@antscorp/antsomi-ui 1.3.5-beta.347 → 1.3.5-beta.348
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.
|
@@ -38,12 +38,10 @@ export const Layout = memo(props => {
|
|
|
38
38
|
const appConfig = useContextSelector(AppConfigContext, state => state);
|
|
39
39
|
const { auth, languageCode, appCode, env } = appConfig;
|
|
40
40
|
const { token, userId, portalId } = auth || {};
|
|
41
|
-
const headerStore = useLayoutStore(store => store.state.header);
|
|
42
41
|
const showLeftMenu = useLayoutStore(store => store.state.leftMenu.show);
|
|
43
42
|
const contentWrapper = useLayoutStore(store => store.state.contentWrapper);
|
|
44
43
|
const workspace = useLayoutStore(store => store.state.workspace);
|
|
45
44
|
const layoutState = useLayoutStore(store => store.state);
|
|
46
|
-
console.log('🚀 ~ layoutState: joifdsjfiodsjfoids', layoutState, contentWrapper);
|
|
47
45
|
const [showAccountSelection, setShowAccountSelection] = useState(false);
|
|
48
46
|
const [noSpaceTopContent, setNoSpaceTopContent] = useState(false);
|
|
49
47
|
// Refs
|
|
@@ -106,15 +104,15 @@ export const Layout = memo(props => {
|
|
|
106
104
|
INSIGHT_U_OGS: 'uogs',
|
|
107
105
|
} }) }), accountSharingConfig: Object.assign(Object.assign({}, headerProps === null || headerProps === void 0 ? void 0 : headerProps.accountSharingConfig), { u_ogs: 'uogs', appCode: 'APP_CUSTOMER_360' }), accountSelection: Object.assign(Object.assign({}, headerProps === null || headerProps === void 0 ? void 0 : headerProps.accountSelection), { show: !!((_b = headerProps === null || headerProps === void 0 ? void 0 : headerProps.accountSelection) === null || _b === void 0 ? void 0 : _b.show) && showAccountSelection }) }));
|
|
108
106
|
}, [headerProps, iamDomain, permissionDomain, showAccountSelection]);
|
|
109
|
-
const mergeHeaderProps = useDeepCompareMemo(() => merge(cloneDeep(initialHeaderProps), cloneDeep(
|
|
107
|
+
const mergeHeaderProps = useDeepCompareMemo(() => merge(cloneDeep(initialHeaderProps), cloneDeep(layoutState.header)),
|
|
110
108
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
111
|
-
[
|
|
112
|
-
const mergeContentWrapperProps = useDeepCompareMemo(() => merge(cloneDeep(contentWrapperProps), cloneDeep(contentWrapper)),
|
|
109
|
+
[initialHeaderProps, layoutState.header]);
|
|
110
|
+
const mergeContentWrapperProps = useDeepCompareMemo(() => merge(cloneDeep(contentWrapperProps), cloneDeep(layoutState.contentWrapper)),
|
|
113
111
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
114
|
-
[
|
|
115
|
-
const mergeWorkSpaceProps = useDeepCompareMemo(() => merge(cloneDeep(restOfWorkspaceProps), cloneDeep(omit(workspace, 'workspaceContentProps'))),
|
|
112
|
+
[contentWrapperProps, layoutState.contentWrapper]);
|
|
113
|
+
const mergeWorkSpaceProps = useDeepCompareMemo(() => merge(cloneDeep(restOfWorkspaceProps), cloneDeep(omit(layoutState.workspace, 'workspaceContentProps'))),
|
|
116
114
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
117
|
-
[
|
|
115
|
+
[restOfWorkspaceProps, layoutState.workspace]);
|
|
118
116
|
const antsProcessingNotificationConfig = useMemo(() => (Object.assign({ permissionDomain, socketDomain: SOCKET_API, token, accountId: userId, userId, lang: languageCode, networkId: portalId }, processingNotificationProps)), [permissionDomain, token, userId, languageCode, portalId, processingNotificationProps]);
|
|
119
117
|
const onActiveMenuCodeChange = useCallback((activeItemPath, flattenPermissionList) => {
|
|
120
118
|
var _a;
|