Skip to content

feat: Allow admins to access member workspace terminals #2114

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 5 commits into from
Jun 10, 2022
Merged

feat: Allow admins to access member workspace terminals #2114

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b0e8f65
allow workspace update permissions to access agents
AbhineetJain Jun 7, 2022
edf985b
do not show app links to users without workspace update access
AbhineetJain Jun 9, 2022
ec4fccc
address CR comments
AbhineetJain Jun 9, 2022
b10545e
initialize machine context in the hook
AbhineetJain Jun 9, 2022
4e69393
revert scoped connected status check
AbhineetJain Jun 10, 2022
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
address CR comments
  • Loading branch information
@AbhineetJain
AbhineetJain committed Jun 10, 2022
commit ec4fcccc6e97d08b57b5771af80dcf5e324f084e
31 changes: 14 additions & 17 deletions site/src/components/Resources/Resources.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,27 +131,24 @@ export const Resources: FC<ResourcesProps> = ({ resources, getResourcesError, wo
{agent.name}
<span className={styles.operatingSystem}>{agent.operating_system}</span>
</TableCell>
{canUpdateWorkspace && (
{canUpdateWorkspace && agent.status === "connected" && (
<TableCell>
<Stack>
{agent.status === "connected" && (
<TerminalLink
className={styles.accessLink}
workspaceName={workspace.name}
agentName={agent.name}
<TerminalLink
className={styles.accessLink}
workspaceName={workspace.name}
agentName={agent.name}
userName={workspace.owner_name}
/>
{agent.apps.map((app) => (
<AppLink
key={app.name}
appIcon={app.icon}
appName={app.name}
userName={workspace.owner_name}
workspaceName={workspace.name}
/>
)}
{agent.status === "connected" &&
agent.apps.map((app) => (
<AppLink
key={app.name}
appIcon={app.icon}
appName={app.name}
userName={workspace.owner_name}
workspaceName={workspace.name}
/>
))}
))}
</Stack>
</TableCell>
)}
Expand Down
7 changes: 6 additions & 1 deletion site/src/pages/WorkspacePage/WorkspacePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@ export const WorkspacePage: React.FC = () => {
const xServices = useContext(XServiceContext)
const me = useSelector(xServices.authXService, selectUser)

const [workspaceState, workspaceSend] = useMachine(workspaceMachine.withContext({ userId: me?.id }))
const [workspaceState, workspaceSend] = useMachine(
workspaceMachine.withContext({
...workspaceMachine.initialState.context,
userId: me?.id,
}),
)
const { workspace, resources, getWorkspaceError, getResourcesError, builds, permissions } = workspaceState.context

const canUpdateWorkspace = !!permissions?.updateWorkspace
Expand Down
10 changes: 5 additions & 5 deletions site/src/xServices/workspace/workspaceXService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ export interface WorkspaceContext {
// error creating a new WorkspaceBuild
buildError?: Error | unknown
// these are separate from getX errors because they don't make the page unusable
refreshWorkspaceError?: Error | unknown
refreshTemplateError?: Error | unknown
getResourcesError?: Error | unknown
refreshWorkspaceError: Error | unknown
refreshTemplateError: Error | unknown
getResourcesError: Error | unknown
// Builds
builds?: TypesGen.WorkspaceBuild[]
getBuildsError?: Error | unknown
loadMoreBuildsError?: Error | unknown
cancellationMessage?: string
cancellationMessage: string
// permissions
permissions?: Permissions
checkPermissionsError?: Error | unknown
Expand Down Expand Up @@ -411,7 +411,7 @@ export const workspaceMachine = createMachine(
cancellationMessage: undefined,
}),
displayCancellationError: (context) => {
displayError(context.cancellationMessage || "Cancellation failed")
displayError(context.cancellationMessage)
},
assignRefreshWorkspaceError: (_, event) =>
assign({
Expand Down