fix(arc-saas): chages in add tenant

GH-64

GH-64

Author: Deepika516

projects/arc-lib/src/lib/core/validators.ts

@@ -22,23 +22,11 @@ export function keyValidator(): ValidatorFn {
   };
 }
 
-export function domainMatchValidator(
-  emailControl: AbstractControl,
-  domainControl: AbstractControl,
-): ValidatorFn {
-  return (control: AbstractControl): ValidationErrors | null => {
-    const emailValue = emailControl.value;
-    const domainValue = domainControl.value;
 
-    if (!emailValue || !domainValue) {
-      return null;
-    }
 
-    const emailDomain = emailValue.split('@')[1];
-    if (emailDomain !== domainValue) {
-      return {domainMismatch: true};
-    }
-
-    return null;
+export function domainMatchValidator(emailDomain: string): ValidatorFn {
+  return (control: AbstractControl): {[key: string]: any} | null => {
+    const domainValue = control.value;
+    return domainValue === emailDomain ? null : { 'domainMismatch': true };
   };
 }

projects/saas-ui/src/app/main/components/tenant-registration/tenant-registration.component.ts

@@ -12,7 +12,7 @@ import {Location} from '@angular/common';
 import {BillingPlanService, OnBoardingService} from '../../../shared/services';
 import {AnyObject} from '@project-lib/core/api/backend-filter';
 import {TenantLead} from '../../../shared/models/tenantLead.model';
-import {domainMatchValidator, keyValidator} from '@project-lib/core/validators';
+import { keyValidator} from '@project-lib/core/validators';
 
 @Component({
   selector: 'app-tenant-registration',

projects/saas-ui/src/app/on-boarding/components/add-tenant/add-tenant.component.ts

@@ -9,6 +9,7 @@ import {Location} from '@angular/common';
 import {BillingPlanService} from '../../../shared/services/billing-plan-service';
 import {AnyObject} from '@project-lib/core/api';
 import {keyValidator} from '@project-lib/core/validators';
+import { Lead } from '../../../shared/models';
 
 @Component({
   selector: 'app-add-tenant',
@@ -17,6 +18,7 @@ import {keyValidator} from '@project-lib/core/validators';
 })
 export class AddTenantComponent implements OnInit {
   [x: string]: any;
+  leadData:Lead;
   addTenantForm: FormGroup;
   subscriptionPlans: AnyObject[];
   leadId = '';
@@ -40,6 +42,9 @@ export class AddTenantComponent implements OnInit {
     this.getRadioOptions();
     this.route.params.subscribe(params => {
       this.leadId = params['leadId'];
+      if (this.leadId) {
+        this.getLeadDataById(this.leadId); 
+      }
     });
   }
 
@@ -51,6 +56,7 @@ export class AddTenantComponent implements OnInit {
   onSubmit() {
     if (this.addTenantForm.valid) {
       const domainData = this.addTenantForm.value;
+      console.log(domainData);
       if (typeof domainData.domains === 'string') {
         domainData.domains = [domainData.domains];
       }
@@ -62,4 +68,27 @@ export class AddTenantComponent implements OnInit {
         });
     }
   }
+
+  getLeadDataById(leadId: string) {
+    this.onboardingService.getLeadDetails(leadId).subscribe(
+      (data:Lead) => {
+        this.leadData = data;
+        this.updateDomainFromEmail();
+        console.log('Lead Data:', this.leadData);
+      },
+      error => {
+        this.toastrService.danger('Failed to fetch lead data', 'Error');
+      }
+    );
+  }
+
+  updateDomainFromEmail() {
+    if (this.leadData && this.leadData.email) {
+      const emailDomain = this.leadData.email?.substring(this.leadData.email.lastIndexOf('@') + 1);
+      if (emailDomain) {
+        this.addTenantForm.get('domains').setValue(emailDomain);
+      }
+    }
+  }
 }
+