瀏覽代碼

update

tags/Baseline_30082024_FRONTEND_UAT
cyril.tsui 1 年之前
父節點
當前提交
3f3de75fd1
共有 2 個檔案被更改,包括 12 行新增12 行删除
  1. +5
    -5
      src/components/NavigationContent/NavigationContent.tsx
  2. +7
    -7
      src/middleware.ts

+ 5
- 5
src/components/NavigationContent/NavigationContent.tsx 查看文件

@@ -67,7 +67,7 @@ import {
MAINTAIN_GROUP, MAINTAIN_GROUP,
MAINTAIN_HOLIDAY, MAINTAIN_HOLIDAY,
VIEW_PROJECT_RESOURCE_CONSUMPTION_RANKING, VIEW_PROJECT_RESOURCE_CONSUMPTION_RANKING,
GENERATE_LATE_START_REPORTS,
GENERATE_LATE_START_REPORT,
GENERATE_PROJECT_POTENTIAL_DELAY_REPORT, GENERATE_PROJECT_POTENTIAL_DELAY_REPORT,
GENERATE_RESOURCE_OVERCONSUMPTION_REPORT, GENERATE_RESOURCE_OVERCONSUMPTION_REPORT,
GENERATE_COST_ANT_EXPENSE_REPORT, GENERATE_COST_ANT_EXPENSE_REPORT,
@@ -76,7 +76,7 @@ import {
GENERATE_FINANCIAL_STATUS_REPORT, GENERATE_FINANCIAL_STATUS_REPORT,
GENERATE_PROJECT_CASH_FLOW_REPORT, GENERATE_PROJECT_CASH_FLOW_REPORT,
GENERATE_STAFF_MONTHLY_WORK_HOURS_ANALYSIS_REPORT, GENERATE_STAFF_MONTHLY_WORK_HOURS_ANALYSIS_REPORT,
GENERATE_CROSS_TEAM_CHARGE_REPORT,
GENERATE_CROSS_TEAM_CHARGE_REPORT
} from "@/middleware"; } from "@/middleware";
import { SessionWithAbilities } from "../AppBar/NavigationToggle"; import { SessionWithAbilities } from "../AppBar/NavigationToggle";
import { authOptions } from "@/config/authConfig"; import { authOptions } from "@/config/authConfig";
@@ -190,7 +190,7 @@ const NavigationContent: React.FC<Props> = ({ abilities, username }) => {
label: "Analysis Report", label: "Analysis Report",
path: "", path: "",
isHidden: ![ isHidden: ![
GENERATE_LATE_START_REPORTS,
GENERATE_LATE_START_REPORT,
GENERATE_PROJECT_POTENTIAL_DELAY_REPORT, GENERATE_PROJECT_POTENTIAL_DELAY_REPORT,
GENERATE_RESOURCE_OVERCONSUMPTION_REPORT, GENERATE_RESOURCE_OVERCONSUMPTION_REPORT,
GENERATE_COST_ANT_EXPENSE_REPORT, GENERATE_COST_ANT_EXPENSE_REPORT,
@@ -199,7 +199,7 @@ const NavigationContent: React.FC<Props> = ({ abilities, username }) => {
GENERATE_FINANCIAL_STATUS_REPORT, GENERATE_FINANCIAL_STATUS_REPORT,
GENERATE_PROJECT_CASH_FLOW_REPORT, GENERATE_PROJECT_CASH_FLOW_REPORT,
GENERATE_STAFF_MONTHLY_WORK_HOURS_ANALYSIS_REPORT, GENERATE_STAFF_MONTHLY_WORK_HOURS_ANALYSIS_REPORT,
GENERATE_CROSS_TEAM_CHARGE_REPORT,
GENERATE_CROSS_TEAM_CHARGE_REPORT
].some((ability) => ].some((ability) =>
abilities!.includes(ability), abilities!.includes(ability),
), ),
@@ -208,7 +208,7 @@ const NavigationContent: React.FC<Props> = ({ abilities, username }) => {
icon: <Analytics />, icon: <Analytics />,
label: "Late Start Report", label: "Late Start Report",
path: "/analytics/LateStartReport", path: "/analytics/LateStartReport",
isHidden: ![GENERATE_LATE_START_REPORTS].some((ability) =>
isHidden: ![GENERATE_LATE_START_REPORT].some((ability) =>
abilities!.includes(ability), abilities!.includes(ability),
), ),
}, },


+ 7
- 7
src/middleware.ts 查看文件

@@ -59,7 +59,7 @@ export const [
VIEW_PROJECT_RESOURCE_CONSUMPTION_RANKING, VIEW_PROJECT_RESOURCE_CONSUMPTION_RANKING,
MAINTAIN_NORMAL_STAFF_WORKSPACE, MAINTAIN_NORMAL_STAFF_WORKSPACE,
MAINTAIN_MANAGEMENT_STAFF_WORKSPACE, MAINTAIN_MANAGEMENT_STAFF_WORKSPACE,
GENERATE_LATE_START_REPORTS,
GENERATE_LATE_START_REPORT,
GENERATE_PROJECT_POTENTIAL_DELAY_REPORT, GENERATE_PROJECT_POTENTIAL_DELAY_REPORT,
GENERATE_RESOURCE_OVERCONSUMPTION_REPORT, GENERATE_RESOURCE_OVERCONSUMPTION_REPORT,
GENERATE_COST_ANT_EXPENSE_REPORT, GENERATE_COST_ANT_EXPENSE_REPORT,
@@ -68,7 +68,7 @@ export const [
GENERATE_FINANCIAL_STATUS_REPORT, GENERATE_FINANCIAL_STATUS_REPORT,
GENERATE_PROJECT_CASH_FLOW_REPORT, GENERATE_PROJECT_CASH_FLOW_REPORT,
GENERATE_STAFF_MONTHLY_WORK_HOURS_ANALYSIS_REPORT, GENERATE_STAFF_MONTHLY_WORK_HOURS_ANALYSIS_REPORT,
GENERATE_CROSS_TEAM_CHARGE_REPORT,
GENERATE_CROSS_TEAM_CHARGE_REPORT
] = [ ] = [
'MAINTAIN_USER', 'MAINTAIN_USER',
'MAINTAIN_TIMESHEET', 'MAINTAIN_TIMESHEET',
@@ -109,7 +109,7 @@ export const [
'VIEW_PROJECT_RESOURCE_CONSUMPTION_RANKING', 'VIEW_PROJECT_RESOURCE_CONSUMPTION_RANKING',
'MAINTAIN_NORMAL_STAFF_WORKSPACE', 'MAINTAIN_NORMAL_STAFF_WORKSPACE',
'MAINTAIN_MANAGEMENT_STAFF_WORKSPACE', 'MAINTAIN_MANAGEMENT_STAFF_WORKSPACE',
'GENERATE_LATE_START_REPORTS',
'GENERATE_LATE_START_REPORT',
'GENERATE_PROJECT_POTENTIAL_DELAY_REPORT', 'GENERATE_PROJECT_POTENTIAL_DELAY_REPORT',
'GENERATE_RESOURCE_OVERCONSUMPTION_REPORT', 'GENERATE_RESOURCE_OVERCONSUMPTION_REPORT',
'GENERATE_COST_ANT_EXPENSE_REPORT', 'GENERATE_COST_ANT_EXPENSE_REPORT',
@@ -118,7 +118,7 @@ export const [
'GENERATE_FINANCIAL_STATUS_REPORT', 'GENERATE_FINANCIAL_STATUS_REPORT',
'GENERATE_PROJECT_CASH_FLOW_REPORT', 'GENERATE_PROJECT_CASH_FLOW_REPORT',
'GENERATE_STAFF_MONTHLY_WORK_HOURS_ANALYSIS_REPORT', 'GENERATE_STAFF_MONTHLY_WORK_HOURS_ANALYSIS_REPORT',
'GENERATE_CROSS_TEAM_CHARGE_REPORT',
'GENERATE_CROSS_TEAM_CHARGE_REPORT'
] ]


const PRIVATE_ROUTES = [ const PRIVATE_ROUTES = [
@@ -243,7 +243,7 @@ export default async function middleware(


if (req.nextUrl.pathname.startsWith('/analytics')) { if (req.nextUrl.pathname.startsWith('/analytics')) {
isAuth = [ isAuth = [
GENERATE_LATE_START_REPORTS,
GENERATE_LATE_START_REPORT,
GENERATE_PROJECT_POTENTIAL_DELAY_REPORT, GENERATE_PROJECT_POTENTIAL_DELAY_REPORT,
GENERATE_RESOURCE_OVERCONSUMPTION_REPORT, GENERATE_RESOURCE_OVERCONSUMPTION_REPORT,
GENERATE_COST_ANT_EXPENSE_REPORT, GENERATE_COST_ANT_EXPENSE_REPORT,
@@ -252,11 +252,11 @@ export default async function middleware(
GENERATE_FINANCIAL_STATUS_REPORT, GENERATE_FINANCIAL_STATUS_REPORT,
GENERATE_PROJECT_CASH_FLOW_REPORT, GENERATE_PROJECT_CASH_FLOW_REPORT,
GENERATE_STAFF_MONTHLY_WORK_HOURS_ANALYSIS_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')) { 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')) { if (req.nextUrl.pathname.startsWith('/analytics/ProjectPotentialDelayReport')) {


Loading…
取消
儲存