UISAUTHCOM-23 Display toast message for saving and editing authorization roles

CHANGELOG.md

@@ -25,3 +25,4 @@
 * [UISAUTHCOM-14](https://folio-org.atlassian.net/browse/UISAUTHCOM-14) ECS - Support sharing of authorization roles and policies.
 * [UISAUTHCOM-20](https://folio-org.atlassian.net/browse/UISAUTHCOM-20) ECS - Prevent editing of shared Role from outside "Consortium manager".
 * [UISAUTHCOM-21](https://folio-org.atlassian.net/browse/UISAUTHCOM-21) ECS - Prevent editing of shared Policies from outside "Consortium manager".
+* [UISAUTHCOM-23](https://folio-org.atlassian.net/browse/UISAUTHCOM-23) Display toast message for saving and editing authorization roles.

lib/Policy/PolicyFormContainer/PolicyFormContainer.js

@@ -16,15 +16,19 @@ import {
 import { isShared } from '../../utils';
 import { PolicyForm } from '../PolicyForm';
 
-export const PolicyFormContainer = ({ path, ...props }) => {
+export const PolicyFormContainer = ({
+  path,
+  tenantId,
+  ...props
+}) => {
   const stripes = useStripes();
   const history = useHistory();
   const showCallout = useShowCallout();
   const { id: policyId } = useParams();
   const actionType = policyId ? 'edit' : 'create';
 
-  const { policy, isLoading } = useAuthorizationPolicyById(policyId);
-  const { mutatePolicy, isLoading: isMutationLoading } = useAuthorizationPolicyMutation();
+  const { policy, isLoading } = useAuthorizationPolicyById(policyId, { tenantId });
+  const { mutatePolicy, isLoading: isMutationLoading } = useAuthorizationPolicyMutation(null, { tenantId });
   const { upsertSharedPolicy, isLoading: isSharing } = usePolicySharing();
 
   const isPolicyShared = Boolean(stripes.hasInterface('consortia') && isShared(policy));
@@ -71,4 +75,5 @@ export const PolicyFormContainer = ({ path, ...props }) => {
 
 PolicyFormContainer.propTypes = {
   path: PropTypes.string.isRequired,
+  tenantId: PropTypes.string,
 };

lib/PolicyDetails/PolicyDetails/PolicyDetails.js

@@ -30,7 +30,10 @@ import {
   useStripes,
 } from '@folio/stripes/core';
 
-import { usePolicySharing } from '../../hooks';
+import {
+  usePolicySharing,
+  useShowCallout,
+} from '../../hooks';
 import {
   isShared,
   isTenantConsortiumCentral,
@@ -47,10 +50,11 @@ const PolicyDetails = ({
 }) => {
   const stripes = useStripes();
   const intl = useIntl();
+  const showCallout = useShowCallout();
 
   const ConnectedViewMetaData = stripes.connect(ViewMetaData);
 
-  const { upsertSharedPolicy } = usePolicySharing();
+  const { upsertSharedPolicy, isLoading } = usePolicySharing();
 
   const [isConfirmShareModalOpen, setIsConfirmShareModalOpen] = useState(false);
 
@@ -101,9 +105,17 @@ const PolicyDetails = ({
   }, [displayShareAction, isMutationsPrevented, isPolicyShared, isTargetTenantCentral, onEdit, stripes]);
 
   const sharePolicy = useCallback(async () => {
-    await upsertSharedPolicy({ policy })
-      .then(() => setIsConfirmShareModalOpen(false));
-  }, [policy, upsertSharedPolicy]);
+    try {
+      await upsertSharedPolicy({ policy });
+      setIsConfirmShareModalOpen(false);
+      showCallout({ messageId: 'stripes-authorization-components.policy.share.success' });
+    } catch {
+      showCallout({
+        messageId: 'stripes-authorization-components.policy.share.error',
+        type: 'error',
+      });
+    }
+  }, [policy, showCallout, upsertSharedPolicy]);
 
   return (
     <Pane
@@ -174,6 +186,7 @@ const PolicyDetails = ({
         )}
         onConfirm={sharePolicy}
         onCancel={() => setIsConfirmShareModalOpen(false)}
+        isConfirmButtonDisabled={isLoading}
       />
     </Pane>
   );

lib/PolicyDetails/PolicyDetails/PolicyDetails.test.js

@@ -82,5 +82,5 @@ describe('PolicyDetails component', () => {
 
       expect(upsertSharedPolicy).toHaveBeenCalledWith(expect.objectContaining({ policy: defaultProps.policy }));
     });
-  })
+  });
 });

lib/Role/RoleCreate/RoleCreate.js

@@ -8,6 +8,7 @@ import {
   useApplicationCapabilitySets,
   useCreateRoleMutation,
   useErrorCallout,
+  useShowCallout,
 } from '../../hooks';
 import { RoleForm } from '../RoleForm';
 
@@ -16,6 +17,7 @@ export const RoleCreate = ({
   tenantId,
 }) => {
   const history = useHistory();
+  const showCallout = useShowCallout();
 
   const [roleName, setRoleName] = useState('');
   const [description, setDescription] = useState('');
@@ -74,8 +76,18 @@ export const RoleCreate = ({
 
   const onSubmit = async (e) => {
     e.preventDefault();
-    await mutateRole({ name: roleName, description });
-    onClose();
+
+    try {
+      const { id: roleId } = await mutateRole({ name: roleName, description });
+
+      history.push(`${path}/${roleId}`);
+      showCallout({ messageId: 'stripes-authorization-components.role.create.success' });
+    } catch {
+      showCallout({
+        messageId: 'stripes-authorization-components.role.create.error',
+        type: 'error',
+      });
+    }
   };
 
   const onSubmitSelectApplications = (appIds, callback) => {

lib/Role/RoleEdit/RoleEdit.js

@@ -15,6 +15,7 @@ import {
   useRoleCapabilities,
   useRoleCapabilitySets,
   useRoleSharing,
+  useShowCallout,
 } from '../../hooks';
 import { isShared } from '../../utils';
 import { RoleForm } from '../RoleForm';
@@ -24,6 +25,7 @@ export const RoleEdit = ({ path, tenantId }) => {
   const { id: roleId } = useParams();
   const queryClient = useQueryClient();
   const stripes = useStripes();
+  const showCallout = useShowCallout();
 
   const { roleDetails, isSuccess: isRoleDetailsLoaded } = useRoleById(roleId, { tenantId });
 
@@ -171,18 +173,26 @@ export const RoleEdit = ({ path, tenantId }) => {
   const onSubmit = async (event) => {
     event.preventDefault();
 
-    if (isRoleShared) {
-      await upsertSharedRole({
-        role: { ...roleDetails, ...roleData },
-        ...updateIndicators,
-        capabilityNames: roleCapabilitiesListNames,
-        capabilitySetNames: roleCapabilitySetsListNames,
+    try {
+      if (isRoleShared) {
+        await upsertSharedRole({
+          role: { ...roleDetails, ...roleData },
+          ...updateIndicators,
+          capabilityNames: roleCapabilitiesListNames,
+          capabilitySetNames: roleCapabilitySetsListNames,
+        });
+      } else {
+        await mutateRole();
+      }
+
+      onClose();
+      showCallout({ messageId: 'stripes-authorization-components.role.edit.success' });
+    } catch (error) {
+      showCallout({
+        messageId: 'stripes-authorization-components.role.edit.error',
+        type: 'error',
       });
-    } else {
-      await mutateRole();
     }
-
-    onClose();
   };
 
   const isInitialDataReady = isInitialRoleCapabilitySetsLoaded && isInitialRoleCapabilitiesLoaded;

lib/RoleDetails/RoleDetails.js

@@ -38,6 +38,8 @@ import {
   useErrorCallout,
   useInitialRoleSharing,
   useRoleById,
+  useRoleSharing,
+  useShowCallout,
 } from '../hooks';
 import {
   isShared,
@@ -59,6 +61,8 @@ export const RoleDetails = ({
 }) => {
   const stripes = useStripes();
   const intl = useIntl();
+  const showCallout = useShowCallout();
+
   const ConnectedViewMetaData = stripes.connect(ViewMetaData);
 
   const [isDeleting, setIsDeleting] = useState(false);
@@ -71,8 +75,18 @@ export const RoleDetails = ({
   const onClose = () => history.push(path);
 
   const { roleDetails: role } = useRoleById(roleId, { tenantId });
-  const { mutateAsync: deleteRole } = useDeleteRoleMutation(onClose, sendErrorCallout, { tenantId });
-  const { shareRole } = useInitialRoleSharing(role);
+  const {
+    mutateAsync: deleteRole,
+    isLoading: isRoleDeleting,
+  } = useDeleteRoleMutation(onClose, sendErrorCallout, { tenantId });
+  const {
+    shareRole,
+    isLoading: isRoleInitialSharing,
+  } = useInitialRoleSharing(role);
+  const {
+    deleteSharedRole,
+    isLoading: isSharedRoleDeleting,
+  } = useRoleSharing();
 
   const isRoleShared = Boolean(stripes.hasInterface('consortia') && isShared(role));
   const targetTenantId = tenantId || stripes.okapi.tenant;
@@ -150,10 +164,35 @@ export const RoleDetails = ({
     );
   };
 
-  const onRoleShare = useCallback(() => {
-    return shareRole()
-      .then(() => setIsConfirmShareModalOpen(false));
-  }, [shareRole]);
+  const onRoleShare = useCallback(async () => {
+    try {
+      await shareRole();
+      setIsConfirmShareModalOpen(false);
+      showCallout({ messageId: 'stripes-authorization-components.role.share.success' });
+    } catch {
+      showCallout({
+        messageId: 'stripes-authorization-components.role.share.error',
+        type: 'error',
+      });
+    }
+  }, [shareRole, showCallout]);
+
+  const onRoleDelete = useCallback(async () => {
+    try {
+      if (isRoleShared) {
+        await deleteSharedRole({ role });
+      } else {
+        await deleteRole(roleId);
+      }
+
+      showCallout({ messageId: 'stripes-authorization-components.role.delete.success' });
+    } catch {
+      showCallout({
+        messageId: 'stripes-authorization-components.role.delete.error',
+        type: 'error',
+      });
+    }
+  }, [deleteRole, deleteSharedRole, isRoleShared, role, roleId, showCallout]);
 
   const paneTitle = isLoading || !role?.name ? <Loading /> : role?.name;
 
@@ -231,9 +270,10 @@ export const RoleDetails = ({
             values={{ rolename: role?.name }}
           />
         )}
-        onConfirm={() => deleteRole(roleId)}
+        onConfirm={onRoleDelete}
         onCancel={() => setIsDeleting(false)}
         confirmLabel={<FormattedMessage id="stripes-authorization-components.crud.delete" />}
+        isConfirmButtonDisabled={isRoleDeleting || isSharedRoleDeleting}
       />
 
       <ConfirmationModal
@@ -247,6 +287,7 @@ export const RoleDetails = ({
         )}
         onConfirm={onRoleShare}
         onCancel={() => setIsConfirmShareModalOpen(false)}
+        isConfirmButtonDisabled={isRoleInitialSharing}
       />
       <ConfirmationModal
         open={isDuplicating}

lib/RoleDetails/RoleDetails.test.js

@@ -10,6 +10,7 @@ import {
   useDeleteRoleMutation,
   useInitialRoleSharing,
   useRoleById,
+  useRoleSharing,
 } from '../hooks';
 import { isTenantConsortiumCentral } from '../utils';
 import { RoleDetails } from './RoleDetails';
@@ -22,6 +23,7 @@ jest.mock('../hooks', () => ({
   useDeleteRoleMutation: jest.fn(),
   useInitialRoleSharing: jest.fn(),
   useRoleById: jest.fn(),
+  useRoleSharing: jest.fn(),
 }));
 jest.mock('../utils', () => ({
   ...jest.requireActual('../utils'),
@@ -77,14 +79,19 @@ jest.mock('./RoleDetailsCapabilitySetsAccordion', () => ({
 }));
 
 describe('RoleDetails component', () => {
+  const deleteSharedRole = jest.fn(() => Promise.resolve());
   const shareRole = jest.fn(() => Promise.resolve());
 
   beforeEach(() => {
     shareRole.mockClear();
+    deleteSharedRole.mockClear();
 
     useInitialRoleSharing
       .mockClear()
       .mockReturnValue({ shareRole });
+    useRoleSharing
+      .mockClear()
+      .mockReturnValue({ deleteSharedRole });
   });
 
   describe('renders roles details pane with expanded information', () => {
@@ -136,6 +143,12 @@ describe('RoleDetails component', () => {
   });
 
   describe('ECS mode', () => {
+    beforeEach(() => {
+      isTenantConsortiumCentral
+        .mockClear()
+        .mockReturnValue(true);
+    });
+
     it('should handle policy sharing when "Share to all" action is performed', async () => {
       isTenantConsortiumCentral.mockReturnValue(true);
 
@@ -149,5 +162,25 @@ describe('RoleDetails component', () => {
 
       expect(shareRole).toHaveBeenCalled();
     });
+
+    it('should handle shared policy delete', async () => {
+      useRoleById
+        .mockClear()
+        .mockReturnValue({
+          roleDetails: { ...getRoleData(), type: 'CONSORTIUM' },
+          isRoleDetailsLoaded: true,
+        });
+
+      renderComponent({ displayShareAction: true });
+
+      await userEvent.click(screen.getByRole('button', { name: 'stripes-components.paneMenuActionsToggleLabel' }));
+      await userEvent.click(screen.getByRole('button', { name: 'stripes-authorization-components.crud.delete' }));
+      await userEvent.click(
+        within(screen.getByText('stripes-authorization-components.crud.deleteRole'))
+          .getByRole('button', { name: 'confirm' })
+      );
+
+      expect(deleteSharedRole).toHaveBeenCalled();
+    });
   });
 });