bug fixed

This commit is contained in:
richard-loafle 2020-04-09 11:10:57 +09:00
parent 2ab9c2c9cf
commit d0fe9435d8
12 changed files with 52 additions and 33 deletions

26
package-lock.json generated
View File

@ -2369,22 +2369,22 @@
"dev": true "dev": true
}, },
"@ucap/ng-store-authentication": { "@ucap/ng-store-authentication": {
"version": "file:pack/ucap-ng-store-authentication-0.0.9.tgz", "version": "file:pack/ucap-ng-store-authentication-0.0.10.tgz",
"integrity": "sha512-NHOtAZzZpEBvrFk0CpRz+AiGe8keOTvk0No0e/Wy6CqIJFbtUsqUrILNBL8EtulZM5EDXSI2SvKt9iA7olPrEA==" "integrity": "sha512-eGdxf9VXmwLlhwpMndnAQUaKV/JaMmtxebSN+kiez8czQiqVKFXSjdVyA92/3AscMf5GvdwKMMh553IT7EhpqA==",
},
"@ucap/ng-store-chat": {
"version": "file:pack/ucap-ng-store-chat-0.0.4.tgz",
"integrity": "sha512-rSZirwFUMv9zXllqBWpdSUbUuRz9j1O8BVIfselp9sZHdKl7Xcx9irqNnHHkF2bJpxeWzugGrgG02tdt/xrIuQ==",
"dev": true "dev": true
}, },
"@ucap/ng-store-chat": {
"version": "file:pack/ucap-ng-store-chat-0.0.5.tgz",
"integrity": "sha512-FlvWI52w58jq/ZO8b8sk/MonY+TYKiEYlkyIfZWfFYOxlnKG0MkbpL0R+tiOFO9GLbBGEsXrzYtaDazrLk55ZQ=="
},
"@ucap/ng-store-group": { "@ucap/ng-store-group": {
"version": "file:pack/ucap-ng-store-group-0.0.5.tgz", "version": "file:pack/ucap-ng-store-group-0.0.6.tgz",
"integrity": "sha512-NNqnSiyQWbBIWLjXsBBxkdCHlRkMPRF8+IXq7scUgG7aNlUA0SGuntUbghRPxAJLQNuMe/csQziOlqHn98sJfw==", "integrity": "sha512-WShenZp/RP+cgiswvM12HPWOeSFuhNYkCUY6fxEAg58unxUZhBskVhefSq+OgD3dX/OaAPo2eQkwvXVANnyiZw==",
"dev": true "dev": true
}, },
"@ucap/ng-store-organization": { "@ucap/ng-store-organization": {
"version": "file:pack/ucap-ng-store-organization-0.0.3.tgz", "version": "file:pack/ucap-ng-store-organization-0.0.4.tgz",
"integrity": "sha512-qakDmEzWloikSk/Sczs2i/dL54ZAIEqkjx2x4jcn0dMKkCF2KseCphNXTfaLpAcMuGVR5ZAy2bQjy90NbbHeOg==", "integrity": "sha512-gVGOTfGmp58U0nHEn0UkjMc9AWQEmopNXDbyIrltMwR5XCKweC9AWXAiQzDxCb3sN07cSozEseFBJzJ7XO+dwg==",
"dev": true "dev": true
}, },
"@ucap/ng-ui": { "@ucap/ng-ui": {
@ -2479,9 +2479,9 @@
"dev": true "dev": true
}, },
"@ucap/protocol-query": { "@ucap/protocol-query": {
"version": "0.0.4", "version": "0.0.5",
"resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/@ucap/protocol-query/-/protocol-query-0.0.4.tgz", "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/@ucap/protocol-query/-/protocol-query-0.0.5.tgz",
"integrity": "sha512-cRMZgrOfKFPJKz+bPTxYOAhTQfgYvAjGvAXgcK8FzQ51R3jwmVTXsHi8FBBfqOeI2bDw1/KkPBfhChHRF2h+kg==", "integrity": "sha512-z8NGdXxw1C3FplynHbglO3Vk9vEIimu9pYWxXNtT9pEErcei4fyosV9DO+7UMPmBfXa47WlyKjLQlKQuPjcyMg==",
"dev": true "dev": true
}, },
"@ucap/protocol-room": { "@ucap/protocol-room": {

View File

@ -165,10 +165,10 @@
"@ucap/ng-protocol-status": "file:pack/ucap-ng-protocol-status-0.0.3.tgz", "@ucap/ng-protocol-status": "file:pack/ucap-ng-protocol-status-0.0.3.tgz",
"@ucap/ng-protocol-sync": "file:pack/ucap-ng-protocol-sync-0.0.3.tgz", "@ucap/ng-protocol-sync": "file:pack/ucap-ng-protocol-sync-0.0.3.tgz",
"@ucap/ng-protocol-umg": "file:pack/ucap-ng-protocol-umg-0.0.3.tgz", "@ucap/ng-protocol-umg": "file:pack/ucap-ng-protocol-umg-0.0.3.tgz",
"@ucap/ng-store-authentication": "file:pack/ucap-ng-store-authentication-0.0.9.tgz", "@ucap/ng-store-authentication": "file:pack/ucap-ng-store-authentication-0.0.10.tgz",
"@ucap/ng-store-chat": "file:pack/ucap-ng-store-chat-0.0.4.tgz", "@ucap/ng-store-chat": "file:pack/ucap-ng-store-chat-0.0.5.tgz",
"@ucap/ng-store-group": "file:pack/ucap-ng-store-group-0.0.5.tgz", "@ucap/ng-store-group": "file:pack/ucap-ng-store-group-0.0.6.tgz",
"@ucap/ng-store-organization": "file:pack/ucap-ng-store-organization-0.0.3.tgz", "@ucap/ng-store-organization": "file:pack/ucap-ng-store-organization-0.0.4.tgz",
"@ucap/ng-ui": "file:pack/ucap-ng-ui-0.0.3.tgz", "@ucap/ng-ui": "file:pack/ucap-ng-ui-0.0.3.tgz",
"@ucap/ng-ui-authentication": "file:pack/ucap-ng-ui-authentication-0.0.15.tgz", "@ucap/ng-ui-authentication": "file:pack/ucap-ng-ui-authentication-0.0.15.tgz",
"@ucap/ng-ui-organization": "file:pack/ucap-ng-ui-organization-0.0.2.tgz", "@ucap/ng-ui-organization": "file:pack/ucap-ng-ui-organization-0.0.2.tgz",
@ -185,7 +185,7 @@
"@ucap/protocol-inner": "~0.0.4", "@ucap/protocol-inner": "~0.0.4",
"@ucap/protocol-option": "~0.0.7", "@ucap/protocol-option": "~0.0.7",
"@ucap/protocol-ping": "~0.0.4", "@ucap/protocol-ping": "~0.0.4",
"@ucap/protocol-query": "~0.0.4", "@ucap/protocol-query": "~0.0.5",
"@ucap/protocol-room": "~0.0.5", "@ucap/protocol-room": "~0.0.5",
"@ucap/protocol-service": "~0.0.4", "@ucap/protocol-service": "~0.0.4",
"@ucap/protocol-status": "~0.0.5", "@ucap/protocol-status": "~0.0.5",

View File

@ -1,6 +1,6 @@
{ {
"name": "@ucap/ng-store-authentication", "name": "@ucap/ng-store-authentication",
"version": "0.0.9", "version": "0.0.10",
"publishConfig": { "publishConfig": {
"registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/" "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
}, },

View File

@ -24,9 +24,9 @@ import {
@Injectable() @Injectable()
export class Effects { export class Effects {
postLoginSuccessForAuth$ = createEffect(() => { sessionCreatedForAuth$ = createEffect(() => {
return this.actions$.pipe( return this.actions$.pipe(
ofType(LoginActions.loginSuccess), ofType(LoginActions.sessionCreated),
map(action => map(action =>
auth({ req: { deviceType: action.loginSession.deviceType } }) auth({ req: { deviceType: action.loginSession.deviceType } })
) )
@ -50,9 +50,9 @@ export class Effects {
) )
); );
postLoginSuccessForRegView$ = createEffect(() => { sessionCreatedForRegView$ = createEffect(() => {
return this.actions$.pipe( return this.actions$.pipe(
ofType(LoginActions.loginSuccess), ofType(LoginActions.sessionCreated),
map(action => regView({ req: {} })) map(action => regView({ req: {} }))
); );
}); });

View File

@ -1,6 +1,6 @@
{ {
"name": "@ucap/ng-store-chat", "name": "@ucap/ng-store-chat",
"version": "0.0.4", "version": "0.0.5",
"publishConfig": { "publishConfig": {
"registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/" "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
}, },

View File

@ -72,9 +72,9 @@ import {
@Injectable() @Injectable()
export class Effects { export class Effects {
postLoginSuccessForRooms$ = createEffect(() => { sessionCreatedForRooms$ = createEffect(() => {
return this.actions$.pipe( return this.actions$.pipe(
ofType(LoginActions.loginSuccess), ofType(LoginActions.sessionCreated),
map(action => rooms({ localeCode: action.loginSession.localeCode })) map(action => rooms({ localeCode: action.loginSession.localeCode }))
); );
}); });

View File

@ -1,6 +1,6 @@
{ {
"name": "@ucap/ng-store-group", "name": "@ucap/ng-store-group",
"version": "0.0.5", "version": "0.0.6",
"publishConfig": { "publishConfig": {
"registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/" "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
}, },

View File

@ -50,9 +50,9 @@ import { _MODULE_CONFIG } from '../../config/token';
@Injectable() @Injectable()
export class Effects { export class Effects {
postLoginSuccessForBuddy2$ = createEffect(() => { sessionCreatedForBuddy2$ = createEffect(() => {
return this.actions$.pipe( return this.actions$.pipe(
ofType(LoginActions.loginSuccess), ofType(LoginActions.sessionCreated),
map(action => buddy2()) map(action => buddy2())
); );
}); });

View File

@ -54,9 +54,9 @@ import {
@Injectable() @Injectable()
export class Effects { export class Effects {
postLoginSuccessForGroups$ = createEffect(() => { sessionCreatedForGroups$ = createEffect(() => {
return this.actions$.pipe( return this.actions$.pipe(
ofType(LoginActions.loginSuccess), ofType(LoginActions.sessionCreated),
map(action => groups()) map(action => groups())
); );
}); });

View File

@ -6,8 +6,10 @@
"umdModuleIds": { "umdModuleIds": {
"@ngrx/store": "@ngrx/store", "@ngrx/store": "@ngrx/store",
"@ngrx/effects": "@ngrx/effects", "@ngrx/effects": "@ngrx/effects",
"@ucap/protocol-query": "@ucap/protocol-query",
"@ucap/ng-api-external": "@ucap/ng-api-external", "@ucap/ng-api-external": "@ucap/ng-api-external",
"@ucap/ng-protocol-query": "@ucap/ng-protocol-query" "@ucap/ng-protocol-query": "@ucap/ng-protocol-query",
"@ucap/ng-store-authentication": "@ucap/ng-store-authentication"
} }
} }
} }

View File

@ -1,6 +1,6 @@
{ {
"name": "@ucap/ng-store-organization", "name": "@ucap/ng-store-organization",
"version": "0.0.3", "version": "0.0.4",
"publishConfig": { "publishConfig": {
"registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/" "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
}, },
@ -11,6 +11,7 @@
"@ucap/protocol-query": "~0.0.1", "@ucap/protocol-query": "~0.0.1",
"@ucap/ng-api-external": "~0.0.1", "@ucap/ng-api-external": "~0.0.1",
"@ucap/ng-protocol-query": "~0.0.1", "@ucap/ng-protocol-query": "~0.0.1",
"@ucap/ng-store-authentication": "~0.0.1",
"tslib": "^1.10.0" "tslib": "^1.10.0"
} }
} }

View File

@ -7,6 +7,7 @@ import { Store } from '@ngrx/store';
import { Actions, ofType, createEffect } from '@ngrx/effects'; import { Actions, ofType, createEffect } from '@ngrx/effects';
import { QueryProtocolService } from '@ucap/ng-protocol-query'; import { QueryProtocolService } from '@ucap/ng-protocol-query';
import { LoginActions } from '@ucap/ng-store-authentication';
import { import {
dept, dept,
@ -16,9 +17,24 @@ import {
myDeptUser, myDeptUser,
myDeptUserFailure myDeptUserFailure
} from './actions'; } from './actions';
import { DeptDivisionCode } from '@ucap/protocol-query';
@Injectable() @Injectable()
export class Effects { export class Effects {
sessionCreatedForGroups$ = createEffect(() => {
return this.actions$.pipe(
ofType(LoginActions.sessionCreated),
map(action =>
dept({
req: {
divCd: DeptDivisionCode.Organization,
companyCode: action.loginSession.companyCode
}
})
)
);
});
dept$ = createEffect(() => { dept$ = createEffect(() => {
return this.actions$.pipe( return this.actions$.pipe(
ofType(dept), ofType(dept),