Commit117d8fd

authored

feat: show when workspace apps are loading (#163)

1 parent2adace3 commit117d8fdCopy full SHA for 117d8fd

File tree

+14

-7

lines changed

+14

-7

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,7 @@ struct FilePicker: View {`
`23`	`23`	`VStack(spacing:0){`
`24`	`24`	`if model.rootIsLoading{`
`25`	`25`	`Spacer()`
`26`		`-ProgressView()`
`27`		`-.controlSize(.large)`
	`26`	`+CircularProgressView(value:nil)`
`28`	`27`	`Spacer()`
`29`	`28`	`}elseiflet loadError= model.error{`
`30`	`29`	`Text("\(loadError.description)")`
`@@ -125,7 +124,8 @@ struct FilePickerEntry: View {`
`125`	`124`	`Label{`
`126`	`125`	`Text(entry.name)`
`127`	`126`	`ZStack{`
`128`		`-ProgressView().controlSize(.small).opacity(entry.isLoading && entry.error==nil?1:0)`
	`127`	`+CircularProgressView(value:nil, strokeWidth:2, diameter:10)`
	`128`	`+.opacity(entry.isLoading && entry.error==nil?1:0)`
`129`	`129`	`Image(systemName:"exclamationmark.triangle.fill")`
`130`	`130`	`.opacity(entry.error!=nil?1:0)`
`131`	`131`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ struct FileSyncSessionModal<VPN: VPNService, FS: FileSyncDaemon>: View {`
`68`	`68`	`Text(msg).foregroundStyle(.secondary)`
`69`	`69`	`}`
`70`	`70`	`if loading{`
`71`		`-ProgressView().controlSize(.small)`
	`71`	`+CircularProgressView(value:nil, strokeWidth:3, diameter:15)`
`72`	`72`	`}`
`73`	`73`	`Button("Cancel", action:{dismiss()}).keyboardShortcut(.cancelAction)`
`74`	`74`	`Button(existingSession==nil?"Add":"Save"){Task{awaitsubmit()}}`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,8 @@ struct MenuItemView: View {`
`72`	`72`
`73`	`73`	`@Stateprivatevarapps:[WorkspaceApp]=[]`
`74`	`74`
	`75`	`+@StateprivatevarloadingApps:Bool=true`
	`76`	`+`
`75`	`77`	`varhasApps:Bool{ !apps.isEmpty}`
`76`	`78`
`77`	`79`	`privatevaritemName:AttributedString{`
`@@ -129,9 +131,13 @@ struct MenuItemView: View {`
`129`	`131`	`MenuItemIcons(item: item, wsURL: wsURL)`
`130`	`132`	`}`
`131`	`133`	`if isExpanded{`
`132`		`-if hasApps{`
	`134`	`+switch(loadingApps, hasApps){`
	`135`	`+case(true, _):`
	`136`	`+CircularProgressView(value:nil, strokeWidth:3, diameter:15)`
	`137`	`+.padding(.top,5)`
	`138`	`+case(false,true):`
`133`	`139`	`MenuItemCollapsibleView(apps: apps)`
`134`		`-}else{`
	`140`	`+case(false,false):`
`135`	`141`	`HStack{`
`136`	`142`	`Text(item.status==.off?"Workspace is offline.":"No apps available.")`
`137`	`143`	`.font(.body)`
`@@ -146,6 +152,7 @@ struct MenuItemView: View {`
`146`	`152`	`}`
`147`	`153`
`148`	`154`	`func loadApps()async{`
	`155`	`+defer{ loadingApps=false}`
`149`	`156`	`// If this menu item is an agent, and the user is logged in`
`150`	`157`	`if caselet.agent(agent)= item,`
`151`	`158`	`let client= state.client,`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ struct WorkspaceAppIcon: View {`
`19`	`19`	`){ $0}`
`20`	`20`	`placeholder:{`
`21`	`21`	`if app.icon!=nil{`
`22`		`-ProgressView().controlSize(.small)`
	`22`	`+CircularProgressView(value:nil, strokeWidth:2, diameter:10)`
`23`	`23`	`}else{`
`24`	`24`	`Image(systemName:"questionmark").frame(`
`25`	`25`	`width:Theme.Size.appIconWidth,`

Comments

(0)