Skip to content

Commit 9a23b4a

Browse files
author
FalkWolsky
committed
Small fix for navigation display
1 parent 2397012 commit 9a23b4a

File tree

2 files changed

+8827
-11870
lines changed

2 files changed

+8827
-11870
lines changed

‎client/packages/lowcoder/src/pages/ApplicationV2/index.tsx

Lines changed: 3 additions & 155 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ import { Subscription } from "pages/setting/subscriptions"
5858
import { getSubscriptions } from 'redux/selectors/subscriptionSelectors';
5959
import { SubscriptionProductsEnum } from '@lowcoder-ee/constants/subscriptionConstants';
6060
import { EnterpriseProvider } from "@lowcoder-ee/util/context/EnterpriseContext";
61+
import { SimpleSubscriptionContextProvider } from "@lowcoder-ee/util/context/SimpleSubscriptionContext";
6162
import { selectIsLicenseActive } from "redux/selectors/enterpriseSelectors";
6263

6364

@@ -153,7 +154,7 @@ export default function ApplicationHome() {
153154
<DivStyled>
154155
<LoadingBarHideTrigger />
155156
{/* <EnterpriseProvider> */}
156-
<SimpleSubscriptionContextProvider>
157+
{/* <SimpleSubscriptionContextProvider> */}
157158
<Layout
158159
sections={[
159160
{
@@ -222,115 +223,6 @@ export default function ApplicationHome() {
222223
},
223224
],
224225
},
225-
/* isLicenseActive ? {
226-
items: [
227-
{
228-
text: <TabLabel>{trans("settings.AppUsage")}</TabLabel>,
229-
routePath: "/ee/6600ae8724a23f365ba2ed4c/admin",
230-
routePathExact: false,
231-
routeComp: AppEditor,
232-
icon: ({ selected, ...otherProps }) => selected ? ( <EnterpriseIcon {...otherProps} width={"24px"}/> ) : ( <EnterpriseIcon {...otherProps} width={"24px"}/> ),
233-
visible: ({ user }) => user.orgDev,
234-
},
235-
],
236-
} : { items: [] }, */
237-
238-
{/*
239-
<Layout
240-
sections={[
241-
{
242-
items: [
243-
{
244-
text: <TabLabel>{trans("home.profile")}</TabLabel>,
245-
routePath: USER_PROFILE_URL,
246-
routeComp: UserProfileView,
247-
icon: ({ selected, ...otherProps }) => selected ? <UserIcon {...otherProps} width={"24px"}/> : <UserIcon {...otherProps} width={"24px"}/>,
248-
mobileVisible: true,
249-
},
250-
{
251-
text: <TabLabel>{trans("home.news")}</TabLabel>,
252-
routePath: NEWS_URL,
253-
routeComp: NewsView,
254-
icon: ({ selected, ...otherProps }) => selected ? <NewsIcon {...otherProps} width={"24px"}/> : <NewsIcon {...otherProps} width={"24px"}/>,
255-
visible: ({ user }) => user.orgDev,
256-
style: { color: "red" },
257-
mobileVisible: false,
258-
},
259-
{
260-
text: <TabLabel>{trans("home.orgHome")}</TabLabel>,
261-
routePath: ORG_HOME_URL,
262-
routePathExact: false,
263-
routeComp: OrgView,
264-
icon: ({ selected, ...otherProps }) => selected ? <WorkspacesIcon {...otherProps} width={"24px"}/> : <WorkspacesIcon {...otherProps} width={"24px"}/>,
265-
visible: ({ user }) => !user.orgDev,
266-
mobileVisible: true,
267-
},
268-
{
269-
text: <TabLabel>{trans("home.marketplace")}</TabLabel>,
270-
routePath: MARKETPLACE_URL,
271-
routePathExact: false,
272-
routeComp: MarketplaceView,
273-
icon: ({ selected, ...otherProps }) => selected ? <MarketplaceIcon {...otherProps} width={"24px"}/> : <MarketplaceIcon {...otherProps} width={"24px"}/>,
274-
mobileVisible: false,
275-
},
276-
]
277-
},
278-
279-
{
280-
items: [
281-
// {
282-
// text: <MoreFoldersWrapper>{trans("home.allFolders")}</MoreFoldersWrapper>,
283-
// routePath: FOLDERS_URL,
284-
// routeComp: RootFolderListView,
285-
// icon: ({ selected, ...otherProps }) => selected ? <FolderIcon {...otherProps} width={"24px"}/> : <FolderIcon {...otherProps} width={"24px"}/>,
286-
// },
287-
{
288-
text: <TabLabel>{trans("home.allApplications")}</TabLabel>,
289-
routePath: ALL_APPLICATIONS_URL,
290-
routeComp: HomeView,
291-
icon: ({ selected, ...otherProps }) => selected ? <AppsIcon {...otherProps} width={"24px"}/> : <AppsIcon {...otherProps} width={"24px"}/>,
292-
mobileVisible: true,
293-
},
294-
],
295-
},
296-
297-
{
298-
items: [
299-
300-
{
301-
text: <TabLabel>{trans("home.queryLibrary")}</TabLabel>,
302-
routePath: QUERY_LIBRARY_URL,
303-
routeComp: QueryLibraryEditor,
304-
icon: ({ selected, ...otherProps }) => selected ? <HomeQueryLibraryIcon {...otherProps} width={"24px"}/> : <HomeQueryLibraryIcon {...otherProps} width={"24px"}/>,
305-
visible: ({ user }) => user.orgDev,
306-
mobileVisible: false,
307-
},
308-
{
309-
text: <TabLabel>{trans("home.datasource")}</TabLabel>,
310-
routePath: DATASOURCE_URL,
311-
routePathExact: false,
312-
routeComp: DatasourceHome,
313-
icon: ({ selected, ...otherProps }) => selected ? <HomeDataSourceIcon {...otherProps} width={"24px"}/> : <HomeDataSourceIcon {...otherProps} width={"24px"}/>,
314-
visible: ({ user }) => user.orgDev,
315-
onSelected: (_, currentPath) => currentPath.split("/")[1] === "datasource",
316-
mobileVisible: false,
317-
},
318-
],
319-
},
320-
isEE() ? {
321-
items: [
322-
{
323-
text: <TabLabel>{trans("settings.AppUsage")}</TabLabel>,
324-
routePath: "/ee/6600ae8724a23f365ba2ed4c/admin",
325-
routePathExact: false,
326-
routeComp: AppEditor,
327-
icon: ({ selected, ...otherProps }) => selected ? ( <EnterpriseIcon {...otherProps} width={"24px"}/> ) : ( <EnterpriseIcon {...otherProps} width={"24px"}/> ),
328-
visible: ({ user }) => user.orgDev,
329-
mobileVisible: false,
330-
},
331-
],
332-
} : { items: [] },
333-
*/}
334226

335227
!supportSubscription && user.orgDev ? {
336228
items: [
@@ -397,53 +289,9 @@ export default function ApplicationHome() {
397289

398290
]}
399291
/>
400-
</SimpleSubscriptionContextProvider>
292+
{/* </SimpleSubscriptionContextProvider> */}
401293
{/* </EnterpriseProvider> */}
402294

403-
{/*
404-
{
405-
items: [
406-
{
407-
text: <TabLabel>{trans("settings.title")}</TabLabel>,
408-
routePath: SETTING_URL,
409-
routePathExact: false,
410-
routeComp: Setting,
411-
icon: ({ selected, ...otherProps }) => selected ? <HomeSettingIcon {...otherProps} width={"24px"}/> : <HomeSettingIcon {...otherProps} width={"24px"}/>,
412-
visible: ({ user }) => user.orgDev,
413-
onSelected: (_, currentPath) => currentPath.split("/")[1] === "setting",
414-
mobileVisible: false,
415-
}
416-
]
417-
},
418-
419-
{
420-
items: [
421-
{
422-
text: <TabLabel>{trans("home.trash")}</TabLabel>,
423-
routePath: TRASH_URL,
424-
routeComp: TrashView,
425-
icon: ({ selected, ...otherProps }) => selected ? <RecyclerIcon {...otherProps} width={"24px"}/> : <RecyclerIcon {...otherProps} width={"24px"}/>,
426-
visible: ({ user }) => user.orgDev,
427-
mobileVisible: false,
428-
},
429-
],
430-
},
431-
432-
// this we need to show the Folders view in the Admin Area
433-
{
434-
items: [
435-
{
436-
text: "",
437-
routePath: FOLDER_URL,
438-
routeComp: FolderView,
439-
visible: () => false,
440-
}
441-
]
442-
}
443-
444-
]}
445-
/>
446-
*/}
447295
</DivStyled>
448296
);
449297
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy