Merge pull request #421 from bcgov/fix-reviewer-form-access

hide forms for reviewer
bcgov · Jul 31, 2023 · 24aca83 · 24aca83
2 parents 8912629 + 44f1c86
commit 24aca83
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-web/src/components/PrivateRoute.jsx b/forms-flow-ai/forms-flow-ai-ee/forms-flow-web/src/components/PrivateRoute.jsx
@@ -230,7 +230,13 @@ const PrivateRoute = React.memo((props) => {
       {isAuth ? (
         <Suspense fallback={<Loading />}>
           <Switch>
-            {ENABLE_FORMS_MODULE && (
+            {ENABLE_FORMS_MODULE && userRoles.includes(CLIENT_REVIEWER) && (
+              <Route
+                path={[`${BASE_ROUTE}form`, `${BASE_ROUTE}bundle`]}
+                component={Form}
+              />
+            )}
+             {ENABLE_FORMS_MODULE && !userRoles.includes(STAFF_REVIEWER) && (
               <Route
                 path={[`${BASE_ROUTE}form`, `${BASE_ROUTE}bundle`]}
                 component={Form}

diff --git a/forms-flow-ai/forms-flow-ai-micro-front-ends/forms-flow-nav/src/Navbar.jsx b/forms-flow-ai/forms-flow-ai-micro-front-ends/forms-flow-nav/src/Navbar.jsx
@@ -192,7 +192,7 @@ const NavBar = React.memo(({ props }) => {
                   id="main-menu-nav"
                   className="active align-items-lg-center"
                 >
-                  {ENABLE_FORMS_MODULE && (
+                  {(getUserRolePermission(userRoles, CLIENT_REVIEWER) || !getUserRolePermission(userRoles, STAFF_REVIEWER)) ? ENABLE_FORMS_MODULE && (
                     <Nav.Link
                       as={Link}
                       to={`${baseUrl}form`}
@@ -205,7 +205,7 @@ const NavBar = React.memo(({ props }) => {
                       <i className="fa fa-wpforms fa-fw fa-lg mr-2" />
                       {t("Forms")}
                     </Nav.Link>
-                  )}
+                  ):null}
 
                   {getUserRolePermission(userRoles, ADMIN_ROLE) ? (
                     <Nav.Link