Merge branch 'master' into 210-fix-event

Author: enriquezrene

README.md

@@ -52,15 +52,24 @@ Install the following extensions:
 - `Prettier - Code formatter`.
 - Go to user settings (`settings.json`) and enable formatting on save: `"editor.formatOnSave": true`.
 
-### Commit message format
-  A commit message needs to start with one of the following words to bump the application version
-  properly (This application is following a semver strategy for versioning https://semver.org/)
-  ### Sumary
-  - **fix** is equal to Patch Release example: 1.0.1
-  - **feat** is equal to Feature Release example: 1.1.0
-  - **perf** is equal to Breaking Release example: 2.0.0
+### Commit messages format
+  Commit messages' format follows the [Conventional Commits guidelines](https://www.conventionalcommits.org/en/v1.0.0/#summary) specification, 
+  and specifically we are relying on the [Angular commit specifications](https://github.com/angular/angular/blob/22b96b9/CONTRIBUTING.md#-commit-message-guidelines) to bump the [semantic version](https://semver.org/) and generate app change log. 
+  
+  Below there are some common examples you can use for your commit messages:
+
+  - **feat**: A new feature.
+  - **fix**: A bug fix.
+  - **perf**: A code change that improves performance.
+  - **build**: Changes that affect the build system or external dependencies (example scopes: npm, ts configuration).
+  - **ci**: Changes to our CI or CD configuration files and scripts (example scopes: Azure devops, github actions).
+  - **docs**: Documentation only changes.
+  - **refactor**: A code change that neither fixes a bug nor adds a feature.
+  - **style**: Changes that do not affect the meaning of the code (typos, white-space, formatting, missing semi-colons, etc).
+               It is important to mention that this key is not related to css styles. 
+  - **test**: Adding missing tests or correcting existing tests.
   ### Example
-    fix: #48 implement semantic version.
+    fix: #48 implement semantic versioning.
 
 ## Code scaffolding
 Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.

package.json

@@ -75,7 +75,7 @@
   },
   "config": {
     "commit-message-validator": {
-      "pattern": "^(fix: #|feat: #|perf: #)[0-9].*",
+      "pattern": "^(fix: #|feat: #|perf: #|build: #|ci: #|docs: #|refactor: #|style: #|test: #)[0-9].*",
       "errorMessage": "Your commit message needs to start with fix:, feat:, or perf: followed by issue number, e.g. fix: #43 any commit message"
     }
   },

src/app/modules/time-clock/components/entry-fields/entry-fields.component.html

@@ -20,6 +20,8 @@
     </div>
     <input
       (keyup)="getTechnologies($event.target.value)"
+      id="technology"
+      formControlName="technology"
       type="text"
       class="form-control"
       aria-label="Small"

src/app/modules/time-clock/components/entry-fields/entry-fields.component.spec.ts

@@ -56,6 +56,7 @@ describe('EntryFieldsComponent', () => {
     project_id: 'project-id-15',
     description: 'description for active entry',
     uri: 'abc',
+    technology: '',
   };
 
   beforeEach(async(() => {

src/app/modules/time-clock/components/entry-fields/entry-fields.component.ts

@@ -42,6 +42,7 @@ export class EntryFieldsComponent implements OnInit {
     this.entryForm = this.formBuilder.group({
       description: '',
       uri: '',
+      technology: '',
     });
   }
 
@@ -102,6 +103,8 @@ export class EntryFieldsComponent implements OnInit {
       this.store.dispatch(
         new entryActions.UpdateActiveEntry({ ...this.newData, technologies: this.selectedTechnology })
       );
+      this.showlist = false;
+      this.entryForm.get('technology').reset();
     }
   }
 

src/app/modules/time-clock/pages/time-clock.component.html

@@ -1,8 +1,5 @@
+<app-notification [notificationMsg]="message | async" [isError]="isError" *ngIf="showNotification"></app-notification>
 <div class="text-center mt-3">
-  <div class="alert alert-danger" role="alert">
-    {{message}}
-  </div>
-
   <div class="card">
     <div class="card-body">
       <h6 class="text-left"><strong>Summary</strong></h6>

src/app/modules/time-clock/pages/time-clock.component.spec.ts

@@ -1,21 +1,21 @@
-import { StopTimeEntryRunning } from './../store/entry.actions';
+import {EntryActionTypes, StopTimeEntryRunning } from './../store/entry.actions';
 import { async, ComponentFixture, TestBed, inject } from '@angular/core/testing';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { provideMockStore, MockStore } from '@ngrx/store/testing';
 
 import { TimeClockComponent } from './time-clock.component';
 import { ProjectState } from '../../customer-management/components/projects/components/store/project.reducer';
 import { ProjectListHoverComponent } from '../components';
-import { ProjectService } from '../../customer-management/components/projects/components/services/project.service';
 import { FilterProjectPipe } from '../../shared/pipes';
 import { AzureAdB2CService } from '../../login/services/azure.ad.b2c.service';
+import {ActionsSubject} from '@ngrx/store';
 
 describe('TimeClockComponent', () => {
   let component: TimeClockComponent;
   let fixture: ComponentFixture<TimeClockComponent>;
   let store: MockStore<ProjectState>;
-  let projectService: ProjectService;
   let azureAdB2CService: AzureAdB2CService;
+  const actionSub: ActionsSubject = new ActionsSubject();
   const state = {
     projects: {
       projects: [{ id: 'id', name: 'name', project_type_id: '' }],
@@ -44,7 +44,10 @@ describe('TimeClockComponent', () => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule],
       declarations: [TimeClockComponent, ProjectListHoverComponent, FilterProjectPipe],
-      providers: [ProjectService, AzureAdB2CService, provideMockStore({ initialState: state })],
+      providers: [
+        AzureAdB2CService,
+        { provide: ActionsSubject, useValue: actionSub },
+        provideMockStore({ initialState: state })],
     }).compileComponents();
     store = TestBed.inject(MockStore);
   }));
@@ -53,7 +56,6 @@ describe('TimeClockComponent', () => {
     fixture = TestBed.createComponent(TimeClockComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
-    projectService = TestBed.inject(ProjectService);
     azureAdB2CService = TestBed.inject(AzureAdB2CService);
   });
 
@@ -77,13 +79,6 @@ describe('TimeClockComponent', () => {
     expect(azureAdB2CService.getName).toHaveBeenCalledTimes(0);
   });
 
-  it('Service injected via inject(...) and TestBed.get(...) should be the same instance', inject(
-    [ProjectService],
-    (injectService: ProjectService) => {
-      expect(injectService).toBe(projectService);
-    }
-  ));
-
   it('clockOut dispatch a StopTimeEntryRunning action', () => {
     spyOn(store, 'dispatch');
 
@@ -92,4 +87,22 @@ describe('TimeClockComponent', () => {
     expect(store.dispatch).toHaveBeenCalledWith(new StopTimeEntryRunning('id'));
   });
 
+  it('on success create entry, the notification is shown', () => {
+    const actionSubject = TestBed.get(ActionsSubject) as ActionsSubject;
+    const action = {
+      type: EntryActionTypes.CREATE_ENTRY_SUCCESS
+    };
+    actionSubject.next(action);
+    expect(component.showNotification).toEqual(true);
+  });
+
+  it('on success stop entry, the notification is shown', () => {
+    const actionSubject = TestBed.get(ActionsSubject) as ActionsSubject;
+    const action = {
+      type: EntryActionTypes.STOP_TIME_ENTRY_RUNNING_SUCCESS
+    };
+    actionSubject.next(action);
+    expect(component.showNotification).toEqual(true);
+  });
+
 });

src/app/modules/time-clock/pages/time-clock.component.ts

@@ -1,27 +1,32 @@
-import { getStatusMessage } from './../../customer-management/store/customer-management.selectors';
-import { getActiveTimeEntry } from './../store/entry.selectors';
-import { StopTimeEntryRunning } from './../store/entry.actions';
-import { Entry } from './../../shared/models/entry.model';
-import { Store, select } from '@ngrx/store';
-import { Component, OnInit } from '@angular/core';
-import { AzureAdB2CService } from '../../login/services/azure.ad.b2c.service';
+import {getStatusMessage} from './../../time-clock/store/entry.selectors';
+import {getActiveTimeEntry} from './../store/entry.selectors';
+import {EntryActionTypes, StopTimeEntryRunning} from './../store/entry.actions';
+import {Entry} from './../../shared/models/entry.model';
+import {Store, select, ActionsSubject} from '@ngrx/store';
+import {Component, OnInit} from '@angular/core';
+import {AzureAdB2CService} from '../../login/services/azure.ad.b2c.service';
+import {Observable, Subscription} from 'rxjs';
+import {filter} from 'rxjs/operators';
 
 @Component({
   selector: 'app-time-clock',
   templateUrl: './time-clock.component.html',
   styleUrls: ['./time-clock.component.scss'],
 })
 export class TimeClockComponent implements OnInit {
-
   username: string;
   areFieldsVisible = false;
   activeTimeEntry: Entry;
-  message: string;
+  message: Observable<string>;
+  showNotification = false;
+  isError = false;
+  actionsSubscription: Subscription;
 
-  constructor(private azureAdB2CService: AzureAdB2CService, private store: Store<Entry>) {
+  constructor(private azureAdB2CService: AzureAdB2CService, private store: Store<Entry>, private actionsSubject$: ActionsSubject) {
   }
 
   ngOnInit() {
+    this.message = this.store.pipe(select(getStatusMessage));
     this.username = this.azureAdB2CService.isLogin() ? this.azureAdB2CService.getName() : '';
     this.store.pipe(select(getActiveTimeEntry)).subscribe((activeTimeEntry) => {
       this.activeTimeEntry = activeTimeEntry;
@@ -31,8 +36,12 @@ export class TimeClockComponent implements OnInit {
         this.areFieldsVisible = false;
       }
     });
-    this.store.pipe(select(getStatusMessage)).subscribe((valueMessage) => {
-      this.message = valueMessage;
+
+    this.actionsSubscription = this.actionsSubject$.pipe(
+      filter((action: any) => (action.type === EntryActionTypes.CREATE_ENTRY_SUCCESS) ||
+        action.type === EntryActionTypes.STOP_TIME_ENTRY_RUNNING_SUCCESS)
+    ).subscribe((action) => {
+      this.displayNotification();
     });
   }
 
@@ -41,4 +50,8 @@ export class TimeClockComponent implements OnInit {
     this.areFieldsVisible = false;
   }
 
+  displayNotification() {
+    this.showNotification = true;
+    setTimeout(() => ((this.showNotification = false), (this.isError = false)), 3000);
+  }
 }

src/app/modules/time-clock/store/entry.actions.spec.ts

@@ -29,11 +29,11 @@ describe('Actions for Entries', () => {
       project_id: '1',
       description: 'It is good for learning',
     });
-    expect(updateActiveEntrySuccess.type).toEqual(actions.EntryActionTypes.UDPATE_ACTIVE_ENTRY_SUCCESS);
+    expect(updateActiveEntrySuccess.type).toEqual(actions.EntryActionTypes.UPDATE_ACTIVE_ENTRY_SUCCESS);
   });
 
   it('UpdateActiveEntryFail type is EntryActionTypes.UDPATE_ACTIVE_ENTRY_FAIL', () => {
     const updateActiveEntryFail = new actions.UpdateActiveEntryFail('error');
-    expect(updateActiveEntryFail.type).toEqual(actions.EntryActionTypes.UDPATE_ACTIVE_ENTRY_FAIL);
+    expect(updateActiveEntryFail.type).toEqual(actions.EntryActionTypes.UPDATE_ACTIVE_ENTRY_FAIL);
   });
 });

src/app/modules/time-clock/store/entry.actions.ts

@@ -8,9 +8,9 @@ export enum EntryActionTypes {
   CREATE_ENTRY = '[Entry] CREATE_ENTRY',
   CREATE_ENTRY_SUCCESS = '[Entry] CREATE_ENTRY_SUCCESS',
   CREATE_ENTRY_FAIL = '[Entry] CREATE_ENTRY_FAIL',
-  UDPATE_ACTIVE_ENTRY = '[Entry] UDPATE_ACTIVE_ENTRY',
-  UDPATE_ACTIVE_ENTRY_SUCCESS = '[Entry] UDPATE_ACTIVE_ENTRY_SUCCESS',
-  UDPATE_ACTIVE_ENTRY_FAIL = '[Entry] UDPATE_ACTIVE_ENTRY_FAIL',
+  UPDATE_ACTIVE_ENTRY = '[Entry] UPDATE_ACTIVE_ENTRY',
+  UPDATE_ACTIVE_ENTRY_SUCCESS = '[Entry] UPDATE_ACTIVE_ENTRY_SUCCESS',
+  UPDATE_ACTIVE_ENTRY_FAIL = '[Entry] UPDATE_ACTIVE_ENTRY_FAIL',
   STOP_TIME_ENTRY_RUNNING = '[Entry] STOP_TIME_ENTRIES_RUNNING',
   STOP_TIME_ENTRY_RUNNING_SUCCESS = '[Entry] STOP_TIME_ENTRIES_RUNNING_SUCCESS',
   STOP_TIME_ENTRY_RUNNING_FAILED = '[Entry] STOP_TIME_ENTRIES_RUNNING_FAILED',
@@ -50,19 +50,19 @@ export class CreateEntryFail implements Action {
 }
 
 export class UpdateActiveEntry implements Action {
-  public readonly type = EntryActionTypes.UDPATE_ACTIVE_ENTRY;
+  public readonly type = EntryActionTypes.UPDATE_ACTIVE_ENTRY;
 
   constructor(public payload: NewEntry) {}
 }
 
 export class UpdateActiveEntrySuccess implements Action {
-  public readonly type = EntryActionTypes.UDPATE_ACTIVE_ENTRY_SUCCESS;
+  public readonly type = EntryActionTypes.UPDATE_ACTIVE_ENTRY_SUCCESS;
 
   constructor(public payload: NewEntry) {}
 }
 
 export class UpdateActiveEntryFail implements Action {
-  public readonly type = EntryActionTypes.UDPATE_ACTIVE_ENTRY_FAIL;
+  public readonly type = EntryActionTypes.UPDATE_ACTIVE_ENTRY_FAIL;
 
   constructor(public error: string) {}
 }