From e8a7d3dbaa208911265d876c11c8b1dff9468e57 Mon Sep 17 00:00:00 2001 From: TheDiaval Date: Fri, 9 Aug 2019 15:03:34 +0300 Subject: [PATCH] refactor(account): change imports from ng.core --- .../account/src/lib/components/login/login.component.ts | 4 ++-- .../src/lib/components/tenant-box/tenant-box.component.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/npm/ng-packs/packages/account/src/lib/components/login/login.component.ts b/npm/ng-packs/packages/account/src/lib/components/login/login.component.ts index a743e121f5..85968b4dd2 100644 --- a/npm/ng-packs/packages/account/src/lib/components/login/login.component.ts +++ b/npm/ng-packs/packages/account/src/lib/components/login/login.component.ts @@ -1,4 +1,4 @@ -import { ConfigGetAppConfiguration, ConfigState } from '@abp/ng.core'; +import { GetAppConfiguration, ConfigState } from '@abp/ng.core'; import { Component, Inject, Optional } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Navigate } from '@ngxs/router-plugin'; @@ -47,7 +47,7 @@ export class LoginComponent { this.oauthService.fetchTokenUsingPasswordFlow(this.form.get('username').value, this.form.get('password').value), ) .pipe( - switchMap(() => this.store.dispatch(new ConfigGetAppConfiguration())), + switchMap(() => this.store.dispatch(new GetAppConfiguration())), tap(() => { const redirectUrl = snq(() => window.history.state).redirectUrl || (this.options || {}).redirectUrl || '/'; this.store.dispatch(new Navigate([redirectUrl])); diff --git a/npm/ng-packs/packages/account/src/lib/components/tenant-box/tenant-box.component.ts b/npm/ng-packs/packages/account/src/lib/components/tenant-box/tenant-box.component.ts index 66f17b99ec..a1ba6004c5 100644 --- a/npm/ng-packs/packages/account/src/lib/components/tenant-box/tenant-box.component.ts +++ b/npm/ng-packs/packages/account/src/lib/components/tenant-box/tenant-box.component.ts @@ -1,4 +1,4 @@ -import { ABP, SessionSetTenant, SessionState } from '@abp/ng.core'; +import { ABP, SetTenant, SessionState } from '@abp/ng.core'; import { ToasterService } from '@abp/ng.theme.shared'; import { Component, OnInit } from '@angular/core'; import { Store } from '@ngxs/store'; @@ -57,10 +57,10 @@ export class TenantBoxComponent implements OnInit { }); this.tenant = {} as ABP.BasicItem; } - this.store.dispatch(new SessionSetTenant(success ? this.tenant : null)); + this.store.dispatch(new SetTenant(success ? this.tenant : null)); }); } else { - this.store.dispatch(new SessionSetTenant(null)); + this.store.dispatch(new SetTenant(null)); this.tenantName = null; this.isModalVisible = false; }