@admin-layout/client 12.0.16-alpha.56 → 12.0.16-alpha.59

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":"AAgBA,eAAO,MAAM,cAAc,4CAMzB,CAAC;AAGH,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,kBAAkB,CAAC,EAAE,MAAM;;GAoF7F;AAED,wBAAsB,kBAAkB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE;;;;CAAA;;;GAqIpE"}
+{"version":3,"file":"UpdateSettings.server.d.ts","sourceRoot":"","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,cAAc,4CAMzB,CAAC;AAIH,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,kBAAkB,CAAC,EAAE,MAAM;;GAqF7F;AAED,wBAAsB,kBAAkB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE;;;;CAAA;;;GAqGpE"}

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

@@ -5,8 +5,10 @@ import {createCookie}from'@remix-run/node';import {ConfigCollectionName,ConfigFr
     path: '/', // Ensure cookie is available for all paths
     domain: config.isProd ? config.APP_DOMAIN : undefined,
 });
-// Alternative: Direct fetch-based implementation (for testing/comparison)
+// Direct fetch-based implementation for fetching settings from GraphQL
+// Note: GraphQL backend already has Redis caching, so no need for additional caching here
 async function fetchPageSettingsWithFetch(request, overrideIdentifier) {
+    console.log(`🔍 Fetching settings from GraphQL (Redis-cached backend)...`);
     const resource = generateCdecodeUri(DEFAULT_CONTRIBUTION_TENANT_ID, {
         resourceType: ConfigCollectionName.Applications,
         resourceId: config.APPLICATION_ID,
@@ -68,7 +70,7 @@ async function fetchPageSettingsWithFetch(request, overrideIdentifier) {
             console.error('❌ GraphQL errors:', JSON.stringify(result.errors, null, 2));
             throw new Error(`GraphQL errors: ${JSON.stringify(result.errors)}`);
         }
-        console.log('✅ Settings fetched successfully with fetch');
+        console.log('✅ Settings fetched successfully (from Redis-cached backend)');
         return { data: result.data };
     }
     catch (error) {
@@ -90,41 +92,18 @@ async function settingsLoaderUtil({ request, context, params }) {
     const pageSettings = result?.data?.pageSettings?.settings
         ? JSON.parse(JSON.stringify(result?.data?.pageSettings?.settings))
         : null;
-    // 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 || {};
-    let pageDefaultSettings = pageSettings;
-    // console.log('🔍 DEBUG - bracketOverrides:', JSON.stringify(bracketOverrides, null, 2));
-    // console.log('🔍 DEBUG - otherSettings:', JSON.stringify(otherSettings, null, 2));
+    // pageSettings now contains flat structure:
+    // {
+    //   logo: '...', theme: '...', ...base settings,
+    //   [desktop]: { overrides for desktop },
+    //   [/dashboard][mobile]: { overrides for /dashboard on mobile },
+    //   ... etc
+    // }
     // Add required keys that might not be in backend
-    pageDefaultSettings = {
-        ...pageDefaultSettings,
-        hiddenMenuKeys: [],
-        hiddenMenuCategories: [],
+    let pageDefaultSettings = {
+        ...pageSettings,
     };
-    // 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,
-    //     hiddenMenuKeys: [],
-    //     hiddenMenuCategories: [],
-    // };
     // Fallback to config.LAYOUT_SETTINGS if backend returns empty
     const settingsKeys = Object.keys(pageDefaultSettings);
     const hasOnlyDefaultKeys = settingsKeys.length === 2 &&
@@ -136,8 +115,6 @@ async function settingsLoaderUtil({ request, context, params }) {
             : { ...config.LAYOUT_SETTINGS };
         pageDefaultSettings = {
             ...fallbackSettings,
-            hiddenMenuKeys: [],
-            hiddenMenuCategories: [],
         };
     }
     // Parse cookie settings
@@ -164,8 +141,20 @@ async function settingsLoaderUtil({ request, context, params }) {
         const cookie = await settingsCookie.serialize(diffSettings);
         return { settings: fullSettings, setCookie: cookie };
     }
-    // Merge settings: backend defaults + config + cookie overrides
-    const fullSettings = merge({}, pageDefaultSettings, config.LAYOUT_SETTINGS, settings);
+    // Extract base settings (non-bracket keys) from pageDefaultSettings
+    const baseSettings = {};
+    const bracketOverrides = {};
+    Object.keys(pageDefaultSettings).forEach((key) => {
+        if (key.startsWith('[') && key.endsWith(']')) {
+            bracketOverrides[key] = pageDefaultSettings[key];
+        }
+        else {
+            baseSettings[key] = pageDefaultSettings[key];
+        }
+    });
+    // Merge: base settings + config + cookie overrides, then add bracket overrides
+    const mergedBaseSettings = merge({}, baseSettings, config.LAYOUT_SETTINGS, settings);
+    const fullSettings = merge({}, mergedBaseSettings, bracketOverrides);
     // Refresh the cookie to keep it active
     const cookie = await settingsCookie.serialize(settings);
     console.log('FULL_SETTINGS', fullSettings);

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":"qhBA+GqE,MAAA,cAAA,GAAA,YAAA,CAAA,UAAA,EAAA;;;AAqIpE,IAAA,QAAA,EAAA,KAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"UpdateSettings.server.js","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"sourcesContent":[null],"names":[],"mappings":"qhBAiHqE,MAAA,cAAA,GAAA,YAAA,CAAA,UAAA,EAAA;;;AAqGpE,IAAA,QAAA,EAAA,KAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@admin-layout/client",
-    "version": "12.0.16-alpha.56",
+    "version": "12.0.16-alpha.59",
     "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.51",
+        "common": "12.0.16-alpha.59",
         "rc-menu": "^9.16.1"
     },
     "peerDependencies": {
@@ -44,5 +44,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "9d608c873fdf63cf3ffd982a8304ecbcad0b92f8"
+    "gitHead": "03aa1a41d438cdd8616b2d9a239728cc01dd9e45"
 }