@admin-layout/client 12.0.16-alpha.45 → 12.0.16-alpha.48

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

@@ -1,16 +1,13 @@
-import { IAppLoadContext } from '@common-stack/client-core';
-import { IResourceParams } from '@common-stack/core';
-import { ProSettings } from '../../interfaces';
 export declare const settingsCookie: import("@remix-run/server-runtime").Cookie;
-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, }: {
-    request: Request;
-    context?: IAppLoadContext;
-    params?: IResourceParams;
+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;AAcrD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAK/C,eAAO,MAAM,cAAc,4CAMzB,CAAC;AAGH,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM;;GAqErF;AAED,wBAAsB,kBAAkB,CAAC,EACrC,OAAO,EACP,OAAO,EACP,MAAM,GACT,EAAE;IACC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,MAAM,CAAC,EAAE,eAAe,CAAC;CAC5B,GAAG,OAAO,CAAC;IACR,QAAQ,EAAE,WAAW,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC,CAsFD"}
+{"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,28 +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,
 });
-// Direct fetch-based implementation for fetching page settings
-async function fetchPageSettingsWithFetch(request, graphqlUrl) {
+// Alternative: Direct fetch-based implementation (for testing/comparison)
+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) {
@@ -62,18 +75,60 @@ async function fetchPageSettingsWithFetch(request, graphqlUrl) {
         throw error;
     }
 }
-async function settingsLoaderUtil({ request, context, params, }) {
+async function settingsLoaderUtil({ request, context, params }) {
     const cookieHeader = request.headers.get('Cookie');
-    // Fetch settings from backend using direct fetch
+    // 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
     console.log('📡 Using direct fetch to get settings');
-    const result = await fetchPageSettingsWithFetch(request);
+    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,
@@ -130,5 +185,6 @@ async function settingsLoaderUtil({ request, context, params, }) {
     });
     // Refresh the cookie to keep it active
     const cookie = await settingsCookie.serialize(settings);
+    console.log('FULL_SETTINGS', fullSettings);
     return { settings: fullSettings, setCookie: cookie };
 }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":"mkBA0GY,MAAA,cAAE,GAAgB,YAAA,CAAA,UAAA,EAAA;IAC1B,MAAM,EAAC,EAAE,GAAA,EAAA,GAAA,EAAA,GAAA,EAAgB;AAC5B,IAAG,QAAQ,EAAA,KAAA;IACR,QAAQ,EAAE;IACV,IAAA,EAAA,GAAS;AACZ,IAsFA,MAAA,EAAA,MAAA,CAAA,MAAA,GAAA,MAAA,CAAA,UAAA,GAAA,SAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"UpdateSettings.server.js","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAkPC,IAAA,QAAA,EAAA,KAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@admin-layout/client",
-    "version": "12.0.16-alpha.45",
+    "version": "12.0.16-alpha.48",
     "description": "Sample client for higher packages to depend on",
     "license": "ISC",
     "author": "CDMBase LLC",
@@ -26,7 +26,7 @@
         "serialize-error": "^8.0.0"
     },
     "devDependencies": {
-        "common": "12.0.16-alpha.44",
+        "common": "12.0.16-alpha.48",
         "rc-menu": "^9.16.1"
     },
     "peerDependencies": {
@@ -44,5 +44,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "3a607a791be415119ea17a70367ba32204068214"
+    "gitHead": "e1eb77f644f9d2f9d8c9d0e0867f86440c6ad921"
 }