simplify worktreeprovider

rodrimaia · rodrimaia · commit f29dd179412e · 2023-03-28T11:17:09.000-03:00
diff --git a/package.json b/package.json
@@ -41,16 +41,22 @@
     "views": {
       "coder": [
         {
-          "id": "coderRemote",
-          "name": "Workspaces",
+          "id": "myWorkspaces",
+          "name": "My Workspaces",
+          "visibility": "visible",
+          "icon": "media/logo.svg"
+        },
+        {
+          "id": "allWorkspaces",
+          "name": "All Workspaces",
           "visibility": "visible",
           "icon": "media/logo.svg"
         }
       ]
     },
     "viewsWelcome": [
       {
-        "view": "coderRemote",
+        "view": "myWorkspaces",
         "contents": "Coder is a platform that provisions remote development environments. \n[Login](command:coder.login)",
         "when": "!coder.authenticated && coder.loaded"
       }
@@ -86,23 +92,19 @@
       "view/title": [
         {
           "command": "coder.logout",
-          "when": "coder.authenticated && view == coderRemote"
+          "when": "coder.authenticated && view == myWorkspaces"
         },
         {
           "command": "coder.createWorkspace",
-          "when": "coder.authenticated && view == coderRemote",
+          "when": "coder.authenticated && view == myWorkspaces",
           "group": "navigation"
         }
       ],
       "view/item/context": [
         {
           "command": "coder.open",
-          "when": "coder.authenticated && viewItem.label !== 'My Workspaces' && view == coderRemote",
+          "when": "coder.authenticated && view == myWorkspaces || coder.authenticated && view == allWorkspaces",
           "group": "inline"
-        },
-        {
-          "command": "coder.removeWorkspace",
-          "when": "coder.authenticated"
         }
       ]
     }
diff --git a/src/extension.ts b/src/extension.ts
@@ -13,8 +13,8 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
   const storage = new Storage(output, ctx.globalState, ctx.secrets, ctx.globalStorageUri, ctx.logUri)
   await storage.init()
 
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  vscode.window.registerTreeDataProvider("coderRemote", new WorkspaceProvider())
+  vscode.window.registerTreeDataProvider("myWorkspaces", new WorkspaceProvider("owner:me"))
+  vscode.window.registerTreeDataProvider("allWorkspaces", new WorkspaceProvider())
 
   getUser()
     .then(() => {
diff --git a/src/workspacesProvider.ts b/src/workspacesProvider.ts
@@ -3,37 +3,17 @@ import * as path from "path"
 import * as vscode from "vscode"
 
 export class WorkspaceProvider implements vscode.TreeDataProvider<TreeItem> {
+  constructor(private readonly getWorkspacesQuery?: string) {}
   getTreeItem(element: TreeItem): vscode.TreeItem {
     return element
   }
 
-  getChildren(element?: TreeItem): Thenable<TreeItem[]> {
-    if (!element) {
-      return Promise.resolve([
-        new TreeItem("My Workspaces", vscode.TreeItemCollapsibleState.Expanded),
-        new TreeItem("All Workspaces", vscode.TreeItemCollapsibleState.None),
-      ])
-    }
-    if (element.label === "My Workspaces") {
-      return getWorkspaces({
-        q: "owner:me",
-      }).then((workspaces) => {
-        return workspaces.workspaces.map(
-          (workspace) => new TreeItem(workspace.name, vscode.TreeItemCollapsibleState.None),
-        )
-      })
-    }
-    if (element.label === "All Workspaces") {
-      return getWorkspaces({
-        q: "owner:all",
-      }).then((workspaces) => {
-        const exampleWorkspaces = [{ name: "example1" }, { name: "example2" }]
-        return [...workspaces.workspaces, ...exampleWorkspaces].map(
-          (workspace) => new TreeItem(workspace.name, vscode.TreeItemCollapsibleState.None),
-        )
-      })
-    }
-    return Promise.resolve([])
+  getChildren(): Thenable<TreeItem[]> {
+    return getWorkspaces({ q: this.getWorkspacesQuery }).then((workspaces) => {
+      return workspaces.workspaces.map(
+        (workspace) => new TreeItem(workspace.name, vscode.TreeItemCollapsibleState.None),
+      )
+    })
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -41,16 +41,22 @@`
`41`	`41`	`"views": {`
`42`	`42`	`"coder": [`
`43`	`43`	`{`
`44`		`- "id": "coderRemote",`
`45`		`- "name": "Workspaces",`
	`44`	`+ "id": "myWorkspaces",`
	`45`	`+ "name": "My Workspaces",`
	`46`	`+ "visibility": "visible",`
	`47`	`+ "icon": "media/logo.svg"`
	`48`	`+ },`
	`49`	`+ {`
	`50`	`+ "id": "allWorkspaces",`
	`51`	`+ "name": "All Workspaces",`
`46`	`52`	`"visibility": "visible",`
`47`	`53`	`"icon": "media/logo.svg"`
`48`	`54`	`}`
`49`	`55`	`]`
`50`	`56`	`},`
`51`	`57`	`"viewsWelcome": [`
`52`	`58`	`{`
`53`		`- "view": "coderRemote",`
	`59`	`+ "view": "myWorkspaces",`
`54`	`60`	`"contents": "Coder is a platform that provisions remote development environments. \n[Login](command:coder.login)",`
`55`	`61`	`"when": "!coder.authenticated && coder.loaded"`
`56`	`62`	`}`
`@@ -86,23 +92,19 @@`
`86`	`92`	`"view/title": [`
`87`	`93`	`{`
`88`	`94`	`"command": "coder.logout",`
`89`		`- "when": "coder.authenticated && view == coderRemote"`
	`95`	`+ "when": "coder.authenticated && view == myWorkspaces"`
`90`	`96`	`},`
`91`	`97`	`{`
`92`	`98`	`"command": "coder.createWorkspace",`
`93`		`- "when": "coder.authenticated && view == coderRemote",`
	`99`	`+ "when": "coder.authenticated && view == myWorkspaces",`
`94`	`100`	`"group": "navigation"`
`95`	`101`	`}`
`96`	`102`	`],`
`97`	`103`	`"view/item/context": [`
`98`	`104`	`{`
`99`	`105`	`"command": "coder.open",`
`100`		`- "when": "coder.authenticated && viewItem.label !== 'My Workspaces' && view == coderRemote",`
	`106`	`+ "when": "coder.authenticated && view == myWorkspaces \|\| coder.authenticated && view == allWorkspaces",`
`101`	`107`	`"group": "inline"`
`102`		`- },`
`103`		`- {`
`104`		`- "command": "coder.removeWorkspace",`
`105`		`- "when": "coder.authenticated"`
`106`	`108`	`}`
`107`	`109`	`]`
`108`	`110`	`}`