fix: #89 added reset_id_customer and solve some issues

Author: daros10

src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.html

@@ -13,7 +13,7 @@
 
       <input
         class="form-control form-control-sm"
-        id="name"
+        id="customerName"
         type="text"
         formControlName="name"
         placeholder="Customer name"
@@ -27,7 +27,7 @@
       >
       <textarea
         class="form-control form-control-sm mt-2"
-        id="description"
+        id="customerDescription"
         rows="3"
         formControlName="description"
         placeholder="Customer description"

src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.spec.ts

@@ -4,7 +4,7 @@ import { MockStore, provideMockStore } from '@ngrx/store/testing';
 
 import { CreateCustomerComponent } from './create-customer';
 import { CustomerState, CreateCustomer } from 'src/app/modules/customer-management/store';
-import { LoadCustomers } from './../../../../store/customer-management.actions';
+import { LoadCustomers, ResetCustomerToEdit } from './../../../../store/customer-management.actions';
 import { Customer } from 'src/app/modules/shared/models';
 
 describe('CreateCustomerComponent', () => {
@@ -68,9 +68,12 @@ describe('CreateCustomerComponent', () => {
 
   it('should call resetCustomerForm', () => {
     spyOn(component.customerForm, 'reset');
+    spyOn(store, 'dispatch');
 
     component.resetCustomerForm();
 
+    expect(store.dispatch).toHaveBeenCalledTimes(1);
+    expect(store.dispatch).toHaveBeenCalledWith(new ResetCustomerToEdit());
     expect(component.customerForm.reset).toHaveBeenCalled();
   });
 

src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.ts

@@ -10,6 +10,7 @@ import {
   CreateCustomer,
   LoadCustomers,
   UpdateCustomer,
+  ResetCustomerToEdit,
 } from 'src/app/modules/customer-management/store';
 
 @Component({
@@ -92,7 +93,7 @@ export class CreateCustomerComponent implements OnInit, OnDestroy {
   }
 
   resetCustomerForm() {
-    this.showAlert = false;
     this.customerForm.reset();
+    this.store.dispatch(new ResetCustomerToEdit());
   }
 }

src/app/modules/customer-management/services/customer.service.ts

@@ -14,11 +14,7 @@ export class CustomerService {
   constructor(private http: HttpClient, private service: AzureAdB2CService) {}
 
   createCustomer(customerData): Observable<any> {
-    const body = {
-      ...customerData,
-      tenant_id: this.service.getTenantId(),
-    };
-    return this.http.post(this.baseUrl, body);
+    return this.http.post(this.baseUrl, customerData);
   }
 
   getCustomers(): Observable<any> {
@@ -32,9 +28,6 @@ export class CustomerService {
 
   updateCustomer(customerData): Observable<any> {
     const url = `${this.baseUrl}/${customerData.id}`;
-    const body = {
-      ...customerData,
-    };
-    return this.http.put(url, body);
+    return this.http.put(url, customerData);
   }
 }

src/app/modules/customer-management/store/customer-management.actions.spec.ts

@@ -76,4 +76,9 @@ describe('CustomerManagmentActions', () => {
     const setCustomerToEdit = new actions.SetCustomerToEdit('abc');
     expect(setCustomerToEdit.type).toEqual(actions.CustomerManagementActionTypes.SET_CUSTOMER_ID_TO_EDIT);
   });
+
+  it('ResetCustomerToEdit type is CustomerManagementActionTypes.RESET_CustomerId_ID_TO_EDIT', () => {
+    const resetCustomerIdToEdit = new actions.ResetCustomerToEdit();
+    expect(resetCustomerIdToEdit.type).toEqual(actions.CustomerManagementActionTypes.RESET_CUSTOMER_ID_TO_EDIT);
+  });
 });

src/app/modules/customer-management/store/customer-management.actions.ts

@@ -15,6 +15,7 @@ export enum CustomerManagementActionTypes {
   UPDATE_CUSTOMER_SUCCESS = '[CustomerManagement] UPDATE_CUSTOMER_SUCCESS',
   UPDATE_CUSTOMER_FAIL = '[CustomerManagement] UPDATE_CUSTOMER_FAIL',
   SET_CUSTOMER_ID_TO_EDIT = '[CustomerManagement] SET_CUSTOMER_ID_TO_EDIT',
+  RESET_CUSTOMER_ID_TO_EDIT = '[CustomerManagement] RESET_CUSTOMER_ID_TO_EDIT',
 }
 
 export class LoadCustomers implements Action {
@@ -92,6 +93,10 @@ export class SetCustomerToEdit implements Action {
   constructor(public payload: string) {}
 }
 
+export class ResetCustomerToEdit implements Action {
+  public readonly type = CustomerManagementActionTypes.RESET_CUSTOMER_ID_TO_EDIT;
+}
+
 export type CustomerManagementActions =
   | CreateCustomer
   | CreateCustomerSuccess
@@ -105,4 +110,5 @@ export type CustomerManagementActions =
   | UpdateCustomer
   | UpdateCustomerSuccess
   | UpdateCustomerFail
-  | SetCustomerToEdit;
+  | SetCustomerToEdit
+  | ResetCustomerToEdit;

src/app/modules/customer-management/store/customer-management.reducers.spec.ts

@@ -123,4 +123,12 @@ describe('customerManagementReducer', () => {
 
     expect(state.customerIdToEdit).toEqual('1');
   });
+
+  it('on ResetCustomerToEdit, should clean the customerIdToEdit variable', () => {
+    const action = new actions.ResetCustomerToEdit();
+
+    const state = customerManagementReducer(initialState, action);
+
+    expect(state.customerIdToEdit).toEqual('');
+  });
 });

src/app/modules/customer-management/store/customer-management.reducers.ts

@@ -61,6 +61,7 @@ export const customerManagementReducer = (state: CustomerState = initialState, a
         data: state.data,
         isLoading: false,
         message: 'An error occurred, try again later.',
+        customerIdToEdit: '',
       };
     }
 
@@ -87,6 +88,7 @@ export const customerManagementReducer = (state: CustomerState = initialState, a
         data: state.data,
         isLoading: false,
         message: 'Something went wrong deleting customer!',
+        customerIdToEdit: '',
       };
     }
 
@@ -126,6 +128,13 @@ export const customerManagementReducer = (state: CustomerState = initialState, a
       };
     }
 
+    case CustomerManagementActionTypes.RESET_CUSTOMER_ID_TO_EDIT: {
+      return {
+        ...state,
+        customerIdToEdit: '',
+      };
+    }
+
     default:
       return state;
   }

src/app/modules/customer-management/store/customer-management.selectors.ts

@@ -1,4 +1,5 @@
 import { createFeatureSelector, createSelector } from '@ngrx/store';
+import { Customer } from 'src/app/modules/shared/models/customer.model';
 
 import { CustomerState } from './customer-management.reducers';
 export const getCustomerState = createFeatureSelector<CustomerState>('customers');
@@ -10,15 +11,21 @@ export const getStatusMessage = createSelector(getCustomerState, (messageState)
 });
 
 export const allCustomers = createSelector(getCustomerState, (state: CustomerState) => {
-  return state.data;
+  if (state) {
+    return state.data;
+  }
 });
 
 export const customerIdtoEdit = createSelector(getCustomerState, (state: CustomerState) => {
-  return state.customerIdToEdit;
+  if (state) {
+    return state.customerIdToEdit;
+  }
 });
 
 export const getCustomerById = createSelector(allCustomers, customerIdtoEdit, (customers, customerId) => {
-  return customers.find((customer) => {
-    return customer.id === customerId;
-  });
+  if (customers) {
+    return customers.find((customer) => {
+      return customer.id === customerId;
+    });
+  }
 });