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
No commit message
  • Loading branch information
enriquezrene committed Apr 3, 2020
commit c351059e5831e6950c96ad413855df872961b048
8 changes: 3 additions & 5 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { HttpClientModule } from '@angular/common/http';
import { StoreModule } from '@ngrx/store';
import { EffectsModule } from '@ngrx/effects';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';

import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
Expand All @@ -28,11 +31,6 @@ import { FilterProjectPipe } from './modules/shared/pipes/filter-project/filter-
import { SearchProjectComponent } from './modules/shared/components/search-project/search-project.component';
import { HomeComponent } from './modules/home/home.component';
import { LoginComponent } from './modules/login/login.component';

import { StoreModule } from '@ngrx/store';
import { EffectsModule } from '@ngrx/effects';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';

import { ActivityEffects } from './modules/activities-management/store/activity-management.effects';
import { activityManagementReducer } from './modules/activities-management/store';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import { provideMockStore, MockStore } from '@ngrx/store/testing';

import { allActivities } from './../../store/activity-management.selectors';
import { Activity } from './../../../shared/models/activity.model';
import { ActivityState } from './../../store/activity-management.reducers';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { provideMockStore, MockStore } from '@ngrx/store/testing';
import { ActivityListComponent } from './activity-list.component';
import { MemoizedSelector, State } from '@ngrx/store';

describe('ActivityListComponent', () => {
let component: ActivityListComponent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { LoadActivities } from './../../store/activity-management.actions';
import { ActivityState } from './../../store/activity-management.reducers';
import {Input, OnInit} from '@angular/core';
import {Component} from '@angular/core';
import {Activity} from '../../../shared/models';
import { Input, OnInit } from '@angular/core';
import { Component } from '@angular/core';
import { Store, select } from '@ngrx/store';

import { allActivities } from '../../store';
import { LoadActivities } from './../../store/activity-management.actions';
import { ActivityState } from './../../store/activity-management.reducers';
import { Activity } from '../../../shared/models';

@Component({selector: 'app-activity-list', templateUrl: './activity-list.component.html', styleUrls: ['./activity-list.component.scss']})
export class ActivityListComponent implements OnInit {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { TestBed, inject } from '@angular/core/testing';
import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';

import { Activity } from '../../shared/models';
import { ActivityService } from './activity.service';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { environment } from './../../../../environments/environment';
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';

import { environment } from './../../../../environments/environment';
import { Activity } from '../../shared/models';

@Injectable({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { LoadActivitiesFail } from './activity-management.actions';
import { LoadActivitiesSuccess, ActivityManagementActionTypes } from './activity-management.actions';

describe('LoadActivitiesSuccess', () => {

it('LoadActivitiesSuccess type is ActivityManagementActionTypes.LoadActivitiesSuccess', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Activity } from './../../shared/models/activity.model';
import { Action } from '@ngrx/store';

import { Activity } from './../../shared/models/activity.model';

export enum ActivityManagementActionTypes {
LoadActivities = '[ActivityManagement] Load Activities',
LoadActivitiesSuccess = '[ActivityManagement] Load Activities Successs',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { ActivityManagementActionTypes, LoadActivitiesSuccess, LoadActivitiesFail } from './activity-management.actions';
import { Activity } from './../../shared/models/activity.model';
import { ActivityService } from './../services/activity.service';
import { Injectable } from '@angular/core';
import { Actions, Effect, ofType } from '@ngrx/effects';
import { Observable, of } from 'rxjs';
import { Action } from '@ngrx/store';
import { Observable, of } from 'rxjs';
import { catchError, map, mergeMap } from 'rxjs/operators';

import { ActivityManagementActionTypes, LoadActivitiesSuccess, LoadActivitiesFail } from './activity-management.actions';
import { Activity } from './../../shared/models/activity.model';
import { ActivityService } from './../services/activity.service';

@Injectable()
export class ActivityEffects {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { Activity } from './../../shared/models/activity.model';
import { LoadActivitiesFail, LoadActivities } from './activity-management.actions';
import { LoadActivitiesSuccess } from './activity-management.actions';
import { activityManagementReducer, ActivityState } from './activity-management.reducers';
describe('activityManagementReducer', () => {

describe('activityManagementReducer', () => {
const initialState: ActivityState = { data: [], isLoading: false, message: '' };

it('on LoadActivities, isLoading is true', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { ActivityState } from './activity-management.reducers';
import { createFeatureSelector, createSelector } from '@ngrx/store';

import { ActivityState } from './activity-management.reducers';

const getActivityState = createFeatureSelector<ActivityState>('activities');

export const allActivities = createSelector(getActivityState, (state: ActivityState) => {
Expand Down