From 9e3f73f098316e0413c3d133a3e8f3e1a2db08b8 Mon Sep 17 00:00:00 2001
From: "MSI\\derek" <abc@gmail.com>
Date: Fri, 3 May 2024 17:13:55 +0800
Subject: [PATCH] Revert "hide menu item based on user"

This reverts commit 831fe7ee316d0b216384c383b98dcf49156d73ce.
---
 src/components/AppBar/NavigationToggle.tsx    |  15 +-
 .../NavigationContent/NavigationContent.tsx   | 199 +++++++++---------
 .../StaffSearch/StaffSearchWrapper.tsx        |   7 +-
 3 files changed, 105 insertions(+), 116 deletions(-)

diff --git a/src/components/AppBar/NavigationToggle.tsx b/src/components/AppBar/NavigationToggle.tsx
index 23551b7..9f61753 100644
--- a/src/components/AppBar/NavigationToggle.tsx
+++ b/src/components/AppBar/NavigationToggle.tsx
@@ -4,17 +4,10 @@ import MenuIcon from "@mui/icons-material/Menu";
 import NavigationContent from "../NavigationContent";
 import React from "react";
 import Drawer from "@mui/material/Drawer";
-import { getServerSession } from "next-auth";
-import { authOptions } from "@/config/authConfig";
-import { Session } from "inspector";
-export interface SessionWithAbilities extends Session {
-  abilities?: string[]
-}
 
-const NavigationToggle: React.FC = async () => {
+const NavigationToggle: React.FC = () => {
   const [isOpened, setIsOpened] = React.useState(false);
-  const session = await getServerSession(authOptions) as SessionWithAbilities;
-  const abilities: string[] = session.abilities || []
+
   const openNavigation = () => {
     setIsOpened(true);
   };
@@ -25,7 +18,7 @@ const NavigationToggle: React.FC = async () => {
   return (
     <>
       <Drawer variant="permanent" sx={{ display: { xs: "none", xl: "block" } }}>
-        <NavigationContent abilities={abilities}/>
+        <NavigationContent />
       </Drawer>
       <Drawer
         sx={{ display: { xl: "none" } }}
@@ -35,7 +28,7 @@ const NavigationToggle: React.FC = async () => {
           keepMounted: true,
         }}
       >
-        <NavigationContent abilities={abilities}/>
+        <NavigationContent />
       </Drawer>
       <IconButton
         sx={{ display: { xl: "none" } }}
diff --git a/src/components/NavigationContent/NavigationContent.tsx b/src/components/NavigationContent/NavigationContent.tsx
index e6fc1b0..9f0c3d7 100644
--- a/src/components/NavigationContent/NavigationContent.tsx
+++ b/src/components/NavigationContent/NavigationContent.tsx
@@ -35,118 +35,111 @@ import BusinessIcon from '@mui/icons-material/Business';
 import ViewWeekIcon from '@mui/icons-material/ViewWeek';
 import ManageAccountsIcon from '@mui/icons-material/ManageAccounts';
 import EmojiEventsIcon from '@mui/icons-material/EmojiEvents';
-import { GENERATE_REPORTS, MAINTAIN_MASTERDATA, MAINTAIN_USER, VIEW_MASTERDATA, VIEW_USER } from "@/middleware";
 
 interface NavigationItem {
   icon: React.ReactNode;
   label: string;
   path: string;
-  isHidden?: boolean;
   children?: NavigationItem[];
 }
 
-interface Props {
-  abilities: string[]
-}
-// console.log(getUserData())
-
-
-const NavigationContent: React.FC<Props> = async ({abilities}) => {
-  const navigationItems: NavigationItem[] = [
-    { icon: <WorkHistory />, label: "User Workspace", path: "/home" },
-    {
-      icon: <Dashboard />,
-      label: "Dashboard",
-      path: "",
-      children: [
-        {
-          icon: <SummarizeIcon />,
-          label: "Financial Summary",
-          path: "/dashboard/ProjectFinancialSummary",
-        },
-        {
-          icon: <PaymentsIcon />,
-          label: "Company / Team Cash Flow",
-          path: "/dashboard/CompanyTeamCashFlow",
-        },
-        {
-          icon: <PaymentsIcon />,
-          label: "Project Cash Flow",
-          path: "/dashboard/ProjectCashFlow",
-        },
-        {
-          icon: <AccountTreeIcon />,
-          label: "Project Status by Client",
-          path: "/dashboard/ProjectStatusByClient",
-        },
-        {
-          icon: <AccountTreeIcon />,
-          label: "Project Status by Team",
-          path: "/dashboard/ProjectStatusByTeam",
-        },
-        {
-          icon: <PeopleIcon />,
-          label: "Staff Utilization",
-          path: "/dashboard/StaffUtilization",
-        },
-        {
-          icon: <ViewWeekIcon />,
-          label: "Project Resource Summary",
-          path: "/dashboard/ProjectResourceSummary",
-        }
-      ],
-    },
-    {
-      icon: <RequestQuote />,
-      label: "Staff Reimbursement",
-      path: "/staffReimbursement",
-      children: [
-        {
-          icon: <RequestQuote />,
-          label: "Claim Approval",
-          path: "/staffReimbursement/ClaimApproval",
-        },
-        {
-          icon: <RequestQuote />,
-          label: "Claim Summary",
-          path: "/staffReimbursement/ClaimSummary",
-        },
-      ],
-    },
-    { icon: <Assignment />, label: "Project Management", path: "/projects" },
-    { icon: <Task />, label: "Task Template", path: "/tasks" },
-    { icon: <Payments />, label: "Invoice", path: "/invoice" },
-    { icon: <Analytics />, label: "Analysis Report", path: "", isHidden: ![GENERATE_REPORTS].some((ability) => abilities.includes(ability)),
-      children: [
-        {icon: <Analytics />, label:"Late Start Report", path: "/analytics/LateStartReport"},
-        {icon: <Analytics />, label:"Delay Report", path: "/analytics/DelayReport"},
-        {icon: <Analytics />, label:"Resource Overconsumption Report", path: "/analytics/ResourceOverconsumptionReport"},
-        {icon: <Analytics />, label:"Cost and Expense Report", path: "/analytics/CostandExpenseReport"},
-        {icon: <Analytics />, label:"Completion Report", path: "/analytics/ProjectCompletionReport"},
-        {icon: <Analytics />, label:"Completion Report with Outstanding Un-billed Hours Report", path: "/analytics/ProjectCompletionReportWO"},
-        {icon: <Analytics />, label:"Project Claims Report", path: "/analytics/ProjectClaimsReport"},
-        {icon: <Analytics />, label:"Project P&L Report", path: "/analytics/ProjectPLReport"},
-        {icon: <Analytics />, label:"Financial Status Report", path: "/analytics/FinancialStatusReport"},
-        {icon: <Analytics />, label:"EX02 - Project Cash Flow Report", path: "/analytics/EX02ProjectCashFlowReport"},
+const navigationItems: NavigationItem[] = [
+  { icon: <WorkHistory />, label: "User Workspace", path: "/home" },
+  {
+    icon: <Dashboard />,
+    label: "Dashboard",
+    path: "",
+    children: [
+      {
+        icon: <SummarizeIcon />,
+        label: "Financial Summary",
+        path: "/dashboard/ProjectFinancialSummary",
+      },
+      {
+        icon: <PaymentsIcon />,
+        label: "Company / Team Cash Flow",
+        path: "/dashboard/CompanyTeamCashFlow",
+      },
+      {
+        icon: <PaymentsIcon />,
+        label: "Project Cash Flow",
+        path: "/dashboard/ProjectCashFlow",
+      },
+      {
+        icon: <AccountTreeIcon />,
+        label: "Project Status by Client",
+        path: "/dashboard/ProjectStatusByClient",
+      },
+      {
+        icon: <AccountTreeIcon />,
+        label: "Project Status by Team",
+        path: "/dashboard/ProjectStatusByTeam",
+      },
+      {
+        icon: <PeopleIcon />,
+        label: "Staff Utilization",
+        path: "/dashboard/StaffUtilization",
+      },
+      {
+        icon: <ViewWeekIcon />,
+        label: "Project Resource Summary",
+        path: "/dashboard/ProjectResourceSummary",
+      }
+    ],
+  },
+  {
+    icon: <RequestQuote />,
+    label: "Staff Reimbursement",
+    path: "/staffReimbursement",
+    children: [
+      {
+        icon: <RequestQuote />,
+        label: "Claim Approval",
+        path: "/staffReimbursement/ClaimApproval",
+      },
+      {
+        icon: <RequestQuote />,
+        label: "Claim Summary",
+        path: "/staffReimbursement/ClaimSummary",
+      },
+    ],
+  },
+  { icon: <Assignment />, label: "Project Management", path: "/projects" },
+  { icon: <Task />, label: "Task Template", path: "/tasks" },
+  { icon: <Payments />, label: "Invoice", path: "/invoice" },
+  { icon: <Analytics />, label: "Analysis Report", path: "",
+    children: [
+      {icon: <Analytics />, label:"Late Start Report", path: "/analytics/LateStartReport"},
+      {icon: <Analytics />, label:"Delay Report", path: "/analytics/DelayReport"},
+      {icon: <Analytics />, label:"Resource Overconsumption Report", path: "/analytics/ResourceOverconsumptionReport"},
+      {icon: <Analytics />, label:"Cost and Expense Report", path: "/analytics/CostandExpenseReport"},
+      {icon: <Analytics />, label:"Completion Report", path: "/analytics/ProjectCompletionReport"},
+      {icon: <Analytics />, label:"Completion Report with Outstanding Un-billed Hours Report", path: "/analytics/ProjectCompletionReportWO"},
+      {icon: <Analytics />, label:"Project Claims Report", path: "/analytics/ProjectClaimsReport"},
+      {icon: <Analytics />, label:"Project P&L Report", path: "/analytics/ProjectPLReport"},
+      {icon: <Analytics />, label:"Financial Status Report", path: "/analytics/FinancialStatusReport"},
+      {icon: <Analytics />, label:"EX02 - Project Cash Flow Report", path: "/analytics/EX02ProjectCashFlowReport"},
+  ],
+},
+  {
+    icon: <Settings />, label: "Setting", path: "",
+    children: [
+      { icon: <GroupIcon />, label: "Client", path: "/settings/customer" },
+      { icon: <BusinessIcon />, label: "Subsidiary", path: "/settings/subsidiary" },
+      { icon: <Staff />, label: "Staff", path: "/settings/staff" },
+      { icon: <Company />, label: "Company", path: "/settings/company" },
+      { icon: <EmojiEventsIcon />, label: "Skill", path: "/settings/skill" },
+      { icon: <Department />, label: "Department", path: "/settings/department" },
+      { icon: <Position />, label: "Position", path: "/settings/position" },
+      { icon: <Salary />, label: "Salary", path: "/settings/salary" },
+      { icon: <Team />, label: "Team", path: "/settings/team" },
+      { icon: <ManageAccountsIcon />, label: "User", path: "/settings/user" },
+      { icon: <Holiday />, label: "Holiday", path: "/settings/holiday" },
     ],
   },
-    {
-      icon: <Settings />, label: "Setting", path: "", isHidden: ![VIEW_MASTERDATA, MAINTAIN_MASTERDATA].some((ability) => abilities.includes(ability)),
-      children: [
-        { icon: <GroupIcon />, label: "Client", path: "/settings/customer" },
-        { icon: <BusinessIcon />, label: "Subsidiary", path: "/settings/subsidiary" },
-        { icon: <Staff />, label: "Staff", path: "/settings/staff" },
-        { icon: <Company />, label: "Company", path: "/settings/company" },
-        { icon: <EmojiEventsIcon />, label: "Skill", path: "/settings/skill" },
-        { icon: <Department />, label: "Department", path: "/settings/department" },
-        { icon: <Position />, label: "Position", path: "/settings/position" },
-        { icon: <Salary />, label: "Salary", path: "/settings/salary" },
-        { icon: <Team />, label: "Team", path: "/settings/team" },
-        { icon: <ManageAccountsIcon />, label: "User", path: "/settings/user", isHidden: ![MAINTAIN_USER, VIEW_USER].some((ability) => abilities.includes(ability))},
-        { icon: <Holiday />, label: "Holiday", path: "/settings/holiday" },
-      ],
-    },
-  ];
+];
+
+const NavigationContent: React.FC = () => {
   const { t } = useTranslation("common");
   const pathname = usePathname();
 
@@ -195,7 +188,7 @@ const NavigationContent: React.FC<Props> = async ({abilities}) => {
       </Box>
       <Divider />
       <List component="nav">
-        {navigationItems.filter(item => item.isHidden !== true).map((item) => renderNavigationItem(item))}
+        {navigationItems.map((item) => renderNavigationItem(item))}
         {/* {navigationItems.map(({ icon, label, path }, index) => {
           return (
             <Box
diff --git a/src/components/StaffSearch/StaffSearchWrapper.tsx b/src/components/StaffSearch/StaffSearchWrapper.tsx
index ad061b8..59f9dc1 100644
--- a/src/components/StaffSearch/StaffSearchWrapper.tsx
+++ b/src/components/StaffSearch/StaffSearchWrapper.tsx
@@ -9,15 +9,18 @@ import { fetchPositionCombo } from "@/app/api/positions/actions";
 import { fetchGradeCombo } from "@/app/api/grades/actions";
 import { fetchSkillCombo } from "@/app/api/skill/actions";
 import { fetchSalaryCombo } from "@/app/api/salarys/actions";
-import { getServerSession } from "next-auth";
+import { Session, getServerSession } from "next-auth";
 import { authOptions } from "@/config/authConfig";
-import { SessionWithAbilities } from "../AppBar/NavigationToggle";
 // import { preloadStaff } from "@/app/api/staff";
 
 interface SubComponents {
   Loading: typeof StaffSearchLoading;
 }
 
+interface SessionWithAbilities extends Session {
+  abilities?: string[]
+}
+
 const StaffSearchWrapper: React.FC & SubComponents = async () => {
   const staff = await fetchStaff();
   const session = await getServerSession(authOptions) as SessionWithAbilities;