fix logic

wavetermdev · Dec 20, 2024 · a9be94a · a9be94a
1 parent a8d30d1
commit a9be94a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 27 deletions.
diff --git a/emain/emain-window.ts b/emain/emain-window.ts
@@ -230,24 +230,25 @@ export class WaveBrowserWindow extends BaseWindow {
             fireAndForget(async () => {
                 const numWindows = waveWindowMap.size;
                 const fullConfig = await FileService.GetFullConfig();
-                if (
-                    fullConfig.settings["window:confirmonclose"] &&
-                    (numWindows > 1 || !fullConfig.settings["window:savelastwindowonclose"])
-                ) {
-                    console.log("numWindows > 1", numWindows);
-                    const workspace = await WorkspaceService.GetWorkspace(this.workspaceId);
-                    console.log("workspace", workspace);
-                    if (isNonEmptyUnsavedWorkspace(workspace)) {
-                        console.log("workspace has no name, icon, and multiple tabs", workspace);
-                        const choice = dialog.showMessageBoxSync(this, {
-                            type: "question",
-                            buttons: ["Cancel", "Close Window"],
-                            title: "Confirm",
-                            message: "Window has unsaved tabs, closing window will delete existing tabs.\n\nContinue?",
-                        });
-                        if (choice === 0) {
-                            console.log("user cancelled close window", this.waveWindowId);
-                            return;
+                if (numWindows > 1 || !fullConfig.settings["window:savelastwindowonclose"]) {
+                    console.log("numWindows > 1 or user does not want last window saved", numWindows);
+                    if (fullConfig.settings["window:confirmclose"]) {
+                        console.log("confirmclose", this.waveWindowId);
+                        const workspace = await WorkspaceService.GetWorkspace(this.workspaceId);
+                        console.log("workspace", workspace);
+                        if (isNonEmptyUnsavedWorkspace(workspace)) {
+                            console.log("workspace has no name, icon, and multiple tabs", workspace);
+                            const choice = dialog.showMessageBoxSync(this, {
+                                type: "question",
+                                buttons: ["Cancel", "Close Window"],
+                                title: "Confirm",
+                                message:
+                                    "Window has unsaved tabs, closing window will delete existing tabs.\n\nContinue?",
+                            });
+                            if (choice === 0) {
+                                console.log("user cancelled close window", this.waveWindowId);
+                                return;
+                            }
                         }
                     }
                     console.log("deleteAllowed = true", this.waveWindowId);
@@ -274,11 +275,6 @@ export class WaveBrowserWindow extends BaseWindow {
                 this.destroy();
                 return;
             }
-            const numWindows = waveWindowMap.size;
-            if (numWindows == 0) {
-                console.log("win no windows left", this.waveWindowId);
-                return;
-            }
             if (this.deleteAllowed) {
                 console.log("win removing window from backend DB", this.waveWindowId);
                 fireAndForget(() => WindowService.CloseWindow(this.waveWindowId, true));

diff --git a/frontend/types/gotypes.d.ts b/frontend/types/gotypes.d.ts
@@ -679,7 +679,7 @@ declare global {
         "window:magnifiedblocksize"?: number;
         "window:magnifiedblockblurprimarypx"?: number;
         "window:magnifiedblockblursecondarypx"?: number;
-        "window:confirmonclose"?: boolean;
+        "window:confirmclose"?: boolean;
         "window:savelastwindowonclose"?: boolean;
         "telemetry:*"?: boolean;
         "telemetry:enabled"?: boolean;

diff --git a/pkg/wconfig/defaultconfig/settings.json b/pkg/wconfig/defaultconfig/settings.json
@@ -18,7 +18,7 @@
     "window:magnifiedblocksize": 0.9,
     "window:magnifiedblockblurprimarypx": 10,
     "window:magnifiedblockblursecondarypx": 2,
-    "window:confirmonclose": true,
+    "window:confirmclose": true,
     "window:savelastwindowonclose": true,
     "telemetry:enabled": true,
     "term:copyonselect": true

diff --git a/pkg/wconfig/metaconsts.go b/pkg/wconfig/metaconsts.go
@@ -79,7 +79,7 @@ const (
 	ConfigKey_WindowMagnifiedBlockSize       = "window:magnifiedblocksize"
 	ConfigKey_WindowMagnifiedBlockBlurPrimaryPx = "window:magnifiedblockblurprimarypx"
 	ConfigKey_WindowMagnifiedBlockBlurSecondaryPx = "window:magnifiedblockblursecondarypx"
-	ConfigKey_WindowConfirmOnClose           = "window:confirmonclose"
+	ConfigKey_WindowConfirmClose             = "window:confirmclose"
 	ConfigKey_WindowSaveLastWindowOnClose    = "window:savelastwindowonclose"
 
 	ConfigKey_TelemetryClear                 = "telemetry:*"

diff --git a/pkg/wconfig/settingsconfig.go b/pkg/wconfig/settingsconfig.go
@@ -106,7 +106,7 @@ type SettingsType struct {
 	WindowMagnifiedBlockSize            *float64 `json:"window:magnifiedblocksize,omitempty"`
 	WindowMagnifiedBlockBlurPrimaryPx   *int64   `json:"window:magnifiedblockblurprimarypx,omitempty"`
 	WindowMagnifiedBlockBlurSecondaryPx *int64   `json:"window:magnifiedblockblursecondarypx,omitempty"`
-	WindowConfirmOnClose                bool     `json:"window:confirmonclose,omitempty"`
+	WindowConfirmClose                  bool     `json:"window:confirmclose,omitempty"`
 	WindowSaveLastWindowOnClose         bool     `json:"window:savelastwindowonclose,omitempty"`
 
 	TelemetryClear   bool `json:"telemetry:*,omitempty"`