@admin-layout/client 12.0.16-alpha.24 → 12.0.16-alpha.25

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

@@ -1,6 +1,6 @@
-import { ProSettings } from '../../interfaces';
 import { IAppLoadContext } from '@common-stack/client-core';
 import { IResourceParams } from '@common-stack/core';
+import { ProSettings } from '../../interfaces';
 export declare function settingsLoaderUtil({ request, context, params, }: {
     request: Request;
     context?: IAppLoadContext;

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,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAuCrD,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":"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"}

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';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.
+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.
 const settingsCookie = createCookie('settings', {
     maxAge: 60 * 60 * 24 * 30, // 1 month
     httpOnly: false, // Allow client-side access
@@ -40,6 +40,12 @@ async function settingsLoaderUtil({ request, context, params, }) {
         ? JSON.parse(JSON.stringify(result?.data?.pageSettings?.settings))
         : null;
     let pageDefaultSettings = pageSettings?.uilayout || defaultSettings || {};
+    // TEMPORARY: Manually add hiddenMenuKeys to defaults until GraphQL schema is updated
+    pageDefaultSettings = {
+        ...pageDefaultSettings,
+        hiddenMenuKeys: [],
+        hiddenMenuCategories: [],
+    };
     try {
         settings = await settingsCookie.parse(cookieHeader);
         console.log('Parsed cookie settings:', settings);
@@ -66,34 +72,52 @@ async function settingsLoaderUtil({ request, context, params, }) {
 }
 const action = async ({ request, context, params, }) => {
     try {
+        // 1. Fetch default settings from GraphQL (or fallback to local defaults)
         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 || {};
+        // 2 TEMPORARY: Manually add hiddenMenuKeys to defaults until GraphQL schema is updated
+        pageDefaultSettings = {
+            ...pageDefaultSettings,
+            hiddenMenuKeys: [],
+            hiddenMenuCategories: [],
+        };
+        // 3. Parse the incoming settings update from the client (usually only changed keys)
         const jsonData = await request.json();
-        console.log('jsonData....', jsonData);
         const payload = jsonData?.config || {};
+        // 4. Fill in any missing default keys in the payload (does not overwrite user values)
         assignDefaults(payload, pageDefaultSettings);
+        // 5. Parse existing settings from the cookie (if present)
         const cookieHeader = request.headers.get('Cookie');
         let existingSettings;
         let mergedSettings;
         try {
             existingSettings = await settingsCookie.parse(cookieHeader);
+            // 6. Merge existing settings with the new payload from the client
             mergedSettings = merge({}, existingSettings, payload);
+            // 7. Ensure merged settings have all default keys (again, does not overwrite user values)
             assignDefaults(mergedSettings, pageDefaultSettings);
         }
         catch (error) {
+            // If cookie parsing fails, fall back to just the payload
             console.error('Error parsing settings cookie in action:', error);
             existingSettings = null;
         }
-        // Build full settings with defaults first, then overlay merged cookie+payload
+        // 8. Build the final settings object: defaults → config.LAYOUT_SETTINGS → merged user settings
         const fullSettings = merge({}, pageDefaultSettings, config.LAYOUT_SETTINGS, mergedSettings);
-        // Store only differences from default
+        // TEMPORARY FIX: Manually override hiddenMenuKeys with payload value
+        // This ensures payload array replaces the prev array values
+        if (payload.hiddenMenuKeys !== undefined) {
+            fullSettings.hiddenMenuKeys = [...payload.hiddenMenuKeys];
+        }
+        // 9. Store only the differences from the defaults in the cookie (to minimize cookie size)
         const diffSettings = await compareAndSaveSettingsDifferences(fullSettings, pageDefaultSettings);
-        // Create a new cookie with the diff settings
+        // 10. Serialize the diff settings into a cookie string
         const newCookie = await settingsCookie.serialize(diffSettings);
+        // 11. Return the full settings as JSON, and set the new cookie in the response headers
         return json(fullSettings, {
             headers: {
                 'Set-Cookie': newCookie,
@@ -101,6 +125,7 @@ const action = async ({ request, context, params, }) => {
         });
     }
     catch (error) {
+        // If anything fails, log the error and return a 500 error response
         console.error('Error in action:', error);
         return json({ error: 'Failed to update settings' }, { status: 500 });
     }
@@ -124,6 +149,12 @@ const loader = async ({ request, context, params, }) => {
             ? JSON.parse(JSON.stringify(result.data.pageSettings.settings))
             : null;
         let pageDefaultSettings = pageSettings?.uilayout || defaultSettings || {};
+        // TEMPORARY: Manually add hiddenMenuKeys to defaults until GraphQL schema is updated
+        pageDefaultSettings = {
+            ...pageDefaultSettings,
+            hiddenMenuKeys: [], // Array format for menu visibility
+            hiddenMenuCategories: [], // Array format for category visibility
+        };
         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":"sbAuDC;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,IAAO;QACA,OAAG,MAAA,YAAgB,CAAA,KAAA,CAAA;YACjB,KAAA,EAAA,uBAAgB;AAC5B,YAAA,OAAA,EAAA;;oBAwBC,cAAA,EAAA,kBAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"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,MAAQ,EAAA,EAAE,aAAY,EAAA;IACtB,QAAS,EAAA;AACZ,IA0CA,QAAA,EAAA,KAAA;AAED,IAAO,IAAA,EAAA,GAAA;IAKH,MAAO,EAAA,aAAU,GAAA,MAAA,CAAA,UAAA,GAAA,SAAA;;;AAGpB,eAAA,iBAAA,CAAA,YAAA,EAAA;AAkED,IAAO,IAAA;QAKI,aAAU,YAAA,CAAA,KAAA,CAAA;YACT,KAAE,EAAA,uBAAgB;YACjB,OAAA,EAAA;AACZ,gBAAA,OAAA,EAAA;;iBAgCC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@admin-layout/client",
-    "version": "12.0.16-alpha.24",
+    "version": "12.0.16-alpha.25",
     "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.52",
+        "@common-stack/client-core": "7.1.1-alpha.63",
         "common": "12.0.16-alpha.24",
         "serialize-error": "^8.0.0"
     },
@@ -40,5 +40,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "78ab2ad3ebc784c053388fa343e2fe7f4d9adb01"
+    "gitHead": "8b62bff1ab82f6131580a877203778f33c4aa8c4"
 }