🐛reset selected app after uninstalling same app

Author: TarradeMarc

controlpanel/cad/src/app/services/app-list.service.ts

@@ -3,6 +3,7 @@ import { BehaviorSubject, lastValueFrom } from 'rxjs';
 import { AppListApiService } from './api/app-list-api.service';
 import { ProtectedApp } from '../models/protected-app';
 import { ApiResponse } from '../models/api-response';
+import { GlobalStateService } from './global-state.service';
 
 @Injectable({
   providedIn: 'root'
@@ -12,7 +13,7 @@ export class AppListService {
   private applistSubject = new BehaviorSubject<ProtectedApp[]>([]);
   applist$ = this.applistSubject.asObservable();
 
-  constructor(private applistApi: AppListApiService) { }
+  constructor(private applistApi: AppListApiService, private globalState: GlobalStateService) { }
 
   get applist(): ProtectedApp[] {
     return this.applistSubject?.value || [];
@@ -24,7 +25,13 @@ export class AppListService {
   async getAppList(): Promise<ApiResponse> {
     try {
       const apiResponse = await lastValueFrom(this.applistApi.getAppList());
-      if (apiResponse.type == 'success') this.applist = apiResponse.data as ProtectedApp[];
+      if (apiResponse.type == 'success') {
+        this.applist = apiResponse.data as ProtectedApp[];
+        if (!this.applist.find(app => app.id == this.globalState.selectedApp.id)) {
+          const defaultApp = this.applist.find(app => app.namespace == 'default' && app.application == 'default');
+          this.globalState.selectedApp = defaultApp || this.applist[0];
+        }
+      }
       return apiResponse;
     } catch (error) {
       return { type: 'error', message: 'Error when fetching app list' };