imhven
/
abp
mirror of https://github.com/abpframework/abp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: remove legacy tenant management types and service

Browse Source
pull/6169/head
Arman Ozak 5 years ago
parent 84f34480d6
commit 48b8ea28e1
4 changed files with 4 additions and 157 deletions
Show Stats Download Patch File Download Diff File

9
npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts
Unescape View File

@ -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<GetTenantsInput>,
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)),

40
npm/ng-packs/packages/tenant-management/src/lib/models/tenant-management.ts
Unescape View File

@ -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<TenantDto>;
selectedItem: TenantDto;
}
/**
* @deprecated To be deleted in v4.0
*/
export type Response = ABP.PagedResponse<Item>;
/**
* @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;
}
}

1
npm/ng-packs/packages/tenant-management/src/lib/services/index.ts
Unescape View File

@ -1,2 +1 @@
export * from './tenant-management.service';
export * from './tenant-management-state.service';

111
npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management.service.ts
Unescape View File

@ -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<TenantManagement.Response> {
const request: Rest.Request<null> = {
method: 'GET',
url: '/api/multi-tenancy/tenants',
params,
};
return this.rest.request<null, TenantManagement.Response>(request, { apiName: this.apiName });
}
getTenantById(id: string): Observable<ABP.BasicItem> {
const request: Rest.Request<null> = {
method: 'GET',
url: `/api/multi-tenancy/tenants/${id}`,
};
return this.rest.request<null, ABP.BasicItem>(request, { apiName: this.apiName });
}
deleteTenant(id: string): Observable<null> {
const request: Rest.Request<null> = {
method: 'DELETE',
url: `/api/multi-tenancy/tenants/${id}`,
};
return this.rest.request<null, null>(request, { apiName: this.apiName });
}
createTenant(body: TenantManagement.AddRequest): Observable<ABP.BasicItem> {
const request: Rest.Request<TenantManagement.AddRequest> = {
method: 'POST',
url: '/api/multi-tenancy/tenants',
body,
};
return this.rest.request<TenantManagement.AddRequest, ABP.BasicItem>(request, {
apiName: this.apiName,
});
}
updateTenant(body: TenantManagement.UpdateRequest): Observable<ABP.BasicItem> {
const url = `/api/multi-tenancy/tenants/${body.id}`;
delete body.id;
const request: Rest.Request<TenantManagement.UpdateRequest> = {
method: 'PUT',
url,
body,
};
return this.rest.request<TenantManagement.UpdateRequest, ABP.BasicItem>(request, {
apiName: this.apiName,
});
}
getDefaultConnectionString(id: string): Observable<string> {
const url = `/api/multi-tenancy/tenants/${id}/default-connection-string`;
const request: Rest.Request<TenantManagement.DefaultConnectionStringRequest> = {
method: 'GET',
responseType: Rest.ResponseType.Text,
url,
};
return this.rest.request<TenantManagement.DefaultConnectionStringRequest, string>(request, {
apiName: this.apiName,
});
}
updateDefaultConnectionString(
payload: TenantManagement.DefaultConnectionStringRequest,
): Observable<any> {
const url = `/api/multi-tenancy/tenants/${payload.id}/default-connection-string`;
const request: Rest.Request<TenantManagement.DefaultConnectionStringRequest> = {
method: 'PUT',
url,
params: { defaultConnectionString: payload.defaultConnectionString },
};
return this.rest.request<TenantManagement.DefaultConnectionStringRequest, any>(request, {
apiName: this.apiName,
});
}
deleteDefaultConnectionString(id: string): Observable<string> {
const url = `/api/multi-tenancy/tenants/${id}/default-connection-string`;
const request: Rest.Request<TenantManagement.DefaultConnectionStringRequest> = {
method: 'DELETE',
url,
};
return this.rest.request<TenantManagement.DefaultConnectionStringRequest, any>(request, {
apiName: this.apiName,
});
}
}
Write Preview
Loading…
Cancel
Save