refactor(sidebarMenu): created util for isExpanded inital value

shesha-io · Jul 6, 2023 · a462693 · a462693
1 parent 2d6058f
commit a462693
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/shesha-reactjs/src/providers/sidebarMenu/contexts.ts b/shesha-reactjs/src/providers/sidebarMenu/contexts.ts
@@ -3,8 +3,7 @@ import { IFlagsSetters } from '../../interfaces/flagsSetters';
 import { IFlagsState } from '../../interfaces/flagsState';
 import { ISidebarMenuItem } from '../../interfaces/sidebar';
 import { IHeaderAction } from './models';
-import { getLocalStorage } from 'utils/storage';
-import { SIDEBAR_COLLAPSE } from 'components/mainLayout/constant';
+import { getInitIsExpanded } from './util';
 
 export type IFlagProgressFlags = 'fetchFileInfo' /* NEW_IN_PROGRESS_FLAG_GOES_HERE */;
 export type IFlagSucceededFlags = 'fetchFileInfo' /* NEW_SUCCEEDED_FLAG_GOES_HERE */;
@@ -32,7 +31,7 @@ export const SIDEBAR_MENU_CONTEXT_INITIAL_STATE: ISidebarMenuStateContext = {
   succeeded: {},
   error: {},
   actioned: {},
-  isExpanded: !JSON.parse(getLocalStorage()?.getItem(SIDEBAR_COLLAPSE)),
+  isExpanded: getInitIsExpanded(),
 };
 
 export const SidebarMenuStateContext = createContext<ISidebarMenuStateContext>(SIDEBAR_MENU_CONTEXT_INITIAL_STATE);

diff --git a/shesha-reactjs/src/providers/sidebarMenu/util.ts b/shesha-reactjs/src/providers/sidebarMenu/util.ts
@@ -0,0 +1,13 @@
+import { SIDEBAR_COLLAPSE } from 'components/mainLayout/constant';
+import { isJsonParseable } from 'utils/multitenancy';
+import { getLocalStorage } from 'utils/storage';
+
+export const getInitIsExpanded = () => {
+  try {
+    const value = getLocalStorage()?.getItem(SIDEBAR_COLLAPSE);
+    const result = isJsonParseable(value) ? JSON.parse(value) : true;
+    return !result;
+  } catch (_e) {
+    return false;
+  }
+};