diff --git a/src/routes/GLDUserRoutes.js b/src/routes/GLDUserRoutes.js index f3d523f..39c1b59 100644 --- a/src/routes/GLDUserRoutes.js +++ b/src/routes/GLDUserRoutes.js @@ -72,72 +72,103 @@ const GLDUserRoutes = { element: }:{}, - isGrantedAny(["VIEW_PROOF","MAINTAIN_PROOF"])? + isGranted(["MAINTAIN_PAYMENT"])? { path: '/paymentPage/search', element: }:{}, + isGranted(["MAINTAIN_PAYMENT"])? { path: '/paymentPage/details/:id', element: - }, + }:{}, + + isGranted(["MAINTAIN_DEMANDNOTE"])? { path: '/paymentPage/createDemandNote', element: - }, + }:{}, + + isGrantedAny(["VIEW_DEMANDNOTE","MAINTAIN_DEMANDNOTE"])? { path: '/paymentPage/demandNote', element: - }, + }:{}, + + isGrantedAny(["VIEW_DEMANDNOTE","MAINTAIN_DEMANDNOTE"])? { path: '/paymentPage/demandNote/details/:id', element: - }, + }:{}, + + isGranted("MAINTAIN_RECON") ? { path: '/paymentPage/reconReport', element: - }, + }:{}, + + isGranted("MAINTAIN_RECON") ? { path: '/gfmis/search', element: - }, + }:{}, + + { path: '/user/profile', element: }, + + isGranted("MAINTAIN_SETTING") ? { path: '/setting/sys', element: - }, + }:{}, + + isGranted("MAINTAIN_ANNOUNCEMENT") ? { path: '/setting/announcement', element: - }, + }:{}, + + isGranted("MAINTAIN_ANNOUNCEMENT")? { path: '/setting/announcement/details/:id', element: - }, + }:{}, + + isGranted("MAINTAIN_EMAIL")? { path: '/setting/emailTemplate', element: - }, + }:{}, + + isGranted("MAINTAIN_EMAIL")? { path: '/setting/emailTemplate/:id', element: - }, + }:{}, + + isGranted("MAINTAIN_GAZETTE_ISSUE")? { path: '/setting/holiday', element: - }, + }:{}, + + isGranted("MAINTAIN_GAZETTE_ISSUE")? { path: '/setting/gazetteissuepage', element: - }, + }:{}, + + isGranted("MAINTAIN_DR")? { path: '/setting/drImport', element: - }, + }:{}, + + { path: '/setting/auditLog', element: diff --git a/src/routes/SettingRoutes.js b/src/routes/SettingRoutes.js index c9ab06f..625916e 100644 --- a/src/routes/SettingRoutes.js +++ b/src/routes/SettingRoutes.js @@ -2,11 +2,10 @@ import { lazy } from 'react'; // project import import Loadable from 'components/Loadable'; -// import MainLayout from "../layout/MainLayout"; + +import {isGranted, isGrantedAny} from "auth/utils"; const MainLayout = Loadable(lazy(() => import('layout/MainLayout'))); -// import {Navigate} from "react-router"; -// render - login const SettingPage = Loadable(lazy(() => import('pages/pnspsSettingPage'))); const PasswordPolicyPage = Loadable(lazy(()=> import('pages/pnspsPasswordPolicyPage'))) const UserSearchPage = Loadable(lazy(()=>import ('pages/User/SearchPage'))); @@ -28,50 +27,72 @@ const SettingRoutes = { path: '/', element: , children: [ + isGrantedAny(["VIEW_GROUP","MAINTAIN_GROUP"])? { path: 'usergroupSearchview', element: - }, + }:{}, + + isGrantedAny(["VIEW_GROUP","MAINTAIN_GROUP"])? { path: '/userGroup/:id', element: - }, + }:{}, + + isGrantedAny(["VIEW_USER","MAINTAIN_USER"])? { path: 'userSearchview', element: - }, + }:{}, + + isGrantedAny(["VIEW_USER","MAINTAIN_USER"])? { path: '/user/:id', element: - }, + }:{}, + + isGrantedAny(["VIEW_USER","MAINTAIN_USER"])? { path: 'indUser', element: - }, + }:{}, + + isGrantedAny(["VIEW_USER","MAINTAIN_USER"])? { path: '/indUser/:id', element: - }, + }:{}, + + isGrantedAny(["VIEW_USER","MAINTAIN_USER"])? { path: 'orgUser', element: - }, + }:{}, + + isGrantedAny(["VIEW_USER","MAINTAIN_USER"])? { path: '/orgUser/:id', element: - }, + }:{}, + + isGrantedAny(["VIEW_ORG","MAINTAIN_ORG"])? { path: 'org', element: - }, + }:{}, + + isGrantedAny(["VIEW_ORG","MAINTAIN_ORG"])? { path: '/org/:id', element: - }, + }:{}, + + isGranted(["VIEW_USER","MAINTAIN_ORG"]) || isGranted(["MAINTAIN_USER","MAINTAIN_ORG"])? { path: '/org/fromUser/:id', element: - }, + }:{}, + { path: 'setting', element: