fixup: clean everything up

Author: jsjoeio

package.json

@@ -45,7 +45,7 @@
     "views": {
       "coder": [
         {
-          "id": "nodeDependencies",
+          "id": "coderRemote",
           "name": "Workspaces",
           "icon": "media/logo.svg",
           "contextualTitle": "Coder Remote",
@@ -55,12 +55,12 @@
     },
     "viewsWelcome": [
       {
-        "view": "nodeDependencies",
+        "view": "coderRemote",
         "contents": "Coder is a platform that provisions remote development environments. \n[Login](command:coder.login)",
         "when": "!coder.authenticated && coder.loaded"
       },
       {
-        "view": "nodeDependencies",
+        "view": "coderRemote",
         "contents": "You're logged in! \n[Open Workspace](command:coder.open)",
         "when": "coder.authenticated && coder.loaded"
       }

src/commands.ts

@@ -2,7 +2,7 @@ import axios from "axios"
 import { getUser, getWorkspaces } from "coder/site/src/api/api"
 import { Workspace } from "coder/site/src/api/typesGenerated"
 import * as vscode from "vscode"
-import { OutlineProvider } from "./outline"
+import { OutlineProvider } from "./workspaces"
 import { Remote } from "./remote"
 import { Storage } from "./storage"
 
@@ -173,10 +173,6 @@ export class Commands {
       } else {
         selected = opened[0]
       }
-      // TODO figure out why we'e getting
-      //  Failed to parse remote port from server output
-      // [16:01:51.489] Resolver error: Error:
-      console.log("here are the values", remoteAuthority, selected.folderUri.path)
 
       await vscode.commands.executeCommand(
         "vscode.openFolder",

src/extension.ts

@@ -4,17 +4,17 @@ import { getUser } from "coder/site/src/api/api"
 import * as module from "module"
 import * as vscode from "vscode"
 import { Commands } from "./commands"
-import { OutlineProvider } from "./outline"
 import { Remote } from "./remote"
 import { Storage } from "./storage"
+import { WorkspacesProvider } from "./workspaces"
 
 export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
   const output = vscode.window.createOutputChannel("Coder")
-  const nodeDependenciesProvider = new OutlineProvider([], ctx)
+  const workspacesProvider = new WorkspacesProvider()
   const storage = new Storage(output, ctx.globalState, ctx.secrets, ctx.globalStorageUri, ctx.logUri)
   await storage.init()
 
-  vscode.window.registerTreeDataProvider("nodeDependencies", nodeDependenciesProvider)
+  vscode.window.registerTreeDataProvider("nodeDependencies", workspacesProvider)
 
   getUser()
     .then(() => {
@@ -54,7 +54,7 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
     },
   })
 
-  const commands = new Commands(storage, nodeDependenciesProvider)
+  const commands = new Commands(storage, workspacesProvider)
 
   vscode.commands.registerCommand("coder.login", commands.login.bind(commands))
   vscode.commands.registerCommand("coder.logout", commands.logout.bind(commands))

src/outline.ts src/workspaces.tssrc/outline.ts renamed to src/workspaces.ts

@@ -2,12 +2,14 @@ import { getWorkspaces } from "coder/site/src/api/api"
 import * as path from "path"
 import * as vscode from "vscode"
 
-export class OutlineProvider implements vscode.TreeDataProvider<any> {
+export class WorkspacesProvider implements vscode.TreeDataProvider<Workspace> {
   private _onDidChangeTreeData: vscode.EventEmitter<Workspace | undefined | void> = new vscode.EventEmitter<
     Workspace | undefined | void
   >()
   readonly onDidChangeTreeData: vscode.Event<Workspace | undefined | void> = this._onDidChangeTreeData.event
-  constructor(private outline: any, private context: vscode.ExtensionContext) {}
+  constructor() {
+    // intentional blank link for ESLint
+  }
 
   refresh(): void {
     this._onDidChangeTreeData.fire()
@@ -17,14 +19,11 @@ export class OutlineProvider implements vscode.TreeDataProvider<any> {
     return element
   }
 
-  async getChildren(element?: Workspace): Promise<Workspace[]> {
-    // TODO - make request to get requests
-    // then resolve with workspaces as children
-    // otherwise resolve with empty array
-    // TODO create dummy data and show those
+  async getChildren(): Promise<Workspace[]> {
     const workspaces = await getWorkspaces({
       q: "owner:me",
     }).catch(() => {
+      // TODO: we should probably warn or error here
       return
     })
 
@@ -44,18 +43,10 @@ export class OutlineProvider implements vscode.TreeDataProvider<any> {
 
       return Promise.resolve(items)
     } else {
+      // TODO: should we issue a warning new workspaces found?
+      // Or return a link to create a new Workspace from the dashboard?
       return Promise.resolve([])
     }
-
-    // TODO - if error, what do we do?
-
-    // TODO - if you login does it refresh the view?
-    // same thing with logout
-    // if (element) {
-    //   return Promise.resolve(element.children)
-    // } else {
-    //   return Promise.resolve(this.outline)
-    // }
   }
 }
 
@@ -71,7 +62,6 @@ export class Workspace extends vscode.TreeItem {
     this.tooltip = `${this.label}`
   }
 
-  //  this.iconId iconPath = this.iconId
   iconPath = {
     light: path.join(__filename, "..", "..", "media", "dependency.svg"),
     dark: path.join(__filename, "..", "..", "media", "dependency.svg"),