@admin-layout/tailwind-design-pro 12.0.16-alpha.61 → 12.0.16-alpha.62
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.
- package/lib/components/LanguageMenu/LanguageMenu.d.ts.map +1 -1
- package/lib/components/LanguageMenu/LanguageMenu.js +8 -20
- package/lib/components/LanguageMenu/LanguageMenu.js.map +1 -1
- package/lib/components/Layout/BasicLayout/index.d.ts.map +1 -1
- package/lib/components/Layout/BasicLayout/index.js +1 -14
- package/lib/components/Layout/BasicLayout/index.js.map +1 -1
- package/lib/components/Layout/GlobalHeader/MainHeader.d.ts.map +1 -1
- package/lib/components/Layout/GlobalHeader/MainHeader.js +0 -1
- package/lib/components/Layout/GlobalHeader/MainHeader.js.map +1 -1
- package/lib/components/Layout/TailwindLayout.d.ts.map +1 -1
- package/lib/components/Layout/TailwindLayout.js +10 -8
- package/lib/components/Layout/TailwindLayout.js.map +1 -1
- package/lib/components/UpdateSettingsResource/UpdateSettingsResource.server.d.ts.map +1 -1
- package/lib/components/UpdateSettingsResource/UpdateSettingsResource.server.js +9 -48
- package/lib/components/UpdateSettingsResource/UpdateSettingsResource.server.js.map +1 -1
- package/package.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LanguageMenu.d.ts","sourceRoot":"","sources":["../../../src/components/LanguageMenu/LanguageMenu.tsx"],"names":[],"mappings":"AAQA,eAAO,MAAM,YAAY,+
|
|
1
|
+
{"version":3,"file":"LanguageMenu.d.ts","sourceRoot":"","sources":["../../../src/components/LanguageMenu/LanguageMenu.tsx"],"names":[],"mappings":"AAQA,eAAO,MAAM,YAAY,+CAyFxB,CAAC"}
|
|
@@ -1,12 +1,9 @@
|
|
|
1
|
-
import {jsxs,jsx}from'react/jsx-runtime';import {useState,useRef,useEffect}from'react';import {useTranslation}from'react-i18next';import {useMediaQuery}from'react-responsive';import {
|
|
1
|
+
import {jsxs,jsx}from'react/jsx-runtime';import {useState,useRef,useEffect}from'react';import {useTranslation}from'react-i18next';import {useMediaQuery}from'react-responsive';import {useAppDispatch,languages,CHANGE_LANGUAGE}from'@admin-layout/client';import {Globe}from'lucide-react';import config from'@app/cde-webconfig.json';const LanguageMenu = () => {
|
|
2
2
|
const isMobile = useMediaQuery({
|
|
3
3
|
maxWidth: 767
|
|
4
4
|
});
|
|
5
|
-
const
|
|
6
|
-
|
|
7
|
-
setSettings
|
|
8
|
-
} = useLayoutSettings();
|
|
9
|
-
const [locale, setLocale] = useState(settings?.language || 'en');
|
|
5
|
+
const [locale, setLocale] = useState('en');
|
|
6
|
+
const dispatch = useAppDispatch();
|
|
10
7
|
const {
|
|
11
8
|
i18n
|
|
12
9
|
} = useTranslation();
|
|
@@ -22,16 +19,12 @@ import {jsxs,jsx}from'react/jsx-runtime';import {useState,useRef,useEffect}from'
|
|
|
22
19
|
const [isOpen, setIsOpen] = useState(false);
|
|
23
20
|
const dropdownRef = useRef(null);
|
|
24
21
|
const filteredLanguages = languages.filter(language => i18nextInstance.supportedLngs.includes(language.key));
|
|
25
|
-
// Initialize currentLang from settings
|
|
26
22
|
useEffect(() => {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
}, [settings?.language]);
|
|
23
|
+
dispatch({
|
|
24
|
+
type: CHANGE_LANGUAGE,
|
|
25
|
+
payload: locale
|
|
26
|
+
});
|
|
27
|
+
}, [locale, dispatch]);
|
|
35
28
|
useEffect(() => {
|
|
36
29
|
const handleClickOutside = event => {
|
|
37
30
|
if (dropdownRef.current && !dropdownRef.current.contains(event.target)) {
|
|
@@ -52,11 +45,6 @@ import {jsxs,jsx}from'react/jsx-runtime';import {useState,useRef,useEffect}from'
|
|
|
52
45
|
});
|
|
53
46
|
i18n.changeLanguage(language.key);
|
|
54
47
|
setLocale(language.key);
|
|
55
|
-
// Update settings through useLayoutSettings hook
|
|
56
|
-
setSettings({
|
|
57
|
-
...settings,
|
|
58
|
-
language: language.key
|
|
59
|
-
});
|
|
60
48
|
setIsOpen(false);
|
|
61
49
|
};
|
|
62
50
|
const toggleDropdown = () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LanguageMenu.js","sources":["../../../src/components/LanguageMenu/LanguageMenu.tsx"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"LanguageMenu.js","sources":["../../../src/components/LanguageMenu/LanguageMenu.tsx"],"sourcesContent":[null],"names":[],"mappings":"wUAQO,MAAM,YAAY,GAAG,MAAK;QAC7B,QAAM,GAAQ,aAAG,CAAA;IACjB,QAAO,EAAA;AACP,GAAA,CAAA;AACA,EAAA,MAAA,CAAA,MAAQ,EAAI,SAAK,CAAA,GAAA,QAAiB,CAAA,IAAA,CAAA;AAClC,EAAA,MAAA,QAAY,iBAAiB,EAAE;AAC/B,EAAA,MAAA;AACI,IAAA;AACA,GAAA,GAAA,cAAO,EAAA;AACP,EAAA,MAAA;AACA,IAAA,IAAA,EAAA;AACH,GAAA,GAAC,MAAC;QACH,CAAA,WAAe,EAAA,cAAa,CAAA,GAAQ,QAAQ,CAAA;AAC5C,IAAA,GAAA,EAAA;IAEA,KAAA,EAAM,SAAA;IAEN,IAAA,EAAA;AACI,IAAA,MAAA,EAAA;AACI,GAAA,CAAA;AACA,EAAA,MAAA,CAAA,MAAA,EAAA,SAAS,CAAM,GAAA,QAAA,CAAA,KAAA,CAAA;AAClB,EAAA,MAAA,WAAE,GAAA,MAAA,CAAA,IAAA,CAAA;AACP,EAAA,MAAI,iBAAiB,GAAE,SAAA,CAAA,MAAA,CAAA,QAAA,IAAA,eAAA,CAAA,aAAA,CAAA,QAAA,CAAA,QAAA,CAAA,GAAA,CAAA,CAAA;WAEvB,CAAA,MAAa;AACT,IAAA,QAAA,CAAA;AACI,MAAA,IAAA,EAAA,eAAe;;;AAGnB,EAAA,CAAA,EAAA,CAAA,MAAE,EAAA,QAAA,CAAA,CAAA;AAEF,EAAA,SAAA,CAAA,MAAS;AACT,IAAA,MAAA,kBAAY,GAAA,KAAA,IAAA;AACR,MAAA,IAAA,WAAS,CAAA,OAAA,IAAA,CAAA,mBAA+B,CAAE,QAAA,CAAA,KAAA,CAAA,MAAoB,CAAA,EAAA;AAClE,QAAA,SAAE,CAAA,KAAA,CAAA;MACL;AAED,IAAA,CAAA;AACI,IAAA,QAAA,CAAA,gBAAe,CAAA,WAAA,EAAA,kBAAA,CAAA;iBACN;cACL,CAAA,mBAAqB,CAAA,WAAA,EAAA,kBAAA,CAAA;;;AAGxB,EAAA,MAAA,oBAAE,GAAA,QAAA,IAAA;AACH,IAAA,cAAK,CAAA;AACL,MAAA,GAAA,EAAA,QAAU,CAAA,GAAA;WACV,EAAA,QAAU,CAAA,KAAO;AACrB,MAAE,IAAA,EAAA,QAAA,CAAA,IAAA;MAEF,MAAM,EAAA,QAAA,CAAA;AACF,KAAA,CAAA;AACJ,IAAA,IAAE,CAAA,cAAA,CAAA,QAAA,CAAA,GAAA,CAAA;AAEF,IAAA,SACI,CAAA,QAAA,CAAA,GAAA,CAAK;AAmCb,IAAE,SAAA,CAAA,KAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/BasicLayout/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,gBAAgB,EAIhB,iBAAiB,EAEpB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAA4D,MAAM,OAAO,CAAC;AAcjF,eAAO,MAAM,mBAAmB,GAAI;;;;CAAwD,sCAkC3F,CAAC;AAgCF,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAC9B,gBAAgB,GAAG,iBAAiB,GAAG;IAAE,WAAW,CAAC,EAAE,GAAG,CAAC;IAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/BasicLayout/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,gBAAgB,EAIhB,iBAAiB,EAEpB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAA4D,MAAM,OAAO,CAAC;AAcjF,eAAO,MAAM,mBAAmB,GAAI;;;;CAAwD,sCAkC3F,CAAC;AAgCF,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAC9B,gBAAgB,GAAG,iBAAiB,GAAG;IAAE,WAAW,CAAC,EAAE,GAAG,CAAC;IAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,CA6VlH,CAAC"}
|
|
@@ -77,7 +77,6 @@ const BasicLayout = props => {
|
|
|
77
77
|
settings,
|
|
78
78
|
authorities,
|
|
79
79
|
primaryColor,
|
|
80
|
-
onSettingChange,
|
|
81
80
|
mainHeaderProps,
|
|
82
81
|
actor
|
|
83
82
|
} = propsWithSettings;
|
|
@@ -171,7 +170,7 @@ const BasicLayout = props => {
|
|
|
171
170
|
pathname: location?.pathname,
|
|
172
171
|
...defaultProps
|
|
173
172
|
}, propsWithSettings);
|
|
174
|
-
|
|
173
|
+
useRef(settings);
|
|
175
174
|
const scrollThreshold = deviceSettings?.header?.scrollThreshold || 50;
|
|
176
175
|
const {
|
|
177
176
|
componentVisibility
|
|
@@ -180,16 +179,6 @@ const BasicLayout = props => {
|
|
|
180
179
|
id: 'search-bar',
|
|
181
180
|
useWindowScroll: true
|
|
182
181
|
}]);
|
|
183
|
-
useEffect(() => {
|
|
184
|
-
if (settingRef.current?.primaryColor === '#3FA541C' && primaryColor !== '#3FA541C') {
|
|
185
|
-
const newState = {
|
|
186
|
-
...settingRef.current,
|
|
187
|
-
primaryColor
|
|
188
|
-
};
|
|
189
|
-
onSettingChange(newState);
|
|
190
|
-
}
|
|
191
|
-
// Only depend on primaryColor - settingRef and isBrowser are stable/unnecessary
|
|
192
|
-
}, [primaryColor, onSettingChange]);
|
|
193
182
|
// Update settings when route changes
|
|
194
183
|
// Memoize the send callback to prevent creating new event objects
|
|
195
184
|
const sendRouteChange = useCallback(() => {
|
|
@@ -271,7 +260,6 @@ const BasicLayout = props => {
|
|
|
271
260
|
menuData: memoizedMenuData,
|
|
272
261
|
settings: settings,
|
|
273
262
|
pageTitleInfo: pageTitleInfo,
|
|
274
|
-
onSettingChange: onSettingChange,
|
|
275
263
|
searchOptionsShown: searchOptionsShown,
|
|
276
264
|
setSearchOptionsShown: setSearchOptionsShown,
|
|
277
265
|
authorities: authorities,
|
|
@@ -332,7 +320,6 @@ const BasicLayout = props => {
|
|
|
332
320
|
value: newSettings
|
|
333
321
|
});
|
|
334
322
|
}
|
|
335
|
-
onSettingChange?.(newSettings);
|
|
336
323
|
},
|
|
337
324
|
actor: actor,
|
|
338
325
|
colorList: getThemeColors(settings?.theme),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../../src/components/Layout/BasicLayout/index.tsx"],"sourcesContent":[null],"names":[],"mappings":"uoCAwBO,MAAM,mBAAmB,GAAG,CAAC;AAChC,EAAA,WAAM;uBAES;AACX,EAAA;;AAEI,EAAA,MAAA,KAAA,GAAA,MAAM,EAAA;AACF,EAAA,SAAA,CAAA,MAAA;oBAAmB,CAAA,OAAO,IAAA,IAAA;;mBAG1B,GAAA,CAAA,IAAA;oBACA,IAAM,CAAA,EAAA;wBACN,EAAA;AAIA;;;AAGA,QAAA,IAAA,MAAA,CAAA,OAAU,GAAC,EAAA,EAAA;qBACP,CAAA,IAAA,CAAA;;AAEJ,QAAA,IAAA,MAAA,CAAA,OAAU,GAAC,EAAA,EAAA;AACP,UAAA,WAAA,CAAA,KAAA,CAAA;;AAER,QAAA,IAAA,MAAE,CAAA,WAAA,GAAA,MAAA,CAAA,OAAA,IAAA,QAAA,CAAA,IAAA,CAAA,YAAA,EAAA;AAEF,UAAA,gBAAO,EAAA;AACP,QAAA;AACI,MAAA,CAAA;AACJ,MAAA,MAAA,CAAC,gBAAC,CAAA,QAAA,EAAA,OAAA,CAAA;aACL,MAAA;QACF,MAAI,CAAA,mBAAA,CAAA,QAAA,EAAA,OAAA,CAAA;AACP,MAAA,CAAA;AACJ,IAAE;AAEF,EAAA,CAAA,EAAA;AAQI,EAAA,OAAA,KAAQ;AACR;AACA,MAAA,sBAAwB,GAAA,CAAA,SAAQ,EAAA,KAAA,KAAA;QAC5B;AACI,IAAA;AACA,GAAA,GAAA,KAAA;AACA,EAAA,MAAA,gBAAY,gBAAA,CAAA,SAAA,CAAA;qBACd,KAAA,KAAA,EAAA;IACN,OAAC;MACD,KAAI,EAAA,KAAA,CAAA,SAAkB,EAAA;AAClB,MAAA,EAAA,EAAA,EAAA;AACA,MAAA,QAAI,EAAA;;AAEI,EAAA;qBACK,EAAA;eACP,GAAA,eAAA,CAAA,SAAA,EAAA,aAAA,CAAA,KAAA,EAAA,aAAA,CAAA;QACN,OAAC,KAAA,KAAA,QAAA,EAAA;aACD;QACH,GAAA,aAAA;AACD,QAAA;AACJ,OAAE;AAEF,IAAA;IAGI,OAAA,CAAA,OAAA,KAAA,KAAA,QAAA,EAAA,6DAA4D,CAAA;;SAE5D,aAAM;;AAEC,MAAA,WAAW,GAAA,KAAA;;AAElB;
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../src/components/Layout/BasicLayout/index.tsx"],"sourcesContent":[null],"names":[],"mappings":"uoCAwBO,MAAM,mBAAmB,GAAG,CAAC;AAChC,EAAA,WAAM;uBAES;AACX,EAAA;;AAEI,EAAA,MAAA,KAAA,GAAA,MAAM,EAAA;AACF,EAAA,SAAA,CAAA,MAAA;oBAAmB,CAAA,OAAO,IAAA,IAAA;;mBAG1B,GAAA,CAAA,IAAA;oBACA,IAAM,CAAA,EAAA;wBACN,EAAA;AAIA;;;AAGA,QAAA,IAAA,MAAA,CAAA,OAAU,GAAC,EAAA,EAAA;qBACP,CAAA,IAAA,CAAA;;AAEJ,QAAA,IAAA,MAAA,CAAA,OAAU,GAAC,EAAA,EAAA;AACP,UAAA,WAAA,CAAA,KAAA,CAAA;;AAER,QAAA,IAAA,MAAE,CAAA,WAAA,GAAA,MAAA,CAAA,OAAA,IAAA,QAAA,CAAA,IAAA,CAAA,YAAA,EAAA;AAEF,UAAA,gBAAO,EAAA;AACP,QAAA;AACI,MAAA,CAAA;AACJ,MAAA,MAAA,CAAC,gBAAC,CAAA,QAAA,EAAA,OAAA,CAAA;aACL,MAAA;QACF,MAAI,CAAA,mBAAA,CAAA,QAAA,EAAA,OAAA,CAAA;AACP,MAAA,CAAA;AACJ,IAAE;AAEF,EAAA,CAAA,EAAA;AAQI,EAAA,OAAA,KAAQ;AACR;AACA,MAAA,sBAAwB,GAAA,CAAA,SAAQ,EAAA,KAAA,KAAA;QAC5B;AACI,IAAA;AACA,GAAA,GAAA,KAAA;AACA,EAAA,MAAA,gBAAY,gBAAA,CAAA,SAAA,CAAA;qBACd,KAAA,KAAA,EAAA;IACN,OAAC;MACD,KAAI,EAAA,KAAA,CAAA,SAAkB,EAAA;AAClB,MAAA,EAAA,EAAA,EAAA;AACA,MAAA,QAAI,EAAA;;AAEI,EAAA;qBACK,EAAA;eACP,GAAA,eAAA,CAAA,SAAA,EAAA,aAAA,CAAA,KAAA,EAAA,aAAA,CAAA;QACN,OAAC,KAAA,KAAA,QAAA,EAAA;aACD;QACH,GAAA,aAAA;AACD,QAAA;AACJ,OAAE;AAEF,IAAA;IAGI,OAAA,CAAA,OAAA,KAAA,KAAA,QAAA,EAAA,6DAA4D,CAAA;;SAE5D,aAAM;;AAEC,MAAA,WAAW,GAAA,KAAA;;AAElB;QAmBA,iBAAqB,GAAE,KAAA;QACvB,CAAA,QAAO,EAAA,WAAW,CAAA,GAAY,QAAI,CAAA,KAAS,CAAA;QAC3C,CAAA,SAAO,EAAA,YAAoB,CAAA,GAAA,QAAA,CAAA,KAAA,CAAA;AAC3B,EAAA,MAAA,CAAA,WAAe,EAAE,kBAAmB,QAAA,CAAA,KAAA,CAAA;AACpC,EAAA,MAAA;AAEA,IAAA,QAAQ;IAER,UAAA,EAAA,eAAA;IACA,gBAAe;AACX,IAAA,QAAI;gBACA;AACA,IAAA,UAAA,GAAA,GAAM;;kBAGN;;YAEA;eACA;AAEA,IAAA,QAAA;;gBAEI;mBACA;;uBAEA;uBAEA,EAAA,iBAA0B,CAAA,GAAA,QAAA,CAAA,KAAA,CAAA;AAC1B,EAAA,MAAA,CAAA,SAAA,EAAA,YAAgB,CAAC,GAAE,QAAS,CAAA,KAAA,CAAA;AAChC,EAAA,MAAA,CAAA,kBAAE,EAAA,qBAAA,CAAA,GAAA,QAAA,CAAA,KAAA,CAAA;QACN;AACJ,IAAA;MAEA,eAAA;AACA,EAAA,MAAA;IACA;MAEA,MAAA;AACA,EAAA,MAAA;;AAEI,GAAA,GAAA;AACA;WACA,CAAA,MAAM;QAEN,kBAAiB,IAAA,QAAA,EAAA;;YAEb,OAAI,SAAU,CAAA,OAAS;AAAE;cAC5B,CAAA,IAAA,CAAA,KAAA,CAAA,QAAA,GAAA,OAAA;cAED,CAAA,IAAA,CAAA,KAAA,CAAA,GAAA,GAAA,CAAA,CAAA,EAAA,OAAA,CAAA,EAAA,CAAA;cACA,CAAO,IAAI,CAAC,KAAK,CAAC,KAAK,GAAA,MAAQ;AACnC,MAAE,QAAA,CAAA,IAAA,CAAA,KAAA,CAAA,QAAA,GAAA,QAAA;MAEF,OAAA,MAAA;AACA;AACI,QAAA,QAAQ,CAAA,IAAA,CAAA,KAAA,CAAA,QAAiB,GAAA,EAAQ;AACjC,QAAA,QAAA,CAAA,IAAY,CAAA,KAAA,CAAA,GAAA,GAAA,EAAgB;AAC5B,QAAA,QAAQ,CAAA,IAAA,CAAA,KAAA,CAAA,KAAiB,GAAA,EAAA;QAC3B,QAAA,CAAA,IAAA,CAAA,KAAA,CAAA,QAAA,GAAA,EAAA;;AAGF,QAAA,gBAAoB,CAAA,EAAG,OAAA,CAAA;AACnB,MAAA,CAAA;AACA,IAAA;AACA,EAAA,CAAA,EAAA,CAAA,kBAAc,EAAA,QAAA,CAAA,CAAA;AACd;AACA,EAAA,MAAA,YAAY,GAAE,QAAA,EAAA,QAAiB,IAAA,GAAA;AAC/B,EAAA,MAAA,UAAU,GAAE,QAAA,GAAA,QAAiB,GAAA,SAAa;AAC1C;AACA,EAAA,MAAA,gBAAA,GAAA,IAAuB,IAAA;AACvB;UACF,eAAA,GAAA,KAAA,CAAA,YAAA,IAAA,YAAA;IAEF,MAAA,cAAA,GAAA,CAAA,CAAA,EAAA,eAAA,CAAA,EAAA,EAAA,UAAA,CAAA,CAAA,CAAA;AACA,IAAA,MAAM,UAAA,GAAA,QAAoB,EAAA,UAAgB,GAAA,cAAA,CAAA;QACtC,UAAO,EAAK;AAChB,MAAE,MAAA,KAAA,GAAA,IAAA,CAAA,KAAA,CAAA,GAAA,CAAA,CAAA,MAAA,CAAA,CAAA,GAAA,EAAA,GAAA,KAAA,GAAA,GAAA,GAAA,CAAA,EAAA,UAAA,CAAA;AACF,MAAA,IAAM,KAAA,KAAA,SAAkB,EAAG,OAAA,KAAA;AACvB,IAAA;AACA;AACA,IAAA,OAAA,IAAO,CAAA,KAAE,CAAA,GAAA,CAAA,CAAA,MAAA,CAAA,CAAA,GAAA,EAAA,GAAA,KAAA,GAAA,GAAA,GAAA,CAAA,EAAA,QAAA,CAAA;AACT,EAAA,CAAA;;QAGJ,cAAM,GAAA;UACF,EAAA,gBAAc,CAAA,QAAe;AACjC,IAAA,UAAE,EAAA,gBAAA,CAAA,YAAA,CAAA;IAEF,MAAM,EAAA,gBAAA,CAAmB,QAAG;;;QAGxB,cAAA,GAAgB;AACnB,IAAA,YAAE,EAAA,gBAAA,CAAA,cAAA,CAAA;IAEH,cAAM,EAAA,gBACF,CAAA,gBAAA,CAAA;AACI,IAAA,YAAG,EAAA,gBAAiB,CAAA,cAAA,CAAA;AACvB,IAAA,WACA,EAAS,gBACZ,CAAA,aAAA,CAAA;IACF,YAAM,EAAA,gBAAgB,CAAA,cAClB,CAAA;cACI,EAAQ,gBAAY,CAAA,YAAQ,CAAA;AAC5B,IAAA,oBAAe,EAAA,gBAAA,CAAA,sBAAA,CAAA;yBAGtB,EAAC,gBAAA,CAAA,uBAAA,CAAA;AAEF,IAAA,oBAAmB,EAAA,gBAAiB,CAAA,sBAAA;;AAIpC;AACI,EAAA,MAAA,gBAAA,GAAA,IAAA,IAAA;AACI,IAAA,OAAA,IAAA,CAAA,KAAS,IAAE,CAAA,CAAA,MAAA,CAAA,CAAA,GAAe,EAAA,GAAA,KAAA,GAAA,GAAA,GAAA,CAAA,EAAA,cAAA,CAAA;AAC1B,EAAA,CAAA;AACA,EAAA,MAAA,kBAAA,GAAiB,cAAI,EAAA,UAAA,IAAA;AACxB,IAAA,IAAA,EAAA,OAAA;AACJ,IAAA,KAAE,EAAA,SAAA;IAEH,KAAA,EAAA,EAEA,CAAA;AACI,EAAA,MAAA,gBAAa,GAAA,MAAU;gBACnB,CAAK,aAAM,IAAA,CAAA,aAAA,CAAA;AACP,EAAA,CAAA;2BACU,GAAA,mBAAkB,CAAA;;AAE/B,IAAA,qBAAE;;AAEX,GAAA,CAAA;QAEA,YAAe,GAAA,IAAA,CAAA;AACX,IAAA,GAAA;AACJ,GAAA,EAAC,CAAA,QAAG,CAAA,CAAA;AAEJ,EAAA,MAAA,aAAa,GAAA,sBAAmB,CAAA;AAChC,IAAA,QAAQ,EAAA,QAAK,EAAO,QAAQ;AAC5B,IAAA,GAAA;KACA,iBAAkB,CAAA;EAEH,MAAA,CAAA,QAAA;AACX,EAAA,MAAA,kBAAgB,cAAc,EAAI,MAAA,EAAA,eAAe,IAAA,EAAA;;;;8BAE1B;QACvB,YAAC;IACL,eAAI,EAAY;IAEhB,CAAA;AACI;AACJ;QAEA,eAAmB,GAAG,WAAK,CAAA,MAAA;QACvB,KAAA,IAAA,QAAiB,EAAC,QAAO,EAAA;AAC7B,MAAE,KAAA,CAAA,IAAA,CAAA;QAEF,IAAA,EAAA,wBAAA;QACA,QAAM,EAAA,QAAA,EAAA,QAA0B;QAC5B,YAAW,EAAG,KAAA,CAAA;QAEd;;WAEC,EAAA,QAAA,EAAA,QAAA,EAAA,KAAA,CAAA,YAAA,CAAA,CAAA;AAED,EAAA,SAAA,CAAA;AACJ,IAAA,eAAE,EAAA;KAEF,CAAA,eAAA,CAAA,CAAA;AACA,EAAA,MAAA;AACA,IAAA,GAAA,EAAA,SAAc;AACd,IAAA,MAAM;AACN,GAAA,GAAA,gBAAM,EAAA;AACN,EAAA,MAAA;AACA,IAAA,GAAA,EAAA,OAAM;IACN,MAAM,EAAA;AACN,GAAA,GAAA,gBAAM,EAAA;AACN,EAAA,MAAA;IAEA,GAAA,EAAA,SAAA;IACA,MAAM,EAAA;sBACC,EAAA;AACC,EAAA,MAAA,CAAA,WAAE,EAAA,cAAS,CAAA,GAAA,QAAA,CAAA,KAAA,CAAA;AACP,EAAA,SAAA,CAAA,MAAE;AACF,IAAA,IAAA,YAAE,IAAA,UAAO,IAAA,YAAA,EAAA;oBACV,GAAA,MAAW,CAAA,WAAA,GAAA,YAAA,GAAA,YAAA,EAAA,cAAA,CAAA,IAAA,CAAA,CAAA,KAAA,cAAA,CAAA,KAAA,CAAA;AACd,IAAA;AACA,EAAA,CAAA,EAAA,CAAA,YAAE,EAAA,UAAO,EAAA,YAAA,CAAA,CAAA;QACb,cAAQ,GAAA,MAAA;AACZ,IAAA,iBAAM,CAAA,CAAA,cAA2B;AACjC,EAAA,CAAA;QAEA,sBAEQ;AAIQ,IAAA,iBAAE,CAAA,KAAA,CAAA;AACI,EAAA,CAAA;AACH;4BACD,GAAA,MAAuB;AACzB,IAAA,IAAA,OAAA,GAAE,yDAAA;0BACI,CAAA,IAAA,KAAe,OAAE,IAAA,kBAAwB,CAAA,KAAA,EAAA;AAC5C,MAAA,OAAA,IAAA,8BAAA;AACH,IAAA;AA0EI,IAAA,OAAA,OAAA;;;wCASY,EAAA,cAAQ,KAAA,QAAA;yCACR,EAAA,QAAW;AACP,EAAA,MAAA,UAAA,GAAA,cAAA,EAAA,MAAA,EAAA,UAAM;AACN,EAAA,MAAA,eAAA,GAAA,cAAA,EAAA,YAAO;AACV,EAAA,MAAA,eAAA,GAAA,QAAA,EAAA,YAAE,KAAA,eAAA;oCACP,GAAC;gCACL,GACA,2BACW,IAAA,eAAe,IAAU,CAAA,QACpC;+CAUU,QAAA;oDACF,GAAA,MAAA,GAAA,EAAsB;;AAe1D,EAAE,MAAA,kBAAA,GAAA,wBAAA,GAAA,CAAA,eAAA,GAAA,SAAA,GAAA,MAAA,GAAA,OAAA,GAAA,CAAA,WAAA,GAAA,MAAA,GAAA,OAAA,GAAA,KAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MainHeader.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalHeader/MainHeader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAS/B,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAMpE,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,GAAG,kBAAkB,
|
|
1
|
+
{"version":3,"file":"MainHeader.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalHeader/MainHeader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAS/B,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAMpE,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,GAAG,kBAAkB,CA6NrE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MainHeader.js","sources":["../../../../src/components/Layout/GlobalHeader/MainHeader.tsx"],"sourcesContent":[null],"names":[],"mappings":"0qBAeO,MAAM,UAAU,GAAmD,KAAC,IAAO;AAC9E,EAAA,MAAA;
|
|
1
|
+
{"version":3,"file":"MainHeader.js","sources":["../../../../src/components/Layout/GlobalHeader/MainHeader.tsx"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TailwindLayout.d.ts","sourceRoot":"","sources":["../../../src/components/Layout/TailwindLayout.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"TailwindLayout.d.ts","sourceRoot":"","sources":["../../../src/components/Layout/TailwindLayout.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA6C,MAAM,sBAAsB,CAAC;AAKnG,OAAO,KAA+B,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAqC,MAAM,aAAa,CAAC;AAyIpG,KAAK,cAAc,GAAG,cAAc,CAAC,OAAO,SAAS,CAAC,CAAC;AAEvD,QAAA,MAAM,SAAS;;;0EAAoB,CAAC;AAEpC,KAAK,+BAA+B,GAAG,gBAAgB,GAAG,cAAc,CAAC;AAEzE,QAAA,MAAM,mBAAmB,EAAE,kBAAkB,CACzC,KAAK,CAAC,mBAAmB,CAAC,CAAC,KAAK,EAAE,+BAA+B,KAAK,GAAG,CAAC,OAAO,CAAC,EAClF,GAAG,CAC8C,CAAC;AAEtD,eAAe,mBAAmB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout/client';import {TailwindThemeProvider}from'@admin-layout/tailwind-ui';import {userSelector}from'@adminide-stack/user-auth0-client';import {useLocation,useRouteLoaderData,useMatches}from'@remix-run/react';import {useMachine}from'@xstate/react';import React__default,{useMemo
|
|
1
|
+
import {jsx}from'react/jsx-runtime';import {useLayoutSettings,CHANGE_SETTINGS_ACTION}from'@admin-layout/client';import {TailwindThemeProvider}from'@admin-layout/tailwind-ui';import {userSelector}from'@adminide-stack/user-auth0-client';import {useLocation,useRouteLoaderData,useMatches}from'@remix-run/react';import {useMachine}from'@xstate/react';import React__default,{useMemo}from'react';import {connect,useSelector,useDispatch}from'react-redux';import {settingsMachine}from'../../machines/settingsMachine.js';import {BasicLayout}from'./BasicLayout/index.js';function BasicLayoutWithAuthorities(props) {
|
|
2
2
|
const userData = useSelector(userSelector);
|
|
3
3
|
const location = useLocation();
|
|
4
4
|
const {
|
|
@@ -9,6 +9,7 @@ import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout
|
|
|
9
9
|
setSettings
|
|
10
10
|
} = useLayoutSettings();
|
|
11
11
|
const matches = useMatches();
|
|
12
|
+
const dispatch = useDispatch();
|
|
12
13
|
const current = matches[matches.length - 1];
|
|
13
14
|
// Use settingsFromLoader if available, fallback to Redux settings
|
|
14
15
|
// This ensures the machine always has valid settings input
|
|
@@ -43,7 +44,14 @@ import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout
|
|
|
43
44
|
hasPublic: !!context.public,
|
|
44
45
|
hasInternal: !!context.internal
|
|
45
46
|
});
|
|
46
|
-
|
|
47
|
+
const publicSettings = context.public;
|
|
48
|
+
if (event?.type === 'UISETTING_ROUTE_CHANGE') {
|
|
49
|
+
dispatch({
|
|
50
|
+
type: CHANGE_SETTINGS_ACTION,
|
|
51
|
+
payload: publicSettings
|
|
52
|
+
});
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
47
55
|
// REVOLUTIONARY APPROACH: No filtering needed!
|
|
48
56
|
// The context is already separated into public and internal namespaces.
|
|
49
57
|
// We simply sync context.public to Redux - that's it!
|
|
@@ -53,7 +61,6 @@ import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout
|
|
|
53
61
|
// - context.internal.configModel changes don't affect context.public
|
|
54
62
|
// - No manual filtering means no chance of mistakes
|
|
55
63
|
// - Type system enforces the separation at compile time
|
|
56
|
-
const publicSettings = context.public;
|
|
57
64
|
console.log('🔥 Sending PUBLIC settings to Redux:', {
|
|
58
65
|
publicKeys: Object.keys(publicSettings).slice(0, 10),
|
|
59
66
|
navTheme: publicSettings.navTheme,
|
|
@@ -85,10 +92,6 @@ import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout
|
|
|
85
92
|
const mainHeaderProps = useMemo(() => ({
|
|
86
93
|
picture: userData?.profile?.picture || null
|
|
87
94
|
}), [userData?.profile?.picture]);
|
|
88
|
-
const onSettingChange = useCallback(config => {
|
|
89
|
-
// Update Redux first
|
|
90
|
-
setSettings(config);
|
|
91
|
-
}, [setSettings]);
|
|
92
95
|
//@ts-ignore
|
|
93
96
|
const {
|
|
94
97
|
routeParams: {
|
|
@@ -103,7 +106,6 @@ import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout
|
|
|
103
106
|
children: jsx(BasicLayout, {
|
|
104
107
|
routeParams: orgName,
|
|
105
108
|
authorities: permissions?.resolveConfiguration ?? permissions,
|
|
106
|
-
onSettingChange: onSettingChange,
|
|
107
109
|
mainHeaderProps: mainHeaderProps,
|
|
108
110
|
actor: settingsActor,
|
|
109
111
|
...props,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TailwindLayout.js","sources":["../../../src/components/Layout/TailwindLayout.tsx"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TailwindLayout.js","sources":["../../../src/components/Layout/TailwindLayout.tsx"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpdateSettingsResource.server.d.ts","sourceRoot":"","sources":["../../../src/components/UpdateSettingsResource/UpdateSettingsResource.server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"UpdateSettingsResource.server.d.ts","sourceRoot":"","sources":["../../../src/components/UpdateSettingsResource/UpdateSettingsResource.server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAyCrD,eAAO,MAAM,MAAM,GAAU,+BAI1B;IACC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,MAAM,CAAC,EAAE,eAAe,CAAC;CAC5B,oEA4JA,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;;GAgEA,CAAC"}
|
|
@@ -10,19 +10,15 @@ import '../../config/analytics-config.js'; /**
|
|
|
10
10
|
function parseLayoutSettings() {
|
|
11
11
|
try {
|
|
12
12
|
if (!config.LAYOUT_SETTINGS) {
|
|
13
|
-
console.log('⚠️ config.LAYOUT_SETTINGS is empty/undefined, returning {}');
|
|
14
13
|
return {};
|
|
15
14
|
}
|
|
16
15
|
// If it's already an object (parsed by envalid json validator), return it
|
|
17
16
|
if (typeof config.LAYOUT_SETTINGS === 'object' && !Array.isArray(config.LAYOUT_SETTINGS)) {
|
|
18
|
-
console.log('✅ config.LAYOUT_SETTINGS is already an object with keys:', Object.keys(config.LAYOUT_SETTINGS).slice(0, 10));
|
|
19
17
|
return config.LAYOUT_SETTINGS;
|
|
20
18
|
}
|
|
21
19
|
// If it's a string, parse it (this happens when envalid uses str validator)
|
|
22
20
|
if (typeof config.LAYOUT_SETTINGS === 'string') {
|
|
23
|
-
console.log('🔧 Parsing LAYOUT_SETTINGS from string:', config.LAYOUT_SETTINGS.substring(0, 50));
|
|
24
21
|
const parsed = JSON.parse(config.LAYOUT_SETTINGS);
|
|
25
|
-
console.log('✅ Parsed to object with keys:', Object.keys(parsed).slice(0, 10));
|
|
26
22
|
return parsed || {};
|
|
27
23
|
}
|
|
28
24
|
console.warn('⚠️ config.LAYOUT_SETTINGS is unexpected type:', typeof config.LAYOUT_SETTINGS);
|
|
@@ -42,7 +38,6 @@ const action = async ({
|
|
|
42
38
|
// Handle DELETE request - Clear settings cookies
|
|
43
39
|
// Note: Database deletion is handled by resetApplicationSettings mutation on the client
|
|
44
40
|
if (request.method === 'DELETE') {
|
|
45
|
-
console.log('🔥 RESET SETTINGS - Clearing cookies');
|
|
46
41
|
try {
|
|
47
42
|
// Clear the settings cookie by setting it to empty with maxAge 0
|
|
48
43
|
const cookie = await settingsCookie.serialize({}, {
|
|
@@ -75,14 +70,9 @@ const action = async ({
|
|
|
75
70
|
// 1. Fetch default settings from GraphQL (or fallback to local defaults)
|
|
76
71
|
const result = await fetchPageSettingsWithFetch(request, overrideIdentifier);
|
|
77
72
|
const pageSettings = result?.data?.pageSettings?.settings ? JSON.parse(JSON.stringify(result.data.pageSettings.settings)) : null;
|
|
78
|
-
//
|
|
79
|
-
const uilayout = pageSettings?.uilayout;
|
|
80
|
-
const hasUilayoutData = uilayout && typeof uilayout === 'object' && Object.keys(uilayout).length > 0;
|
|
73
|
+
// pageSettings is now flat (no uilayout wrapper) - use it directly
|
|
81
74
|
const layoutSettings = parseLayoutSettings();
|
|
82
|
-
let pageDefaultSettings =
|
|
83
|
-
console.log('📥 Step 1 - GraphQL result has data:', !!result?.data?.pageSettings);
|
|
84
|
-
console.log('📥 Step 1 - uilayout has data:', hasUilayoutData);
|
|
85
|
-
console.log('📥 Step 1 - pageDefaultSettings keys:', Object.keys(pageDefaultSettings).slice(0, 10));
|
|
75
|
+
let pageDefaultSettings = pageSettings || layoutSettings;
|
|
86
76
|
// 2 TEMPORARY: Manually add hiddenMenuKeys to defaults until GraphQL schema is updated
|
|
87
77
|
pageDefaultSettings = {
|
|
88
78
|
...pageDefaultSettings,
|
|
@@ -92,13 +82,6 @@ const action = async ({
|
|
|
92
82
|
// 3. Parse the incoming settings update from the client (usually only changed keys)
|
|
93
83
|
const jsonData = await request.json();
|
|
94
84
|
const payload = jsonData?.config || {};
|
|
95
|
-
console.log('📥 Step 3 - Incoming payload keys:', Object.keys(payload));
|
|
96
|
-
console.log('📥 Step 3 - Payload has changedSettings:', !!payload.changedSettings);
|
|
97
|
-
if (payload.changedSettings) {
|
|
98
|
-
console.log('📥 Step 3 - changedSettings type:', typeof payload.changedSettings);
|
|
99
|
-
console.log('📥 Step 3 - changedSettings keys:', Object.keys(payload.changedSettings));
|
|
100
|
-
console.log('📥 Step 3 - changedSettings JSON:', JSON.stringify(payload.changedSettings).substring(0, 200));
|
|
101
|
-
}
|
|
102
85
|
// 4. Fill in any missing default keys in the payload (does not overwrite user values)
|
|
103
86
|
// assignDefaults(payload, pageDefaultSettings);
|
|
104
87
|
// 5. Parse existing settings from the cookie (if present)
|
|
@@ -107,7 +90,6 @@ const action = async ({
|
|
|
107
90
|
let mergedSettings;
|
|
108
91
|
try {
|
|
109
92
|
existingSettings = await settingsCookie.parse(cookieHeader);
|
|
110
|
-
console.log('📥 Step 5 - Parsed cookie keys:', existingSettings ? Object.keys(existingSettings).slice(0, 15) : 'null');
|
|
111
93
|
// DEFENSIVE: Remove any invalid numeric string keys that shouldn't be there
|
|
112
94
|
if (existingSettings && typeof existingSettings === 'object') {
|
|
113
95
|
const invalidKeys = [];
|
|
@@ -119,15 +101,9 @@ const action = async ({
|
|
|
119
101
|
delete existingSettings[key];
|
|
120
102
|
}
|
|
121
103
|
});
|
|
122
|
-
if (invalidKeys.length > 0) {
|
|
123
|
-
console.log('🧹 Cleaned keys from cookie:', invalidKeys);
|
|
124
|
-
}
|
|
125
104
|
}
|
|
126
|
-
console.log('📥 Step 6 - Before merge - existingSettings keys:', existingSettings ? Object.keys(existingSettings).slice(0, 10) : 'null');
|
|
127
|
-
console.log('📥 Step 6 - Before merge - payload keys:', Object.keys(payload).slice(0, 10));
|
|
128
105
|
// 6. Merge existing settings with the new payload from the client
|
|
129
106
|
mergedSettings = merge({}, existingSettings, payload);
|
|
130
|
-
console.log('📥 Step 6 - After merge - mergedSettings keys:', Object.keys(mergedSettings).slice(0, 15));
|
|
131
107
|
// Check if numeric keys appeared after merge
|
|
132
108
|
const numericKeysAfterMerge = Object.keys(mergedSettings).filter(k => /^\d+$/.test(k));
|
|
133
109
|
if (numericKeysAfterMerge.length > 0) {
|
|
@@ -136,20 +112,14 @@ const action = async ({
|
|
|
136
112
|
}
|
|
137
113
|
// 7. Ensure merged settings have all default keys (again, does not overwrite user values)
|
|
138
114
|
// assignDefaults(mergedSettings, pageDefaultSettings);
|
|
139
|
-
console.log('📥 Step 7 - After assignDefaults - mergedSettings keys:', Object.keys(mergedSettings).slice(0, 15));
|
|
140
115
|
} catch (error) {
|
|
141
116
|
// If cookie parsing fails, fall back to just the payload
|
|
142
117
|
console.error('Error parsing settings cookie in action:', error);
|
|
143
118
|
existingSettings = null;
|
|
144
119
|
mergedSettings = payload;
|
|
145
120
|
}
|
|
146
|
-
//
|
|
147
|
-
|
|
148
|
-
console.log(' - pageDefaultSettings keys:', Object.keys(pageDefaultSettings).slice(0, 10));
|
|
149
|
-
console.log(' - layoutSettings keys:', Object.keys(layoutSettings).slice(0, 10));
|
|
150
|
-
console.log(' - mergedSettings keys:', mergedSettings ? Object.keys(mergedSettings).slice(0, 10) : 'null');
|
|
151
|
-
const fullSettings = merge({}, pageDefaultSettings, layoutSettings, mergedSettings);
|
|
152
|
-
console.log('📥 Step 8 - After final merge - fullSettings keys:', Object.keys(fullSettings).slice(0, 15));
|
|
121
|
+
// Fix merge order: layoutSettings (base) → pageDefaultSettings (GraphQL) → mergedSettings (cookies)
|
|
122
|
+
const fullSettings = merge({}, layoutSettings, pageDefaultSettings, mergedSettings);
|
|
153
123
|
// Check if numeric keys appeared after final merge
|
|
154
124
|
const numericKeysAfterFinalMerge = Object.keys(fullSettings).filter(k => /^\d+$/.test(k));
|
|
155
125
|
if (numericKeysAfterFinalMerge.length > 0) {
|
|
@@ -162,9 +132,6 @@ const action = async ({
|
|
|
162
132
|
fullSettings.hiddenMenuKeys = [...payload.hiddenMenuKeys];
|
|
163
133
|
}
|
|
164
134
|
// 9. Store only the differences from the defaults in the cookie (to minimize cookie size)
|
|
165
|
-
console.log('🔍 Comparing settings:');
|
|
166
|
-
console.log('fullSettings keys:', Object.keys(fullSettings).slice(0, 10));
|
|
167
|
-
console.log('pageDefaultSettings keys:', Object.keys(pageDefaultSettings).slice(0, 10));
|
|
168
135
|
// DEFENSIVE: Remove any invalid numeric string keys before comparison
|
|
169
136
|
if (fullSettings && typeof fullSettings === 'object') {
|
|
170
137
|
Object.keys(fullSettings).forEach(key => {
|
|
@@ -184,10 +151,8 @@ const action = async ({
|
|
|
184
151
|
}
|
|
185
152
|
});
|
|
186
153
|
}
|
|
187
|
-
console.log('📦 Diff settings to save in cookie:', JSON.stringify(diffSettings).substring(0, 500));
|
|
188
|
-
console.log('diffSettings keys:', Object.keys(diffSettings));
|
|
189
154
|
// 10. Serialize the diff settings into a cookie string
|
|
190
|
-
const newCookie = await settingsCookie.serialize(
|
|
155
|
+
const newCookie = await settingsCookie.serialize(payload);
|
|
191
156
|
// 11. Return the full settings as JSON, and set the new cookie in the response headers
|
|
192
157
|
return json(fullSettings, {
|
|
193
158
|
headers: {
|
|
@@ -210,7 +175,6 @@ const loader = async ({
|
|
|
210
175
|
params
|
|
211
176
|
}) => {
|
|
212
177
|
try {
|
|
213
|
-
console.log('📤 LOADER - Starting settingsLoaderUtil');
|
|
214
178
|
const USE_FETCH_METHOD = config.USE_FETCH_SETTINGS === 'true';
|
|
215
179
|
const {
|
|
216
180
|
settings,
|
|
@@ -220,7 +184,6 @@ const loader = async ({
|
|
|
220
184
|
context,
|
|
221
185
|
params
|
|
222
186
|
});
|
|
223
|
-
console.log('📤 LOADER - Received settings keys:', settings ? Object.keys(settings).slice(0, 15) : 'null');
|
|
224
187
|
// Check for numeric keys in the settings returned by loader
|
|
225
188
|
if (settings && typeof settings === 'object') {
|
|
226
189
|
const numericKeys = Object.keys(settings).filter(k => /^\d+$/.test(k));
|
|
@@ -239,7 +202,6 @@ const loader = async ({
|
|
|
239
202
|
if (setCookie) {
|
|
240
203
|
headers['Set-Cookie'] = setCookie;
|
|
241
204
|
}
|
|
242
|
-
console.log('📤 LOADER - Returning settings with keys:', settings ? Object.keys(settings).slice(0, 15) : 'null');
|
|
243
205
|
// returnInfo: {"returnType":"json","keys":["settings"],"hasOptions":true}
|
|
244
206
|
return {
|
|
245
207
|
data: [settings],
|
|
@@ -257,11 +219,9 @@ const loader = async ({
|
|
|
257
219
|
// Fall back to default settings
|
|
258
220
|
const result = await fetchPageSettingsWithFetch(request, overrideIdentifier);
|
|
259
221
|
const pageSettings = result?.data?.pageSettings?.settings ? JSON.parse(JSON.stringify(result.data.pageSettings.settings)) : null;
|
|
260
|
-
//
|
|
261
|
-
const uilayout = pageSettings?.uilayout;
|
|
262
|
-
const hasUilayoutData = uilayout && typeof uilayout === 'object' && Object.keys(uilayout).length > 0;
|
|
222
|
+
// pageSettings is now flat (no uilayout wrapper) - use it directly
|
|
263
223
|
const layoutSettings = parseLayoutSettings();
|
|
264
|
-
let pageDefaultSettings =
|
|
224
|
+
let pageDefaultSettings = pageSettings || layoutSettings;
|
|
265
225
|
// TEMPORARY: Manually add hiddenMenuKeys to defaults until GraphQL schema is updated
|
|
266
226
|
pageDefaultSettings = {
|
|
267
227
|
...pageDefaultSettings,
|
|
@@ -269,9 +229,10 @@ const loader = async ({
|
|
|
269
229
|
// Array format for menu visibility
|
|
270
230
|
hiddenMenuCategories: [] // Array format for category visibility
|
|
271
231
|
};
|
|
232
|
+
// Fix merge order: layoutSettings (base) → pageDefaultSettings (GraphQL)
|
|
272
233
|
// returnInfo: {"returnType":"json","keys":["settings","settings"],"hasOptions":true}
|
|
273
234
|
return {
|
|
274
|
-
data: [merge({},
|
|
235
|
+
data: [merge({}, layoutSettings, pageDefaultSettings)]
|
|
275
236
|
};
|
|
276
237
|
}
|
|
277
238
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpdateSettingsResource.server.js","sources":["../../../src/components/UpdateSettingsResource/UpdateSettingsResource.server.ts"],"sourcesContent":[null],"names":[],"mappings":"mXAYA;;;AAGG;AACH,SAAS,mBAAmB,GAAA;AACxB,EAAA,IAAA;AACI,IAAA,IAAA,CAAA,MAAK,CAAA,eAAO,EAAA;AACR,MAAA,OAAA,
|
|
1
|
+
{"version":3,"file":"UpdateSettingsResource.server.js","sources":["../../../src/components/UpdateSettingsResource/UpdateSettingsResource.server.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@admin-layout/tailwind-design-pro",
|
|
3
|
-
"version": "12.0.16-alpha.
|
|
3
|
+
"version": "12.0.16-alpha.62",
|
|
4
4
|
"description": "Sample core for higher packages to depend on",
|
|
5
5
|
"license": "ISC",
|
|
6
6
|
"author": "CDMBase LLC",
|
|
@@ -22,8 +22,8 @@
|
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@admin-layout/assets": "12.0.16-alpha.36",
|
|
25
|
-
"@admin-layout/client": "12.0.16-alpha.
|
|
26
|
-
"@admin-layout/tailwind-ui": "12.0.16-alpha.
|
|
25
|
+
"@admin-layout/client": "12.0.16-alpha.62",
|
|
26
|
+
"@admin-layout/tailwind-ui": "12.0.16-alpha.62",
|
|
27
27
|
"react-favicon": "^0.0.23",
|
|
28
28
|
"react-intl": "^6.1.1",
|
|
29
29
|
"react-responsive": "^10.0.0"
|
|
@@ -53,5 +53,5 @@
|
|
|
53
53
|
"typescript": {
|
|
54
54
|
"definition": "lib/index.d.ts"
|
|
55
55
|
},
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "0f34e34fa56ef415cd32998b67df42ab784af9a1"
|
|
57
57
|
}
|