diff --git a/src/components/NavigationContent/NavigationContent.tsx b/src/components/NavigationContent/NavigationContent.tsx index 83a5535..3203fa6 100644 --- a/src/components/NavigationContent/NavigationContent.tsx +++ b/src/components/NavigationContent/NavigationContent.tsx @@ -67,7 +67,7 @@ import { MAINTAIN_GROUP, MAINTAIN_HOLIDAY, VIEW_PROJECT_RESOURCE_CONSUMPTION_RANKING, - GENERATE_LATE_START_REPORTS, + GENERATE_LATE_START_REPORT, GENERATE_PROJECT_POTENTIAL_DELAY_REPORT, GENERATE_RESOURCE_OVERCONSUMPTION_REPORT, GENERATE_COST_ANT_EXPENSE_REPORT, @@ -76,7 +76,7 @@ import { GENERATE_FINANCIAL_STATUS_REPORT, GENERATE_PROJECT_CASH_FLOW_REPORT, GENERATE_STAFF_MONTHLY_WORK_HOURS_ANALYSIS_REPORT, - GENERATE_CROSS_TEAM_CHARGE_REPORT, + GENERATE_CROSS_TEAM_CHARGE_REPORT } from "@/middleware"; import { SessionWithAbilities } from "../AppBar/NavigationToggle"; import { authOptions } from "@/config/authConfig"; @@ -190,7 +190,7 @@ const NavigationContent: React.FC = ({ abilities, username }) => { label: "Analysis Report", path: "", isHidden: ![ - GENERATE_LATE_START_REPORTS, + GENERATE_LATE_START_REPORT, GENERATE_PROJECT_POTENTIAL_DELAY_REPORT, GENERATE_RESOURCE_OVERCONSUMPTION_REPORT, GENERATE_COST_ANT_EXPENSE_REPORT, @@ -199,7 +199,7 @@ const NavigationContent: React.FC = ({ abilities, username }) => { GENERATE_FINANCIAL_STATUS_REPORT, GENERATE_PROJECT_CASH_FLOW_REPORT, GENERATE_STAFF_MONTHLY_WORK_HOURS_ANALYSIS_REPORT, - GENERATE_CROSS_TEAM_CHARGE_REPORT, + GENERATE_CROSS_TEAM_CHARGE_REPORT ].some((ability) => abilities!.includes(ability), ), @@ -208,7 +208,7 @@ const NavigationContent: React.FC = ({ abilities, username }) => { icon: , label: "Late Start Report", path: "/analytics/LateStartReport", - isHidden: ![GENERATE_LATE_START_REPORTS].some((ability) => + isHidden: ![GENERATE_LATE_START_REPORT].some((ability) => abilities!.includes(ability), ), }, diff --git a/src/middleware.ts b/src/middleware.ts index 0448add..c9208df 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -59,7 +59,7 @@ export const [ VIEW_PROJECT_RESOURCE_CONSUMPTION_RANKING, MAINTAIN_NORMAL_STAFF_WORKSPACE, MAINTAIN_MANAGEMENT_STAFF_WORKSPACE, - GENERATE_LATE_START_REPORTS, + GENERATE_LATE_START_REPORT, GENERATE_PROJECT_POTENTIAL_DELAY_REPORT, GENERATE_RESOURCE_OVERCONSUMPTION_REPORT, GENERATE_COST_ANT_EXPENSE_REPORT, @@ -68,7 +68,7 @@ export const [ GENERATE_FINANCIAL_STATUS_REPORT, GENERATE_PROJECT_CASH_FLOW_REPORT, GENERATE_STAFF_MONTHLY_WORK_HOURS_ANALYSIS_REPORT, - GENERATE_CROSS_TEAM_CHARGE_REPORT, + GENERATE_CROSS_TEAM_CHARGE_REPORT ] = [ 'MAINTAIN_USER', 'MAINTAIN_TIMESHEET', @@ -109,7 +109,7 @@ export const [ 'VIEW_PROJECT_RESOURCE_CONSUMPTION_RANKING', 'MAINTAIN_NORMAL_STAFF_WORKSPACE', 'MAINTAIN_MANAGEMENT_STAFF_WORKSPACE', - 'GENERATE_LATE_START_REPORTS', + 'GENERATE_LATE_START_REPORT', 'GENERATE_PROJECT_POTENTIAL_DELAY_REPORT', 'GENERATE_RESOURCE_OVERCONSUMPTION_REPORT', 'GENERATE_COST_ANT_EXPENSE_REPORT', @@ -118,7 +118,7 @@ export const [ 'GENERATE_FINANCIAL_STATUS_REPORT', 'GENERATE_PROJECT_CASH_FLOW_REPORT', 'GENERATE_STAFF_MONTHLY_WORK_HOURS_ANALYSIS_REPORT', - 'GENERATE_CROSS_TEAM_CHARGE_REPORT', + 'GENERATE_CROSS_TEAM_CHARGE_REPORT' ] const PRIVATE_ROUTES = [ @@ -243,7 +243,7 @@ export default async function middleware( if (req.nextUrl.pathname.startsWith('/analytics')) { isAuth = [ - GENERATE_LATE_START_REPORTS, + GENERATE_LATE_START_REPORT, GENERATE_PROJECT_POTENTIAL_DELAY_REPORT, GENERATE_RESOURCE_OVERCONSUMPTION_REPORT, GENERATE_COST_ANT_EXPENSE_REPORT, @@ -252,11 +252,11 @@ export default async function middleware( GENERATE_FINANCIAL_STATUS_REPORT, GENERATE_PROJECT_CASH_FLOW_REPORT, GENERATE_STAFF_MONTHLY_WORK_HOURS_ANALYSIS_REPORT, - GENERATE_CROSS_TEAM_CHARGE_REPORT,].some((ability) => abilities.includes(ability)); + GENERATE_CROSS_TEAM_CHARGE_REPORT].some((ability) => abilities.includes(ability)); } if (req.nextUrl.pathname.startsWith('/analytics/LateStartReport')) { - isAuth = [GENERATE_LATE_START_REPORTS].some((ability) => abilities.includes(ability)); + isAuth = [GENERATE_LATE_START_REPORT].some((ability) => abilities.includes(ability)); } if (req.nextUrl.pathname.startsWith('/analytics/ProjectPotentialDelayReport')) {