Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
#64 Rename actions
  • Loading branch information
jorgecod committed Apr 7, 2020
commit 989a1258babe3079892e20ca59b8929ccb10fda3
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class ProjectListComponent implements OnInit {
constructor(private store: Store<any>) {}

ngOnInit(): void {
this.store.dispatch(new actions.GetProjectsLoad());
this.store.dispatch(new actions.LoadProjects());
const projects$ = this.store.pipe(select(allProjects));

projects$.subscribe((response) => {
Expand Down
12 changes: 6 additions & 6 deletions src/app/modules/project-management/store/project.actions.spec.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import * as actions from './project.actions';

describe('Actions for Projects', () => {
it('GetProjectsSuccess type is ProjectActionTypes.GET_PROJECTS_SUCCESS', () => {
const getProjectsSuccess = new actions.GetProjectsSuccess([]);
expect(getProjectsSuccess.type).toEqual(actions.ProjectActionTypes.GET_PROJECTS_SUCCESS);
it('LoadProjectsSuccess type is ProjectActionTypes.LOAD_PROJECTS_SUCCESS', () => {
const loadProjectsSuccess = new actions.LoadProjectsSuccess([]);
expect(loadProjectsSuccess.type).toEqual(actions.ProjectActionTypes.LOAD_PROJECTS_SUCCESS);
});

it('getProjectsFail type is ProjectActionTypes.GET_PROJECTS_FAIL', () => {
const getProjectsFail = new actions.GetProjectsFail('error');
expect(getProjectsFail.type).toEqual(actions.ProjectActionTypes.GET_PROJECTS_FAIL);
it('LoadProjectsFail type is ProjectActionTypes.LOAD_PROJECTS_FAIL', () => {
const loadProjectsFail = new actions.LoadProjectsFail('error');
expect(loadProjectsFail.type).toEqual(actions.ProjectActionTypes.LOAD_PROJECTS_FAIL);
});

it('CreateProjectSuccess type is ProjectActionTypes.CREATE_PROJECT_SUCCESS', () => {
Expand Down
24 changes: 12 additions & 12 deletions src/app/modules/project-management/store/project.actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { Action } from '@ngrx/store';
import { Project } from '../../shared/models';

export enum ProjectActionTypes {
GET_PROJECTS = '[Projects] GET_PROJECTS',
GET_PROJECTS_SUCCESS = '[Projects] GET_PROJECTS_SUCCESS',
GET_PROJECTS_FAIL = '[Projects] GET_PROJECTS_FAIL',
LOAD_PROJECTS = '[Projects] LOAD_PROJECTS',
LOAD_PROJECTS_SUCCESS = '[Projects] LOAD_PROJECTS_SUCCESS',
LOAD_PROJECTS_FAIL = '[Projects] LOAD_PROJECTS_FAIL',
CREATE_PROJECT = '[Projects] CREATE_PROJECT',
CREATE_PROJECT_SUCCESS = '[Projects] CREATE_PROJECT_SUCCESS',
CREATE_PROJECT_FAIL = '[Projects] CREATE_PROJECT_FAIL',
Expand All @@ -13,17 +13,17 @@ export enum ProjectActionTypes {
UPDATE_PROJECT_FAIL = '[Projects] UPDATE_PROJECT_FAIL',
}

export class GetProjectsLoad implements Action {
public readonly type = ProjectActionTypes.GET_PROJECTS;
export class LoadProjects implements Action {
public readonly type = ProjectActionTypes.LOAD_PROJECTS;
}

export class GetProjectsSuccess implements Action {
readonly type = ProjectActionTypes.GET_PROJECTS_SUCCESS;
export class LoadProjectsSuccess implements Action {
readonly type = ProjectActionTypes.LOAD_PROJECTS_SUCCESS;
constructor(readonly payload: Project[]) {}
}

export class GetProjectsFail implements Action {
public readonly type = ProjectActionTypes.GET_PROJECTS_FAIL;
export class LoadProjectsFail implements Action {
public readonly type = ProjectActionTypes.LOAD_PROJECTS_FAIL;

constructor(public error: string) {}
}
Expand Down Expand Up @@ -65,9 +65,9 @@ export class UpdateProjectFail implements Action {
}

export type ProjectActions =
| GetProjectsLoad
| GetProjectsSuccess
| GetProjectsFail
| LoadProjects
| LoadProjectsSuccess
| LoadProjectsFail
| CreateProject
| CreateProjectSuccess
| CreateProjectFail
Expand Down
8 changes: 4 additions & 4 deletions src/app/modules/project-management/store/project.effects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ export class ProjectEffects {
constructor(private actions$: Actions, private projectService: ProjectService, private store: Store<any>) {}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you're not using the store at all. Why are we injecting it here?


@Effect()
getProjects$: Observable<Action> = this.actions$.pipe(
ofType(actions.ProjectActionTypes.GET_PROJECTS),
loadProjects$: Observable<Action> = this.actions$.pipe(
ofType(actions.ProjectActionTypes.LOAD_PROJECTS),
mergeMap(() =>
this.projectService.getProjects().pipe(
map((project) => {
return new actions.GetProjectsSuccess(project);
return new actions.LoadProjectsSuccess(project);
}),
catchError((error) => of(new actions.GetProjectsFail(error)))
catchError((error) => of(new actions.LoadProjectsFail(error)))
)
)
);
Expand Down
12 changes: 6 additions & 6 deletions src/app/modules/project-management/store/project.reducer.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ import { projectReducer, ProjectState } from './project.reducer';
describe('projectReducer', () => {
const initialState: ProjectState = { projectList: [], isLoading: false };

it('on GetProjects, isLoading is true', () => {
const action = new actions.GetProjectsLoad();
it('on LoadProjects, isLoading is true', () => {
const action = new actions.LoadProjects();
const state = projectReducer(initialState, action);
expect(state.isLoading).toEqual(true);
});

it('on GetProjectsSuccess, projectsFound are saved in the store', () => {
it('on LoadProjectsSuccess, projectsFound are saved in the store', () => {
const projectsFound: Project[] = [{ id: '', name: '', description: '' }];
const action = new actions.GetProjectsSuccess(projectsFound);
const action = new actions.LoadProjectsSuccess(projectsFound);
const state = projectReducer(initialState, action);
expect(state.projectList).toEqual(projectsFound);
});

it('on GetProjectsFail, projectList equal []', () => {
const action = new actions.GetProjectsFail('error');
it('on LoadProjectsFail, projectList equal []', () => {
const action = new actions.LoadProjectsFail('error');
const state = projectReducer(initialState, action);
expect(state.projectList).toEqual([]);
});
Expand Down
6 changes: 3 additions & 3 deletions src/app/modules/project-management/store/project.reducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ export const initialState = {
export const projectReducer = (state: ProjectState = initialState, action: ProjectActions) => {
const projects = [...state.projectList];
switch (action.type) {
case ProjectActionTypes.GET_PROJECTS: {
case ProjectActionTypes.LOAD_PROJECTS: {
return {
...state,
isLoading: true,
};
}
case ProjectActionTypes.GET_PROJECTS_SUCCESS:
case ProjectActionTypes.LOAD_PROJECTS_SUCCESS:
return {
...state,
projectList: action.payload,
isLoading: false,
};

case ProjectActionTypes.GET_PROJECTS_FAIL: {
case ProjectActionTypes.LOAD_PROJECTS_FAIL: {
return {
projectList: [],
isLoading: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class ProjectListHoverComponent implements OnInit {
}

ngOnInit(): void {
this.store.dispatch(new actions.GetProjectsLoad());
this.store.dispatch(new actions.LoadProjects());
const projects$ = this.store.pipe(select(allProjects));

projects$.subscribe((response) => {
Expand Down