NVSHAS-9943: Namespaced user cannot login NV UI

Author: xingzhang-suse

admin/webapp/websrc/app/common/services/multi-cluster.service.ts

@@ -5,15 +5,14 @@ import { HttpClient } from '@angular/common/http';
 import { PathConstant } from '@common/constants/path.constant';
 import { Router } from '@angular/router';
 import { SESSION_STORAGE, StorageService } from 'ngx-webstorage-service';
-import { BehaviorSubject, Observable, Subject } from 'rxjs';
-import { tap } from 'rxjs/operators';
+import { BehaviorSubject, Observable, Subject, of } from 'rxjs';
 import { Cluster, ClusterData, ClusterSummary } from '@common/types';
 import { GlobalVariable } from '@common/variables/global.variable';
 import { TranslateService } from '@ngx-translate/core';
 import { UtilsService } from '@common/utils/app.utils';
 import { MultiClusterSummary } from '@common/types/scala_for_reference_only/MultiClusterSummary';
 import { ConfigHttpService } from '@common/api/config-http.service';
-import { map } from 'rxjs/operators';
+import { tap, map, catchError } from 'rxjs/operators';
 import { CommonHttpService } from '@common/api/common-http.service';
 import { GlobalConstant } from '@common/constants/global.constant';
 import { SummaryService } from './summary.service';
@@ -101,9 +100,12 @@ export class MultiClusterService {
   }
 
   getClusters(): Observable<any> {
-    return GlobalVariable.http
-      .get(PathConstant.FED_MEMBER_URL)
-      .pipe(tap(member => this.memberSubject.next(member)));
+    return GlobalVariable.http.get(PathConstant.FED_MEMBER_URL).pipe(
+      tap(member => this.memberSubject.next(member)),
+      catchError(error => {
+        return of(null);
+      })
+    );
   }
 
   getRemoteSummary(id): Observable<any> {

admin/webapp/websrc/app/routes/pages/login/login.component.ts

@@ -469,21 +469,23 @@ export class LoginComponent implements OnInit, OnDestroy {
           GlobalVariable.summary = summaryInfo.summary;
 
           // Handle clusterData
-          GlobalVariable.isMaster =
-            clusterData.fed_role === MapConstant.FED_ROLES.MASTER;
-          GlobalVariable.isMember =
-            clusterData.fed_role === MapConstant.FED_ROLES.MEMBER;
-          GlobalVariable.isStandAlone = clusterData.fed_role === '';
-
-          const sessionCluster = this.localStorage.get(
-            GlobalConstant.LOCAL_STORAGE_CLUSTER
-          );
-          const clusterInSession = sessionCluster
-            ? JSON.parse(sessionCluster)
-            : null;
-          GlobalVariable.isRemote = clusterInSession
-            ? clusterInSession.isRemote
-            : false;
+          if (clusterData) {
+            GlobalVariable.isMaster =
+              clusterData.fed_role === MapConstant.FED_ROLES.MASTER;
+            GlobalVariable.isMember =
+              clusterData.fed_role === MapConstant.FED_ROLES.MEMBER;
+            GlobalVariable.isStandAlone = clusterData.fed_role === '';
+
+            const sessionCluster = this.localStorage.get(
+              GlobalConstant.LOCAL_STORAGE_CLUSTER
+            );
+            const clusterInSession = sessionCluster
+              ? JSON.parse(sessionCluster)
+              : null;
+            GlobalVariable.isRemote = clusterInSession
+              ? clusterInSession.isRemote
+              : false;
+          }
 
           GlobalVariable.hasInitializedSummary = true;
 

admin/webapp/websrc/app/routes/registries/registry-details/registry-details-table/registry-details-dialog/registry-details-dialog.component.ts

@@ -184,5 +184,4 @@ export class RegistryDetailsDialogComponent implements OnInit, OnDestroy {
   ngOnDestroy() {
     this.filter.setValue('');
   }
-
 }