@admin-layout/client 12.0.16-alpha.58 → 12.0.16-alpha.62

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;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;;;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

@@ -92,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 &&
@@ -138,8 +115,6 @@ async function settingsLoaderUtil({ request, context, params }) {
             : { ...config.LAYOUT_SETTINGS };
         pageDefaultSettings = {
             ...fallbackSettings,
-            hiddenMenuKeys: [],
-            hiddenMenuCategories: [],
         };
     }
     // Parse cookie settings
@@ -166,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":"qhBAiHqE,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/lib/utils/settingsDifference.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"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,QA6D3F,CAAC"}

package/lib/utils/settingsDifference.js

@@ -1,4 +1,4 @@
-import {cloneDeep,get,isObject,isEqual,transform}from'lodash-es';/**
+import {cloneDeep,isObject,isEqual,transform}from'lodash-es';/**
  * Gets the deep differences between two objects
  * Returns only the values that differ from obj2
  */
@@ -63,84 +63,6 @@ const getDifference = (obj1, obj2) => {
     // Return undefined if the resulting object is empty
     return Object.keys(result).length > 0 ? result : undefined;
 };
-/**
- * Special handler for route settings differences with improved nested comparison
- */
-const getRouteSettingsDifferences = (currentRouteSettings, defaultRouteSettings) => {
-    const differences = {};
-    // Get the default route template (typically from '/')
-    const defaultRouteTemplate = defaultRouteSettings['/'] || Object.values(defaultRouteSettings)[0];
-    if (!defaultRouteTemplate) {
-        console.warn('No default route template found for comparison');
-        return currentRouteSettings;
-    }
-    // Compare each route's settings
-    Object.keys(currentRouteSettings).forEach((route) => {
-        const currentRouteConfig = currentRouteSettings[route];
-        // Use the specific route config if it exists, otherwise use the default template
-        const defaultRouteConfig = defaultRouteSettings[route] || defaultRouteTemplate;
-        // Compare each section separately (layout, regions, etc)
-        const routeDiff = {};
-        Object.keys(currentRouteConfig).forEach((section) => {
-            if (section === 'layout' || section === 'regions') {
-                const sectionDiff = {};
-                // Compare desktop and mobile separately
-                ['desktop', 'mobile'].forEach((device) => {
-                    if (!currentRouteConfig[section][device]) {
-                        return;
-                    }
-                    // For regions section with header/footer/background
-                    if (section === 'regions') {
-                        const regionsDiff = {};
-                        ['header', 'footer', 'background'].forEach((region) => {
-                            if (!currentRouteConfig[section][device][region]) {
-                                return;
-                            }
-                            // Get default path for comparison
-                            const defaultRegionPath = `${section}.${device}.${region}`;
-                            const defaultRegion = get(defaultRouteConfig, defaultRegionPath);
-                            if (defaultRegion) {
-                                const regionDiff = getDifference(currentRouteConfig[section][device][region], defaultRegion);
-                                if (regionDiff !== undefined &&
-                                    (Array.isArray(regionDiff) || Object.keys(regionDiff).length > 0)) {
-                                    regionsDiff[region] = regionDiff;
-                                }
-                            }
-                        });
-                        if (Object.keys(regionsDiff).length > 0) {
-                            sectionDiff[device] = regionsDiff;
-                        }
-                    }
-                    else {
-                        // For other sections (like layout)
-                        const defaultDevicePath = `${section}.${device}`;
-                        const defaultDevice = get(defaultRouteConfig, defaultDevicePath);
-                        if (defaultDevice) {
-                            const deviceDiff = getDifference(currentRouteConfig[section][device], defaultDevice);
-                            if (deviceDiff !== undefined && Object.keys(deviceDiff).length > 0) {
-                                sectionDiff[device] = deviceDiff;
-                            }
-                        }
-                    }
-                });
-                if (Object.keys(sectionDiff).length > 0) {
-                    routeDiff[section] = sectionDiff;
-                }
-            }
-            else {
-                const sectionDiff = getDifference(currentRouteConfig[section], defaultRouteConfig[section]);
-                if (sectionDiff !== undefined && Object.keys(sectionDiff).length > 0) {
-                    routeDiff[section] = sectionDiff;
-                }
-            }
-        });
-        // Only include the route if there are actual differences
-        if (Object.keys(routeDiff).length > 0) {
-            differences[route] = routeDiff;
-        }
-    });
-    return Object.keys(differences).length > 0 ? differences : undefined;
-};
 /**
  * Compares settings objects and saves only the differences
  * @returns An object containing only the differences, or an empty object on error
@@ -154,39 +76,46 @@ const compareAndSaveSettingsDifferences = (currentSettings, defaultSettings) =>
         // Make deep clones to avoid modifying the original objects
         const current = cloneDeep(currentSettings);
         const defaults = cloneDeep(defaultSettings);
-        // Handle route settings separately
-        const routeSettingsDiff = current.routeSettings
-            ? getRouteSettingsDifferences(current.routeSettings, defaults?.routeSettings || {})
-            : undefined;
-        // Make a copy of settings without routeSettings to compare separately
-        const currentWithoutRoutes = { ...current };
-        const defaultWithoutRoutes = { ...defaults };
-        delete currentWithoutRoutes.routeSettings;
-        delete defaultWithoutRoutes.routeSettings;
-        // Get differences for all other settings
-        const otherSettingsDiff = getDifference(currentWithoutRoutes, defaultWithoutRoutes);
-        // Combine the differences
+        // Extract overrides (bracket keys) from current settings
+        const overrides = {};
+        Object.keys(current).forEach((key) => {
+            if (key.startsWith('[') && key.endsWith(']')) {
+                overrides[key] = current[key];
+            }
+        });
+        // Get differences for non-override settings (base settings)
+        const currentBase = { ...current };
+        const defaultBase = { ...defaults };
+        // Remove all bracket keys from both objects
+        Object.keys(currentBase).forEach((key) => {
+            if (key.startsWith('[') && key.endsWith(']')) {
+                delete currentBase[key];
+            }
+        });
+        Object.keys(defaultBase).forEach((key) => {
+            if (key.startsWith('[') && key.endsWith(']')) {
+                delete defaultBase[key];
+            }
+        });
+        const baseSettingsDiff = getDifference(currentBase, defaultBase);
+        // Combine base settings differences with overrides
         const diffSettings = {};
-        // Add other settings differences if any exist and are not empty objects
-        if (otherSettingsDiff && Object.keys(otherSettingsDiff).length > 0) {
-            Object.assign(diffSettings, otherSettingsDiff);
-        }
-        // Add route settings differences if any exist
-        if (routeSettingsDiff && Object.keys(routeSettingsDiff).length > 0) {
-            diffSettings.routeSettings = routeSettingsDiff;
+        // Add base settings differences if any exist
+        if (baseSettingsDiff && Object.keys(baseSettingsDiff).length > 0) {
+            Object.assign(diffSettings, baseSettingsDiff);
         }
+        // Add all overrides (they are always different from defaults)
+        Object.assign(diffSettings, overrides);
         // If there are no differences at all, return early
         if (Object.keys(diffSettings).length === 0) {
             return {};
         }
         // Remove empty objects from the diff
-        // This helps prevent unnecessary properties in the payload
         const cleanDiffSettings = removeEmptyObjects(diffSettings);
         return cleanDiffSettings;
     }
     catch (error) {
         console.error('Error comparing settings differences:', error);
-        // 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":";;AAqLG;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.58",
+    "version": "12.0.16-alpha.62",
     "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": "efd185779ae70bff337be3796834fba601aae848"
+    "gitHead": "0f34e34fa56ef415cd32998b67df42ab784af9a1"
 }