@admin-layout/client 12.0.16-alpha.37 → 12.0.16-alpha.40

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":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAMrD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAuC/C,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,CA0CD;AAED,eAAO,MAAM,MAAM,GAAU,+BAI1B;IACC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,MAAM,CAAC,EAAE,eAAe,CAAC;CAC5B,oEAgEA,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;;GAgCA,CAAC"}
+{"version":3,"file":"UpdateSettings.server.d.ts","sourceRoot":"","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAerD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAoD/C,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,CA2CD;AAED,eAAO,MAAM,MAAM,GAAU,+BAI1B;IACC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,MAAM,CAAC,EAAE,eAAe,CAAC;CAC5B,oEAgEA,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;;GAiCA,CAAC"}

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

@@ -1,4 +1,4 @@
-import {createCookie,json}from'@remix-run/node';import {GetPageSettingsDocument}from'common/graphql';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';// NOTE: We are temporarily using `defaultSettings`. This will be removed once `defaultSettings` is updated in the all packages.
+import {createCookie,json}from'@remix-run/node';import {ConfigCollectionName,ConfigFragmentName,ConfigurationSchemaId}from'common';import {GetPageSettingsDocument}from'common/graphql';import {merge}from'lodash-es';import {config}from'../../config/env-config.js';import'../../config/defaultSettings.js';import'react';import'@cdm-logger/client';import {compareAndSaveSettingsDifferences}from'../../utils/settingsDifference.js';import {assignDefaults}from'../../utils/assignDefaults.js';import {generateCdecodeUri,DEFAULT_TENANT_ID}from'@adminide-stack/core';// 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
@@ -9,6 +9,12 @@ const settingsCookie = createCookie('settings', {
 // Helper to fetch page settings from Apollo
 async function fetchPageSettings(apolloClient) {
     try {
+        // Generate the same resource URI as SettingDrawer.tsx
+        const resource = generateCdecodeUri(DEFAULT_TENANT_ID, {
+            resourceType: ConfigCollectionName.Applications,
+            resourceId: config.APPLICATION_ID,
+            idField: 'appId',
+        }, {}, ConfigFragmentName.UiSettings);
         return await apolloClient.query({
             query: GetPageSettingsDocument,
             context: {
@@ -17,9 +23,9 @@ async function fetchPageSettings(apolloClient) {
                 },
             },
             variables: {
-                resourceUri: `cdecode://default/uilayout#uiSettings`,
+                resourceUri: resource,
                 options: {
-                    schemaId: 'uiLayout',
+                    schemaId: ConfigurationSchemaId.UiLayout,
                     target: 2 /* ConfigurationTarget.APPLICATION */,
                 },
             },
@@ -36,10 +42,11 @@ async function settingsLoaderUtil({ request, context, params, }) {
     let settings;
     const { apolloClient } = context;
     const result = await fetchPageSettings(apolloClient);
+    console.log('RESULT', JSON.stringify(result));
     const pageSettings = result?.data?.pageSettings?.settings
         ? JSON.parse(JSON.stringify(result?.data?.pageSettings?.settings))
         : null;
-    let pageDefaultSettings = pageSettings?.uilayout || defaultSettings || {};
+    let pageDefaultSettings = pageSettings?.uilayout || pageSettings || {};
     // TEMPORARY: Manually add hiddenMenuKeys to defaults until GraphQL schema is updated
     pageDefaultSettings = {
         ...pageDefaultSettings,
@@ -78,7 +85,7 @@ const action = async ({ request, context, params, }) => {
         const pageSettings = result?.data?.pageSettings?.settings
             ? JSON.parse(JSON.stringify(result.data.pageSettings.settings))
             : null;
-        let pageDefaultSettings = pageSettings?.uilayout || defaultSettings || {};
+        let pageDefaultSettings = pageSettings?.uilayout || pageSettings || {};
         // 2 TEMPORARY: Manually add hiddenMenuKeys to defaults until GraphQL schema is updated
         pageDefaultSettings = {
             ...pageDefaultSettings,
@@ -145,10 +152,11 @@ const loader = async ({ request, context, params, }) => {
         // Fall back to default settings
         const { apolloClient } = context;
         const result = await fetchPageSettings(apolloClient);
+        console.log('result', result);
         const pageSettings = result?.data?.pageSettings?.settings
             ? JSON.parse(JSON.stringify(result.data.pageSettings.settings))
             : null;
-        let pageDefaultSettings = pageSettings?.uilayout || defaultSettings || {};
+        let pageDefaultSettings = pageSettings?.uilayout || pageSettings || {};
         // TEMPORARY: Manually add hiddenMenuKeys to defaults until GraphQL schema is updated
         pageDefaultSettings = {
             ...pageDefaultSettings,

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":";AAsDC,oBAAW,GAAA,YAAA,CAAA,UAAA,EAAA;IACR,MAAA,EAAQ,EAAE,aAAY,EAAA;IACtB,QAAA,EAAS;AACZ,IA0CA,QAAA,EAAA,KAAA;AAED,IAAA,IAAA,EAAA,GAAA;IAKI,MAAA,EAAO,aAAU,GAAA,MAAA,CAAA,UAAA,GAAA,SAAA;;;AAGpB,eAAA,iBAAA,CAAA,YAAA,EAAA;AAkED,IAAA,IAAA;QAKI,aAAiB,YAAA,CAAA,KAAA,CAAA;YACT,KAAE,EAAA,uBAAgB;YACnB,OAAE,EAAA;AACZ,gBAAA,OAAA,EAAA;;iBAgCC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"UpdateSettings.server.js","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"sourcesContent":[null],"names":[],"mappings":";MA8EI,iBAAkB,YAAA,CAAA,UAAA,EAAA;AACrB,IA2CA,MAAA,EAAA,EAAA,GAAA,EAAA,GAAA,EAAA,GAAA,EAAA;AAED,IAAA,QAAA,EAAA,KAAO;IAKH,QAAO;IACP,IAAA,EAAA,GAAQ;IACR,MAAM,EAAC,MAAE,CAAA,MAAA,GAAe,MAAC,CAAA,UAAA,GAAA,SAAA;AAC5B,CAAA,CAAA;AAkED;gCAKqB,CAAA,YAAA,EAAA;IACjB,IAAA;;AAEH,QAAA,MAAA,QAAA,GAAA,kBAAA,CAAA,iBAAA,EAAA;;YAiCC,UAAA,EAAA,MAAA,CAAA,cAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/config/env-config.d.ts

@@ -3,6 +3,7 @@ import { DefaultSettings } from '../interfaces';
 declare const preConfig: Readonly<{
     LAYOUT_SETTINGS: DefaultSettings;
     APP_DOMAIN: string;
+    APPLICATION_ID: string;
 } & envalid.CleanedEnvAccessors>;
 declare let config: typeof preConfig;
 export { config };

package/lib/config/env-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env-config.d.ts","sourceRoot":"","sources":["../../src/config/env-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAOhD,QAAA,MAAM,SAAS;;;gCAKb,CAAC;AACH,QAAA,IAAI,MAAM,EAAS,OAAO,SAAS,CAAC;AAepC,OAAO,EAAE,MAAM,EAAE,CAAC"}
+{"version":3,"file":"env-config.d.ts","sourceRoot":"","sources":["../../src/config/env-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAOhD,QAAA,MAAM,SAAS;;;;gCAMb,CAAC;AACH,QAAA,IAAI,MAAM,EAAS,OAAO,SAAS,CAAC;AAepC,OAAO,EAAE,MAAM,EAAE,CAAC"}

package/lib/config/env-config.js

@@ -2,9 +2,10 @@ 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, extensionName: 'account' }),
+        default: JSON.stringify({}),
     }),
     APP_DOMAIN: envalid.str({ default: 'cdebase.dev' }),
+    APPLICATION_ID: envalid.str({ default: 'default' }),
 });
 let config = {};
 // Parse the LAYOUT_SETTINGS if it exists in the environment

package/lib/config/env-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"env-config.js","sources":["../../src/config/env-config.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAeA,MAAA,SAAI,GAAM,OAAS,CAAA,YAAiB,EAAA;AAepC,IAAA,eAAkB,EAAA,IAAA,CAAA;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"env-config.js","sources":["../../src/config/env-config.ts"],"sourcesContent":[null],"names":[],"mappings":";;kCAeG,CAAA,GAAA,EAAA;AACH,IAAA,eAAU,EAAS,IAAA,CAAA;AAenB,QAAO,OAAQ,EAAE,IAAC,CAAA,SAAA,CAAA,EAAA,CAAA;;;;;;;;;;;;;;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@admin-layout/client",
-    "version": "12.0.16-alpha.37",
+    "version": "12.0.16-alpha.40",
     "description": "Sample client for higher packages to depend on",
     "license": "ISC",
     "author": "CDMBase LLC",
@@ -23,8 +23,9 @@
         "watch": "yarn build:lib:watch"
     },
     "dependencies": {
+        "@adminide-stack/core": "12.0.4-alpha.236",
         "@common-stack/client-core": "7.1.1-alpha.63",
-        "common": "12.0.16-alpha.37",
+        "common": "12.0.16-alpha.38",
         "serialize-error": "^8.0.0"
     },
     "peerDependencies": {
@@ -40,5 +41,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "9b3dbe1fe226f5f2f73af5c53b3fde77e80d9348"
+    "gitHead": "7409c4935186a49a29b01ba88c3722dc5b6405f2"
 }