Merge pull request #178 from bcgov/bugfix/navigate-enquiry

Resolve navigation permission issues
bcgov · Oct 3, 2024 · 205102d · 205102d
2 parents dbffa2a + 7f3d961
commit 205102d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/frontend/src/components/form/internal/InputMaskInternal.vue b/frontend/src/components/form/internal/InputMaskInternal.vue
@@ -8,7 +8,7 @@ const { label, name, mask, placeholder, disabled, bold } = defineProps<{
   label: string;
   name: string;
   mask: string;
-  placeholder: string;
+  placeholder?: string;
   disabled: boolean;
   bold: boolean;
 }>();

diff --git a/frontend/src/components/layout/Navbar.vue b/frontend/src/components/layout/Navbar.vue
@@ -15,7 +15,7 @@ type NavItem = {
   label: string;
   route?: string;
   public?: boolean;
-  access?: string;
+  access?: NavigationPermission | Array<NavigationPermission>;
   items?: Array<NavItem>;
   mailTo?: string;
 };
@@ -39,12 +39,12 @@ onMounted(() => {
         {
           label: 'Start a new project investigation',
           route: RouteName.HOUSING_SUBMISSION_INTAKE,
-          access: NavigationPermission.HOUSING_INTAKE
+          access: NavigationPermission.HOUSING_SUBMISSION_INTAKE
         },
         {
           label: 'Submit an enquiry',
           route: RouteName.HOUSING_ENQUIRY_INTAKE,
-          access: NavigationPermission.HOUSING_ENQUIRY
+          access: NavigationPermission.HOUSING_ENQUIRY_INTAKE
         },
         {
           label: 'View my drafts and previous entries',
@@ -80,7 +80,7 @@ onMounted(() => {
         {
           label: 'Contact a Navigator',
           mailTo: `mailto:${HOUSING_CONTACT.email}?subject=${HOUSING_CONTACT.subject}`,
-          access: NavigationPermission.HOUSING_INTAKE
+          access: [NavigationPermission.HOUSING_SUBMISSION_INTAKE, NavigationPermission.HOUSING_ENQUIRY_INTAKE]
         },
         {
           label: 'Report a problem',

diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
@@ -113,7 +113,7 @@ const routes: Array<RouteRecordRaw> = [
                 beforeEnter: accessHandler,
                 props: createProps,
                 meta: {
-                  access: [NavigationPermission.HOUSING_INTAKE]
+                  access: [NavigationPermission.HOUSING_ENQUIRY_INTAKE]
                 }
               }
             ]
@@ -138,7 +138,7 @@ const routes: Array<RouteRecordRaw> = [
                 beforeEnter: accessHandler,
                 props: createProps,
                 meta: {
-                  access: [NavigationPermission.HOUSING_INTAKE]
+                  access: [NavigationPermission.HOUSING_SUBMISSION_INTAKE]
                 }
               }
             ]

diff --git a/frontend/src/store/authzStore.ts b/frontend/src/store/authzStore.ts
@@ -10,8 +10,9 @@ export enum NavigationPermission {
   HOUSING = 'housing',
   HOUSING_DROPDOWN = 'housing.dropdown',
   HOUSING_ENQUIRY = 'housing.enquiry',
-  HOUSING_INTAKE = 'housing.intake',
+  HOUSING_ENQUIRY_INTAKE = 'housing.enquiry.intake',
   HOUSING_SUBMISSION = 'housing.submission',
+  HOUSING_SUBMISSION_INTAKE = 'housing.submission.intake',
   HOUSING_SUBMISSIONS = 'housing.submissions',
   HOUSING_SUBMISSIONS_SUB = 'housing.submissions.sub',
   HOUSING_STATUS_TRACKER = 'housing.statustracker',
@@ -26,6 +27,7 @@ const NavigationAuthorizationMap = [
     group: GroupName.ADMIN,
     permissions: [
       NavigationPermission.HOUSING_DROPDOWN,
+      NavigationPermission.HOUSING_ENQUIRY,
       NavigationPermission.HOUSING_STATUS_TRACKER,
       NavigationPermission.HOUSING_SUBMISSION,
       NavigationPermission.HOUSING_SUBMISSIONS,
@@ -37,30 +39,35 @@ const NavigationAuthorizationMap = [
     group: GroupName.NAVIGATOR,
     permissions: [
       NavigationPermission.HOUSING_DROPDOWN,
+      NavigationPermission.HOUSING_ENQUIRY,
       NavigationPermission.HOUSING_STATUS_TRACKER,
       NavigationPermission.HOUSING_SUBMISSION,
       NavigationPermission.HOUSING_SUBMISSIONS
     ]
   },
   {
     group: GroupName.NAVIGATOR_READ_ONLY,
-    permissions: [NavigationPermission.HOUSING_SUBMISSION, NavigationPermission.HOUSING_SUBMISSIONS]
+    permissions: [
+      NavigationPermission.HOUSING_ENQUIRY,
+      NavigationPermission.HOUSING_SUBMISSION,
+      NavigationPermission.HOUSING_SUBMISSIONS
+    ]
   },
   {
     group: GroupName.PROPONENT,
     permissions: [
       NavigationPermission.HOUSING,
       NavigationPermission.HOUSING_DROPDOWN,
-      NavigationPermission.HOUSING_ENQUIRY,
-      NavigationPermission.HOUSING_INTAKE,
-      NavigationPermission.HOUSING_SUBMISSION,
+      NavigationPermission.HOUSING_ENQUIRY_INTAKE,
+      NavigationPermission.HOUSING_SUBMISSION_INTAKE,
       NavigationPermission.HOUSING_SUBMISSIONS_SUB
     ]
   },
   {
     group: GroupName.SUPERVISOR,
     permissions: [
       NavigationPermission.HOUSING_DROPDOWN,
+      NavigationPermission.HOUSING_ENQUIRY,
       NavigationPermission.HOUSING_STATUS_TRACKER,
       NavigationPermission.HOUSING_SUBMISSION,
       NavigationPermission.HOUSING_SUBMISSIONS,