Skip to content

Commit cf2c16a

Browse files
committed
feat: TT-155 create user module and model
1 parent 88ae09d commit cf2c16a

File tree

13 files changed

+17
-20
lines changed

13 files changed

+17
-20
lines changed

src/app/app.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ import { ProjectTypeListComponent } from './modules/customer-management/componen
5858
import { CreateProjectTypeComponent } from './modules/customer-management/components/projects-type/components/create-project-type/create-project-type.component';
5959
import { CustomerEffects } from './modules/customer-management/store/customer-management.effects';
6060
import { UserEffects as UsersEffects } from './modules/users/store/user.effects';
61-
import { UserEffects } from './modules/login/store/user.effects';
61+
import { UserEffects } from './modules/user/store/user.effects';
6262
import { EntryEffects } from './modules/time-clock/store/entry.effects';
6363
import { InjectTokenInterceptor } from './modules/shared/interceptors/inject.token.interceptor';
6464
import { SubstractDatePipe } from './modules/shared/pipes/substract-date/substract-date.pipe';

src/app/modules/shared/components/user/user.component.ts

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
import { Component, OnInit } from '@angular/core';
22
import { AzureAdB2CService } from '../../../login/services/azure.ad.b2c.service';
33

4-
import { select, Store } from '@ngrx/store';
5-
import { getUserInfo } from '../../../login/store/user.selectors';
6-
import { Subscription } from 'rxjs';
7-
import { LoadUser } from '../../../login/store/user.actions';
84

95
@Component({
106
selector: 'app-user',
@@ -13,19 +9,12 @@ import { LoadUser } from '../../../login/store/user.actions';
139
})
1410
export class UserComponent implements OnInit {
1511
name: string;
16-
userSubscription: Subscription;
1712

18-
constructor(private azureAdB2CService: AzureAdB2CService, private store: Store) {}
13+
constructor(private azureAdB2CService: AzureAdB2CService) {}
1914

2015
ngOnInit(): void {
2116
if (this.azureAdB2CService.isLogin()) {
2217
this.name = this.azureAdB2CService.getName();
23-
const userId = this.azureAdB2CService.getUserId();
24-
25-
this.store.dispatch(new LoadUser(userId));
26-
this.userSubscription = this.store.pipe(select(getUserInfo)).subscribe((response) => {
27-
console.log('from Store: ', response);
28-
});
2918
this.azureAdB2CService.setTenantId();
3019
}
3120
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
export interface User {
2+
name: string;
3+
email: string;
4+
roles?: string[];
5+
groups?: string[];
6+
id: string;
7+
tenant_id?: string;
8+
deleted?: string;
9+
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Action } from '@ngrx/store';
2+
import { User } from '../models/user';
23

34
export enum UserActionTypes {
45
LOAD_USER = '[User] LOAD_USER',
@@ -14,7 +15,7 @@ export class LoadUser implements Action {
1415
export class LoadUserSuccess implements Action {
1516
public readonly type = UserActionTypes.LOAD_USER_SUCCESS;
1617

17-
constructor(readonly payload: any) {}
18+
constructor(readonly payload: User) {}
1819
}
1920

2021
export class LoadUserFail implements Action {

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

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

33
export const initialState = {
44
name: '',
5+
email: '',
6+
roles: [],
57
groups: [],
68
};
79

@@ -10,11 +12,7 @@ export const userReducer = (state: any = initialState, action: UserActions): any
1012
case UserActionTypes.LOAD_USER:
1113
return state;
1214
case UserActionTypes.LOAD_USER_SUCCESS:
13-
return {
14-
...state,
15-
name: action.payload.name,
16-
groups: action.payload.groups,
17-
};
15+
return action.payload;
1816
case UserActionTypes.LOAD_USER_FAIL:
1917
return state;
2018
default: {

0 commit comments

Comments
 (0)