Fix return to catalogue after activity

src/src/components/launchActivity.js

@@ -5,7 +5,7 @@ import describeUI from "./describeUI.vue";
 import { mapGetters } from "vuex";
 
 export default {
-  props: ["id"],
+  props: ["id", "setTimer"],
   components: {
     "describe-activity": describeActivity,
     "describe-ui": describeUI,

src/src/components/launchActivity.vue

@@ -2,7 +2,7 @@
   <div class="container-fluid">
 	<div class="row">
       <div class="col bg-secondary">
-	    <h3 class="text-white text-left" > Your hardware</h3>
+	    <h3 class="text-white text-left" > Your hardware </h3>
       </div>
     </div>
 	<div class="row">

src/src/store/getters.js

@@ -1,3 +1,5 @@
+import dayjs from "dayjs";
+
 export const bearer = (state) => state.bearer;
 
 export const bookingToken = (state) => state.bookingToken;
@@ -43,13 +45,21 @@ export const getBookingByID = (state, id) => {
 
 export const getFinishedByID = (state, id) => {
   return (id) => {
-    var results = state.finishedBookings.filter((obj) => {
-      return obj.id === id;
-    });
-    if (results.length < 1) {
-      return false;
-    } else {
-      return true;
+    try {
+      return state.finishedBookings[id].exp <= dayjs().unix();
+    } catch (e) {
+      console.log("error checking if finished", id, e);
+      return false; // avoid prematurely clearing new bookings
+    }
+  };
+};
+export const getTimeLeftByID = (state, id) => {
+  return (id) => {
+    try {
+      return state.finishedBookings[id].exp - dayjs().unix();
+    } catch (e) {
+      console.log("error checking if finished", id, e);
+      return -1;
     }
   };
 };

src/src/store/index.js

@@ -20,7 +20,7 @@ const state = {
   poolDescriptions: {},
   poolStatus: {},
   activityBookings: [],
-  finishedBookings: [],
+  finishedBookings: {},
   requestsMade: 0,
   finishedCount: 0,
   lastPoolRefresh: 0,

src/src/store/mutations.js

@@ -83,21 +83,24 @@ export const setPoolStatus = (state, status) => {
   state.poolStatus[status.id] = status;
 };
 
-export const addActivityBooking = (state, booking) => {
+/*export const addActivityBooking = (state, booking) => {
   state.activityBookings.push(booking);
-};
+};*/
 
 export const replaceBookings = (state, bookings) => {
   var tempBookings = [];
   var tempIDs = [];
   var i;
   for (i = 0; i < bookings.length; i++) {
+    var id = bookings[i].description.id;
     tempBookings.push({
-      id: bookings[i].description.id,
+      id: id,
       status: bookings[i],
       ok: true,
     });
-    tempIDs.push(bookings[i].description.id);
+    tempIDs.push(id);
+
+    state.finishedBookings[id] = bookings[i];
   }
 
   state.activityBookings = tempBookings;

src/src/views/Activity.js

@@ -6,34 +6,43 @@ export default {
   components: {
     "launch-activity": launchActivity,
   },
+  data() {
+    return {
+      timerSet: false,
+    };
+  },
   computed: {
     id: function () {
       return this.$route.params.id;
     },
-    finished: function () {
+    setTimer: function () {
       var id = this.id;
       if (!id) {
         return false;
       }
 
-      var isFinished = this.getFinishedByID(id);
+      var timeLeft = this.getTimeLeftByID(id);
 
-      if (isFinished) {
-        this.$router.back();
+      if (timeLeft > 0 && !this.timerSet) {
+        console.log("setting Timer for ", timeLeft);
+        setTimeout(this.goBack, timeLeft * 1000);
+        this.timerSet = true;
+        return true;
       }
-      return isFinished;
+
+      return this.timerSet;
+    },
+    ...mapGetters(["getTimeLeftByID"]),
+  },
+  methods: {
+    goBack() {
+      console.log("going back");
+      this.$router.back();
     },
-    ...mapGetters(["getFinishedByID"]),
   },
   watch: {
     $route(to, from) {
       console.log("Activity:", to, from);
     },
-    finished(now, before) {
-      console.log("watching finish, now=", now, "before=", before);
-      if (now) {
-        this.$router.back();
-      }
-    },
   },
 };

src/src/views/Activity.vue

@@ -1,7 +1,7 @@
 <template>
    <div class="container-fluid">
 	 <div class="row">
-<launch-activity :id="id"
+<launch-activity :id="id" :setTimer="setTimer"
   ></launch-activity>
   </div>
   </div>