Skip to content

feat: allow configuring display apps from template #9100

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 30, 2023
Merged

feat: allow configuring display apps from template #9100

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a71e3c8
feat: add display_apps field to agent
sreya Aug 15, 2023
1ba035c
fix frontend
sreya Aug 28, 2023
9be2234
pr comments
sreya Aug 29, 2023
682eee1
Merge branch 'main' into jon/defaultapps
sreya Aug 29, 2023
838af08
move migration
sreya Aug 29, 2023
f0d029e
fix e2e test
sreya Aug 30, 2023
75fabc9
update provider version for new tests
sreya Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix frontend
  • Loading branch information
@sreya
sreya committed Aug 28, 2023
commit 1ba035c07eaabf27379e46bd4678fffd0d240873
2 changes: 1 addition & 1 deletion site/src/components/Resources/AgentRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ export const AgentRow: FC<AgentRowProps> = ({
workspaceName={workspace.name}
agentName={agent.name}
folderPath={agent.expanded_directory}
defaultApps={agent.display_apps}
displayApps={agent.display_apps}
/>
)}
{agent.apps.map((app) => (
Expand Down
7 changes: 7 additions & 0 deletions site/src/components/VSCodeDesktopButton/VSCodeDesktopButton.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,11 @@ Default.args = {
userName: MockWorkspace.owner_name,
workspaceName: MockWorkspace.name,
agentName: MockWorkspaceAgent.name,
displayApps: [
"vscode",
"port_forwarding_helper",
"ssh_helper",
"vscode_insiders",
"web_terminal",
],
}
6 changes: 3 additions & 3 deletions site/src/components/VSCodeDesktopButton/VSCodeDesktopButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export interface VSCodeDesktopButtonProps {
workspaceName: string
agentName?: string
folderPath?: string
defaultApps: DisplayApp[]
displayApps: DisplayApp[]
}

type VSCodeVariant = "vscode" | "vscode-insiders"
Expand All @@ -42,8 +42,8 @@ export const VSCodeDesktopButton: FC<
setIsVariantMenuOpen(false)
}

const includesVSCodeDesktop = props.defaultApps.includes("vscode")
const includesVSCodeInsiders = props.defaultApps.includes("vscode_insiders")
const includesVSCodeDesktop = props.displayApps.includes("vscode")
const includesVSCodeInsiders = props.displayApps.includes("vscode_insiders")

return includesVSCodeDesktop && includesVSCodeInsiders ? (
<div>
Expand Down