NAS-131100: Fix installed apps is empty on app install

truenas · Sep 25, 2024 · 9179593 · 9179593
1 parent b237815
commit 9179593
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git 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<ApiEvent> {
+  getInstalledAppsUpdates(): Observable<ApiEvent<App>> {
     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
@@ -153,14 +153,11 @@ export class InstalledAppsStore extends ComponentStore<InstalledAppsState> imple
   private loadInstalledApps(): Observable<unknown> {
     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([]);
         }