Merge pull request #416 from bcgov/bugfix/intake-navigation

Fixed Navigation Guard Issue

Author: kyle1morel

frontend/src/components/form/FormNavigationGuard.vue

@@ -15,6 +15,7 @@ const { autoSaveRef = null, callback = () => {} } = defineProps<{
 }>();
 
 // State
+const isAccepted: Ref<boolean> = ref(false);
 const isDirty = useIsFormDirty();
 const isOpen: Ref<boolean> = ref(false);
 
@@ -25,6 +26,9 @@ const router = useRouter();
 onBeforeRouteLeave(async (to) => {
   autoSaveRef?.stopAutoSave();
 
+  // Skip navigation guard if already accepted
+  if (isAccepted.value) return true;
+
   if (isDirty.value && !isOpen.value) {
     isOpen.value = true;
     confirm.require({
@@ -35,6 +39,7 @@ onBeforeRouteLeave(async (to) => {
       rejectLabel: 'Cancel',
       rejectProps: { outlined: true },
       accept: async () => {
+        isAccepted.value = true;
         await callback();
         router.replace(to);
       },

frontend/src/components/projectCommon/submission/ProjectTeamTab.vue

@@ -123,7 +123,7 @@ function onRevokeUserClick(contact: ActivityContact) {
     <div class="basis-1/6">
       <div class="flex justify-end">
         <Button
-          :label="t('e.common.projectTeamTab.addUserBtn')"
+          :label="t('e.common.projectTeamTab.addMemberBtn')"
           icon="pi pi-plus"
           outlined
           @click="createUserModalVisible = true"

frontend/src/locales/en-CA.json

@@ -71,7 +71,7 @@
         "save": "Save"
       },
       "projectTeamTab": {
-        "addUserBtn": "Add user",
+        "addMemberBtn": "Add team member",
         "adminAdded": "{first} {last} has been added as a Project Admin.",
         "adminUpdated": "{first} {last} is now a Project Admin.",
         "failedToAdd": "Failed to add user",