Make reload notification a modal again

code-asher · code-asher · commit 9e578ddb370d · 2024-10-14T14:17:31.000-08:00
After experimentation, I think this is better.  The idea with the
notification was that it would not be in the way, but I think this is
really something you need to be aware of and ideally you should
immediately reload.

Also, only show it once.
diff --git a/src/remote.ts b/src/remote.ts
@@ -373,7 +373,7 @@ export class Remote {
     }
 
     // Watch the workspace for changes.
-    const monitor = new WorkspaceMonitor(workspace, workspaceRestClient, this.storage)
+    const monitor = new WorkspaceMonitor(workspace, workspaceRestClient, this.storage, this.vscodeProposed)
     disposables.push(monitor)
     disposables.push(monitor.onChange.event((w) => (this.commands.workspace = w)))
 
diff --git a/src/workspaceMonitor.ts b/src/workspaceMonitor.ts
@@ -23,17 +23,20 @@ export class WorkspaceMonitor implements vscode.Disposable {
   private notifiedAutostop = false
   private notifiedDeletion = false
   private notifiedOutdated = false
+  private notifiedNotRunning = false
 
   readonly onChange = new vscode.EventEmitter<Workspace>()
   private readonly statusBarItem: vscode.StatusBarItem
 
   // For logging.
-  private readonly name: String
+  private readonly name: string
 
   constructor(
     workspace: Workspace,
     private readonly restClient: Api,
     private readonly storage: Storage,
+    // We use the proposed API to get access to useCustom in dialogs.
+    private readonly vscodeProposed: typeof vscode,
   ) {
     this.name = `${workspace.owner_name}/${workspace.name}`
     const url = this.restClient.getAxiosInstance().defaults.baseURL
@@ -129,19 +132,24 @@ export class WorkspaceMonitor implements vscode.Disposable {
   }
 
   private maybeNotifyNotRunning(workspace: Workspace) {
-    if (workspace.latest_build.status !== "running") {
-      vscode.window.showInformationMessage(
-        "Your workspace is no longer running!",
-        {
-          detail: "Reloading the window to reconnect.",
-        },
-        "Reload Window",
-      ).then((action) => {
-        if (!action) {
-          return
-        }
-        vscode.commands.executeCommand("workbench.action.reloadWindow")
-      })
+    if (!this.notifiedNotRunning && workspace.latest_build.status !== "running") {
+      this.notifiedNotRunning = true
+      this.vscodeProposed.window
+        .showInformationMessage(
+          `${this.name} is no longer running!`,
+          {
+            detail: `The workspace status is "${workspace.latest_build.status}". Reload the window to reconnect.`,
+            modal: true,
+            useCustom: true,
+          },
+          "Reload Window",
+        )
+        .then((action) => {
+          if (!action) {
+            return
+          }
+          vscode.commands.executeCommand("workbench.action.reloadWindow")
+        })
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ export class Remote {`
`373`	`373`	`}`
`374`	`374`
`375`	`375`	`// Watch the workspace for changes.`
`376`		`- const monitor = new WorkspaceMonitor(workspace, workspaceRestClient, this.storage)`
	`376`	`+ const monitor = new WorkspaceMonitor(workspace, workspaceRestClient, this.storage, this.vscodeProposed)`
`377`	`377`	`disposables.push(monitor)`
`378`	`378`	`disposables.push(monitor.onChange.event((w) => (this.commands.workspace = w)))`
`379`	`379`