WIP: feat: crud workspaces #72
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,4 +4,5 @@ | |
| /.vscode-test/ | ||
| /.nyc_output/ | ||
| /coverage/ | ||
| *.vsix | ||
| yarn-error.log | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| import { Workspace, WorkspaceAgent } from "coder/site/src/api/typesGenerated" | ||
|
|
||
| export function extractAgentsAndFolderPath( | ||
| workspace: Workspace, | ||
| ): [agents: WorkspaceAgent[], folderPath: string | undefined] { | ||
| // TODO: multiple agent support | ||
| const agents = workspace.latest_build.resources.reduce((acc, resource) => { | ||
| return acc.concat(resource.agents || []) | ||
| }, [] as WorkspaceAgent[]) | ||
|
|
||
| let folderPath = undefined | ||
| if (agents.length === 1) { | ||
| folderPath = agents[0].expanded_directory | ||
| } | ||
| return [agents, folderPath] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,11 @@ | ||
| import axios from "axios" | ||
| import { getAuthenticatedUser, getWorkspaces, updateWorkspaceVersion } from "coder/site/src/api/api" | ||
| import { Workspace } from "coder/site/src/api/typesGenerated" | ||
| import * as vscode from "vscode" | ||
| import { extractAgentsAndFolderPath } from "./api-helper" | ||
| import { Remote } from "./remote" | ||
| import { Storage } from "./storage" | ||
| import { WorkspaceTreeItem } from "./workspacesProvider" | ||
|
|
||
| export class Commands { | ||
| public constructor(private readonly vscodeProposed: typeof vscode, private readonly storage: Storage) {} | ||
|
|
@@ -79,6 +81,9 @@ export class Commands { | |
| throw new Error("Failed to get authenticated user") | ||
| } | ||
| await vscode.commands.executeCommand("setContext", "coder.authenticated", true) | ||
| if (user.roles.find((role) => role.name === "owner")) { | ||
| await vscode.commands.executeCommand("setContext", "coder.isOwner", true) | ||
| } | ||
|
Comment on lines
+84
to
+86
There was a problem hiding this comment. Why do we need to check for the owner role? We prefer to do capability checks. You can send a payload to {
"checks":{
"readAllUsers":{
"object":{
"resource_type":"user"
},
"action":"read"
},
},
}Is this just to see if we have arbitrary execution of all workspaces? There was a problem hiding this comment. I think this is ok for now, we but we might want to change this soon, especially with coder/coder#6875 There was a problem hiding this comment. We decided to only show the "all Workspaces" view for users who have the owner role. sure we can revisit this after the owner connections PR |
||
| vscode.window | ||
| .showInformationMessage( | ||
| `Welcome to Coder, ${user.username}!`, | ||
|
|
@@ -108,7 +113,37 @@ export class Commands { | |
| }) | ||
| } | ||
|
|
||
| public async createWorkspace(): Promise<void> { | ||
| const uri = this.storage.getURL() + "/templates" | ||
| await vscode.commands.executeCommand("vscode.open", uri) | ||
| } | ||
|
|
||
| public async navigateToWorkspace(workspace: WorkspaceTreeItem) { | ||
| if (workspace) { | ||
| const uri = this.storage.getURL() + `/@${workspace.workspaceOwner}/${workspace.workspaceName}` | ||
| await vscode.commands.executeCommand("vscode.open", uri) | ||
| } else if (this.storage.workspace) { | ||
| const uri = this.storage.getURL() + `/@${this.storage.workspace.owner_name}/${this.storage.workspace.name}` | ||
| await vscode.commands.executeCommand("vscode.open", uri) | ||
| } else { | ||
| vscode.window.showInformationMessage("No workspace found.") | ||
| } | ||
| } | ||
|
|
||
| public async navigateToWorkspaceSettings(workspace: WorkspaceTreeItem) { | ||
| if (workspace) { | ||
| const uri = this.storage.getURL() + `/@${workspace.workspaceOwner}/${workspace.workspaceName}/settings` | ||
| await vscode.commands.executeCommand("vscode.open", uri) | ||
| } else if (this.storage.workspace) { | ||
| const uri = | ||
| this.storage.getURL() + `/@${this.storage.workspace.owner_name}/${this.storage.workspace.name}/settings` | ||
| await vscode.commands.executeCommand("vscode.open", uri) | ||
| } else { | ||
| vscode.window.showInformationMessage("No workspace found.") | ||
| } | ||
| } | ||
|
|
||
| public async open(...args: unknown[]): Promise<void> { | ||
| let workspaceOwner: string | ||
| let workspaceName: string | ||
| let folderPath: string | undefined | ||
|
|
@@ -165,19 +200,19 @@ export class Commands { | |
| workspaceOwner = workspace.owner_name | ||
| workspaceName = workspace.name | ||
|
|
||
| const [, folderPathExtracted] = extractAgentsAndFolderPath(workspace) | ||
| folderPath = folderPathExtracted | ||
| } else if (args.length === 2) { | ||
| // opening a workspace from the sidebar | ||
| const workspaceTreeItem = args[0] as WorkspaceTreeItem | ||
| workspaceOwner = workspaceTreeItem.workspaceOwner | ||
| workspaceName = workspaceTreeItem.workspaceName | ||
| folderPath = workspaceTreeItem.workspaceFolderPath | ||
| } else { | ||
| workspaceOwner = args[0] as string | ||
| workspaceName = args[1] as string | ||
| // workspaceAgent is reserved for args[2], but multiple agents aren't supported yet. | ||
| folderPath = args[3] as string | undefined | ||
| } | ||
|
|
||
| // A workspace can have multiple agents, but that's handled | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| import { getWorkspaces } from "coder/site/src/api/api" | ||
| import * as path from "path" | ||
| import * as vscode from "vscode" | ||
| import { extractAgentsAndFolderPath } from "./api-helper" | ||
|
|
||
| export enum WorkspaceQuery { | ||
| Mine = "owner:me", | ||
| All = "", | ||
| } | ||
|
|
||
| export class WorkspaceProvider implements vscode.TreeDataProvider<WorkspaceTreeItem> { | ||
| constructor(private readonly getWorkspacesQuery: WorkspaceQuery) {} | ||
|
|
||
| private _onDidChangeTreeData: vscode.EventEmitter<WorkspaceTreeItem | undefined | null | void> = | ||
| new vscode.EventEmitter<WorkspaceTreeItem | undefined | null | void>() | ||
| readonly onDidChangeTreeData: vscode.Event<WorkspaceTreeItem | undefined | null | void> = | ||
| this._onDidChangeTreeData.event | ||
|
|
||
| refresh(): void { | ||
| this._onDidChangeTreeData.fire() | ||
| } | ||
|
|
||
| getTreeItem(element: WorkspaceTreeItem): vscode.TreeItem { | ||
| return element | ||
| } | ||
|
|
||
| getChildren(): Thenable<WorkspaceTreeItem[]> { | ||
| return getWorkspaces({ q: this.getWorkspacesQuery }).then((workspaces) => { | ||
| return workspaces.workspaces.map((workspace) => { | ||
| const status = | ||
| workspace.latest_build.status.substring(0, 1).toUpperCase() + workspace.latest_build.status.substring(1) | ||
|
|
||
| const label = | ||
| this.getWorkspacesQuery === WorkspaceQuery.All | ||
| ? `${workspace.owner_name} / ${workspace.name}` | ||
| : workspace.name | ||
| const detail = `Template: ${workspace.template_display_name || workspace.template_name} • Status: ${status}` | ||
| const [, folderPath] = extractAgentsAndFolderPath(workspace) | ||
| return new WorkspaceTreeItem(label, detail, workspace.owner_name, workspace.name, folderPath) | ||
| }) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| export class WorkspaceTreeItem extends vscode.TreeItem { | ||
| constructor( | ||
| public readonly label: string, | ||
| public readonly tooltip: string, | ||
| public readonly workspaceOwner: string, | ||
| public readonly workspaceName: string, | ||
| public readonly workspaceFolderPath: string | undefined, | ||
| ) { | ||
| super(label, vscode.TreeItemCollapsibleState.None) | ||
| } | ||
|
|
||
| iconPath = { | ||
| light: path.join(__filename, "..", "..", "media", "logo.svg"), | ||
| dark: path.join(__filename, "..", "..", "media", "logo.svg"), | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If there is more than 1 agent, does everything fail? Should we randomly choose one?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That is a good question. I am not changing the actual behavior, just extracted it to a new function. the current version also does this
agents[0]choice =/ . I am not sure what is the best way to handle multiple agents...