feat(DataTable): resize, hide/show columns and more features...

DIRACGrid · Oct 31, 2024 · 594b21a · 594b21a
1 parent 99df937
commit 594b21a
Show file tree

Hide file tree

Showing 56 changed files with 2,517 additions and 1,719 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,4 +38,7 @@ yarn-error.log*
 next-env.d.ts
 
 # eslint
-.eslintcache
+.eslintcache
+
+# storybook
+**/.cache
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/diracx-web-components/components/BaseApp/BaseApp.stories.tsx b/packages/diracx-web-components/components/BaseApp/BaseApp.stories.tsx
@@ -1,12 +1,11 @@
 import React from "react";
 import { StoryObj, Meta } from "@storybook/react";
-import { ThemeProvider as MUIThemeProvider } from "@mui/material/styles";
 import { Paper } from "@mui/material";
 import { Apps } from "@mui/icons-material";
 import { useOidcAccessToken } from "../../mocks/react-oidc.mock";
-import { useMUITheme } from "../../hooks/theme";
 import { ApplicationsContext } from "../../contexts/ApplicationsProvider";
 import { NavigationProvider } from "../../contexts/NavigationProvider";
+import { ThemeProvider } from "../../contexts/ThemeProvider";
 import BaseApp from "./BaseApp";
 
 const meta = {
@@ -16,18 +15,14 @@ const meta = {
     layout: "centered",
   },
   tags: ["autodocs"],
-  argTypes: {
-    headerSize: { control: "radio" },
-  },
   decorators: [
     (Story) => {
-      const theme = useMUITheme();
       return (
-        <MUIThemeProvider theme={theme}>
+        <ThemeProvider>
           <Paper sx={{ p: 2 }}>
             <Story />
           </Paper>
-        </MUIThemeProvider>
+        </ThemeProvider>
       );
     },
     (Story) => (
@@ -76,9 +71,7 @@ export default meta;
 type Story = StoryObj<typeof meta>;
 
 export const LoggedIn: Story = {
-  args: {
-    headerSize: undefined,
-  },
+  args: {},
   render: (props) => {
     useOidcAccessToken.mockReturnValue({
       accessTokenPayload: { preferred_username: "John Doe" },
@@ -88,9 +81,7 @@ export const LoggedIn: Story = {
 };
 
 export const LoggedOff: Story = {
-  args: {
-    headerSize: undefined,
-  },
+  args: {},
   render: (props) => {
     useOidcAccessToken.mockReturnValue({
       accessTokenPayload: null,

diff --git a/packages/diracx-web-components/components/BaseApp/BaseApp.tsx b/packages/diracx-web-components/components/BaseApp/BaseApp.tsx
@@ -1,19 +1,13 @@
 "use client";
 import { useOidcAccessToken } from "@axa-fr/react-oidc/";
 import { useOIDCContext } from "@/hooks/oidcConfiguration";
-import ApplicationHeader from "@/components/shared/ApplicationHeader";
 
 /**
  * Build the User Dashboard page
  *
  * @returns User Dashboard content
  */
-export default function BaseApplication({
-  headerSize,
-}: {
-  /** The size of the header, optional, will default to h4 */
-  headerSize?: "h1" | "h2" | "h3" | "h4" | "h5" | "h6";
-}) {
+export default function BaseApplication() {
   const { configuration } = useOIDCContext();
   const { accessTokenPayload } = useOidcAccessToken(configuration?.scope);
 
@@ -23,7 +17,6 @@ export default function BaseApplication({
 
   return (
     <div>
-      <ApplicationHeader type="Dashboard" size={headerSize} />
       <h2>Hello {accessTokenPayload["preferred_username"]}</h2>
 
       <p>To start with, select an application in the side bar</p>

diff --git a/packages/diracx-web-components/components/DashboardLayout/ApplicationDialog.stories.tsx b/packages/diracx-web-components/components/DashboardLayout/ApplicationDialog.stories.tsx
@@ -1,13 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
 
-import { ThemeProvider } from "@mui/material";
 import { useArgs } from "@storybook/core/preview-api";
 
 import { ApplicationsContext } from "../../contexts/ApplicationsProvider";
 import { useOidcAccessToken } from "../../mocks/react-oidc.mock";
 import { applicationList } from "../ApplicationList";
-import { useMUITheme } from "../../hooks/theme";
+import { ThemeProvider } from "../../contexts/ThemeProvider";
 import ApplicationDialog from "./ApplicationDialog";
 
 const meta = {
@@ -31,9 +30,8 @@ const meta = {
       );
     },
     (Story) => {
-      const theme = useMUITheme();
       return (
-        <ThemeProvider theme={theme}>
+        <ThemeProvider>
           <Story />
         </ThemeProvider>
       );

diff --git a/packages/diracx-web-components/components/DashboardLayout/Dashboard.tsx b/packages/diracx-web-components/components/DashboardLayout/Dashboard.tsx
@@ -2,16 +2,15 @@
 import React from "react";
 import AppBar from "@mui/material/AppBar";
 import Box from "@mui/material/Box";
-import CssBaseline from "@mui/material/CssBaseline";
 import IconButton from "@mui/material/IconButton";
 import { Menu } from "@mui/icons-material";
 import Toolbar from "@mui/material/Toolbar";
 import Stack from "@mui/material/Stack";
-import { ThemeProvider as MUIThemeProvider } from "@mui/material/styles";
+import { Typography, useMediaQuery, useTheme } from "@mui/material";
 import { ProfileButton } from "./ProfileButton";
 import { ThemeToggleButton } from "./ThemeToggleButton";
 import DashboardDrawer from "./DashboardDrawer";
-import { useMUITheme } from "@/hooks/theme";
+import { useApplicationTitle, useApplicationType } from "@/hooks/application";
 
 interface DashboardProps {
   /** The content to be displayed in the main area */
@@ -30,85 +29,123 @@ interface DashboardProps {
  * @return an dashboard layout
  */
 export default function Dashboard(props: DashboardProps) {
-  const theme = useMUITheme();
+  const { children, drawerWidth = 240, logoURL } = props;
+
+  const appTitle = useApplicationTitle();
+  const appType = useApplicationType();
+
+  /** Theme and media query */
+  const theme = useTheme();
+  const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
+
   /** State management for mobile drawer */
   const [mobileOpen, setMobileOpen] = React.useState(false);
   const handleDrawerToggle = () => {
     setMobileOpen(!mobileOpen);
   };
 
-  /** Drawer width */
-  const drawerWidth = props.drawerWidth || 240;
-
   return (
-    <Box sx={{ display: "flex" }}>
-      <CssBaseline />
-      <MUIThemeProvider theme={theme}>
-        <AppBar
-          position="fixed"
-          elevation={0}
-          sx={{
-            width: { sm: `calc(100% - ${drawerWidth}px)` },
-            ml: { sm: `${drawerWidth}px` },
-          }}
-        >
-          <Stack direction="row">
+    <Box sx={{ display: "flex", height: "100vh" }}>
+      <AppBar
+        position="fixed"
+        elevation={0}
+        sx={{
+          width: { sm: `calc(100% - ${drawerWidth}px)` },
+          marginLeft: { sm: `${drawerWidth}px` },
+        }}
+      >
+        <Stack direction="row" alignItems="center" spacing={2}>
+          {isMobile && (
             <Toolbar>
               <IconButton
                 aria-label="open drawer"
                 edge="start"
                 onClick={handleDrawerToggle}
-                sx={{ mr: 2, display: { sm: "none" } }}
+                sx={{ display: { sm: "none" } }}
                 data-testid="drawer-toggle-button"
               >
                 <Menu />
               </IconButton>
             </Toolbar>
-            <Toolbar
+          )}
+
+          <Stack
+            spacing={1}
+            direction={"row"}
+            alignItems={"end"}
+            sx={{
+              flexGrow: 1,
+              overflow: "hidden",
+              whiteSpace: "nowrap",
+              textOverflow: "ellipsis",
+            }}
+          >
+            <Typography
+              color="text.primary"
+              variant={isMobile ? "h6" : "h4"}
+              fontWeight={"bold"}
+              width={"fit-content"}
               sx={{
-                justifyContent: "space-between",
-                flexGrow: 1,
+                overflow: "hidden",
+                whiteSpace: "nowrap",
+                textOverflow: "ellipsis",
+                paddingLeft: 2,
               }}
             >
-              <div />
-              <Stack direction="row">
-                <ThemeToggleButton />
-                <ProfileButton />
-              </Stack>
-            </Toolbar>
+              {appTitle}
+            </Typography>
+            <Typography
+              color="text.secondary"
+              variant={isMobile ? "body2" : "subtitle1"}
+              width={"fit-content"}
+              sx={{
+                overflow: "hidden",
+                whiteSpace: "nowrap",
+                textOverflow: "ellipsis",
+              }}
+            >
+              {appType}
+            </Typography>
           </Stack>
-        </AppBar>
-        <Box
-          component="nav"
-          sx={{ width: { sm: drawerWidth }, flexShrink: { sm: 0 } }}
-          aria-label="side bar"
-        >
-          {/* Here two types of drawers are rendered:
-           1. Temporary drawer: Visible on small screens (xs) and is collapsible.
-           2. Permanent drawer: Visible on larger screens (sm) and stays fixed.
-          Depending on the screen size, only one will be visible at a time. */}
-          <DashboardDrawer
-            variant="temporary"
-            mobileOpen={mobileOpen}
-            width={drawerWidth}
-            handleDrawerToggle={handleDrawerToggle}
-            logoURL={props.logoURL}
-          />
-          <DashboardDrawer
-            variant="permanent"
-            mobileOpen={mobileOpen}
-            width={drawerWidth}
-            handleDrawerToggle={handleDrawerToggle}
-            logoURL={props.logoURL}
-          />
-        </Box>
-        <Box
-          component="main"
-          sx={{ pt: 7, width: { sm: `calc(100% - ${drawerWidth}px)` } }}
-        >
-          {props.children}
-        </Box>
-      </MUIThemeProvider>
+
+          <Toolbar
+            sx={{
+              justifyContent: "flex-end",
+              flexGrow: 0,
+            }}
+          >
+            <Stack direction="row" spacing={1} alignItems="center">
+              <ThemeToggleButton />
+              <ProfileButton />
+            </Stack>
+          </Toolbar>
+        </Stack>
+      </AppBar>
+      <Box
+        component="nav"
+        sx={{ width: { sm: drawerWidth }, flexShrink: { sm: 0 } }}
+        aria-label="side bar"
+      >
+        <DashboardDrawer
+          variant={isMobile ? "temporary" : "permanent"}
+          mobileOpen={mobileOpen}
+          width={drawerWidth}
+          handleDrawerToggle={handleDrawerToggle}
+          logoURL={logoURL}
+        />
+      </Box>
+      <Box
+        component="main"
+        sx={{
+          flexGrow: 1,
+          display: "flex",
+          flexDirection: "column",
+          width: { sm: `${drawerWidth}px` },
+        }}
+      >
+        <Toolbar />
+        {children}
+      </Box>
     </Box>
   );
 }