@admin-layout/tailwind-design-pro 12.0.16-alpha.42 → 12.0.16-alpha.44
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/Layout/BasicLayout/index.d.ts.map +1 -1
- package/lib/components/Layout/BasicLayout/index.js +7 -2
- package/lib/components/Layout/BasicLayout/index.js.map +1 -1
- package/lib/components/Layout/TailwindLayout.d.ts.map +1 -1
- package/lib/components/Layout/TailwindLayout.js +23 -1
- package/lib/components/Layout/TailwindLayout.js.map +1 -1
- package/lib/components/SettingDrawer/SettingDrawer.d.ts.map +1 -1
- package/lib/components/SettingDrawer/SettingDrawer.js +18 -14
- package/lib/components/SettingDrawer/SettingDrawer.js.map +1 -1
- package/lib/components/UpdateSettingsResource/UpdateSettingsResource.server.d.ts +8 -5
- package/lib/components/UpdateSettingsResource/UpdateSettingsResource.server.d.ts.map +1 -1
- package/lib/components/UpdateSettingsResource/UpdateSettingsResource.server.js +245 -4
- package/lib/components/UpdateSettingsResource/UpdateSettingsResource.server.js.map +1 -1
- package/lib/compute.js +6 -1
- package/lib/config/analytics-config.js +9 -0
- package/lib/config/analytics-config.js.map +1 -0
- package/lib/config/env-config.d.ts +1 -0
- package/lib/config/env-config.d.ts.map +1 -1
- package/lib/config/env-config.js +3 -0
- package/lib/config/env-config.js.map +1 -1
- package/lib/machines/settingsMachine.d.ts.map +1 -1
- package/lib/machines/settingsMachine.js +20 -45
- package/lib/machines/settingsMachine.js.map +1 -1
- package/lib/routes.json +9 -2
- package/package.json +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/BasicLayout/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,gBAAgB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/BasicLayout/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,gBAAgB,EAIhB,iBAAiB,EAGpB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAA+C,MAAM,OAAO,CAAC;AAcpE,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,CAAA;CAAE,CAqT3F,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {jsxs,jsx}from'react/jsx-runtime';import {
|
|
1
|
+
import {jsxs,jsx}from'react/jsx-runtime';import {useLayoutSettings,useComponentSize,getMenuSeparation,getThemeColors}from'@admin-layout/client';import {Outlet}from'@remix-run/react';import {omit}from'lodash-es';import {useState,useEffect,useRef,useMemo}from'react';import warning from'warning';import {config}from'../../../config/env-config.js';import'@react-icons/all-files/fa/FaMoon.js';import'@react-icons/all-files/fa/FaSun.js';import {useMediaQuery}from'../../../hooks/useMediaQuery.js';import {useScrollThreshold}from'../../../hooks/useScrollThreshold.js';import isBrowser from'../../../utils/isBrowser/index.js';import {SettingDrawer}from'../../SettingDrawer/SettingDrawer.js';import {getPageTitleInfo}from'../getPageTitle.js';import {MainHeader}from'../GlobalHeader/MainHeader.js';import'../GlobalHeader/Logo.js';import'@remix-run/router';import'../../../helpers/DynamicIcon.js';import'@app/dialog/WrappedDialogsSwitch';import {GlobalHeader}from'../GlobalHeader/Header.js';import {MainSidebar}from'../Sidebar/MainSidebar.js';import {PerplexSidebar}from'../Sidebar/PerplexSidebar.js';import'@common-stack/components-pro';import {FooterSlot}from'../slot-fill/Footer.js';import'reflect-metadata';import'@admin-layout/client/lib/constants/layout.js';const useHorizontalScroll = ({
|
|
2
2
|
setScrolled,
|
|
3
3
|
setSearchOptionsShown,
|
|
4
4
|
onScrollReachEnd
|
|
@@ -56,8 +56,13 @@ const defaultPageTitleRender = (pageProps, props) => {
|
|
|
56
56
|
return pageTitleInfo;
|
|
57
57
|
};
|
|
58
58
|
const BasicLayout = props => {
|
|
59
|
+
// Get settings from Redux state
|
|
60
|
+
const {
|
|
61
|
+
settings: reduxSettings
|
|
62
|
+
} = useLayoutSettings();
|
|
63
|
+
// Merge Redux settings with props (props take precedence for backwards compatibility)
|
|
59
64
|
const propsWithSettings = {
|
|
60
|
-
...
|
|
65
|
+
...reduxSettings,
|
|
61
66
|
...props
|
|
62
67
|
};
|
|
63
68
|
const [scrolled, setScrolled] = useState(false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../../src/components/Layout/BasicLayout/index.tsx"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../src/components/Layout/BasicLayout/index.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,EAAqB,MAAM,sBAAsB,CAAC;AAK3E,OAAO,KAA+B,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAwB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"TailwindLayout.d.ts","sourceRoot":"","sources":["../../../src/components/Layout/TailwindLayout.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAqB,MAAM,sBAAsB,CAAC;AAK3E,OAAO,KAA+B,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAwB,MAAM,aAAa,CAAC;AA+FvF,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"}
|
|
@@ -4,8 +4,23 @@ import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout
|
|
|
4
4
|
settings: settingsFromLoader
|
|
5
5
|
} = useRouteLoaderData('root');
|
|
6
6
|
const {
|
|
7
|
+
settings: reduxSettings,
|
|
7
8
|
setSettings
|
|
8
9
|
} = useLayoutSettings();
|
|
10
|
+
// Use settingsFromLoader if available, fallback to Redux settings
|
|
11
|
+
// This ensures the machine always has valid settings input
|
|
12
|
+
const initialSettings = settingsFromLoader || reduxSettings;
|
|
13
|
+
console.log('🎯 TailwindLayout - Settings check:', {
|
|
14
|
+
hasSettingsFromLoader: !!settingsFromLoader,
|
|
15
|
+
hasReduxSettings: !!reduxSettings,
|
|
16
|
+
loaderSettingsKeys: settingsFromLoader ? Object.keys(settingsFromLoader) : [],
|
|
17
|
+
reduxSettingsKeys: reduxSettings ? Object.keys(reduxSettings) : [],
|
|
18
|
+
loaderShowSettingPanel: settingsFromLoader?.showSettingPanel,
|
|
19
|
+
reduxShowSettingPanel: reduxSettings?.showSettingPanel,
|
|
20
|
+
usingSettings: initialSettings ? 'provided' : 'none',
|
|
21
|
+
initialSettingsKeys: initialSettings ? Object.keys(initialSettings) : [],
|
|
22
|
+
initialShowSettingPanel: initialSettings?.showSettingPanel
|
|
23
|
+
});
|
|
9
24
|
const [state, send, settingsActor] = useMachine(settingsMachine.provide({
|
|
10
25
|
actions: {
|
|
11
26
|
updateReduxSettings: ({
|
|
@@ -20,10 +35,17 @@ import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout
|
|
|
20
35
|
}
|
|
21
36
|
}), {
|
|
22
37
|
input: {
|
|
23
|
-
settings:
|
|
38
|
+
settings: initialSettings
|
|
24
39
|
}
|
|
25
40
|
});
|
|
26
41
|
const settingXstate = state?.context;
|
|
42
|
+
console.log('🔧 XState Context after initialization:', {
|
|
43
|
+
showSettingPanel: settingXstate?.showSettingPanel,
|
|
44
|
+
hasAllKeys: !!settingXstate,
|
|
45
|
+
contextKeys: settingXstate ? Object.keys(settingXstate).slice(0, 10) : [],
|
|
46
|
+
navTheme: settingXstate?.navTheme,
|
|
47
|
+
primaryColor: settingXstate?.primaryColor
|
|
48
|
+
});
|
|
27
49
|
const {
|
|
28
50
|
permissions
|
|
29
51
|
} = props;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TailwindLayout.js","sources":["../../../src/components/Layout/TailwindLayout.tsx"],"sourcesContent":[null],"names":[],"mappings":"mgBAYA,SAAS,0BAA0B,CAAC,KAAqC,EAAA;AACrE,EAAA,MAAA,WAAc,WAAG,CAAA,YAAY,CAAA;QAC7B;AACA,IAAA,
|
|
1
|
+
{"version":3,"file":"TailwindLayout.js","sources":["../../../src/components/Layout/TailwindLayout.tsx"],"sourcesContent":[null],"names":[],"mappings":"mgBAYA,SAAS,0BAA0B,CAAC,KAAqC,EAAA;AACrE,EAAA,MAAA,WAAc,WAAG,CAAA,YAAY,CAAA;QAC7B;IACA,QAAQ,EAAA;MAER,kBAAA,CAAA,MAAA,CAAA;QACA;AACA,IAAA,QAAM,EAAA,aAAe;AAErB,IAAA;uBACI,EAAA;;AAEA;AACA,EAAA,MAAA,eAAA,GAAiB,kBAAkB,IAAA,aAAY;SAC/C,CAAA,GAAA,CAAA,qCAA0C,EAAE;yBAC5C,EAAA,CAAA,CAAqB,kBAAiB;oBACtC,EAAa,CAAE;AACf,IAAA,kBAAA,EAAA,kBAAqB,GAAgB,MAAE,CAAA,IAAO,CAAA,kBAAqB,CAAC,GAAE,EAAE;qBACxE,EAAA,aAAyB,GAAA,MAAA,CAAA,IAAiB,CAAA,aAAA,CAAA,GAAgB,EAAA;AAC7D,IAAA,sBAAE,EAAA,kBAAA,EAAA,gBAAA;AAEH,IAAA,qBAAoB,EAAA,aAAc,EAAG,gBACjC;AACI,IAAA,aAAS,EAAA,eAAA,GAAA,UAAA,GAAA,MAAA;uBACL,EAAA,eAAwB,GAAO,MAAE,CAAK,IAAI,CAAA,eAAE,CAAA,GAAA,EAAA;AACxC,IAAA,uBAAW,EAAA,eAAS,EAAA;;gBAEpB,IAAC,EAAA,aAAA,CAAA,GAAA,UAAA,CAAA,eAAA,CAAA,OAAA,CAAA;;yBAEJ,EAAA,CAAA;AACJ,QAAA,OAAA;AACJ,QACD;AACI,OAAA,KAAA;AACI,QAAA,IAAA,KAAA,EAAA,IAAU,KAAA,cAAe,EAAA;AAC5B,UAAA;AACJ,QACH;AAEF,QAAA,WAAM,CAAA,OAAiB,CAAA;AAEvB,MAAA;;;SAGI,EAAA;cACA,EAAQ;;AAEX,GAAA,CAAA;AAED,EAAA,MAAA,aAAQ,GAAW,cAAW;AAC9B,EAAA,OAAA,CAAM,6CACK,EAAA;AACH,IAAA,gBAAS,EAAA,aAAiB,EAAE,gBAAe;cAE9C,EAAA,CAAQ,CAAA,aAAW;AAExB,IAAA,0BAAwB,GAAA,MAAW,CAC/B,IAAC,CAAA,aAAU,CAAA,CAAA,KAAA,CAAA,CAAA,EAAA,EAAA,CAAA,GAAA,EAAA;YACP,EAAA,aAAA,EAAqB,QAAA;gBACrB,EAAA,aAAoB,EAAA;AACxB,GAAA,CAAA;QAIJ;IACA;MAEA,KAAO;AAaX,EAAC,MAAA,eAAA,GAAA,OAAA,CAAA,OAAA;AAED,IAAA,OAAM,EAAA,QAAc,EAAA,OAAU,EAAA,OAAa,IAAK;IAC5C,EAAA,CAAA,QAAQ,EAAA,OAAA,EAAA,OAAA,CAAA,CAAA;QACR,eAAiB,GAAA,WAAQ,CAAA,MAAA,IAAA;AAC5B;AAMD,IAAA,WAAe,CAAA,MAAG,CAAA;AAIlB,EAAA,CAAA,EAAA,CAAM,WAAA,CAAA,CAAA;AAKN;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SettingDrawer.d.ts","sourceRoot":"","sources":["../../../src/components/SettingDrawer/SettingDrawer.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAe/B,OAAO,EAAsB,kBAAkB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"SettingDrawer.d.ts","sourceRoot":"","sources":["../../../src/components/SettingDrawer/SettingDrawer.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAe/B,OAAO,EAAsB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAuTjE,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,GAAG,GAAG,CA0W5D,CAAC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import {jsx,Fragment,jsxs}from'react/jsx-runtime';import {
|
|
2
|
-
const updateTheme = (dark, color, publicPath = '/theme') => {
|
|
1
|
+
import {jsx,Fragment,jsxs}from'react/jsx-runtime';import {useSelector}from'@xstate/react';import clsx from'clsx';import {parse}from'qs';import {useState,useRef,useEffect}from'react';import {useTranslation}from'react-i18next';import'@react-icons/all-files/fa/FaMoon.js';import'@react-icons/all-files/fa/FaSun.js';import {useMediaQuery}from'../../hooks/useMediaQuery.js';import {icons}from'../../icons.js';import isBrowser from'../../utils/isBrowser/index.js';import'@common-stack/components-pro';import {AdditionalSettingsSlot}from'../Layout/slot-fill/AdditionalSettings.js';import'reflect-metadata';import'@admin-layout/client/lib/constants/layout.js';import CheckBoxTheme from'./CheckBoxTheme.js';import InvitationSettings from'./InvitationSettings.js';import LayoutChange from'./LayoutChange.js';import MenuVisibilitySettings from'./MenuVisibilitySettings.js';import NavigationModes from'./NavigationsModes.js';import RegionalSettings from'./RegionalSettings.js';import ThemeColor from'./ThemeColor.js';import {ThemeSelector}from'./ThemeSelector.js';import {WebFontsSelector}from'./WebFontsSelector.js';import {useWriteSettingsMutation}from'common/lib/generated/generated.js';import {ConfigCollectionName,ConfigFragmentName}from'common/lib/generated/generated-models.js';import {generateCdecodeUri,DEFAULT_TENANT_ID}from'@adminide-stack/core';import {useLayoutSettings}from'@admin-layout/client';import {config}from'../../config/env-config.js';const updateTheme = (dark, color, publicPath = '/theme') => {
|
|
3
2
|
// ssr
|
|
4
3
|
if (typeof window === 'undefined' || !window.umi_plugin_ant_themeVar) {
|
|
5
4
|
return;
|
|
@@ -42,7 +41,7 @@ const updateTheme = (dark, color, publicPath = '/theme') => {
|
|
|
42
41
|
}
|
|
43
42
|
// localStorage.setItem('site-theme', dark ? 'dark' : 'light');
|
|
44
43
|
};
|
|
45
|
-
const initState = (settings, onSettingChange, publicPath) => {
|
|
44
|
+
const initState = (settings, onSettingChange, publicPath, oldSetting) => {
|
|
46
45
|
if (!isBrowser()) {
|
|
47
46
|
return;
|
|
48
47
|
}
|
|
@@ -51,7 +50,7 @@ const initState = (settings, onSettingChange, publicPath) => {
|
|
|
51
50
|
const params = parse(window.location.search.replace('?', ''));
|
|
52
51
|
const replaceSetting = {};
|
|
53
52
|
Object.keys(params).forEach(key => {
|
|
54
|
-
if (
|
|
53
|
+
if (settings[key] !== undefined || settings[key] === undefined) {
|
|
55
54
|
replaceSetting[key] = params[key];
|
|
56
55
|
if (key.includes('Render')) {
|
|
57
56
|
replaceSetting[key] = params[key] === 'false' ? false : undefined;
|
|
@@ -65,7 +64,7 @@ const initState = (settings, onSettingChange, publicPath) => {
|
|
|
65
64
|
});
|
|
66
65
|
}
|
|
67
66
|
// Set the topic in the URL and load it once.
|
|
68
|
-
if (oldSetting
|
|
67
|
+
if (oldSetting?.navTheme !== params.navTheme && params.navTheme) {
|
|
69
68
|
updateTheme(settings.navTheme === 'realDark', params.primaryColor, publicPath);
|
|
70
69
|
loadedStyle = true;
|
|
71
70
|
}
|
|
@@ -74,7 +73,7 @@ const initState = (settings, onSettingChange, publicPath) => {
|
|
|
74
73
|
return;
|
|
75
74
|
}
|
|
76
75
|
// If there is no topic in the URL, and no load in the URL is loaded.
|
|
77
|
-
if (
|
|
76
|
+
if (oldSetting?.navTheme !== settings.navTheme && settings.navTheme) {
|
|
78
77
|
updateTheme(settings.navTheme === 'realDark', settings.primaryColor, publicPath);
|
|
79
78
|
}
|
|
80
79
|
};
|
|
@@ -264,7 +263,6 @@ const fontOptions = [{
|
|
|
264
263
|
}];
|
|
265
264
|
const SettingDrawer = props => {
|
|
266
265
|
const {
|
|
267
|
-
settings,
|
|
268
266
|
onSettingChange,
|
|
269
267
|
hideLoading,
|
|
270
268
|
hideColors,
|
|
@@ -278,6 +276,10 @@ const SettingDrawer = props => {
|
|
|
278
276
|
location,
|
|
279
277
|
fullMenuData
|
|
280
278
|
} = props;
|
|
279
|
+
// Get settings from Redux state using the hook
|
|
280
|
+
const {
|
|
281
|
+
settings
|
|
282
|
+
} = useLayoutSettings();
|
|
281
283
|
const {
|
|
282
284
|
CloseIcon,
|
|
283
285
|
Settings5FillIcon,
|
|
@@ -293,6 +295,8 @@ const SettingDrawer = props => {
|
|
|
293
295
|
const {
|
|
294
296
|
t
|
|
295
297
|
} = useTranslation('settings');
|
|
298
|
+
// Track previous settings to detect changes
|
|
299
|
+
const prevSettingsRef = useRef({});
|
|
296
300
|
const resource = generateCdecodeUri(DEFAULT_TENANT_ID, {
|
|
297
301
|
resourceType: ConfigCollectionName.Applications,
|
|
298
302
|
resourceId: config.APPLICATION_ID,
|
|
@@ -385,16 +389,16 @@ const SettingDrawer = props => {
|
|
|
385
389
|
useEffect(() => {
|
|
386
390
|
// Only update if there's a meaningful difference
|
|
387
391
|
if (JSON.stringify(settingState) !== JSON.stringify(settings)) {
|
|
388
|
-
oldSetting = {
|
|
389
|
-
...defaultSettings,
|
|
390
|
-
...settings
|
|
391
|
-
};
|
|
392
392
|
if (isBrowser()) {
|
|
393
|
-
// Compare settings with
|
|
394
|
-
if (JSON.stringify(settings) !== JSON.stringify(
|
|
395
|
-
initState(settings, onSettingChange, props.publicPath);
|
|
393
|
+
// Compare settings with previous settings to determine if initialization is needed
|
|
394
|
+
if (JSON.stringify(settings) !== JSON.stringify(prevSettingsRef.current)) {
|
|
395
|
+
initState(settings, onSettingChange, props.publicPath, prevSettingsRef.current);
|
|
396
396
|
}
|
|
397
397
|
}
|
|
398
|
+
// Update the ref to current settings
|
|
399
|
+
prevSettingsRef.current = {
|
|
400
|
+
...settings
|
|
401
|
+
};
|
|
398
402
|
}
|
|
399
403
|
}, [settings]); // Only depend on settings
|
|
400
404
|
const currentPathname = isBrowser() ? window.location.pathname : pathname || '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SettingDrawer.js","sources":["../../../src/components/SettingDrawer/SettingDrawer.tsx"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SettingDrawer.js","sources":["../../../src/components/SettingDrawer/SettingDrawer.tsx"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
|
+
import { IAppLoadContext } from '@common-stack/client-core';
|
|
2
|
+
import { IResourceParams } from '@common-stack/core';
|
|
1
3
|
export declare const action: ({ request, context, params, }: {
|
|
2
4
|
request: Request;
|
|
3
|
-
context?:
|
|
4
|
-
params?:
|
|
5
|
-
}) => Promise<import("@remix-run/server-runtime").TypedResponse<any
|
|
5
|
+
context?: IAppLoadContext;
|
|
6
|
+
params?: IResourceParams;
|
|
7
|
+
}) => Promise<import("@remix-run/server-runtime").TypedResponse<any>>;
|
|
8
|
+
export declare const loader: ({ request, context, params, }: {
|
|
6
9
|
request: Request;
|
|
7
|
-
context?:
|
|
8
|
-
params?:
|
|
10
|
+
context?: IAppLoadContext;
|
|
11
|
+
params?: IResourceParams;
|
|
9
12
|
}) => Promise<import("@remix-run/server-runtime").TypedResponse<{
|
|
10
13
|
settings: any;
|
|
11
14
|
}>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpdateSettingsResource.server.d.ts","sourceRoot":"","sources":["../../../src/components/UpdateSettingsResource/UpdateSettingsResource.server.ts"],"names":[],"mappings":"
|
|
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;AAgDrD,eAAO,MAAM,MAAM,GAAU,+BAI1B;IACC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,MAAM,CAAC,EAAE,eAAe,CAAC;CAC5B,oEA+KA,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;;GA8DA,CAAC"}
|
|
@@ -1,4 +1,245 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
import { json } from '@remix-run/node';
|
|
2
|
+
import { merge } from 'lodash-es';
|
|
3
|
+
import { assignDefaults, compareAndSaveSettingsDifferences } from '@admin-layout/client';
|
|
4
|
+
import { fetchPageSettings, settingsCookie, settingsLoaderUtil } from '@admin-layout/client/lib/components/UpdateSettings/UpdateSettings.server';
|
|
5
|
+
import { config } from '../../config/env-config.js';
|
|
6
|
+
import '../../config/analytics-config.js'; /**
|
|
7
|
+
* Parse LAYOUT_SETTINGS from config (which may be a JSON string from env variable)
|
|
8
|
+
* This is the single place where we handle the parsing logic
|
|
9
|
+
*/
|
|
10
|
+
function parseLayoutSettings() {
|
|
11
|
+
try {
|
|
12
|
+
if (!config.LAYOUT_SETTINGS) {
|
|
13
|
+
console.log('⚠️ config.LAYOUT_SETTINGS is empty/undefined, returning {}');
|
|
14
|
+
return {};
|
|
15
|
+
}
|
|
16
|
+
// If it's already an object (parsed by envalid json validator), return it
|
|
17
|
+
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
|
+
return config.LAYOUT_SETTINGS;
|
|
20
|
+
}
|
|
21
|
+
// If it's a string, parse it (this happens when envalid uses str validator)
|
|
22
|
+
if (typeof config.LAYOUT_SETTINGS === 'string') {
|
|
23
|
+
console.log('🔧 Parsing LAYOUT_SETTINGS from string:', config.LAYOUT_SETTINGS.substring(0, 50));
|
|
24
|
+
const parsed = JSON.parse(config.LAYOUT_SETTINGS);
|
|
25
|
+
console.log('✅ Parsed to object with keys:', Object.keys(parsed).slice(0, 10));
|
|
26
|
+
return parsed || {};
|
|
27
|
+
}
|
|
28
|
+
console.warn('⚠️ config.LAYOUT_SETTINGS is unexpected type:', typeof config.LAYOUT_SETTINGS);
|
|
29
|
+
return {};
|
|
30
|
+
} catch (error) {
|
|
31
|
+
console.error('❌ Error parsing LAYOUT_SETTINGS:', error);
|
|
32
|
+
console.error('❌ Value was:', config.LAYOUT_SETTINGS);
|
|
33
|
+
return {};
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
const action = async ({
|
|
37
|
+
request,
|
|
38
|
+
context,
|
|
39
|
+
params
|
|
40
|
+
}) => {
|
|
41
|
+
try {
|
|
42
|
+
// 1. Fetch default settings from GraphQL (or fallback to local defaults)
|
|
43
|
+
const {
|
|
44
|
+
apolloClient
|
|
45
|
+
} = context;
|
|
46
|
+
const result = await fetchPageSettings(apolloClient);
|
|
47
|
+
const pageSettings = result?.data?.pageSettings?.settings ? JSON.parse(JSON.stringify(result.data.pageSettings.settings)) : null;
|
|
48
|
+
// Use pageSettings.uilayout only if it has keys, otherwise use parsed LAYOUT_SETTINGS
|
|
49
|
+
const uilayout = pageSettings?.uilayout;
|
|
50
|
+
const hasUilayoutData = uilayout && typeof uilayout === 'object' && Object.keys(uilayout).length > 0;
|
|
51
|
+
const layoutSettings = parseLayoutSettings();
|
|
52
|
+
let pageDefaultSettings = hasUilayoutData ? uilayout : layoutSettings;
|
|
53
|
+
console.log('📥 Step 1 - GraphQL result has data:', !!result?.data?.pageSettings);
|
|
54
|
+
console.log('📥 Step 1 - uilayout has data:', hasUilayoutData);
|
|
55
|
+
console.log('📥 Step 1 - pageDefaultSettings keys:', Object.keys(pageDefaultSettings).slice(0, 10));
|
|
56
|
+
// 2 TEMPORARY: Manually add hiddenMenuKeys to defaults until GraphQL schema is updated
|
|
57
|
+
pageDefaultSettings = {
|
|
58
|
+
...pageDefaultSettings,
|
|
59
|
+
hiddenMenuKeys: [],
|
|
60
|
+
hiddenMenuCategories: []
|
|
61
|
+
};
|
|
62
|
+
// 3. Parse the incoming settings update from the client (usually only changed keys)
|
|
63
|
+
const jsonData = await request.json();
|
|
64
|
+
const payload = jsonData?.config || {};
|
|
65
|
+
console.log('📥 Step 3 - Incoming payload keys:', Object.keys(payload));
|
|
66
|
+
console.log('📥 Step 3 - Payload has changedSettings:', !!payload.changedSettings);
|
|
67
|
+
if (payload.changedSettings) {
|
|
68
|
+
console.log('📥 Step 3 - changedSettings type:', typeof payload.changedSettings);
|
|
69
|
+
console.log('📥 Step 3 - changedSettings keys:', Object.keys(payload.changedSettings));
|
|
70
|
+
console.log('📥 Step 3 - changedSettings JSON:', JSON.stringify(payload.changedSettings).substring(0, 200));
|
|
71
|
+
}
|
|
72
|
+
// 4. Fill in any missing default keys in the payload (does not overwrite user values)
|
|
73
|
+
assignDefaults(payload, pageDefaultSettings);
|
|
74
|
+
// 5. Parse existing settings from the cookie (if present)
|
|
75
|
+
const cookieHeader = request.headers.get('Cookie');
|
|
76
|
+
let existingSettings;
|
|
77
|
+
let mergedSettings;
|
|
78
|
+
try {
|
|
79
|
+
existingSettings = await settingsCookie.parse(cookieHeader);
|
|
80
|
+
console.log('📥 Step 5 - Parsed cookie keys:', existingSettings ? Object.keys(existingSettings).slice(0, 15) : 'null');
|
|
81
|
+
// DEFENSIVE: Remove any invalid numeric string keys that shouldn't be there
|
|
82
|
+
if (existingSettings && typeof existingSettings === 'object') {
|
|
83
|
+
const invalidKeys = [];
|
|
84
|
+
Object.keys(existingSettings).forEach(key => {
|
|
85
|
+
// Remove keys that are numeric strings (like "0", "1", etc.)
|
|
86
|
+
if (/^\d+$/.test(key)) {
|
|
87
|
+
invalidKeys.push(key);
|
|
88
|
+
console.warn(`⚠️ Removing invalid numeric key from cookie settings: "${key}" = ${JSON.stringify(existingSettings[key])}`);
|
|
89
|
+
delete existingSettings[key];
|
|
90
|
+
}
|
|
91
|
+
});
|
|
92
|
+
if (invalidKeys.length > 0) {
|
|
93
|
+
console.log('🧹 Cleaned keys from cookie:', invalidKeys);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
console.log('📥 Step 6 - Before merge - existingSettings keys:', existingSettings ? Object.keys(existingSettings).slice(0, 10) : 'null');
|
|
97
|
+
console.log('📥 Step 6 - Before merge - payload keys:', Object.keys(payload).slice(0, 10));
|
|
98
|
+
// 6. Merge existing settings with the new payload from the client
|
|
99
|
+
mergedSettings = merge({}, existingSettings, payload);
|
|
100
|
+
console.log('📥 Step 6 - After merge - mergedSettings keys:', Object.keys(mergedSettings).slice(0, 15));
|
|
101
|
+
// Check if numeric keys appeared after merge
|
|
102
|
+
const numericKeysAfterMerge = Object.keys(mergedSettings).filter(k => /^\d+$/.test(k));
|
|
103
|
+
if (numericKeysAfterMerge.length > 0) {
|
|
104
|
+
console.error('❌ NUMERIC KEYS APPEARED AFTER MERGE!', numericKeysAfterMerge);
|
|
105
|
+
console.error('❌ Values:', numericKeysAfterMerge.map(k => `${k}: ${JSON.stringify(mergedSettings[k])}`));
|
|
106
|
+
}
|
|
107
|
+
// 7. Ensure merged settings have all default keys (again, does not overwrite user values)
|
|
108
|
+
assignDefaults(mergedSettings, pageDefaultSettings);
|
|
109
|
+
console.log('📥 Step 7 - After assignDefaults - mergedSettings keys:', Object.keys(mergedSettings).slice(0, 15));
|
|
110
|
+
} catch (error) {
|
|
111
|
+
// If cookie parsing fails, fall back to just the payload
|
|
112
|
+
console.error('Error parsing settings cookie in action:', error);
|
|
113
|
+
existingSettings = null;
|
|
114
|
+
mergedSettings = payload;
|
|
115
|
+
}
|
|
116
|
+
// 8. Build the final settings object: defaults → layoutSettings → merged user settings
|
|
117
|
+
console.log('📥 Step 8 - Before final merge:');
|
|
118
|
+
console.log(' - pageDefaultSettings keys:', Object.keys(pageDefaultSettings).slice(0, 10));
|
|
119
|
+
console.log(' - layoutSettings keys:', Object.keys(layoutSettings).slice(0, 10));
|
|
120
|
+
console.log(' - mergedSettings keys:', mergedSettings ? Object.keys(mergedSettings).slice(0, 10) : 'null');
|
|
121
|
+
const fullSettings = merge({}, pageDefaultSettings, layoutSettings, mergedSettings);
|
|
122
|
+
console.log('📥 Step 8 - After final merge - fullSettings keys:', Object.keys(fullSettings).slice(0, 15));
|
|
123
|
+
// Check if numeric keys appeared after final merge
|
|
124
|
+
const numericKeysAfterFinalMerge = Object.keys(fullSettings).filter(k => /^\d+$/.test(k));
|
|
125
|
+
if (numericKeysAfterFinalMerge.length > 0) {
|
|
126
|
+
console.error('❌ NUMERIC KEYS APPEARED AFTER FINAL MERGE!', numericKeysAfterFinalMerge);
|
|
127
|
+
console.error('❌ Values:', numericKeysAfterFinalMerge.map(k => `${k}: ${JSON.stringify(fullSettings[k])}`));
|
|
128
|
+
}
|
|
129
|
+
// TEMPORARY FIX: Manually override hiddenMenuKeys with payload value
|
|
130
|
+
// This ensures payload array replaces the prev array values
|
|
131
|
+
if (payload.hiddenMenuKeys !== undefined) {
|
|
132
|
+
fullSettings.hiddenMenuKeys = [...payload.hiddenMenuKeys];
|
|
133
|
+
}
|
|
134
|
+
// 9. Store only the differences from the defaults in the cookie (to minimize cookie size)
|
|
135
|
+
console.log('🔍 Comparing settings:');
|
|
136
|
+
console.log('fullSettings keys:', Object.keys(fullSettings).slice(0, 10));
|
|
137
|
+
console.log('pageDefaultSettings keys:', Object.keys(pageDefaultSettings).slice(0, 10));
|
|
138
|
+
// DEFENSIVE: Remove any invalid numeric string keys before comparison
|
|
139
|
+
if (fullSettings && typeof fullSettings === 'object') {
|
|
140
|
+
Object.keys(fullSettings).forEach(key => {
|
|
141
|
+
if (/^\d+$/.test(key)) {
|
|
142
|
+
console.warn(`⚠️ Removing invalid numeric key from fullSettings: "${key}"`);
|
|
143
|
+
delete fullSettings[key];
|
|
144
|
+
}
|
|
145
|
+
});
|
|
146
|
+
}
|
|
147
|
+
const diffSettings = await compareAndSaveSettingsDifferences(fullSettings, pageDefaultSettings);
|
|
148
|
+
// DEFENSIVE: Final check - remove any invalid keys from diffSettings before saving
|
|
149
|
+
if (diffSettings && typeof diffSettings === 'object') {
|
|
150
|
+
Object.keys(diffSettings).forEach(key => {
|
|
151
|
+
if (/^\d+$/.test(key)) {
|
|
152
|
+
console.warn(`⚠️ Removing invalid numeric key from diffSettings: "${key}"`);
|
|
153
|
+
delete diffSettings[key];
|
|
154
|
+
}
|
|
155
|
+
});
|
|
156
|
+
}
|
|
157
|
+
console.log('📦 Diff settings to save in cookie:', JSON.stringify(diffSettings).substring(0, 500));
|
|
158
|
+
console.log('diffSettings keys:', Object.keys(diffSettings));
|
|
159
|
+
// 10. Serialize the diff settings into a cookie string
|
|
160
|
+
const newCookie = await settingsCookie.serialize(diffSettings);
|
|
161
|
+
// 11. Return the full settings as JSON, and set the new cookie in the response headers
|
|
162
|
+
return json(fullSettings, {
|
|
163
|
+
headers: {
|
|
164
|
+
'Set-Cookie': newCookie
|
|
165
|
+
}
|
|
166
|
+
});
|
|
167
|
+
} catch (error) {
|
|
168
|
+
// If anything fails, log the error and return a 500 error response
|
|
169
|
+
console.error('Error in action:', error);
|
|
170
|
+
return json({
|
|
171
|
+
error: 'Failed to update settings'
|
|
172
|
+
}, {
|
|
173
|
+
status: 500
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
};
|
|
177
|
+
const loader = async ({
|
|
178
|
+
request,
|
|
179
|
+
context,
|
|
180
|
+
params
|
|
181
|
+
}) => {
|
|
182
|
+
try {
|
|
183
|
+
console.log('📤 LOADER - Starting settingsLoaderUtil');
|
|
184
|
+
const {
|
|
185
|
+
settings,
|
|
186
|
+
setCookie
|
|
187
|
+
} = await settingsLoaderUtil({
|
|
188
|
+
request,
|
|
189
|
+
context,
|
|
190
|
+
params
|
|
191
|
+
});
|
|
192
|
+
console.log('📤 LOADER - Received settings keys:', settings ? Object.keys(settings).slice(0, 15) : 'null');
|
|
193
|
+
// Check for numeric keys in the settings returned by loader
|
|
194
|
+
if (settings && typeof settings === 'object') {
|
|
195
|
+
const numericKeys = Object.keys(settings).filter(k => /^\d+$/.test(k));
|
|
196
|
+
if (numericKeys.length > 0) {
|
|
197
|
+
console.error('❌ LOADER - NUMERIC KEYS IN SETTINGS!', numericKeys);
|
|
198
|
+
console.error('❌ LOADER - Values:', numericKeys.map(k => `${k}: ${JSON.stringify(settings[k])}`));
|
|
199
|
+
// DEFENSIVE: Remove them
|
|
200
|
+
numericKeys.forEach(key => {
|
|
201
|
+
console.warn(`⚠️ LOADER - Removing invalid numeric key: "${key}"`);
|
|
202
|
+
delete settings[key];
|
|
203
|
+
});
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
// Always include headers, but only set cookie if provided
|
|
207
|
+
const headers = {};
|
|
208
|
+
if (setCookie) {
|
|
209
|
+
headers['Set-Cookie'] = setCookie;
|
|
210
|
+
}
|
|
211
|
+
console.log('📤 LOADER - Returning settings with keys:', settings ? Object.keys(settings).slice(0, 15) : 'null');
|
|
212
|
+
// returnInfo: {"returnType":"json","keys":["settings"],"hasOptions":true}
|
|
213
|
+
return {
|
|
214
|
+
data: [settings],
|
|
215
|
+
options: {
|
|
216
|
+
headers
|
|
217
|
+
}
|
|
218
|
+
};
|
|
219
|
+
} catch (error) {
|
|
220
|
+
console.error('Error in settings loader:', error);
|
|
221
|
+
// Fall back to default settings
|
|
222
|
+
const {
|
|
223
|
+
apolloClient
|
|
224
|
+
} = context;
|
|
225
|
+
const result = await fetchPageSettings(apolloClient);
|
|
226
|
+
const pageSettings = result?.data?.pageSettings?.settings ? JSON.parse(JSON.stringify(result.data.pageSettings.settings)) : null;
|
|
227
|
+
// Use pageSettings.uilayout only if it has keys, otherwise use parsed LAYOUT_SETTINGS
|
|
228
|
+
const uilayout = pageSettings?.uilayout;
|
|
229
|
+
const hasUilayoutData = uilayout && typeof uilayout === 'object' && Object.keys(uilayout).length > 0;
|
|
230
|
+
const layoutSettings = parseLayoutSettings();
|
|
231
|
+
let pageDefaultSettings = hasUilayoutData ? uilayout : layoutSettings;
|
|
232
|
+
// TEMPORARY: Manually add hiddenMenuKeys to defaults until GraphQL schema is updated
|
|
233
|
+
pageDefaultSettings = {
|
|
234
|
+
...pageDefaultSettings,
|
|
235
|
+
hiddenMenuKeys: [],
|
|
236
|
+
// Array format for menu visibility
|
|
237
|
+
hiddenMenuCategories: [] // Array format for category visibility
|
|
238
|
+
};
|
|
239
|
+
// returnInfo: {"returnType":"json","keys":["settings","settings"],"hasOptions":true}
|
|
240
|
+
return {
|
|
241
|
+
data: [merge({}, pageDefaultSettings, layoutSettings)]
|
|
242
|
+
};
|
|
243
|
+
}
|
|
244
|
+
};
|
|
245
|
+
export { action, loader }; //# sourceMappingURL=UpdateSettingsResource.server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpdateSettingsResource.server.js","sources":["../../../src/components/UpdateSettingsResource/UpdateSettingsResource.server.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"UpdateSettingsResource.server.js","sources":["../../../src/components/UpdateSettingsResource/UpdateSettingsResource.server.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
package/lib/compute.js
CHANGED
|
@@ -30,7 +30,12 @@ const tailwindDesignProPage = [{
|
|
|
30
30
|
componentPath: "@admin-layout/tailwind-design-pro/lib/components/UpdateSettingsResource/UpdateSettingsResource.js",
|
|
31
31
|
hasComponent: true,
|
|
32
32
|
hasLoader: true,
|
|
33
|
-
hasAction: true
|
|
33
|
+
hasAction: true,
|
|
34
|
+
loaderReturnInfo: {
|
|
35
|
+
returnType: "json",
|
|
36
|
+
hasOptions: true,
|
|
37
|
+
keys: ["settings", "settings"]
|
|
38
|
+
}
|
|
34
39
|
}];
|
|
35
40
|
// get menus
|
|
36
41
|
getFilteredMenus(tailwindDesignProPage);
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import {config}from'./env-config.js';/**
|
|
2
|
+
* Google Analytics Configuration
|
|
3
|
+
*/
|
|
4
|
+
// Configuration for analytics tracking
|
|
5
|
+
({
|
|
6
|
+
// Enable or disable debugging messages in console
|
|
7
|
+
debug: process.env.NODE_ENV === 'development',
|
|
8
|
+
// GA4 Measurement ID
|
|
9
|
+
GA4_MEASUREMENT_ID: config.GOOGLE_ANALYTICS_ID});//# sourceMappingURL=analytics-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"analytics-config.js","sources":["../../src/config/analytics-config.ts"],"sourcesContent":[null],"names":[],"mappings":"qCAAA;;AAEG;AAIH;CACgC;;AAK5B,EAAA,KAAA,EAAK,OAAE,CAAA,YAAY,kBAAa;;oBAGhC,EAAkB,MAAE,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-config.d.ts","sourceRoot":"","sources":["../../src/config/env-config.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,MAAM
|
|
1
|
+
{"version":3,"file":"env-config.d.ts","sourceRoot":"","sources":["../../src/config/env-config.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;0CA2CjB,CAAC"}
|
package/lib/config/env-config.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-config.js","sources":["../../src/config/env-config.ts"],"sourcesContent":[null],"names":[],"mappings":"0JAIA,MAAM,GAAG,GAAG,cAAc,EAAE;AAE5B,MAAM,sBAAsB,GAAG,IAAI,CAAC,SAAS,CAAC;KAC1C,EAAG,gBAAE,CAAA,GAAiB;KACtB,EAAG,gBAAE,CAAA,GAAiB;MACtB,EAAI,gBAAE,CAAA,IAAiB;SACvB,EAAO,gBAAE,CAAA;AACZ,CAAA,CAAC;AAEK,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE;AAChC,EAAA,WAAA,EAAW,GAAE,CAAA;AACb,IAAA,OAAA,EAAA,aAAA;AACA,IAAA,IAAA,EAAA;AACA,GAAA,CAAA;AACA,EAAA,gCAA4B,EAAI,IAAE,CAAA;AAClC,IAAA,OAAA,EAAA,KAAc;AACd,IAAA,IAAA,EAAA;
|
|
1
|
+
{"version":3,"file":"env-config.js","sources":["../../src/config/env-config.ts"],"sourcesContent":[null],"names":[],"mappings":"0JAIA,MAAM,GAAG,GAAG,cAAc,EAAE;AAE5B,MAAM,sBAAsB,GAAG,IAAI,CAAC,SAAS,CAAC;KAC1C,EAAG,gBAAE,CAAA,GAAiB;KACtB,EAAG,gBAAE,CAAA,GAAiB;MACtB,EAAI,gBAAE,CAAA,IAAiB;SACvB,EAAO,gBAAE,CAAA;AACZ,CAAA,CAAC;AAEK,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE;AAChC,EAAA,WAAA,EAAW,GAAE,CAAA;AACb,IAAA,OAAA,EAAA,aAAA;AACA,IAAA,IAAA,EAAA;AACA,GAAA,CAAA;AACA,EAAA,gCAA4B,EAAI,IAAE,CAAA;AAClC,IAAA,OAAA,EAAA,KAAc;AACd,IAAA,IAAA,EAAA;IACA;AACA,EAAA,gBAAa,EAAE,GAAI,CAAA;IACnB,OAAA,EAAA;IACA,IAAA,EAAA;AACI,GAAA,CAAA;AACA,EAAA,eAAM,EAAA,GAAA,CAAA;WACR,EAAA,IAAA,CAAA,SAAA,CAAA,eAAA,CAAA;IACF,IAAA,EAAA;AACI,GAAA,CAAA;AACA,EAAA,0BAAM,EAAA,GAAA,CAAA;WACR,EAAA,EAAA;IACF,IAAA,EAAA;;AAEI,EAAA,cAAM,EAAA,GAAA,CAAA;WACR,EAAA,EAAA;IACF,IAAA,EAAA;AACI,GAAA,CAAA;AACA,EAAA,mBAAM,EAAA,GAAA,CAAA;WACR,EAAA,EAAA;IACF,IAAA,EAAA;AACI,GAAA,CAAA;AACA,EAAA,UAAI,EAAE,GAAA,CAAA;WACR,EAAA;IACF;eACA,EAAA,GAAA,CAAA;AACI,IAAA,OAAA,EAAA,SAAS;AACT,IAAA,IAAA,EAAA;;AAEJ,EAAA,mBAAA,EAAA,GAAqB,CAAE;IACvB,OAAA,EAAA;IACA;mCACoB,EAAA,GAAA,CAAA;AAChB,IAAA,OAAA,EAAA,EAAO;AACP,IAAA,IAAA,EAAA;;AAEP,EAAC,kCAAC,EAAA,GAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settingsMachine.d.ts","sourceRoot":"","sources":["../../src/machines/settingsMachine.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"settingsMachine.d.ts","sourceRoot":"","sources":["../../src/machines/settingsMachine.ts"],"names":[],"mappings":"AAEA,OAAO,EAGH,YAAY,EAIZ,eAAe,EAElB,MAAM,SAAS,CAAC;AAwFjB,eAAO,MAAM,eAAe;cAMN,eAAe;oBACT,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;sEA4HlE,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {cloneDeep,set}from'lodash-es';import {createMachine,assign}from'xstate';import {SearchBarBehavior}from'./types.js';// Default route settings template
|
|
2
2
|
const DEFAULT_LAYOUT = {
|
|
3
3
|
navigationMode: 'mixed',
|
|
4
4
|
sideMenuType: 'expanded',
|
|
@@ -87,49 +87,21 @@ const settingsMachine = createMachine({
|
|
|
87
87
|
context: ({
|
|
88
88
|
input
|
|
89
89
|
}) => {
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
showSettingPanel: defaultSettings.showSettingPanel,
|
|
98
|
-
titleColor: defaultSettings.titleColor,
|
|
99
|
-
language: defaultSettings.language,
|
|
100
|
-
fontFamily: defaultSettings.fontFamily,
|
|
101
|
-
titleFontWeight: defaultSettings.titleFontWeight,
|
|
102
|
-
titleHeight: defaultSettings.titleHeight,
|
|
103
|
-
titleFontSize: defaultSettings.titleFontSize,
|
|
104
|
-
letterSpacings: defaultSettings.letterSpacings,
|
|
105
|
-
siderBgColor: defaultSettings.siderBgColor,
|
|
106
|
-
headerBgColor: defaultSettings.headerBgColor,
|
|
107
|
-
textColor: defaultSettings.textColor,
|
|
108
|
-
themeType: defaultSettings.themeType,
|
|
109
|
-
sideMenuType: defaultSettings.sideMenuType,
|
|
110
|
-
loginThemeColor: defaultSettings.loginThemeColor,
|
|
111
|
-
loginFormPosition: defaultSettings.loginFormPosition,
|
|
112
|
-
loginSocials: defaultSettings.loginSocials,
|
|
113
|
-
loginBackgroundImage: defaultSettings.loginBackgroundImage,
|
|
114
|
-
verifyFormLayout: defaultSettings.verifyFormLayout,
|
|
115
|
-
verifyFormImageUrl: defaultSettings.verifyFormImageUrl,
|
|
116
|
-
verifyFormBackgroundStyle: defaultSettings.verifyFormBackgroundStyle,
|
|
117
|
-
verifyFormVisibleFields: defaultSettings.verifyFormVisibleFields,
|
|
118
|
-
verifyFormShowSkipButton: defaultSettings.verifyFormShowSkipButton,
|
|
119
|
-
components: [],
|
|
120
|
-
activeComponent: null,
|
|
90
|
+
// Use input settings with machine-specific defaults
|
|
91
|
+
// Input settings should contain all required fields from Redux/environment
|
|
92
|
+
return {
|
|
93
|
+
...input?.settings,
|
|
94
|
+
// Only override/add machine-specific fields
|
|
95
|
+
components: input?.settings?.components || [],
|
|
96
|
+
activeComponent: input?.settings?.activeComponent || null,
|
|
121
97
|
currentRoute: input?.settings?.currentRoute || '/',
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
routeSettings: {
|
|
98
|
+
hiddenMenuKeys: input?.settings?.hiddenMenuKeys || [],
|
|
99
|
+
hiddenMenuCategories: input?.settings?.hiddenMenuCategories || [],
|
|
100
|
+
routeSettings: input?.settings?.routeSettings || {
|
|
126
101
|
'/': defaultRouteSettings
|
|
127
102
|
},
|
|
128
|
-
sidebar: {
|
|
129
|
-
pinnedPath: null
|
|
130
|
-
},
|
|
131
103
|
changedSettings: {}
|
|
132
|
-
}
|
|
104
|
+
};
|
|
133
105
|
},
|
|
134
106
|
states: {
|
|
135
107
|
idle: {
|
|
@@ -202,15 +174,18 @@ const settingsMachine = createMachine({
|
|
|
202
174
|
})), 'updateReduxSettings']
|
|
203
175
|
},
|
|
204
176
|
RESET: {
|
|
205
|
-
actions: [assign((
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
177
|
+
actions: [assign(({
|
|
178
|
+
context
|
|
179
|
+
}) => ({
|
|
180
|
+
// Reset to initial input settings by clearing runtime changes
|
|
181
|
+
// Keep the base settings from input but reset runtime state
|
|
182
|
+
...context,
|
|
209
183
|
components: [],
|
|
210
184
|
activeComponent: null,
|
|
211
185
|
routeSettings: {
|
|
212
186
|
'/': defaultRouteSettings
|
|
213
|
-
}
|
|
187
|
+
},
|
|
188
|
+
changedSettings: {}
|
|
214
189
|
})), 'updateReduxSettings']
|
|
215
190
|
},
|
|
216
191
|
RESET_CHANGED_SETTINGS: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settingsMachine.js","sources":["../../src/machines/settingsMachine.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"settingsMachine.js","sources":["../../src/machines/settingsMachine.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
package/lib/routes.json
CHANGED
|
@@ -35,9 +35,16 @@
|
|
|
35
35
|
"auth": false,
|
|
36
36
|
"path": "/resources/settings",
|
|
37
37
|
"componentPath": "@admin-layout/tailwind-design-pro/lib/components/UpdateSettingsResource/UpdateSettingsResource.js",
|
|
38
|
-
"hasComponent": true,
|
|
39
38
|
"hasLoader": true,
|
|
40
|
-
"hasAction": true
|
|
39
|
+
"hasAction": true,
|
|
40
|
+
"loaderReturnInfo": {
|
|
41
|
+
"returnType": "json",
|
|
42
|
+
"hasOptions": true,
|
|
43
|
+
"keys": [
|
|
44
|
+
"settings",
|
|
45
|
+
"settings"
|
|
46
|
+
]
|
|
47
|
+
}
|
|
41
48
|
}
|
|
42
49
|
}
|
|
43
50
|
]
|
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.44",
|
|
4
4
|
"description": "Sample core for higher packages to depend on",
|
|
5
5
|
"license": "ISC",
|
|
6
6
|
"author": "CDMBase LLC",
|
|
@@ -22,14 +22,14 @@
|
|
|
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.44",
|
|
26
|
+
"@admin-layout/tailwind-ui": "12.0.16-alpha.44",
|
|
27
27
|
"react-favicon": "^0.0.23",
|
|
28
28
|
"react-intl": "^6.1.1",
|
|
29
29
|
"react-responsive": "^10.0.0"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
|
-
"@adminide-stack/extension-api": "^12.0.4-alpha.
|
|
32
|
+
"@adminide-stack/extension-api": "^12.0.4-alpha.266",
|
|
33
33
|
"@tailwindcss/aspect-ratio": "^0.4.2",
|
|
34
34
|
"@tailwindcss/forms": "^0.5.4",
|
|
35
35
|
"@tailwindcss/typography": "^0.5.9",
|
|
@@ -53,5 +53,5 @@
|
|
|
53
53
|
"typescript": {
|
|
54
54
|
"definition": "lib/index.d.ts"
|
|
55
55
|
},
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "81709761b697730903123a9d1d79d2d907a3edc5"
|
|
57
57
|
}
|