Merge branch 'UIIN-3137' of https://github.com/folio-org/ui-inventory …

…into UIIN-3137 merge master# the commit.
folio-org · Dec 2, 2024 · 230e528 · 230e528
2 parents 440a767 + 5ec2722
commit 230e528
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 * Display informative error message when editing same instance, holdings, item in two tabs. Fixes UIIN-3127.
 * Display user's name instead of "Unknown user" in "Last updated" field in "Settings" for member tenant. Fixes UIIN-3144.
 * Update Linked data API URL to use the new API path. Fixes UIIN-3146.
+* Add the `isSearchToggleHitInBrowse` flag to the history state to use in the condition that specifies whether to use the default sort on mount.  Fixes UIIN-3137.
 
 ## [12.0.3](https://github.com/folio-org/ui-inventory/tree/v12.0.3) (2024-11-27)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v12.0.2...v12.0.3)

diff --git a/src/components/InstancesList/InstancesList.js b/src/components/InstancesList/InstancesList.js
@@ -225,6 +225,7 @@ class InstancesList extends React.Component {
       data,
     } = this.props;
 
+    const { isSearchToggleHitInBrowse } = _location.state || {};
     const params = getParams();
     const defaultSort = data.displaySettings.defaultSort;
 
@@ -251,9 +252,16 @@ class InstancesList extends React.Component {
     const searchParams = new URLSearchParams(_location.search);
 
     const isStaffSuppressFilterChanged = this.applyDefaultStaffSuppressFilter(searchParams);
+    let isSortingChanged = false;
 
-    if (params.sort !== defaultSort || isStaffSuppressFilterChanged) {
+    // don't set the default sort when redirecting from Browse search by hitting the Search toggle,
+    // the previously selected sort option should be used (it will be taken from session storage).
+    if (params.sort !== defaultSort && !isSearchToggleHitInBrowse) {
+      isSortingChanged = true;
       searchParams.set('sort', defaultSort);
+    }
+
+    if (isSortingChanged || isStaffSuppressFilterChanged) {
       this.redirectToSearchParams(searchParams);
     }
   }

diff --git a/src/components/InstancesList/InstancesList.test.js b/src/components/InstancesList/InstancesList.test.js
@@ -314,7 +314,13 @@ describe('InstancesList', () => {
         it('should call history.replace with sort parameter from Settings', () => {
           jest.spyOn(history, 'replace');
 
-          history.push('/inventory?filters=staffSuppress.false&sort=title');
+          history.push({
+            pathname: '/inventory',
+            search: '?filters=staffSuppress.false&sort=title',
+            state: {
+              isSearchToggleHitInBrowse: false,
+            },
+          });
 
           renderInstancesList({
             segment: 'instances',
@@ -329,10 +335,41 @@ describe('InstancesList', () => {
             },
           });
 
-          expect(history.replace).toHaveBeenLastCalledWith({
-            pathname: '/inventory',
-            search: 'filters=staffSuppress.false&sort=relevance',
-            state: undefined,
+          expect(history.replace).toHaveBeenLastCalledWith(expect.objectContaining({
+            search: expect.stringContaining('sort=relevance'),
+          }));
+        });
+
+        describe('and redirection from Browse search by pressing Search toggle', () => {
+          it('should not call history.replace with sort parameter from Settings', () => {
+            jest.spyOn(history, 'replace');
+
+            history.push({
+              pathname: '/inventory',
+              search: '?filters=staffSuppress.false&sort=title',
+              state: {
+                isSearchToggleHitInBrowse: true,
+              },
+            });
+
+            const defaultSort = SORT_OPTIONS.RELEVANCE;
+
+            renderInstancesList({
+              segment: segments.instances,
+              data: {
+                ...data,
+                query: {
+                  query: '',
+                },
+                displaySettings: {
+                  defaultSort,
+                },
+              },
+            });
+
+            expect(history.replace).not.toHaveBeenLastCalledWith(expect.objectContaining({
+              search: expect.stringContaining(`sort=${defaultSort}`),
+            }));
           });
         });
       });

diff --git a/src/views/BrowseInventory/BrowseInventory.js b/src/views/BrowseInventory/BrowseInventory.js
@@ -197,6 +197,9 @@ const BrowseInventory = () => {
         >
           <SearchModeNavigation
             search={getLastSearch()}
+            state={{
+              isSearchToggleHitInBrowse: true,
+            }}
           />
 
           <SingleSearchForm