@admin-layout/tailwind-design-pro 12.0.16-alpha.55 → 12.0.16-alpha.57

package/lib/components/SettingDrawer/ThemeColor.js

@@ -1,4 +1,4 @@
-import {jsx}from'react/jsx-runtime';import'react';import'@react-icons/all-files/fa/FaMoon.js';import'@react-icons/all-files/fa/FaSun.js';import {useMediaQuery}from'../../hooks/useMediaQuery.js';function ThemeColor(props) {
+import {jsx}from'react/jsx-runtime';import'react';import'@react-icons/all-files/fa/FaMoon.js';import'@react-icons/all-files/fa/FaSun.js';import {useMediaQuery}from'../../hooks/useMediaQuery.js';import {getSettingValue}from'../../utils/settingsUtils.js';function ThemeColor(props) {
   const {
     color,
     changeSetting,
@@ -11,23 +11,9 @@ import {jsx}from'react/jsx-runtime';import'react';import'@react-icons/all-files/
   } = useMediaQuery();
   const currentRoute = location?.pathname || '/';
   const deviceType = isMobile ? 'mobile' : 'desktop';
-  // Helper to get primaryColor value with overrides applied
+  // Use getSettingValue to get the correct primaryColor based on applyToAllRoutes
   const getPrimaryColorValue = () => {
-    // If applyToAllRoutes is true, use global settings only
-    if (applyToAllRoutes) {
-      return settings?.primaryColor || '#1890ff';
-    }
-    // Otherwise, check for route-specific overrides
-    const contextKey = `[${currentRoute}][${deviceType}]`;
-    const overrideSettings = settings?.uiSettings?.overrides?.[contextKey];
-    if (overrideSettings) {
-      // Handle the uilayout wrapper in override structure
-      const overrideData = overrideSettings.uilayout || overrideSettings;
-      if (overrideData?.primaryColor !== undefined) {
-        return overrideData.primaryColor;
-      }
-    }
-    return settings?.primaryColor || '#1890ff';
+    return getSettingValue(settings, 'primaryColor', applyToAllRoutes, currentRoute, deviceType, '#1890ff');
   };
   if (!color || color.length < 1) {
     return null;

package/lib/components/SettingDrawer/ThemeColor.js.map

@@ -1 +1 @@
-{"version":3,"file":"ThemeColor.js","sources":["../../../src/components/SettingDrawer/ThemeColor.tsx"],"sourcesContent":[null],"names":[],"mappings":"kMAIc,SAAU,UAAU,CAAC,KAAuB,EAAA;AACtD,EAAA,MAAA;AACA,IAAA,KAAA;AACA,IAAA;IACA,QAAM;IAEN,QAAA;IACA,gBAAM,GAAA;WACF;QACA;AACI,IAAA;mBACH,EAAA;QAED,YAAA,GAAA,QAAA,EAAA,QAAA,IAAA,GAAA;AACA,EAAA,MAAA,qBAAmB,cAAgB,SAAK;;QAExC,oBAAoB,GAAG,MAAA;;AAEnB,IAAA,IAAA;AACA,MAAA,OAAA,sBAAkB,IAAA,SAAiB;;;UAGtC,UAAA,GAAA,CAAA,CAAA,EAAA,YAAA,CAAA,EAAA,EAAA,UAAA,CAAA,CAAA,CAAA;AACD,IAAA,MAAA,gBAAiB,GAAA,QAAY,EAAA,YAAc,SAAA,GAAA,UAAA,CAAA;AAC/C,IAAA,IAAE,gBAAA,EAAA;;AAGE,MAAA,MAAA,YAAY,GAAA,gBAAA,CAAA,QAAA,IAAA,gBAAA;MACf,IAAA,YAAA,EAAA,YAAA,KAAA,SAAA,EAAA;AAED,QAAA,OACI,YAAK,CAAA;AAEG,MAAA;AAMY,IAAA;mBACH,EAAA,YAEA,IAAA,SAAA;;AAqBzB,EAAC,IAAA,CAAA,KAAA,IAAA,KAAA,CAAA,MAAA,GAAA,CAAA,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"ThemeColor.js","sources":["../../../src/components/SettingDrawer/ThemeColor.tsx"],"sourcesContent":[null],"names":[],"mappings":"6PAKc,SAAU,UAAU,CAAC,KAAuB,EAAA;AACtD,EAAA,MAAA;AACA,IAAA,KAAA;AACA,IAAA;IACA,QAAM;IAEN,QAAA;IACA,gBAAM,GAAA;AACF,GAAA,GAAA,KAAA;AACJ,EAAA,MAAE;IAEF;AACI,GAAA,GAAA,aAAW,EAAC;QACf,YAAA,GAAA,QAAA,EAAA,QAAA,IAAA,GAAA;AAED,EAAA,MAAA,UACI,GAAA,QAAK,GAAA;AAEG;AAMY,EAAA,MAAA,oBAAA,GAAA,MAAc;0BACjB,CAAA,QAEA,EAAA,cAAsB,EAAA,gBAAkB,EACrC,YAAA,YACU,EAAA,SAAA,CAAA;;AAmBtC,EAAC,IAAA,CAAA,KAAA,IAAA,KAAA,CAAA,MAAA,GAAA,CAAA,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/components/UpdateSettingsResource/UpdateSettingsResource.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateSettingsResource.server.d.ts","sourceRoot":"","sources":["../../../src/components/UpdateSettingsResource/UpdateSettingsResource.server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAgDrD,eAAO,MAAM,MAAM,GAAU,+BAI1B;IACC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,MAAM,CAAC,EAAE,eAAe,CAAC;CAC5B,oEA8KA,CAAC;AAEF,eAAO,MAAM,MAAM,GAAU,+BAI1B;IACC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,MAAM,CAAC,EAAE,eAAe,CAAC;CAC5B;;GAkEA,CAAC"}
+{"version":3,"file":"UpdateSettingsResource.server.d.ts","sourceRoot":"","sources":["../../../src/components/UpdateSettingsResource/UpdateSettingsResource.server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAgDrD,eAAO,MAAM,MAAM,GAAU,+BAI1B;IACC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,MAAM,CAAC,EAAE,eAAe,CAAC;CAC5B,oEAoLA,CAAC;AAEF,eAAO,MAAM,MAAM,GAAU,+BAI1B;IACC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,MAAM,CAAC,EAAE,eAAe,CAAC;CAC5B;;GAwEA,CAAC"}

package/lib/components/UpdateSettingsResource/UpdateSettingsResource.server.js

@@ -1,6 +1,6 @@
 import { json } from '@remix-run/node';
 import { merge } from 'lodash-es';
-import { assignDefaults, compareAndSaveSettingsDifferences } from '@admin-layout/client';
+import { compareAndSaveSettingsDifferences } from '@admin-layout/client';
 import { fetchPageSettingsWithFetch, settingsCookie, settingsLoaderUtil } from '@admin-layout/client/lib/components/UpdateSettings/UpdateSettings.server';
 import { config } from '../../config/env-config.js';
 import '../../config/analytics-config.js'; /**
@@ -39,8 +39,13 @@ const action = async ({
   params
 }) => {
   try {
+    // Detect device type from User-Agent
+    const userAgent = request.headers.get('User-Agent') || '';
+    const isMobile = /mobile|android|iphone|ipad|ipod/i.test(userAgent);
+    const deviceType = isMobile ? 'mobile' : 'desktop';
+    const overrideIdentifier = `[${deviceType}]`;
     // 1. Fetch default settings from GraphQL (or fallback to local defaults)
-    const result = await fetchPageSettingsWithFetch(request);
+    const result = await fetchPageSettingsWithFetch(request, overrideIdentifier);
     const pageSettings = result?.data?.pageSettings?.settings ? JSON.parse(JSON.stringify(result.data.pageSettings.settings)) : null;
     // Use pageSettings.uilayout only if it has keys, otherwise use parsed LAYOUT_SETTINGS
     const uilayout = pageSettings?.uilayout;
@@ -67,7 +72,7 @@ const action = async ({
       console.log('📥 Step 3 - changedSettings JSON:', JSON.stringify(payload.changedSettings).substring(0, 200));
     }
     // 4. Fill in any missing default keys in the payload (does not overwrite user values)
-    assignDefaults(payload, pageDefaultSettings);
+    // assignDefaults(payload, pageDefaultSettings);
     // 5. Parse existing settings from the cookie (if present)
     const cookieHeader = request.headers.get('Cookie');
     let existingSettings;
@@ -102,7 +107,7 @@ const action = async ({
         console.error('❌ Values:', numericKeysAfterMerge.map(k => `${k}: ${JSON.stringify(mergedSettings[k])}`));
       }
       // 7. Ensure merged settings have all default keys (again, does not overwrite user values)
-      assignDefaults(mergedSettings, pageDefaultSettings);
+      // assignDefaults(mergedSettings, pageDefaultSettings);
       console.log('📥 Step 7 - After assignDefaults - mergedSettings keys:', Object.keys(mergedSettings).slice(0, 15));
     } catch (error) {
       // If cookie parsing fails, fall back to just the payload
@@ -216,8 +221,13 @@ const loader = async ({
     };
   } catch (error) {
     console.error('Error in settings loader:', error);
+    // Detect device type from User-Agent
+    const userAgent = request.headers.get('User-Agent') || '';
+    const isMobile = /mobile|android|iphone|ipad|ipod/i.test(userAgent);
+    const deviceType = isMobile ? 'mobile' : 'desktop';
+    const overrideIdentifier = `[${deviceType}]`;
     // Fall back to default settings
-    const result = await fetchPageSettingsWithFetch(request);
+    const result = await fetchPageSettingsWithFetch(request, overrideIdentifier);
     const pageSettings = result?.data?.pageSettings?.settings ? JSON.parse(JSON.stringify(result.data.pageSettings.settings)) : null;
     // Use pageSettings.uilayout only if it has keys, otherwise use parsed LAYOUT_SETTINGS
     const uilayout = pageSettings?.uilayout;

package/lib/components/UpdateSettingsResource/UpdateSettingsResource.server.js.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateSettingsResource.server.js","sources":["../../../src/components/UpdateSettingsResource/UpdateSettingsResource.server.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"UpdateSettingsResource.server.js","sources":["../../../src/components/UpdateSettingsResource/UpdateSettingsResource.server.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/lib/components/index.js

@@ -1 +1 @@
-export{MainHeader,defaultRenderLogo,defaultRenderLogoAndTitle}from'./Layout/GlobalHeader/MainHeader.js';export{Logo}from'./Layout/GlobalHeader/Logo.js';export{RightMenu}from'./Layout/GlobalHeader/RightMenu.js';//# sourceMappingURL=index.js.map
+export{MainHeader}from'./Layout/GlobalHeader/MainHeader.js';export{RightMenu}from'./Layout/GlobalHeader/RightMenu.js';//# sourceMappingURL=index.js.map

package/lib/components/typings.d.ts

@@ -51,6 +51,8 @@ export interface SidebarProps {
         [key: string]: string;
     };
     settings?: any;
+    sideBarMarginTop?: string;
+    showHeader?: boolean;
     upperMenuDividerName?: string;
     middleMenuDividerName?: string;
     lowerMenuDividerName?: string;
@@ -115,6 +117,7 @@ export type PrivateHeaderProps = {
 export interface MainHeaderProps extends Partial<GlobalHeaderProps> {
     rightContentRender?: WithFalse<(props: any) => React.ReactNode>;
     showSettings?: boolean;
+    showMenu?: boolean;
 }
 export type IRightMenuProps = {
     match?: any;

package/lib/components/typings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typings.d.ts","sourceRoot":"","sources":["../../src/components/typings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"typings.d.ts","sourceRoot":"","sources":["../../src/components/typings.ts"],"names":[],"mappings":"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"}

package/lib/config/env-config.d.ts

@@ -20,5 +20,6 @@ export declare const config: Readonly<{
     GOOGLE_ANALYTICS_ID: string;
     RAPID_API_KEY: string;
     APPLICATION_ID: string;
+    USE_FETCH_SETTINGS: string;
 } & import("envalid").CleanedEnvAccessors>;
 //# sourceMappingURL=env-config.d.ts.map

package/lib/config/env-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env-config.d.ts","sourceRoot":"","sources":["../../src/config/env-config.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;0CA2CjB,CAAC"}
+{"version":3,"file":"env-config.d.ts","sourceRoot":"","sources":["../../src/config/env-config.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;0CA4CjB,CAAC"}

package/lib/config/env-config.js

@@ -85,5 +85,8 @@ const config = cleanEnv(env, {
   APPLICATION_ID: str({
     default: '660e8400-e29b-41d4-a716-446655440001',
     desc: 'Matches the Application ID exist already'
+  }),
+  USE_FETCH_SETTINGS: str({
+    default: ''
   })
 });export{config};//# sourceMappingURL=env-config.js.map

package/lib/config/env-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"env-config.js","sources":["../../src/config/env-config.ts"],"sourcesContent":[null],"names":[],"mappings":"0JAIA,MAAM,GAAG,GAAG,cAAc,EAAE;AAE5B,MAAM,sBAAsB,GAAG,IAAI,CAAC,SAAS,CAAC;KAC1C,EAAG,gBAAE,CAAA,GAAiB;KACtB,EAAG,gBAAE,CAAA,GAAiB;MACtB,EAAI,gBAAE,CAAA,IAAiB;SACvB,EAAO,gBAAE,CAAA;AACZ,CAAA,CAAC;AAEK,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE;AAChC,EAAA,WAAA,EAAW,GAAE,CAAA;AACb,IAAA,OAAA,EAAA,aAAA;AACA,IAAA,IAAA,EAAA;AACA,GAAA,CAAA;AACA,EAAA,gCAA4B,EAAI,IAAE,CAAA;AAClC,IAAA,OAAA,EAAA,KAAc;AACd,IAAA,IAAA,EAAA;IACA;AACA,EAAA,gBAAa,EAAE,GAAI,CAAA;IACnB,OAAA,EAAA;IACA,IAAA,EAAA;AACI,GAAA,CAAA;AACA,EAAA,eAAM,EAAA,GAAA,CAAA;WACR,EAAA,IAAA,CAAA,SAAA,CAAA,eAAA,CAAA;IACF,IAAA,EAAA;AACI,GAAA,CAAA;AACA,EAAA,0BAAM,EAAA,GAAA,CAAA;WACR,EAAA,EAAA;IACF,IAAA,EAAA;;AAEI,EAAA,cAAM,EAAA,GAAA,CAAA;WACR,EAAA,EAAA;IACF,IAAA,EAAA;AACI,GAAA,CAAA;AACA,EAAA,mBAAM,EAAA,GAAA,CAAA;WACR,EAAA,EAAA;IACF,IAAA,EAAA;AACI,GAAA,CAAA;AACA,EAAA,UAAI,EAAE,GAAA,CAAA;WACR,EAAA;IACF;eACA,EAAA,GAAA,CAAA;AACI,IAAA,OAAA,EAAA,SAAS;AACT,IAAA,IAAA,EAAA;;AAEJ,EAAA,mBAAA,EAAA,GAAqB,CAAE;IACvB,OAAA,EAAA;IACA;mCACoB,EAAA,GAAA,CAAA;AAChB,IAAA,OAAA,EAAA,EAAO;AACP,IAAA,IAAA,EAAA;;AAEP,EAAC,kCAAC,EAAA,GAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"env-config.js","sources":["../../src/config/env-config.ts"],"sourcesContent":[null],"names":[],"mappings":"0JAIA,MAAM,GAAG,GAAG,cAAc,EAAE;AAE5B,MAAM,sBAAsB,GAAG,IAAI,CAAC,SAAS,CAAC;KAC1C,EAAG,gBAAE,CAAA,GAAiB;KACtB,EAAG,gBAAE,CAAA,GAAiB;MACtB,EAAI,gBAAE,CAAA,IAAiB;SACvB,EAAO,gBAAE,CAAA;AACZ,CAAA,CAAC;AAEK,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE;AAChC,EAAA,WAAA,EAAW,GAAE,CAAA;AACb,IAAA,OAAA,EAAA,aAAA;AACA,IAAA,IAAA,EAAA;AACA,GAAA,CAAA;AACA,EAAA,gCAA4B,EAAI,IAAE,CAAA;AAClC,IAAA,OAAA,EAAA,KAAc;AACd,IAAA,IAAA,EAAA;IACA;AACA,EAAA,gBAAa,EAAE,GAAI,CAAA;IACnB,OAAA,EAAA;IACA,IAAA,EAAA;AACI,GAAA,CAAA;AACA,EAAA,eAAM,EAAA,GAAA,CAAA;WACR,EAAA,IAAA,CAAA,SAAA,CAAA,eAAA,CAAA;IACF,IAAA,EAAA;AACI,GAAA,CAAA;AACA,EAAA,0BAAM,EAAA,GAAA,CAAA;WACR,EAAA,EAAA;IACF,IAAA,EAAA;;AAEI,EAAA,cAAM,EAAA,GAAA,CAAA;WACR,EAAA,EAAA;IACF,IAAA,EAAA;AACI,GAAA,CAAA;AACA,EAAA,mBAAM,EAAA,GAAA,CAAA;WACR,EAAA,EAAA;IACF,IAAA,EAAA;AACI,GAAA,CAAA;AACA,EAAA,UAAI,EAAE,GAAA,CAAA;WACR,EAAA;IACF;eACA,EAAA,GAAA,CAAA;AACI,IAAA,OAAA,EAAA,SAAS;AACT,IAAA,IAAA,EAAA;;AAEJ,EAAA,mBAAA,EAAA,GAAqB,CAAE;IACvB,OAAA,EAAA;IACA;mCACoB,EAAA,GAAA,CAAA;AAChB,IAAA,OAAA,EAAA,EAAO;AACP,IAAA,IAAA,EAAA;;sCAE6B,GAAI;AACxC,IAAE,OAAA,EAAA,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/machines/settingsMachine.d.ts

@@ -1,5 +1,10 @@
+import { ConfigurationModel } from '@adminide-stack/core';
 import { MachineEvent, SettingsContext } from './types';
-export declare const settingsMachine: import("xstate").StateMachine<SettingsContext, MachineEvent, Record<string, import("xstate").AnyActorRef>, import("xstate").ProvidedActor, import("xstate").ParameterizedObject, import("xstate").ParameterizedObject, string, import("xstate").StateValue, string, {
-    settings: SettingsContext;
+export declare const settingsMachine: import("xstate").StateMachine<SettingsContext & {
+    configModel: ConfigurationModel;
+    deviceType: string;
+}, MachineEvent, Record<string, import("xstate").AnyActorRef>, import("xstate").ProvidedActor, import("xstate").ParameterizedObject, import("xstate").ParameterizedObject, string, import("xstate").StateValue, string, {
+    settings: any;
+    currentRoute?: string;
 }, {}, import("xstate").EventObject, import("xstate").MetaObject, any>;
 //# sourceMappingURL=settingsMachine.d.ts.map

package/lib/machines/settingsMachine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settingsMachine.d.ts","sourceRoot":"","sources":["../../src/machines/settingsMachine.ts"],"names":[],"mappings":"AAEA,OAAO,EAGH,YAAY,EAIZ,eAAe,EAElB,MAAM,SAAS,CAAC;AA4HjB,eAAO,MAAM,eAAe;cAMN,eAAe;sEA2MnC,CAAC"}
+{"version":3,"file":"settingsMachine.d.ts","sourceRoot":"","sources":["../../src/machines/settingsMachine.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAExD,eAAO,MAAM,eAAe;iBAIH,kBAAkB;gBACnB,MAAM;;cAIR,GAAG;mBACE,MAAM;sEAgQ/B,CAAC"}

package/lib/machines/settingsMachine.js

@@ -1,162 +1,163 @@
-import {cloneDeep,set}from'lodash-es';import {createMachine,assign}from'xstate';import {SearchBarBehavior}from'./types.js';import {setNestedValue}from'../utils/configOverrides.js';({
-  searchBarBehavior: SearchBarBehavior.PERMANENT});
-// Helper function to merge global settings with uiSettings overrides
-const createMergedSettings = (context, currentRoute, deviceType) => {
-  const merged = {
-    ...context
-  };
-  // Apply uiSettings overrides to the merged settings
-  if (context.uiSettings?.overrides) {
-    // Always merge global device overrides: [deviceType]
-    const deviceKey = `[${deviceType}]`;
-    const deviceOverride = context.uiSettings.overrides[deviceKey];
-    if (deviceOverride?.uilayout) {
-      // Merge global device-specific uilayout overrides (always applied)
-      Object.keys(deviceOverride.uilayout).forEach(key => {
-        merged[key] = deviceOverride.uilayout[key];
-      });
-    }
-    // Additionally merge route-specific overrides if they exist: [route][deviceType]
-    const routeDeviceKey = `[${currentRoute}][${deviceType}]`;
-    const routeDeviceOverride = context.uiSettings.overrides[routeDeviceKey];
-    if (routeDeviceOverride?.uilayout) {
-      // Merge route-specific uilayout overrides (overrides global device settings)
-      Object.keys(routeDeviceOverride.uilayout).forEach(key => {
-        merged[key] = routeDeviceOverride.uilayout[key];
-      });
-    }
-  }
-  return merged;
-};
-const settingsMachine = createMachine({
+import {cloneDeep,set}from'lodash-es';import {createMachine,assign}from'xstate';import {ConfigurationModel}from'@adminide-stack/core';const settingsMachine = createMachine({
   id: 'settings',
   types: {},
   initial: 'idle',
   context: ({
     input
   }) => {
-    // Use input settings with machine-specific defaults
-    // Input settings should contain all required fields from Redux/environment
-    // Separate regular settings from bracket pattern overrides
-    const {
-      uiSettings,
-      overrides,
-      ...otherSettings
-    } = input?.settings || {};
-    // Extract bracket pattern overrides from uiSettings.overrides (server structure)
-    const bracketOverrides = {};
-    if (input?.settings?.uiSettings?.overrides) {
-      Object.keys(input.settings.uiSettings.overrides).forEach(key => {
-        if (key.startsWith('[') && key.endsWith(']')) {
-          bracketOverrides[key] = input.settings.uiSettings.overrides[key];
-        }
-      });
-    }
-    // Also check top-level for backward compatibility
-    Object.keys(input?.settings || {}).forEach(key => {
+    // Input settings are now flat: { logo: '...', theme: '...', [/route][device]: {...}, ... }
+    const rawSettings = input?.settings || {};
+    console.log('🔍 Context Init - Raw settings:', {
+      hasRawSettings: !!rawSettings,
+      rawSettingsKeys: rawSettings ? Object.keys(rawSettings).slice(0, 15) : []
+    });
+    // Settings are flat - no uilayout wrapper to handle
+    // Just separate base settings from bracket overrides
+    const cleanedSettings = rawSettings;
+    console.log('🔍 Context Init - Settings keys:', {
+      totalKeys: Object.keys(cleanedSettings).length,
+      bracketKeys: Object.keys(cleanedSettings).filter(k => k.startsWith('[') && k.endsWith(']'))
+    });
+    // Transform loader data into ConfigurationModel format
+    // Separate base settings from bracket overrides
+    const baseContents = {};
+    const overrides = [];
+    Object.keys(cleanedSettings).forEach(key => {
       if (key.startsWith('[') && key.endsWith(']')) {
-        bracketOverrides[key] = input.settings[key];
+        // This is a bracket override: [device] or [/route][device]
+        const overrideData = cleanedSettings[key];
+        overrides.push({
+          identifiers: [key],
+          contents: overrideData,
+          keys: Object.keys(overrideData)
+        });
+      } else {
+        // Base settings (flat, no wrapper)
+        baseContents[key] = cleanedSettings[key];
       }
     });
-    const baseContext = {
-      ...otherSettings,
-      uiSettings: {
-        ...uiSettings,
-        overrides: bracketOverrides
-      },
-      // Only override/add machine-specific fields
-      components: input?.settings?.components || [],
-      activeComponent: input?.settings?.activeComponent || null,
-      currentRoute: input?.settings?.currentRoute || '/',
-      hiddenMenuKeys: input?.settings?.hiddenMenuKeys || [],
-      hiddenMenuCategories: input?.settings?.hiddenMenuCategories || [],
+    console.log('🔍 ConfigurationModel input:', {
+      baseKeys: Object.keys(baseContents),
+      overridesCount: overrides.length,
+      overrideIdentifiers: overrides.map(o => o.identifiers[0])
+    });
+    // ConfigurationModel handles ALL bracket patterns automatically
+    const configModel = new ConfigurationModel(baseContents, [], overrides);
+    // Get current route from input (passed from component) or default to '/'
+    const currentRoute = input?.currentRoute || '/';
+    const deviceType = 'desktop'; // Default, will be updated by component
+    // Build override keys with fallback logic
+    const routeDeviceKey = `[${currentRoute}][${deviceType}]`;
+    const deviceKey = `[${deviceType}]`;
+    // Apply overrides by chaining: base -> global -> route-specific
+    // First apply global override to base
+    const globalOverride = configModel.override(deviceKey);
+    // Then apply route-specific override on top of global
+    const routeOverride = globalOverride.override(routeDeviceKey);
+    // Extract final merged settings (already flat, no uilayout wrapper)
+    const mergedContents = routeOverride?.contents;
+    const effectiveSettings = mergedContents;
+    // Context = flat settings + machine internal state
+    // Note: configModel is kept for machine operations but filtered out before sending to Redux
+    const contextToReturn = {
+      // Apply merged settings first
+      ...effectiveSettings,
+      // Then set defaults for anything that's missing (won't override existing values)
+      navTheme: effectiveSettings.navTheme || 'light',
+      // Machine internal state (not sent to Redux)
+      configModel,
+      deviceType,
+      currentRoute,
       changedSettings: {}
     };
-    // Add merged settings for immediate UI updates
-    const currentRoute = baseContext.currentRoute;
-    const deviceType = 'desktop'; // Default, will be updated by component
-    baseContext.mergedSettings = createMergedSettings(baseContext, currentRoute, deviceType);
-    return baseContext;
+    console.log('🔍 Context Init - Final context:', contextToReturn);
+    return contextToReturn;
   },
   states: {
     idle: {
+      entry: ['updateReduxSettings'],
       on: {
-        UPDATE: {
+        UISETTING_UPDATE: {
           actions: [assign(({
             context,
             event
           }) => {
             if (!event.value) return context;
+            console.log('🔧 Machine UPDATE event:', event);
             const newContext = cloneDeep({
               ...context
             });
-            // Track only the changed settings
+            const changedSettings = {
+              ...newContext.changedSettings
+            };
+            // Process each changed setting
             Object.keys(event.value).forEach(key => {
-              const oldValue = context[key];
               const newValue = event.value[key];
-              // Check if this is an override identifier key (starts with [)
+              console.log('🔧 Processing key:', key, 'value:', newValue);
+              // Use ConfigurationModel's setValue to update settings
+              newContext.configModel.setValue(key, newValue);
+              // Track in changedSettings
+              changedSettings[key] = newValue;
+              // If it's a bracket key, check if it applies to current context
               if (key.startsWith('[')) {
-                // This is an override key like:
-                // Old format: "[/dashboard.mobile].uilayout.regions.header.showLogo"
-                // New format: "[/dashboard][mobile].uilayout.regions.header.showLogo"
-                // Extract all bracket patterns and the remaining path
                 const bracketPattern = key.match(/^(\[[^\]]+\])+/);
                 if (bracketPattern) {
-                  const identifier = bracketPattern[0]; // "[/dashboard][mobile]" or "[/dashboard.mobile]"
-                  const remainingKey = key.substring(identifier.length);
-                  // Remove leading dot if present
-                  const path = remainingKey.startsWith('.') ? remainingKey.substring(1) : remainingKey;
-                  // Initialize overrides if not exists
-                  if (!newContext.uiSettings) {
-                    newContext.uiSettings = {
-                      uilayout: {},
-                      overrides: {}
-                    };
-                  }
-                  if (!newContext.uiSettings.overrides) {
-                    newContext.uiSettings.overrides = {};
+                  const identifier = bracketPattern[0];
+                  const currentIdentifier = `[${newContext.currentRoute}][${newContext.deviceType}]`;
+                  const deviceOnlyIdentifier = `[${newContext.deviceType}]`;
+                  // If this override applies to current route/device, update context immediately
+                  if (identifier === currentIdentifier || identifier === deviceOnlyIdentifier) {
+                    const remainingKey = key.substring(identifier.length);
+                    const path = remainingKey.startsWith('.') ? remainingKey.substring(1) : remainingKey;
+                    set(newContext, path, newValue);
                   }
-                  // Initialize this override identifier if not exists
-                  if (!newContext.uiSettings.overrides[identifier]) {
-                    newContext.uiSettings.overrides[identifier] = {};
-                  }
-                  // Set the nested value in the override
-                  newContext.uiSettings.overrides[identifier] = setNestedValue(newContext.uiSettings.overrides[identifier], path, newValue);
-                  // Track in changedSettings with the full key
-                  set(newContext.changedSettings, key, newValue);
                 }
               } else {
-                // Regular top-level setting
+                // Regular setting - update context directly
                 set(newContext, key, newValue);
-                // Track changes in changedSettings
-                if (JSON.stringify(oldValue) !== JSON.stringify(newValue)) {
-                  set(newContext.changedSettings, key, newValue);
-                }
               }
             });
-            // Update merged settings after changes
-            newContext.mergedSettings = createMergedSettings(newContext, newContext.currentRoute, 'desktop');
+            newContext.changedSettings = changedSettings;
             return newContext;
           }), 'updateReduxSettings']
         },
-        ROUTE_CHANGE: {
+        UISETTING_ROUTE_CHANGE: {
           actions: [assign(({
             context,
             event
           }) => {
-            const newContext = cloneDeep({
+            cloneDeep({
               ...context
             });
             const routePath = event.pathname || '/';
-            // Update current route
-            newContext.currentRoute = routePath;
-            // Update merged settings with new route context
-            // This ensures only global [device] settings persist, route-specific [route][device] settings only apply on that route
-            newContext.mergedSettings = createMergedSettings(newContext, routePath, 'desktop');
-            return newContext;
+            console.log('🔧 ROUTE_CHANGE to:', routePath);
+            // Build override keys
+            const routeDeviceKey = `[${routePath}][${context.deviceType}]`;
+            const deviceKey = `[${context.deviceType}]`;
+            // Apply overrides by chaining: base -> global -> route-specific
+            // First apply global override to base
+            const globalOverride = context.configModel.override(deviceKey);
+            // Then apply route-specific override on top of global
+            const routeOverride = globalOverride.override(routeDeviceKey);
+            // Extract final merged settings (already flat, no uilayout wrapper)
+            const mergedContents = routeOverride?.contents || context.configModel.contents;
+            const effectiveSettings = mergedContents;
+            // Build NEW context from scratch with only the merged settings
+            // This ensures no old route-specific settings leak through
+            return {
+              // Apply merged settings first
+              ...effectiveSettings,
+              // Then set defaults for anything that's missing (won't override existing values)
+              navTheme: effectiveSettings.navTheme || 'light',
+              // Keep machine internal state
+              configModel: context.configModel,
+              deviceType: context.deviceType,
+              currentRoute: routePath,
+              changedSettings: context.changedSettings
+            };
           }), 'updateReduxSettings']
         },
-        UPDATE_ROUTE_SETTINGS: {
+        UISETTING_UPDATE_ROUTE_SETTINGS: {
           actions: [assign(({
             context,
             event
@@ -165,7 +166,7 @@ const settingsMachine = createMachine({
             // Route settings are now handled via uiSettings overrides
           })), 'updateReduxSettings']
         },
-        RESET: {
+        UISETTING_RESET: {
           actions: [assign(({
             context
           }) => ({
@@ -177,7 +178,7 @@ const settingsMachine = createMachine({
             changedSettings: {}
           })), 'updateReduxSettings']
         },
-        RESET_CHANGED_SETTINGS: {
+        UISETTING_RESET_CHANGED_SETTINGS: {
           actions: [assign(({
             context
           }) => ({
@@ -185,18 +186,36 @@ const settingsMachine = createMachine({
             changedSettings: {}
           }))]
         },
-        UPDATE_DEVICE_TYPE: {
+        UISETTING_UPDATE_DEVICE_TYPE: {
           actions: [assign(({
             context,
             event
           }) => {
-            const newContext = cloneDeep({
-              ...context
-            });
             const deviceType = event.deviceType || 'desktop';
-            // Update merged settings with new device type
-            newContext.mergedSettings = createMergedSettings(newContext, newContext.currentRoute, deviceType);
-            return newContext;
+            console.log('🔧 UPDATE_DEVICE_TYPE to:', deviceType);
+            // Build override keys
+            const routeDeviceKey = `[${context.currentRoute}][${deviceType}]`;
+            const deviceKey = `[${deviceType}]`;
+            // Apply overrides by chaining: base -> global -> route-specific
+            // First apply global override to base
+            const globalOverride = context.configModel.override(deviceKey);
+            // Then apply route-specific override on top of global
+            const routeOverride = globalOverride.override(routeDeviceKey);
+            // Extract final merged settings (already flat, no uilayout wrapper)
+            const mergedContents = routeOverride?.contents || context.configModel.contents;
+            const effectiveSettings = mergedContents;
+            // Replace context with flat settings + machine internal state
+            return {
+              // Apply merged settings first
+              ...effectiveSettings,
+              // Then set defaults for anything that's missing (won't override existing values)
+              navTheme: effectiveSettings.navTheme || 'light',
+              // Keep machine internal state
+              configModel: context.configModel,
+              deviceType: deviceType,
+              currentRoute: context.currentRoute,
+              changedSettings: context.changedSettings
+            };
           }), 'updateReduxSettings']
         }
         // SAVE: {