Commit08d1c34

committed

address CR comments

1 parent158dd56 commit08d1c34Copy full SHA for 08d1c34

File tree

+25

-23

lines changed

+25

-23

lines changed

Lines changed: 14 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -131,27 +131,24 @@ export const Resources: FC<ResourcesProps> = ({ resources, getResourcesError, wo`
`131`	`131`	`{agent.name}`
`132`	`132`	`<spanclassName={styles.operatingSystem}>{agent.operating_system}</span>`
`133`	`133`	`</TableCell>`
`134`		`-{canUpdateWorkspace&&(`
	`134`	`+{canUpdateWorkspace&&agent.status==="connected"&&(`
`135`	`135`	`<TableCell>`
`136`	`136`	`<Stack>`
`137`		`-{agent.status==="connected"&&(`
`138`		`-<TerminalLink`
`139`		`-className={styles.accessLink}`
`140`		`-workspaceName={workspace.name}`
`141`		`-agentName={agent.name}`
	`137`	`+<TerminalLink`
	`138`	`+className={styles.accessLink}`
	`139`	`+workspaceName={workspace.name}`
	`140`	`+agentName={agent.name}`
	`141`	`+userName={workspace.owner_name}`
	`142`	`+/>`
	`143`	`+{agent.apps.map((app)=>(`
	`144`	`+<AppLink`
	`145`	`+key={app.name}`
	`146`	`+appIcon={app.icon}`
	`147`	`+appName={app.name}`
`142`	`148`	`userName={workspace.owner_name}`
	`149`	`+workspaceName={workspace.name}`
`143`	`150`	`/>`
`144`		`-)}`
`145`		`-{agent.status==="connected"&&`
`146`		`-agent.apps.map((app)=>(`
`147`		`-<AppLink`
`148`		`-key={app.name}`
`149`		`-appIcon={app.icon}`
`150`		`-appName={app.name}`
`151`		`-userName={workspace.owner_name}`
`152`		`-workspaceName={workspace.name}`
`153`		`-/>`
`154`		`-))}`
	`151`	`+))}`
`155`	`152`	`</Stack>`
`156`	`153`	`</TableCell>`
`157`	`154`	`)}`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,12 @@ export const WorkspacePage: React.FC = () => {`
`21`	`21`	`constxServices=useContext(XServiceContext)`
`22`	`22`	`constme=useSelector(xServices.authXService,selectUser)`
`23`	`23`
`24`		`-const[workspaceState,workspaceSend]=useMachine(workspaceMachine.withContext({userId:me?.id}))`
	`24`	`+const[workspaceState,workspaceSend]=useMachine(`
	`25`	`+workspaceMachine.withContext({`
	`26`	`+ ...workspaceMachine.initialState.context,`
	`27`	`+userId:me?.id,`
	`28`	`+}),`
	`29`	`+)`
`25`	`30`	`const{ workspace, resources, getWorkspaceError, getResourcesError, builds, permissions}=workspaceState.context`
`26`	`31`
`27`	`32`	`constcanUpdateWorkspace=!!permissions?.updateWorkspace`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,14 +28,14 @@ export interface WorkspaceContext {`
`28`	`28`	`// error creating a new WorkspaceBuild`
`29`	`29`	`buildError?:Error\|unknown`
`30`	`30`	`// these are separate from getX errors because they don't make the page unusable`
`31`		`-refreshWorkspaceError?:Error\|unknown`
`32`		`-refreshTemplateError?:Error\|unknown`
`33`		`-getResourcesError?:Error\|unknown`
	`31`	`+refreshWorkspaceError:Error\|unknown`
	`32`	`+refreshTemplateError:Error\|unknown`
	`33`	`+getResourcesError:Error\|unknown`
`34`	`34`	`// Builds`
`35`	`35`	`builds?:TypesGen.WorkspaceBuild[]`
`36`	`36`	`getBuildsError?:Error\|unknown`
`37`	`37`	`loadMoreBuildsError?:Error\|unknown`
`38`		`-cancellationMessage?:string`
	`38`	`+cancellationMessage:string`
`39`	`39`	`// permissions`
`40`	`40`	`permissions?:Permissions`
`41`	`41`	`checkPermissionsError?:Error\|unknown`
`@@ -411,7 +411,7 @@ export const workspaceMachine = createMachine(`
`411`	`411`	`cancellationMessage:undefined,`
`412`	`412`	`}),`
`413`	`413`	`displayCancellationError:(context)=>{`
`414`		`-displayError(context.cancellationMessage\|\|"Cancellation failed")`
	`414`	`+displayError(context.cancellationMessage)`
`415`	`415`	`},`
`416`	`416`	`assignRefreshWorkspaceError:(_,event)=>`
`417`	`417`	`assign({`

Comments

(0)