fix(arc-saas): review changes

review changes

GH-64

Author: Deepika516

projects/arc-lib/src/lib/core/auth/auth.service.ts

@@ -379,7 +379,7 @@ export class AuthService {
     const clientSecret = document.createElement('input');
     clientSecret.type = 'hidden';
     clientSecret.name = 'logout_uri';
-    clientSecret.value = '3be3tt3bkl6sf1pkdiurejejm7phdvhd1fnkch7esiva38p6g6v';
+    clientSecret.value = this.appConfig.publicKey;;
     form.appendChild(clientSecret);
     document.body.appendChild(form);
     form.submit();

projects/saas-ui/src/app/main/commands/add-features.command.ts

@@ -14,7 +14,7 @@ export class AddFeaturesCommand<T> extends PostAPICommand<Feature[]> {
     super(
       apiService,
       adapter,
-      `https://arc-saas.net/subscription-service/plans/${planId}/features`,
+      `${appConfig.baseApiUrl}${appConfig.subscriptionServiceUrl}/plans/${planId}/features`,
     );
   }
 }

projects/saas-ui/src/app/main/commands/edit-features.command.ts renamed to projects/saas-ui/src/app/main/commands/edit-features-by-planid.command.ts

@@ -3,7 +3,7 @@ import {ApiService, IAdapter, PatchAPICommand} from '@project-lib/core/api';
 import {Inject} from '@angular/core';
 import {APP_CONFIG} from '@project-lib/app-config';
 import {IAnyObject} from '@project-lib/core/i-any-object';
-export class EditFeaturesCommand<T> extends PatchAPICommand<T> {
+export class EditFeaturesByPlanIdCommand<T> extends PatchAPICommand<T> {
   constructor(
     apiService: ApiService,
     adapter: IAdapter<T>,

projects/saas-ui/src/app/main/commands/get-feature-by-id.command.ts renamed to projects/saas-ui/src/app/main/commands/get-feature-by-planid.command.ts

@@ -6,7 +6,7 @@ import {IAnyObject} from '@project-lib/core/i-any-object';
 import {Plan} from '../../shared/models';
 import {FeatureValues} from '../../shared/models/feature-values.model';
 import {PlanWithFeatures} from '../../shared/models/plans-features.model';
-export class GetFeatureByIdCommand<T> extends GetAPICommand<PlanWithFeatures> {
+export class GetFeatureByPlanIdCommand<T> extends GetAPICommand<PlanWithFeatures> {
   parameters: {};
   constructor(
     apiService: IApiService,

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

@@ -16,6 +16,6 @@ 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 './edit-features.command';
-export * from './get-feature-by-id.command';
+export * from './edit-features-by-planid.command';
+export * from './get-feature-by-planid.command';
 export * from './get-features.command';

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

@@ -16,13 +16,6 @@ <h3>General Details</h3>
               <div class="input-box">
                 <div class="input-title icon-wrapper">
                   <span>Name <span class="required">*</span></span>
-                  <!-- <nb-icon
-                    icon="info-outline"
-                    class="info-icon"
-                    [nbTooltip]="
-                      'Please enter the name of the plan. This is a required field.'
-                    "
-                  ></nb-icon> -->
                 </div>
                 <div class="input-container">
                   <div class="input">
@@ -49,7 +42,7 @@ <h3>General Details</h3>
                 <div class="select">
                   <nb-select
                     class="dropdown-wrapper"
-                    placeholder="Select Plan"
+                    placeholder="Choose Your Plan"
                     status="basic"
                     formControlName="billingCycleId"
                   >
@@ -127,11 +120,6 @@ <h3>General Details</h3>
                     nbInput
                     rows="4"
                   ></textarea>
-                  <!-- <nb-icon
-                      icon="info-outline"
-                      class="info-icon"
-                      nbTooltip="Please write Description about the plan. This field is required."
-                    ></nb-icon> -->
                 </div>
               </div>
             </div>
@@ -235,7 +223,6 @@ <h3>Plan Configuration</h3>
           </div>
 
           <!-- AddPlan button -->
-          <!--  *ngIf="isEditMode" -->
           <div class="regbtn button-wrapper">
             <button
               nbButton

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

@@ -101,7 +101,6 @@ export class AddPlanComponent implements OnInit {
   }
 
   addPlan() {
-    // if (this.addPlanForm.valid) {
     const domainData = this.addPlanForm.value;
     domainData.price = parseFloat(domainData.price);
     domainData.tier = String(domainData.tier);
@@ -211,9 +210,8 @@ export class AddPlanComponent implements OnInit {
     this.billingplanService
       .getPlanById(this.activateRoute.snapshot.params.id)
       .subscribe(response => {
-        // const body = JSON.parse(JSON.stringify(response)).body;
         const tierName = response.tier;
-        // response.tier = JSON.stringify(body.tier);
+       
 
         this.addPlanForm = this.fb.group({
           name: [response.name, Validators.required],
@@ -229,17 +227,13 @@ export class AddPlanComponent implements OnInit {
     this.featureListService
       .getFeatureById(this.activateRoute.snapshot.params.id)
       .subscribe(resp => {
-        // const featureBody = JSON.parse(JSON.stringify(resp)).body;
-        // const features = resp.features;
         const features = resp.features;
-        // (f as any).key
         this.featureValue = resp;
         this.createFeatureControls();
         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,
               features.find(item => item.key === controlName)?.value?.value,
             );
           });
@@ -324,8 +318,6 @@ export class AddPlanComponent implements OnInit {
         .subscribe(respFeature => {
           console.log(respFeature);
         });
-
-      // this.featureListService.editFeatures()
     } else {
       // Handle form validation errors if necessary
       console.error('Form is invalid');
@@ -362,8 +354,6 @@ export class AddPlanComponent implements OnInit {
   getCurrencyDetails() {
     this.billingplanService.getCurrencyDetails().subscribe(response => {
       this.currencyOptions = response;
-
-      // test
       if (this.currencyOptions.length > 0) {
         this.defaultCurrencyId = this.currencyOptions[0].id; 
         this.addPlanForm.get('currencyId').setValue(this.defaultCurrencyId);
@@ -374,7 +364,6 @@ export class AddPlanComponent implements OnInit {
   getBillingCycleDetails() {
     this.billingplanService.getBillingCycles().subscribe(cycleResp => {
       this.billingOptions = cycleResp;
-// test
       if (this.billingOptions.length > 0) {
         this.defaultBillingCycleId = this.billingOptions[0].id; 
         this.addPlanForm.get('billingCycleId').setValue(this.defaultBillingCycleId);

projects/saas-ui/src/app/shared/services/feature-list-service.ts

@@ -18,8 +18,8 @@ import {Observable, catchError, throwError} from 'rxjs';
 import {AddFeaturesCommand} from '../../main/commands/add-features.command';
 import {FeatureValues} from '../models/feature-values.model';
 import {AuthTokenSkipHeader} from '@project-lib/core/constants';
-import {EditFeaturesCommand} from '../../main/commands/edit-features.command';
-import {GetFeatureByIdCommand} from '../../main/commands/get-feature-by-id.command';
+import {EditFeaturesByPlanIdCommand} from '../../main/commands/edit-features-by-planid.command';
+import {GetFeatureByPlanIdCommand} from '../../main/commands/get-feature-by-planid.command';
 import {PlanWithFeatures} from '../models/plans-features.model';
 
 interface BackendFilter<MT extends object = AnyObject> {
@@ -68,8 +68,8 @@ export class FeatureListService {
   }
 
   editFeatures(featureValue: FeatureValues[], planId: string) {
-    const command: EditFeaturesCommand<FeatureValues[]> =
-      new EditFeaturesCommand(
+    const command: EditFeaturesByPlanIdCommand<FeatureValues[]> =
+      new EditFeaturesByPlanIdCommand(
         this.apiService,
         this.anyAdapter,
         planId,
@@ -82,8 +82,8 @@ export class FeatureListService {
   }
 
   getFeatureById(planId: string) {
-    const command: GetFeatureByIdCommand<PlanWithFeatures> =
-      new GetFeatureByIdCommand(
+    const command: GetFeatureByPlanIdCommand<PlanWithFeatures> =
+      new GetFeatureByPlanIdCommand(
         this.apiService,
         this.anyAdapter,
         planId,