Merge e7bcb04 into 05fce31

Author: VanessaIniguez

src/app/modules/shared/feature-toggles/feature-toggle-general/feature-toggle-general.service.spec.ts

@@ -0,0 +1,36 @@
+import { FeatureToggle } from './../../../../../environments/enum';
+import { TestBed } from '@angular/core/testing';
+import { of, Observable } from 'rxjs';
+import { FeatureManagerService } from '../feature-toggle-manager.service';
+import { FeatureToggleGeneralService } from './feature-toggle-general.service';
+
+
+describe('FeatureToggleGeneralService', () => {
+  let featureToggleGeneralService: FeatureToggleGeneralService;
+  let featureManagerService: FeatureManagerService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [{ provide: FeatureManagerService }],
+    });
+    featureToggleGeneralService = TestBed.inject(FeatureToggleGeneralService);
+    featureManagerService = TestBed.inject(FeatureManagerService);
+  });
+
+  it('should be created', () => {
+    expect(featureToggleGeneralService).toBeTruthy();
+  });
+
+  const params = [{ bool: false }, { bool: true }];
+  params.map((param) => {
+    it(`isActivated should return a boolean ${param.bool}`, () => {
+      const toggleName = FeatureToggle.SWITCH_GROUP;
+      // tslint:disable-next-line: no-shadowed-variable
+      featureManagerService.isToggleEnabledForUser = (toggleName) => of(param.bool);
+
+      featureToggleGeneralService.isActivated(toggleName).subscribe((enabled) => {
+        expect(enabled).toBe(param.bool);
+      });
+    });
+  });
+});

src/app/modules/shared/feature-toggles/feature-toggle-general/feature-toggle-general.service.ts

@@ -0,0 +1,16 @@
+import { map } from 'rxjs/operators';
+import { FeatureToggle } from './../../../../../environments/enum';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { FeatureManagerService } from '../feature-toggle-manager.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class FeatureToggleGeneralService {
+  constructor(private featureManagerService: FeatureManagerService) {}
+
+  isActivated(featureToggle: FeatureToggle): Observable<boolean> {
+    return this.featureManagerService.isToggleEnabledForUser(featureToggle);
+  }
+}

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

@@ -16,6 +16,8 @@ import { NgxMaterialTimepickerModule } from 'ngx-material-timepicker';
 import * as moment from 'moment';
 import { DATE_FORMAT_YEAR } from 'src/environments/environment';
 import { FeatureManagerService } from './../../../shared/feature-toggles/feature-toggle-manager.service';
+import { FeatureToggleGeneralService } from './../../../shared/feature-toggles/feature-toggle-general/feature-toggle-general.service';
+import { FeatureToggle } from 'src/environments/enum';
 
 
 describe('EntryFieldsComponent', () => {
@@ -26,7 +28,7 @@ describe('EntryFieldsComponent', () => {
   let mockTechnologySelector;
   let mockProjectsSelector;
   let entryForm;
-  let featureManagerService: FeatureManagerService;
+  let featureToggleGeneralService: FeatureToggleGeneralService;
   const actionSub: ActionsSubject = new ActionsSubject();
   const toastrServiceStub = {
     error: (message?: string, title?: string, override?: Partial<IndividualConfig>) => { },
@@ -117,7 +119,7 @@ describe('EntryFieldsComponent', () => {
     entryForm = TestBed.inject(FormBuilder);
     mockTechnologySelector = store.overrideSelector(allTechnologies, state.technologies);
     mockProjectsSelector = store.overrideSelector(getCustomerProjects, state.projects);
-    featureManagerService = TestBed.inject(FeatureManagerService);
+    featureToggleGeneralService = TestBed.inject(FeatureToggleGeneralService);
   }));
 
   beforeEach(() => {
@@ -431,42 +433,31 @@ describe('EntryFieldsComponent', () => {
   });
 
   it('when feature-toggle "update-entries" enable for the user, the updateEntry function is executes to update the entries', () => {
-    spyOn(featureManagerService, 'isToggleEnabledForUser').and.returnValue(of(true));
+    spyOn(featureToggleGeneralService, 'isActivated').and.returnValue(of(true));
 
     const mockEntry = { ...entry,
       start_date : moment().format(DATE_FORMAT_YEAR),
       start_hour : moment().format('HH:mm'),
       update_last_entry_if_overlap: true
     };
     component.newData = mockEntry;
-    component.isFeatureToggleActivated();
     const expected = { update_last_entry_if_overlap: true };
-    expect(component.newData.update_last_entry_if_overlap).toEqual(expected.update_last_entry_if_overlap);
+    featureToggleGeneralService.isActivated(FeatureToggle.UPDATE_ENTRIES).subscribe(() => {
+      expect(featureToggleGeneralService.isActivated).toHaveBeenCalled();
+      expect(component.newData.update_last_entry_if_overlap).toEqual(expected.update_last_entry_if_overlap);
+    });
   });
 
   it('when FT "update-entries" disable for the user,the UpdateCurrentOrLastEntry function is called to update the entries', () => {
-    spyOn(featureManagerService, 'isToggleEnabledForUser').and.returnValue(of(false));
+    spyOn(featureToggleGeneralService, 'isActivated').and.returnValue(of(false));
 
     const mockEntry = { ...entry,
       start_date : moment().format(DATE_FORMAT_YEAR),
       start_hour : moment().format('HH:mm'),
-      update_last_entry_if_overlap: false
     };
     component.newData = mockEntry;
-    component.isFeatureToggleActivated();
-    const expected = { update_last_entry_if_overlap: false };
-    expect(component.newData.update_last_entry_if_overlap).toEqual(expected.update_last_entry_if_overlap);
-  });
-
-  const toggleValues = [true, false];
-  toggleValues.map((toggleValue) => {
-    it(`when FeatureToggle is ${toggleValue} should return ${toggleValue}`, () => {
-      spyOn(featureManagerService, 'isToggleEnabledForUser').and.returnValue(of(toggleValue));
-
-      const isFeatureToggleActivated: Observable<boolean> = component.isFeatureToggleActivated();
-
-      expect(featureManagerService.isToggleEnabledForUser).toHaveBeenCalled();
-      isFeatureToggleActivated.subscribe((value) => expect(value).toEqual(toggleValue));
+    featureToggleGeneralService.isActivated(FeatureToggle.UPDATE_ENTRIES).subscribe(() => {
+      expect(featureToggleGeneralService.isActivated).toHaveBeenCalled();
     });
   });
 });

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

@@ -1,5 +1,7 @@
+import { AzureAdB2CService } from './../../../login/services/azure.ad.b2c.service';
+import { FeatureToggleGeneralService } from './../../../shared/feature-toggles/feature-toggle-general/feature-toggle-general.service';
 import { ActivityManagementActionTypes } from './../../../activities-management/store/activity-management.actions';
-import { EntryActionTypes, LoadActiveEntry, UpdateCurrentOrLastEntry, UpdateEntry } from './../../store/entry.actions';
+import { EntryActionTypes, LoadActiveEntry, UpdateCurrentOrLastEntry, UpdateEntry, UpdateEntryRunning } from './../../store/entry.actions';
 import { filter, map } from 'rxjs/operators';
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
@@ -17,6 +19,7 @@ import { getTimeEntriesDataSource } from '../../store/entry.selectors';
 import { DATE_FORMAT } from 'src/environments/environment';
 import { Subscription, Observable } from 'rxjs';
 import { FeatureManagerService } from './../../../shared/feature-toggles/feature-toggle-manager.service';
+import { FeatureToggle } from './../../../../../environments/enum';
 
 type Merged = TechnologyState & ProjectState & ActivityState;
 
@@ -44,7 +47,7 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {
     private store: Store<Merged>,
     private actionsSubject$: ActionsSubject,
     private toastrService: ToastrService,
-    private featureManagerService: FeatureManagerService
+    private featureToggleGeneralService: FeatureToggleGeneralService,
   ) {
     this.entryForm = this.formBuilder.group({
       description: '',
@@ -65,7 +68,7 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {
         this.store.dispatch(new LoadActiveEntry());
       });
 
-    this.isEnableToggleSubscription = this.isFeatureToggleActivated().subscribe((flag) => {
+    this.isEnableToggleSubscription = this.featureToggleGeneralService.isActivated(FeatureToggle.UPDATE_ENTRIES).subscribe((flag) => {
       this.isFeatureToggleActive = flag;
     });
 
@@ -192,9 +195,4 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {
     this.loadActiveEntrySubscription.unsubscribe();
     this.actionSetDateSubscription.unsubscribe();
   }
-
-  isFeatureToggleActivated(): Observable<boolean> {
-    return this.featureManagerService.isToggleEnabledForUser('update-entries')
-      .pipe(map((enabled: boolean) => enabled));
-  }
 }

src/environments/enum.ts

@@ -0,0 +1,4 @@
+export enum FeatureToggle {
+    SWITCH_GROUP = 'switch-group',
+    UPDATE_ENTRIES = 'update-entries'
+}