only one tree explorer window is opened from computation window (issue …

…#13)
sybila · Oct 28, 2023 · 9297bdd · 9297bdd
1 parent 2420293
commit 9297bdd
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 3 deletions.
diff --git a/fe/script/Computation.js b/fe/script/Computation.js
@@ -1,8 +1,9 @@
 let Computation = {
-    _windowSessionKey: undefined,
+    _windowSessionKey: undefined, // window session key is computation window label
     _lastComputation: undefined,
     _modelTitle: undefined,
     _windowTimestamp: undefined,
+    _treeExplorerWindowLabel: undefined,
 
     setWindowSessionKey(windowSessionKey) {
         this._windowSessionKey = windowSessionKey
@@ -43,6 +44,14 @@ let Computation = {
         return this._lastComputation !== undefined;
     },
 
+    getTreeExplorerWindowLabel() {
+        return this._treeExplorerWindowLabel
+    },
+
+    setTreeExplorerWindowLabel(label) {
+        this._treeExplorerWindowLabel = label
+    },
+
     update_computation_process() {
         ComputationEndpoints.update_computation_process()
             .then((computationInfoObject) => {

diff --git a/fe/script/Windows.js b/fe/script/Windows.js
@@ -161,7 +161,17 @@ let Windows = {
 
 
     openTreeExplorerWindow() {
-        let treeWindowLabel = "tree-window:" + Date.now()
+        let treeWindowLabel = Computation.getTreeExplorerWindowLabel()
+
+        // If the window is already opened, just focus on it
+        if (treeWindowLabel !== undefined) {
+            const treeWindow = TAURI.window.WebviewWindow.getByLabel(treeWindowLabel)
+            treeWindow.setFocus()
+            return
+        }
+
+        treeWindowLabel = "tree-window:" + Date.now()
+        Computation.setTreeExplorerWindowLabel(treeWindowLabel)
         let windowTitle = Computation.getModelTitle() + ", started: " + new Date(Computation.getWindowTimestamp()).toLocaleTimeString('en-GB')
 
         WindowsEndpoints.openTreeExplorerWindow(treeWindowLabel, windowTitle)

diff --git a/fe/script/events/ComputationWindowEvent.js b/fe/script/events/ComputationWindowEvent.js
@@ -46,3 +46,8 @@ TAURI.window.getCurrent().listen("tauri://close-requested", async () => {
             Dialog.errorMessage(errorMessage)
         })
 })
+
+// Listen for event when tree explorer window is closed
+TAURI.event.listen('tree-explorer-window-closed', () => {
+    Computation.setTreeExplorerWindowLabel(undefined)
+});
diff --git a/fe/script/events/TreeExplorerWindowEvent.js b/fe/script/events/TreeExplorerWindowEvent.js
@@ -7,4 +7,11 @@ TAURI.event.listen('send-window-session-key', (event) => {
     console.log("got event")
     // Initialize the window
     showTree()
-});
+});
+
+// Send message to computation window before closing this tree explorer window
+TAURI.window.getCurrent().listen("tauri://close-requested", () => {
+    const computationWindow = TAURI.window.WebviewWindow.getByLabel(Computation.getWindowSessionKey())
+    computationWindow.emit('tree-explorer-window-closed', {})
+    TAURI.window.getCurrent().close()
+})