fix comments

src/constants.js

@@ -681,3 +681,7 @@ export const INSTANCE_SHARING_STATUSES = {
 export const HTTP_RESPONSE_STATUS_CODES = {
   FORBIDDEN: 403,
 };
+
+export const events = {
+  SWITCH_ACTIVE_AFFILIATION: 'SWITCH_ACTIVE_AFFILIATION',
+};

src/index.js

@@ -43,6 +43,8 @@ import {
 } from './routes';
 import Settings from './settings';
 import { DataProvider, HoldingsProvider, LastSearchTermsProvider } from './providers';
+import { events } from './constants';
+import { clearStorage } from './utils';
 
 const InventoryRouting = (props) => {
   const history = useHistory();
@@ -202,8 +204,8 @@ const InventoryRouting = (props) => {
 };
 
 InventoryRouting.eventHandler = (event) => {
-  if ([coreEvents.LOGIN, 'SWITCH_ACTIVE_AFFILIATION'].includes(event)) {
-    sessionStorage.clear();
+  if ([coreEvents.LOGIN, events.SWITCH_ACTIVE_AFFILIATION].includes(event)) {
+    clearStorage();
   }
 };
 

src/index.test.js

@@ -1,25 +1,38 @@
+import { coreEvents } from '@folio/stripes/core';
+
 import InventoryRouting from './index';
+import { removeItem } from './storage';
+import { events } from './constants';
 
-import { coreEvents } from '@folio/stripes/core';
+jest.mock('./storage');
 
-global.Storage.prototype.clear = jest.fn();
+const searchTermsExpectations = () => {
+  expect(removeItem).toHaveBeenNthCalledWith(1, '@folio/inventory/search.instances.lastSearch');
+  expect(removeItem).toHaveBeenNthCalledWith(2, '@folio/inventory/search.holdings.lastSearch');
+  expect(removeItem).toHaveBeenNthCalledWith(3, '@folio/inventory/search.items.lastSearch');
+  expect(removeItem).toHaveBeenNthCalledWith(4, '@folio/inventory/browse.lastSearch');
+  expect(removeItem).toHaveBeenNthCalledWith(5, '@folio/inventory/search.instances.lastOffset');
+  expect(removeItem).toHaveBeenNthCalledWith(6, '@folio/inventory/search.holdings.lastOffset');
+  expect(removeItem).toHaveBeenNthCalledWith(7, '@folio/inventory/search.items.lastOffset');
+  expect(removeItem).toHaveBeenNthCalledWith(8, '@folio/inventory/browse.lastOffset');
+}
 
 describe('InventoryRouting', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
-  describe('when LOGIN event is fired', () => {
-    it('should clear session storage', () => {
+  describe('when the user logs in', () => {
+    it('should reset search terms in session storage', () => {
       InventoryRouting.eventHandler(coreEvents.LOGIN);
-      expect(sessionStorage.clear).toHaveBeenCalled();
+      searchTermsExpectations();
     });
   });
 
-  describe('when SWITCH_ACTIVE_AFFILIATION event is fired', () => {
-    it('should clear session storage', () => {
-      InventoryRouting.eventHandler('SWITCH_ACTIVE_AFFILIATION');
-      expect(sessionStorage.clear).toHaveBeenCalled();
+  describe('when the user switch affiliation', () => {
+    it('should reset search terms in session storage', () => {
+      InventoryRouting.eventHandler(events.SWITCH_ACTIVE_AFFILIATION);
+      searchTermsExpectations();
     });
   });
 });

src/utils.js

@@ -42,8 +42,9 @@ import {
   OKAPI_TENANT_HEADER,
   CONTENT_TYPE_HEADER,
   OKAPI_TOKEN_HEADER,
-  AUTHORITY_LINKED_FIELDS,
+  AUTHORITY_LINKED_FIELDS, segments,
 } from './constants';
+import { removeItem } from './storage';
 
 export const areAllFieldsEmpty = fields => fields.every(item => (isArray(item)
   ? (isEmpty(item) || item.every(element => !element || element === '-'))
@@ -866,3 +867,21 @@ export const getLinkedAuthorityIds = instance => {
 
   return flatten(authorityIdList);
 };
+
+export const clearStorage = () => {
+  const namespace = '@folio/inventory';
+
+  removeItem(`${namespace}/search.${segments.instances}.lastSearch`);
+  removeItem(`${namespace}/search.${segments.holdings}.lastSearch`);
+  removeItem(`${namespace}/search.${segments.items}.lastSearch`);
+  removeItem(`${namespace}/browse.lastSearch`);
+  removeItem(`${namespace}/search.${segments.instances}.lastOffset`);
+  removeItem(`${namespace}/search.${segments.holdings}.lastOffset`);
+  removeItem(`${namespace}/search.${segments.items}.lastOffset`);
+  removeItem(`${namespace}/browse.lastOffset`);
+  removeItem(`${namespace}/search.lastSegment`);
+
+  Object.values(segments).forEach((segment) => {
+    removeItem(`${namespace}.${segment}.lastOpenRecord`);
+  });
+};