From 57d8ff1ef6a1883002af37bdd46d2c0b5ecae41f Mon Sep 17 00:00:00 2001
From: Miguel Cabrerizo <30386061+doncicuto@users.noreply.github.com>
Date: Tue, 19 Sep 2023 16:12:49 +0200
Subject: [PATCH] fix(console): if Validate Org domains is disabled don't show
 domain verification dialog (#6572)

* fix: don't show verify domain if policy disabled

* fix: refactor code
---
 .../app/pages/domains/domains.component.html  |  2 +-
 .../app/pages/domains/domains.component.ts    | 24 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/console/src/app/pages/domains/domains.component.html b/console/src/app/pages/domains/domains.component.html
index d5acadd19e..ff517b6496 100644
--- a/console/src/app/pages/domains/domains.component.html
+++ b/console/src/app/pages/domains/domains.component.html
@@ -48,7 +48,7 @@
         <button
           mat-icon-button
           [disabled]="(canwrite$ | async) === false || domain.isVerified"
-          *ngIf="canwrite$ | async"
+          *ngIf="(canwrite$ | async) && verifyOrgDomains"
           (click)="verifyDomain(domain)"
         >
           <i class="las la-pen"></i>
diff --git a/console/src/app/pages/domains/domains.component.ts b/console/src/app/pages/domains/domains.component.ts
index 6b1b5abd56..6a957e06c9 100644
--- a/console/src/app/pages/domains/domains.component.ts
+++ b/console/src/app/pages/domains/domains.component.ts
@@ -19,6 +19,7 @@ export class DomainsComponent implements OnInit {
   public domains: Domain.AsObject[] = [];
   public primaryDomain: string = '';
   public InfoSectionType: any = InfoSectionType;
+  public verifyOrgDomains: boolean | undefined;
 
   constructor(
     private mgmtService: ManagementService,
@@ -38,6 +39,10 @@ export class DomainsComponent implements OnInit {
   }
 
   public loadDomains(): void {
+    this.mgmtService.getDomainPolicy().then((result) => {
+      this.verifyOrgDomains = result.policy?.validateOrgDomains;
+    });
+
     this.mgmtService.listOrgDomains().then((result) => {
       this.domains = result.resultList;
       this.primaryDomain = this.domains.find((domain) => domain.isPrimary)?.domainName ?? '';
@@ -68,13 +73,14 @@ export class DomainsComponent implements OnInit {
           .addOrgDomain(domainName)
           .then(() => {
             this.toast.showInfo('ORG.TOAST.DOMAINADDED', true);
-            this.verifyDomain({
-              domainName: domainName,
-              validationType: DomainValidationType.DOMAIN_VALIDATION_TYPE_UNSPECIFIED,
-            });
-            setTimeout(() => {
+            if (this.verifyOrgDomains) {
+              this.verifyDomain({
+                domainName: domainName,
+                validationType: DomainValidationType.DOMAIN_VALIDATION_TYPE_UNSPECIFIED,
+              });
+            } else {
               this.loadDomains();
-            }, 1000);
+            }
           })
           .catch((error) => {
             this.toast.showError(error);
@@ -120,10 +126,8 @@ export class DomainsComponent implements OnInit {
       width: '500px',
     });
 
-    dialogRef.afterClosed().subscribe((reload: boolean) => {
-      if (reload) {
-        this.loadDomains();
-      }
+    dialogRef.afterClosed().subscribe(() => {
+      this.loadDomains();
     });
   }
 }