Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit63442fe

Browse files
committed
undo dumb idea
1 parent972f269 commit63442fe

File tree

3 files changed

+11
-71
lines changed

3 files changed

+11
-71
lines changed

‎Coder Desktop/Coder Desktop/Views/Agents.swift

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,20 @@ struct Agents<VPN: VPNService, S: Session>: View {
1313
// Agents List
1414
if vpn.state==.connected{
1515
letitems= vpn.menuState.sorted
16-
letvisibleOnlineItems= items.prefix(defaultVisibleRows){
17-
$0.status!=.off
18-
}
19-
letvisibleItems= viewAll?items[...]: visibleOnlineItems
16+
letvisibleItems= viewAll?items[...]: items.prefix(defaultVisibleRows)
2017
ForEach(visibleItems, id: \.id){ agentin
2118
MenuItemView(item: agent, baseAccessURL: session.baseAccessURL!)
2219
.padding(.horizontal,Theme.Size.trayMargin)
2320
}
24-
ifvisibleItems.count==0{
25-
Text("No\(items.count>0?"running":"")workspaces!")
21+
ifitems.count==0{
22+
Text("No workspaces!")
2623
.font(.body)
2724
.foregroundColor(.gray)
2825
.padding(.horizontal,Theme.Size.trayInset)
2926
.padding(.top,2)
3027
}
3128
// Only show the toggle if there are more items to show
32-
ifvisibleOnlineItems.count< items.count{
29+
ifitems.count> defaultVisibleRows{
3330
Toggle(isOn: $viewAll){
3431
Text(viewAll?"Show less":"Show all")
3532
.font(.headline)

‎Coder Desktop/Coder Desktop/Views/Util.swift

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,3 @@ extension UUID {
3131
self.init(uuid: uuid)
3232
}
3333
}
34-
35-
extensionArray{
36-
func prefix(_ maxCount:Int, while predicate:(Element)->Bool)->ArraySlice<Element>{
37-
letfailureIndex=enumerated().first(where:{ !predicate($0.element)})?.offset?? count
38-
letendIndex=Swift.min(failureIndex, maxCount)
39-
returnself[..<endIndex]
40-
}
41-
}

‎Coder Desktop/Coder DesktopTests/AgentsTests.swift

Lines changed: 7 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -101,68 +101,19 @@ struct AgentsTests {
101101
}
102102
}
103103

104-
@Testfunc showAllToggle_noOnlineWorkspaces()asyncthrows{
105-
vpn.state=.connected
106-
lettmpAgents=createMockAgents(count:Theme.defaultVisibleAgents+1, status:.off)
107-
vpn.menuState=.init(agents: tmpAgents)
108-
109-
tryawaitViewHosting.host(view){
110-
tryawait sut.inspection.inspect{ viewin
111-
vartoggle=try view.find(ViewType.Toggle.self)
112-
varforEach=try view.find(ViewType.ForEach.self)
113-
#expect(throws:Never.self){try view.find(text:"No running workspaces!")}
114-
#expect(forEach.count==0)
115-
#expect(try toggle.labelView().text().string()=="Show all")
116-
#expect(try!toggle.isOn())
117-
118-
try toggle.tap()
119-
toggle=try view.find(ViewType.Toggle.self)
120-
forEach=try view.find(ViewType.ForEach.self)
121-
#expect(forEach.count==Theme.defaultVisibleAgents+1)
122-
#expect(try toggle.labelView().text().string()=="Show less")
123-
124-
try toggle.tap()
125-
toggle=try view.find(ViewType.Toggle.self)
126-
forEach=try view.find(ViewType.ForEach.self)
127-
#expect(try toggle.labelView().text().string()=="Show all")
128-
#expect(forEach.count==0)
129-
}
130-
}
131-
}
132-
133104
@Test
134-
funcshowAllToggle_oneOfflineWorkspace()asyncthrows{
105+
funcshowOfflineWorkspace()asyncthrows{
135106
vpn.state=.connected
136-
vpn.menuState=.init(agents:createMockAgents(count:Theme.defaultVisibleAgents-2))
137-
letofflineAgent=Agent(
138-
id:UUID(),
139-
name:"dev",
140-
status:.off,
141-
hosts:["offline.coder"],
142-
wsName:"offlinews",
143-
wsID:UUID()
107+
vpn.menuState=.init(
108+
agents:createMockAgents(count:Theme.defaultVisibleAgents-1),
109+
workspaces:[UUID():Workspace(id:UUID(), name:"offline", agents:.init())]
144110
)
145-
vpn.menuState.agents[offlineAgent.id]= offlineAgent
146111

147112
tryawaitViewHosting.host(view){
148113
tryawait sut.inspection.inspect{ viewin
149-
vartoggle=try view.find(ViewType.Toggle.self)
150-
varforEach=try view.find(ViewType.ForEach.self)
151-
#expect(forEach.count==Theme.defaultVisibleAgents-2)
152-
#expect(try toggle.labelView().text().string()=="Show all")
153-
#expect(try!toggle.isOn())
154-
155-
try toggle.tap()
156-
toggle=try view.find(ViewType.Toggle.self)
157-
forEach=try view.find(ViewType.ForEach.self)
158-
#expect(forEach.count==Theme.defaultVisibleAgents-1)
159-
#expect(try toggle.labelView().text().string()=="Show less")
160-
161-
try toggle.tap()
162-
toggle=try view.find(ViewType.Toggle.self)
163-
forEach=try view.find(ViewType.ForEach.self)
164-
#expect(try toggle.labelView().text().string()=="Show all")
165-
#expect(forEach.count==Theme.defaultVisibleAgents-2)
114+
letforEach=try view.find(ViewType.ForEach.self)
115+
#expect(forEach.count==Theme.defaultVisibleAgents)
116+
#expect(throws:Never.self){try view.find(link:"offline.coder")}
166117
}
167118
}
168119
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp