D8596.1765078119.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D8596.1765078119.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
	@@ -24,6 +24,7 @@
	import EnumSettingsOption from '../components/enum-settings-option.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';

	type CreateRolesModalProps = {
	+threadInfo: ThreadInfo,
	@@ -34,7 +35,7 @@
	};

	function CreateRolesModal(props: CreateRolesModalProps): React.Node {
	- const { popModal } = useModalContext();
	+ const { pushModal, popModal } = useModalContext();
	const { threadInfo, action, existingRoleID, roleName, rolePermissions } =
	props;

	@@ -54,8 +55,26 @@
	);

	const onCloseModal = React.useCallback(() => {
	- popModal();
	- }, [popModal]);
	+ const arePermissionsEqual =
	+ pendingRolePermissions.length === rolePermissions.length &&
	+ pendingRolePermissions.every(permission =>
	+ rolePermissions.includes(permission),
	+ );
	+
	+ if (pendingRoleName === roleName && arePermissionsEqual) {
	+ popModal();
	+ return;
	+ }
	+
	+ pushModal(<UnsavedChangesModal />);
	+ }, [
	+ pendingRoleName,
	+ roleName,
	+ pendingRolePermissions,
	+ rolePermissions,
	+ pushModal,
	+ popModal,
	+ ]);

	const clearPermissionsClassNames = classNames({
	[css.clearPermissions]: true,
	@@ -167,7 +186,7 @@
	variant="outline"
	className={css.backButton}
	buttonColor={buttonThemes.outline}
	- onClick={null}
	+ onClick={onCloseModal}
	>
	Back
	</Button>