Merge remote-tracking branch 'refs/remotes/origin/ok/integration' int…

…o ok/integration
testfiesta · May 13, 2024 · 9126ff7 · 9126ff7
2 parents 0acda4d + 3464c1d
commit 9126ff7
Show file tree

Hide file tree

Showing 26 changed files with 2,067 additions and 248 deletions.
diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
     "d3": "^5.14.2",
     "dayjs": "^1.11.5",
     "detect-file-type": "^0.2.8",
+    "dom-to-image-more": "^3.3.0",
     "extract-zip": "^2.0.1",
     "ffmpeg-static": "^5.1.0",
     "ffprobe-static": "^3.1.0",

diff --git a/src/components/ControlPanel.vue b/src/components/ControlPanel.vue
@@ -774,6 +774,7 @@
       v-if="evidenceData"
       v-model="addEvidenceDialog"
       :item-data="evidenceData"
+      :selectedNodes="selectedNodes"
       @close="
         addEvidenceDialog = false;
         evidenceData = null;
@@ -926,6 +927,8 @@ export default {
   computed: {
     ...mapGetters({
       items: "sessionItems",
+      nodes: "sessionNodes",
+      connections: "sessionConnections",
       hotkeys: "config/hotkeys",
       postSessionData: "config/postSessionData",
       config: "config/fullConfig",
@@ -1042,6 +1045,7 @@ export default {
       started: "",
       ended: "",
       selected: [],
+      selectedNodes: [],
       callback: null,
       evidenceExportDestinationMenu: false,
       issueCreateDestinationMenu: false,
@@ -1057,6 +1061,7 @@ export default {
       this.$electronService.onResetSession(this.showResetConfirmDialog);
     }
 
+    this.$root.$on("update-selected-nodes", this.updateSelectedNodes);
     this.$root.$on("close-sourcepickerdialog", this.hideSourcePickerDialog);
     this.$root.$on("close-sharesessiondialog", this.hideShareSessionDialog);
     this.$root.$on("close-notedialog", this.hideNoteDialog);
@@ -1198,6 +1203,9 @@ export default {
     hideNoteDialog() {
       this.noteDialog = false;
     },
+    updateSelectedNodes(value) {
+      this.selectedNodes = value;
+    },
     handleDeleteConfirmDialog() {
       this.deleteConfirmDialog = true;
       setTimeout(() => {
@@ -1418,7 +1426,6 @@ export default {
           video.remove();
           const imgURI = canvas.toDataURL("image/png");
           stream.getTracks().forEach((track) => track.stop());
-
           if (this.$isElectron) {
             // todo add web implementation
             const { status, message, item } =
@@ -1753,8 +1760,54 @@ export default {
         timer_mark: this.timer,
         createdAt: Date.now(),
       };
-      this.$emit("add-item", newItem);
+      const updatedItems = [...this.items];
+      let updatedNodes = [];
+      let updatedConnections = [...this.connections];
+
+      if (this.nodes.length == 0) {
+        newItem.fx = Math.floor(Math.random() * 1001) - 500;
+        newItem.fy = Math.floor(Math.random() * 1001) - 500;
+      } else {
+        let random_offset_x, random_offset_y;
+        do {
+          random_offset_x = Math.floor(Math.random() * 800) - 400;
+          random_offset_y = Math.floor(Math.random() * 800) - 400;
+        } while (
+          (random_offset_x >= -200 && random_offset_x <= -100) ||
+          (random_offset_x >= 100 && random_offset_x <= 200)
+        );
+        newItem.fx = this.nodes[this.nodes.length - 1].fx + random_offset_x;
+        newItem.fy = this.nodes[this.nodes.length - 1].fy + random_offset_y;
+      }
+      updatedItems.push(newItem);
+      updatedItems.forEach((item) => {
+        item.id = item.stepID;
+        updatedNodes.push({ ...item, content: item.comment.text });
+      });
+
+      if (this.nodes.length > 0) {
+        if (this.selectedNodes.length) {
+          this.selectedNodes.forEach((node) => {
+            updatedConnections.push({
+              source: node.stepID,
+              target: newItem.stepID,
+            });
+          });
+        } else {
+          updatedConnections.push({
+            source: this.nodes[this.nodes.length - 1].stepID,
+            target: newItem.stepID,
+          });
+        }
+      }
+      console.log(updatedItems);
+      await this.$store.commit("setSessionItems", [...updatedItems]);
+      await this.$store.commit("setSessionNodes", [...updatedNodes]);
+      await this.$store.commit("setSessionConnections", [
+        ...updatedConnections,
+      ]);
       this.noteDialog = false;
+      this.$root.$emit("render-mindmap");
     },
     async addSummary(value) {
       // TODO - handle summary like a regular note and allow additional metadata