Browse Source

fix(tenant-management): rename GetTenant action to GetTenants

pull/1612/head
TheDiaval 7 years ago
parent
commit
ed7cbc1848
  1. 2
      npm/ng-packs/packages/tenant-management/src/lib/actions/tenant-management.actions.ts
  2. 4
      npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts
  3. 4
      npm/ng-packs/packages/tenant-management/src/lib/resolvers/tenants.resolver.ts
  4. 12
      npm/ng-packs/packages/tenant-management/src/lib/states/tenant-management.state.ts

2
npm/ng-packs/packages/tenant-management/src/lib/actions/tenant-management.actions.ts

@ -1,7 +1,7 @@
import { TenantManagement } from '../models/tenant-management'; import { TenantManagement } from '../models/tenant-management';
import { ABP } from '@abp/ng.core'; import { ABP } from '@abp/ng.core';
export class GetTenant { export class GetTenants {
static readonly type = '[TenantManagement] Get Tenant'; static readonly type = '[TenantManagement] Get Tenant';
constructor(public payload?: ABP.PageQueryParams) {} constructor(public payload?: ABP.PageQueryParams) {}
} }

4
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 { import {
CreateTenant, CreateTenant,
DeleteTenant, DeleteTenant,
GetTenant, GetTenants,
GetTenantById, GetTenantById,
UpdateTenant, UpdateTenant,
} from '../../actions/tenant-management.actions'; } from '../../actions/tenant-management.actions';
@ -197,7 +197,7 @@ export class TenantsComponent {
get() { get() {
this.loading = true; this.loading = true;
this.store this.store
.dispatch(new GetTenant(this.pageQuery)) .dispatch(new GetTenants(this.pageQuery))
.pipe(finalize(() => (this.loading = false))) .pipe(finalize(() => (this.loading = false)))
.subscribe(); .subscribe();
} }

4
npm/ng-packs/packages/tenant-management/src/lib/resolvers/tenants.resolver.ts

@ -1,7 +1,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Resolve } from '@angular/router'; import { Resolve } from '@angular/router';
import { Store } from '@ngxs/store'; 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 { TenantManagement } from '../models/tenant-management';
import { TenantManagementState } from '../states/tenant-management.state'; import { TenantManagementState } from '../states/tenant-management.state';
@ -11,6 +11,6 @@ export class TenantsResolver implements Resolve<TenantManagement.State> {
resolve() { resolve() {
const data = this.store.selectSnapshot(TenantManagementState.get); 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());
} }
} }

12
npm/ng-packs/packages/tenant-management/src/lib/states/tenant-management.state.ts

@ -3,7 +3,7 @@ import { switchMap, tap } from 'rxjs/operators';
import { import {
CreateTenant, CreateTenant,
DeleteTenant, DeleteTenant,
GetTenant, GetTenants,
GetTenantById, GetTenantById,
UpdateTenant, UpdateTenant,
} from '../actions/tenant-management.actions'; } from '../actions/tenant-management.actions';
@ -28,8 +28,8 @@ export class TenantManagementState {
constructor(private tenantManagementService: TenantManagementService) {} constructor(private tenantManagementService: TenantManagementService) {}
@Action(GetTenant) @Action(GetTenants)
get({ patchState }: StateContext<TenantManagement.State>, { payload }: GetTenant) { get({ patchState }: StateContext<TenantManagement.State>, { payload }: GetTenants) {
return this.tenantManagementService.getTenant(payload).pipe( return this.tenantManagementService.getTenant(payload).pipe(
tap(result => tap(result =>
patchState({ patchState({
@ -52,19 +52,19 @@ export class TenantManagementState {
@Action(DeleteTenant) @Action(DeleteTenant)
delete({ dispatch }: StateContext<TenantManagement.State>, { payload }: DeleteTenant) { delete({ dispatch }: StateContext<TenantManagement.State>, { payload }: DeleteTenant) {
return this.tenantManagementService.deleteTenant(payload).pipe(switchMap(() => dispatch(new GetTenant()))); return this.tenantManagementService.deleteTenant(payload).pipe(switchMap(() => dispatch(new GetTenants())));
} }
@Action(CreateTenant) @Action(CreateTenant)
add({ dispatch }: StateContext<TenantManagement.State>, { payload }: CreateTenant) { add({ dispatch }: StateContext<TenantManagement.State>, { payload }: CreateTenant) {
return this.tenantManagementService.createTenant(payload).pipe(switchMap(() => dispatch(new GetTenant()))); return this.tenantManagementService.createTenant(payload).pipe(switchMap(() => dispatch(new GetTenants())));
} }
@Action(UpdateTenant) @Action(UpdateTenant)
update({ dispatch, getState }: StateContext<TenantManagement.State>, { payload }: UpdateTenant) { update({ dispatch, getState }: StateContext<TenantManagement.State>, { payload }: UpdateTenant) {
return dispatch(new GetTenantById(payload.id)).pipe( return dispatch(new GetTenantById(payload.id)).pipe(
switchMap(() => this.tenantManagementService.updateTenant({ ...getState().selectedItem, ...payload })), switchMap(() => this.tenantManagementService.updateTenant({ ...getState().selectedItem, ...payload })),
switchMap(() => dispatch(new GetTenant())), switchMap(() => dispatch(new GetTenants())),
); );
} }
} }

Loading…
Cancel
Save