Browse Source

fix(core): store tenant instead of tenant id

pull/1578/head
TheDiaval 7 years ago
parent
commit
b1c30fdcd1
  1. 8
      npm/ng-packs/packages/core/src/lib/actions/session.actions.ts
  2. 4
      npm/ng-packs/packages/core/src/lib/models/session.ts
  3. 14
      npm/ng-packs/packages/core/src/lib/states/session.state.ts

8
npm/ng-packs/packages/core/src/lib/actions/session.actions.ts

@ -1,8 +1,10 @@
import { ABP } from '../models';
export class SessionSetLanguage { export class SessionSetLanguage {
static readonly type = '[Session] Set Language'; static readonly type = '[Session] Set Language';
constructor(public payload: string) {} constructor(public payload: string) {}
} }
export class SessionSetTenantId { export class SessionSetTenant {
static readonly type = '[Session] Set Tenant Id'; static readonly type = '[Session] Set Tenant';
constructor(public payload: string) {} constructor(public payload: ABP.BasicItem) {}
} }

4
npm/ng-packs/packages/core/src/lib/models/session.ts

@ -1,6 +1,8 @@
import { ABP } from '../models';
export namespace Session { export namespace Session {
export interface State { export interface State {
language: string; language: string;
tenantId: string; tenant: ABP.BasicItem;
} }
} }

14
npm/ng-packs/packages/core/src/lib/states/session.state.ts

@ -1,6 +1,6 @@
import { Action, Selector, State, StateContext } from '@ngxs/store'; import { Action, Selector, State, StateContext } from '@ngxs/store';
import { SessionSetLanguage, SessionSetTenantId } from '../actions/session.actions'; import { SessionSetLanguage, SessionSetTenant } from '../actions/session.actions';
import { Session } from '../models/session'; import { ABP, Session } from '../models';
@State<Session.State>({ @State<Session.State>({
name: 'SessionState', name: 'SessionState',
@ -13,8 +13,8 @@ export class SessionState {
} }
@Selector() @Selector()
static getSelectedTenantId({ tenantId }: Session.State): string { static getTenant({ tenant }: Session.State): ABP.BasicItem {
return tenantId; return tenant;
} }
constructor() {} constructor() {}
@ -26,10 +26,10 @@ export class SessionState {
}); });
} }
@Action(SessionSetTenantId) @Action(SessionSetTenant)
sessionSetTenantId({ patchState }: StateContext<Session.State>, { payload }: SessionSetTenantId) { sessionSetTenantId({ patchState }: StateContext<Session.State>, { payload }: SessionSetTenant) {
patchState({ patchState({
tenantId: payload, tenant: payload,
}); });
} }
} }

Loading…
Cancel
Save