Commit49fd303

authored

fix: handle missing workspace appdisplay_name (#154)

also uses `code-insiders.svg` for the VS Code insiders icon.Context:coder/coder#17700

1 parent565665f commit49fd303Copy full SHA for 49fd303

File tree

-6

lines changed

-6

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,8 @@ struct WorkspaceApp {`
`75`	`75`	`sessionToken:String`
`76`	`76`	`)throws(WorkspaceAppError){`
`77`	`77`	`slug= original.slug`
`78`		`- displayName= original.display_name`
	`78`	`+ // Same behaviour as the web UI`
	`79`	`+ displayName= original.display_name?? original.slug`
`79`	`80`
`80`	`81`	`guard original.externalelse{`
`81`	`82`	`throw.isWebApp`
`@@ -196,7 +197,7 @@ func vscodeDisplayApp(hostname: String, baseIconURL: URL, path: String? = nil) -`
`196`	`197`	`}`
`197`	`198`
`198`	`199`	`func vscodeInsidersDisplayApp(hostname:String, baseIconURL:URL, path:String?=nil)->WorkspaceApp{`
`199`		`-leticon= baseIconURL.appendingPathComponent("/icon/code.svg")`
	`200`	`+leticon= baseIconURL.appendingPathComponent("/icon/code-insiders.svg")`
`200`	`201`	`returnWorkspaceApp(`
`201`	`202`	`slug:"-vscode-insiders",`
`202`	`203`	`displayName:"VS Code Insiders Desktop",`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ struct WorkspaceAppTests {`
`137`	`137`	`#expect(apps.count==1)`
`138`	`138`	`#expect(apps[0].slug=="-vscode-insiders")`
`139`	`139`	`#expect(apps[0].displayName=="VS Code Insiders Desktop")`
`140`		`- #expect(apps[0].icon?.absoluteString=="https://coder.example.com/icon/code.svg")`
	`140`	`+ #expect(apps[0].icon?.absoluteString=="https://coder.example.com/icon/code-insiders.svg")`
`141`	`141`	`#expect(`
`142`	`142`	`apps[0].url.absoluteString=="""`
`143`	`143`	`vscode-insiders://vscode-remote/ssh-remote+test-workspace.coder.test//home/user`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,10 @@ public struct WorkspaceAgent: Codable, Identifiable, Sendable {`
`56`	`56`
`57`	`57`	`publicstructWorkspaceApp:Codable,Identifiable,Sendable{`
`58`	`58`	`publicletid:UUID`
`59`		- // Not `omitempty`, but `coderd` sends empty string if `command` is set
`60`		`-publicvarurl:URL?`
	`59`	+publicvarurl:URL? // `omitempty`
`61`	`60`	`publicletexternal:Bool`
`62`	`61`	`publicletslug:String`
`63`		`-publicletdisplay_name:String`
	`62`	+publicletdisplay_name:String? // `omitempty`
`64`	`63`	publicletcommand:String? // `omitempty`
`65`	`64`	publicleticon:URL? // `omitempty`
`66`	`65`	`publicletsubdomain:Bool`

Comments

(0)