Page MenuHomePhorge
Files F32188392

D8596.1765088741.diff
No OneTemporary
Actions

Size
1 KB
Referenced Files
None
Subscribers
None

D8596.1765088741.diff
View Options

diff --git a/web/roles/create-roles-modal.react.js b/web/roles/create-roles-modal.react.js
--- a/web/roles/create-roles-modal.react.js
+++ b/web/roles/create-roles-modal.react.js
@@ -31,6 +31,7 @@
import LoadingIndicator from '../loading-indicator.react.js';
import Input from '../modals/input.react.js';
import Modal from '../modals/modal.react.js';
+import UnsavedChangesModal from '../modals/unsaved-changes-modal.react.js';
import { useSelector } from '../redux/redux-utils.js';
const createRolesLoadingStatusSelector = createLoadingStatusSelector(
@@ -46,7 +47,7 @@
};
function CreateRolesModal(props: CreateRolesModalProps): React.Node {
- const { popModal } = useModalContext();
+ const { pushModal, popModal } = useModalContext();
const { threadInfo, action, existingRoleID, roleName, rolePermissions } =
props;
@@ -70,8 +71,34 @@
);
const onCloseModal = React.useCallback(() => {
- popModal();
- }, [popModal]);
+ const pendingSet = new Set(pendingRolePermissions);
+ const roleSet = new Set(rolePermissions);
+
+ let arePermissionsEqual = true;
+ if (pendingSet.size !== roleSet.size) {
+ arePermissionsEqual = false;
+ }
+ for (const permission of pendingSet) {
+ if (!roleSet.has(permission)) {
+ arePermissionsEqual = false;
+ break;
+ }
+ }
+
+ if (pendingRoleName === roleName && arePermissionsEqual) {
+ popModal();
+ return;
+ }
+
+ pushModal(<UnsavedChangesModal />);
+ }, [
+ pendingRoleName,
+ roleName,
+ pendingRolePermissions,
+ rolePermissions,
+ pushModal,
+ popModal,
+ ]);
const clearPermissionsClassNames = classNames({
[css.clearPermissions]: true,
@@ -211,7 +238,7 @@
variant="outline"
className={css.backButton}
buttonColor={buttonThemes.outline}
- onClick={null}
+ onClick={onCloseModal}
>
Back
</Button>

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 7, 6:25 AM (13 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5841548
Default Alt Text
D8596.1765088741.diff (1 KB)

Event Timeline