fix: #87 fixed issues and remove search component

daros10 · daros10 · commit 2e9aef9c2422 · 2020-04-17T16:26:55.000-05:00
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -39,7 +39,6 @@ import { environment } from '../environments/environment';
 import { CustomerComponent } from './modules/customer-management/pages/customer.component';
 // tslint:disable-next-line: max-line-length
 import { CustomerListComponent } from './modules/customer-management/components/customer-info/components/customer-list/customer-list.component';
-import { SearchComponent } from './modules/customer-management/components/search/search.component';
 // tslint:disable-next-line: max-line-length
 import { ManagementCustomerProjectsComponent } from './modules/customer-management/components/management-customer-projects/management-customer-projects.component';
 import { CreateCustomerComponent } from './modules/customer-management/components/customer-info/components/create-customer/create-customer';
@@ -78,7 +77,6 @@ import { CustomerEffects } from './modules/customer-management/store/customer-ma
     SearchProjectComponent,
     CustomerComponent,
     CustomerListComponent,
-    SearchComponent,
     ManagementCustomerProjectsComponent,
     CreateCustomerComponent,
     CreateProjectComponent,
diff --git a/src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.html b/src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.html
@@ -3,7 +3,7 @@
     <div class="form-group">
       <div
         *ngIf="showAlert && messageToShow !== ''"
-        [ngClass]="{'bg-secondary': messageToShow == 'Customer create successfully!', 'bg-primary': messageToShow != 'Customer create successfully!'}"
+        [ngClass]="{'bg-secondary': messageToShow == 'Customer created successfully!', 'bg-primary': messageToShow != 'Customer created successfully!'}"
         class="alert alert-dismissible fade fade-in show text-white"
         role="alert"
       >
diff --git a/src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.spec.ts b/src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { FormBuilder } from '@angular/forms';
+import { MockStore, provideMockStore } from '@ngrx/store/testing';
 
 import { CreateCustomerComponent } from './create-customer';
-import { MockStore, provideMockStore } from '@ngrx/store/testing';
 import { CustomerState, CreateCustomer } from 'src/app/modules/customer-management/store';
-import { FormBuilder } from '@angular/forms';
-import { Customer } from 'src/app/modules/shared/models/customer.model';
+import * as models from 'src/app/modules/shared/models/index';
 
 describe('CreateCustomerComponent', () => {
   let component: CreateCustomerComponent;
@@ -17,7 +17,7 @@ describe('CreateCustomerComponent', () => {
     message: '',
   };
 
-  const customerData: Customer = {
+  const customerData: models.Customer = {
     name: 'aa',
     description: 'bb',
     tenant_id: 'cc',
@@ -72,8 +72,8 @@ describe('CreateCustomerComponent', () => {
     expect(component.customerForm.reset).toHaveBeenCalled();
   });
 
-  it('should be enable tabs and show message Customer create successfully! ', () => {
-    component.isActiveItemTabs = false;
+  it('should be enable tabs and show message Customer created successfully! ', () => {
+    component.areTabsActive = false;
     component.messageToShow = '';
 
     spyOn(store, 'dispatch');
@@ -82,14 +82,14 @@ describe('CreateCustomerComponent', () => {
 
     component.onSubmit(customerData);
 
-    component.setStatusOnScreen('Customer create successfully!');
+    component.setStatusOnScreen('Customer created successfully!');
 
-    expect(component.messageToShow).toEqual('Customer create successfully!');
-    expect(component.isActiveItemTabs).toBeTrue();
+    expect(component.messageToShow).toEqual('Customer created successfully!');
+    expect(component.areTabsActive).toBeTrue();
   });
 
-  it('should be disabled tabs and show message Something went wrong creating customer! ', () => {
-    component.isActiveItemTabs = false;
+  it('should be disabled tabs and show message An error occurred, try again later. ', () => {
+    component.areTabsActive = false;
     component.messageToShow = '';
 
     spyOn(store, 'dispatch');
@@ -98,9 +98,9 @@ describe('CreateCustomerComponent', () => {
 
     component.onSubmit(customerData);
 
-    component.setStatusOnScreen('Something went wrong creating customer!');
+    component.setStatusOnScreen('An error occurred, try again later.');
 
-    expect(component.messageToShow).toEqual('Something went wrong creating customer!');
-    expect(component.isActiveItemTabs).toBeFalse();
+    expect(component.messageToShow).toEqual('An error occurred, try again later.');
+    expect(component.areTabsActive).toBeFalse();
   });
 });
diff --git a/src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.ts b/src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.ts
@@ -1,8 +1,9 @@
 import { Component, Input, Output, EventEmitter, OnDestroy, OnInit } from '@angular/core';
-import { Store, select } from '@ngrx/store';
-import { CustomerState, CreateCustomer } from 'src/app/modules/customer-management/store';
 import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { Store, select } from '@ngrx/store';
+
 import { Subscription } from 'rxjs';
+import { CustomerState, CreateCustomer } from 'src/app/modules/customer-management/store';
 import { getStatusMessage } from 'src/app/modules/customer-management/store/customer-management.selectors';
 
 @Component({
@@ -12,8 +13,8 @@ import { getStatusMessage } from 'src/app/modules/customer-management/store/cust
 })
 export class CreateCustomerComponent implements OnInit, OnDestroy {
   customerForm: FormGroup;
-  @Input() isActiveItemTabs: boolean;
-  @Output() changeValueIsActiveItemTabs = new EventEmitter<boolean>();
+  @Input() areTabsActive: boolean;
+  @Output() changeValueAreTabsActives = new EventEmitter<boolean>();
   showAlert = false;
   messageToShow = '';
   saveSubscription: Subscription;
@@ -29,12 +30,11 @@ export class CreateCustomerComponent implements OnInit, OnDestroy {
     const messages$ = this.store.pipe(select(getStatusMessage));
     this.saveSubscription = messages$.subscribe((valueMessage) => {
       this.setStatusOnScreen(valueMessage);
-      console.log(valueMessage);
     });
   }
 
   ngOnDestroy() {
-    this.isActiveItemTabs = false;
+    this.areTabsActive = false;
     this.saveSubscription.unsubscribe();
   }
 
@@ -44,14 +44,14 @@ export class CreateCustomerComponent implements OnInit, OnDestroy {
   }
 
   setStatusOnScreen(message: string) {
-    if (message === 'Customer create successfully!') {
+    if (message === 'Customer created successfully!') {
       this.messageToShow = message;
-      this.isActiveItemTabs = true;
-      this.changeValueIsActiveItemTabs.emit(this.isActiveItemTabs);
-    } else if (message === 'Something went wrong creating customer!') {
+      this.areTabsActive = true;
+      this.changeValueAreTabsActives.emit(this.areTabsActive);
+    } else if (message === 'An error occurred, try again later.') {
       this.messageToShow = message;
-      this.isActiveItemTabs = false;
-      this.changeValueIsActiveItemTabs.emit(this.isActiveItemTabs);
+      this.areTabsActive = false;
+      this.changeValueAreTabsActives.emit(this.areTabsActive);
     }
   }
 
diff --git a/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.html b/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.html
@@ -12,10 +12,9 @@
       >
     </li>
     <li class="nav-item">
-      <!--nav-active-->
       <a
         class="nav-link text-black font-weight-bold"
-        [ngClass]="{ 'nav-active': isActiveNavsItemTabs, disabled: !isActiveNavsItemTabs }"
+        [ngClass]="{ 'nav-active': areTabsActive, disabled: !areTabsActive }"
         id="projects-type-tab"
         data-toggle="tab"
         href="#projectsType"
@@ -27,7 +26,7 @@
     <li class="nav-item">
       <a
         class="nav-link text-black font-weight-bold"
-        [ngClass]="{ 'nav-active': isActiveNavsItemTabs, disabled: !isActiveNavsItemTabs }"
+        [ngClass]="{ 'nav-active': areTabsActive, disabled: !areTabsActive }"
         id="projects-tab"
         data-toggle="tab"
         href="#projects"
@@ -45,8 +44,8 @@
       aria-labelledby="customer-information-tab"
     >
       <app-create-customer
-        [isActiveItemTabs]="isActiveNavsItemTabs"
-        (changeValueIsActiveItemTabs)="isActiveNavsItemTabs = $event"
+        [areTabsActive]="areTabsActive"
+        (changeValueAreTabsActives)="areTabsActive = $event"
       ></app-create-customer>
     </div>
     <div class="tab-pane fade mt-3" id="projects" role="tabpanel" aria-labelledby="projects-tab">
diff --git a/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.ts b/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.ts
@@ -6,7 +6,7 @@ import { Component } from '@angular/core';
   styleUrls: ['./management-customer-projects.component.scss'],
 })
 export class ManagementCustomerProjectsComponent {
-  isActiveNavsItemTabs = false;
+  areTabsActive = false;
 
   constructor() {}
 }
diff --git a/src/app/modules/customer-management/components/projects/components/create-project/create-project.component.html b/src/app/modules/customer-management/components/projects/components/create-project/create-project.component.html
@@ -20,7 +20,9 @@
   <hr />
   <div class="row text-right">
     <hr />
-    <app-search></app-search>
+    <div class="col-5 text-right">
+      <app-search-project></app-search-project>
+    </div>
   </div>
   <app-project-list></app-project-list>
 </div>
diff --git a/src/app/modules/customer-management/components/search/search.component.html b/src/app/modules/customer-management/components/search/search.component.html
diff --git a/src/app/modules/customer-management/components/search/search.component.scss b/src/app/modules/customer-management/components/search/search.component.scss
diff --git a/src/app/modules/customer-management/components/search/search.component.spec.ts b/src/app/modules/customer-management/components/search/search.component.spec.ts
diff --git a/src/app/modules/customer-management/components/search/search.component.ts b/src/app/modules/customer-management/components/search/search.component.ts
diff --git a/src/app/modules/customer-management/pages/customer.component.html b/src/app/modules/customer-management/pages/customer.component.html
@@ -4,7 +4,9 @@ <h4>Customers</h4>
     <div class="col">
       <button (click)="activateCustomerForm()" type="button" class="btn btn-primary">Add new customer</button>
     </div>
-    <app-search></app-search>
+    <div class="col-5 text-right">
+      <app-search-project></app-search-project>
+    </div>
   </div>
   <app-customer-list></app-customer-list>
   <div class="row" *ngIf="showCustomerForm">
diff --git a/src/app/modules/customer-management/services/customer.service.spec.ts b/src/app/modules/customer-management/services/customer.service.spec.ts
@@ -1,7 +1,7 @@
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { TestBed, inject } from '@angular/core/testing';
 
 import { CustomerService } from './customer.service';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { Customer } from '../../shared/models/customer.model';
 
 describe('CustomerService', () => {
diff --git a/src/app/modules/customer-management/services/customer.service.ts b/src/app/modules/customer-management/services/customer.service.ts
@@ -1,13 +1,14 @@
 import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+
 import { environment } from './../../../../environments/environment';
 import { Observable } from 'rxjs';
 
 @Injectable({
   providedIn: 'root',
 })
 export class CustomerService {
-  baseUrl = `${environment.timeTrackerApiUrl}/customers`;
+  baseUrl = `https://private-8c3d21-ts32.apiary-mock.com/customers`;
 
   constructor(private http: HttpClient) {}
 
diff --git a/src/app/modules/customer-management/store/customer-management.reducers.spec.ts b/src/app/modules/customer-management/store/customer-management.reducers.spec.ts
@@ -21,11 +21,11 @@ describe('customerManagementReducer', () => {
     expect(state.isLoading).toEqual(false);
   });
 
-  it('on CreateCustomerFail, message equal to Something went wrong creating customer! ', () => {
+  it('on CreateCustomerFail, message equal to An error occurred, try again later. ', () => {
     const action = new actions.CreateCustomerFail('error');
     const state = customerManagementReducer(initialState, action);
 
-    expect(state.message).toEqual('Something went wrong creating customer!');
+    expect(state.message).toEqual('An error occurred, try again later.');
     expect(state.isLoading).toEqual(false);
   });
 });
diff --git a/src/app/modules/customer-management/store/customer-management.reducers.ts b/src/app/modules/customer-management/store/customer-management.reducers.ts
@@ -30,7 +30,7 @@ export function customerManagementReducer(
         ...state,
         data: [action.payload],
         isLoading: false,
-        message: 'Customer create successfully!',
+        message: 'Customer created successfully!',
       };
     }
 
@@ -39,7 +39,7 @@ export function customerManagementReducer(
         ...state,
         data: [],
         isLoading: false,
-        message: 'Something went wrong creating customer!',
+        message: 'An error occurred, try again later.',
       };
     }
 
diff --git a/src/app/modules/shared/components/search-project/search-project.component.html b/src/app/modules/shared/components/search-project/search-project.component.html
@@ -1,3 +1,11 @@
 <div class="form-group">
-  <input (keyup)="changeFilterValue()" type="text" class="form-control" placeholder="&#xF002; Search projects..." name="filterProject" [(ngModel)]="filterProject" style="font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif, FontAwesome">
-</div>
+  <input
+    (keyup)="changeFilterValue()"
+    type="text"
+    class="form-control"
+    placeholder="&#xF002; Search..."
+    name="filterProject"
+    [(ngModel)]="filterProject"
+    style="font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif, FontAwesome;"
+  />
+</div>
diff --git a/src/app/modules/shared/models/index.ts b/src/app/modules/shared/models/index.ts
@@ -2,3 +2,4 @@ export * from './activity.model';
 export * from './entry.model';
 export * from './project.model';
 export * from './technology.model';
+export * from './customer.model';

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`<div class="form-group">`
`4`	`4`	`<div`
`5`	`5`	`*ngIf="showAlert && messageToShow !== ''"`
`6`		`- [ngClass]="{'bg-secondary': messageToShow == 'Customer create successfully!', 'bg-primary': messageToShow != 'Customer create successfully!'}"`
	`6`	`+ [ngClass]="{'bg-secondary': messageToShow == 'Customer created successfully!', 'bg-primary': messageToShow != 'Customer created successfully!'}"`
`7`	`7`	`class="alert alert-dismissible fade fade-in show text-white"`
`8`	`8`	`role="alert"`
`9`	`9`	`>`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import { Component } from '@angular/core';`
`6`	`6`	`styleUrls: ['./management-customer-projects.component.scss'],`
`7`	`7`	`})`
`8`	`8`	`export class ManagementCustomerProjectsComponent {`
`9`		`- isActiveNavsItemTabs = false;`
	`9`	`+ areTabsActive = false;`
`10`	`10`
`11`	`11`	`constructor() {}`
`12`	`12`	`}`