@admin-layout/client 10.1.1-alpha.10 → 10.1.1-alpha.11

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,KAA0B,MAAM,OAAO,CAAC;AAK/C,UAAU,yBAAyB;IAC/B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC7B;AAED,wBAAgB,oBAAoB,CAAC,EAAE,QAAQ,EAAE,EAAE,yBAAyB,GAAG,KAAK,CAAC,YAAY,CAsBhG"}
+{"version":3,"file":"LayoutCookieProvider.d.ts","sourceRoot":"","sources":["../../src/components/LayoutCookieProvider.tsx"],"names":[],"mappings":"AACA,OAAO,KAA0B,MAAM,OAAO,CAAC;AAK/C,UAAU,yBAAyB;IAC/B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC7B;AAED,wBAAgB,oBAAoB,CAAC,EAAE,QAAQ,EAAE,EAAE,yBAAyB,GAAG,KAAK,CAAC,YAAY,CAkBhG"}

package/lib/components/LayoutCookieProvider.js

@@ -12,8 +12,5 @@ import {jsx,Fragment}from'react/jsx-runtime';import {useLoaderData}from'@remix-r
     useLayoutEffect(() => {
         changeSettings();
     }, [settings, dispatch]);
-    if (typeof window === 'undefined') {
-        changeSettings();
-    }
     return jsx(Fragment, { children: children });
 }export{LayoutCookieProvider};//# sourceMappingURL=LayoutCookieProvider.js.map

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.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateSettings.server.d.ts","sourceRoot":"","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAY/C,wBAAsB,kBAAkB,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC;IACjF,QAAQ,EAAE,WAAW,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC,CA2BD;AAED,eAAO,MAAM,MAAM,GAAU,aAAa;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,oEAkC7D,CAAC;AAEF,eAAO,MAAM,MAAM,GAAU,aAAa;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE;;GAqB7D,CAAC"}
+{"version":3,"file":"UpdateSettings.server.d.ts","sourceRoot":"","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAY/C,wBAAsB,kBAAkB,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC;IACjF,QAAQ,EAAE,WAAW,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC,CA6BD;AAED,eAAO,MAAM,MAAM,GAAU,aAAa;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,oEA8B7D,CAAC;AAEF,eAAO,MAAM,MAAM,GAAU,aAAa;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE;;GAkB7D,CAAC"}

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

@@ -11,6 +11,7 @@ async function settingsLoaderUtil({ request }) {
     try {
         settings = await settingsCookie.parse(cookieHeader);
         console.log('Parsed cookie settings:', settings);
+        assignDefaults(settings, defaultSettings);
     }
     catch (error) {
         console.error('Error parsing settings cookie:', error);
@@ -19,6 +20,7 @@ async function settingsLoaderUtil({ request }) {
     // If no settings in cookie, generate default settings
     if (!settings) {
         const fullSettings = merge({}, defaultSettings, config.LAYOUT_SETTINGS);
+        assignDefaults(fullSettings, defaultSettings);
         // Only store differences to keep cookie size small
         const diffSettings = await compareAndSaveSettingsDifferences(fullSettings, defaultSettings);
         const cookie = await settingsCookie.serialize(diffSettings);
@@ -38,15 +40,12 @@ const action = async ({ request }) => {
         let existingSettings;
         try {
             existingSettings = await settingsCookie.parse(cookieHeader);
+            assignDefaults(merge({}, payload, existingSettings), defaultSettings);
         }
         catch (error) {
             console.error('Error parsing settings cookie in action:', error);
             existingSettings = null;
         }
-        // Compare payload and existingSettings, add missing keys from existingSettings to payload with default value
-        if (existingSettings) {
-            assignDefaults(payload, existingSettings, defaultSettings);
-        }
         // Merge everything together
         const fullSettings = merge({}, defaultSettings, config.LAYOUT_SETTINGS, existingSettings || {}, payload);
         // Store only differences from default
@@ -72,9 +71,6 @@ const loader = async ({ request }) => {
         if (setCookie) {
             headers['Set-Cookie'] = setCookie;
         }
-        if (settings) {
-            assignDefaults(settings, settings, defaultSettings);
-        }
         return json({ settings }, { headers });
     }
     catch (error) {

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":"uYAiBa,iBAAS,YAAA,CAAA,UAAA,EAAA;AACrB,IA2BA,MAAA,EAAA,EAAA,GAAA,EAAA,GAAA,EAAA,GAAA,EAAA;AAED,IAAO,QAAA,EAAA,KAAA;IAAqC,QAAO;AAAW,IAAA,IAAA,EAAA,GAAA;AAoC9D,IAAO,MAAA,EAAA,MAAA,CAAA,MAAY,GAAA,MAAuB,CAAA,UAAA,GAAA,SAAA;;AAAoB,eAAA,kBAAA,CAAA,EAAA,OAAA,EAAA,EAAA;;IAqB5D,IAAA,QAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"UpdateSettings.server.js","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"sourcesContent":[null],"names":[],"mappings":"uYAiBa,iBAAS,YAAA,CAAA,UAAA,EAAA;AACrB,IA6BA,MAAA,EAAA,EAAA,GAAA,EAAA,GAAA,EAAA,GAAA,EAAA;AAED,IAAO,QAAA,EAAA,KAAA;IAAqC,QAAO;AAAW,IAAA,IAAA,EAAA,GAAA;AAgC9D,IAAO,MAAA,EAAA,MAAA,CAAA,MAAY,GAAA,MAAuB,CAAA,UAAA,GAAA,SAAA;;AAAoB,eAAA,kBAAA,CAAA,EAAA,OAAA,EAAA,EAAA;;IAkB5D,IAAA,QAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/redux/reducers/settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../../src/redux/reducers/settings.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAiBnD,QAAA,MAAM,eAAe,GACjB,OAAO,GAA4B,EACnC,mBAAwB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,eAAe,CAAA;CAAE,QAyBrE,CAAC;AAEF,OAAO,EAAE,eAAe,EAAE,CAAC"}
+{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../../src/redux/reducers/settings.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAanD,QAAA,MAAM,eAAe,GACjB,OAAO,GAAgC,EACvC,mBAAwB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,eAAe,CAAA;CAAE,QAyBrE,CAAC;AAEF,OAAO,EAAE,eAAe,EAAE,CAAC"}

package/lib/redux/reducers/settings.js

@@ -1,4 +1,4 @@
-import {CHANGE_LANGUAGE,CHANGE_SETTINGS_ACTION}from'../../constants/constants.js';import {config}from'../../config/env-config.js';import'../../config/defaultSettings.js';import {cloneDeep}from'lodash-es';/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+import {CHANGE_LANGUAGE,CHANGE_SETTINGS_ACTION}from'../../constants/constants.js';import {defaultSettings}from'../../config/defaultSettings.js';import {merge,cloneDeep}from'lodash-es';/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 /* eslint-disable no-case-declarations */
 // Note: We customize reducer part as AntPro uses inbuild way.
 const updateColorWeak = (colorWeak) => {
@@ -10,11 +10,7 @@ const updateColorWeak = (colorWeak) => {
         }
     }
 };
-// interface SettingsActionPayload {
-//     colorWeak: any;
-//     contentWidth: any;
-// }
-const settingsReducer = (state = config.LAYOUT_SETTINGS, { type, payload = {} }) => {
+const settingsReducer = (state = merge({}, defaultSettings), { type, payload = {} }) => {
     switch (type) {
         case CHANGE_SETTINGS_ACTION:
             const { colorWeak, contentWidth } = payload;

package/lib/redux/reducers/settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings.js","sources":["../../../src/redux/reducers/settings.ts"],"sourcesContent":[null],"names":[],"mappings":"4MAIA;AAiBA;AA6BA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"settings.js","sources":["../../../src/redux/reducers/settings.ts"],"sourcesContent":[null],"names":[],"mappings":"wLAKA;AAaA;AA6BA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/redux/store.js

@@ -1,4 +1,4 @@
-import {combineReducers,configureStore}from'@reduxjs/toolkit';import {applicationErrors}from'./reducers/error.js';import'../config/env-config.js';import'../config/defaultSettings.js';import'lodash-es';// Combine the reducers into an object
+import {combineReducers,configureStore}from'@reduxjs/toolkit';import {applicationErrors}from'./reducers/error.js';import'../config/defaultSettings.js';import'lodash-es';// Combine the reducers into an object
 const rootReducer = combineReducers({
     applicationErrors: applicationErrors, // Adding applicationErrors reducer
 });

package/lib/utils/assignDefaults.d.ts

@@ -2,11 +2,10 @@ export interface DefaultsObject {
     [key: string]: any;
 }
 /**
- * Recursively assigns default values for any missing nested keys in target object,
- * based on source object structure and default values
+ * Recursively assigns default values only for non-existent keys in target object,
+ * based on source object structure. Does not modify any existing values in target.
  * @param target - The target object to assign defaults to
- * @param source - The source object containing the structure to follow
- * @param defaults - The default values to use when a key is missing
+ * @param source - The source object containing the structure and default values
  */
-export declare function assignDefaults(target: DefaultsObject, source: DefaultsObject, defaults?: DefaultsObject): void;
+export declare function assignDefaults(target: DefaultsObject, source: DefaultsObject): void;
 //# sourceMappingURL=assignDefaults.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"assignDefaults.d.ts","sourceRoot":"","sources":["../../src/utils/assignDefaults.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACtB;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,IAAI,CAoD9G"}
+{"version":3,"file":"assignDefaults.d.ts","sourceRoot":"","sources":["../../src/utils/assignDefaults.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACtB;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,cAAc,GAAG,IAAI,CA6JnF"}

package/lib/utils/assignDefaults.js

@@ -1,48 +1,157 @@
 /**
- * Recursively assigns default values for any missing nested keys in target object,
- * based on source object structure and default values
+ * Recursively assigns default values only for non-existent keys in target object,
+ * based on source object structure. Does not modify any existing values in target.
  * @param target - The target object to assign defaults to
- * @param source - The source object containing the structure to follow
- * @param defaults - The default values to use when a key is missing
+ * @param source - The source object containing the structure and default values
  */
-function assignDefaults(target, source, defaults) {
+function assignDefaults(target, source) {
     // Special handling for routeSettings to ensure all routes have complete structure
-    if (defaults?.routeSettings && target.routeSettings) {
-        const rootRoute = defaults.routeSettings['/'];
+    if (source?.routeSettings && target.routeSettings) {
+        const rootRoute = source.routeSettings['/'];
         if (rootRoute) {
             Object.keys(target.routeSettings).forEach((route) => {
-                // Deep merge the root route structure with the current route
-                const mergedLayout = {
-                    desktop: { ...rootRoute.layout.desktop, ...target.routeSettings[route].layout?.desktop },
-                    mobile: { ...rootRoute.layout.mobile, ...target.routeSettings[route].layout?.mobile },
-                };
-                const mergedRegions = {
-                    desktop: {
-                        header: {
-                            ...rootRoute.regions.desktop.header,
-                            ...target.routeSettings[route].regions?.desktop?.header,
+                const currentRoute = target.routeSettings[route];
+                // Handle layout
+                if (!currentRoute.layout) {
+                    currentRoute.layout = {
+                        desktop: { ...rootRoute.layout.desktop },
+                        mobile: { ...rootRoute.layout.mobile },
+                    };
+                }
+                else {
+                    if (!currentRoute.layout.desktop) {
+                        currentRoute.layout.desktop = { ...rootRoute.layout.desktop };
+                    }
+                    else {
+                        Object.keys(rootRoute.layout.desktop).forEach((key) => {
+                            if (!(key in currentRoute.layout.desktop)) {
+                                currentRoute.layout.desktop[key] = rootRoute.layout.desktop[key];
+                            }
+                        });
+                    }
+                    if (!currentRoute.layout.mobile) {
+                        currentRoute.layout.mobile = { ...rootRoute.layout.mobile };
+                    }
+                    else {
+                        Object.keys(rootRoute.layout.mobile).forEach((key) => {
+                            if (!(key in currentRoute.layout.mobile)) {
+                                currentRoute.layout.mobile[key] = rootRoute.layout.mobile[key];
+                            }
+                        });
+                    }
+                }
+                // Handle regions
+                if (!currentRoute.regions) {
+                    currentRoute.regions = {
+                        desktop: {
+                            header: { ...rootRoute.regions.desktop.header },
+                            background: { ...rootRoute.regions.desktop.background },
+                            footer: { ...rootRoute.regions.desktop.footer },
                         },
-                        background: { ...rootRoute.regions.desktop.background },
-                        footer: { ...rootRoute.regions.desktop.footer },
-                    },
-                    mobile: {
-                        header: { ...rootRoute.regions.mobile.header },
-                        background: { ...rootRoute.regions.mobile.background },
-                        footer: { ...rootRoute.regions.mobile.footer },
-                    },
-                };
-                target.routeSettings[route] = {
-                    ...target.routeSettings[route],
-                    layout: mergedLayout,
-                    regions: mergedRegions,
-                };
+                        mobile: {
+                            header: { ...rootRoute.regions.mobile.header },
+                            background: { ...rootRoute.regions.mobile.background },
+                            footer: { ...rootRoute.regions.mobile.footer },
+                        },
+                    };
+                }
+                else {
+                    // Handle desktop regions
+                    if (!currentRoute.regions.desktop) {
+                        currentRoute.regions.desktop = {
+                            header: { ...rootRoute.regions.desktop.header },
+                            background: { ...rootRoute.regions.desktop.background },
+                            footer: { ...rootRoute.regions.desktop.footer },
+                        };
+                    }
+                    else {
+                        // Handle desktop header
+                        if (!currentRoute.regions.desktop.header) {
+                            currentRoute.regions.desktop.header = { ...rootRoute.regions.desktop.header };
+                        }
+                        else {
+                            Object.keys(rootRoute.regions.desktop.header).forEach((key) => {
+                                if (!(key in currentRoute.regions.desktop.header)) {
+                                    currentRoute.regions.desktop.header[key] = rootRoute.regions.desktop.header[key];
+                                }
+                            });
+                        }
+                        // Handle desktop background
+                        if (!currentRoute.regions.desktop.background) {
+                            currentRoute.regions.desktop.background = { ...rootRoute.regions.desktop.background };
+                        }
+                        else {
+                            Object.keys(rootRoute.regions.desktop.background).forEach((key) => {
+                                if (!(key in currentRoute.regions.desktop.background)) {
+                                    currentRoute.regions.desktop.background[key] =
+                                        rootRoute.regions.desktop.background[key];
+                                }
+                            });
+                        }
+                        // Handle desktop footer
+                        if (!currentRoute.regions.desktop.footer) {
+                            currentRoute.regions.desktop.footer = { ...rootRoute.regions.desktop.footer };
+                        }
+                        else {
+                            Object.keys(rootRoute.regions.desktop.footer).forEach((key) => {
+                                if (!(key in currentRoute.regions.desktop.footer)) {
+                                    currentRoute.regions.desktop.footer[key] = rootRoute.regions.desktop.footer[key];
+                                }
+                            });
+                        }
+                    }
+                    // Handle mobile regions
+                    if (!currentRoute.regions.mobile) {
+                        currentRoute.regions.mobile = {
+                            header: { ...rootRoute.regions.mobile.header },
+                            background: { ...rootRoute.regions.mobile.background },
+                            footer: { ...rootRoute.regions.mobile.footer },
+                        };
+                    }
+                    else {
+                        // Handle mobile header
+                        if (!currentRoute.regions.mobile.header) {
+                            currentRoute.regions.mobile.header = { ...rootRoute.regions.mobile.header };
+                        }
+                        else {
+                            Object.keys(rootRoute.regions.mobile.header).forEach((key) => {
+                                if (!(key in currentRoute.regions.mobile.header)) {
+                                    currentRoute.regions.mobile.header[key] = rootRoute.regions.mobile.header[key];
+                                }
+                            });
+                        }
+                        // Handle mobile background
+                        if (!currentRoute.regions.mobile.background) {
+                            currentRoute.regions.mobile.background = { ...rootRoute.regions.mobile.background };
+                        }
+                        else {
+                            Object.keys(rootRoute.regions.mobile.background).forEach((key) => {
+                                if (!(key in currentRoute.regions.mobile.background)) {
+                                    currentRoute.regions.mobile.background[key] =
+                                        rootRoute.regions.mobile.background[key];
+                                }
+                            });
+                        }
+                        // Handle mobile footer
+                        if (!currentRoute.regions.mobile.footer) {
+                            currentRoute.regions.mobile.footer = { ...rootRoute.regions.mobile.footer };
+                        }
+                        else {
+                            Object.keys(rootRoute.regions.mobile.footer).forEach((key) => {
+                                if (!(key in currentRoute.regions.mobile.footer)) {
+                                    currentRoute.regions.mobile.footer[key] = rootRoute.regions.mobile.footer[key];
+                                }
+                            });
+                        }
+                    }
+                }
             });
         }
     }
     Object.keys(source).forEach((key) => {
         if (!(key in target)) {
-            // If the default exists, assign it; otherwise, assign undefined
-            target[key] = defaults ? defaults[key] : undefined;
+            // Only assign default if the key doesn't exist
+            target[key] = source[key];
         }
         else if (typeof source[key] === 'object' &&
             source[key] !== null &&
@@ -51,7 +160,7 @@ function assignDefaults(target, source, defaults) {
             target[key] !== null &&
             !Array.isArray(target[key])) {
             // Recursively assign for nested objects
-            assignDefaults(target[key], source[key], defaults ? defaults[key] : undefined);
+            assignDefaults(target[key], source[key]);
         }
     });
 }export{assignDefaults};//# sourceMappingURL=assignDefaults.js.map

package/lib/utils/assignDefaults.js.map

@@ -1 +1 @@
-{"version":3,"file":"assignDefaults.js","sources":["../../src/utils/assignDefaults.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACI;AACH;AAED;;;;;;AAMG,IAAA,IAAA,QAAA,EAAA,aAAA,IAAA,MAAA,CAAA,aAAA,EAAA;AACH,QAAA,MAAA,SAAA,yBAAuC,CAAA,GAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"assignDefaults.js","sources":["../../src/utils/assignDefaults.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACI;AACH;AAED;;;;;AAKG,IAAA,IAAA,MAAA,EAAA,aAAA,IAAA,MAAA,CAAA,aAAA,EAAA;AACH,QAAgB,MAAA,SAAA,GAAA,MAAA,CAAA,aAAuB,CAAA,GAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@admin-layout/client",
-    "version": "10.1.1-alpha.10",
+    "version": "10.1.1-alpha.11",
     "description": "Sample client for higher packages to depend on",
     "license": "ISC",
     "author": "CDMBase LLC",
@@ -40,5 +40,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "8d921f04aba05c0969b37ecee725d2153bae5de9"
+    "gitHead": "ca5f3396d249806ac05fd1f01b36fcb27f096744"
 }