Commit 8a9b88e

authored

Merge pull request #1180 from lowcoder-org/dev

Fixing Folders View in Admin Area

2 parents ff2b1e1 + 43dea52 commit 8a9b88eCopy full SHA for 8a9b88e

File tree

+19

-4

lines changed

+19

-4

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -305,9 +305,10 @@ export interface HomeLayoutProps {`
`305`	`305`
`306`	`306`	`export function HomeLayout(props: HomeLayoutProps) {`
`307`	`307`
`308`		`-`
`309`	`308`	`const { breadcrumb = [], elements = [], localMarketplaceApps = [], globalMarketplaceApps = [], mode } = props;`
`310`	`309`
	`310`	`+ console.log("HomeLayout props: ", props);`
	`311`	`+`
`311`	`312`	`const categoryOptions = [`
`312`	`313`	`{ label: <FilterMenuItem>{trans("home.allCategories")}</FilterMenuItem>, value: 'All' },`
`313`	`314`	`...Object.entries(ApplicationCategoriesEnum).map(([key, value]) => ({`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ export function RootFolderListView() {`
`9`	`9`	`const user = useSelector(getUser);`
`10`	`10`	`const allFolders = useSelector(foldersSelector);`
`11`	`11`
	`12`	`+ console.log("RootFolderListView", allFolders);`
	`13`	`+`
`12`	`14`	`if (!user.currentOrgId) {`
`13`	`15`	`return null;`
`14`	`16`	`}`

Lines changed: 15 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ import {`
`2`	`2`	`USER_PROFILE_URL,`
`3`	`3`	`ALL_APPLICATIONS_URL,`
`4`	`4`	`DATASOURCE_URL,`
`5`		`- // FOLDER_URL,`
`6`		`- // FOLDER_URL_PREFIX,`
	`5`	`+ FOLDER_URL,`
	`6`	`+ FOLDER_URL_PREFIX,`
`7`	`7`	`FOLDERS_URL,`
`8`	`8`	`MARKETPLACE_URL,`
`9`	`9`	`// MODULE_APPLICATIONS_URL,`
`@@ -50,7 +50,7 @@ import { NewsView } from "./NewsView";`
`50`	`50`	`import { OrgView } from "./OrgView";`
`51`	`51`	`import styled, { css } from "styled-components";`
`52`	`52`	`// import history from "../../util/history";`
`53`		`-// import { FolderView } from "./FolderView";`
	`53`	`+import { FolderView } from "./FolderView";`
`54`	`54`	`import { TrashView } from "./TrashView";`
`55`	`55`	`import { MarketplaceView } from "./MarketplaceView";`
`56`	`56`	`// import { SideBarItemType } from "../../components/layout/SideBarSection";`
`@@ -334,6 +334,18 @@ export default function ApplicationHome() {`
`334`	`334`	`],`
`335`	`335`	`},`
`336`	`336`
	`337`	`+ // this we need to show the Folders view in the Admin Area`
	`338`	`+ {`
	`339`	`+ items: [`
	`340`	`+ {`
	`341`	`+ text: "",`
	`342`	`+ routePath: FOLDER_URL,`
	`343`	`+ routeComp: FolderView,`
	`344`	`+ visible: () => false,`
	`345`	`+ }`
	`346`	`+ ]`
	`347`	`+ }`
	`348`	`+`
`337`	`349`	`]}`
`338`	`350`	`/>`
`339`	`351`	`</DivStyled>`

Comments

(0)