fix(arc-saas): changes in tenant component

changes in tenant component

GH-76

Author: Deepika516

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

@@ -16,11 +16,6 @@ <h2 class="heading">Onboarded Tenant List</h2>
         </div>
       </div>
 
-      <!-- loader -->
-      <!-- <div *ngIf="loading" class="loader-overlay">
-        <div class="loader"></div>
-      </div> -->
-
       <!-- ag-grid -->
       <div class="grid-wrapper">
         <div class="grid">

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

@@ -3,7 +3,7 @@
 .ag-theme-alpine {
   width: 100%;
   height: 100%;
-  overflow-x: auto; /* Enable horizontal scroll */
+  overflow-x: auto; 
 }
 
 .header-wrapper {
@@ -17,7 +17,6 @@
   color: #19a5ff;
 }
 
-// for test
 .loader-overlay {
   position: fixed;
   top: 0;

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

@@ -134,26 +134,36 @@ export class OnboardingTenantListComponent extends RouteComponentBaseDirective {
 
   getTenantDetails() {
     this.tenantFacade.getTenantDetails().subscribe(resp => {
-      console.log(resp);
       this.rowData = resp.map(item => {
-        const addressString = `${item.address.zip}, ${item.address.country}`;
-        const tenantName = `${item.contacts[0].firstName} ${item.contacts[0].lastName}`;
+        if (item) {
+          const fullTenantName = [
+            item.contacts[0]?.firstName,
+            '    ',
+            item.contacts[0]?.lastName,
+          ]
+            .filter(ele => ele != null && ele.trim() != '')
+            .join(' ');
 
-        return {
-          id: item.id,
-          name: item.name,
-          tenant_name: tenantName,
-          email: item.contacts[0].email,
-          address: addressString,
-          planName: item.subscription?.plan.name,
-          status: TenantStatus[item.subscription?.status],
-          startDate: item.subscription?.startDate
-            ? new Date(item.subscription.startDate).toLocaleDateString()
-            : 'N/A',
-          endDate: item.subscription?.endDate
-            ? new Date(item.subscription.endDate).toLocaleDateString()
-            : 'N/A',
-        };
+          const addressString = [item.address.zip, '    ', item.address.country]
+            .filter(ele => ele != null && ele.trim() != '')
+            .join(' ');
+
+          return {
+            id: item.id,
+            name: item.name,
+            tenant_name: fullTenantName,
+            email: item.contacts[0].email,
+            address: addressString,
+            planName: item.subscription?.plan.name,
+            status: TenantStatus[item.subscription?.status],
+            startDate: item.subscription?.startDate
+              ? new Date(item.subscription.startDate).toLocaleDateString()
+              : 'N/A',
+            endDate: item.subscription?.endDate
+              ? new Date(item.subscription.endDate).toLocaleDateString()
+              : 'N/A',
+          };
+        }
       });
       if (this.gridApi) {
         this.gridApi.setRowData(this.rowData);

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

@@ -1,4 +1,4 @@
-$primary-color: #f50057;  // You can replace with your app's primary color
+$primary-color: #f50057; 
 $secondary-color: #6c757d;
 $background-color: #f8f9fa;
 $text-color: #343a40;

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

@@ -69,14 +69,13 @@ export class TenantDetailComponent {
           }
         },
         error => {
-          console.error('Error fetching tenant data:', error);
+          console.error('Error fetching tenant data:', error); // NOSONAR
         },
       );
     }
   }
 
   backToPriviousPage() {
-    console.log('Go back to the previous page');
     this.router.navigate(['main/onboard-tenant-list']);
   }
 }