From 48b8ea28e1c41e14fbaa2f70882579f7608597ac Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Thu, 12 Nov 2020 10:02:15 +0300 Subject: [PATCH] chore: remove legacy tenant management types and service --- .../components/tenants/tenants.component.ts | 9 +- .../src/lib/models/tenant-management.ts | 40 +------ .../src/lib/services/index.ts | 1 - .../lib/services/tenant-management.service.ts | 111 ------------------ 4 files changed, 4 insertions(+), 157 deletions(-) delete mode 100644 npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management.service.ts 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 460811dfab..f5b69fd3aa 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 @@ -14,7 +14,7 @@ import { UpdateTenant, } from '../../actions/tenant-management.actions'; import { GetTenantsInput, TenantDto } from '../../proxy/models'; -import { TenantManagementService } from '../../services/tenant-management.service'; +import { TenantService } from '../../proxy/tenant.service'; import { TenantManagementState } from '../../states/tenant-management.state'; interface SelectedModalContent { @@ -103,7 +103,7 @@ export class TenantsComponent implements OnInit { public readonly list: ListService, private injector: Injector, private confirmationService: ConfirmationService, - private tenantService: TenantManagementService, + private tenantService: TenantService, private fb: FormBuilder, private store: Store, ) {} @@ -206,10 +206,7 @@ export class TenantsComponent implements OnInit { }); } else { this.tenantService - .updateDefaultConnectionString({ - id: this.selected.id, - defaultConnectionString: this.connectionString, - }) + .updateDefaultConnectionString(this.selected.id, this.connectionString) .pipe( take(1), finalize(() => (this.modalBusy = false)), diff --git a/npm/ng-packs/packages/tenant-management/src/lib/models/tenant-management.ts b/npm/ng-packs/packages/tenant-management/src/lib/models/tenant-management.ts index bc47ae171d..3771d94e23 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/models/tenant-management.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/models/tenant-management.ts @@ -1,4 +1,4 @@ -import { ABP, PagedResultDto } from '@abp/ng.core'; +import { PagedResultDto } from '@abp/ng.core'; import { TenantDto } from '../proxy/models'; export namespace TenantManagement { @@ -6,42 +6,4 @@ export namespace TenantManagement { result: PagedResultDto; selectedItem: TenantDto; } - - /** - * @deprecated To be deleted in v4.0 - */ - export type Response = ABP.PagedResponse; - - /** - * @deprecated To be deleted in v4.0 - */ - export interface Item { - id: string; - name: string; - } - - /** - * @deprecated To be deleted in v4.0 - */ - export interface AddRequest { - adminEmailAddress: string; - adminPassword: string; - name: string; - } - - /** - * @deprecated To be deleted in v4.0 - */ - export interface UpdateRequest { - id: string; - name: string; - } - - /** - * @deprecated To be deleted in v4.0 - */ - export interface DefaultConnectionStringRequest { - id: string; - defaultConnectionString: string; - } } diff --git a/npm/ng-packs/packages/tenant-management/src/lib/services/index.ts b/npm/ng-packs/packages/tenant-management/src/lib/services/index.ts index 060dae4e0c..22b8fba686 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/services/index.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/services/index.ts @@ -1,2 +1 @@ -export * from './tenant-management.service'; export * from './tenant-management-state.service'; 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 deleted file mode 100644 index 3ace57367c..0000000000 --- a/npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management.service.ts +++ /dev/null @@ -1,111 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; -import { RestService, Rest, ABP } from '@abp/ng.core'; -import { TenantManagement } from '../models/tenant-management'; - -@Injectable({ - providedIn: 'root', -}) -/** - * @deprecated Use TenantService instead. To be deleted in v4.0. - */ -export class TenantManagementService { - apiName = 'AbpTenantManagement'; - - constructor(private rest: RestService) {} - - getTenant(params = {} as ABP.PageQueryParams): Observable { - const request: Rest.Request = { - method: 'GET', - url: '/api/multi-tenancy/tenants', - params, - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - getTenantById(id: string): Observable { - const request: Rest.Request = { - method: 'GET', - url: `/api/multi-tenancy/tenants/${id}`, - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - deleteTenant(id: string): Observable { - const request: Rest.Request = { - method: 'DELETE', - url: `/api/multi-tenancy/tenants/${id}`, - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - createTenant(body: TenantManagement.AddRequest): Observable { - const request: Rest.Request = { - method: 'POST', - url: '/api/multi-tenancy/tenants', - body, - }; - - return this.rest.request(request, { - apiName: this.apiName, - }); - } - - updateTenant(body: TenantManagement.UpdateRequest): Observable { - const url = `/api/multi-tenancy/tenants/${body.id}`; - delete body.id; - - const request: Rest.Request = { - method: 'PUT', - url, - body, - }; - - return this.rest.request(request, { - apiName: this.apiName, - }); - } - - getDefaultConnectionString(id: string): Observable { - const url = `/api/multi-tenancy/tenants/${id}/default-connection-string`; - - const request: Rest.Request = { - method: 'GET', - responseType: Rest.ResponseType.Text, - url, - }; - return this.rest.request(request, { - apiName: this.apiName, - }); - } - - updateDefaultConnectionString( - payload: TenantManagement.DefaultConnectionStringRequest, - ): Observable { - const url = `/api/multi-tenancy/tenants/${payload.id}/default-connection-string`; - - const request: Rest.Request = { - method: 'PUT', - url, - params: { defaultConnectionString: payload.defaultConnectionString }, - }; - return this.rest.request(request, { - apiName: this.apiName, - }); - } - - deleteDefaultConnectionString(id: string): Observable { - const url = `/api/multi-tenancy/tenants/${id}/default-connection-string`; - - const request: Rest.Request = { - method: 'DELETE', - url, - }; - return this.rest.request(request, { - apiName: this.apiName, - }); - } -}