From 46d2b7ed0036414338a9c464f871d44e080bb910 Mon Sep 17 00:00:00 2001 From: TheDiaval Date: Fri, 9 Aug 2019 15:05:23 +0300 Subject: [PATCH] refactor(tenant-management): rename actions and service functions --- .../lib/actions/tenant-management.actions.ts | 20 ++++----- .../components/tenants/tenants.component.ts | 22 +++++----- .../src/lib/resolvers/tenants.resolver.ts | 6 +-- .../lib/services/tenant-management.service.ts | 10 ++--- .../src/lib/states/tenant-management.state.ts | 44 +++++++++---------- 5 files changed, 50 insertions(+), 52 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 74034507e8..60817a3e78 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,27 +1,27 @@ import { TenantManagement } from '../models/tenant-management'; import { ABP } from '@abp/ng.core'; -export class TenantManagementGet { - static readonly type = '[TenantManagement] Get'; +export class GetTenant { + static readonly type = '[TenantManagement] Get Tenant'; constructor(public payload?: ABP.PageQueryParams) {} } -export class TenantManagementGetById { - static readonly type = '[TenantManagement] Get By Id'; +export class GetTenantById { + static readonly type = '[TenantManagement] Get Tenant By Id'; constructor(public payload: string) {} } -export class TenantManagementAdd { - static readonly type = '[TenantManagement] Add'; +export class CreateTenant { + static readonly type = '[TenantManagement] Create Tenant'; constructor(public payload: TenantManagement.AddRequest) {} } -export class TenantManagementUpdate { - static readonly type = '[TenantManagement] Update'; +export class UpdateTenant { + static readonly type = '[TenantManagement] Update Tenant'; constructor(public payload: TenantManagement.UpdateRequest) {} } -export class TenantManagementDelete { - static readonly type = '[TenantManagement] Delete'; +export class DeleteTenant { + static readonly type = '[TenantManagement] Delete Tenant'; constructor(public payload: string) {} } 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 64db8a1035..c060710dd8 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 @@ -6,11 +6,11 @@ import { Select, Store } from '@ngxs/store'; import { Observable, Subject } from 'rxjs'; import { debounceTime, finalize, pluck, switchMap, take } from 'rxjs/operators'; import { - TenantManagementAdd, - TenantManagementDelete, - TenantManagementGet, - TenantManagementGetById, - TenantManagementUpdate, + CreateTenant, + DeleteTenant, + GetTenant, + GetTenantById, + UpdateTenant, } from '../../actions/tenant-management.actions'; import { TenantManagementService } from '../../services/tenant-management.service'; import { TenantManagementState } from '../../states/tenant-management.state'; @@ -103,7 +103,7 @@ export class TenantsComponent { onEditConnectionString(id: string) { this.store - .dispatch(new TenantManagementGetById(id)) + .dispatch(new GetTenantById(id)) .pipe( pluck('TenantManagementState', 'selectedItem'), switchMap(selected => { @@ -127,7 +127,7 @@ export class TenantsComponent { onEditTenant(id: string) { this.store - .dispatch(new TenantManagementGetById(id)) + .dispatch(new GetTenantById(id)) .pipe(pluck('TenantManagementState', 'selectedItem')) .subscribe(selected => { this.selected = selected; @@ -167,8 +167,8 @@ export class TenantsComponent { this.store .dispatch( this.selected.id - ? new TenantManagementUpdate({ ...this.tenantForm.value, id: this.selected.id }) - : new TenantManagementAdd(this.tenantForm.value), + ? new UpdateTenant({ ...this.tenantForm.value, id: this.selected.id }) + : new CreateTenant(this.tenantForm.value), ) .subscribe(() => { this.isModalVisible = false; @@ -182,7 +182,7 @@ export class TenantsComponent { }) .subscribe((status: Toaster.Status) => { if (status === Toaster.Status.confirm) { - this.store.dispatch(new TenantManagementDelete(id)); + this.store.dispatch(new DeleteTenant(id)); } }); } @@ -197,7 +197,7 @@ export class TenantsComponent { get() { this.loading = true; this.store - .dispatch(new TenantManagementGet(this.pageQuery)) + .dispatch(new GetTenant(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 4ad2a81d9e..e656833d12 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 { TenantManagementGet } from '../actions/tenant-management.actions'; +import { GetTenant } from '../actions/tenant-management.actions'; import { TenantManagement } from '../models/tenant-management'; import { TenantManagementState } from '../states/tenant-management.state'; @@ -11,8 +11,6 @@ export class TenantsResolver implements Resolve { resolve() { const data = this.store.selectSnapshot(TenantManagementState.get); - return data && data.length - ? null - : this.store.dispatch(new TenantManagementGet()); + return data && data.length ? null : this.store.dispatch(new GetTenant()); } } diff --git a/npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management.service.ts b/npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management.service.ts index f038931390..c89ee6577a 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management.service.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management.service.ts @@ -9,7 +9,7 @@ import { TenantManagement } from '../models/tenant-management'; export class TenantManagementService { constructor(private rest: RestService) {} - get(params = {} as ABP.PageQueryParams): Observable { + getTenant(params = {} as ABP.PageQueryParams): Observable { const request: Rest.Request = { method: 'GET', url: '/api/multi-tenancy/tenants', @@ -19,7 +19,7 @@ export class TenantManagementService { return this.rest.request(request); } - getById(id: string): Observable { + getTenantById(id: string): Observable { const request: Rest.Request = { method: 'GET', url: `/api/multi-tenancy/tenants/${id}`, @@ -28,7 +28,7 @@ export class TenantManagementService { return this.rest.request(request); } - delete(id: string): Observable { + deleteTenant(id: string): Observable { const request: Rest.Request = { method: 'DELETE', url: `/api/multi-tenancy/tenants/${id}`, @@ -37,7 +37,7 @@ export class TenantManagementService { return this.rest.request(request); } - add(body: TenantManagement.AddRequest): Observable { + createTenant(body: TenantManagement.AddRequest): Observable { const request: Rest.Request = { method: 'POST', url: `/api/multi-tenancy/tenants`, @@ -47,7 +47,7 @@ export class TenantManagementService { return this.rest.request(request); } - update(body: TenantManagement.UpdateRequest): Observable { + updateTenant(body: TenantManagement.UpdateRequest): Observable { const url = `/api/multi-tenancy/tenants/${body.id}`; delete body.id; 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 cd108dd225..45e57e2bca 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 @@ -1,11 +1,11 @@ import { Action, Selector, State, StateContext } from '@ngxs/store'; import { switchMap, tap } from 'rxjs/operators'; import { - TenantManagementAdd, - TenantManagementDelete, - TenantManagementGet, - TenantManagementGetById, - TenantManagementUpdate, + CreateTenant, + DeleteTenant, + GetTenant, + GetTenantById, + UpdateTenant, } from '../actions/tenant-management.actions'; import { TenantManagement } from '../models/tenant-management'; import { TenantManagementService } from '../services/tenant-management.service'; @@ -28,9 +28,9 @@ export class TenantManagementState { constructor(private tenantManagementService: TenantManagementService) {} - @Action(TenantManagementGet) - get({ patchState }: StateContext, { payload }: TenantManagementGet) { - return this.tenantManagementService.get(payload).pipe( + @Action(GetTenant) + get({ patchState }: StateContext, { payload }: GetTenant) { + return this.tenantManagementService.getTenant(payload).pipe( tap(result => patchState({ result, @@ -39,9 +39,9 @@ export class TenantManagementState { ); } - @Action(TenantManagementGetById) - getById({ patchState }: StateContext, { payload }: TenantManagementGetById) { - return this.tenantManagementService.getById(payload).pipe( + @Action(GetTenantById) + getById({ patchState }: StateContext, { payload }: GetTenantById) { + return this.tenantManagementService.getTenantById(payload).pipe( tap(selectedItem => patchState({ selectedItem, @@ -50,21 +50,21 @@ export class TenantManagementState { ); } - @Action(TenantManagementDelete) - delete({ dispatch }: StateContext, { payload }: TenantManagementDelete) { - return this.tenantManagementService.delete(payload).pipe(switchMap(() => dispatch(new TenantManagementGet()))); + @Action(DeleteTenant) + delete({ dispatch }: StateContext, { payload }: DeleteTenant) { + return this.tenantManagementService.deleteTenant(payload).pipe(switchMap(() => dispatch(new GetTenant()))); } - @Action(TenantManagementAdd) - add({ dispatch }: StateContext, { payload }: TenantManagementAdd) { - return this.tenantManagementService.add(payload).pipe(switchMap(() => dispatch(new TenantManagementGet()))); + @Action(CreateTenant) + add({ dispatch }: StateContext, { payload }: CreateTenant) { + return this.tenantManagementService.createTenant(payload).pipe(switchMap(() => dispatch(new GetTenant()))); } - @Action(TenantManagementUpdate) - update({ dispatch, getState }: StateContext, { payload }: TenantManagementUpdate) { - return dispatch(new TenantManagementGetById(payload.id)).pipe( - switchMap(() => this.tenantManagementService.update({ ...getState().selectedItem, ...payload })), - switchMap(() => dispatch(new TenantManagementGet())), + @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())), ); } }