Merge pull request #70 from dacoaster/da/session_restore

Da/session restore

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yattie",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "engines": {
     "npm": ">=8.0.0 <9.0.0",
     "node": ">=16.0.0 <17.0.0"

src/App.vue

@@ -7,16 +7,44 @@
 </template>
 
 <script>
+import { IPC_HANDLERS, IPC_FUNCTIONS } from "./modules/constants";
+
 const default_layout = "default";
 
 export default {
   name: "App",
-
   computed: {
     layout() {
       return (this.$route.meta.layout || default_layout) + "-layout";
     },
   },
+  beforeCreate() {
+    // Only restore state for the primary window that opens at HomeView
+    if (this.$router.history.current.path === "/") {
+      window.ipc
+        .invoke(IPC_HANDLERS.DATABASE, {
+          func: IPC_FUNCTIONS.GET_STATE,
+        })
+        .then((state) => {
+          if (Object.keys(state).length > 0) {
+            this.$store.commit("restoreState", state);
+            const currentPath = this.$router.history.current.path;
+            if (state.path && currentPath !== state.path) {
+              if (state.path.includes("result")) {
+                window.ipc.invoke(IPC_HANDLERS.WINDOW, {
+                  func: IPC_FUNCTIONS.SET_WINDOW_SIZE,
+                  data: {
+                    width: 1440,
+                    height: 900,
+                  },
+                });
+              }
+              this.$router.push({ path: state.path });
+            }
+          }
+        });
+    }
+  },
 };
 </script>
 <style scoped>

src/components/AudioWrapper.vue

@@ -221,7 +221,7 @@ export default {
         data: { url: uri, isPoster: true },
       });
       if (posterResult.status === STATUSES.ERROR) {
-        // TODO - Bubble to snackbar
+        this.$root.$emit("set-snackbar", posterResult.message);
         console.log(
           "Unable to generate waveform image: " + posterResult.message
         );
@@ -233,7 +233,7 @@ export default {
       });
 
       if (audioResult.status === STATUSES.ERROR) {
-        // TODO - Bubble to snackbar
+        this.$root.$emit("set-snackbar", audioResult.message);
         console.log("Unable to update audio file: " + audioResult.message);
       }
       this.sessionItem = {
@@ -242,7 +242,7 @@ export default {
         ...audioResult.item,
       };
       this.$root.$emit("update-session", this.sessionItem);
-      this.$root.$emit("save-data"); // CTODO remove data on all of these
+      this.$root.$emit("save-data", this.sessionItem);
     },
   },
 };

src/components/ControlPanel.vue

@@ -1077,7 +1077,7 @@ export default {
         duration: this.duration,
       });
     },
-    startSession(id) {
+    async startSession(id) {
       this.sourceId = id;
       this.sourcePickerDialog = false;
 
@@ -1099,6 +1099,30 @@ export default {
         this.changeSessionStatus(SESSION_STATUSES.START);
       }
 
+      const sessionId = await window.ipc.invoke(IPC_HANDLERS.DATABASE, {
+        func: IPC_FUNCTIONS.GET_SESSION_ID,
+      });
+
+      if (sessionId === "") {
+        const data = {
+          title: this.$store.state.title,
+          charter: this.$store.state.charter,
+          precondition: this.$store.state.precondition,
+          duration: this.$store.state.duration,
+          status: this.$store.state.status,
+          timer: this.$store.state.timer,
+          started: this.$store.state.started,
+          ended: this.$store.state.ended,
+          quickTest: this.$store.state.quickTest,
+          path: this.$route.path,
+        };
+
+        window.ipc.invoke(IPC_HANDLERS.FILE_SYSTEM, {
+          func: IPC_FUNCTIONS.CREATE_NEW_SESSION,
+          data: data,
+        });
+      }
+
       if (this.viewMode === "normal") {
         const currentPath = this.$router.history.current.path;
         if (currentPath !== "/main/workspace") {
@@ -1261,7 +1285,7 @@ export default {
           );
 
           if (status === STATUSES.ERROR) {
-            // CTODO - bubble up to snackbar
+            this.$root.$emit("set-snackbar", message);
             console.log(message);
           } else {
             const data = {
@@ -1340,7 +1364,7 @@ export default {
             );
 
             if (status === STATUSES.ERROR) {
-              // CTODO - bubble up to snackbar
+              this.$root.$emit("set-snackbar", message);
               console.log("Unable to generate poster for video: " + message);
             }
             poster = item.filePath;
@@ -1366,7 +1390,7 @@ export default {
           );
 
           if (status === STATUSES.ERROR) {
-            // CTODO - bubble up to snackbar
+            this.$root.$emit("set-snackbar", message);
             console.log(message);
           } else {
             const { id, fileName, filePath } = item;
@@ -1497,7 +1521,7 @@ export default {
           );
 
           if (status === STATUSES.ERROR) {
-            // CTODO - bubble up to snackbar
+            this.$root.$emit("set-snackbar", message);
             console.log(message);
           } else {
             const data = {
@@ -1570,7 +1594,7 @@ export default {
       );
 
       if (status === STATUSES.ERROR) {
-        // CTODO - bubble up to snackbar
+        this.$root.$emit("set-snackbar", message);
         console.log(message);
       } else {
         let newItem = {
@@ -1673,9 +1697,15 @@ export default {
     },
     async saveSession(callback = null) {
       this.newSessionDialog = false;
+      const sessionId = await window.ipc.invoke(IPC_HANDLERS.DATABASE, {
+        func: IPC_FUNCTIONS.GET_SESSION_ID,
+      });
+
       const data = {
+        id: sessionId,
         title: this.$store.state.title,
         charter: this.$store.state.charter,
+        mindmap: this.$store.state.mindmap,
         precondition: this.$store.state.precondition,
         duration: this.$store.state.duration,
         status: this.$store.state.status,
@@ -1721,27 +1751,45 @@ export default {
       this.audioErrorDialog = false;
       this.endSessionDialog = false;
 
+      if (!window.ipc) return;
+
+      const data = {
+        title: this.$store.state.title,
+        charter: this.$store.state.charter,
+        precondition: this.$store.state.precondition,
+        duration: this.$store.state.duration,
+        status: this.$store.state.status,
+        timer: this.$store.state.timer,
+        started: this.$store.state.started,
+        ended: this.$store.state.ended,
+        quickTest: this.$store.state.quickTest,
+        path: this.$route.path,
+      };
+
+      await window.ipc.invoke(IPC_HANDLERS.FILE_SYSTEM, {
+        func: IPC_FUNCTIONS.CREATE_NEW_SESSION,
+        data: data,
+      });
+
       this.$store.commit("clearState");
 
-      if (!window.ipc) return;
-      await window.ipc
-        .invoke(IPC_HANDLERS.DATABASE, {
-          func: IPC_FUNCTIONS.RESET_DATA,
-        })
-        .then(() => {
-          window.ipc.invoke(IPC_HANDLERS.WINDOW, {
-            func: IPC_FUNCTIONS.SET_WINDOW_SIZE,
-            data: {
-              width: 800,
-              height: 600,
-            },
-          });
-          this.stopInterval();
-          const currentPath = this.$router.history.current.path;
-          if (currentPath !== "/main") {
-            this.$router.push({ path: "/main" });
-          }
-        });
+      await window.ipc.invoke(IPC_HANDLERS.DATABASE, {
+        func: IPC_FUNCTIONS.RESET_DATA,
+      });
+
+      window.ipc.invoke(IPC_HANDLERS.WINDOW, {
+        func: IPC_FUNCTIONS.SET_WINDOW_SIZE,
+        data: {
+          width: 800,
+          height: 600,
+        },
+      });
+
+      this.stopInterval();
+      const currentPath = this.$router.history.current.path;
+      if (currentPath !== "/main") {
+        this.$router.push({ path: "/main" });
+      }
     },
     async resetSession() {
       if (this.resetConfirmDialog) {

src/components/ImageEditor.vue

@@ -152,7 +152,7 @@ export default {
       );
 
       if (status === STATUSES.ERROR) {
-        // CTODO - bubble up to snackbar
+        this.$root.$emit("set-snackbar", message);
         console.log(message);
       } else {
         // Force the timeline component to update the image through a fake QS

src/components/ReviewWrapper.vue

@@ -118,7 +118,7 @@ export default {
         }
       );
       if (status === STATUSES.ERROR) {
-        // CTODO - bubble up to snackbar
+        this.$root.$emit("set-snackbar", message);
         console.log(message);
       } else {
         this.sessionItem.fileName = item.fileName;

src/components/TimelineWrapper.vue

@@ -1053,7 +1053,7 @@ export default {
       );
 
       if (status === STATUSES.ERROR) {
-        // CTODO - bubble up to snackbar
+        this.$root.$emit("set-snackbar", message);
         console.log(message);
       } else {
         const data = {
@@ -1168,7 +1168,7 @@ export default {
         );
 
         if (status === STATUSES.ERROR) {
-          // CTODO - bubble up to snackbar
+          this.$root.$emit("set-snackbar", message);
           console.log(message);
         } else {
           const data = {

src/components/VideoWrapper.vue

@@ -151,7 +151,7 @@ export default {
       );
 
       if (status === STATUSES.ERROR) {
-        // CTODO - bubble up to snackbar
+        this.$root.$emit("set-snackbar", message);
         console.log(message);
       } else {
         this.sessionItem.filePath = item.filePath;

src/components/dialogs/NewSessionDialog.vue

@@ -11,6 +11,7 @@
             small
             :color="currentTheme.primary"
             class="text-capitalize btn"
+            :style="{ color: currentTheme.white }"
             @click="$emit('save')"
           >
             {{ $tc("caption.save", 1) }}
@@ -19,6 +20,7 @@
             small
             :color="currentTheme.background"
             class="text-capitalize btn"
+            :style="{ color: currentTheme.secondary }"
             @click="$emit('discard')"
           >
             {{ $tc("caption.discard", 1) }}

src/components/settings/GeneralTab.vue

@@ -209,7 +209,7 @@ export default {
   name: "GeneralTab",
   components: {},
   props: {
-    metaData: {
+    metadata: {
       type: Object,
       default: () => {},
     },
@@ -219,7 +219,7 @@ export default {
     },
   },
   watch: {
-    metaData: function (newValue) {
+    metadata: function (newValue) {
       this.meta = newValue;
     },
     config: function (newValue) {
@@ -259,7 +259,7 @@ export default {
   },
   data() {
     return {
-      meta: this.metaData,
+      meta: this.metadata,
       setting: this.config,
       comment: {
         type: "Comment",

src/components/testrail/TestRailExportSession.vue

@@ -176,7 +176,7 @@
                         return-object
                       >
                       </v-select>
-                      <div v-for="(item, i) in itemLists" :key="i">
+                      <div v-for="(item, i) in selectedAttachments" :key="i">
                         <div
                           class="image-wrapper"
                           @click="handleItemClick(item.id)"
@@ -372,6 +372,20 @@ export default {
       }
       return temp;
     },
+    selectedAttachments() {
+      let selectedAttachments = [];
+      if (this.selectedIds.length > 0) {
+        this.itemLists.map((item) => {
+          if (
+            item.sessionType !== "Summary" &&
+            this.selectedIds.includes(item.id)
+          ) {
+            selectedAttachments.push(item);
+          }
+        });
+      }
+      return selectedAttachments;
+    },
   },
   mounted() {},
   methods: {
@@ -541,17 +555,9 @@ export default {
       };
       let resultId;
 
-      if (this.selectedIds.length === 0) {
-        this.itemLists.map((item) => {
-          if (item.sessionType !== "Summary") {
-            this.selectedIds.push(item.id);
-          }
-        });
-      }
-
       let attachmentComments = "";
       this.selectedIds.map(async (id, i) => {
-        const item = this.itemLists.find((item) => item.id === id);
+        const item = this.selectedAttachments.find((item) => item.id === id);
         attachmentComments += item.comment.type + ": " + item.comment.text;
         if (i !== this.selectedIds.length - 1) {
           attachmentComments += "\n";
@@ -594,8 +600,7 @@ export default {
         const formData = new FormData();
         this.projectLoading = true;
 
-        this.selectedIds.map(async (id, i) => {
-          const item = this.itemLists.find((item) => item.id === id);
+        this.selectedAttachments.map(async (item, i) => {
           const response = await fetch(`file:${item.filePath}`);
           const file = new File([await response.blob()], item.fileName);
           formData.append("attachment", file);