Skip to content

Commit 85dbc42

Browse files
author
thegreatyamori
committed
feat: TT-155 register userEfecct in AppModule
1 parent 9b6a02a commit 85dbc42

File tree

12 files changed

+33
-49
lines changed

12 files changed

+33
-49
lines changed

src/app/app.module.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ import { ProjectTypeListComponent } from './modules/customer-management/componen
5656
// tslint:disable-next-line: max-line-length
5757
import { CreateProjectTypeComponent } from './modules/customer-management/components/projects-type/components/create-project-type/create-project-type.component';
5858
import { CustomerEffects } from './modules/customer-management/store/customer-management.effects';
59-
import { UserEffects } from './modules/users/store/user.effects';
59+
import { UserEffects as UsersEffects } from './modules/users/store/user.effects';
60+
import { UserEffects } from './modules/login/store/user.effects';
6061
import { EntryEffects } from './modules/time-clock/store/entry.effects';
6162
import { InjectTokenInterceptor } from './modules/shared/interceptors/inject.token.interceptor';
6263
import { SubstractDatePipe } from './modules/shared/pipes/substract-date/substract-date.pipe';
@@ -73,7 +74,7 @@ import { LoadingBarComponent } from './modules/shared/components/loading-bar/loa
7374
import { UsersComponent } from './modules/users/pages/users.component';
7475
import { UsersListComponent } from './modules/users/components/users-list/users-list.component';
7576
import { UiSwitchModule } from 'ngx-ui-switch';
76-
import {NgxMaterialTimepickerModule} from 'ngx-material-timepicker';
77+
import { NgxMaterialTimepickerModule } from 'ngx-material-timepicker';
7778
// tslint:disable-next-line: max-line-length
7879
import { TechnologyReportTableComponent } from './modules/technology-report/components/technology-report-table/technology-report-table.component';
7980
import { TechnologyReportComponent } from './modules/technology-report/pages/technology-report.component';
@@ -149,8 +150,8 @@ const maskConfig: Partial<IConfig> = {
149150
}),
150151
!environment.production
151152
? StoreDevtoolsModule.instrument({
152-
maxAge: 15, // Retains last 15 states
153-
})
153+
maxAge: 15, // Retains last 15 states
154+
})
154155
: [],
155156
EffectsModule.forRoot([
156157
ProjectEffects,
@@ -159,9 +160,10 @@ const maskConfig: Partial<IConfig> = {
159160
TechnologyEffects,
160161
ProjectTypeEffects,
161162
EntryEffects,
163+
UsersEffects,
162164
UserEffects,
163165
]),
164-
ToastrModule.forRoot()
166+
ToastrModule.forRoot(),
165167
],
166168
providers: [
167169
{
@@ -174,4 +176,4 @@ const maskConfig: Partial<IConfig> = {
174176
],
175177
bootstrap: [AppComponent],
176178
})
177-
export class AppModule { }
179+
export class AppModule {}

src/app/modules/login/store/user.actions.spec.ts

Whitespace-only changes.

src/app/modules/shared/components/user/store/user.actions.ts renamed to src/app/modules/login/store/user.actions.ts

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,19 @@ export enum UserActionTypes {
88

99
export class LoadUser implements Action {
1010
public readonly type = UserActionTypes.LOAD_USER;
11-
constructor(readonly userId) {
12-
}
11+
constructor(readonly userId: string) {}
1312
}
1413

1514
export class LoadUserSuccess implements Action {
16-
readonly type = UserActionTypes.LOAD_USER_SUCCESS;
15+
public readonly type = UserActionTypes.LOAD_USER_SUCCESS;
1716

18-
constructor(readonly payload) {
19-
}
17+
constructor(readonly payload: any) {}
2018
}
2119

2220
export class LoadUserFail implements Action {
2321
public readonly type = UserActionTypes.LOAD_USER_FAIL;
2422

25-
constructor(public error: string) {
26-
}
23+
constructor(public error: string) {}
2724
}
2825

29-
30-
export type UserActions =
31-
| LoadUser
32-
| LoadUserSuccess
33-
| LoadUserFail
26+
export type UserActions = LoadUser | LoadUserSuccess | LoadUserFail;

src/app/modules/login/store/user.effects.spec.ts

Whitespace-only changes.
Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,24 @@
11
import { Injectable } from '@angular/core';
2-
import { Actions, Effect, ofType } from '@ngrx/effects';
2+
import { Actions, ofType, Effect } from '@ngrx/effects';
33
import { Action } from '@ngrx/store';
44
import { Observable, of } from 'rxjs';
5-
import { catchError, map, mergeMap, switchMap } from 'rxjs/operators';
5+
import { catchError, map, mergeMap } from 'rxjs/operators';
66
import { UserService } from './user.service';
77
import * as actions from './user.actions';
88

99
@Injectable()
1010
export class UserEffects {
11-
constructor(private actions$: Actions, private userService: UserService) {
12-
}
11+
constructor(private actions$: Actions, private userService: UserService) {}
1312

1413
@Effect()
15-
loadUser$: Observable<Action> = this.actions$.pipe(
14+
loadUserInfo$: Observable<Action> = this.actions$.pipe(
1615
ofType(actions.UserActionTypes.LOAD_USER),
1716
map((action: actions.LoadUser) => action.userId),
1817
mergeMap((userId) =>
1918
this.userService.loadUser(userId).pipe(
20-
map((response) => {
21-
return new actions.LoadUserSuccess(response);
22-
}),
23-
catchError((error) => {
24-
return of(new actions.LoadUserFail(error));
25-
})
19+
map((response) => new actions.LoadUserSuccess(response)),
20+
catchError((error) => of(new actions.LoadUserFail(error)))
2621
)
2722
)
2823
);
29-
3024
}

src/app/modules/login/store/user.reducer.spec.ts

Whitespace-only changes.

src/app/modules/shared/components/user/store/user.reducer.ts renamed to src/app/modules/login/store/user.reducer.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { UserActions, UserActionTypes } from './user.actions';
22

33
export const initialState = {
4-
name:'',
5-
groups:[]
4+
name: '',
5+
groups: [],
66
};
77

88
export const userReducer = (state: any = initialState, action: UserActions): any => {
@@ -13,7 +13,7 @@ export const userReducer = (state: any = initialState, action: UserActions): any
1313
return {
1414
...state,
1515
name: action.payload.name,
16-
groups: action.payload.groups
16+
groups: action.payload.groups,
1717
};
1818
case UserActionTypes.LOAD_USER_FAIL:
1919
return state;

src/app/modules/login/store/user.selectors.spec.ts

Whitespace-only changes.

src/app/modules/shared/components/user/store/user.selectors.ts renamed to src/app/modules/login/store/user.selectors.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { createFeatureSelector, createSelector } from '@ngrx/store';
22

3-
const getUserState = createFeatureSelector('user');
3+
const getUserState = createFeatureSelector<any>('user');
44

55
export const getUserInfo = createSelector(getUserState, (state: any) => state);
6-
File renamed without changes.

0 commit comments

Comments
 (0)