diff --git a/src/app/pages/apps/services/applications.service.ts b/src/app/pages/apps/services/applications.service.ts index 94c0a1d7de8..80c18682370 100644 --- a/src/app/pages/apps/services/applications.service.ts +++ b/src/app/pages/apps/services/applications.service.ts @@ -79,7 +79,7 @@ export class ApplicationsService { }]); } - getInstalledAppsUpdates(): Observable { + getInstalledAppsUpdates(): Observable> { return this.ws.subscribe('app.query'); } diff --git a/src/app/pages/apps/store/installed-apps-store.service.ts b/src/app/pages/apps/store/installed-apps-store.service.ts index e97e92517eb..fe28fa629dd 100644 --- a/src/app/pages/apps/store/installed-apps-store.service.ts +++ b/src/app/pages/apps/store/installed-apps-store.service.ts @@ -153,14 +153,11 @@ export class InstalledAppsStore extends ComponentStore imple private loadInstalledApps(): Observable { return this.dockerStore.isLoading$.pipe( withLatestFrom(this.dockerStore.isDockerStarted$), - filter(([loading, isDockerStarted]) => !loading && isDockerStarted !== null), - tap(([, isDockerStarted]) => { - if (isDockerStarted) { - this.appsStats.subscribeToUpdates(); - this.subscribeToInstalledAppsUpdates(); - } - }), + filter(([isLoading, isDockerStarted]) => !isLoading && isDockerStarted !== null), switchMap(([, isDockerStarted]) => { + this.appsStats.subscribeToUpdates(); + this.subscribeToInstalledAppsUpdates(); + if (!isDockerStarted) { return of([]); }