- Notifications
You must be signed in to change notification settings - Fork1k
feat: display builtin apps on workspaces table#17695
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
Show all changes
4 commits Select commitHold shift + click to select a range
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
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,54 @@ | ||
| type GetVSCodeHrefParams = { | ||
| owner: string; | ||
| workspace: string; | ||
| token: string; | ||
| agent?: string; | ||
| folder?: string; | ||
| }; | ||
| export const getVSCodeHref = ( | ||
| app: "vscode" | "vscode-insiders", | ||
| { owner, workspace, token, agent, folder }: GetVSCodeHrefParams, | ||
| ) => { | ||
| const query = new URLSearchParams({ | ||
| owner, | ||
| workspace, | ||
| url: location.origin, | ||
| token, | ||
| openRecent: "true", | ||
| }); | ||
| if (agent) { | ||
| query.set("agent", agent); | ||
| } | ||
| if (folder) { | ||
| query.set("folder", folder); | ||
| } | ||
| return `${app}://coder.coder-remote/open?${query}`; | ||
| }; | ||
| type GetTerminalHrefParams = { | ||
| username: string; | ||
| workspace: string; | ||
| agent?: string; | ||
| container?: string; | ||
| }; | ||
| export const getTerminalHref = ({ | ||
| username, | ||
| workspace, | ||
| agent, | ||
| container, | ||
| }: GetTerminalHrefParams) => { | ||
| const params = new URLSearchParams(); | ||
| if (container) { | ||
| params.append("container", container); | ||
| } | ||
| // Always use the primary for the terminal link. This is a relative link. | ||
| return `/@${username}/${workspace}${ | ||
| agent ? `.${agent}` : "" | ||
| }/terminal?${params}`; | ||
| }; | ||
| export const openAppInNewWindow = (name: string, href: string) => { | ||
| window.open(href, "_blank", "width=900,height=600"); | ||
| }; |
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
28 changes: 7 additions & 21 deletionssite/src/modules/resources/VSCodeDesktopButton/VSCodeDesktopButton.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
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 |
|---|---|---|
| @@ -3,6 +3,7 @@ import Star from "@mui/icons-material/Star"; | ||
| import Checkbox from "@mui/material/Checkbox"; | ||
| import Skeleton from "@mui/material/Skeleton"; | ||
| import { templateVersion } from "api/queries/templates"; | ||
| import { apiKey } from "api/queries/users"; | ||
| import { | ||
| cancelBuild, | ||
| deleteWorkspace, | ||
| @@ -19,6 +20,8 @@ import { Avatar } from "components/Avatar/Avatar"; | ||
| import { AvatarData } from "components/Avatar/AvatarData"; | ||
| import { AvatarDataSkeleton } from "components/Avatar/AvatarDataSkeleton"; | ||
| import { Button } from "components/Button/Button"; | ||
| import { VSCodeIcon } from "components/Icons/VSCodeIcon"; | ||
| import { VSCodeInsidersIcon } from "components/Icons/VSCodeInsidersIcon"; | ||
| import { InfoTooltip } from "components/InfoTooltip/InfoTooltip"; | ||
| import { Spinner } from "components/Spinner/Spinner"; | ||
| import { Stack } from "components/Stack/Stack"; | ||
| @@ -49,7 +52,17 @@ import dayjs from "dayjs"; | ||
| import relativeTime from "dayjs/plugin/relativeTime"; | ||
| import { useAuthenticated } from "hooks"; | ||
| import { useClickableTableRow } from "hooks/useClickableTableRow"; | ||
| import { | ||
| BanIcon, | ||
| PlayIcon, | ||
| RefreshCcwIcon, | ||
| SquareTerminalIcon, | ||
| } from "lucide-react"; | ||
| import { | ||
| getTerminalHref, | ||
| getVSCodeHref, | ||
| openAppInNewWindow, | ||
| } from "modules/apps/apps"; | ||
| import { useDashboard } from "modules/dashboard/useDashboard"; | ||
| import { WorkspaceAppStatus } from "modules/workspaces/WorkspaceAppStatus/WorkspaceAppStatus"; | ||
| import { WorkspaceDormantBadge } from "modules/workspaces/WorkspaceDormantBadge/WorkspaceDormantBadge"; | ||
| @@ -59,6 +72,7 @@ import { | ||
| useWorkspaceUpdate, | ||
| } from "modules/workspaces/WorkspaceUpdateDialogs"; | ||
| import { abilitiesByWorkspaceStatus } from "modules/workspaces/actions"; | ||
| import type React from "react"; | ||
| import { | ||
| type FC, | ||
| type PropsWithChildren, | ||
| @@ -534,6 +548,10 @@ const WorkspaceActionsCell: FC<WorkspaceActionsCellProps> = ({ | ||
| return ( | ||
| <TableCell> | ||
| <div className="flex gap-1 justify-end"> | ||
| {workspace.latest_build.status === "running" && ( | ||
| <WorkspaceApps workspace={workspace} /> | ||
| )} | ||
| {abilities.actions.includes("start") && ( | ||
| <PrimaryAction | ||
| onClick={() => startWorkspaceMutation.mutate({})} | ||
| @@ -557,18 +575,6 @@ const WorkspaceActionsCell: FC<WorkspaceActionsCellProps> = ({ | ||
| </> | ||
| )} | ||
Comment on lines -560 to -571 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Do we not want users to be able to stop workspaces from the table view anymore? I see in the designs there is a dropdown menu that will have this. Is that going to be a fast follow to this PR? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Yes, the "more options" menu will be implemented in a different PR. | ||
| {abilities.canCancel && ( | ||
| <PrimaryAction | ||
| onClick={cancelBuildMutation.mutate} | ||
| @@ -594,9 +600,9 @@ const WorkspaceActionsCell: FC<WorkspaceActionsCellProps> = ({ | ||
| }; | ||
| type PrimaryActionProps = PropsWithChildren<{ | ||
| label: string; | ||
| isLoading?: boolean; | ||
| onClick: () => void; | ||
| }>; | ||
| const PrimaryAction: FC<PrimaryActionProps> = ({ | ||
| @@ -626,3 +632,127 @@ const PrimaryAction: FC<PrimaryActionProps> = ({ | ||
| </TooltipProvider> | ||
| ); | ||
| }; | ||
| type WorkspaceAppsProps = { | ||
| workspace: Workspace; | ||
| }; | ||
| const WorkspaceApps: FC<WorkspaceAppsProps> = ({ workspace }) => { | ||
| const { data: apiKeyRes } = useQuery(apiKey()); | ||
| const token = apiKeyRes?.key; | ||
| /** | ||
| * Coder is pretty flexible and allows an enormous variety of use cases, such | ||
| * as having multiple resources with many agents, but they are not common. The | ||
| * most common scenario is to have one single compute resource with one single | ||
| * agent containing all the apps. Lets test this getting the apps for the | ||
| * first resource, and first agent - they are sorted to return the compute | ||
| * resource first - and see what customers and ourselves, using dogfood, think | ||
| * about that. | ||
| */ | ||
| const agent = workspace.latest_build.resources | ||
| .filter((r) => !r.hide) | ||
| .at(0) | ||
| ?.agents?.at(0); | ||
| if (!agent) { | ||
| return null; | ||
| } | ||
| const buttons: ReactNode[] = []; | ||
| if (agent.display_apps.includes("vscode")) { | ||
| buttons.push( | ||
| <AppLink | ||
| isLoading={!token} | ||
| label="Open VSCode" | ||
| href={getVSCodeHref("vscode", { | ||
| owner: workspace.owner_name, | ||
| workspace: workspace.name, | ||
| agent: agent.name, | ||
| token: apiKeyRes?.key ?? "", | ||
| folder: agent.expanded_directory, | ||
| })} | ||
| > | ||
| <VSCodeIcon /> | ||
| </AppLink>, | ||
| ); | ||
| } | ||
| if (agent.display_apps.includes("vscode_insiders")) { | ||
| buttons.push( | ||
| <AppLink | ||
| label="Open VSCode Insiders" | ||
| isLoading={!token} | ||
| href={getVSCodeHref("vscode-insiders", { | ||
| owner: workspace.owner_name, | ||
| workspace: workspace.name, | ||
| agent: agent.name, | ||
| token: apiKeyRes?.key ?? "", | ||
| folder: agent.expanded_directory, | ||
| })} | ||
| > | ||
| <VSCodeInsidersIcon /> | ||
| </AppLink>, | ||
| ); | ||
| } | ||
| if (agent.display_apps.includes("web_terminal")) { | ||
| const href = getTerminalHref({ | ||
| username: workspace.owner_name, | ||
| workspace: workspace.name, | ||
| agent: agent.name, | ||
| }); | ||
| buttons.push( | ||
| <AppLink | ||
| href={href} | ||
| onClick={(e) => { | ||
| e.preventDefault(); | ||
| openAppInNewWindow("Terminal", href); | ||
| }} | ||
| label="Open Terminal" | ||
| > | ||
| <SquareTerminalIcon /> | ||
| </AppLink>, | ||
| ); | ||
| } | ||
brettkolodny marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| return buttons; | ||
| }; | ||
| type AppLinkProps = PropsWithChildren<{ | ||
| label: string; | ||
| href: string; | ||
| isLoading?: boolean; | ||
| onClick?: (e: React.MouseEvent<HTMLAnchorElement>) => void; | ||
| }>; | ||
| const AppLink: FC<AppLinkProps> = ({ | ||
| href, | ||
| isLoading, | ||
| label, | ||
| children, | ||
| onClick, | ||
| }) => { | ||
| return ( | ||
| <TooltipProvider> | ||
| <Tooltip> | ||
| <TooltipTrigger asChild> | ||
| <Button variant="outline" size="icon-lg" asChild> | ||
| <a | ||
| className={isLoading ? "animate-pulse" : ""} | ||
| href={href} | ||
| onClick={(e) => { | ||
| e.stopPropagation(); | ||
| onClick?.(e); | ||
| }} | ||
| > | ||
| {children} | ||
| <span className="sr-only">{label}</span> | ||
| </a> | ||
| </Button> | ||
| </TooltipTrigger> | ||
| <TooltipContent>{label}</TooltipContent> | ||
| </Tooltip> | ||
| </TooltipProvider> | ||
| ); | ||
| }; | ||
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.