fix(arc-saas): revomed domain n show storge on standard

revomed domain n show storge on standard

GH-64

Author: Deepika516

projects/saas-ui/src/app/main/components/add-plan/add-plan.component.html

@@ -166,10 +166,7 @@ <h3>Plan Configuration</h3>
               </div>
 
               <!-- Plan Storage Size in select-->
-              <div
-                class="input-box-wrapper"
-                *ngIf="addPlanForm.get('tier')?.value === 'PREMIUM'"
-              >
+              <div class="input-box-wrapper" *ngIf="showStorageSize">
                 <div class="input-title">
                   <span>Size</span>
                 </div>
@@ -248,7 +245,7 @@ <h3>Plan Configuration</h3>
             >
               Cancel
             </button>
-
+            
             <button
               nbButton
               size="medium"

projects/saas-ui/src/app/main/components/add-plan/add-plan.component.ts

@@ -1,3 +1,4 @@
+
 import {Component, Inject, OnInit} from '@angular/core';
 import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms';
 import {ActivatedRoute, Router} from '@angular/router';
@@ -246,72 +247,6 @@ export class AddPlanComponent implements OnInit {
       });
   }
 
-  // editPlan() {
-  //   if (this.addPlanForm.valid) {
-  //     const domainData = this.addPlanForm.value;
-  //     domainData.price = parseFloat(domainData.price);
-
-  //     const featuresGroup = this.addPlanForm.get('features') as FormGroup;
-  //     const selectedFeatures = featuresGroup
-  //       ? Object.keys(featuresGroup.controls)
-  //           .filter(
-  //             key =>
-  //               featuresGroup.get(key)?.value !== null &&
-  //               featuresGroup.get(key)?.value !== '',
-  //           )
-  //           .reduce(
-  //             (acc, key) => {
-  //               const feature = this.featureOption.find(f => f.key === key);
-  //               if (feature) {
-  //                 acc[feature.key] = featuresGroup.get(key)?.value;
-  //               }
-  //               return acc;
-  //             },
-  //             {} as {[key: string]: any},
-  //           )
-  //       : {};
-  //     const generalDetailsData = {
-  //       name: domainData.name,
-  //       billingCycleId: domainData.billingCycleId,
-  //       price: domainData.price,
-  //       currencyId: domainData.currencyId,
-  //       description: domainData.description,
-  //       tier: domainData.tier,
-  //       size: domainData.size,
-  //     };
-
-  //     domainData.features = selectedFeatures;
-
-  //     this.billingplanService
-  //       .editPlan(generalDetailsData, this.activateRoute.snapshot.params.id)
-  //       .subscribe(res => {
-  //         this.router.navigate(['/main/plans']);
-  //       });
-
-  //     const updateFeatureDetails: FeatureValues[] = Object.keys(
-  //       selectedFeatures,
-  //     )
-  //       .map(key => {
-  //         const feature = this.featureOption.find(f => f.key === key);
-  //         return {
-  //           featureKey: feature ? feature.id : null,
-  //           strategyKey: 'plan',
-  //           strategyEntityId: this.activateRoute.snapshot.params.id,
-  //           status: true,
-  //           value: selectedFeatures[key].toString(), // Ensure value is always a string
-  //         };
-  //       })
-  //       .filter(item => item.featureKey !== null);
-  //     this.featureListService
-  //       .editFeatures(updateFeatureDetails)
-  //       .subscribe(respFeature => {
-  //         console.log('skip'); //NOSONAR
-  //       });
-  //   } else {
-  //     console.error('Form is invalid');
-  //   }
-  // }
-
   cancelEdit() {
     this.router.navigate(['/main/plans']);
   }
@@ -397,9 +332,9 @@ export class AddPlanComponent implements OnInit {
     }
   }
   onTierChange(selectedTier: string): void {
-    this.showStorageSize = selectedTier === 'PREMIUM';
+    this.showStorageSize = selectedTier === 'STANDARD' || selectedTier === 'PREMIUM';
     if (!this.showStorageSize) {
-      this.addPlanForm.get('storage')?.reset();
+      this.addPlanForm.get('size')?.reset();
     }
   }
 
@@ -457,4 +392,4 @@ export class AddPlanComponent implements OnInit {
     const completedCount = this.task.subtasks!.filter(t => t.completed).length;
     return completedCount > 0 && completedCount < this.task.subtasks!.length;
   }
-}
+}

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

@@ -250,7 +250,7 @@ <h2>Tenant Registration</h2>
                 </div>
               </div>
               <!-- domain -->
-              <div class="input-box">
+              <!-- <div class="input-box">
                 <div class="input-title">
                   <span>Email domain<span class="required">*</span></span>
                 </div>
@@ -275,7 +275,7 @@ <h2>Tenant Registration</h2>
                   Email domain does not match the domain part of the email
                   address.
                 </div>
-              </div>
+              </div> -->
 
               <!--plan design -->
               <div class="plan-card-container">

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

@@ -46,7 +46,7 @@ export class TenantRegistrationComponent {
         zip: ['',[Validators.pattern('^[0-9]+$'),Validators.maxLength(9)]],
         key: ['', [Validators.required, Validators.maxLength(10),
           Validators.pattern('^[a-zA-Z][a-zA-Z0-9]*$')]],
-        domains: ['', Validators.required],
+        domains: [''],
         planId: [''],
       },
       {validators: this.emailDomainMatchValidator},

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

@@ -13,7 +13,7 @@ <h2>Please Complete Your registration</h2>
               <!-- input fields -->
               <div class="input-wrapper">
                 <!-- key -->
-                <div class="input-box">
+                <div class="input-box address-input-box">
                   <div class="input-title">
                     <span
                       >Application Sub domain
@@ -65,7 +65,8 @@ <h2>Please Complete Your registration</h2>
                   </div>
                 </div>
                 <!-- domain -->
-                <div class="input-box">
+                <!-- <div class="input-box">
+
                   <div class="input-title">
                     <span>Email Domain <span class="required">*</span></span>
                   </div>
@@ -90,7 +91,7 @@ <h2>Please Complete Your registration</h2>
                     Email domain does not match the domain part of the email
                     address.
                   </div>
-                </div>
+                </div> -->
               </div>
 
               <!-- Subscription Plans -->

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

@@ -123,6 +123,10 @@
   gap: 20px;
 }
 
+.address-input-box {
+  width: 100%;
+}
+
 .plan-card-box {
   width: 300px;
   border-radius: 8px;

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

@@ -34,7 +34,7 @@ export class AddTenantComponent implements OnInit {
     this.addTenantForm = this.fb.group({
       key: ['', [Validators.required, Validators.maxLength(10),
         Validators.pattern('^[a-zA-Z][a-zA-Z0-9]*$')]],
-      domains: ['', Validators.required],
+      domains: [''],
       planId: [null],
     });
   }
@@ -56,7 +56,6 @@ 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];
       }