@admin-layout/client 11.0.4-alpha.4 → 12.0.16-alpha.0

package/lib/{antd-themes/colors.d.ts → colors/colorsList.d.ts}

@@ -26,4 +26,4 @@ export declare const getThemeColors: (theme?: ThemeKey) => {
     color: string;
 }[];
 export {};
-//# sourceMappingURL=colors.d.ts.map
+//# sourceMappingURL=colorsList.d.ts.map

package/lib/colors/colorsList.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"colorsList.d.ts","sourceRoot":"","sources":["../../src/colors/colorsList.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;CA4DrB,CAAC;AAEF,KAAK,QAAQ,GAAG,MAAM,OAAO,SAAS,CAAC;AAEvC,eAAO,MAAM,cAAc,GAAI,QAAQ,QAAQ;;;GAK9C,CAAC"}

package/lib/{antd-themes/colors.js → colors/colorsList.js}

@@ -64,4 +64,4 @@ const getThemeColors = (theme) => {
         return colorList[theme];
     }
     return colorList.default;
-};export{colorList,getThemeColors};//# sourceMappingURL=colors.js.map
+};export{colorList,getThemeColors};//# sourceMappingURL=colorsList.js.map

package/lib/colors/colorsList.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"colorsList.js","sources":["../../src/colors/colorsList.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA,MAAA,SAAsB,GAAA;;;;;;;;;;;;;;;;;;;;;QA4DpB,EAAA,GAAA,EAAA,OAAA,EAAA,KAAA,EAAA,SAAA,EAAA;AAEF,KAAK;AAEL,IAAA,KAAA,EAAA;;;QAKE,EAAA,GAAA,EAAA,OAAA,EAAA,KAAA,EAAA,SAAA,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/colors/index.d.ts

@@ -1,3 +1,4 @@
 export * from './Color';
 export * from './presets';
+export * from './colorsList';
 //# sourceMappingURL=index.d.ts.map

package/lib/colors/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/colors/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/colors/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC"}

package/lib/colors/presets/brinkPink.js

@@ -0,0 +1,11 @@
+const brinkPink = {
+    base100: '#FEDCD7',
+    base200: '#FDB3B0',
+    base300: '#FB888F',
+    base400: '#F86A80',
+    base: '#E63763',
+    base600: '#D12A64',
+    base700: '#AF1D5E',
+    base800: '#8D1255',
+    base900: '#750B4E'
+};export{brinkPink};//# sourceMappingURL=brinkPink.js.map

package/lib/colors/presets/brinkPink.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"brinkPink.js","sources":["../../../src/colors/presets/brinkPink.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAS,MAAA,SAAa;AAEtB,IAAA,OAAA,EAAA,SAAa;;;;;;;;;"}

package/lib/colors/presets/cyan.js

@@ -0,0 +1,11 @@
+const cyan = {
+    base100: '#CEFDF9',
+    base200: '#9EFBFB',
+    base300: '#6CECF5',
+    base400: '#47D4EC',
+    base: '#10B3E0',
+    base600: '#0B8CC0',
+    base700: '#0869A1',
+    base800: '#054B81',
+    base900: '#03366B'
+};export{cyan};//# sourceMappingURL=cyan.js.map

package/lib/colors/presets/cyan.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cyan.js","sources":["../../../src/colors/presets/cyan.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAS,MAAA,IAAO,GAAA;AAEhB,IAAA,OAAA,EAAA,SAAa;;;;;;;;;"}

package/lib/colors/presets/lime.js

@@ -0,0 +1,11 @@
+const lime = {
+    base100: '#F5FCD4',
+    base200: '#E9FAA9',
+    base300: '#D4F07C',
+    base400: '#BDE25A',
+    base: '#9DCF29',
+    base600: '#80B21D',
+    base700: '#669514',
+    base800: '#4D780D',
+    base900: '#3C6307'
+};export{lime};//# sourceMappingURL=lime.js.map

package/lib/colors/presets/lime.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lime.js","sources":["../../../src/colors/presets/lime.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAS,MAAA,IAAO,GAAA;AAEhB,IAAA,OAAA,EAAA,SAAa;;;;;;;;;"}

package/lib/colors/presets/pink.js

@@ -0,0 +1,11 @@
+const pink = {
+    base100: '#FEDADD',
+    base200: '#FEBAC7',
+    base300: '#FD98B5',
+    base400: '#FB7EAE',
+    base: '#EB4696',
+    base600: '#D63D96',
+    base700: '#B32A88',
+    base800: '#901A77',
+    base900: '#77106B'
+};export{pink};//# sourceMappingURL=pink.js.map

package/lib/colors/presets/pink.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pink.js","sources":["../../../src/colors/presets/pink.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAS,MAAA,IAAO,GAAA;AAEhB,IAAA,OAAA,EAAA,SAAa;;;;;;;;;"}

package/lib/colors/presets/purple.js

@@ -0,0 +1,11 @@
+const purple = {
+    base100: '#FBCAFC',
+    base200: '#F096FA',
+    base300: '#D960F1',
+    base400: '#BC39E4',
+    base: '#9400D3',
+    base600: '#7300B5',
+    base700: '#560097',
+    base800: '#3D007A',
+    base900: '#2B0065'
+};export{purple};//# sourceMappingURL=purple.js.map

package/lib/colors/presets/purple.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"purple.js","sources":["../../../src/colors/presets/purple.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAS,MAAA,MAAO,GAAM;AAEtB,IAAA,OAAA,EAAA,SAAa;;;;;;;;;"}

package/lib/colors/presets/skyBlue.js

@@ -0,0 +1,11 @@
+const skyBlue = {
+    base100: '#CEFDF9',
+    base200: '#9EFBFB',
+    base300: '#6CECF5',
+    base400: '#47D4EC',
+    base: '#10B3E0',
+    base600: '#0B8CC0',
+    base700: '#0869A1',
+    base800: '#054B81',
+    base900: '#03366B'
+};export{skyBlue};//# sourceMappingURL=skyBlue.js.map

package/lib/colors/presets/skyBlue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skyBlue.js","sources":["../../../src/colors/presets/skyBlue.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAS,MAAA,OAAO;AAEhB,IAAA,OAAA,EAAA,SAAa;;;;;;;;;"}

package/lib/colors/presets/turquoise.js

@@ -0,0 +1,11 @@
+const turquoise = {
+    base100: '#CFFCE4',
+    base200: '#A0FAD2',
+    base300: '#6FF1C3',
+    base400: '#49E3BB',
+    base: '#15D1B2',
+    base600: '#0FB3A8',
+    base700: '#0A9396',
+    base800: '#066B79',
+    base900: '#045064'
+};export{turquoise};//# sourceMappingURL=turquoise.js.map

package/lib/colors/presets/turquoise.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turquoise.js","sources":["../../../src/colors/presets/turquoise.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAS,MAAA,SAAa;AAEtB,IAAA,OAAA,EAAA,SAAa;;;;;;;;;"}

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

@@ -1 +1 @@
-{"version":3,"file":"ApplicationErrorFillWrapper.d.ts","sourceRoot":"","sources":["../../src/components/ApplicationErrorFillWrapper.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,2BAA2B,yDAEvC,CAAA"}
+{"version":3,"file":"ApplicationErrorFillWrapper.d.ts","sourceRoot":"","sources":["../../src/components/ApplicationErrorFillWrapper.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,2BAA2B,GAAI,UAAK,4CAEhD,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"ApplicationErrorHandlerCommon.d.ts","sourceRoot":"","sources":["../../src/components/ApplicationErrorHandlerCommon.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvD,OAAO,kBAAkB,CAAC;AAI1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD;;;GAGG;AACH,UAAU,kCAAkC;IAC1C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED,KAAK,sBAAsB,GAAG,CAAC,KAAK,EAAE;IACpC,iBAAiB,EAAE,qBAAqB,EAAE,CAAC;IAC3C,YAAY,EAAE,qBAAqB,CAAA;CACpC,KAAK,YAAY,CAAC;AAEnB,KAAK,yBAAyB,GAAG,CAC/B,KAAK,EAAE;IACL,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE;QACT,MAAM,EAAE,OAAO,CAAC;QAChB,iBAAiB,EAAE,qBAAqB,EAAE,CAAA;KAC3C,CAAA;CACF,KACE,YAAY,CAAC;AAClB;;;;;;;;;;GAUG;AACH,eAAO,MAAM,6BAA6B,kDAEjB,yBAAyB,sBAC5B,sBAAsB,6BACf,kCAAkC,KAAG,YA2BjE,CAAA"}
+{"version":3,"file":"ApplicationErrorHandlerCommon.d.ts","sourceRoot":"","sources":["../../src/components/ApplicationErrorHandlerCommon.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvD,OAAO,kBAAkB,CAAC;AAI1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD;;;GAGG;AACH,UAAU,kCAAkC;IAC1C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED,KAAK,sBAAsB,GAAG,CAAC,KAAK,EAAE;IACpC,iBAAiB,EAAE,qBAAqB,EAAE,CAAC;IAC3C,YAAY,EAAE,qBAAqB,CAAA;CACpC,KAAK,YAAY,CAAC;AAEnB,KAAK,yBAAyB,GAAG,CAC/B,KAAK,EAAE;IACL,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE;QACT,MAAM,EAAE,OAAO,CAAC;QAChB,iBAAiB,EAAE,qBAAqB,EAAE,CAAA;KAC3C,CAAA;CACF,KACE,YAAY,CAAC;AAClB;;;;;;;;;;GAUG;AACH,eAAO,MAAM,6BAA6B,GACxC,sBAAiB,EACjB,uBAAuB,yBAAyB,EAChD,oBAAoB,sBAAsB,MACtC,uBAAuB,kCAAkC,KAAG,YA2BjE,CAAA"}

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,KAAoB,MAAM,OAAO,CAAC;AAMzC,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":"AACA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAIlE,UAAU,yBAAyB;IAC/B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC7B;AAED,wBAAgB,oBAAoB,CAAC,EAAE,QAAQ,EAAE,EAAE,yBAAyB,GAAG,KAAK,CAAC,YAAY,CA2BhG"}

package/lib/components/LayoutCookieProvider.js

@@ -1,19 +1,25 @@
-import {jsx,Fragment}from'react/jsx-runtime';import {useEffect}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();
+import {jsx,Fragment}from'react/jsx-runtime';import {useRouteLoaderData}from'@remix-run/react';import {useRef,useEffect}from'react';import {useDispatch}from'react-redux';import {CHANGE_SETTINGS_ACTION}from'../constants/constants.js';function LayoutCookieProvider({ children }) {
+    const routeData = useRouteLoaderData('root');
+    const settings = routeData?.settings?.settings || routeData?.settings;
     const dispatch = useDispatch();
-    const changeSettings = () => {
-        if (settings) {
+    const hasDispatched = useRef(false);
+    // Handle both server and client side
+    useEffect(() => {
+        if (settings && !hasDispatched.current) {
             dispatch({
                 type: CHANGE_SETTINGS_ACTION,
                 payload: settings,
             });
+            hasDispatched.current = true;
         }
-    };
-    useEffect(() => {
-        changeSettings();
     }, [settings, dispatch]);
-    if (typeof window === 'undefined') {
-        changeSettings();
+    // Initial server-side dispatch
+    if (typeof window === 'undefined' && settings && !hasDispatched.current) {
+        dispatch({
+            type: CHANGE_SETTINGS_ACTION,
+            payload: settings,
+        });
+        hasDispatched.current = true;
     }
     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/SettingsConfigurationModel.test.d.ts

@@ -0,0 +1,2 @@
+import 'reflect-metadata';
+//# sourceMappingURL=SettingsConfigurationModel.test.d.ts.map

package/lib/components/UpdateSettings/SettingsConfigurationModel.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SettingsConfigurationModel.test.d.ts","sourceRoot":"","sources":["../../../src/components/UpdateSettings/SettingsConfigurationModel.test.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC"}

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

@@ -0,0 +1,24 @@
+import { ProSettings } from '../../interfaces';
+import { IAppLoadContext } from '@common-stack/client-core';
+import { IResourceParams } from '@common-stack/core';
+export declare function settingsLoaderUtil({ request, context, params, }: {
+    request: Request;
+    context?: IAppLoadContext;
+    params?: IResourceParams;
+}): Promise<{
+    settings: ProSettings;
+    setCookie: string;
+}>;
+export declare const action: ({ request, context, params, }: {
+    request: Request;
+    context?: IAppLoadContext;
+    params?: IResourceParams;
+}) => Promise<import("@remix-run/server-runtime").TypedResponse<any>>;
+export declare const loader: ({ request, context, params, }: {
+    request: Request;
+    context?: IAppLoadContext;
+    params?: IResourceParams;
+}) => Promise<import("@remix-run/server-runtime").TypedResponse<{
+    settings: any;
+}>>;
+//# sourceMappingURL=UpdateSettings.server.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"UpdateSettings.server.d.ts","sourceRoot":"","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAiCrD,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,CAmCD;AAED,eAAO,MAAM,MAAM,GAAU,+BAI1B;IACC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,MAAM,CAAC,EAAE,eAAe,CAAC;CAC5B,oEAyCA,CAAC;AAEF,eAAO,MAAM,MAAM,GAAU,+BAI1B;IACC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,MAAM,CAAC,EAAE,eAAe,CAAC;CAC5B;;GAwBA,CAAC"}

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

@@ -1,38 +1,124 @@
-import {createCookie}from'@remix-run/node';import {data}from'@remix-run/react';import {pick,keys}from'lodash-es';import {config}from'../../config/env-config.js';import {defaultSettings}from'../../config/defaultSettings.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';import {GetPageSettingsDocument}from'common/graphql';// NOTE: We are temporarily using `defaultSettings`. This will be removed once `defaultSettings` is updated in the all packages.
+const settingsCookie = createCookie('settings', {
     maxAge: 60 * 60 * 24 * 30, // 1 month
-    httpOnly: true,
+    httpOnly: false, // Allow client-side access
     sameSite: 'lax',
+    path: '/', // Ensure cookie is available for all paths
     domain: config.isProd ? config.APP_DOMAIN : undefined,
 });
-const action = async ({ request }) => {
-    // const jsonData = await request.json();
-    const clonedRequest = request.clone();
-    const jsonData = await clonedRequest.json();
-    const payload = jsonData?.config;
-    const cookieHeader = request.headers.get('Cookie');
-    const settings = await settingsCookie.parse(cookieHeader);
-    const updatedSettings = {
-        ...settings,
-        ...pick(payload, keys(config.LAYOUT_SETTINGS)),
-    };
-    return data(updatedSettings, {
-        headers: {
-            'Set-Cookie': await settingsCookie.serialize(updatedSettings),
+// Helper to fetch page settings from Apollo
+async function fetchPageSettings(apolloClient) {
+    return apolloClient.query({
+        query: GetPageSettingsDocument,
+        context: {
+            headers: {
+                'Content-Type': 'application/json',
+            },
+        },
+        variables: {
+            resourceUri: `cdecode://default/uilayout#uiSettings`,
+            options: {
+                schemaId: 'uiLayout',
+                target: 2 /* ConfigurationTarget.APPLICATION */,
+            },
         },
     });
-};
-const loader = async ({ request }) => {
+}
+async function settingsLoaderUtil({ request, context, params, }) {
     const cookieHeader = request.headers.get('Cookie');
-    const settings = await settingsCookie.parse(cookieHeader);
+    let settings;
+    const { apolloClient } = context;
+    const result = await fetchPageSettings(apolloClient);
+    const pageSettings = result?.data?.pageSettings?.settings
+        ? JSON.parse(JSON.stringify(result?.data?.pageSettings?.settings))
+        : null;
+    let pageDefaultSettings = pageSettings?.uilayout || defaultSettings || {};
+    try {
+        settings = await settingsCookie.parse(cookieHeader);
+        console.log('Parsed cookie settings:', settings);
+        assignDefaults(settings, pageDefaultSettings);
+    }
+    catch (error) {
+        console.error('Error parsing settings cookie:', error);
+        settings = null;
+    }
+    // If no settings in cookie, generate default settings
     if (!settings) {
-        const updatedSettings = {
-            ...defaultSettings,
-        };
-        return data(updatedSettings, {
+        const fullSettings = merge({}, pageDefaultSettings, config.LAYOUT_SETTINGS);
+        assignDefaults(fullSettings, pageDefaultSettings);
+        // Only store differences to keep cookie size small
+        const diffSettings = await compareAndSaveSettingsDifferences(fullSettings, pageDefaultSettings);
+        const cookie = await settingsCookie.serialize(diffSettings);
+        return { settings: fullSettings, setCookie: cookie };
+    }
+    // Merge cookie settings with defaults to get complete settings
+    const fullSettings = merge({}, settings, pageDefaultSettings, config.LAYOUT_SETTINGS);
+    // Refresh the cookie to keep it active
+    const cookie = await settingsCookie.serialize(settings);
+    return { settings: fullSettings, setCookie: cookie };
+}
+const action = async ({ request, context, params, }) => {
+    try {
+        const { apolloClient } = context;
+        const result = await fetchPageSettings(apolloClient);
+        const pageSettings = result?.data?.pageSettings?.settings
+            ? JSON.parse(JSON.stringify(result.data.pageSettings.settings))
+            : null;
+        let pageDefaultSettings = pageSettings?.uilayout || defaultSettings || {};
+        const jsonData = await request.json();
+        console.log('jsonData....', jsonData);
+        const payload = jsonData?.config || {};
+        assignDefaults(payload, pageDefaultSettings);
+        const cookieHeader = request.headers.get('Cookie');
+        let existingSettings;
+        let mergedSettings;
+        try {
+            existingSettings = await settingsCookie.parse(cookieHeader);
+            mergedSettings = merge({}, existingSettings, payload);
+            assignDefaults(mergedSettings, pageDefaultSettings);
+        }
+        catch (error) {
+            console.error('Error parsing settings cookie in action:', error);
+            existingSettings = null;
+        }
+        // Merge everything together
+        const fullSettings = merge({}, mergedSettings, config.LAYOUT_SETTINGS);
+        // Store only differences from default
+        const diffSettings = await compareAndSaveSettingsDifferences(fullSettings, pageDefaultSettings);
+        // Create a new cookie with the diff settings
+        const newCookie = await settingsCookie.serialize(diffSettings);
+        return json(fullSettings, {
             headers: {
-                'Set-Cookie': await settingsCookie.serialize(updatedSettings),
+                'Set-Cookie': newCookie,
             },
         });
     }
-    return settings;
-};export{action,loader};//# sourceMappingURL=UpdateSettings.server.js.map
+    catch (error) {
+        console.error('Error in action:', error);
+        return json({ error: 'Failed to update settings' }, { status: 500 });
+    }
+};
+const loader = async ({ request, context, params, }) => {
+    try {
+        const { settings, setCookie } = await settingsLoaderUtil({ request, context, params });
+        // Always include headers, but only set cookie if provided
+        const headers = {};
+        if (setCookie) {
+            headers['Set-Cookie'] = setCookie;
+        }
+        return json({ settings }, { headers });
+    }
+    catch (error) {
+        console.error('Error in settings loader:', error);
+        // Fall back to default settings
+        const { apolloClient } = context;
+        const result = await fetchPageSettings(apolloClient);
+        const pageSettings = result?.data?.pageSettings?.settings
+            ? JSON.parse(JSON.stringify(result.data.pageSettings.settings))
+            : null;
+        let pageDefaultSettings = pageSettings?.uilayout || defaultSettings || {};
+        return json({
+            settings: merge({}, pageDefaultSettings, config.LAYOUT_SETTINGS),
+        });
+    }
+};export{action,loader,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":["import { createCookie } from '@remix-run/node';\nimport { data } from '@remix-run/react';\nimport { keys, pick } from 'lodash-es';\nimport { config, defaultSettings } from '../../config';\nconst settingsCookie = createCookie('settings', {\n    maxAge: 60 * 60 * 24 * 30, // 1 month\n    httpOnly: true,\n    sameSite: 'lax',\n    domain: config.isProd ? config.APP_DOMAIN : undefined,\n});\nexport const action = async ({ request }) => {\n    // const jsonData = await request.json();\n    const clonedRequest = request.clone();\n    const jsonData = await clonedRequest.json();\n    const payload = jsonData?.config;\n    const cookieHeader = request.headers.get('Cookie');\n    const settings = await settingsCookie.parse(cookieHeader);\n    const updatedSettings = {\n        ...settings,\n        ...pick(payload, keys(config.LAYOUT_SETTINGS)),\n    };\n    return data(updatedSettings, {\n        headers: {\n            'Set-Cookie': await settingsCookie.serialize(updatedSettings),\n        },\n    });\n};\nexport const loader = async ({ request }) => {\n    const cookieHeader = request.headers.get('Cookie');\n    const settings = await settingsCookie.parse(cookieHeader);\n    if (!settings) {\n        const updatedSettings = {\n            ...defaultSettings,\n        };\n        return data(updatedSettings, {\n            headers: {\n                'Set-Cookie': await settingsCookie.serialize(updatedSettings),\n            },\n        });\n    }\n    return settings;\n};\n"],"names":[],"mappings":"+NAIA,MAAM,cAAc,GAAG,YAAY,CAAC,UAAU,EAAE;AAChD,IAAI,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE;AAC7B,IAAI,QAAQ,EAAE,IAAI;AAClB,IAAI,QAAQ,EAAE,KAAK;AACnB,IAAI,MAAM,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,GAAG,SAAS;AACzD,CAAC,CAAC;AACU,MAAC,MAAM,GAAG,OAAO,EAAE,OAAO,EAAE,KAAK;AAC7C;AACA,IAAI,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE;AACzC,IAAI,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE;AAC/C,IAAI,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;AACpC,IAAI,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;AACtD,IAAI,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,KAAK,CAAC,YAAY,CAAC;AAC7D,IAAI,MAAM,eAAe,GAAG;AAC5B,QAAQ,GAAG,QAAQ;AACnB,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;AACtD,KAAK;AACL,IAAI,OAAO,IAAI,CAAC,eAAe,EAAE;AACjC,QAAQ,OAAO,EAAE;AACjB,YAAY,YAAY,EAAE,MAAM,cAAc,CAAC,SAAS,CAAC,eAAe,CAAC;AACzE,SAAS;AACT,KAAK,CAAC;AACN;AACY,MAAC,MAAM,GAAG,OAAO,EAAE,OAAO,EAAE,KAAK;AAC7C,IAAI,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;AACtD,IAAI,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,KAAK,CAAC,YAAY,CAAC;AAC7D,IAAI,IAAI,CAAC,QAAQ,EAAE;AACnB,QAAQ,MAAM,eAAe,GAAG;AAChC,YAAY,GAAG,eAAe;AAC9B,SAAS;AACT,QAAQ,OAAO,IAAI,CAAC,eAAe,EAAE;AACrC,YAAY,OAAO,EAAE;AACrB,gBAAgB,YAAY,EAAE,MAAM,cAAc,CAAC,SAAS,CAAC,eAAe,CAAC;AAC7E,aAAa;AACb,SAAS,CAAC;AACV;AACA,IAAI,OAAO,QAAQ;AACnB"}
+{"version":3,"file":"UpdateSettings.server.js","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"sourcesContent":[null],"names":[],"mappings":"sbAiDC;MACW,6BAAc,CAAA,UAAA,EAAA;IACtB,MAAS,EAAA,EAAA,QAAS,EAAA,GAAA,EAAA;AACrB,IAmCA,QAAA,EAAA,KAAA;AAED,IAAO,QAAA,EAAA,KAAA;IAKH,IAAO,EAAA,GAAE;IACT,MAAO,EAAC,MAAE,CAAA,MAAA,GAAA,MAAgB,CAAA,UAAA,GAAA,SAAA;;AAE7B;AA2CD,eAAO,iBAIJ,CAAA,YAAA,EAAA;IACC,OAAO,YAAU,CAAA,KAAA,CAAA;QACV,KAAG,EAAA,uBAAgB;QACpB,OAAG,EAAA;AACZ,YAAA,OAAA,EAAA;;aAwBC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/config/defaultSettings.d.ts

@@ -1,7 +1,10 @@
-import { ProSettings } from '../interfaces';
+import { ProSettings, SearchbarSettings } from '../interfaces';
+import { NavigationMode, SideMenuType, SearchBarBehavior } from '../interfaces/settings';
+import { ContentWidth } from '../interfaces/pure-settings';
 export type ISettings = ProSettings & {
     logo: string;
     showSettingPanel: boolean;
+    secondaryColor: string;
     titleColor: string;
     language: string;
     fontFamily: string;
@@ -14,6 +17,110 @@ export type ISettings = ProSettings & {
     textColor: string;
     theme: string;
     themeType: string;
+    loginThemeColor: string;
+    loginFormPosition: string;
+    loginSocials: string;
+    loginBackgroundImage: string;
+    verifyFormLayout: string;
+    verifyFormImageUrl: string;
+    verifyFormBackgroundStyle: string;
+    verifyFormVisibleFields: string;
+    verifyFormShowSkipButton: boolean;
+    searchbarSettings: SearchbarSettings;
+    currentRoute: string;
+    routeSettings: Record<string, {
+        layout: {
+            desktop: {
+                navigationMode: NavigationMode;
+                sideMenuType: SideMenuType;
+                contentWidth: ContentWidth;
+                fixedHeader: boolean;
+                fixedSidebar: boolean;
+                splitMenus: boolean;
+                upperMenuDividerName: string;
+                middleMenuDividerName: string;
+                lowerMenuDividerName: string;
+            };
+            mobile: {
+                navigationMode: NavigationMode;
+                sideMenuType: SideMenuType;
+                contentWidth: ContentWidth;
+                fixedHeader: boolean;
+                fixedSidebar: boolean;
+                splitMenus: boolean;
+                upperMenuDividerName: string;
+                middleMenuDividerName: string;
+                lowerMenuDividerName: string;
+            };
+        };
+        regions: {
+            desktop: {
+                header: {
+                    showLogo: boolean;
+                    showSearchSlot: boolean;
+                    showRightContent: boolean;
+                    showMenuToggle: boolean;
+                    showBackButton: boolean;
+                    showPageTitle: boolean;
+                    showActionButtons: boolean;
+                    position: string;
+                    height: string;
+                    backgroundColor: string;
+                    elevation: number;
+                    showHeader: boolean;
+                    showMenu: boolean;
+                    menuHeaderRender: boolean;
+                    searchBarRender: boolean;
+                    searchBarBehavior: SearchBarBehavior;
+                    searchBarOverlay: boolean;
+                    scrollThreshold: number;
+                };
+                background: {
+                    type: string;
+                    color: string;
+                    image: string;
+                    video: string;
+                    videoThumbnail: string;
+                };
+                footer: {
+                    showFooter: boolean;
+                };
+            };
+            mobile: {
+                header: {
+                    showLogo: boolean;
+                    showSearchSlot: boolean;
+                    showRightContent: boolean;
+                    showMenuToggle: boolean;
+                    showBackButton: boolean;
+                    showPageTitle: boolean;
+                    showActionButtons: boolean;
+                    position: string;
+                    height: string;
+                    backgroundColor: string;
+                    elevation: number;
+                    showHeader: boolean;
+                    showMenu: boolean;
+                    menuHeaderRender: boolean;
+                    searchBarRender: boolean;
+                    searchBarBehavior: SearchBarBehavior;
+                    searchBarOverlay: boolean;
+                    scrollThreshold: number;
+                };
+                background: {
+                    type: string;
+                    color: string;
+                    image: string;
+                    video: string;
+                };
+                footer: {
+                    showFooter: boolean;
+                };
+            };
+        };
+    }>;
+    components: any[];
+    activeComponent: string | null;
 };
 export declare const defaultSettings: ISettings;
 //# sourceMappingURL=defaultSettings.d.ts.map

package/lib/config/defaultSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defaultSettings.d.ts","sourceRoot":"","sources":["../../src/config/defaultSettings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,WAAW,EAAE,MAAM,eAAe,CAAC;AAEvD,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,OAAO,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACrB,CAAA;AAED,eAAO,MAAM,eAAe,EAAE,SAkC7B,CAAC"}
+{"version":3,"file":"defaultSettings.d.ts","sourceRoot":"","sources":["../../src/config/defaultSettings.ts"],"names":[],"mappings":"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"}