Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h2 class="mb-0">
</a>
<div class="btn-group float-right" role="group">
<i class="far fa-edit btn btn-link text-white"></i>
<i class="far fa-trash-alt btn btn-link text-white"></i>
<i (click)="deleteActivity(activity.id)" class="far fa-trash-alt btn btn-link text-white"></i>
</div>
</h2>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Input, OnInit } from '@angular/core';
import { Component } from '@angular/core';
import { Store, select } from '@ngrx/store';

import { LoadActivities } from './../../store/activity-management.actions';
import { LoadActivities, DeleteActivity } from './../../store/activity-management.actions';
import { ActivityState } from './../../store/activity-management.reducers';
import { allActivities } from '../../store';
import { Activity } from '../../../shared/models';
Expand All @@ -27,4 +27,8 @@ export class ActivityListComponent implements OnInit {
this.activities = response.data;
});
}

deleteActivity(activityId: string) {
this.store.dispatch(new DeleteActivity(activityId));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,14 @@ describe('Activity Service', () => {
expect(createActivitiesRequest.request.method).toBe('POST');
createActivitiesRequest.flush(activity);
});

it('activities are delete using DELETE from baseUrl', () => {
const url = `${service.baseUrl}/1`;
service.deleteActivity(activities[0].id).subscribe((activitiesInResponse) => {
expect(activitiesInResponse.filter((activity) => activity.id !== activities[0].id)).toEqual([activities[1]]);
});
const getActivitiesRequest = httpMock.expectOne(url);
expect(getActivitiesRequest.request.method).toBe('DELETE');
getActivitiesRequest.flush(activities);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,9 @@ export class ActivityService {

return this.http.post(this.baseUrl, body);
}

deleteActivity(acitivityId: string): Observable<any> {
const url = `${this.baseUrl}/${acitivityId}`;
return this.http.delete(url);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ export enum ActivityManagementActionTypes {
CREATE_ACTIVITY = '[ActivityManagement] CREATE_ACTIVITY',
CREATE_ACTIVITY_SUCCESS = '[ActivityManagement] CREATE_ACTIVITY_SUCCESS',
CREATE_ACTIVITY_FAIL = '[ActivityManagement] CREATE_ACTIVITY_FAIL',
DELETE_ACTIVITY = '[ActivityManagement] DELETE_ACTIVITY',
DELETE_ACTIVITY_SUCCESS = '[ActivityManagement] DELETE_ACTIVITY_SUCESS',
DELETE_ACTIVITY_FAIL = '[ActivityManagement] DELETE_ACTIVITY_FAIL',
}

export class LoadActivities implements Action {
Expand Down Expand Up @@ -45,10 +48,31 @@ export class CreateActivityFail implements Action {
constructor(public error: string) {}
}

export class DeleteActivity implements Action {
public readonly type = ActivityManagementActionTypes.DELETE_ACTIVITY;

constructor(public activityId: string) {}
}

export class DeleteActivitySuccess implements Action {
public readonly type = ActivityManagementActionTypes.DELETE_ACTIVITY_SUCCESS;

constructor(public activityId: string) {}
}

export class DeleteActivityFail implements Action {
public readonly type = ActivityManagementActionTypes.DELETE_ACTIVITY_FAIL;

constructor(public error: string) {}
}

export type ActivityManagementActions =
| LoadActivities
| LoadActivitiesSuccess
| LoadActivitiesFail
| CreateActivity
| CreateActivitySuccess
| CreateActivityFail;
| CreateActivityFail
| DeleteActivity
| DeleteActivitySuccess
| DeleteActivityFail;
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,18 @@ export class ActivityEffects {
)
)
);

@Effect()
deleteActivity$: Observable<Action> = this.actions$.pipe(
ofType(actions.ActivityManagementActionTypes.DELETE_ACTIVITY),
map((action: actions.DeleteActivity) => action.activityId),
mergeMap((activityId) =>
this.activityService.deleteActivity(activityId).pipe(
map(() => {
return new actions.DeleteActivitySuccess(activityId);
}),
catchError((error) => of(new actions.DeleteActivityFail(error)))
)
)
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import {
CreateActivitySuccess,
CreateActivityFail,
CreateActivity,
DeleteActivity,
DeleteActivitySuccess,
} from './activity-management.actions';
import { LoadActivitiesSuccess } from './activity-management.actions';
import { activityManagementReducer, ActivityState } from './activity-management.reducers';
Expand Down Expand Up @@ -63,4 +65,13 @@ describe('activityManagementReducer', () => {
expect(state.message).toEqual('Something went wrong creating activities!');
expect(state.isLoading).toEqual(false);
});

it('on DeleteActivity, message equal to Activity removed successfully!', () => {
const activityToDeleteId = '1';
const action = new DeleteActivitySuccess(activityToDeleteId);

const state = activityManagementReducer(initialState, action);

expect(state.message).toEqual('Activity removed successfully!');
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,29 @@ export function activityManagementReducer(state: ActivityState = initialState, a
message: 'Something went wrong creating activities!',
};
}
case ActivityManagementActionTypes.DELETE_ACTIVITY: {
return {
...state,
isLoading: true,
};
}

case ActivityManagementActionTypes.DELETE_ACTIVITY_SUCCESS: {
const activites = state.data.filter((activity) => activity.id !== action.activityId);
return {
data: activites,
isLoading: false,
message: 'Activity removed successfully!',
};
}

case ActivityManagementActionTypes.DELETE_ACTIVITY_FAIL: {
return {
data: [],
isLoading: false,
message: 'Something went wrong deleting activity!',
};
}
default:
return state;
}
Expand Down