change router handling for redirect to same page, keeping query param…

…eters when changing location, fix expiry time evaluation, ui version in result reporting
ReproNim · Nov 1, 2024 · a401e6b · a401e6b
1 parent bbd24f4
commit a401e6b
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 43 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -7,7 +7,7 @@
       <div id="timer" class="timer" v-if="showTimer">
         <!--  Timer Component  -->
         <Timer
-            starttime="Dec 23, 2020 02:37:25"
+            starttime="Oct 31, 2024 21:00:00"
             :endtime=expiryTime
             trans='{
             "day":"Day",
@@ -127,7 +127,6 @@ import Vue from 'vue';
 import BootstrapVue from 'bootstrap-vue';
 import axios from 'axios';
 import Bowser from "bowser";
-import moment from 'moment';
 import _ from 'lodash';
 import JSZip from 'jszip';
 import { v4 as uuidv4 } from 'uuid';
@@ -285,11 +284,8 @@ export default {
     },
     setActivity(index) {
       if (!this.checkDisableBack && this.isProtocolUrl) { // check if disableBack not enabled
-        if (this.$route.query.url) {
-          this.$router.push(`/activities/${index}?url=${this.$route.query.url}`);
-        } else {
-          this.$router.push(`/activities/${index}`);
-        }
+        const query = this.$route.fullPath.replace(this.$route.path, '')
+        this.$router.push(`/activities/${index}` + query);
       }
     },
     updateProgress(progress) {
@@ -652,10 +648,14 @@ export default {
         return path;
       },
       expiryTime() {
-        let endDate = moment(this.$store.getters.getExpiryTime)['_i'];
-        endDate = endDate.replace(' ', '+');
-        // console.log(537, endDate, new Date(endDate).toString(), new Date(endDate).getTime());
-        return new Date(endDate).getTime();
+        const timestamp = this.$store.getters.getExpiryTime;
+        const formattedTime = timestamp.replace(
+            /(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})Z/,
+            '$1-$2-$3T$4:$5:$6Z'
+        );
+        const time = Date.parse(formattedTime);
+        console.log(537, timestamp, formattedTime, time);
+        return time;
       },
       showTimer() {
           return !!this.$store.getters.getExpiryTime;

diff --git a/src/components/Landing/Landing.vue b/src/components/Landing/Landing.vue
@@ -66,11 +66,8 @@ 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];
-      if (this.$route.query.url) {
-        this.$router.push(`/activities/${nextIndex}?url=${this.$route.query.url}`);
-      } else {
-        this.$router.push(`/activities/${nextIndex}`);
-      }
+      const query = this.$route.fullPath.replace(this.$route.path, '')
+      this.$router.push(`/activities/${nextIndex}` + query);
     },
   },
 };

diff --git a/src/components/Section/Section.vue b/src/components/Section/Section.vue
@@ -312,7 +312,7 @@ export default {
         startedAtTime: this.t0,
         endedAtTime: t1,
         wasAssociatedWith: {
-          version: '0.0.1',
+          version: '1.0.0',
           url: uiUrl,
           '@id': 'https://github.com/ReproNim/reproschema-ui',
         },

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

diff --git a/src/components/Survey/Survey.vue b/src/components/Survey/Survey.vue
@@ -270,7 +270,7 @@
           startedAtTime: this.t0,
           endedAtTime: t1,
           wasAssociatedWith: {
-            version: '0.0.1',
+            version: '1.0.0',
             url: uiUrl,
             '@id': 'https://github.com/ReproNim/reproschema-ui',
           },
@@ -439,11 +439,8 @@
         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];
-        if (this.$route.query.url) {
-          this.$router.push(`/activities/${nextIndex}?url=${this.$route.query.url}`);
-        } else {
-          this.$router.push(`/activities/${nextIndex}`);
-        }
+        const query = this.$route.fullPath.replace(this.$route.path, '')
+        this.$router.push(`/activities/${nextIndex}` + query);
       },
       uploadZipData() {
         const Response = this.$store.state.exportResponses;
@@ -460,6 +457,7 @@
         const expiryMinutes = this.$store.state.expiryMinutes;
         const jszip = new JSZip();
         const fileName = `${uuidv4()}-${this.participantId}-activity${currentIndex}`;
+        const activityData = [];
         _.map(data.response[currentIndex], (itemObj) => {
           const newObj = { ...itemObj };
           if (itemObj['@type'] === 'reproschema:Response') {
@@ -470,10 +468,11 @@
               newObj.value = `${keyStrings[keyStrings.length-1]}-${rId}.wav`;
             }
           }
+          activityData.push(newObj);
         });
         // write out the activity files
         jszip.folder(fileName).file(`activity_${currentIndex}.jsonld`,
-                JSON.stringify(data.response[currentIndex], null, 4));
+                JSON.stringify(activityData, null, 4));
         jszip.generateAsync({ type: 'blob' })
           .then((myzipfile) => {
             // console.log(492, 'generate async ');

diff --git a/src/router/index.js b/src/router/index.js
@@ -5,8 +5,17 @@ import Landing from '@/components/Landing/';
 import StudyIntroduction from '@/components/StudyIntroduction/';
 import config from '../config';
 
+const originalPush = Router.prototype.push
+Router.prototype.push = function push(location) {
+  return originalPush.call(this, location).catch(err => {
+    if (err.name !== 'NavigationDuplicated') {
+      throw err
+    }
+  })
+}
 Vue.use(Router);
 
+
 const router = new Router({
   routes: [
     {
@@ -30,22 +39,4 @@ const router = new Router({
   ],
 });
 
-router.beforeEach((to, from, next) => {
-
-  if ((from.query.auth_token && !to.query.auth_token) 
-      || (from.query.uid && !to.query.uid)){
-    if (from.path === to.path) {
-      next(false);
-    } else {
-      next({
-        path: to.path,
-        query: from.query,
-      });
-    }
-  } else {
-    next();
-  }
-
-})
-
 export default router