fix(arc-saas): review changes

review changes

GH-64

Author: Deepika516

projects/saas-ui/src/app/main/commands/add-features.command.ts renamed to projects/saas-ui/src/app/main/commands/add-features-for-plan.command.ts

@@ -2,7 +2,7 @@ import {PostAPICommand, ApiService, IAdapter} from '@project-lib/core/api';
 import {IAnyObject} from '@project-lib/core/i-any-object';
 import {Plan} from '../../shared/models';
 import {Feature} from '../../shared/interfaces/features';
-export class AddFeaturesCommand<T> extends PostAPICommand<Feature[]> {
+export class AddFeaturesForPlanCommand<T> extends PostAPICommand<Feature[]> {
   parameters: any;
 
   constructor(

projects/saas-ui/src/app/main/commands/get-features.command.ts renamed to projects/saas-ui/src/app/main/commands/get-features-for-plan.command.ts

@@ -2,7 +2,7 @@ import {IApiService, IAdapter, GetAPICommand} from '@project-lib/core/api';
 import {IAnyObject} from '@project-lib/core/i-any-object';
 import {Features} from '../../shared/models/feature.model';
 
-export class GetFeaturesCommand<T> extends GetAPICommand<Features[]> {
+export class GetFeaturesForPlanCommand<T> extends GetAPICommand<Features[]> {
   constructor(
     apiService: IApiService,
     adapter: IAdapter<Features[]>,

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

@@ -15,7 +15,7 @@ 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 './add-features.command';
+export * from './add-features-for-plan.command';
 export * from './edit-features-by-planid.command';
 export * from './get-feature-by-planid.command';
-export * from './get-features.command';
+export * from './get-features-for-plan.command';

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

@@ -1,4 +1,3 @@
-
 import {Component, Inject, OnInit} from '@angular/core';
 import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms';
 import {ActivatedRoute, Router} from '@angular/router';
@@ -38,7 +37,7 @@ export class AddPlanComponent implements OnInit {
   currencyOptions: AnyObject;
   selectedFeatures: Features[];
   featureOption: Features[];
-  featureValue: PlanWithFeatures | any;
+  featureValue: PlanWithFeatures;
   planId: string;
   featureId: string;
   isEditMode = false;
@@ -135,8 +134,7 @@ export class AddPlanComponent implements OnInit {
     domainData.features = featuresGroup ? featuresGroup.value : {};
 
     this.billingplanService.addPlan(generalDetailsData).subscribe(
-      resp => 
-      {
+      resp => {
         this.planId = resp.id;
         const obj: FeatureValues[] = [];
         const planFeatureDetailData = Object.keys(selectedFeatures)
@@ -211,7 +209,6 @@ export class AddPlanComponent implements OnInit {
       .getPlanById(this.activateRoute.snapshot.params.id)
       .subscribe(response => {
         const tierName = response.tier;
-       
 
         this.addPlanForm = this.fb.group({
           name: [response.name, Validators.required],
@@ -233,9 +230,11 @@ export class AddPlanComponent implements OnInit {
         const featuresGroup = this.addPlanForm.get('features') as FormGroup;
         if (featuresGroup) {
           Object.keys(featuresGroup.controls).forEach(controlName => {
-            featuresGroup.get(controlName)?.setValue(
-              features.find(item => item.key === controlName)?.value?.value,
-            );
+            featuresGroup
+              .get(controlName)
+              ?.setValue(
+                features.find(item => item.key === controlName)?.value?.value,
+              );
           });
         }
       });
@@ -324,7 +323,8 @@ export class AddPlanComponent implements OnInit {
     }
   }
   onTierChange(selectedTier: string): void {
-    this.showStorageSize = selectedTier === 'STANDARD' || selectedTier === 'PREMIUM';
+    this.showStorageSize =
+      selectedTier === 'STANDARD' || selectedTier === 'PREMIUM';
     if (!this.showStorageSize) {
       this.addPlanForm.get('size')?.reset();
     }
@@ -355,18 +355,19 @@ export class AddPlanComponent implements OnInit {
     this.billingplanService.getCurrencyDetails().subscribe(response => {
       this.currencyOptions = response;
       if (this.currencyOptions.length > 0) {
-        this.defaultCurrencyId = this.currencyOptions[0].id; 
+        this.defaultCurrencyId = this.currencyOptions[0].id;
         this.addPlanForm.get('currencyId').setValue(this.defaultCurrencyId);
       }
-    
     });
   }
   getBillingCycleDetails() {
     this.billingplanService.getBillingCycles().subscribe(cycleResp => {
       this.billingOptions = cycleResp;
       if (this.billingOptions.length > 0) {
-        this.defaultBillingCycleId = this.billingOptions[0].id; 
-        this.addPlanForm.get('billingCycleId').setValue(this.defaultBillingCycleId);
+        this.defaultBillingCycleId = this.billingOptions[0].id;
+        this.addPlanForm
+          .get('billingCycleId')
+          .setValue(this.defaultBillingCycleId);
       }
     });
   }
@@ -381,4 +382,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/shared/services/feature-list-service.ts

@@ -12,10 +12,10 @@ import {GetPlanAdapter} from '../../on-boarding/adapters';
 import {GetPlanCommand} from '../../on-boarding/commands';
 import {IAnyObject} from '@project-lib/core/i-any-object';
 import {APP_CONFIG} from '@project-lib/app-config';
-import {GetFeaturesCommand} from '../../main/commands/get-features.command';
+import {GetFeaturesForPlanCommand} from '../../main/commands/get-features-for-plan.command';
 import {Features} from '../models/feature.model';
 import {Observable, catchError, throwError} from 'rxjs';
-import {AddFeaturesCommand} from '../../main/commands/add-features.command';
+import {AddFeaturesForPlanCommand} from '../../main/commands/add-features-for-plan.command';
 import {FeatureValues} from '../models/feature-values.model';
 import {AuthTokenSkipHeader} from '@project-lib/core/constants';
 import {EditFeaturesByPlanIdCommand} from '../../main/commands/edit-features-by-planid.command';
@@ -43,24 +43,26 @@ export class FeatureListService {
   ) {}
 
   getFeatures(): Observable<Features[]> {
-    const command: GetFeaturesCommand<Features[]> = new GetFeaturesCommand(
-      this.apiService,
-      this.anyAdapter,
-      this.appConfig,
-    );
+    const command: GetFeaturesForPlanCommand<Features[]> =
+      new GetFeaturesForPlanCommand(
+        this.apiService,
+        this.anyAdapter,
+        this.appConfig,
+      );
     return command.execute();
   }
 
   addFeatures(
     featureValue: FeatureValues[],
     planId: string,
   ): Observable<Features[]> {
-    const command: AddFeaturesCommand<Features[]> = new AddFeaturesCommand(
-      this.apiService,
-      this.anyAdapter,
-      planId,
-      this.appConfig,
-    );
+    const command: AddFeaturesForPlanCommand<Features[]> =
+      new AddFeaturesForPlanCommand(
+        this.apiService,
+        this.anyAdapter,
+        planId,
+        this.appConfig,
+      );
     command.parameters = {
       data: featureValue,
     };