feat: TT-208 rebase on latest master commit

src/app/modules/activities-management/store/activity-management.actions.ts

@@ -1,6 +1,6 @@
 import { Action } from '@ngrx/store';
 
-import { Activity, Status } from './../../shared/models/activity.model';
+import { Activity, ActivityStatus } from './../../shared/models/activity.model';
 
 export enum ActivityManagementActionTypes {
   LOAD_ACTIVITIES = '[ActivityManagement] LOAD_ACTIVITIES',
@@ -65,7 +65,7 @@ export class ArchiveActivity implements Action {
 export class ArchiveActivitySuccess implements Action {
   public readonly type = ActivityManagementActionTypes.ARCHIVE_ACTIVITY_SUCCESS;
 
-  constructor(public payload: Status) { }
+  constructor(public payload: ActivityStatus) { }
 }
 
 export class ArchiveActivityFail implements Action {
@@ -100,7 +100,7 @@ export class UnarchiveActivity implements Action {
 export class UnarchiveActivitySuccess implements Action {
   public readonly type = ActivityManagementActionTypes.UNARCHIVE_ACTIVITY_SUCCESS;
 
-  constructor(public payload: Status) { }
+  constructor(public payload: ActivityStatus) { }
 }
 export class UnarchiveActivityFail implements Action {
   public readonly type = ActivityManagementActionTypes.UNARCHIVE_ACTIVITY_FAIL;

src/app/modules/activities-management/store/activity-management.effects.ts

@@ -7,7 +7,7 @@ import { catchError, map, mergeMap } from 'rxjs/operators';
 import { ToastrService } from 'ngx-toastr';
 
 import * as actions from './activity-management.actions';
-import { Activity, Status } from './../../shared/models/activity.model';
+import { Activity, ActivityStatus } from './../../shared/models/activity.model';
 import { ActivityService } from './../services/activity.service';
 
 @Injectable()
@@ -59,7 +59,7 @@ export class ActivityEffects {
       id: action.activityId,
       status: 'inactive'
     })),
-    mergeMap((activity: Status) =>
+    mergeMap((activity: ActivityStatus) =>
       this.activityService.deleteActivity(activity.id).pipe(
         map(() => {
           this.toastrService.success(INFO_DELETE_SUCCESSFULLY);
@@ -99,7 +99,7 @@ export class ActivityEffects {
       status: 'active'
     })
     ),
-    mergeMap((activity: Status) =>
+    mergeMap((activity: ActivityStatus) =>
       this.activityService.updateActivity(activity).pipe(
         map((activityData) => {
           this.toastrService.success(INFO_SAVED_SUCCESSFULLY);

src/app/modules/activities-management/store/activity-management.reducers.spec.ts

@@ -1,4 +1,4 @@
-import { Activity, Status } from './../../shared/models/activity.model';
+import { Activity, ActivityStatus } from './../../shared/models/activity.model';
 import * as actions from './activity-management.actions';
 import { activityManagementReducer, ActivityState } from './activity-management.reducers';
 
@@ -68,7 +68,7 @@ describe('activityManagementReducer', () => {
     const currentActivity = { ...activity };
     currentActivity.status = 'active';
     const currentState: ActivityState = { data: [currentActivity], isLoading: false, message: '', activityIdToEdit: '' };
-    const activityArchived: Status = { id: '1', status: 'inactive' };
+    const activityArchived: ActivityStatus = { id: '1', status: 'inactive' };
     const action = new actions.ArchiveActivitySuccess(activityArchived);
     const state = activityManagementReducer(currentState, action);
 
@@ -125,7 +125,7 @@ describe('activityManagementReducer', () => {
 
   it('on UnarchiveActivitySuccess, status activity is change to \"active\" in the store', () => {
     const currentState: ActivityState = { data: [activity], isLoading: false, message: '', activityIdToEdit: '1' };
-    const activityEdited: Status = { id: '1', status: 'active' };
+    const activityEdited: ActivityStatus = { id: '1', status: 'active' };
     const expectedActivity: Activity = { id: '1', name: 'Training', description: 'It is good for learning', status: 'active' };
     const action = new actions.UnarchiveActivitySuccess(activityEdited);
     const state = activityManagementReducer(currentState, action);

src/app/modules/shared/models/activity.model.ts

@@ -19,7 +19,7 @@ export interface ActivityFront {
   btnName: string;
 }
 
-export interface Status {
+export interface ActivityStatus {
   id: string;
   status: string;
 }