@admin-layout/client 12.0.16-alpha.67 → 12.0.16-alpha.70

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

@@ -1 +1 @@
-{"version":3,"file":"useLayoutSettings.d.ts","sourceRoot":"","sources":["../../src/hooks/useLayoutSettings.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,iBAAiB;;0BAgDP,GAAG;;CAiEzB,CAAC;AAEF,wBAAgB,mBAAmB,IAAI,QAAQ,GAAG,SAAS,CAY1D"}
+{"version":3,"file":"useLayoutSettings.d.ts","sourceRoot":"","sources":["../../src/hooks/useLayoutSettings.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,iBAAiB;;0BAgDP,GAAG;;CAyEzB,CAAC;AAEF,wBAAgB,mBAAmB,IAAI,QAAQ,GAAG,SAAS,CAY1D"}

package/lib/hooks/useLayoutSettings.js

@@ -57,13 +57,20 @@ const useLayoutSettings = () => {
             const cleanDiffSettings = compareAndSaveSettingsDifferences(config, settings);
             if (Object.keys(cleanDiffSettings).length === 0)
                 return;
+            if (config?.routerPattern && cleanDiffSettings.routerPattern) {
+                delete cleanDiffSettings.routerPattern;
+            }
+            const payloadConfig = config?.routerPattern
+                ? { [config.routerPattern]: cleanDiffSettings }
+                : cleanDiffSettings;
+            console.log('payloadConfig :', payloadConfig);
             const response = await fetch('/resources/settings', {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
                     orgName: orgNameFromParams || orgNameFromUrl || '',
                 },
-                body: JSON.stringify({ config: cleanDiffSettings, deviceType: getClientDeviceType() }),
+                body: JSON.stringify({ config: payloadConfig, deviceType: getClientDeviceType() }),
             });
             // Check content type before parsing
             const contentType = response.headers.get('content-type');

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/utils/settingsDifference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settingsDifference.d.ts","sourceRoot":"","sources":["../../src/utils/settingsDifference.ts"],"names":[],"mappings":"AAkLA;;;GAGG;AACH,eAAO,MAAM,iCAAiC,GAAI,iBAAiB,GAAG,EAAE,iBAAiB,GAAG,QA6D3F,CAAC"}
+{"version":3,"file":"settingsDifference.d.ts","sourceRoot":"","sources":["../../src/utils/settingsDifference.ts"],"names":[],"mappings":"AAkLA;;;GAGG;AACH,eAAO,MAAM,iCAAiC,GAAI,iBAAiB,GAAG,EAAE,iBAAiB,GAAG,QA8D3F,CAAC"}

package/lib/utils/settingsDifference.js

@@ -99,19 +99,20 @@ const compareAndSaveSettingsDifferences = (currentSettings, defaultSettings) =>
         });
         const baseSettingsDiff = getDifference(currentBase, defaultBase);
         // Combine base settings differences with overrides
-        const diffSettings = {};
-        // Add base settings differences if any exist
-        if (baseSettingsDiff && Object.keys(baseSettingsDiff).length > 0) {
-            Object.assign(diffSettings, baseSettingsDiff);
-        }
-        // Add all overrides (they are always different from defaults)
-        Object.assign(diffSettings, overrides);
-        // If there are no differences at all, return early
-        if (Object.keys(diffSettings).length === 0) {
-            return {};
-        }
+        // const diffSettings: any = {};
+        // // Add base settings differences if any exist
+        // if (baseSettingsDiff && Object.keys(baseSettingsDiff).length > 0) {
+        //     Object.assign(diffSettings, baseSettingsDiff);
+        // }
+        // console.log('diffSettings :', diffSettings);
+        // // Add all overrides (they are always different from defaults)
+        // Object.assign(diffSettings, overrides);
+        // // If there are no differences at all, return early
+        // if (Object.keys(diffSettings).length === 0) {
+        //     return {};
+        // }
         // Remove empty objects from the diff
-        const cleanDiffSettings = removeEmptyObjects(diffSettings);
+        const cleanDiffSettings = removeEmptyObjects(baseSettingsDiff);
         return cleanDiffSettings;
     }
     catch (error) {

package/lib/utils/settingsDifference.js.map

@@ -1 +1 @@
-{"version":3,"file":"settingsDifference.js","sources":["../../src/utils/settingsDifference.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAqLG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"settingsDifference.js","sources":["../../src/utils/settingsDifference.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAqLG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@admin-layout/client",
-    "version": "12.0.16-alpha.67",
+    "version": "12.0.16-alpha.70",
     "description": "Sample client for higher packages to depend on",
     "license": "ISC",
     "author": "CDMBase LLC",
@@ -26,7 +26,7 @@
         "serialize-error": "^8.0.0"
     },
     "devDependencies": {
-        "common": "12.0.16-alpha.64",
+        "common": "12.0.16-alpha.70",
         "rc-menu": "^9.16.1"
     },
     "peerDependencies": {
@@ -44,5 +44,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "d8c9237b79c0bb4b1457cf446ab77dd5b43d8e05"
+    "gitHead": "a086ab5ea5213416f3c5e929bd68a74f2e89979e"
 }