UITEN-273: Use Save & close button label stripes-component translatio…

…n key
folio-org · Feb 12, 2024 · 7e801f7 · 7e801f7
1 parent 13cf568
commit 7e801f7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 * [UITEN-266](https://issues.folio.org/browse/UITEN-266) No longer displays non-working inventory-related pages when the inventory interfaces are not present.
 * [UITEN-269](https://issues.folio.org/browse/UITEN-269) User without "Settings (tenant): Can maintain preferred plugins" permission can edit preferred plugins.
+* [UITEN-273](https://issues.folio.org/browse/UITEN-273) Use Save & close button label stripes-component translation key
 
 ## [8.0.0](https://github.com/folio-org/ui-tenant-settings/tree/v8.0.0)(2023-10-13)
 [Full Changelog](https://github.com/folio-org/ui-tenant-settings/compare/v7.4.0...v8.0.0)

diff --git a/src/settings/LocationLocations/LocationForm/LocationForm.js b/src/settings/LocationLocations/LocationForm/LocationForm.js
@@ -109,7 +109,7 @@ class LocationForm extends React.Component {
         marginBottom0
         disabled={((pristine || submitting) && !cloning)}
       >
-        <FormattedMessage id="ui-tenant-settings.settings.general.saveAndClose" />
+        <FormattedMessage id="stripes-components.saveAndClose" />
       </Button>
     );
 

diff --git a/src/settings/LocationLocations/LocationForm/LocationFormContainer.test.js b/src/settings/LocationLocations/LocationForm/LocationFormContainer.test.js
@@ -241,7 +241,7 @@ describe('LocationFormContainer', () => {
 
     inputs.forEach((el) => expect(screen.getByRole('textbox', { name: el })).toHaveValue('Test value'));
 
-    userEvent.click(screen.getByRole('button', { name: /settings.general.saveAndClose/ }));
+    userEvent.click(screen.getByRole('button', { name: /stripes-components.saveAndClose/ }));
   });
 
   it('should render expand buttons', () => {
@@ -253,7 +253,7 @@ describe('LocationFormContainer', () => {
 
     userEvent.click(screen.getByRole('button', { name: /stripes-components.expandAll/ }));
 
-    userEvent.click(screen.getByRole('button', { name: /settings.general.saveAndClose/ }));
+    userEvent.click(screen.getByRole('button', { name: /stripes-components.saveAndClose/ }));
   });
 
   it('should render Service point combobox', () => {
@@ -325,6 +325,6 @@ describe('LocationFormContainer', () => {
       selectLibrary,
       libraryOption
     );
-    userEvent.click(screen.getByRole('button', { name: /settings.general.saveAndClose/ }));
+    userEvent.click(screen.getByRole('button', { name: /stripes-components.saveAndClose/ }));
   });
 });
diff --git a/src/settings/LocationLocations/LocationManager.test.js b/src/settings/LocationLocations/LocationManager.test.js
@@ -211,7 +211,7 @@ describe('LocationManager', () => {
       /stripes-components.collapseAll/,
       /Icon ui-tenant-settings.settings.location.locations.generalInformation/,
       /Icon ui-tenant-settings.settings.location.locations.locationDetails/,
-      /ui-tenant-settings.settings.general.saveAndClose/
+      /stripes-components.saveAndClose/
     ];
 
     buttons.forEach((el) => userEvent.click(screen.getByRole('button', { name: el })));