- Notifications
You must be signed in to change notification settings - Fork925
feat(site): open dev container in vscode#17182
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
3 changes: 2 additions & 1 deletionsite/src/modules/resources/AgentDevcontainerCard.stories.tsx
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
26 changes: 21 additions & 5 deletionssite/src/modules/resources/AgentDevcontainerCard.tsx
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
2 changes: 1 addition & 1 deletionsite/src/modules/resources/AgentRow.tsx
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
60 changes: 60 additions & 0 deletionssite/src/modules/resources/VSCodeDevContainerButton/VSCodeDevContainerButton.stories.tsx
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 type { Meta, StoryObj } from "@storybook/react"; | ||
| import { MockWorkspace, MockWorkspaceAgent } from "testHelpers/entities"; | ||
| import { VSCodeDevContainerButton } from "./VSCodeDevContainerButton"; | ||
| const meta: Meta<typeof VSCodeDevContainerButton> = { | ||
| title: "modules/resources/VSCodeDevContainerButton", | ||
| component: VSCodeDevContainerButton, | ||
| }; | ||
| export default meta; | ||
| type Story = StoryObj<typeof VSCodeDevContainerButton>; | ||
| export const Default: Story = { | ||
| args: { | ||
| userName: MockWorkspace.owner_name, | ||
| workspaceName: MockWorkspace.name, | ||
| agentName: MockWorkspaceAgent.name, | ||
| devContainerName: "musing_ride", | ||
| devContainerFolder: "/workspace/coder", | ||
| displayApps: [ | ||
| "vscode", | ||
| "vscode_insiders", | ||
| "port_forwarding_helper", | ||
| "ssh_helper", | ||
| "web_terminal", | ||
| ], | ||
| }, | ||
| }; | ||
| export const VSCodeOnly: Story = { | ||
| args: { | ||
| userName: MockWorkspace.owner_name, | ||
| workspaceName: MockWorkspace.name, | ||
| agentName: MockWorkspaceAgent.name, | ||
| devContainerName: "nifty_borg", | ||
| devContainerFolder: "/workspace/coder", | ||
| displayApps: [ | ||
| "vscode", | ||
| "port_forwarding_helper", | ||
| "ssh_helper", | ||
| "web_terminal", | ||
| ], | ||
| }, | ||
| }; | ||
| export const InsidersOnly: Story = { | ||
| args: { | ||
| userName: MockWorkspace.owner_name, | ||
| workspaceName: MockWorkspace.name, | ||
| agentName: MockWorkspaceAgent.name, | ||
| devContainerName: "amazing_swartz", | ||
| devContainerFolder: "/workspace/coder", | ||
| displayApps: [ | ||
| "vscode_insiders", | ||
| "port_forwarding_helper", | ||
| "ssh_helper", | ||
| "web_terminal", | ||
| ], | ||
| }, | ||
| }; |
197 changes: 197 additions & 0 deletionssite/src/modules/resources/VSCodeDevContainerButton/VSCodeDevContainerButton.tsx
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,197 @@ | ||
| import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown"; | ||
| import ButtonGroup from "@mui/material/ButtonGroup"; | ||
| import Menu from "@mui/material/Menu"; | ||
| import MenuItem from "@mui/material/MenuItem"; | ||
| import { API } from "api/api"; | ||
| import type { DisplayApp } from "api/typesGenerated"; | ||
| import { VSCodeIcon } from "components/Icons/VSCodeIcon"; | ||
| import { VSCodeInsidersIcon } from "components/Icons/VSCodeInsidersIcon"; | ||
| import { type FC, useRef, useState } from "react"; | ||
| import { AgentButton } from "../AgentButton"; | ||
| import { DisplayAppNameMap } from "../AppLink/AppLink"; | ||
| export interface VSCodeDevContainerButtonProps { | ||
| userName: string; | ||
| workspaceName: string; | ||
| agentName?: string; | ||
| devContainerName: string; | ||
| devContainerFolder: string; | ||
| displayApps: readonly DisplayApp[]; | ||
| } | ||
| type VSCodeVariant = "vscode" | "vscode-insiders"; | ||
| const VARIANT_KEY = "vscode-variant"; | ||
| export const VSCodeDevContainerButton: FC<VSCodeDevContainerButtonProps> = ( | ||
| props, | ||
| ) => { | ||
| const [isVariantMenuOpen, setIsVariantMenuOpen] = useState(false); | ||
| const previousVariant = localStorage.getItem(VARIANT_KEY); | ||
| const [variant, setVariant] = useState<VSCodeVariant>(() => { | ||
| if (!previousVariant) { | ||
| return "vscode"; | ||
| } | ||
| return previousVariant as VSCodeVariant; | ||
| }); | ||
| const menuAnchorRef = useRef<HTMLDivElement>(null); | ||
| const selectVariant = (variant: VSCodeVariant) => { | ||
| localStorage.setItem(VARIANT_KEY, variant); | ||
| setVariant(variant); | ||
| setIsVariantMenuOpen(false); | ||
| }; | ||
| const includesVSCodeDesktop = props.displayApps.includes("vscode"); | ||
| const includesVSCodeInsiders = props.displayApps.includes("vscode_insiders"); | ||
| return includesVSCodeDesktop && includesVSCodeInsiders ? ( | ||
| <div> | ||
| <ButtonGroup ref={menuAnchorRef} variant="outlined"> | ||
| {variant === "vscode" ? ( | ||
| <VSCodeButton {...props} /> | ||
| ) : ( | ||
| <VSCodeInsidersButton {...props} /> | ||
| )} | ||
| <AgentButton | ||
| aria-controls={ | ||
| isVariantMenuOpen ? "vscode-variant-button-menu" : undefined | ||
| } | ||
| aria-expanded={isVariantMenuOpen ? "true" : undefined} | ||
| aria-label="select VSCode variant" | ||
| aria-haspopup="menu" | ||
| disableRipple | ||
| onClick={() => { | ||
| setIsVariantMenuOpen(true); | ||
| }} | ||
| css={{ paddingLeft: 0, paddingRight: 0 }} | ||
| > | ||
| <KeyboardArrowDownIcon css={{ fontSize: 16 }} /> | ||
| </AgentButton> | ||
| </ButtonGroup> | ||
| <Menu | ||
| open={isVariantMenuOpen} | ||
| anchorEl={menuAnchorRef.current} | ||
| onClose={() => setIsVariantMenuOpen(false)} | ||
| css={{ | ||
| "& .MuiMenu-paper": { | ||
| width: menuAnchorRef.current?.clientWidth, | ||
| }, | ||
| }} | ||
| > | ||
| <MenuItem | ||
| css={{ fontSize: 14 }} | ||
| onClick={() => { | ||
| selectVariant("vscode"); | ||
| }} | ||
| > | ||
| <VSCodeIcon css={{ width: 12, height: 12 }} /> | ||
| {DisplayAppNameMap.vscode} | ||
| </MenuItem> | ||
| <MenuItem | ||
| css={{ fontSize: 14 }} | ||
| onClick={() => { | ||
| selectVariant("vscode-insiders"); | ||
| }} | ||
| > | ||
| <VSCodeInsidersIcon css={{ width: 12, height: 12 }} /> | ||
| {DisplayAppNameMap.vscode_insiders} | ||
| </MenuItem> | ||
| </Menu> | ||
| </div> | ||
| ) : includesVSCodeDesktop ? ( | ||
| <VSCodeButton {...props} /> | ||
| ) : ( | ||
| <VSCodeInsidersButton {...props} /> | ||
| ); | ||
| }; | ||
| const VSCodeButton: FC<VSCodeDevContainerButtonProps> = ({ | ||
| userName, | ||
| workspaceName, | ||
| agentName, | ||
| devContainerName, | ||
| devContainerFolder, | ||
| }) => { | ||
| const [loading, setLoading] = useState(false); | ||
| return ( | ||
| <AgentButton | ||
| startIcon={<VSCodeIcon />} | ||
| disabled={loading} | ||
| onClick={() => { | ||
| setLoading(true); | ||
| API.getApiKey() | ||
| .then(({ key }) => { | ||
| const query = new URLSearchParams({ | ||
| owner: userName, | ||
| workspace: workspaceName, | ||
| url: location.origin, | ||
| token: key, | ||
| devContainerName, | ||
| devContainerFolder, | ||
| }); | ||
| if (agentName) { | ||
| query.set("agent", agentName); | ||
| } | ||
| location.href = `vscode://coder.coder-remote/openDevContainer?${query.toString()}`; | ||
| }) | ||
| .catch((ex) => { | ||
| console.error(ex); | ||
| }) | ||
| .finally(() => { | ||
| setLoading(false); | ||
| }); | ||
| }} | ||
| > | ||
| {DisplayAppNameMap.vscode} | ||
| </AgentButton> | ||
| ); | ||
| }; | ||
| const VSCodeInsidersButton: FC<VSCodeDevContainerButtonProps> = ({ | ||
| userName, | ||
| workspaceName, | ||
| agentName, | ||
| devContainerName, | ||
| devContainerFolder, | ||
| }) => { | ||
| const [loading, setLoading] = useState(false); | ||
| return ( | ||
| <AgentButton | ||
| startIcon={<VSCodeInsidersIcon />} | ||
| disabled={loading} | ||
| onClick={() => { | ||
| setLoading(true); | ||
| API.getApiKey() | ||
| .then(({ key }) => { | ||
| const query = new URLSearchParams({ | ||
| owner: userName, | ||
| workspace: workspaceName, | ||
| url: location.origin, | ||
| token: key, | ||
| devContainerName, | ||
| devContainerFolder, | ||
| }); | ||
| if (agentName) { | ||
| query.set("agent", agentName); | ||
| } | ||
| location.href = `vscode-insiders://coder.coder-remote/openDevContainer?${query.toString()}`; | ||
| }) | ||
| .catch((ex) => { | ||
| console.error(ex); | ||
| }) | ||
| .finally(() => { | ||
| setLoading(false); | ||
| }); | ||
| }} | ||
| > | ||
| {DisplayAppNameMap.vscode_insiders} | ||
| </AgentButton> | ||
| ); | ||
| }; |
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
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.