diff --git a/CHANGELOG.md b/CHANGELOG.md
index a22052082..2903b68ef 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/src/components/agreements-list/agreements-list.js b/src/components/agreements-list/agreements-list.js
index 116f4163c..ff4608dbe 100644
--- a/src/components/agreements-list/agreements-list.js
+++ b/src/components/agreements-list/agreements-list.js
@@ -112,7 +112,7 @@ const AgreementsList = ({
name: ({ name }) => name,
actions: agreement => (
}
+ text={}
id={`unassign-agreement-${agreement.id}-tooltip`}
>
{({ ref, ariaIds }) => (
diff --git a/src/components/route-history/route-history.js b/src/components/route-history/route-history.js
index 88da01f6a..437732577 100644
--- a/src/components/route-history/route-history.js
+++ b/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;
});
diff --git a/src/features/agreements-accordion/agreements-accordion.js b/src/features/agreements-accordion/agreements-accordion.js
index ff96e79c1..181599e1e 100644
--- a/src/features/agreements-accordion/agreements-accordion.js
+++ b/src/features/agreements-accordion/agreements-accordion.js
@@ -199,32 +199,29 @@ const AgreementsAccordion = ({
}
- id="unassign-agreement-confirmation-modal"
+ label={}
+ id="delete-agreement-confirmation-modal"
footer={(
)}
>
diff --git a/src/features/agreements-accordion/agreements-accordion.test.js b/src/features/agreements-accordion/agreements-accordion.test.js
index 8e49e2361..b0e3da171 100644
--- a/src/features/agreements-accordion/agreements-accordion.test.js
+++ b/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();
});
});
});
diff --git a/translations/ui-eholdings/en.json b/translations/ui-eholdings/en.json
index 309f284ea..1b68c08f5 100644
--- a/translations/ui-eholdings/en.json
+++ b/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 {agreementName} from {recordName}? 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: {recordName}?",
+ "agreements.deleteModal.cancel": "Cancel",
+ "agreements.deleteModal.delete": "Delete",
"usageConsolidation": "Usage & analysis",
"usageConsolidation.filters.year": "Year",
"usageConsolidation.filters.platformType": "Platform",