@admin-layout/client 12.0.16-alpha.58 → 12.0.16-alpha.59

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/components/UpdateSettings/UpdateSettings.server.d.ts.map +1 -1
  2. package/lib/components/UpdateSettings/UpdateSettings.server.js +23 -36
  3. package/lib/components/UpdateSettings/UpdateSettings.server.js.map +1 -1
  4. package/package.json +3 -3
package/lib/components/UpdateSettings/UpdateSettings.server.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"UpdateSettings.server.d.ts","sourceRoot":"","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,cAAc,4CAMzB,CAAC;AAIH,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,kBAAkB,CAAC,EAAE,MAAM;;GAqF7F;AAED,wBAAsB,kBAAkB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE;;;;CAAA;;;GAqIpE"}
1
+ {"version":3,"file":"UpdateSettings.server.d.ts","sourceRoot":"","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,cAAc,4CAMzB,CAAC;AAIH,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,kBAAkB,CAAC,EAAE,MAAM;;GAqF7F;AAED,wBAAsB,kBAAkB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE;;;;CAAA;;;GAqGpE"}
package/lib/components/UpdateSettings/UpdateSettings.server.js CHANGED
@@ -92,41 +92,18 @@ async function settingsLoaderUtil({ request, context, params }) {
92
92
  const pageSettings = result?.data?.pageSettings?.settings
93
93
  ? JSON.parse(JSON.stringify(result?.data?.pageSettings?.settings))
94
94
  : null;
95
- // Object.keys(pageSettings || {}).forEach((key) => {
96
- // if (key.startsWith('[') && key.endsWith(']')) {
97
- // bracketOverrides[key] = pageSettings[key];
98
- // } else if (key !== 'uilayout') {
99
- // // Preserve other top-level settings like organization
100
- // otherSettings[key] = pageSettings[key];
101
- // }
102
- // });
103
- // let pageDefaultSettings = hasUilayoutData ? uilayout : pageSettings || {};
104
- let pageDefaultSettings = pageSettings;
105
- // console.log('🔍 DEBUG - bracketOverrides:', JSON.stringify(bracketOverrides, null, 2));
106
- // console.log('🔍 DEBUG - otherSettings:', JSON.stringify(otherSettings, null, 2));
95
+ // pageSettings now contains flat structure:
96
+ // {
97
+ // logo: '...', theme: '...', ...base settings,
98
+ // [desktop]: { overrides for desktop },
99
+ // [/dashboard][mobile]: { overrides for /dashboard on mobile },
100
+ // ... etc
101
+ // }
107
102
  // Add required keys that might not be in backend
108
- pageDefaultSettings = {
109
- ...pageDefaultSettings,
110
- hiddenMenuKeys: [],
111
- hiddenMenuCategories: [],
103
+ let pageDefaultSettings = {
104
+ ...pageSettings,
112
105
  };
113
- // Structure the settings properly for the frontend
114
- // The frontend expects uiSettings.overrides to contain the bracket pattern overrides
115
- // pageDefaultSettings = {
116
- // ...pageDefaultSettings,
117
- // ...otherSettings, // Add other top-level settings like organization
118
- // uiSettings: {
119
- // ...pageDefaultSettings.uiSettings,
120
- // overrides: bracketOverrides, // Put bracket overrides in uiSettings.overrides
121
- // },
122
- // };
123
106
  console.log('🔍 DEBUG - final pageDefaultSettings:', JSON.stringify(pageDefaultSettings, null, 2));
124
- // Add required keys that might not be in backend
125
- // pageDefaultSettings = {
126
- // ...pageDefaultSettings,
127
- // hiddenMenuKeys: [],
128
- // hiddenMenuCategories: [],
129
- // };
130
107
  // Fallback to config.LAYOUT_SETTINGS if backend returns empty
131
108
  const settingsKeys = Object.keys(pageDefaultSettings);
132
109
  const hasOnlyDefaultKeys = settingsKeys.length === 2 &&
@@ -138,8 +115,6 @@ async function settingsLoaderUtil({ request, context, params }) {
138
115
  : { ...config.LAYOUT_SETTINGS };
139
116
  pageDefaultSettings = {
140
117
  ...fallbackSettings,
141
- hiddenMenuKeys: [],
142
- hiddenMenuCategories: [],
143
118
  };
144
119
  }
145
120
  // Parse cookie settings
@@ -166,8 +141,20 @@ async function settingsLoaderUtil({ request, context, params }) {
166
141
  const cookie = await settingsCookie.serialize(diffSettings);
167
142
  return { settings: fullSettings, setCookie: cookie };
168
143
  }
169
- // Merge settings: backend defaults + config + cookie overrides
170
- const fullSettings = merge({}, pageDefaultSettings, config.LAYOUT_SETTINGS, settings);
144
+ // Extract base settings (non-bracket keys) from pageDefaultSettings
145
+ const baseSettings = {};
146
+ const bracketOverrides = {};
147
+ Object.keys(pageDefaultSettings).forEach((key) => {
148
+ if (key.startsWith('[') && key.endsWith(']')) {
149
+ bracketOverrides[key] = pageDefaultSettings[key];
150
+ }
151
+ else {
152
+ baseSettings[key] = pageDefaultSettings[key];
153
+ }
154
+ });
155
+ // Merge: base settings + config + cookie overrides, then add bracket overrides
156
+ const mergedBaseSettings = merge({}, baseSettings, config.LAYOUT_SETTINGS, settings);
157
+ const fullSettings = merge({}, mergedBaseSettings, bracketOverrides);
171
158
  // Refresh the cookie to keep it active
172
159
  const cookie = await settingsCookie.serialize(settings);
173
160
  console.log('FULL_SETTINGS', fullSettings);
package/lib/components/UpdateSettings/UpdateSettings.server.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"UpdateSettings.server.js","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"sourcesContent":[null],"names":[],"mappings":"qhBAiHqE,MAAA,cAAA,GAAA,YAAA,CAAA,UAAA,EAAA;;;AAqIpE,IAAA,QAAA,EAAA,KAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
1
+ {"version":3,"file":"UpdateSettings.server.js","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"sourcesContent":[null],"names":[],"mappings":"qhBAiHqE,MAAA,cAAA,GAAA,YAAA,CAAA,UAAA,EAAA;;;AAqGpE,IAAA,QAAA,EAAA,KAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@admin-layout/client",
3
- "version": "12.0.16-alpha.58",
3
+ "version": "12.0.16-alpha.59",
4
4
  "description": "Sample client for higher packages to depend on",
5
5
  "license": "ISC",
6
6
  "author": "CDMBase LLC",
@@ -26,7 +26,7 @@
26
26
  "serialize-error": "^8.0.0"
27
27
  },
28
28
  "devDependencies": {
29
- "common": "12.0.16-alpha.51",
29
+ "common": "12.0.16-alpha.59",
30
30
  "rc-menu": "^9.16.1"
31
31
  },
32
32
  "peerDependencies": {
@@ -44,5 +44,5 @@
44
44
  "typescript": {
45
45
  "definition": "lib/index.d.ts"
46
46
  },
47
- "gitHead": "efd185779ae70bff337be3796834fba601aae848"
47
+ "gitHead": "03aa1a41d438cdd8616b2d9a239728cc01dd9e45"
48
48
  }