fixup! fix tests for Che Multiuser

eclipse-che · Sep 13, 2019 · 6fe27e3 · 6fe27e3
1 parent 33806c6
commit 6fe27e3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/dashboard/src/app/navbar/navbar.controller.ts b/dashboard/src/app/navbar/navbar.controller.ts
@@ -109,9 +109,13 @@ export class CheNavBarController {
         if (this.chePermissions.getSystemPermissions()) {
           this.updateData();
         } else {
-          this.chePermissions.fetchSystemPermissions().finally(() => {
-            this.updateData();
-          });
+          this.chePermissions.fetchSystemPermissions()
+            .catch((error: any) => {
+              // noop
+            })
+            .finally(() => {
+              this.updateData();
+            });
         }
       }
     });
@@ -136,9 +140,13 @@ export class CheNavBarController {
     organization.fetchOrganizations().then(() => {
       this.organizations = organization.getOrganizations();
       const user = this.cheAPI.getUser().getUser();
-      organization.fetchOrganizationByName(user.name).finally(() => {
-        this.hasPersonalAccount = angular.isDefined(organization.getOrganizationByName(user.name));
-      });
+      organization.fetchOrganizationByName(user.name)
+        .catch((error: any) => {
+          // noop
+        })
+        .finally(() => {
+          this.hasPersonalAccount = angular.isDefined(organization.getOrganizationByName(user.name));
+        });
     });
   }
 

diff --git a/dashboard/src/app/organizations/list-organizations/list-organizations.controller.ts b/dashboard/src/app/organizations/list-organizations/list-organizations.controller.ts
@@ -178,9 +178,6 @@ export class ListOrganizationsController {
    * Process organization - retrieving additional data.
    */
   processOrganizations(): void {
-    if (angular.isUndefined(this.organizations)) {
-      return;
-    }
     if (this.parentName) {
       const parentOrganization = this.cheOrganization.getOrganizationByName(this.parentName);
       this.parentId = parentOrganization ? parentOrganization.id : null;

diff --git a/dashboard/src/components/api/che-permissions.factory.ts b/dashboard/src/components/api/che-permissions.factory.ts
@@ -191,6 +191,8 @@ export class ChePermissions implements che.api.IChePermissions {
     promise.then((systemPermissions: che.api.ISystemPermissions) => {
       this.updateUserServices(systemPermissions);
       this.systemPermissions = systemPermissions;
+    }, (error: any) => {
+        // noop
     });
 
     return promise;