Merge pull request #65 from sourcefuse/GH-63

feat(arc-saas): Enable tenant registration via super admin

Author: yeshamavani

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

@@ -12,3 +12,33 @@ export class CustomValidators {
     };
   }
 }
+
+export function keyValidator(): ValidatorFn {
+  return (control: AbstractControl): {[key: string]: any} | null => {
+    const key = control.value;
+    const maxLength = 10;
+    const isValid = /^[A-Za-z][A-Za-z0-9]{0,9}$/.test(key);
+    return isValid ? null : {keyInvalid: true};
+  };
+}
+
+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;
+  };
+}

projects/saas-ui/src/app/main/commands/index.ts

@@ -15,3 +15,4 @@ export * from './get-total-lead.command';
 export * from './get-total-tenant.command';
 export * from './get-total-plan.command';
 export * from './get-total-billing-plan.command';
+export * from './register-tenant.command';

projects/saas-ui/src/app/main/commands/register-tenant.command.ts

@@ -0,0 +1,24 @@
+import {
+  ApiService,
+  GetListAPICommand,
+  IAdapter,
+  PostAPICommand,
+} from '@project-lib/core/api';
+import {Lead} from '../../shared/models';
+
+import {IAnyObject} from '@project-lib/core/i-any-object';
+import {TenantLead} from '../../shared/models/tenantLead.model';
+
+export class RegisterTenantCommand<T> extends PostAPICommand<TenantLead> {
+  constructor(
+    apiService: ApiService,
+    adapter: IAdapter<TenantLead>,
+    appConfig: IAnyObject,
+  ) {
+    super(
+      apiService,
+      adapter,
+      `${appConfig.baseApiUrl}${appConfig.tenantMgmtFacadeUrl}/tenants`,
+    );
+  }
+}

projects/saas-ui/src/app/main/components/onboarding-tenant-list/onboarding-tenant-list.component.html

@@ -1,7 +1,26 @@
 <div>
   <nb-card accent="danger" class="card-style">
     <nb-card-body>
-      <h2 class="heading">Onboarded Tenant List</h2>
+      <div class="header-wrapper">
+        <h2 class="heading">Onboarded Tenant List</h2>
+        <!-- signup button -->
+        <div class="regbtn">
+          <button
+            nbButton
+            size="medium"
+            status="danger"
+            (click)="registerTenantPage()"
+          >
+            Add tenant
+          </button>
+        </div>
+      </div>
+
+      <!-- loader -->
+      <!-- <div *ngIf="loading" class="loader-overlay">
+        <div class="loader"></div>
+      </div> -->
+
       <!-- ag-grid -->
       <div class="grid">
         <ag-grid-angular

projects/saas-ui/src/app/main/components/onboarding-tenant-list/onboarding-tenant-list.component.scss

@@ -4,3 +4,48 @@
   width: 100%;
   height: 400;
 }
+
+.header-wrapper{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.a {
+  text-decoration: none;
+  color: #19a5ff;
+}
+
+// for test
+.loader-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(255, 255, 255, 0.8);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 1000;
+}
+
+.loader {
+  border: 8px solid #f3f3f3;
+  border-top: 8px solid #3498db;
+  border-radius: 50%;
+  width: 60px;
+  height: 60px;
+  -webkit-animation: spin 2s linear infinite;
+  animation: spin 2s linear infinite;
+}
+
+@-webkit-keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}

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

@@ -1,5 +1,5 @@
 import {Component, Inject, OnInit} from '@angular/core';
-import {ActivatedRoute} from '@angular/router';
+import {ActivatedRoute, Router} from '@angular/router';
 import {RouteComponentBaseDirective} from '@project-lib/core/route-component-base';
 import {
   ColDef,
@@ -35,8 +35,10 @@ export class OnboardingTenantListComponent extends RouteComponentBaseDirective {
     floatingFilter: true,
     resizable: true,
   };
+
   constructor(
     protected override readonly location: Location,
+    private readonly router: Router,
     protected override readonly route: ActivatedRoute,
     private readonly tenantFacade: TenantFacadeService,
     private http: HttpClient,
@@ -106,6 +108,7 @@ export class OnboardingTenantListComponent extends RouteComponentBaseDirective {
         combineLatest([paginatedLeads, totalLead]).subscribe(
           ([data, count]) => {
             params.successCallback(data, count.count);
+            // for test
           },
 
           err => {
@@ -126,7 +129,8 @@ export class OnboardingTenantListComponent extends RouteComponentBaseDirective {
     return this.tenantFacade.getTenantList(filter).pipe(
       map(res => {
         return res.map(item => {
-          const addressString = `${item.address.city}, ${item.address.state}, ${item.address.zip}, ${item.address.country}`;
+          const addressString = ` ${item.address.zip}, ${item.address.country}`;
+          // ${item.address.city}, ${item.address.state},
           return {
             name: item.name,
             key: item.key,
@@ -152,4 +156,8 @@ export class OnboardingTenantListComponent extends RouteComponentBaseDirective {
   getTotal() {
     return this.tenantFacade.getTotalTenant();
   }
+
+  registerTenantPage() {
+    this.router.navigate(['main/create-tenant']);
+  }
 }