Proponent tracker navigation

bcgov · Jan 29, 2025 · acdcdec · acdcdec
1 parent efceefc
commit acdcdec
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 168 deletions.
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
@@ -179,15 +179,6 @@ const routes: Array<RouteRecordRaw> = [
               access: [NavigationPermission.HOUSING_STATUS_TRACKER]
             },
             children: [
-              {
-                path: '',
-                component: () => import('@/views/housing/project/ProjectListView.vue'),
-                beforeEnter: accessHandler,
-                meta: {
-                  access: [NavigationPermission.HOUSING_STATUS_TRACKER]
-                },
-                name: RouteName.HOUSING_PROJECTS_LIST
-              },
               {
                 path: ':submissionId',
                 component: () => import('@/views/housing/project/ProjectView.vue'),

diff --git a/frontend/src/views/housing/HousingView.vue b/frontend/src/views/housing/HousingView.vue
@@ -29,13 +29,6 @@ const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 
-function onProjectClick(project: Submission) {
-  router.push({
-    name: RouteName.HOUSING_SUBMISSION_INTAKE,
-    query: { activityId: project.activityId, submissionId: project.submissionId }
-  });
-}
-
 function onSubmissionDraftDelete(draftId: string) {
   drafts.value = drafts.value.filter((x) => x.draftId !== draftId);
 }
@@ -163,15 +156,14 @@ onMounted(async () => {
         :index="index"
         class="rounded-sm shadow-md hover:shadow-lg px-6 py-4 custom-card hover-hand"
         :class="{ 'mb-2': index != displayedProjects.length - 1 }"
-        @click="onProjectClick(project)"
       >
         <div class="grid grid-cols-12 gap-4">
           <div class="col-span-3 flex items-center">
             <router-link
               class="no-underline"
               :to="{
-                name: RouteName.HOUSING_SUBMISSION_INTAKE,
-                query: { activityId: project.activityId, submissionId: project.submissionId }
+                name: RouteName.HOUSING_PROJECT,
+                params: { submissionId: project.submissionId }
               }"
             >
               <h4 class="font-bold mb-0">{{ project.projectName }}</h4>

diff --git a/frontend/src/views/housing/project/ProjectListView.vue b/frontend/src/views/housing/project/ProjectListView.vue
diff --git a/frontend/src/views/housing/project/ProjectView.vue b/frontend/src/views/housing/project/ProjectView.vue
@@ -206,9 +206,9 @@ async function handleEnquirySubmit(enquiryDescription: string = '') {
   }
 }
 
-function navigateToSubmissionView() {
+function navigateToSubmissionIntakeView() {
   router.push({
-    name: RouteName.HOUSING_SUBMISSION,
+    name: RouteName.HOUSING_SUBMISSION_INTAKE,
     query: { activityId: getSubmission.value?.activityId, submissionId: getSubmission.value?.submissionId }
   });
 }
@@ -264,9 +264,9 @@ onMounted(async () => {
       <h1
         class="m-0 cursor-pointer hover:underline"
         tabindex="0"
-        @click="navigateToSubmissionView()"
-        @keydown.enter.prevent="navigateToSubmissionView()"
-        @keydown.space.prevent="navigateToSubmissionView()"
+        @click="navigateToSubmissionIntakeView()"
+        @keydown.enter.prevent="navigateToSubmissionIntakeView()"
+        @keydown.space.prevent="navigateToSubmissionIntakeView()"
       >
         {{ getSubmission.projectName }}
         <font-awesome-icon

diff --git a/frontend/tests/unit/views/housing/project/ProjectListView.spec.ts b/frontend/tests/unit/views/housing/project/ProjectListView.spec.ts