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

Feat: efficient dashboard #131

Merged
merged 15 commits into from
May 8, 2024
Merged

Feat: efficient dashboard #131

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
67dc88b
feat: add react beautiful dnd lib
Loxeris Apr 16, 2024
6c03fee
feat: draggable dashboard menu
Loxeris Apr 16, 2024
e80c73f
feat: change pages structure to avoid dashboard menu refresh
Loxeris Apr 16, 2024
cdb036d
feat: useState for Groups
Loxeris Apr 16, 2024
c0b8886
feat: Migrating to pragmatic dnd - removing react beautiful dnd
Loxeris Apr 17, 2024
519c7c5
feat: Migrating to pragmatic dnd - implementation
Loxeris Apr 18, 2024
b123fc0
fix: dragging preview bug
Loxeris Apr 22, 2024
1d6deff
feat: Working Dashboard menu
Loxeris Apr 23, 2024
203f2eb
feat: Application Provider & Section in URL
Loxeris Apr 23, 2024
dc7982b
fix: app creation not updating sections correctly
Loxeris Apr 24, 2024
43376a4
feat: shorten URL with jsonCrush lib
Loxeris Apr 24, 2024
9f5edbd
fix: jobmonitor filter urls
Loxeris Apr 24, 2024
f3b1c89
feat: Store filters in dashboard + auth redirection + scrollbar style
Loxeris Apr 25, 2024
e180b96
feat: tests
Loxeris Apr 29, 2024
fc9301f
fix: Resolve issues highlighted in PR review
Loxeris May 6, 2024
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
110 changes: 91 additions & 19 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
"prepare": "husky"
},
"dependencies": {
"@atlaskit/pragmatic-drag-and-drop": "^1.1.3",
"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
"@axa-fr/react-oidc": "^7.21.0",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
Expand All @@ -22,6 +25,7 @@
"@types/react": "18.2.48",
"@types/react-dom": "18.2.25",
"autoprefixer": "10.4.19",
"jsoncrush": "^1.1.8",
"next": "^14.1.4",
"postcss": "8.4.38",
"react": "^18.2.0",
Expand Down
0 src/app/error.tsx → src/app/(dashboard)/error.tsx
View file
Open in desktop
File renamed without changes.
0 src/app/jobmonitor/error.tsx → src/app/(dashboard)/jobmonitor/error.tsx
View file
Open in desktop
aldbr marked this conversation as resolved.
Show resolved Hide resolved
File renamed without changes.
0 src/app/jobmonitor/layout.tsx → src/app/(dashboard)/jobmonitor/layout.tsx
View file
Open in desktop
File renamed without changes.
0 src/app/jobmonitor/page.tsx → src/app/(dashboard)/jobmonitor/page.tsx
View file
Open in desktop
File renamed without changes.
39 changes: 39 additions & 0 deletions src/app/(dashboard)/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
"use client";
import * as React from "react";
import CssBaseline from "@mui/material/CssBaseline";
import { Box } from "@mui/material";
import { ThemeProvider as MUIThemeProvider } from "@mui/material/styles";
import { useMUITheme } from "@/hooks/theme";
import Dashboard from "@/components/layout/Dashboard";
import ApplicationsProvider from "@/contexts/ApplicationsProvider";
import { OIDCSecure } from "@/components/layout/OIDCSecure";

export default function JobMonitorLayout({
Loxeris marked this conversation as resolved.
Show resolved Hide resolved
children,
}: {
children: React.ReactNode;
}) {
const theme = useMUITheme();

return (
<section>
<ApplicationsProvider>
<OIDCSecure>
<Dashboard>
<MUIThemeProvider theme={theme}>
<CssBaseline />
<Box
sx={{
ml: "5%",
mr: "5%",
}}
>
{children}
</Box>
</MUIThemeProvider>
</Dashboard>
</OIDCSecure>
</ApplicationsProvider>
</section>
);
}
21 changes: 21 additions & 0 deletions src/app/(dashboard)/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
"use client";
import React from "react";
import { useSearchParams } from "next/navigation";
import UserDashboard from "@/components/applications/UserDashboard";
import { ApplicationsContext } from "@/contexts/ApplicationsProvider";
import { applicationList } from "@/components/applications/ApplicationList";

export default function Page() {
const searchParams = useSearchParams();
const appId = searchParams.get("appId");
const [sections] = React.useContext(ApplicationsContext);

const appType = sections
.find((section) => section.items.some((item) => item.id === appId))
?.items.find((item) => item.id === appId)?.type;
aldbr marked this conversation as resolved.
Show resolved Hide resolved

const Component = applicationList.find((app) => app.name === appType)
?.component;
aldbr marked this conversation as resolved.
Show resolved Hide resolved

return Component ? <Component /> : <UserDashboard />;
}
6 changes: 1 addition & 5 deletions src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { Inter } from "next/font/google";
import { OIDCConfigurationProvider } from "@/contexts/OIDCConfigurationProvider";
import { ThemeProvider } from "@/contexts/ThemeProvider";
import Dashboard from "@/components/layout/Dashboard";
import { OIDCSecure } from "@/components/layout/OIDCSecure";

const inter = Inter({ subsets: ["latin"] });

Expand All @@ -24,9 +22,7 @@ export default function RootLayout({
<html lang="en">
<body className={inter.className}>
<OIDCConfigurationProvider>
<ThemeProvider>
<OIDCSecure>{children}</OIDCSecure>
</ThemeProvider>
<ThemeProvider>{children}</ThemeProvider>
</OIDCConfigurationProvider>
</body>
</html>
Expand Down
5 changes: 0 additions & 5 deletions src/app/page.tsx
View file
Open in desktop

This file was deleted.

17 changes: 17 additions & 0 deletions src/components/applications/ApplicationList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { Dashboard, FolderCopy, Monitor } from "@mui/icons-material";
import JobMonitor from "./JobMonitor";
import UserDashboard from "./UserDashboard";

export const applicationList = [
aldbr marked this conversation as resolved.
Show resolved Hide resolved
{ name: "Dashboard", component: UserDashboard, icon: Dashboard },
{
name: "Job Monitor",
component: JobMonitor,
icon: Monitor,
},
{
name: "File Catalog",
component: JobMonitor,
icon: FolderCopy,
},
];
Loading