fix: #29 Fix comments

jorgecod · jorgecod · commit a69a9119037f · 2020-04-14T12:25:02.000-05:00
diff --git a/scripts/populate-keys.sh b/scripts/populate-keys.sh
@@ -4,5 +4,5 @@
 echo 'export const AUTHORITY = "'$AUTHORITY'";' >> src/environments/keys.ts
 echo 'export const CLIENT_ID = "'$CLIENT_ID'";' >> src/environments/keys.ts
 echo 'export const SCOPES = ["'$SCOPES'"];' >> src/environments/keys.ts
-echo 'export const STACK_EXCHANGE_ID = ["'$STACK_EXCHANGE_ID'"];' >> src/environments/keys.ts
-echo 'export const STACK_EXCHANGE_ACCESS_TOKEN = ["'$STACK_EXCHANGE_ACCESS_TOKEN'"];' >> src/environments/keys.ts
+echo 'export const STACK_EXCHANGE_ID = "'$STACK_EXCHANGE_ID'";' >> src/environments/keys.ts
+echo 'export const STACK_EXCHANGE_ACCESS_TOKEN = "'$STACK_EXCHANGE_ACCESS_TOKEN'";' >> src/environments/keys.ts
diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.html b/src/app/modules/shared/components/details-fields/details-fields.component.html
@@ -52,14 +52,14 @@
 
   <app-search-project (changeFilterProject)="filterTechnology = $event"></app-search-project>
   <div *ngIf="isLoading">LOADING...</div>
-  <div *ngIf="technologies" class="d-flex flex-column technology-content">
+  <div *ngIf="technology" class="d-flex flex-column technology-content">
     <div
-      *ngFor="let technology of technologies.items | filterProject: filterTechnology"
-      (click)="setTechnology(technology.name)"
+      *ngFor="let item of technology.items | filterProject: filterTechnology"
+      (click)="setTechnology(item.name)"
       class="technology-list"
-      [ngClass]="{ active: selectedTechnology.includes(technology.name) }"
+      [ngClass]="{ active: selectedTechnology.includes(item.name) }"
     >
-      {{ technology.name }}
+      {{ item.name }}
     </div>
   </div>
   <div class="tags-content d-flex flex-wrap">
diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts
@@ -13,6 +13,7 @@ describe('DetailsFieldsComponent', () => {
   let fixture: ComponentFixture<DetailsFieldsComponent>;
   let store: MockStore<TechnologyState>;
   let mockTechnologySelector;
+  let length;
 
   const state = {
     technologyList: { items: [{ name: 'java' }] },
@@ -53,12 +54,6 @@ describe('DetailsFieldsComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  it('should emit saveEntry event', () => {
-    spyOn(component.saveEntry, 'emit');
-    component.onSubmit();
-    expect(component.saveEntry.emit).toHaveBeenCalledWith(initialData);
-  });
-
   it('should emit ngOnChange without data', () => {
     component.entryToEdit = null;
     component.ngOnChanges();
@@ -71,12 +66,22 @@ describe('DetailsFieldsComponent', () => {
     expect(component.entryForm.value).toEqual(newData);
   });
 
-  it('should dispatch LoadTechnology action #getTechnologies', () => {
+  it('should dispatch FindTechnology action #getTechnologies', () => {
     const value = 'java';
     spyOn(store, 'dispatch');
+    length = value.length;
     component.getTechnologies(value);
 
-    expect(store.dispatch).toHaveBeenCalledWith(new actions.LoadTechnology(value));
+    expect(store.dispatch).toHaveBeenCalledWith(new actions.FindTechnology(value));
+  });
+
+  it('should NOT dispatch FindTechnology action #getTechnologies', () => {
+    const value = 'j';
+    spyOn(store, 'dispatch');
+    length = value.length;
+    component.getTechnologies(value);
+
+    expect(store.dispatch).not.toHaveBeenCalledWith(new actions.FindTechnology(value));
   });
 
   it('should add a new tag #setTechnology', () => {
@@ -102,4 +107,10 @@ describe('DetailsFieldsComponent', () => {
     component.removeTag(index);
     expect(component.selectedTechnology.length).toBe(1);
   });
+
+  it('should emit saveEntry event', () => {
+    spyOn(component.saveEntry, 'emit');
+    component.onSubmit();
+    expect(component.saveEntry.emit).toHaveBeenCalledWith(initialData);
+  });
 });
diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.ts b/src/app/modules/shared/components/details-fields/details-fields.component.ts
@@ -17,7 +17,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
   @Output() saveEntry = new EventEmitter();
   @ViewChild('closeModal') closeModal: ElementRef;
   entryForm: FormGroup;
-  technologies: Technology;
+  technology: Technology;
   filterTechnology = '';
   selectedTechnology: string[] = [];
   isLoading = false;
@@ -35,13 +35,13 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
     const technologies$ = this.store.pipe(select(allTechnologies));
     technologies$.subscribe((response) => {
       this.isLoading = response.isLoading;
-      this.technologies = response.technologyList;
+      this.technology = response.technologyList;
     });
   }
 
   ngOnChanges(): void {
     if (this.entryToEdit) {
-      this.selectedTechnology = this.entryToEdit.technology;
+      this.selectedTechnology = this.entryToEdit.technologies;
 
       this.entryForm.setValue({
         project: this.entryToEdit.project,
@@ -54,7 +54,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
 
   getTechnologies(value) {
     if (value.length >= 2) {
-      this.store.dispatch(new actions.LoadTechnology(value));
+      this.store.dispatch(new actions.FindTechnology(value));
     }
   }
 
diff --git a/src/app/modules/shared/components/modal/modal.component.spec.ts b/src/app/modules/shared/components/modal/modal.component.spec.ts
@@ -33,7 +33,7 @@ describe('ModalComponent', () => {
       startDate: '2020-02-05T15:36:15.887Z',
       endDate: '2020-02-05T18:36:15.887Z',
       activity: 'development',
-      technology: ['Angular', 'TypeScript'],
+      technologies: ['Angular', 'TypeScript'],
     };
 
     spyOn(component.removeList, 'emit');
diff --git a/src/app/modules/shared/models/entry.model.ts b/src/app/modules/shared/models/entry.model.ts
@@ -4,7 +4,7 @@ export interface Entry {
   startDate: string;
   endDate: string;
   activity: string;
-  technology: string[];
+  technologies: string[];
   comments?: string;
   ticket?: string;
 }
diff --git a/src/app/modules/shared/store/technology.actions.spec.ts b/src/app/modules/shared/store/technology.actions.spec.ts
@@ -2,14 +2,14 @@ import * as actions from './technology.actions';
 import { Technology } from '../models';
 
 describe('Actions for Technology', () => {
-  it('LoadTechnologySuccess type is TechnologyActionTypes.LOAD_TECHNOLOGY_SUCCESS', () => {
+  it('FindTechnologySuccess type is TechnologyActionTypes.FIND_TECHNOLOGIES_SUCESS', () => {
     const technologyList: Technology = { items: [{ name: 'java' }, { name: 'javascript' }] };
-    const loadTechnologySuccess = new actions.LoadTechnologySuccess(technologyList);
-    expect(loadTechnologySuccess.type).toEqual(actions.TechnologyActionTypes.LOAD_TECHNOLOGY_SUCCESS);
+    const findTechnologySuccess = new actions.FindTechnologySuccess(technologyList);
+    expect(findTechnologySuccess.type).toEqual(actions.TechnologyActionTypes.FIND_TECHNOLOGIES_SUCESS);
   });
 
-  it('LoadTechnologyFail type is TechnologyActionTypes.LOAD_TECHNOLOGY_FAIL', () => {
-    const loadTechnologyFail = new actions.LoadTechnologyFail('error');
-    expect(loadTechnologyFail.type).toEqual(actions.TechnologyActionTypes.LOAD_TECHNOLOGY_FAIL);
+  it('FindTechnologyFail type is TechnologyActionTypes.FIND_TECHNOLOGIES_FAIL', () => {
+    const findTechnologyFail = new actions.FindTechnologyFail('error');
+    expect(findTechnologyFail.type).toEqual(actions.TechnologyActionTypes.FIND_TECHNOLOGIES_FAIL);
   });
 });
diff --git a/src/app/modules/shared/store/technology.actions.ts b/src/app/modules/shared/store/technology.actions.ts
@@ -2,27 +2,27 @@ import { Action } from '@ngrx/store';
 import { Technology } from '../models/technology.model';
 
 export enum TechnologyActionTypes {
-  LOAD_TECHNOLOGY = '[Technology] LOAD_TECHNOLOGY',
-  LOAD_TECHNOLOGY_SUCCESS = '[Technology] LOAD_TECHNOLOGY_SUCCESS',
-  LOAD_TECHNOLOGY_FAIL = '[Technology] LOAD_TECHNOLOGY_FAIL',
+  FIND_TECHNOLOGIES = '[Technology] FIND_TECHNOLOGIES',
+  FIND_TECHNOLOGIES_SUCESS = '[Technology] FIND_TECHNOLOGIES_SUCESS',
+  FIND_TECHNOLOGIES_FAIL = '[Technology] FIND_TECHNOLOGIES_FAIL ',
 }
 
-export class LoadTechnology implements Action {
-  public readonly type = TechnologyActionTypes.LOAD_TECHNOLOGY;
+export class FindTechnology implements Action {
+  public readonly type = TechnologyActionTypes.FIND_TECHNOLOGIES;
 
   constructor(readonly payload: string) {}
 }
 
-export class LoadTechnologySuccess implements Action {
-  readonly type = TechnologyActionTypes.LOAD_TECHNOLOGY_SUCCESS;
+export class FindTechnologySuccess implements Action {
+  readonly type = TechnologyActionTypes.FIND_TECHNOLOGIES_SUCESS;
 
   constructor(readonly payload: Technology) {}
 }
 
-export class LoadTechnologyFail implements Action {
-  public readonly type = TechnologyActionTypes.LOAD_TECHNOLOGY_FAIL;
+export class FindTechnologyFail implements Action {
+  public readonly type = TechnologyActionTypes.FIND_TECHNOLOGIES_FAIL;
 
   constructor(public error: string) {}
 }
 
-export type TechnologyActions = LoadTechnology | LoadTechnologySuccess | LoadTechnologyFail;
+export type TechnologyActions = FindTechnology | FindTechnologySuccess | FindTechnologyFail;
diff --git a/src/app/modules/shared/store/technology.effects.ts b/src/app/modules/shared/store/technology.effects.ts
@@ -11,15 +11,15 @@ export class TechnologyEffects {
   constructor(private actions$: Actions, private technologyService: TechnologyService) {}
 
   @Effect()
-  loadTechnology$: Observable<Action> = this.actions$.pipe(
-    ofType(actions.TechnologyActionTypes.LOAD_TECHNOLOGY),
-    map((action: actions.LoadTechnology) => action.payload),
+  findTechnology$: Observable<Action> = this.actions$.pipe(
+    ofType(actions.TechnologyActionTypes.FIND_TECHNOLOGIES),
+    map((action: actions.FindTechnology) => action.payload),
     mergeMap((value) =>
       this.technologyService.getTechnologies(value).pipe(
         map((technology) => {
-          return new actions.LoadTechnologySuccess(technology);
+          return new actions.FindTechnologySuccess(technology);
         }),
-        catchError((error) => of(new actions.LoadTechnologyFail(error)))
+        catchError((error) => of(new actions.FindTechnologyFail(error)))
       )
     )
   );
diff --git a/src/app/modules/shared/store/technology.reducers.spec.ts b/src/app/modules/shared/store/technology.reducers.spec.ts
@@ -5,21 +5,21 @@ import { Technology } from '../models/technology.model';
 describe('technologyReducer', () => {
   const initialState: TechnologyState = { technologyList: null, isLoading: false };
 
-  it('on LoadTechnology, isLoading is true', () => {
-    const action = new actions.LoadTechnology('java');
+  it('on FindTechnology, isLoading is true', () => {
+    const action = new actions.FindTechnology('java');
     const state = technologyReducer(initialState, action);
     expect(state.isLoading).toEqual(true);
   });
 
-  it('on LoadTechnologySuccess, technologiesFound are saved in the store', () => {
+  it('on FindTechnologySuccess, technologiesFound are saved in the store', () => {
     const technologiesFound: Technology = { items: [{ name: 'java' }] };
-    const action = new actions.LoadTechnologySuccess(technologiesFound);
+    const action = new actions.FindTechnologySuccess(technologiesFound);
     const state = technologyReducer(initialState, action);
     expect(state.technologyList).toEqual(technologiesFound);
   });
 
-  it('on LoadTechnologyFail, technologyList equal []', () => {
-    const action = new actions.LoadTechnologyFail('error');
+  it('on FindTechnologyFail, technologyList equal []', () => {
+    const action = new actions.FindTechnologyFail('error');
     const state = technologyReducer(initialState, action);
     expect(state.technologyList).toEqual([]);
   });
diff --git a/src/app/modules/shared/store/technology.reducers.ts b/src/app/modules/shared/store/technology.reducers.ts
@@ -13,21 +13,21 @@ export const initialState = {
 
 export const technologyReducer = (state: TechnologyState = initialState, action: TechnologyActions) => {
   switch (action.type) {
-    case TechnologyActionTypes.LOAD_TECHNOLOGY: {
+    case TechnologyActionTypes.FIND_TECHNOLOGIES: {
       return {
         ...state,
         isLoading: true,
       };
     }
 
-    case TechnologyActionTypes.LOAD_TECHNOLOGY_SUCCESS:
+    case TechnologyActionTypes.FIND_TECHNOLOGIES_SUCESS:
       return {
         ...state,
         technologyList: action.payload,
         isLoading: false,
       };
 
-    case TechnologyActionTypes.LOAD_TECHNOLOGY_FAIL: {
+    case TechnologyActionTypes.FIND_TECHNOLOGIES_FAIL: {
       return {
         technologyList: [],
         isLoading: false,
diff --git a/src/app/modules/time-entries/pages/time-entries.component.spec.ts b/src/app/modules/time-entries/pages/time-entries.component.spec.ts
@@ -40,7 +40,7 @@ describe('TimeEntriesComponent', () => {
     startDate: '2020-02-05T15:36:15.887Z',
     endDate: '2020-02-05T18:36:15.887Z',
     activity: 'development',
-    technology: ['Angular', 'TypeScript'],
+    technologies: ['Angular', 'TypeScript'],
     comments: 'No comments',
     ticket: 'EY-25',
   };
@@ -91,7 +91,7 @@ describe('TimeEntriesComponent', () => {
     expect(component.entry.startDate).toBe(entry.startDate);
     expect(component.entry.endDate).toBe(entry.endDate);
     expect(component.entry.activity).toBe(entry.activity);
-    expect(component.entry.technology).toEqual(entry.technology);
+    expect(component.entry.technologies).toEqual(entry.technologies);
   });
 
   it('should save an Entry', () => {
@@ -101,7 +101,6 @@ describe('TimeEntriesComponent', () => {
     expect(component.entryList[0].startDate).toBe('2020-02-05T15:36:15.887Z');
     expect(component.entryList[0].endDate).toBe('2020-02-05T18:36:15.887Z');
     expect(component.entryList[0].activity).toBe('development');
-    expect(component.entryList[0].technology).toEqual(['Angular', 'TypeScript']);
   });
 
   it('should delete a Entry', () => {
diff --git a/src/app/modules/time-entries/pages/time-entries.component.ts b/src/app/modules/time-entries/pages/time-entries.component.ts
@@ -20,7 +20,7 @@ export class TimeEntriesComponent implements OnInit {
       startDate: '2020-02-05T15:36:15.887Z',
       endDate: '2020-02-05T18:36:15.887Z',
       activity: 'development',
-      technology: ['Angular', 'TypeScript'],
+      technologies: ['Angular', 'TypeScript'],
       comments: 'No comments',
       ticket: 'EY-25',
     },
@@ -30,7 +30,7 @@ export class TimeEntriesComponent implements OnInit {
       startDate: '2020-03-15T20:36:15.887Z',
       endDate: '2020-03-15T23:36:15.887Z',
       activity: 'development',
-      technology: ['Angular', 'TypeScript'],
+      technologies: ['Angular', 'TypeScript'],
       comments: 'No comments',
       ticket: 'EY-38',
     },
@@ -40,7 +40,7 @@ export class TimeEntriesComponent implements OnInit {
       startDate: '2020-03-15T23:36:15.887Z',
       endDate: '2020-03-16T05:36:15.887Z',
       activity: 'development',
-      technology: ['Angular', 'TypeScript'],
+      technologies: ['Angular', 'TypeScript'],
       comments: 'No comments',
       ticket: 'EY-225',
     },
@@ -50,7 +50,7 @@ export class TimeEntriesComponent implements OnInit {
       startDate: '2020-03-16T15:36:15.887Z',
       endDate: '2020-03-16T18:36:15.887Z',
       activity: 'development',
-      technology: ['javascript', 'java-stream'],
+      technologies: ['javascript', 'java-stream'],
       comments: 'No comments',
       ticket: 'EY-89',
     },
@@ -60,7 +60,7 @@ export class TimeEntriesComponent implements OnInit {
       startDate: '2020-04-01T09:36:15.887Z',
       endDate: '2020-04-01T15:36:15.887Z',
       activity: 'development',
-      technology: ['javascript', 'java', 'java-stream'],
+      technologies: ['javascript', 'java', 'java-stream'],
       comments: 'No comments',
       ticket: 'EY-59',
     },
@@ -86,7 +86,6 @@ export class TimeEntriesComponent implements OnInit {
     const entryIndex = this.entryList.findIndex((entry) => entry.id === this.entryId);
     this.entryList[entryIndex].project = newData.project;
     this.entryList[entryIndex].activity = newData.activity;
-    this.entryList[entryIndex].technology = newData.technology;
     this.entryList[entryIndex].ticket = newData.jiraTicket;
     this.entryList[entryIndex].comments = newData.notes;
   }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ export interface Entry {`
`4`	`4`	`startDate: string;`
`5`	`5`	`endDate: string;`
`6`	`6`	`activity: string;`
`7`		`- technology: string[];`
	`7`	`+ technologies: string[];`
`8`	`8`	`comments?: string;`
`9`	`9`	`ticket?: string;`
`10`	`10`	`}`