@admin-layout/client 12.0.16-alpha.44 → 12.0.16-alpha.46

package/lib/colors/presets/black.js

@@ -4,8 +4,5 @@ const black = {
     base300: '#2b2f3b',
     base400: '#181a21',
     base: '#20232c',
-    base600: '#000',
-    base700: '#FFF',
-    base800: '#000',
     base900: '#FFF'
 };export{black};//# sourceMappingURL=black.js.map

package/lib/colors/presets/black.js.map

@@ -1 +1 @@
-{"version":3,"file":"black.js","sources":["../../../src/colors/presets/black.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAS,MAAA,KAAO,GAAA;AAEhB,IAAA,OAAA,EAAA,MAAO;;;;;;;;;"}
+{"version":3,"file":"black.js","sources":["../../../src/colors/presets/black.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAS,MAAA,KAAO,GAAA;AAEhB,IAAA,OAAA,EAAA,MAAO;;;;;;"}

package/lib/colors/presets/white.js

@@ -4,8 +4,5 @@ const white = {
     base300: '#C3C3C3',
     base400: '#F7F7F7', // #F2F2F2
     base: '#FFF',
-    base600: '#000',
-    base700: '#FFF',
-    base800: '#FFF',
     base900: '#000'
 };export{white};//# sourceMappingURL=white.js.map

package/lib/colors/presets/white.js.map

@@ -1 +1 @@
-{"version":3,"file":"white.js","sources":["../../../src/colors/presets/white.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAS,MAAA,KAAO,GAAA;AAEhB,IAAA,OAAA,EAAA,MAAO;;;;;;;;;"}
+{"version":3,"file":"white.js","sources":["../../../src/colors/presets/white.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAS,MAAA,KAAO,GAAA;AAEhB,IAAA,OAAA,EAAA,MAAO;;;;;;"}

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

@@ -1 +1 @@
-{"version":3,"file":"LayoutCookieProvider.d.ts","sourceRoot":"","sources":["../../src/components/LayoutCookieProvider.tsx"],"names":[],"mappings":"AACA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAIlE,UAAU,yBAAyB;IAC/B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC7B;AAED,wBAAgB,oBAAoB,CAAC,EAAE,QAAQ,EAAE,EAAE,yBAAyB,GAAG,KAAK,CAAC,YAAY,CAsChG"}
+{"version":3,"file":"LayoutCookieProvider.d.ts","sourceRoot":"","sources":["../../src/components/LayoutCookieProvider.tsx"],"names":[],"mappings":"AACA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAIlE,UAAU,yBAAyB;IAC/B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC7B;AAED,wBAAgB,oBAAoB,CAAC,EAAE,QAAQ,EAAE,EAAE,yBAAyB,GAAG,KAAK,CAAC,YAAY,CA2BhG"}

package/lib/components/LayoutCookieProvider.js

@@ -3,19 +3,9 @@ import {jsx,Fragment}from'react/jsx-runtime';import {useRouteLoaderData}from'@re
     const settings = routeData?.settings?.settings || routeData?.settings;
     const dispatch = useDispatch();
     const hasDispatched = useRef(false);
-    // Debug logging
-    if (typeof window !== 'undefined') {
-        console.log('🎨 LayoutCookieProvider - Client Side:', {
-            hasRouteData: !!routeData,
-            hasSettings: !!settings,
-            settingsKeys: settings ? Object.keys(settings).slice(0, 10) : 'null',
-            settingsData: settings, // Full settings object
-        });
-    }
     // Handle both server and client side
     useEffect(() => {
         if (settings && !hasDispatched.current) {
-            console.log('🎨 LayoutCookieProvider - Dispatching settings to Redux');
             dispatch({
                 type: CHANGE_SETTINGS_ACTION,
                 payload: settings,

package/lib/components/LayoutCookieProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"LayoutCookieProvider.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"LayoutCookieProvider.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/components/UpdateSettings/UpdateSettings.server.d.ts

@@ -1,20 +1,13 @@
-import { IAppLoadContext } from '@common-stack/client-core';
-import { IResourceParams } from '@common-stack/core';
-import { IGetPageSettingsQuery } from 'common';
-import type { ApolloClient } from '@apollo/client';
-import { ProSettings } from '../../interfaces';
 export declare const settingsCookie: import("@remix-run/server-runtime").Cookie;
-export declare function fetchPageSettings(apolloClient: ApolloClient<any>): Promise<import("@apollo/client").InteropApolloQueryResult<IGetPageSettingsQuery>>;
-export declare function fetchPageSettingsWithFetch(request: Request, graphqlUrl?: string): Promise<{
+export declare function fetchPageSettingsWithFetch(request: Request, overrideIdentifier?: string): Promise<{
     data: any;
 }>;
-export declare function settingsLoaderUtil({ request, context, params, useFetch, }: {
-    request: Request;
-    context?: IAppLoadContext;
-    params?: IResourceParams;
-    useFetch?: boolean;
+export declare function settingsLoaderUtil({ request, context, params }: {
+    request: any;
+    context: any;
+    params: any;
 }): Promise<{
-    settings: ProSettings;
+    settings: any;
     setCookie: string;
 }>;
 //# sourceMappingURL=UpdateSettings.server.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"UpdateSettings.server.d.ts","sourceRoot":"","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAKH,qBAAqB,EAExB,MAAM,QAAQ,CAAC;AAGhB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAGnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAK/C,eAAO,MAAM,cAAc,4CAMzB,CAAC;AAGH,wBAAsB,iBAAiB,CAAC,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,qFAyBtE;AAGD,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM;;GAqErF;AAED,wBAAsB,kBAAkB,CAAC,EACrC,OAAO,EACP,OAAO,EACP,MAAM,EACN,QAAe,GAClB,EAAE;IACC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB,GAAG,OAAO,CAAC;IACR,QAAQ,EAAE,WAAW,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC,CA6FD"}
+{"version":3,"file":"UpdateSettings.server.d.ts","sourceRoot":"","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,cAAc,4CAMzB,CAAC;AAGH,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,kBAAkB,CAAC,EAAE,MAAM;;GAmF7F;AAED,wBAAsB,kBAAkB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE;;;;CAAA;;;GA0IpE"}

package/lib/components/UpdateSettings/UpdateSettings.server.js

@@ -5,48 +5,41 @@ import {createCookie}from'@remix-run/node';import {ConfigCollectionName,ConfigFr
     path: '/', // Ensure cookie is available for all paths
     domain: config.isProd ? config.APP_DOMAIN : undefined,
 });
-// Helper to fetch page settings from Apollo
-async function fetchPageSettings(apolloClient) {
-    const resource = generateCdecodeUri(DEFAULT_TENANT_ID, {
-        resourceType: ConfigCollectionName.Applications,
-        resourceId: config.APPLICATION_ID,
-        idField: 'appId',
-    }, {}, ConfigFragmentName.UiSettings);
-    const result = await apolloClient.query({
-        query: GetPageSettingsDocument,
-        variables: {
-            resourceUri: resource,
-            options: {
-                schemaId: ConfigurationSchemaId.UiLayout,
-                target: 2 /* ConfigurationTarget.APPLICATION */,
-            },
-        },
-        fetchPolicy: 'no-cache', // Bypass cache completely - always fetch fresh from server
-    });
-    return result;
-}
 // Alternative: Direct fetch-based implementation (for testing/comparison)
-async function fetchPageSettingsWithFetch(request, graphqlUrl) {
+async function fetchPageSettingsWithFetch(request, overrideIdentifier) {
     const resource = generateCdecodeUri(DEFAULT_TENANT_ID, {
         resourceType: ConfigCollectionName.Applications,
         resourceId: config.APPLICATION_ID,
         idField: 'appId',
     }, {}, ConfigFragmentName.UiSettings);
-    const url = graphqlUrl || process.env.GRAPHQL_URL || 'http://localhost:8080/graphql';
+    const url = process.env.GRAPHQL_URL || 'http://localhost:8080/graphql';
     // Convert GraphQL DocumentNode to string
     const query = print(GetPageSettingsDocument);
+    // Prepare options with optional overrides
+    const options = {
+        schemaId: ConfigurationSchemaId.UiLayout,
+        target: 2 /* ConfigurationTarget.APPLICATION */,
+    };
+    // Add overrides if provided
+    if (overrideIdentifier) {
+        options.overrides = {
+            overrideIdentifier,
+        };
+    }
+    // Add timestamp to force cache invalidation
     const variables = {
         resourceUri: resource,
-        options: {
-            schemaId: ConfigurationSchemaId.UiLayout,
-            target: 2 /* ConfigurationTarget.APPLICATION */,
-        },
+        options,
+        _timestamp: Date.now(), // Force cache bust
     };
     console.log('🔍 Fetching settings with direct fetch to:', url);
     console.log('🔍 Query variables:', JSON.stringify(variables, null, 2));
     // Forward cookies from the incoming request
     const headers = {
         'Content-Type': 'application/json',
+        'Cache-Control': 'no-cache, no-store, must-revalidate',
+        Pragma: 'no-cache',
+        Expires: '0',
     };
     const cookieHeader = request.headers.get('Cookie');
     if (cookieHeader) {
@@ -82,27 +75,60 @@ async function fetchPageSettingsWithFetch(request, graphqlUrl) {
         throw error;
     }
 }
-async function settingsLoaderUtil({ request, context, params, useFetch = true, // Set to true to test fetch-based approach
- }) {
+async function settingsLoaderUtil({ request, context, params }) {
     const cookieHeader = request.headers.get('Cookie');
-    const { apolloClient } = context;
+    // Detect device type from User-Agent (simplified detection)
+    const userAgent = request.headers.get('User-Agent') || '';
+    const isMobile = /mobile|android|iphone|ipad|ipod/i.test(userAgent);
+    const deviceType = isMobile ? 'mobile' : 'desktop';
+    // Fetch ALL settings for this device upfront (includes all route overrides)
+    // Pass device-level override to get all route-specific overrides for this device
+    const overrideIdentifier = `[${deviceType}]`;
+    // Fetch settings with device override - this will include ALL route overrides for this device
     // Fetch settings from backend - choose method based on flag
-    let result;
-    if (useFetch) {
-        console.log('📡 Using direct fetch to get settings');
-        result = await fetchPageSettingsWithFetch(request);
-    }
-    else {
-        console.log('🚀 Using Apollo Client to get settings');
-        result = await fetchPageSettings(apolloClient);
-    }
+    console.log('📡 Using direct fetch to get settings');
+    const result = await fetchPageSettingsWithFetch(request, overrideIdentifier);
+    console.log('RESULT=========>', JSON.stringify(result));
     const pageSettings = result?.data?.pageSettings?.settings
         ? JSON.parse(JSON.stringify(result?.data?.pageSettings?.settings))
         : null;
-    // Extract uilayout settings if available
+    // pageSettings now contains:
+    // {
+    //   uilayout: { base config },
+    //   [/dashboard][mobile]: { overrides for /dashboard on mobile },
+    //   [/profile][mobile]: { overrides for /profile on mobile },
+    //   ... etc
+    // }
+    // Extract uilayout settings and preserve all other settings
     const uilayout = pageSettings?.uilayout;
     const hasUilayoutData = uilayout && typeof uilayout === 'object' && Object.keys(uilayout).length > 0;
+    // Extract bracket pattern overrides (keys that start with [)
+    const bracketOverrides = {};
+    // Extract other top-level settings (like organization, etc.)
+    const otherSettings = {};
+    Object.keys(pageSettings || {}).forEach((key) => {
+        if (key.startsWith('[') && key.endsWith(']')) {
+            bracketOverrides[key] = pageSettings[key];
+        }
+        else if (key !== 'uilayout') {
+            // Preserve other top-level settings like organization
+            otherSettings[key] = pageSettings[key];
+        }
+    });
     let pageDefaultSettings = hasUilayoutData ? uilayout : pageSettings || {};
+    console.log('🔍 DEBUG - bracketOverrides:', JSON.stringify(bracketOverrides, null, 2));
+    console.log('🔍 DEBUG - otherSettings:', JSON.stringify(otherSettings, null, 2));
+    // Structure the settings properly for the frontend
+    // The frontend expects uiSettings.overrides to contain the bracket pattern overrides
+    pageDefaultSettings = {
+        ...pageDefaultSettings,
+        ...otherSettings, // Add other top-level settings like organization
+        uiSettings: {
+            ...pageDefaultSettings.uiSettings,
+            overrides: bracketOverrides, // Put bracket overrides in uiSettings.overrides
+        },
+    };
+    console.log('🔍 DEBUG - final pageDefaultSettings:', JSON.stringify(pageDefaultSettings, null, 2));
     // Add required keys that might not be in backend
     pageDefaultSettings = {
         ...pageDefaultSettings,
@@ -159,5 +185,6 @@ async function settingsLoaderUtil({ request, context, params, useFetch = true, /
     });
     // Refresh the cookie to keep it active
     const cookie = await settingsCookie.serialize(settings);
+    console.log('FULL_SETTINGS', fullSettings);
     return { settings: fullSettings, setCookie: cookie };
-}export{fetchPageSettings,fetchPageSettingsWithFetch,settingsCookie,settingsLoaderUtil};//# sourceMappingURL=UpdateSettings.server.js.map
+}export{fetchPageSettingsWithFetch,settingsCookie,settingsLoaderUtil};//# sourceMappingURL=UpdateSettings.server.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"UpdateSettings.server.js","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"sourcesContent":[null],"names":[],"mappings":"mkBA+HC,MAAA,cAAA,GAAA,YAAA,CAAA,UAAA,EAAA;AAED,IAAA,MAAA,EAAA,EAAA,GAAA,EAAA,GAAA,EAAsB,GAAA,EAAA;IAMlB,QAAO;IACP,QAAQ,EAAE,KAAA;IACV,IAAA,EAAM,GAAG;IACT,MAAA,EAAQ,MAAG,CAAA,MAAQ,GAAA,MAAA,CAAA,UAAA,GAAA,SAAA;AACtB,CAAA;;AAEG,eAAkB,iBAAA,CAAA,YAAA,EAAA;AACrB,IA6FA,MAAA,QAAA,GAAA,kBAAA,CAAA,iBAAA,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"UpdateSettings.server.js","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAkPC,IAAA,QAAA,EAAA,KAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/utils/settingsDifference.d.ts

@@ -1,5 +1,6 @@
 /**
  * Compares settings objects and saves only the differences
+ * @returns An object containing only the differences, or an empty object on error
  */
 export declare const compareAndSaveSettingsDifferences: (currentSettings: any, defaultSettings: any) => any;
 //# sourceMappingURL=settingsDifference.d.ts.map

package/lib/utils/settingsDifference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settingsDifference.d.ts","sourceRoot":"","sources":["../../src/utils/settingsDifference.ts"],"names":[],"mappings":"AAuKA;;GAEG;AACH,eAAO,MAAM,iCAAiC,GAAI,iBAAiB,GAAG,EAAE,iBAAiB,GAAG,QAoD3F,CAAC"}
+{"version":3,"file":"settingsDifference.d.ts","sourceRoot":"","sources":["../../src/utils/settingsDifference.ts"],"names":[],"mappings":"AAkLA;;;GAGG;AACH,eAAO,MAAM,iCAAiC,GAAI,iBAAiB,GAAG,EAAE,iBAAiB,GAAG,QAqD3F,CAAC"}

package/lib/utils/settingsDifference.js

@@ -16,17 +16,26 @@ const getDifference = (obj1, obj2) => {
         return source;
     }
     // Handle non-object comparisons (primitives, functions, etc.)
-    if (!isObject(source) || !isObject(target)) {
-        // Case-insensitive string comparison
+    // IMPORTANT: Check for string BEFORE isObject check, because strings are technically objects
+    if (typeof source === 'string' || typeof target === 'string') {
         if (typeof source === 'string' && typeof target === 'string') {
+            // Case-insensitive string comparison
             return source.toLowerCase() !== target.toLowerCase() ? source : undefined;
         }
+        // If types differ, return the source value
+        return source;
+    }
+    if (!isObject(source) || !isObject(target)) {
         return !isEqual(source, target) ? source : undefined;
     }
     // For arrays, do a simple equality check and return the full array if different
     if (Array.isArray(source) && Array.isArray(target)) {
         return !isEqual(source, target) ? source : undefined;
     }
+    // Prevent string from being treated as an object with numeric keys
+    if (Array.isArray(source) !== Array.isArray(target)) {
+        return source;
+    }
     // For objects, do deep comparison
     const result = transform(source, (result, value, key) => {
         // Skip keys that are in source but have the exact same value in target
@@ -134,12 +143,13 @@ const getRouteSettingsDifferences = (currentRouteSettings, defaultRouteSettings)
 };
 /**
  * Compares settings objects and saves only the differences
+ * @returns An object containing only the differences, or an empty object on error
  */
 const compareAndSaveSettingsDifferences = (currentSettings, defaultSettings) => {
     try {
         if (!currentSettings || !defaultSettings) {
             console.warn('Missing settings objects for comparison');
-            return null;
+            return {};
         }
         // Make deep clones to avoid modifying the original objects
         const current = cloneDeep(currentSettings);
@@ -176,7 +186,8 @@ const compareAndSaveSettingsDifferences = (currentSettings, defaultSettings) =>
     }
     catch (error) {
         console.error('Error comparing settings differences:', error);
-        return null;
+        // Return empty object instead of null to avoid downstream errors
+        return {};
     }
 };
 /**

package/lib/utils/settingsDifference.js.map

@@ -1 +1 @@
-{"version":3,"file":"settingsDifference.js","sources":["../../src/utils/settingsDifference.ts"],"sourcesContent":[null],"names":[],"mappings":";AAyKG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"settingsDifference.js","sources":["../../src/utils/settingsDifference.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAqLG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@admin-layout/client",
-    "version": "12.0.16-alpha.44",
+    "version": "12.0.16-alpha.46",
     "description": "Sample client for higher packages to depend on",
     "license": "ISC",
     "author": "CDMBase LLC",
@@ -44,5 +44,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "81709761b697730903123a9d1d79d2d907a3edc5"
+    "gitHead": "ce30e2742a315175f9ec774fe3422976b5d7110f"
 }