Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing Folders View in Admin Area #1180

Merged
merged 1 commit into from
Sep 21, 2024
Merged

Fixing Folders View in Admin Area #1180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion client/packages/lowcoder/src/pages/ApplicationV2/HomeLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,10 @@ export interface HomeLayoutProps {

export function HomeLayout(props: HomeLayoutProps) {


const { breadcrumb = [], elements = [], localMarketplaceApps = [], globalMarketplaceApps = [], mode } = props;

console.log("HomeLayout props: ", props);

const categoryOptions = [
{ label: <FilterMenuItem>{trans("home.allCategories")}</FilterMenuItem>, value: 'All' },
...Object.entries(ApplicationCategoriesEnum).map(([key, value]) => ({
Expand Down
2 changes: 2 additions & 0 deletions client/packages/lowcoder/src/pages/ApplicationV2/RootFolderListView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ export function RootFolderListView() {
const user = useSelector(getUser);
const allFolders = useSelector(foldersSelector);

console.log("RootFolderListView", allFolders);

if (!user.currentOrgId) {
return null;
}
Expand Down
18 changes: 15 additions & 3 deletions client/packages/lowcoder/src/pages/ApplicationV2/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import {
USER_PROFILE_URL,
ALL_APPLICATIONS_URL,
DATASOURCE_URL,
// FOLDER_URL,
// FOLDER_URL_PREFIX,
FOLDER_URL,
FOLDER_URL_PREFIX,
FOLDERS_URL,
MARKETPLACE_URL,
// MODULE_APPLICATIONS_URL,
Expand Down Expand Up @@ -50,7 +50,7 @@ import { NewsView } from "./NewsView";
import { OrgView } from "./OrgView";
import styled, { css } from "styled-components";
// import history from "../../util/history";
// import { FolderView } from "./FolderView";
import { FolderView } from "./FolderView";
import { TrashView } from "./TrashView";
import { MarketplaceView } from "./MarketplaceView";
// import { SideBarItemType } from "../../components/layout/SideBarSection";
Expand Down Expand Up @@ -334,6 +334,18 @@ export default function ApplicationHome() {
],
},

// this we need to show the Folders view in the Admin Area
{
items: [
{
text: "",
routePath: FOLDER_URL,
routeComp: FolderView,
visible: () => false,
}
]
}

]}
/>
</DivStyled>
Expand Down
Loading