feat(confirm-route-leave): enhance confirmation modal functionality a…

…nd naming Signed-off-by: Wanjin Noh <[email protected]>
cloudforet-io · Nov 30, 2024 · bf29c50 · bf29c50
1 parent bfc5fc1
commit bf29c50
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/apps/web/src/common/composables/confirm-route-leave/index.ts b/apps/web/src/common/composables/confirm-route-leave/index.ts
@@ -1,30 +1,39 @@
+import type { Ref } from 'vue';
 import {
     ref, readonly,
 } from 'vue';
 import type { Route } from 'vue-router';
 import { useRouter } from 'vue-router/composables';
 
-export const useConfirmRouteLeave = () => {
+export const useConfirmRouteLeave = ({
+    passConfirmation,
+}: {
+    passConfirmation?: Ref<boolean>
+} = {}) => {
     const router = useRouter();
 
-    const isConfirmBackModalVisible = ref(false);
+    const isConfirmLeaveModalVisible = ref(false);
     const isConfirmed = ref(false);
     let nextRoute: Route|undefined;
 
     const openConfirmBackModal = () => {
-        isConfirmBackModalVisible.value = true;
+        isConfirmLeaveModalVisible.value = true;
     };
-    const handleConfirmBack = () => {
+    const confirmRouteLeave = () => {
         isConfirmed.value = true;
-        isConfirmBackModalVisible.value = false;
+        isConfirmLeaveModalVisible.value = false;
         router.push(nextRoute);
     };
-    const handleCancelBack = () => {
-        isConfirmBackModalVisible.value = false;
+    const stopRouteLeave = () => {
+        isConfirmLeaveModalVisible.value = false;
         nextRoute = undefined;
     };
 
     const handleBeforeRouteLeave = (to, from, next) => {
+        if (passConfirmation?.value) {
+            next();
+            return;
+        }
         if (!isConfirmed.value) {
             nextRoute = to;
             openConfirmBackModal();
@@ -35,9 +44,9 @@ export const useConfirmRouteLeave = () => {
     };
 
     return {
-        isConfirmBackModalVisible: readonly(isConfirmBackModalVisible),
-        handleConfirmBack,
-        handleCancelBack,
+        isConfirmLeaveModalVisible: readonly(isConfirmLeaveModalVisible),
+        confirmRouteLeave,
+        stopRouteLeave,
         handleBeforeRouteLeave,
     };
 };
diff --git a/apps/web/src/common/composables/go-back/index.ts b/apps/web/src/common/composables/go-back/index.ts
@@ -22,5 +22,6 @@ export const useGoBack = (mainRoute: Location) => {
     return {
         setPathFrom,
         handleClickBackButton,
+        goBack: handleClickBackButton,
     };
 };