UIEH-1420 Agreements accordion - Revise Are you sure you want to unassign agreement? message

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change history for ui-eholdings
 
+## [9.2.0] (IN PROGRESS)
+
+* Agreements accordion - Revise Are you sure you want to unassign agreement? message. (UIEH-1420)
+
 ## [9.1.1] (https://github.com/folio-org/ui-eholdings/tree/v9.1.1) (2024-03-24)
 
 * Add erm 7.0 interface support

src/components/agreements-list/agreements-list.js

@@ -112,7 +112,7 @@ const AgreementsList = ({
     name: ({ name }) => name,
     actions: agreement => (
       <Tooltip
-        text={<FormattedMessage id="ui-eholdings.agreements.unlink" />}
+        text={<FormattedMessage id="ui-eholdings.agreements.delete" />}
         id={`unassign-agreement-${agreement.id}-tooltip`}
       >
         {({ ref, ariaIds }) => (

src/components/route-history/route-history.js

@@ -47,7 +47,9 @@ const RouteHistoryContextProvider = ({ children }) => {
     updateRouteHistory(routeHistory => {
       const lastEholdingsPage = routeHistory.findIndex(page => page.pathname.startsWith('/eholdings'));
 
-      routeHistory[lastEholdingsPage].leavingEholdings = true;
+      if (lastEholdingsPage !== -1) {
+        routeHistory[lastEholdingsPage].leavingEholdings = true;
+      }
 
       return routeHistory;
     });

src/features/agreements-accordion/agreements-accordion.js

@@ -199,32 +199,29 @@ const AgreementsAccordion = ({
       <Modal
         open={showModal}
         size="small"
-        label={<FormattedMessage id="ui-eholdings.agreements.unassignModal.header" />}
-        id="unassign-agreement-confirmation-modal"
+        label={<FormattedMessage id="ui-eholdings.agreements.deleteModal.header" />}
+        id="delete-agreement-confirmation-modal"
         footer={(
           <ModalFooter>
             <Button
-              data-test-eholdings-agreements-unassign-modal-yes
-              buttonStyle="primary"
+              buttonStyle="danger"
               marginBottom0
               onClick={handleUnassignConfirm}
             >
-              <FormattedMessage id="ui-eholdings.agreements.unassignModal.unassign" />
+              <FormattedMessage id="ui-eholdings.agreements.deleteModal.delete" />
             </Button>
             <Button
-              data-test-eholdings-agreements-unassign-modal-no
               marginBottom0
               onClick={closeModal}
             >
-              <FormattedMessage id="ui-eholdings.agreements.unassignModal.cancel" />
+              <FormattedMessage id="ui-eholdings.agreements.deleteModal.cancel" />
             </Button>
           </ModalFooter>
         )}
       >
         <FormattedMessage
-          id="ui-eholdings.agreements.unassignModal.description"
+          id="ui-eholdings.agreements.deleteModal.description"
           values={{
-            agreementName: currentAgreement.name,
             recordName: refName,
           }}
         />

src/features/agreements-accordion/agreements-accordion.test.js

@@ -119,9 +119,9 @@ describe('Given AgreementsAccordion', () => {
         getByText,
       } = renderAgreementsAccordion();
 
-      fireEvent.click(getAllByLabelText('ui-eholdings.agreements.unlink')[0]);
+      fireEvent.click(getAllByLabelText('ui-eholdings.agreements.delete')[0]);
 
-      expect(getByText('ui-eholdings.agreements.unassignModal.header')).toBeDefined();
+      expect(getByText('ui-eholdings.agreements.deleteModal.header')).toBeDefined();
     });
   });
 
@@ -133,11 +133,11 @@ describe('Given AgreementsAccordion', () => {
         getByText,
       } = renderAgreementsAccordion();
 
-      fireEvent.click(getAllByLabelText('ui-eholdings.agreements.unlink')[0]);
-      fireEvent.click(getByText('ui-eholdings.agreements.unassignModal.unassign'));
+      fireEvent.click(getAllByLabelText('ui-eholdings.agreements.delete')[0]);
+      fireEvent.click(getByText('ui-eholdings.agreements.deleteModal.delete'));
 
       await waitFor(() => {
-        expect(queryByText('ui-eholdings.agreements.unassignModal.header')).toBeNull();
+        expect(queryByText('ui-eholdings.agreements.deleteModal.header')).toBeNull();
       });
     });
   });

translations/ui-eholdings/en.json

@@ -22,11 +22,11 @@
     "shortcut.find": "Find",
     "agreements": "Agreements",
     "agreements.notFound": "No agreements found",
-    "agreements.unlink": "Unlink agreement from this record.",
-    "agreements.unassignModal.header": "Unassign an agreement from this record",
-    "agreements.unassignModal.description": "Are you sure you want to unassign <strong>{agreementName}</strong> from <strong>{recordName}</strong>? Once you unsassign, the agreement will no longer be attached to this record.",
-    "agreements.unassignModal.cancel": "Cancel",
-    "agreements.unassignModal.unassign": "Unassign",
+    "agreements.delete": "Delete agreement line",
+    "agreements.deleteModal.header": "Delete agreement line",
+    "agreements.deleteModal.description": "Are you sure you want to delete this agreement line: <strong>{recordName}</strong>?",
+    "agreements.deleteModal.cancel": "Cancel",
+    "agreements.deleteModal.delete": "Delete",
     "usageConsolidation": "Usage & analysis",
     "usageConsolidation.filters.year": "Year",
     "usageConsolidation.filters.platformType": "Platform",