From ed7cbc18487cac5336b089f7efd94d209d192de7 Mon Sep 17 00:00:00 2001 From: TheDiaval Date: Fri, 9 Aug 2019 15:54:57 +0300 Subject: [PATCH] fix(tenant-management): rename GetTenant action to GetTenants --- .../src/lib/actions/tenant-management.actions.ts | 2 +- .../src/lib/components/tenants/tenants.component.ts | 4 ++-- .../src/lib/resolvers/tenants.resolver.ts | 4 ++-- .../src/lib/states/tenant-management.state.ts | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/npm/ng-packs/packages/tenant-management/src/lib/actions/tenant-management.actions.ts b/npm/ng-packs/packages/tenant-management/src/lib/actions/tenant-management.actions.ts index 60817a3e78..6cb1f997f6 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/actions/tenant-management.actions.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/actions/tenant-management.actions.ts @@ -1,7 +1,7 @@ import { TenantManagement } from '../models/tenant-management'; import { ABP } from '@abp/ng.core'; -export class GetTenant { +export class GetTenants { static readonly type = '[TenantManagement] Get Tenant'; constructor(public payload?: ABP.PageQueryParams) {} } diff --git a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts index c060710dd8..d2f9e271d6 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts @@ -8,7 +8,7 @@ import { debounceTime, finalize, pluck, switchMap, take } from 'rxjs/operators'; import { CreateTenant, DeleteTenant, - GetTenant, + GetTenants, GetTenantById, UpdateTenant, } from '../../actions/tenant-management.actions'; @@ -197,7 +197,7 @@ export class TenantsComponent { get() { this.loading = true; this.store - .dispatch(new GetTenant(this.pageQuery)) + .dispatch(new GetTenants(this.pageQuery)) .pipe(finalize(() => (this.loading = false))) .subscribe(); } diff --git a/npm/ng-packs/packages/tenant-management/src/lib/resolvers/tenants.resolver.ts b/npm/ng-packs/packages/tenant-management/src/lib/resolvers/tenants.resolver.ts index e656833d12..3476b977d1 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/resolvers/tenants.resolver.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/resolvers/tenants.resolver.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { Resolve } from '@angular/router'; import { Store } from '@ngxs/store'; -import { GetTenant } from '../actions/tenant-management.actions'; +import { GetTenants } from '../actions/tenant-management.actions'; import { TenantManagement } from '../models/tenant-management'; import { TenantManagementState } from '../states/tenant-management.state'; @@ -11,6 +11,6 @@ export class TenantsResolver implements Resolve { resolve() { const data = this.store.selectSnapshot(TenantManagementState.get); - return data && data.length ? null : this.store.dispatch(new GetTenant()); + return data && data.length ? null : this.store.dispatch(new GetTenants()); } } diff --git a/npm/ng-packs/packages/tenant-management/src/lib/states/tenant-management.state.ts b/npm/ng-packs/packages/tenant-management/src/lib/states/tenant-management.state.ts index 45e57e2bca..7b7f693e71 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/states/tenant-management.state.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/states/tenant-management.state.ts @@ -3,7 +3,7 @@ import { switchMap, tap } from 'rxjs/operators'; import { CreateTenant, DeleteTenant, - GetTenant, + GetTenants, GetTenantById, UpdateTenant, } from '../actions/tenant-management.actions'; @@ -28,8 +28,8 @@ export class TenantManagementState { constructor(private tenantManagementService: TenantManagementService) {} - @Action(GetTenant) - get({ patchState }: StateContext, { payload }: GetTenant) { + @Action(GetTenants) + get({ patchState }: StateContext, { payload }: GetTenants) { return this.tenantManagementService.getTenant(payload).pipe( tap(result => patchState({ @@ -52,19 +52,19 @@ export class TenantManagementState { @Action(DeleteTenant) delete({ dispatch }: StateContext, { payload }: DeleteTenant) { - return this.tenantManagementService.deleteTenant(payload).pipe(switchMap(() => dispatch(new GetTenant()))); + return this.tenantManagementService.deleteTenant(payload).pipe(switchMap(() => dispatch(new GetTenants()))); } @Action(CreateTenant) add({ dispatch }: StateContext, { payload }: CreateTenant) { - return this.tenantManagementService.createTenant(payload).pipe(switchMap(() => dispatch(new GetTenant()))); + return this.tenantManagementService.createTenant(payload).pipe(switchMap(() => dispatch(new GetTenants()))); } @Action(UpdateTenant) update({ dispatch, getState }: StateContext, { payload }: UpdateTenant) { return dispatch(new GetTenantById(payload.id)).pipe( switchMap(() => this.tenantManagementService.updateTenant({ ...getState().selectedItem, ...payload })), - switchMap(() => dispatch(new GetTenant())), + switchMap(() => dispatch(new GetTenants())), ); } }