@admin-layout/client 10.1.1-alpha.14 → 10.1.1-alpha.23

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,KAA6C,MAAM,OAAO,CAAC;AAKlE,UAAU,yBAAyB;IAC/B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC7B;AAED,wBAAgB,oBAAoB,CAAC,EAAE,QAAQ,EAAE,EAAE,yBAAyB,GAAG,KAAK,CAAC,YAAY,CA0BhG"}
+{"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,5 +1,6 @@
-import {jsx,Fragment}from'react/jsx-runtime';import {useLoaderData}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 { 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 hasDispatched = useRef(false);
     // Handle both server and client side

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

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

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,CA6BD;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;;GAkB7D,CAAC"}
+{"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,eAAe,EAAE,MAAM,2BAA2B,CAAC;AA8B7E,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,17 +1,41 @@
-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', {
+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';const settingsCookie = createCookie('settings', {
     maxAge: 60 * 60 * 24 * 30, // 1 month
     httpOnly: false, // Allow client-side access
     sameSite: 'lax',
     path: '/', // Ensure cookie is available for all paths
     domain: config.isProd ? config.APP_DOMAIN : undefined,
 });
-async function settingsLoaderUtil({ request }) {
+// Helper to fetch page settings from Apollo
+async function fetchPageSettings(apolloClient, orgName) {
+    return apolloClient.query({
+        query: GetPageSettingsDocument,
+        context: {
+            headers: {
+                'Content-Type': 'application/json',
+            },
+        },
+        variables: {
+            resourceUri: `cdecode://default/${orgName}#settings`,
+            options: {
+                schemaId: 'uiLayout',
+                extensionName: config?.LAYOUT_SETTINGS?.extensionName || 'account',
+            },
+        },
+    });
+}
+async function settingsLoaderUtil({ request, context, params, }) {
     const cookieHeader = request.headers.get('Cookie');
     let settings;
+    const { apolloClient } = context;
+    const { orgName: orgNameFromParams } = params || {};
+    const orgName = request.headers.get('orgname') || orgNameFromParams || '';
+    const result = await fetchPageSettings(apolloClient, orgName);
+    const pageSettings = JSON.parse(JSON.stringify(result.data.pageSettings.settings));
+    let pageDefaultSettings = pageSettings?.uilayout || defaultSettings || {};
     try {
         settings = await settingsCookie.parse(cookieHeader);
         console.log('Parsed cookie settings:', settings);
-        assignDefaults(settings, defaultSettings);
+        assignDefaults(settings, pageDefaultSettings);
     }
     catch (error) {
         console.error('Error parsing settings cookie:', error);
@@ -19,31 +43,38 @@ async function settingsLoaderUtil({ request }) {
     }
     // If no settings in cookie, generate default settings
     if (!settings) {
-        const fullSettings = merge({}, defaultSettings, config.LAYOUT_SETTINGS);
-        assignDefaults(fullSettings, defaultSettings);
+        const fullSettings = merge({}, pageDefaultSettings, config.LAYOUT_SETTINGS);
+        assignDefaults(fullSettings, pageDefaultSettings);
         // Only store differences to keep cookie size small
-        const diffSettings = await compareAndSaveSettingsDifferences(fullSettings, defaultSettings);
+        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({}, defaultSettings, config.LAYOUT_SETTINGS, settings);
+    const fullSettings = merge({}, pageDefaultSettings, config.LAYOUT_SETTINGS, settings);
     // Refresh the cookie to keep it active
     const cookie = await settingsCookie.serialize(settings);
     return { settings: fullSettings, setCookie: cookie };
 }
-const action = async ({ request }) => {
+const action = async ({ request, context, params, }) => {
     try {
+        const { apolloClient } = context;
+        //console.log('request', request);
+        const orgName = request.headers.get('orgname') || '';
+        const result = await fetchPageSettings(apolloClient, orgName);
+        const pageSettings = JSON.parse(JSON.stringify(result.data.pageSettings.settings));
+        let pageDefaultSettings = pageSettings?.uilayout || defaultSettings || {};
         const jsonData = await request.json();
+        console.log('jsonData....', jsonData);
         const payload = jsonData?.config || {};
-        assignDefaults(payload, defaultSettings);
+        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, defaultSettings);
+            assignDefaults(mergedSettings, pageDefaultSettings);
         }
         catch (error) {
             console.error('Error parsing settings cookie in action:', error);
@@ -52,7 +83,7 @@ const action = async ({ request }) => {
         // Merge everything together
         const fullSettings = merge({}, config.LAYOUT_SETTINGS, mergedSettings);
         // Store only differences from default
-        const diffSettings = await compareAndSaveSettingsDifferences(fullSettings, defaultSettings);
+        const diffSettings = await compareAndSaveSettingsDifferences(fullSettings, pageDefaultSettings);
         // Create a new cookie with the diff settings
         const newCookie = await settingsCookie.serialize(diffSettings);
         return json(fullSettings, {
@@ -66,9 +97,9 @@ const action = async ({ request }) => {
         return json({ error: 'Failed to update settings' }, { status: 500 });
     }
 };
-const loader = async ({ request }) => {
+const loader = async ({ request, context, params, }) => {
     try {
-        const { settings, setCookie } = await settingsLoaderUtil({ request });
+        const { settings, setCookie } = await settingsLoaderUtil({ request, context, params });
         // Always include headers, but only set cookie if provided
         const headers = {};
         if (setCookie) {
@@ -79,8 +110,14 @@ const loader = async ({ request }) => {
     catch (error) {
         console.error('Error in settings loader:', error);
         // Fall back to default settings
+        const { apolloClient } = context;
+        const { orgName: orgNameFromParams } = params || {};
+        const orgName = request.headers.get('orgname') || orgNameFromParams || '';
+        const result = await fetchPageSettings(apolloClient, orgName);
+        const pageSettings = JSON.parse(JSON.stringify(result.data.pageSettings.settings));
+        let pageDefaultSettings = pageSettings?.uilayout || defaultSettings || {};
         return json({
-            settings: merge({}, defaultSettings, config.LAYOUT_SETTINGS),
+            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":[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;AAoC9D,IAAO,MAAA,EAAA,MAAA,CAAA,MAAY,GAAA,MAAuB,CAAA,UAAA,GAAA,SAAA;;AAAoB,eAAA,kBAAA,CAAA,EAAA,OAAA,EAAA,EAAA;;IAkB5D,IAAA,QAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"UpdateSettings.server.js","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"sourcesContent":[null],"names":[],"mappings":"4bA8CY,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,OAAA,EAAA;IACC,OAAO,YAAU,CAAA,KAAA,CAAA;QACV,KAAG,EAAA,uBAAgB;QACpB,OAAG,EAAA;AACZ,YAAA,OAAA,EAAA;;aAwBC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/config/env-config.js

@@ -2,7 +2,7 @@ import*as envalid from'envalid';import {getEnvironment}from'@common-stack/core';
 const env = getEnvironment();
 const preConfig = envalid.cleanEnv(env, {
     LAYOUT_SETTINGS: json({
-        default: JSON.stringify(defaultSettings),
+        default: JSON.stringify({ ...defaultSettings, extensionName: 'account' }),
     }),
     APP_DOMAIN: envalid.str({ default: 'cdebase.dev' }),
 });

package/lib/hooks/useLayoutSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useLayoutSettings.d.ts","sourceRoot":"","sources":["../../src/hooks/useLayoutSettings.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,iBAAiB;;0BA4BP,GAAG;;CA6CzB,CAAC"}
+{"version":3,"file":"useLayoutSettings.d.ts","sourceRoot":"","sources":["../../src/hooks/useLayoutSettings.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,iBAAiB;;0BAiCP,GAAG;;CA+CzB,CAAC"}

package/lib/hooks/useLayoutSettings.js

@@ -1,4 +1,4 @@
-import {useCallback}from'react';import {useDispatch,useSelector}from'react-redux';import {merge}from'lodash-es';import {defaultSettings}from'../config/defaultSettings.js';import {CHANGE_SETTINGS_ACTION}from'../constants/constants.js';import {compareAndSaveSettingsDifferences}from'../utils/settingsDifference.js';const updateColorWeak = (colorWeak) => {
+import {useCallback}from'react';import {useDispatch,useSelector}from'react-redux';import {merge}from'lodash-es';import {defaultSettings}from'../config/defaultSettings.js';import {CHANGE_SETTINGS_ACTION}from'../constants/constants.js';import {compareAndSaveSettingsDifferences}from'../utils/settingsDifference.js';import {useParams}from'react-router';const updateColorWeak = (colorWeak) => {
     // @sri to avoid breaking during SSR, split into to checks
     if (typeof window !== 'undefined') {
         const root = document.getElementById('root');
@@ -10,12 +10,17 @@ import {useCallback}from'react';import {useDispatch,useSelector}from'react-redux
 const useLayoutSettings = () => {
     const dispatch = useDispatch();
     const settings = useSelector((state) => state.settings);
+    const { orgName: orgNameFromParams } = useSelector((state) => ({
+        orgName: state.platform.orgName,
+    }));
+    const { orgName: orgNameFromUrl } = useParams();
     const getSettings = useCallback(async () => {
         try {
             const response = await fetch('/resources/settings', {
                 method: 'GET',
                 headers: {
                     'Content-Type': 'application/json',
+                    orgName: orgNameFromParams || orgNameFromUrl || '',
                 },
             });
             if (!response.ok) {
@@ -45,6 +50,7 @@ const useLayoutSettings = () => {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
+                    orgName: orgNameFromParams || orgNameFromUrl || '',
                 },
                 body: JSON.stringify({ config: cleanDiffSettings }),
             });
@@ -52,8 +58,9 @@ const useLayoutSettings = () => {
                 throw new Error('Failed to update settings');
             }
             const result = await response.json();
+            const pageDefaultSettings = result || defaultSettings;
             // Merge the full config with default settings before updating the store
-            const mergedSettings = merge({}, defaultSettings, config);
+            const mergedSettings = merge({}, pageDefaultSettings, config);
             dispatch({
                 type: CHANGE_SETTINGS_ACTION,
                 payload: mergedSettings,

package/lib/hooks/useLayoutSettings.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLayoutSettings.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"useLayoutSettings.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/interfaces/default-settings.d.ts

@@ -6,5 +6,6 @@ export type DefaultSettings = Partial<ProSettings> & {
     textColor?: string;
     theme?: string;
     themeType?: string;
+    extensionName?: string;
 };
 //# sourceMappingURL=default-settings.d.ts.map

package/lib/interfaces/default-settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"default-settings.d.ts","sourceRoot":"","sources":["../../src/interfaces/default-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC"}
+{"version":3,"file":"default-settings.d.ts","sourceRoot":"","sources":["../../src/interfaces/default-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@admin-layout/client",
-    "version": "10.1.1-alpha.14",
+    "version": "10.1.1-alpha.23",
     "description": "Sample client for higher packages to depend on",
     "license": "ISC",
     "author": "CDMBase LLC",
@@ -23,7 +23,7 @@
         "watch": "yarn build:lib:watch"
     },
     "dependencies": {
-        "@common-stack/client-core": "7.1.1-alpha.14",
+        "@common-stack/client-core": "7.1.1-alpha.29",
         "common": "10.1.1-alpha.0",
         "serialize-error": "^8.0.0"
     },
@@ -40,5 +40,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "377421f92a20ac0db0d2d59a6c5df304669bc01e"
+    "gitHead": "73dd894ad8c271ff66dc539da2c4d0bfd45b6ff8"
 }