| @@ -33,7 +33,6 @@ export const [ | |||||
| VIEW_POSITION, | VIEW_POSITION, | ||||
| VIEW_SALARY, | VIEW_SALARY, | ||||
| VIEW_TEAM, | VIEW_TEAM, | ||||
| VIEW_USER_GROUP, | |||||
| VIEW_HOLIDAY, | VIEW_HOLIDAY, | ||||
| MAINTAIN_CLIENT, | MAINTAIN_CLIENT, | ||||
| MAINTAIN_SUBSIDIARY, | MAINTAIN_SUBSIDIARY, | ||||
| @@ -44,12 +43,11 @@ export const [ | |||||
| MAINTAIN_POSITION, | MAINTAIN_POSITION, | ||||
| MAINTAIN_SALARY, | MAINTAIN_SALARY, | ||||
| MAINTAIN_TEAM, | MAINTAIN_TEAM, | ||||
| MAINTAIN_USER_GROUP, | |||||
| MAINTAIN_GROUP, | |||||
| MAINTAIN_HOLIDAY, | MAINTAIN_HOLIDAY, | ||||
| VIEW_DASHBOARD_SELF, | VIEW_DASHBOARD_SELF, | ||||
| VIEW_DASHBOARD_ALL, | VIEW_DASHBOARD_ALL, | ||||
| IMPORT_INVOICE, | IMPORT_INVOICE, | ||||
| MAINTAIN_GROUP, | |||||
| GENERATE_REPORTS, | GENERATE_REPORTS, | ||||
| VIEW_STAFF_PROFILE, | VIEW_STAFF_PROFILE, | ||||
| IMPORT_RECEIPT, | IMPORT_RECEIPT, | ||||
| @@ -73,7 +71,6 @@ export const [ | |||||
| 'VIEW_POSITION', | 'VIEW_POSITION', | ||||
| 'VIEW_SALARY', | 'VIEW_SALARY', | ||||
| 'VIEW_TEAM', | 'VIEW_TEAM', | ||||
| 'VIEW_USER_GROUP', | |||||
| 'VIEW_HOLIDAY', | 'VIEW_HOLIDAY', | ||||
| 'MAINTAIN_CLIENT', | 'MAINTAIN_CLIENT', | ||||
| 'MAINTAIN_SUBSIDIARY', | 'MAINTAIN_SUBSIDIARY', | ||||
| @@ -84,12 +81,11 @@ export const [ | |||||
| 'MAINTAIN_POSITION', | 'MAINTAIN_POSITION', | ||||
| 'MAINTAIN_SALARY', | 'MAINTAIN_SALARY', | ||||
| 'MAINTAIN_TEAM', | 'MAINTAIN_TEAM', | ||||
| 'MAINTAIN_USER_GROUP', | |||||
| 'MAINTAIN_GROUP', | |||||
| 'MAINTAIN_HOLIDAY', | 'MAINTAIN_HOLIDAY', | ||||
| 'VIEW_DASHBOARD_SELF', | 'VIEW_DASHBOARD_SELF', | ||||
| 'VIEW_DASHBOARD_ALL', | 'VIEW_DASHBOARD_ALL', | ||||
| 'IMPORT_INVOICE', | 'IMPORT_INVOICE', | ||||
| 'MAINTAIN_GROUP', | |||||
| 'GENERATE_REPORTS', | 'GENERATE_REPORTS', | ||||
| 'VIEW_STAFF_PROFILE', | 'VIEW_STAFF_PROFILE', | ||||
| 'IMPORT_RECEIPT', | 'IMPORT_RECEIPT', | ||||
| @@ -157,7 +153,7 @@ export default async function middleware( | |||||
| VIEW_POSITION, | VIEW_POSITION, | ||||
| VIEW_SALARY, | VIEW_SALARY, | ||||
| VIEW_TEAM, | VIEW_TEAM, | ||||
| VIEW_USER_GROUP, | |||||
| VIEW_GROUP, | |||||
| VIEW_HOLIDAY, | VIEW_HOLIDAY, | ||||
| MAINTAIN_CLIENT, | MAINTAIN_CLIENT, | ||||
| MAINTAIN_SUBSIDIARY, | MAINTAIN_SUBSIDIARY, | ||||
| @@ -168,7 +164,7 @@ export default async function middleware( | |||||
| MAINTAIN_POSITION, | MAINTAIN_POSITION, | ||||
| MAINTAIN_SALARY, | MAINTAIN_SALARY, | ||||
| MAINTAIN_TEAM, | MAINTAIN_TEAM, | ||||
| MAINTAIN_USER_GROUP, | |||||
| MAINTAIN_GROUP, | |||||
| MAINTAIN_HOLIDAY | MAINTAIN_HOLIDAY | ||||
| ].some((ability) => abilities.includes(ability)); | ].some((ability) => abilities.includes(ability)); | ||||
| } | } | ||||
| @@ -206,7 +202,7 @@ export default async function middleware( | |||||
| } | } | ||||
| if (req.nextUrl.pathname.startsWith('/settings/group/create') || req.nextUrl.pathname.startsWith('/settings/group/edit')) { | if (req.nextUrl.pathname.startsWith('/settings/group/create') || req.nextUrl.pathname.startsWith('/settings/group/edit')) { | ||||
| isAuth = [MAINTAIN_USER_GROUP].some((ability) => abilities.includes(ability)); | |||||
| isAuth = [MAINTAIN_GROUP].some((ability) => abilities.includes(ability)); | |||||
| } | } | ||||
| if (req.nextUrl.pathname.startsWith('/settings/holiday/create') || req.nextUrl.pathname.startsWith('/settings/holiday/edit')) { | if (req.nextUrl.pathname.startsWith('/settings/holiday/create') || req.nextUrl.pathname.startsWith('/settings/holiday/edit')) { | ||||