fix: TT-106 Resolve Conflicts

Author: VanessaIniguezG

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

@@ -40,7 +40,8 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {
   loadActivitiesSubject;
   loadActiveEntrySubject;
   actionSetDateSubject;
-  exponentialGrowth: Boolean;
+
+  exponentialGrowth;
 
   constructor(
     private featureManagerService: FeatureManagerService,
@@ -58,12 +59,14 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {
     });
   }
 
+
   async ngOnInit(): Promise<void> {
 
     this.exponentialGrowth = await this.isFeatureToggleActivated();
 
     console.log(this.exponentialGrowth);
 
+
     this.store.dispatch(new LoadActivities());
     this.store.dispatch(new entryActions.LoadEntries(new Date().getMonth() + 1, new Date().getFullYear()));
     this.loadActivitiesSubject = this.actionsSubject$
@@ -73,8 +76,10 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {
         this.store.dispatch(new LoadActiveEntry());
       });
 
+
     this.exponentialGrowth  ? this.loadActivitiesSubscribe = this.loadActivitiesSubject : this.loadActivitiesSubject;
 
+
     this.loadActiveEntrySubject = this.actionsSubject$
       .pipe(
         filter(
@@ -94,8 +99,10 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {
         }
       });
 
+
       this.exponentialGrowth  ? this.loadActiveEntrySubscribe = this.loadActiveEntrySubject : this.loadActiveEntrySubject;
 
+
       this.actionSetDateSubject = this.actionsSubject$
       .pipe(filter((action: any) => action.type === EntryActionTypes.LOAD_ACTIVE_ENTRY_SUCCESS))
       .subscribe((action) => {
@@ -111,7 +118,8 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {
         };
       });
 
-      this.exponentialGrowth  ? this.actionSetDateSubscribe = this.actionSetDateSubject : this.actionSetDateSubject;
+      this.exponentialGrowth ? this.actionSetDateSubscribe = this.actionSetDateSubject : this.actionSetDateSubject;
+
   }
 
   get activity_id() {
@@ -198,12 +206,13 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {
 
 
   ngOnDestroy(): void {
-    console.log(this.exponentialGrowth);
+
     if(this.exponentialGrowth){
       this.loadActivitiesSubscribe.unsubscribe();
       this.loadActiveEntrySubscribe.unsubscribe();
       this.actionSetDateSubscribe.unsubscribe();
     }
+
     console.log('Entry Fields OnDestroy');
   }
 

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

@@ -2,6 +2,7 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActionsSubject, select, Store } from '@ngrx/store';
 import { ToastrService } from 'ngx-toastr';
 import { Subscription } from 'rxjs';
+
 import { filter, map } from 'rxjs/operators';
 import { threadId } from 'worker_threads';
 import { AzureAdB2CService } from '../../login/services/azure.ad.b2c.service';
@@ -28,10 +29,12 @@ export class TimeClockComponent implements OnInit, OnDestroy {
    * subscription variables
   */
   storeSubscribe : Subscription;
+
   storeSubject;
   exponentialGrowth;
 
 
+
   constructor(
     private featureManagerService: FeatureManagerService,
     private azureAdB2CService: AzureAdB2CService,
@@ -45,6 +48,7 @@ export class TimeClockComponent implements OnInit, OnDestroy {
     //   this.storeSubscribe.unsubscribe();
     // }
     this.clockOutSubscription.unsubscribe();
+    this.storeSubscribe.unsubscribe();
   }
 
   ngOnInit() {
@@ -56,7 +60,8 @@ export class TimeClockComponent implements OnInit, OnDestroy {
     // console.log('Time-clock', this.exponentialGrowth);
 
     this.username = this.azureAdB2CService.isLogin() ? this.azureAdB2CService.getName() : '';
-    this.storeSubject = this.store.pipe(select(getActiveTimeEntry)).subscribe((activeTimeEntry) => {
+
+    this.storeSubscribe = this.store.pipe(select(getActiveTimeEntry)).subscribe((activeTimeEntry) => {
       this.activeTimeEntry = activeTimeEntry;
       if (this.activeTimeEntry) {
         this.areFieldsVisible = true;