ref: clean up query parameter setting

ReproNim · Nov 1, 2024 · 881459b · 881459b
1 parent a401e6b
commit 881459b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -284,8 +284,9 @@ export default {
     },
     setActivity(index) {
       if (!this.checkDisableBack && this.isProtocolUrl) { // check if disableBack not enabled
-        const query = this.$route.fullPath.replace(this.$route.path, '')
-        this.$router.push(`/activities/${index}` + query);
+        this.$router.push({
+          'path': `/activities/${index}`,
+          'query': this.$route.query});
       }
     },
     updateProgress(progress) {

diff --git a/src/components/Landing/Landing.vue b/src/components/Landing/Landing.vue
@@ -66,8 +66,10 @@ export default {
       // eslint-disable-next-line consistent-return
       const visibleAct = _.map(this.actVisibility, (ac, key) => (ac === true ? key : '')).filter(String);
       const nextIndex = visibleAct[visibleAct.indexOf(currentIndex) + 1];
-      const query = this.$route.fullPath.replace(this.$route.path, '')
-      this.$router.push(`/activities/${nextIndex}` + query);
+      this.$router.push({
+        'path': `/activities/${nextIndex}`,
+        'query': this.$route.query}
+      );
     },
   },
 };

diff --git a/src/components/StudyIntroduction/StudyIntroduction.vue b/src/components/StudyIntroduction/StudyIntroduction.vue
@@ -87,8 +87,9 @@ export default {
       if (this.step < this.totalSteps) {
         this.step += 1;
       } else if (this.step === this.totalSteps) {
-        const query = this.$route.fullPath.replace(this.$route.path, '')
-        this.$router.push(`/activities/0` + query);
+        this.$router.push({
+          'path': `/activities/0`,
+          'query': this.$route.query});
       }
     },
     learnMore() {

diff --git a/src/components/Survey/Survey.vue b/src/components/Survey/Survey.vue
@@ -439,8 +439,9 @@
         const currentIndex = parseInt(this.$store.state.activityIndex);
         const visibleAct = _.map(this.actVisibility, (ac, key) => (ac === true ? key : '')).filter(String);
         const nextIndex = visibleAct[visibleAct.indexOf(currentIndex) + 1];
-        const query = this.$route.fullPath.replace(this.$route.path, '')
-        this.$router.push(`/activities/${nextIndex}` + query);
+        this.$router.push({
+          'path': `/activities/${nextIndex}`,
+          'query': this.$route.query});
       },
       uploadZipData() {
         const Response = this.$store.state.exportResponses;