@admin-layout/client 10.1.1-alpha.0 → 10.1.1-alpha.8

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

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

package/lib/components/LayoutCookieProvider.js

@@ -1,11 +1,11 @@
-import {jsx,Fragment}from'react/jsx-runtime';import {useLayoutEffect}from'react';import {useDispatch}from'react-redux';import {useLoaderData}from'@remix-run/react';import {CHANGE_SETTINGS_ACTION}from'../constants/constants.js';import {defaultSettings}from'../config/defaultSettings.js';import {merge}from'lodash-es';function LayoutCookieProvider({ children }) {
+import {jsx,Fragment}from'react/jsx-runtime';import {useLayoutEffect}from'react';import {useDispatch}from'react-redux';import {useLoaderData}from'@remix-run/react';import {CHANGE_SETTINGS_ACTION}from'../constants/constants.js';function LayoutCookieProvider({ children }) {
     const { settings } = useLoaderData();
     const dispatch = useDispatch();
     const changeSettings = () => {
         if (settings) {
             dispatch({
                 type: CHANGE_SETTINGS_ACTION,
-                payload: merge({}, defaultSettings, settings),
+                payload: settings.settings,
             });
         }
     };

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;AAW/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,oEAqD7D,CAAC;AAEF,eAAO,MAAM,MAAM,GAAU,aAAa;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE;;GAkB7D,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,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"}

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

@@ -1,4 +1,4 @@
-import {createCookie,json}from'@remix-run/node';import {merge}from'lodash-es';import {config}from'../../config/env-config.js';import {defaultSettings}from'../../config/defaultSettings.js';import'react';import'common';import'@cdm-logger/client';import {compareAndSaveSettingsDifferences}from'../../utils/settingsDifference.js';const settingsCookie = createCookie('settings', {
+import {createCookie,json}from'@remix-run/node';import {merge}from'lodash-es';import {config}from'../../config/env-config.js';import {defaultSettings}from'../../config/defaultSettings.js';import'react';import'common';import'@cdm-logger/client';import {compareAndSaveSettingsDifferences}from'../../utils/settingsDifference.js';import {assignDefaults}from'../../utils/assignDefaults.js';const settingsCookie = createCookie('settings', {
     maxAge: 60 * 60 * 24 * 30, // 1 month
     httpOnly: false, // Allow client-side access
     sameSite: 'lax',
@@ -45,24 +45,6 @@ const action = async ({ request }) => {
         }
         // Compare payload and existingSettings, add missing keys from existingSettings to payload with default value
         if (existingSettings) {
-            // Recursively assign default values for any missing nested keys in payload, based on existingSettings structure
-            const assignDefaults = (target, source, defaults) => {
-                Object.keys(source).forEach((key) => {
-                    if (!(key in target)) {
-                        // If the default exists, assign it; otherwise, assign undefined
-                        target[key] = defaults ? defaults[key] : undefined;
-                    }
-                    else if (typeof source[key] === 'object' &&
-                        source[key] !== null &&
-                        !Array.isArray(source[key]) &&
-                        typeof target[key] === 'object' &&
-                        target[key] !== null &&
-                        !Array.isArray(target[key])) {
-                        // Recursively assign for nested objects
-                        assignDefaults(target[key], source[key], defaults ? defaults[key] : undefined);
-                    }
-                });
-            };
             assignDefaults(payload, existingSettings, defaultSettings);
         }
         // Merge everything together
@@ -90,6 +72,9 @@ 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":"4UAeY,6BAAc,CAAA,UAAA,EAAA;IACtB,MAAS,EAAA,EAAA,QAAS,EAAA,GAAA,EAAA;AACrB,IA2BA,QAAA,EAAA,KAAA;AAED,IAAO,QAAA,EAAA,KAAA;IAAqC,IAAO,EAAA,GAAE;AAAS,IAAA,MAAA,EAAA,MAAA,CAAA,MAAA,GAAA,MAAA,CAAA,UAAA,GAAA,SAAA;AAuD9D,CAAO,CAAA;AAA4C,eAAS,kBAAA,CAAA,EAAA,OAAA,EAAA,EAAA;AAAE,IAAA,MAAA,YAAA,GAAA,OAAA,CAAA,OAAA,CAAA,GAAA,CAAA,QAAA,CAAA;;IAkB5D,IAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/utils/assignDefaults.d.ts

@@ -0,0 +1,12 @@
+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
+ * @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
+ */
+export declare function assignDefaults(target: DefaultsObject, source: DefaultsObject, defaults?: DefaultsObject): void;
+//# sourceMappingURL=assignDefaults.d.ts.map

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

@@ -0,0 +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"}

package/lib/utils/assignDefaults.js

@@ -0,0 +1,57 @@
+/**
+ * Recursively assigns default values for any missing nested keys in target object,
+ * based on source object structure and default values
+ * @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
+ */
+function assignDefaults(target, source, defaults) {
+    // Special handling for routeSettings to ensure all routes have complete structure
+    if (defaults?.routeSettings && target.routeSettings) {
+        const rootRoute = defaults.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,
+                        },
+                        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,
+                };
+            });
+        }
+    }
+    Object.keys(source).forEach((key) => {
+        if (!(key in target)) {
+            // If the default exists, assign it; otherwise, assign undefined
+            target[key] = defaults ? defaults[key] : undefined;
+        }
+        else if (typeof source[key] === 'object' &&
+            source[key] !== null &&
+            !Array.isArray(source[key]) &&
+            typeof target[key] === 'object' &&
+            target[key] !== null &&
+            !Array.isArray(target[key])) {
+            // Recursively assign for nested objects
+            assignDefaults(target[key], source[key], defaults ? defaults[key] : undefined);
+        }
+    });
+}export{assignDefaults};//# sourceMappingURL=assignDefaults.js.map

package/lib/utils/assignDefaults.js.map

@@ -0,0 +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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=assignDefaults.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"assignDefaults.test.d.ts","sourceRoot":"","sources":["../../src/utils/assignDefaults.test.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@admin-layout/client",
-    "version": "10.1.1-alpha.0",
+    "version": "10.1.1-alpha.8",
     "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": "98971c95912aaacc173916358a488b412f513d52"
+    "gitHead": "520a72ec4c8b0127be9a71f042c41aaff74f113b"
 }