Make workspaces refresh load new workspaces

Currently the refresh button does exactly nothing. This will also let us load new workspaces in other cases, like when logging in or out.
coder · code-asher · Aug 18, 2023 · Aug 18, 2023 · Aug 18, 2023 · Aug 18, 2023
commit 78ff33c258d8e5350585342ba74f3836bd7dd825
diff --git a/src/extension.ts b/src/extension.ts
@@ -138,8 +138,8 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
     commands.navigateToWorkspaceSettings.bind(commands),
   )
   vscode.commands.registerCommand("coder.refreshWorkspaces", () => {
-    myWorkspacesProvider.refresh()
-    allWorkspacesProvider.refresh()
+    myWorkspacesProvider.fetchAndRefresh()
+    allWorkspacesProvider.fetchAndRefresh()
   })
 
   // Since the "onResolveRemoteAuthority:ssh-remote" activation event exists

diff --git a/src/workspacesProvider.ts b/src/workspacesProvider.ts
@@ -16,39 +16,35 @@ export class WorkspaceProvider implements vscode.TreeDataProvider<vscode.TreeIte
   private agentMetadata: Record<WorkspaceAgent["id"], AgentMetadataEvent[]> = {}
 
   constructor(private readonly getWorkspacesQuery: WorkspaceQuery, private readonly storage: Storage) {
-    if (!storage.getURL()) {
-      // Not logged in.
-      return
-    }
-    getWorkspaces({ q: this.getWorkspacesQuery })
-      .then((workspaces) => {
-        const workspacesTreeItem: WorkspaceTreeItem[] = []
-        workspaces.workspaces.forEach((workspace) => {
-          const showMetadata = this.getWorkspacesQuery === WorkspaceQuery.Mine
-          if (showMetadata) {
-            const agents = extractAgents(workspace)
-            agents.forEach((agent) => this.monitorMetadata(agent.id)) // monitor metadata for all agents
-          }
-          const treeItem = new WorkspaceTreeItem(
-            workspace,
-            this.getWorkspacesQuery === WorkspaceQuery.All,
-            showMetadata,
-          )
-          workspacesTreeItem.push(treeItem)
-        })
-        return workspacesTreeItem
-      })
-      .then((workspaces) => {
-        this.workspaces = workspaces
-        this.refresh()
+    this.fetchAndRefresh()
+  }
+
+  // fetchAndRefrehsh fetches new workspaces then re-renders the entire tree.
+  async fetchAndRefresh() {
+    const workspacesTreeItem: WorkspaceTreeItem[] = []
+    // If the URL is set then we are logged in.
+    if (this.storage.getURL()) {
+      const resp = await getWorkspaces({ q: this.getWorkspacesQuery })
+      resp.workspaces.forEach((workspace) => {
+        const showMetadata = this.getWorkspacesQuery === WorkspaceQuery.Mine
+        if (showMetadata) {
+          const agents = extractAgents(workspace)
+          agents.forEach((agent) => this.monitorMetadata(agent.id)) // monitor metadata for all agents
+        }
+        const treeItem = new WorkspaceTreeItem(workspace, this.getWorkspacesQuery === WorkspaceQuery.All, showMetadata)
+        workspacesTreeItem.push(treeItem)
       })
+    }
+    this.workspaces = workspacesTreeItem
+    this.refresh()
   }
 
   private _onDidChangeTreeData: vscode.EventEmitter<vscode.TreeItem | undefined | null | void> =
     new vscode.EventEmitter<vscode.TreeItem | undefined | null | void>()
   readonly onDidChangeTreeData: vscode.Event<vscode.TreeItem | undefined | null | void> =
     this._onDidChangeTreeData.event
 
+  // refresh causes the tree to re-render.  It does not fetch fresh workspaces.
   refresh(item: vscode.TreeItem | undefined | null | void): void {
     this._onDidChangeTreeData.fire(item)
   }