Commit30839c8

committed

Fix selection when workspace name collides

This can happen if multiple users are using the same name for theirworkspaces.Turns out we can just match the workspace ID.It hardly seems worth a test to see that a == is working, so I did notbother to update it.

1 parent0f66e3e commit30839c8Copy full SHA for 30839c8

File tree

3 files changed

+13

-65

lines changed

src
- main/kotlin/com/coder/gateway
  - models
    - WorkspaceAgentListModel.kt
  - views/steps
    - CoderWorkspacesStepView.kt
- test/kotlin/com/coder/gateway/views/steps
  - CoderWorkspacesStepViewTest.kt

3 files changed

+13

-65

lines changed

`‎src/main/kotlin/com/coder/gateway/models/WorkspaceAgentListModel.kt`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ data class WorkspaceAgentListModel(`
`16`	`16`	`varicon:Icon? =null,`
`17`	`17`	`// The combined status of the workspace and agent to display on the row.`
`18`	`18`	`valstatus:WorkspaceAndAgentStatus =WorkspaceAndAgentStatus.from(workspace, agent),`
`19`		-// The combined `workspace.agent` name to display on the row.
	`19`	+// The combined `workspace.agent` name to display on the row. Users can have workspaces with the same name, so it
	`20`	`+// must not be used as a unique identifier.`
`20`	`21`	`valname:String =if (agent != null)"${workspace.name}.${agent.name}"else workspace.name,`
`21`	`22`	`)`

`‎src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt`

Lines changed: 11 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -989,17 +989,19 @@ class WorkspacesTable : TableView<WorkspaceAgentListModel>(WorkspacesTableModel(`
`989`	`989`	`}`
`990`	`990`	`}`
`991`	`991`
`992`		`-fungetNewSelection(oldSelection:WorkspaceAgentListModel?):Int {`
	`992`	`+/**`
	`993`	`+ * If a row becomes unselected because the workspace turned on, find the`
	`994`	`+ * first agent row and select that.`
	`995`	`+ *`
	`996`	`+ * If a row becomes unselected because the workspace turned off, find the`
	`997`	`+ * workspace row and select that.`
	`998`	`+*/`
	`999`	`+privatefungetNewSelection(oldSelection:WorkspaceAgentListModel?):Int {`
`993`	`1000`	`if (oldSelection==null) {`
`994`	`1001`	`return-1`
`995`	`1002`	`}`
`996`		`-val index= listTableModel.items.indexOfFirst { it.name== oldSelection.name }`
`997`		`-if (index>-1) {`
`998`		`-return index`
`999`		`- }`
`1000`		`-// If there is no matching agent, try matching on just the workspace.`
`1001`		`-// It is possible it turned off so it no longer has agents displaying;`
`1002`		`-// in this case we want to keep it highlighted.`
`1003`		`-return listTableModel.items.indexOfFirst { it.workspace.name== oldSelection.workspace.name }`
	`1003`	`+// Both cases are handled by just looking for the ID, since we only ever`
	`1004`	`+// show agents or a workspace but never both.`
	`1005`	`+return listTableModel.items.indexOfFirst { it.workspace.id== oldSelection.workspace.id }`
`1004`	`1006`	`}`
`1005`	`1007`	`}`

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit30839c8

File tree

3 files changed

3 files changed

`‎src/main/kotlin/com/coder/gateway/models/WorkspaceAgentListModel.kt`

`‎src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt`

`‎src/test/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepViewTest.kt`

0 commit comments