WRS-2133 - session store selected user interface

chili-publish · Nov 29, 2024 · a84343c · a84343c
1 parent 78f8c34
commit a84343c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/components/navbar/navbarItems/useUserInterfaceSelector.tsx b/src/components/navbar/navbarItems/useUserInterfaceSelector.tsx
@@ -1,5 +1,6 @@
 import { AvailableIcons, DropDown } from '@chili-publish/grafx-shared-components';
 import { useMemo } from 'react';
+import { SESSION_USER_INTEFACE_ID_KEY } from '../../../utils/constants';
 import { getDataIdForSUI, getDataTestIdForSUI } from '../../../utils/dataIds';
 import { useUiConfigContext } from '../../../contexts/UiConfigContext';
 
@@ -10,7 +11,12 @@ const useUserInterfaceSelector = () => {
         () => userInterfaces.map((item) => ({ label: item.name, value: item.id })),
         [userInterfaces],
     );
-    const selectedUserInterface = selectedUserInterfaceId || userInterfaces.find((item) => item.default)?.id;
+    const validUserInterfaceForTemplate = userInterfaces.find(
+        (item) => item.id === sessionStorage.getItem(SESSION_USER_INTEFACE_ID_KEY),
+    )?.id;
+
+    const selectedUserInterface =
+        validUserInterfaceForTemplate || selectedUserInterfaceId || userInterfaces.find((item) => item.default)?.id;
 
     const navbarItem = useMemo(
         () => ({
@@ -21,7 +27,10 @@ const useUserInterfaceSelector = () => {
                     dataTestId={getDataTestIdForSUI('dropdown-user-interface')}
                     options={options}
                     value={options.find((op) => op.value === selectedUserInterface)}
-                    onChange={(option) => onUserInterfaceChange(option?.value as unknown as string)}
+                    onChange={(option) => {
+                        onUserInterfaceChange(option?.value as unknown as string);
+                        sessionStorage.setItem(SESSION_USER_INTEFACE_ID_KEY, option?.value as string);
+                    }}
                     noDropDownIcon
                     controlShouldRenderValue={false}
                     placeholderIcon={AvailableIcons.faTableLayout}

diff --git a/src/utils/constants.ts b/src/utils/constants.ts
@@ -1 +1,2 @@
 export const APP_WRAPPER_ID = 'studio-ui-application';
+export const SESSION_USER_INTEFACE_ID_KEY = 'userInterfaceId';
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export const APP_WRAPPER_ID = 'studio-ui-application';
		export const SESSION_USER_INTEFACE_ID_KEY = 'userInterfaceId';