#46 defaulted goBackOrNavigateTo() param to 0

fcamblor · fcamblor · commit 9b77daa94f20 · 2023-10-04T02:36:52.000+02:00
diff --git a/mobile/src/components/feedbacks/BaseFeedbackStep.vue b/mobile/src/components/feedbacks/BaseFeedbackStep.vue
@@ -79,7 +79,7 @@ const eventId = new EventId(getRouteParamsValue(route, 'eventId'));
 
 const ionRouter = useIonRouter();
 function backButtonClicked() {
-    goBackOrNavigateTo(ionRouter, `/events/${eventId.value}`, 0)
+    goBackOrNavigateTo(ionRouter, `/events/${eventId.value}`)
 }
 </script>
 
diff --git a/mobile/src/components/user/GlobalUserActionsButton.vue b/mobile/src/components/user/GlobalUserActionsButton.vue
@@ -14,7 +14,7 @@ const viewableUserDashboard = import.meta.env.VITE_VIEWABLE_USER_DASHBOARD === "
 const ionRouter = useIonRouter();
 function openUserDashboard() {
     if(viewableUserDashboard) {
-        goBackOrNavigateTo(ionRouter, `/user/dashboard`, 0);
+        goBackOrNavigateTo(ionRouter, `/user/dashboard`);
     }
 }
 </script>
diff --git a/mobile/src/router/index.ts b/mobile/src/router/index.ts
@@ -80,7 +80,7 @@ export default router
  *     (after some vue-router's back() magic: if you want further explanation on the why, look at useTabbedPageNav hook)
  *   - If this is not possible, then a navigation on fallback url will replace actual history state
  */
-export async function goBackOrNavigateTo(ionRouter: UseIonRouterResult, fallbackUrl: string, routerGoBacks: number, routeDirection: RouteDirection = 'back', onEventCaught: (() => Promise<void>)|undefined = undefined) {
+export async function goBackOrNavigateTo(ionRouter: UseIonRouterResult, fallbackUrl: string, routerGoBacks: number = 0, routeDirection: RouteDirection = 'back', onEventCaught: (() => Promise<void>)|undefined = undefined) {
   if(onEventCaught) {
     await onEventCaught();
   }
diff --git a/mobile/src/views/event-admin/EventAdminTalkFeedbacks.vue b/mobile/src/views/event-admin/EventAdminTalkFeedbacks.vue
@@ -4,7 +4,7 @@
       <ion-header class="stickyHeader">
         <ion-toolbar>
           <ion-button class="stickyHeader-close" shape="round" slot="start" size="small" fill="outline"
-                      @click="goBackOrNavigateTo(ionRouter, `/event-selector`, 0)">
+                      @click="goBackOrNavigateTo(ionRouter, `/event-selector`)">
             <ion-icon src="/assets/icons/line/arrow-left-line.svg"></ion-icon>
           </ion-button>
           <ion-title class="stickyHeader-title" slot="start">Event Talk Feedbacks</ion-title>
diff --git a/mobile/src/views/feedbacks/NewFeedbackPage.vue b/mobile/src/views/feedbacks/NewFeedbackPage.vue
@@ -223,7 +223,7 @@ async function watchLaterAllFavoritedTalks() {
 }
 
 function backToSchedulePage() {
-    goBackOrNavigateTo(ionRouter, `/events/${eventIdRef.value.value}`, 0)
+    goBackOrNavigateTo(ionRouter, `/events/${eventIdRef.value.value}`)
 }
 
 const dayIdRef = computed(() => labelledTimeslotWithOverlappingsRef.value?.dayId)
@@ -234,7 +234,7 @@ async function submitSkippedFeedback() {
         timeslotId: labelledTimeslotWithOverlappingsRef.value!.labelledTimeslot.id.value,
         alsoConcernsOverlappingTimeslotIds: labelledTimeslotWithOverlappingsRef.value!.overlappingLabelledTimeslots.map(ts => ts.id.value)
     })
-    goBackOrNavigateTo(ionRouter, `/events/${eventIdRef.value.value}`, 0)
+    goBackOrNavigateTo(ionRouter, `/events/${eventIdRef.value.value}`)
 }
 
 </script>
diff --git a/mobile/src/views/feedbacks/RateTalkPage.vue b/mobile/src/views/feedbacks/RateTalkPage.vue
@@ -183,7 +183,7 @@ async function submitFeedback() {
 
 const ionRouter = useIonRouter();
 function backToSchedulePage() {
-    goBackOrNavigateTo(ionRouter, `/events/${eventIdRef.value.value}`, 0)
+    goBackOrNavigateTo(ionRouter, `/events/${eventIdRef.value.value}`)
 }
 
 </script>
diff --git a/mobile/src/views/user/MyGlobalSettingsPage.vue b/mobile/src/views/user/MyGlobalSettingsPage.vue
@@ -4,7 +4,7 @@
       <ion-header class="stickyHeader">
         <ion-toolbar>
           <ion-button class="stickyHeader-close" shape="round" slot="start" size="small" fill="outline"
-                      @click="goBackOrNavigateTo(ionRouter, `/user/dashboard`, 0)">
+                      @click="goBackOrNavigateTo(ionRouter, `/user/dashboard`)">
             <ion-icon src="/assets/icons/line/arrow-left-line.svg"></ion-icon>
           </ion-button>
           <ion-title class="stickyHeader-title" slot="start">App settings</ion-title>
diff --git a/mobile/src/views/user/MyPersonalDataPage.vue b/mobile/src/views/user/MyPersonalDataPage.vue
@@ -4,7 +4,7 @@
       <ion-header class="stickyHeader">
         <ion-toolbar>
           <ion-button class="stickyHeader-close" shape="round" slot="start" size="small" fill="outline"
-                      @click="goBackOrNavigateTo(ionRouter, `/user/dashboard`, 0)">
+                      @click="goBackOrNavigateTo(ionRouter, `/user/dashboard`)">
             <ion-icon src="/assets/icons/line/arrow-left-line.svg"></ion-icon>
           </ion-button>
           <ion-title class="stickyHeader-title" slot="start">My personal data</ion-title>
diff --git a/mobile/src/views/user/TalkFeedbacksPage.vue b/mobile/src/views/user/TalkFeedbacksPage.vue
@@ -4,7 +4,7 @@
       <ion-header class="stickyHeader">
         <ion-toolbar>
           <ion-button class="stickyHeader-close" shape="round" slot="start" size="small" fill="outline"
-                      @click="goBackOrNavigateTo(ionRouter, `/user/talks`, 0)">
+                      @click="goBackOrNavigateTo(ionRouter, `/user/talks`)">
             <ion-icon src="/assets/icons/solid/close.svg"></ion-icon>
           </ion-button>
           <ion-title class="stickyHeader-title" slot="start">{{LL.Talk_Feedbacks()}}</ion-title>
diff --git a/mobile/src/views/user/UserDashboardPage.vue b/mobile/src/views/user/UserDashboardPage.vue
@@ -4,7 +4,7 @@
       <ion-header class="stickyHeader">
         <ion-toolbar>
           <ion-button class="stickyHeader-close" shape="round" slot="start" size="small" fill="outline"
-                      @click="goBackOrNavigateTo(ionRouter, `/event-selector`, 0)">
+                      @click="goBackOrNavigateTo(ionRouter, `/event-selector`)">
             <ion-icon src="/assets/icons/line/arrow-left-line.svg"></ion-icon>
           </ion-button>
           <ion-title class="stickyHeader-title" slot="start">{{ LL.Profile() }}</ion-title>
diff --git a/mobile/src/views/user/ViewableTalksHavingFeedbacksPage.vue b/mobile/src/views/user/ViewableTalksHavingFeedbacksPage.vue
@@ -4,7 +4,7 @@
       <ion-header class="stickyHeader">
         <ion-toolbar>
           <ion-button class="stickyHeader-close" shape="round" slot="start" size="small" fill="outline"
-                      @click="goBackOrNavigateTo(ionRouter, `/user/dashboard`, 0)">
+                      @click="goBackOrNavigateTo(ionRouter, `/user/dashboard`)">
             <ion-icon src="/assets/icons/line/arrow-left-line.svg"></ion-icon>
           </ion-button>
           <ion-title class="stickyHeader-title" slot="start">{{LL.My_talks_with_Feedbacks()}}</ion-title>

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ const eventId = new EventId(getRouteParamsValue(route, 'eventId'));`
`79`	`79`
`80`	`80`	`const ionRouter = useIonRouter();`
`81`	`81`	`function backButtonClicked() {`
`82`		- goBackOrNavigateTo(ionRouter, `/events/${eventId.value}`, 0)
	`82`	+ goBackOrNavigateTo(ionRouter, `/events/${eventId.value}`)
`83`	`83`	`}`
`84`	`84`	`</script>`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ const viewableUserDashboard = import.meta.env.VITE_VIEWABLE_USER_DASHBOARD === "`
`14`	`14`	`const ionRouter = useIonRouter();`
`15`	`15`	`function openUserDashboard() {`
`16`	`16`	`if(viewableUserDashboard) {`
`17`		- goBackOrNavigateTo(ionRouter, `/user/dashboard`, 0);
	`17`	+ goBackOrNavigateTo(ionRouter, `/user/dashboard`);
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`	`</script>`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ export default router`
`80`	`80`	`* (after some vue-router's back() magic: if you want further explanation on the why, look at useTabbedPageNav hook)`
`81`	`81`	`* - If this is not possible, then a navigation on fallback url will replace actual history state`
`82`	`82`	`*/`
`83`		`-export async function goBackOrNavigateTo(ionRouter: UseIonRouterResult, fallbackUrl: string, routerGoBacks: number, routeDirection: RouteDirection = 'back', onEventCaught: (() => Promise<void>)\|undefined = undefined) {`
	`83`	`+export async function goBackOrNavigateTo(ionRouter: UseIonRouterResult, fallbackUrl: string, routerGoBacks: number = 0, routeDirection: RouteDirection = 'back', onEventCaught: (() => Promise<void>)\|undefined = undefined) {`
`84`	`84`	`if(onEventCaught) {`
`85`	`85`	`await onEventCaught();`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ async function watchLaterAllFavoritedTalks() {`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`function backToSchedulePage() {`
`226`		- goBackOrNavigateTo(ionRouter, `/events/${eventIdRef.value.value}`, 0)
	`226`	+ goBackOrNavigateTo(ionRouter, `/events/${eventIdRef.value.value}`)
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`const dayIdRef = computed(() => labelledTimeslotWithOverlappingsRef.value?.dayId)`
`@@ -234,7 +234,7 @@ async function submitSkippedFeedback() {`
`234`	`234`	`timeslotId: labelledTimeslotWithOverlappingsRef.value!.labelledTimeslot.id.value,`
`235`	`235`	`alsoConcernsOverlappingTimeslotIds: labelledTimeslotWithOverlappingsRef.value!.overlappingLabelledTimeslots.map(ts => ts.id.value)`
`236`	`236`	`})`
`237`		- goBackOrNavigateTo(ionRouter, `/events/${eventIdRef.value.value}`, 0)
	`237`	+ goBackOrNavigateTo(ionRouter, `/events/${eventIdRef.value.value}`)
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`</script>`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ async function submitFeedback() {`
`183`	`183`
`184`	`184`	`const ionRouter = useIonRouter();`
`185`	`185`	`function backToSchedulePage() {`
`186`		- goBackOrNavigateTo(ionRouter, `/events/${eventIdRef.value.value}`, 0)
	`186`	+ goBackOrNavigateTo(ionRouter, `/events/${eventIdRef.value.value}`)
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`</script>`