@gridsuite/commons-ui 0.67.0 → 0.68.1

package/dist/components/inputs/reactHookForm/agGridTable/CustomAgGridTable.js

@@ -114,12 +114,12 @@ function CustomAgGridTable({
     [getValues, name]
   );
   const handleMoveRowUp = () => {
-    selectedRows.map((row) => getIndex(row)).sort().forEach((idx) => {
+    selectedRows.map((row) => getIndex(row)).sort((n1, n2) => n1 - n2).forEach((idx) => {
       swap(idx, idx - 1);
     });
   };
   const handleMoveRowDown = () => {
-    selectedRows.map((row) => getIndex(row)).sort().reverse().forEach((idx) => {
+    selectedRows.map((row) => getIndex(row)).sort((n1, n2) => n1 - n2).reverse().forEach((idx) => {
       swap(idx, idx + 1);
     });
   };

package/dist/components/topBar/TopBar.js

@@ -2,10 +2,12 @@ import { jsx, jsxs } from "react/jsx-runtime";
 import { useState, useMemo } from "react";
 import { FormattedMessage } from "react-intl";
 import { Menu, MenuItem, ListItemIcon, AppBar, Toolbar, Box, IconButton, ListItemText, Button, Popper, Paper, ClickAwayListener, MenuList, Typography, ToggleButtonGroup, ToggleButton, darken } from "@mui/material";
-import { Apps, ArrowDropUp, ArrowDropDown, Person, WbSunny, Brightness3, Computer, Settings, HelpOutline, ExitToApp } from "@mui/icons-material";
+import { Apps, ArrowDropUp, ArrowDropDown, Person, WbSunny, Brightness3, Computer, Settings, ManageAccounts, HelpOutline, ExitToApp } from "@mui/icons-material";
 import { styled } from "@mui/system";
 import { GridLogo } from "./GridLogo.js";
 import { AboutDialog } from "./AboutDialog.js";
+import { useStateBoolean } from "../../hooks/customStates/useStateBoolean.js";
+import UserInformationDialog from "./UserInformationDialog.js";
 import { LIGHT_THEME, DARK_THEME, LANG_SYSTEM, LANG_ENGLISH, LANG_FRENCH } from "../../utils/constants/browserConstants.js";
 const styles = {
   grow: {
@@ -127,6 +129,11 @@ function TopBar({
 }) {
   const [anchorElSettingsMenu, setAnchorElSettingsMenu] = useState(null);
   const [anchorElAppsMenu, setAnchorElAppsMenu] = useState(null);
+  const {
+    value: userInformationDialogOpen,
+    setFalse: closeUserInformationDialog,
+    setTrue: openUserInformationDialog
+  } = useStateBoolean(false);
   const handleToggleSettingsMenu = (event) => {
     setAnchorElSettingsMenu(event.currentTarget);
   };
@@ -176,6 +183,17 @@ function TopBar({
       setAboutDialogOpen(true);
     }
   };
+  const isHiddenUserInformation = () => {
+    if (appsAndUrls) {
+      const app = appsAndUrls.find((item) => item.name === appName);
+      return (app == null ? void 0 : app.hiddenUserInformation) ?? false;
+    }
+    return false;
+  };
+  const onUserInformationDialogClicked = () => {
+    setAnchorElSettingsMenu(null);
+    openUserInformationDialog();
+  };
   const logoClickable = useMemo(
     () => /* @__PURE__ */ jsx(GridLogo, { onClick: onLogoClick, appLogo, appName, appColor }),
     [onLogoClick, appLogo, appName, appColor]
@@ -427,6 +445,24 @@ function TopBar({
                   }
                 ) }) })
               ] }),
+              !isHiddenUserInformation() && /* @__PURE__ */ jsxs(
+                StyledMenuItem,
+                {
+                  sx: styles.borderBottom,
+                  style: { opacity: "1" },
+                  onClick: onUserInformationDialogClicked,
+                  children: [
+                    /* @__PURE__ */ jsx(CustomListItemIcon, { children: /* @__PURE__ */ jsx(ManageAccounts, { fontSize: "small" }) }),
+                    /* @__PURE__ */ jsx(ListItemText, { children: /* @__PURE__ */ jsx(Typography, { sx: styles.sizeLabel, children: /* @__PURE__ */ jsx(
+                      FormattedMessage,
+                      {
+                        id: "top-bar/userInformation",
+                        defaultMessage: "User information"
+                      }
+                    ) }) })
+                  ]
+                }
+              ),
               /* @__PURE__ */ jsxs(
                 StyledMenuItem,
                 {
@@ -447,10 +483,18 @@ function TopBar({
           }
         )
       ] }),
+      userInformationDialogOpen && /* @__PURE__ */ jsx(
+        UserInformationDialog,
+        {
+          openDialog: userInformationDialogOpen,
+          user,
+          onClose: closeUserInformationDialog
+        }
+      ),
       /* @__PURE__ */ jsx(
         AboutDialog,
         {
-          open: isAboutDialogOpen,
+          open: isAboutDialogOpen && !!user,
           onClose: () => setAboutDialogOpen(false),
           appName,
           appVersion,

package/dist/components/topBar/UserInformationDialog.d.ts

@@ -0,0 +1,9 @@
+import { User } from 'oidc-client';
+
+interface UserInformationDialogProps {
+    openDialog: boolean;
+    onClose: () => void;
+    user: User | undefined;
+}
+declare function UserInformationDialog({ openDialog, user, onClose }: UserInformationDialogProps): import("react/jsx-runtime").JSX.Element;
+export default UserInformationDialog;

package/dist/components/topBar/UserInformationDialog.js

@@ -0,0 +1,67 @@
+import { jsxs, jsx } from "react/jsx-runtime";
+import { Dialog, DialogTitle, DialogContent, Grid, Typography, DialogActions } from "@mui/material";
+import { Box } from "@mui/system";
+import { FormattedMessage } from "react-intl";
+import { useState, useEffect } from "react";
+import { CancelButton } from "../inputs/reactHookForm/utils/CancelButton.js";
+import fetchUserDetails from "../../services/userAdmin.js";
+const styles = {
+  DialogTitle: { fontSize: "1.5rem" },
+  DialogContent: { marginTop: "10px" },
+  quotasBox: { marginTop: "60px" },
+  quotasTopography: { marginTop: "30px", marginBottom: "25px", fontSize: "1.15rem" },
+  usedTopography: { marginLeft: "15%" }
+};
+function UserInformationDialog({ openDialog, user, onClose }) {
+  const [userDetails, setUserDetails] = useState(void 0);
+  const getUserDetails = (userName) => {
+    fetchUserDetails(userName).then((response) => {
+      setUserDetails(response);
+    }).catch((error) => {
+      console.warn(`Could not fetch user information for ${userName}`, error);
+    });
+  };
+  useEffect(() => {
+    if (openDialog && (user == null ? void 0 : user.profile.sub)) {
+      getUserDetails(user == null ? void 0 : user.profile.sub);
+    }
+  }, [openDialog, user]);
+  return /* @__PURE__ */ jsxs(Dialog, { open: openDialog && !!user && !!userDetails, onClose, children: [
+    /* @__PURE__ */ jsx(DialogTitle, { fontWeight: "bold", sx: styles.DialogTitle, children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/title" }) }),
+    /* @__PURE__ */ jsxs(DialogContent, { children: [
+      /* @__PURE__ */ jsxs(Grid, { container: true, spacing: 2, sx: styles.DialogContent, children: [
+        /* @__PURE__ */ jsx(Grid, { item: true, xs: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/role" }) }) }),
+        /* @__PURE__ */ jsx(Grid, { item: true, xs: 6, children: /* @__PURE__ */ jsx(Typography, { children: /* @__PURE__ */ jsx(
+          FormattedMessage,
+          {
+            id: (userDetails == null ? void 0 : userDetails.isAdmin) ? "user-information-dialog/role-admin" : "user-information-dialog/role-user"
+          }
+        ) }) }),
+        /* @__PURE__ */ jsx(Grid, { item: true, xs: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/profile" }) }) }),
+        /* @__PURE__ */ jsx(Grid, { item: true, xs: 6, children: (userDetails == null ? void 0 : userDetails.profileName) === null ? /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/no-profile" }) : /* @__PURE__ */ jsx(Typography, { children: userDetails == null ? void 0 : userDetails.profileName }) })
+      ] }),
+      /* @__PURE__ */ jsxs(Box, { mt: 3, sx: styles.quotasBox, children: [
+        /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", sx: styles.quotasTopography, children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/quotas" }) }),
+        /* @__PURE__ */ jsxs(Grid, { container: true, spacing: 2, children: [
+          /* @__PURE__ */ jsx(Grid, { item: true, xs: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-cases-or-studies" }) }) }),
+          /* @__PURE__ */ jsx(Grid, { item: true, xs: 6, children: /* @__PURE__ */ jsxs(Typography, { children: [
+            userDetails == null ? void 0 : userDetails.maxAllowedCases,
+            /* @__PURE__ */ jsxs(Box, { component: "span", sx: styles.usedTopography, children: [
+              "( ",
+              /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/used" }),
+              ":",
+              ` ${userDetails == null ? void 0 : userDetails.numberCasesUsed}`,
+              " )"
+            ] })
+          ] }) }),
+          /* @__PURE__ */ jsx(Grid, { item: true, xs: 6, children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: /* @__PURE__ */ jsx(FormattedMessage, { id: "user-information-dialog/number-of-builds-per-study" }) }) }),
+          /* @__PURE__ */ jsx(Grid, { item: true, xs: 6, children: /* @__PURE__ */ jsx(Typography, { children: userDetails == null ? void 0 : userDetails.maxAllowedBuilds }) })
+        ] })
+      ] })
+    ] }),
+    /* @__PURE__ */ jsx(DialogActions, { children: /* @__PURE__ */ jsx(CancelButton, { color: "primary", onClick: onClose }) })
+  ] });
+}
+export {
+  UserInformationDialog as default
+};

package/dist/components/treeViewFinder/TreeViewFinder.js

@@ -231,7 +231,10 @@ function TreeViewFinderComponant(props) {
     {
       open,
       onClose: (e, r) => {
-        if (r === "escapeKeyDown" || r === "backdropClick") {
+        if (r === "backdropClick") {
+          return;
+        }
+        if (r === "escapeKeyDown") {
           onClose == null ? void 0 : onClose([]);
           setSelected([]);
         }

package/dist/services/userAdmin.d.ts

@@ -0,0 +1,4 @@
+import { UserDetail } from '../utils/types/types';
+
+declare function fetchUserDetails(user: string): Promise<UserDetail>;
+export default fetchUserDetails;

package/dist/services/userAdmin.js

@@ -0,0 +1,12 @@
+import { backendFetchJson } from "./utils.js";
+const PREFIX_USER_ADMIN_QUERIES = `${"api/gateway"}/user-admin/v1`;
+function fetchUserDetails(user) {
+  console.info("get user details");
+  return backendFetchJson(`${PREFIX_USER_ADMIN_QUERIES}/users/${user}/detail`, {
+    method: "get",
+    headers: { "Content-Type": "application/json" }
+  });
+}
+export {
+  fetchUserDetails as default
+};

package/dist/translations/en/topBarEn.d.ts

@@ -9,6 +9,7 @@ export declare const topBarEn: {
     'top-bar/logout': string;
     'top-bar/goFullScreen': string;
     'top-bar/exitFullScreen': string;
+    'top-bar/user-information': string;
     'top-bar/about': string;
     'top-bar/displayMode': string;
     'top-bar/equipmentLabel': string;
@@ -26,4 +27,14 @@ export declare const topBarEn: {
     'about-dialog/module-tooltip-app': string;
     'about-dialog/module-tooltip-server': string;
     'about-dialog/module-tooltip-other': string;
+    'user-information-dialog/title': string;
+    'user-information-dialog/role': string;
+    'user-information-dialog/role-user': string;
+    'user-information-dialog/role-admin': string;
+    'user-information-dialog/profile': string;
+    'user-information-dialog/no-profile': string;
+    'user-information-dialog/quotas': string;
+    'user-information-dialog/number-of-cases-or-studies': string;
+    'user-information-dialog/used': string;
+    'user-information-dialog/number-of-builds-per-study': string;
 };

package/dist/translations/en/topBarEn.js

@@ -3,6 +3,7 @@ const topBarEn = {
   "top-bar/logout": "Logout",
   "top-bar/goFullScreen": "Full screen",
   "top-bar/exitFullScreen": "Exit full screen mode",
+  "top-bar/user-information": "User information",
   "top-bar/about": "About",
   "top-bar/displayMode": "Display mode",
   "top-bar/equipmentLabel": "Equipment label",
@@ -19,7 +20,17 @@ const topBarEn = {
   "about-dialog/label-type": "Type",
   "about-dialog/module-tooltip-app": "application",
   "about-dialog/module-tooltip-server": "server",
-  "about-dialog/module-tooltip-other": "other"
+  "about-dialog/module-tooltip-other": "other",
+  "user-information-dialog/title": "User information",
+  "user-information-dialog/role": "Role",
+  "user-information-dialog/role-user": "Basic user",
+  "user-information-dialog/role-admin": "Admin",
+  "user-information-dialog/profile": "Profile",
+  "user-information-dialog/no-profile": "No profile",
+  "user-information-dialog/quotas": "User quotas",
+  "user-information-dialog/number-of-cases-or-studies": "Number of cases or studies",
+  "user-information-dialog/used": "Used",
+  "user-information-dialog/number-of-builds-per-study": "Number of builds per study"
 };
 export {
   topBarEn

package/dist/translations/fr/topBarFr.d.ts

@@ -9,6 +9,7 @@ export declare const topBarFr: {
     'top-bar/logout': string;
     'top-bar/goFullScreen': string;
     'top-bar/exitFullScreen': string;
+    'top-bar/userInformation': string;
     'top-bar/about': string;
     'top-bar/displayMode': string;
     'top-bar/equipmentLabel': string;
@@ -26,4 +27,14 @@ export declare const topBarFr: {
     'about-dialog/module-tooltip-app': string;
     'about-dialog/module-tooltip-server': string;
     'about-dialog/module-tooltip-other': string;
+    'user-information-dialog/title': string;
+    'user-information-dialog/role': string;
+    'user-information-dialog/role-user': string;
+    'user-information-dialog/role-admin': string;
+    'user-information-dialog/profile': string;
+    'user-information-dialog/no-profile': string;
+    'user-information-dialog/quotas': string;
+    'user-information-dialog/number-of-cases-or-studies': string;
+    'user-information-dialog/used': string;
+    'user-information-dialog/number-of-builds-per-study': string;
 };

package/dist/translations/fr/topBarFr.js

@@ -3,6 +3,7 @@ const topBarFr = {
   "top-bar/logout": "Se déconnecter",
   "top-bar/goFullScreen": "Plein écran",
   "top-bar/exitFullScreen": "Quitter mode plein écran",
+  "top-bar/userInformation": "Informations utilisateur",
   "top-bar/about": "À propos",
   "top-bar/displayMode": "Mode d'affichage",
   "top-bar/equipmentLabel": "Label des ouvrages",
@@ -19,7 +20,17 @@ const topBarFr = {
   "about-dialog/label-type": "Type",
   "about-dialog/module-tooltip-app": "application",
   "about-dialog/module-tooltip-server": "serveur",
-  "about-dialog/module-tooltip-other": "autre"
+  "about-dialog/module-tooltip-other": "autre",
+  "user-information-dialog/title": "Informations utilisateur",
+  "user-information-dialog/role": "Rôle",
+  "user-information-dialog/role-user": "Utilisateur simple",
+  "user-information-dialog/role-admin": "Admin",
+  "user-information-dialog/profile": "Profil",
+  "user-information-dialog/no-profile": "Pas de profil",
+  "user-information-dialog/quotas": "Quotas",
+  "user-information-dialog/number-of-cases-or-studies": "Nombre situations ou études",
+  "user-information-dialog/used": "Utilisé",
+  "user-information-dialog/number-of-builds-per-study": "Nombre réalisations par étude"
 };
 export {
   topBarFr

package/dist/utils/types/metadata.d.ts

@@ -9,6 +9,7 @@ export type Metadata = {
     url: string | URL;
     appColor: string;
     hiddenInAppsMenu: boolean;
+    hiddenUserInformation: boolean;
     resources?: MetaDataRessources[];
 };
 export type StudyMetadata = Metadata & {

package/dist/utils/types/types.d.ts

@@ -29,3 +29,11 @@ export type Option = {
 export type PredefinedProperties = {
     [propertyName: string]: string[];
 };
+export type UserDetail = {
+    sub: string;
+    isAdmin: boolean;
+    profileName?: string;
+    maxAllowedCases: number;
+    numberCasesUsed: number;
+    maxAllowedBuilds: number;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.67.0",
+    "version": "0.68.1",
     "description": "common react components for gridsuite applications",
     "engines": {
         "npm": ">=9",