Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-26 02:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix error handling when store unreachable (#1925)

Browse Source 
Co-authored-by: Matt Hill <matthewonthemoon@gmail.com>
This commit is contained in:
Aiden McClelland
2022-11-09 12:29:06 -07:00
parent 2f00a642be
commit 6deb51428a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/projects/ui/src/app/services/marketplace.service.ts
View File

@@ -55,8 +55,8 @@ export class MarketplaceService implements AbstractMarketplaceService {
mergeMap(([prev, curr]) => from(Object.entries(getNewEntries(prev, curr)))),
mergeMap(([url, registry]) =>
this.fetchStore$(url).pipe(
map<StoreData, [string, StoreData | null]>(data => {
if (data.info) this.updateStoreIdentifier(url, registry, data.info)
map<StoreData | null, [string, StoreData | null]>(data => {
if (data?.info) this.updateStoreIdentifier(url, registry, data.info)
return [url, data]
}),
@@ -156,12 +156,13 @@ export class MarketplaceService implements AbstractMarketplaceService {
)
}
private fetchStore$(url: string): Observable<StoreData> {
private fetchStore$(url: string): Observable<StoreData | null> {
return combineLatest([this.fetchInfo$(url), this.fetchPackages$(url)]).pipe(
map(([info, packages]) => ({ info, packages })),
catchError(e => {
console.error(e)
this.requestErrors$.next(this.requestErrors$.value.concat(url))
return of(e)
return of(null)
}),
)
}