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

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":"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"}
+{"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;AAiC7E,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,4 +1,5 @@
-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', {
+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: false, // Allow client-side access
     sameSite: 'lax',
@@ -6,7 +7,7 @@ import {createCookie,json}from'@remix-run/node';import {merge}from'lodash-es';im
     domain: config.isProd ? config.APP_DOMAIN : undefined,
 });
 // Helper to fetch page settings from Apollo
-async function fetchPageSettings(apolloClient, orgName) {
+async function fetchPageSettings(apolloClient) {
     return apolloClient.query({
         query: GetPageSettingsDocument,
         context: {
@@ -15,10 +16,10 @@ async function fetchPageSettings(apolloClient, orgName) {
             },
         },
         variables: {
-            resourceUri: `cdecode://default/${orgName}#settings`,
+            resourceUri: `cdecode://default/uilayout#uiSettings`,
             options: {
                 schemaId: 'uiLayout',
-                extensionName: config?.LAYOUT_SETTINGS?.extensionName || 'account',
+                target: 2 /* ConfigurationTarget.APPLICATION */,
             },
         },
     });
@@ -27,10 +28,10 @@ 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));
+    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);
@@ -59,10 +60,10 @@ async function settingsLoaderUtil({ request, context, params, }) {
 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));
+        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);
@@ -111,10 +112,10 @@ const loader = async ({ request, context, params, }) => {
         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));
+        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),

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":"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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"UpdateSettings.server.js","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"sourcesContent":[null],"names":[],"mappings":";MAkDa,iBAAS,YAAA,CAAA,UAAA,EAAA;AACrB,IAmCA,MAAA,EAAA,EAAA,GAAA,EAAA,GAAA,EAAA,GAAA,EAAA;AAED,IAAO,QAAA,EAAA,KAAA;IAKH,QAAO;IACP,IAAO,EAAA,GAAG;IACV,MAAM,EAAG,MAAA,CAAA,MAAA,GAAe,MAAC,CAAA,UAAA,GAAA,SAAA;AAC5B,CAAA,CAAA;AA2CD;gCAKqB,CAAA,YAAA,EAAA;IACjB,OAAO,YAAG,CAAA,KAAe,CAAC;QACpB,KAAG,EAAA,uBAAgB;AAC5B,QAAA,OAAA,EAAA;;gBAwBC,cAAA,EAAA,kBAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@admin-layout/client",
-    "version": "10.1.1-alpha.23",
+    "version": "10.1.1-alpha.25",
     "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": "73dd894ad8c271ff66dc539da2c4d0bfd45b6ff8"
+    "gitHead": "fab8da16290065ebdbbf6c386dd501bebe02a2bd"
 }