fix(console): orgs list is shown empty when org is removed (#7781)

fix:active orgs not shown when org is removed

Co-authored-by: Livio Spring <[email protected]>

console/src/app/pages/orgs/org-detail/org-detail.component.ts

@@ -15,6 +15,7 @@ import { Member } from 'src/app/proto/generated/zitadel/member_pb';
 import { Metadata } from 'src/app/proto/generated/zitadel/metadata_pb';
 import { Org, OrgState } from 'src/app/proto/generated/zitadel/org_pb';
 import { User } from 'src/app/proto/generated/zitadel/user_pb';
+import { AdminService } from 'src/app/services/admin.service';
 import { Breadcrumb, BreadcrumbService, BreadcrumbType } from 'src/app/services/breadcrumb.service';
 import { GrpcAuthService } from 'src/app/services/grpc-auth.service';
 import { ManagementService } from 'src/app/services/mgmt.service';
@@ -48,6 +49,7 @@ export class OrgDetailComponent implements OnInit, OnDestroy {
     private auth: GrpcAuthService,
     private dialog: MatDialog,
     public mgmtService: ManagementService,
+    private adminService: AdminService,
     private toast: ToastService,
     private router: Router,
     breadcrumbService: BreadcrumbService,
@@ -146,15 +148,34 @@ export class OrgDetailComponent implements OnInit, OnDestroy {
         width: '400px',
       });
 
+      // Before we remove the org we get the current default org
+      // we have to query before the current org is removed
       dialogRef.afterClosed().subscribe((resp) => {
         if (resp) {
-          this.mgmtService
-            .removeOrg()
-            .then(() => {
-              setTimeout(() => {
-                this.router.navigate(['/orgs']);
-              }, 1000);
-              this.toast.showInfo('ORG.TOAST.DELETED', true);
+          this.adminService
+            .getDefaultOrg()
+            .then((response) => {
+              const org = response?.org;
+              if (org) {
+                // We now remove the org
+                this.mgmtService
+                  .removeOrg()
+                  .then(() => {
+                    setTimeout(() => {
+                      // We change active org to default org as
+                      // current org was deleted to avoid Organization doesn't exist
+                      this.auth.setActiveOrg(org);
+                      // Now we visit orgs
+                      this.router.navigate(['/orgs']);
+                    }, 1000);
+                    this.toast.showInfo('ORG.TOAST.DELETED', true);
+                  })
+                  .catch((error) => {
+                    this.toast.showError(error);
+                  });
+              } else {
+                this.toast.showError('ORG.TOAST.DEFAULTORGNOTFOUND', false, true);
+              }
             })
             .catch((error) => {
               this.toast.showError(error);

console/src/app/services/admin.service.ts

@@ -90,6 +90,8 @@ import {
   GetDefaultLanguageResponse,
   GetDefaultLoginTextsRequest,
   GetDefaultLoginTextsResponse,
+  GetDefaultOrgRequest,
+  GetDefaultOrgResponse,
   GetDefaultPasswordChangeMessageTextRequest,
   GetDefaultPasswordChangeMessageTextResponse,
   GetDefaultPasswordlessRegistrationMessageTextRequest,
@@ -429,6 +431,11 @@ export class AdminService {
       this.storageService.getItem('onboarding-dismissed', StorageLocation.local) === 'true' ? true : false;
   }
 
+  public getDefaultOrg(): Promise<GetDefaultOrgResponse.AsObject> {
+    const req = new GetDefaultOrgRequest();
+    return this.grpcService.admin.getDefaultOrg(req, null).then((resp) => resp.toObject());
+  }
+
   public setDefaultOrg(orgId: string): Promise<SetDefaultOrgResponse.AsObject> {
     const req = new SetDefaultOrgRequest();
     req.setOrgId(orgId);

console/src/app/services/mgmt.service.ts

@@ -353,6 +353,7 @@ import {
   RemoveOrgMetadataRequest,
   RemoveOrgMetadataResponse,
   RemoveOrgRequest,
+  RemoveOrgResponse,
   RemovePersonalAccessTokenRequest,
   RemovePersonalAccessTokenResponse,
   RemoveProjectGrantMemberRequest,
@@ -1749,7 +1750,7 @@ export class ManagementService {
     return this.grpcService.mgmt.removeUser(req, null).then((resp) => resp.toObject());
   }
 
-  public removeOrg(): Promise<RemoveUserResponse.AsObject> {
+  public removeOrg(): Promise<RemoveOrgResponse.AsObject> {
     const req = new RemoveOrgRequest();
     return this.grpcService.mgmt.removeOrg(req, null).then((resp) => resp.toObject());
   }