Back navigation link fix

bcgov · Dec 18, 2024 · bfa2a54 · bfa2a54
1 parent 210f22e
commit bfa2a54
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 26 deletions.
diff --git a/frontend/src/components/housing/enquiry/EnquiryIntakeForm.vue b/frontend/src/components/housing/enquiry/EnquiryIntakeForm.vue
@@ -2,7 +2,7 @@
 import { storeToRefs } from 'pinia';
 import { Form } from 'vee-validate';
 import { computed, onBeforeMount, ref } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { array, object, string } from 'yup';
 
 import BackButton from '@/components/common/BackButton.vue';
@@ -71,21 +71,13 @@ const formSchema = object({
 // Actions
 const confirm = useConfirm();
 const router = useRouter();
-const route = useRoute();
 const toast = useToast();
 
 const getBackButtonConfig = computed(() => {
-  if (route.query.activityId) {
-    return {
-      text: 'Back to my drafts and previous entries',
-      routeName: RouteName.HOUSING_SUBMISSIONS
-    };
-  } else {
-    return {
-      text: 'Back to Housing',
-      routeName: RouteName.HOUSING
-    };
-  }
+  return {
+    text: 'Back to Housing',
+    routeName: RouteName.HOUSING
+  };
 });
 
 function confirmSubmit(data: any) {

diff --git a/frontend/src/components/housing/submission/SubmissionIntakeForm.vue b/frontend/src/components/housing/submission/SubmissionIntakeForm.vue
@@ -2,7 +2,7 @@
 import { storeToRefs } from 'pinia';
 import { Form, FieldArray, ErrorMessage } from 'vee-validate';
 import { computed, onBeforeMount, nextTick, ref } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 
 import AdvancedFileUpload from '@/components/file/AdvancedFileUpload.vue';
 import BackButton from '@/components/common/BackButton.vue';
@@ -125,21 +125,13 @@ const validationErrors = computed(() => {
 // Actions
 const confirm = useConfirm();
 const router = useRouter();
-const route = useRoute();
 const toast = useToast();
 
 const getBackButtonConfig = computed(() => {
-  if (route.query.activityId) {
-    return {
-      text: 'Back to my drafts and previous entries',
-      routeName: RouteName.HOUSING_SUBMISSIONS
-    };
-  } else {
-    return {
-      text: 'Back to Housing',
-      routeName: RouteName.HOUSING
-    };
-  }
+  return {
+    text: 'Back to Housing',
+    routeName: RouteName.HOUSING
+  };
 });
 
 function confirmSubmit(data: GenericObject) {