Cu 86bzx3387 UI configuration improvements

JeMPI_Apps/JeMPI_UI/src/hooks/useAppConfig.tsx

@@ -39,25 +39,23 @@ export const AppConfigProvider = ({
     refetchOnWindowFocus: false
   })
   const availableFields: DisplayField[] = useMemo(() => {
-    return (fields || [])
-      .filter(({ scope }) =>
-        scope.some(path => {
-          return matchPath(
-            {
-              path: path
-            },
-            location.pathname
-          )
-        })
-      )
-      .map(field => {
-        return {
+    try {
+      if (!fields || !Array.isArray(fields)) return []
+
+      return fields
+        .filter(({ scope }) =>
+          scope?.some(path => matchPath({ path }, location.pathname))
+        )
+        .map(field => ({
           ...field,
           formatValue: getFieldValueFormatter(field.fieldType),
           isValid: (value: unknown) => isInputValid(value, field?.validation),
           getValue: valueGetter
-        }
-      })
+        }))
+    } catch (error) {
+      console.error('Error processing available fields:', error)
+      return []
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fields, location])
 

JeMPI_Apps/JeMPI_UI/src/pages/settings/Settings.tsx

@@ -15,9 +15,11 @@ import { generateId } from 'utils/helpers'
 import Probabilistic from './probabilistic/Probabilistic'
 import { useConfig } from 'hooks/useConfig'
 import { useSnackbar } from 'notistack'
+import { useConfiguration } from 'hooks/useUIConfiguration'
 
 const Settings = () => {
   const [value, setValue] = useState(0)
+  const {configuration} = useConfiguration()
   const [configurationData, setConfigurationData] = useState(() => {
     const storedData = localStorage.getItem('configuration')
     return storedData
@@ -106,12 +108,12 @@ const Settings = () => {
               variant="scrollable"
             >
               <Tab label="Common" {...a11yProps(0)} />
-              <Tab label="Unique to Golden Record" {...a11yProps(1)} />
+              {/* <Tab label="Unique to Golden Record" {...a11yProps(1)} />
               <Tab label="Unique to Interaction" {...a11yProps(2)} />
-              <Tab label="Golden Records Lists" {...a11yProps(3)} />
-              <Tab label="Deterministic" {...a11yProps(4)} />
-              <Tab label="Blocking" {...a11yProps(5)} />
-              <Tab label="Probabilistic" {...a11yProps(6)} />
+              <Tab label="Golden Records Lists" {...a11yProps(3)} /> */}
+              <Tab label="Deterministic" {...a11yProps(1)} />
+              <Tab label="Blocking" {...a11yProps(2)} />
+              <Tab label="Probabilistic" {...a11yProps(3)} />
             </Tabs>
           </Box>
           <CustomTabPanel value={value} index={0}>
@@ -120,31 +122,31 @@ const Settings = () => {
             </Typography>
             <CommonSettings />
           </CustomTabPanel>
-          <CustomTabPanel value={value} index={1}>
+          {/* <CustomTabPanel value={value} index={1}>
             <Typography variant="h5" sx={{ py: 3 }}>
               Setup properties that are unique to the golden record
             </Typography>
             <UniqueToGR />
-          </CustomTabPanel>
-          <CustomTabPanel value={value} index={2}>
+          </CustomTabPanel> */}
+          {/* <CustomTabPanel value={value} index={2}>
             <Typography variant="h5" sx={{ py: 3 }}>
               Setup properties that are unique to the interaction
             </Typography>
             <UniqueToInteraction />
-          </CustomTabPanel>
-          <CustomTabPanel value={value} index={3}>
+          </CustomTabPanel> */}
+          {/* <CustomTabPanel value={value} index={3}>
             <Typography variant="h5" sx={{ py: 3 }}>
               Setup properties for Golden record lists
             </Typography>
             <GoldenRecordLists />
-          </CustomTabPanel>
-          <CustomTabPanel value={value} index={4}>
+          </CustomTabPanel> */}
+          <CustomTabPanel value={value} index={1}>
             <Deterministic />
           </CustomTabPanel>
-          <CustomTabPanel value={value} index={5}>
+          <CustomTabPanel value={value} index={2}>
             <Blocking />
           </CustomTabPanel>
-          <CustomTabPanel value={value} index={6}>
+          <CustomTabPanel value={value} index={3}>
             <Typography variant="h5" sx={{ py: 3 }}>
               <Probabilistic />
             </Typography>