Commit6147967

committed

fixup

1 parenta10e955 commit6147967Copy full SHA for 6147967

File tree

-20

lines changed

-20

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,12 @@ struct Agent: Identifiable, Equatable, Comparable, Hashable {`
`10`	`10`	`letwsName:String`
`11`	`11`	`letwsID:UUID`
`12`	`12`
`13`		`- // Agents are sorted by name`
	`13`	`+ // Agents are sorted bystauts, and then byname`
`14`	`14`	`staticfunc<(lhs:Agent, rhs:Agent)->Bool{`
`15`		`- lhs.wsName.localizedCompare(rhs.wsName)==.orderedAscending`
	`15`	`+if lhs.status!= rhs.status{`
	`16`	`+return lhs.status< rhs.status`
	`17`	`+}`
	`18`	`+return lhs.wsName.localizedCompare(rhs.wsName)==.orderedAscending`
`16`	`19`	`}`
`17`	`20`
`18`	`21`	`letprimaryHost:String`

Lines changed: 1 addition & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -233,9 +233,7 @@ struct MenuItemIconButton: View {`
`233`	`233`	`letaction:@MainActor()->Void`
`234`	`234`
`235`	`235`	`varbody:someView{`
`236`		`-Button{`
`237`		`-action()`
`238`		`-} label:{`
	`236`	`+Button(action: action){`
`239`	`237`	`Image(systemName: systemName)`
`240`	`238`	`.padding(3)`
`241`	`239`	`.contentShape(Rectangle())`
`@@ -259,16 +257,3 @@ struct AnimatedChevron: View {`
`259`	`257`	`.animation(.easeInOut(duration:Theme.Animation.collapsibleDuration), value: isExpanded)`
`260`	`258`	`}`
`261`	`259`	`}`
`262`		`-`
`263`		`-#if DEBUG`
`264`		`- #Preview{`
`265`		`-letappState=AppState(persistent:false)`
`266`		`- appState.login(baseAccessURL:URL(string:"http://127.0.0.1:8080")!, sessionToken:"")`
`267`		`- // appState.clearSession()`
`268`		`-`
`269`		`-returnVPNMenu<PreviewVPN,PreviewFileSync>().frame(width:256)`
`270`		`-.environmentObject(PreviewVPN())`
`271`		`-.environmentObject(appState)`
`272`		`-.environmentObject(PreviewFileSync())`
`273`		`-}`
`274`		`-#endif`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ struct AgentsTests {`
`62`	`62`	`letforEach=try view.inspect().find(ViewType.ForEach.self)`
`63`	`63`	`#expect(forEach.count==Theme.defaultVisibleAgents)`
`64`	`64`	`// Agents are sorted by status, and then by name in alphabetical order`
`65`		`- #expect(throws:Never.self){try view.inspect().find(link:"a1.coder")}`
	`65`	`+ #expect(throws:Never.self){try view.inspect().find(text:"a1.coder")}`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`@Test`
`@@ -115,7 +115,7 @@ struct AgentsTests {`
`115`	`115`	`tryawait sut.inspection.inspect{ viewin`
`116`	`116`	`letforEach=try view.find(ViewType.ForEach.self)`
`117`	`117`	`#expect(forEach.count==Theme.defaultVisibleAgents)`
`118`		`- #expect(throws:Never.self){try view.find(link:"offline.coder")}`
	`118`	`+ #expect(throws:Never.self){try view.find(text:"offline.coder")}`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`	`}`

Comments

(0)