sidebar by role

Author: chhsiao1981

src/components/NewLibrary/components/operations/UploadData.tsx

@@ -1,7 +1,6 @@
 import { Dropdown } from "../../../Antd";
 import { Button } from "@patternfly/react-core";
 import { AddIcon } from "../../../Icons";
-import { MouseEventHandler } from "react";
 
 const OPERATION_ITEMS = [
   { key: "fileUpload", label: "Upload Files", disabled: false },

src/components/Wrapper/Sidebar.tsx

@@ -14,7 +14,7 @@ import { isEmpty } from "lodash";
 import { Link } from "react-router-dom";
 import { useAppDispatch, useAppSelector } from "../../store/hooks";
 import { setSidebarActive, type IUiState } from "../../store/ui/uiSlice";
-import type { IUserState } from "../../store/user/userSlice";
+import { Role, type IUserState } from "../../store/user/userSlice";
 import brandImg from "../../assets/logo_chris_dashboard.png";
 import styles from "./Sidebar.module.css";
 import type { FormEvent } from "react";
@@ -149,6 +149,10 @@ const Sidebar: React.FC<AllProps> = (props: AllProps) => {
   const uploadDataColor =
     sidebarActiveItem === "uploadData" ? "#ffffff" : "#aaaaaa";
 
+  const classNameImportPackage = role === Role.Admin ? undefined : styles.hide;
+  const classNameComposePackage =
+    role === Role.Clinician ? styles.hide : undefined;
+
   const PageNav = (
     <>
       <Nav onSelect={onSelect} aria-label="ChRIS Demo site navigation">
@@ -204,7 +208,7 @@ const Sidebar: React.FC<AllProps> = (props: AllProps) => {
             </NavItem>
             */}
             <NavItem itemId="pacs" isActive={sidebarActiveItem === "pacs"}>
-              {renderLink("/pacs", "Retrieve PACS", "pacs")}
+              {renderLink("/pacs", "Query and Retrieve PACS", "pacs")}
             </NavItem>
           </NavGroup>
           <NavGroup title="Packages">
@@ -214,21 +218,28 @@ const Sidebar: React.FC<AllProps> = (props: AllProps) => {
             >
               {renderLink("/package", "Browse Packages", "catalog")}
             </NavItem>
+
             <NavExpandable
               title="Tags"
               buttonProps={{ className: styles["tags-expand"] }}
               isExpanded={true}
             >
               {renderPackageTags()}
             </NavExpandable>
+
             {!isEmpty(import.meta.env.VITE_CHRIS_STORE_URL) && (
-              <NavItem itemId="store" isActive={sidebarActiveItem === "store"}>
+              <NavItem
+                itemId="store"
+                isActive={sidebarActiveItem === "store"}
+                className={classNameImportPackage}
+              >
                 {renderLink("/import", "Import Package", "store")}
               </NavItem>
             )}
             <NavItem
               itemId="compose"
               isActive={sidebarActiveItem === "compose"}
+              className={classNameComposePackage}
             >
               {renderLink("/compose", "Compose Package", "compose")}
             </NavItem>

src/store/user/userSlice.ts

@@ -10,21 +10,9 @@ export enum Role {
   Admin2 = "an admin2",
 }
 
-export const Roles = [
-  Role.Clinician,
-  Role.Clinician2,
-  Role.Researcher,
-  Role.Researcher2,
-];
+export const Roles = [Role.Clinician, Role.Researcher];
 
-export const StaffRoles = [
-  Role.Clinician,
-  Role.Clinician2,
-  Role.Researcher,
-  Role.Researcher2,
-  Role.Admin,
-  Role.Admin2,
-];
+export const StaffRoles = [Role.Clinician, Role.Researcher, Role.Admin];
 
 export interface IUserState {
   username?: string | null;