From 041f9bd20d5a7977c8fdddfa461ce378c8ceb158 Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Thu, 12 Nov 2020 09:54:24 +0300 Subject: [PATCH 1/7] chore: remove replaceable components state --- .../packages/core/src/lib/actions/index.ts | 3 +- .../actions/replaceable-components.actions.ts | 13 ---- .../packages/core/src/lib/core.module.ts | 3 +- .../packages/core/src/lib/states/index.ts | 1 - .../states/replaceable-components.state.ts | 74 ------------------- .../replaceable-components.state.spec.ts | 59 --------------- 6 files changed, 2 insertions(+), 151 deletions(-) delete mode 100644 npm/ng-packs/packages/core/src/lib/actions/replaceable-components.actions.ts delete mode 100644 npm/ng-packs/packages/core/src/lib/states/replaceable-components.state.ts delete mode 100644 npm/ng-packs/packages/core/src/lib/tests/replaceable-components.state.spec.ts diff --git a/npm/ng-packs/packages/core/src/lib/actions/index.ts b/npm/ng-packs/packages/core/src/lib/actions/index.ts index 8a3b36e5b2..03336d2668 100644 --- a/npm/ng-packs/packages/core/src/lib/actions/index.ts +++ b/npm/ng-packs/packages/core/src/lib/actions/index.ts @@ -1,5 +1,4 @@ -export { SetEnvironment, GetAppConfiguration } from './config.actions'; +export { GetAppConfiguration, SetEnvironment } from './config.actions'; export * from './loader.actions'; export * from './profile.actions'; -export * from './replaceable-components.actions'; export * from './rest.actions'; diff --git a/npm/ng-packs/packages/core/src/lib/actions/replaceable-components.actions.ts b/npm/ng-packs/packages/core/src/lib/actions/replaceable-components.actions.ts deleted file mode 100644 index a800ab858a..0000000000 --- a/npm/ng-packs/packages/core/src/lib/actions/replaceable-components.actions.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { ReplaceableComponents } from '../models/replaceable-components'; - -// tslint:disable: max-line-length -/** - * @deprecated To be deleted in v4.0. Use ReplaceableComponentsService instead. See the doc (https://docs.abp.io/en/abp/latest/UI/Angular/Component-Replacement) - */ -export class AddReplaceableComponent { - static readonly type = '[ReplaceableComponents] Add'; - constructor( - public payload: ReplaceableComponents.ReplaceableComponent, - public reload?: boolean, - ) {} -} diff --git a/npm/ng-packs/packages/core/src/lib/core.module.ts b/npm/ng-packs/packages/core/src/lib/core.module.ts index bbe3de7299..a9053d804b 100644 --- a/npm/ng-packs/packages/core/src/lib/core.module.ts +++ b/npm/ng-packs/packages/core/src/lib/core.module.ts @@ -30,7 +30,6 @@ import { SortPipe } from './pipes/sort.pipe'; import { LocaleProvider } from './providers/locale.provider'; import { LocalizationService } from './services/localization.service'; import { ProfileState } from './states/profile.state'; -import { ReplaceableComponentsState } from './states/replaceable-components.state'; import { oAuthStorage } from './strategies/auth-flow.strategy'; import { coreOptionsFactory, CORE_OPTIONS } from './tokens/options.token'; import { noop } from './utils/common-utils'; @@ -113,7 +112,7 @@ export class BaseCoreModule {} imports: [ BaseCoreModule, LocalizationModule, - NgxsModule.forFeature([ReplaceableComponentsState, ProfileState]), + NgxsModule.forFeature([ProfileState]), NgxsRouterPluginModule.forRoot(), OAuthModule.forRoot(), HttpClientXsrfModule.withOptions({ diff --git a/npm/ng-packs/packages/core/src/lib/states/index.ts b/npm/ng-packs/packages/core/src/lib/states/index.ts index 76a5510ac9..a96a6e7213 100644 --- a/npm/ng-packs/packages/core/src/lib/states/index.ts +++ b/npm/ng-packs/packages/core/src/lib/states/index.ts @@ -1,3 +1,2 @@ -export * from './replaceable-components.state'; export * from './config.state'; export * from './profile.state'; diff --git a/npm/ng-packs/packages/core/src/lib/states/replaceable-components.state.ts b/npm/ng-packs/packages/core/src/lib/states/replaceable-components.state.ts deleted file mode 100644 index 8b861f144e..0000000000 --- a/npm/ng-packs/packages/core/src/lib/states/replaceable-components.state.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { Injectable, isDevMode } from '@angular/core'; -import { Action, createSelector, Selector, State, StateContext } from '@ngxs/store'; -import snq from 'snq'; -import { AddReplaceableComponent } from '../actions/replaceable-components.actions'; -import { ReplaceableComponents } from '../models/replaceable-components'; -import { ReplaceableComponentsService } from '../services/replaceable-components.service'; - -function logDeprecationMsg() { - if (isDevMode()) { - console.warn(` - ReplacableComponentsState has been deprecated. Use ReplaceableComponentsService instead. - See the doc https://docs.abp.io/en/abp/latest/UI/Angular/Component-Replacement - `); - } -} - -// tslint:disable: max-line-length -/** - * @deprecated To be deleted in v4.0. Use ReplaceableComponentsService instead. See the doc (https://docs.abp.io/en/abp/latest/UI/Angular/Component-Replacement) - */ -@State({ - name: 'ReplaceableComponentsState', - defaults: { replaceableComponents: [] } as ReplaceableComponents.State, -}) -@Injectable() -export class ReplaceableComponentsState { - @Selector() - static getAll({ - replaceableComponents, - }: ReplaceableComponents.State): ReplaceableComponents.ReplaceableComponent[] { - logDeprecationMsg(); - return replaceableComponents || []; - } - - static getComponent(key: string) { - const selector = createSelector( - [ReplaceableComponentsState], - (state: ReplaceableComponents.State): ReplaceableComponents.ReplaceableComponent => { - logDeprecationMsg(); - return snq(() => state.replaceableComponents.find(component => component.key === key)); - }, - ); - - return selector; - } - - constructor(private service: ReplaceableComponentsService) {} - - @Action(AddReplaceableComponent) - replaceableComponentsAction( - { getState, patchState }: StateContext, - { payload, reload }: AddReplaceableComponent, - ) { - logDeprecationMsg(); - - let { replaceableComponents } = getState(); - - const index = snq( - () => replaceableComponents.findIndex(component => component.key === payload.key), - -1, - ); - if (index > -1) { - replaceableComponents[index] = payload; - } else { - replaceableComponents = [...replaceableComponents, payload]; - } - - patchState({ - replaceableComponents, - }); - - this.service.add(payload, reload); - } -} diff --git a/npm/ng-packs/packages/core/src/lib/tests/replaceable-components.state.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/replaceable-components.state.spec.ts deleted file mode 100644 index be063c4844..0000000000 --- a/npm/ng-packs/packages/core/src/lib/tests/replaceable-components.state.spec.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { APP_BASE_HREF } from '@angular/common'; -import { Component } from '@angular/core'; -import { Router, RouterModule } from '@angular/router'; -import { SpyObject } from '@ngneat/spectator'; -import { createHostFactory, SpectatorHost } from '@ngneat/spectator/jest'; -import { NgxsModule, Store } from '@ngxs/store'; -import { AddReplaceableComponent } from '../actions'; -import { ReplaceableComponentsState } from '../states/replaceable-components.state'; - -@Component({ selector: 'abp-dummy', template: 'dummy works' }) -class DummyComponent {} - -describe('ReplaceableComponentsState', () => { - let spectator: SpectatorHost; - let router: SpyObject; - const createHost = createHostFactory({ - component: DummyComponent, - providers: [{ provide: APP_BASE_HREF, useValue: '/' }], - imports: [RouterModule.forRoot([]), NgxsModule.forRoot([ReplaceableComponentsState])], - }); - - beforeEach(() => { - spectator = createHost(''); - router = spectator.inject(Router); - }); - - it('should add a component to the state', () => { - const store = spectator.inject(Store); - expect(store.selectSnapshot(ReplaceableComponentsState.getAll)).toEqual([]); - store.dispatch(new AddReplaceableComponent({ component: DummyComponent, key: 'Dummy' })); - expect(store.selectSnapshot(ReplaceableComponentsState.getComponent('Dummy'))).toEqual({ - component: DummyComponent, - key: 'Dummy', - }); - }); - - it('should replace a exist component', () => { - const store = spectator.inject(Store); - store.dispatch(new AddReplaceableComponent({ component: DummyComponent, key: 'Dummy' })); - store.dispatch(new AddReplaceableComponent({ component: null, key: 'Dummy' })); - expect(store.selectSnapshot(ReplaceableComponentsState.getComponent('Dummy'))).toEqual({ - component: null, - key: 'Dummy', - }); - expect(store.selectSnapshot(ReplaceableComponentsState.getAll)).toHaveLength(1); - }); - - it('should call reloadRoute when reload parameter is given as true to AddReplaceableComponent', async () => { - const spy = jest.spyOn(router, 'navigateByUrl'); - const store = spectator.inject(Store); - store.dispatch(new AddReplaceableComponent({ component: DummyComponent, key: 'Dummy' })); - store.dispatch(new AddReplaceableComponent({ component: null, key: 'Dummy' }, true)); - - await spectator.fixture.whenStable(); - - expect(spy).toHaveBeenCalledTimes(1); - expect(spy).toHaveBeenCalledWith(router.url); - }); -}); From 84f34480d6c498178182f1a5f5dc048a038046a8 Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Thu, 12 Nov 2020 09:59:04 +0300 Subject: [PATCH 2/7] chore: remove legacy identity types and service --- .../lib/components/users/users.component.ts | 2 - .../identity/src/lib/models/identity.ts | 63 +------- .../src/lib/services/identity.service.ts | 150 ------------------ .../identity/src/lib/services/index.ts | 1 - .../identity/src/lib/states/identity.state.ts | 4 +- 5 files changed, 3 insertions(+), 217 deletions(-) delete mode 100644 npm/ng-packs/packages/identity/src/lib/services/identity.service.ts diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts index c302b14cea..3588ad02b0 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts +++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts @@ -36,7 +36,6 @@ import { IdentityRoleDto, IdentityUserDto, } from '../../proxy/identity/models'; -import { IdentityService } from '../../services/identity.service'; import { IdentityState } from '../../states/identity.state'; @Component({ @@ -88,7 +87,6 @@ export class UsersComponent implements OnInit { private confirmationService: ConfirmationService, private fb: FormBuilder, private store: Store, - private identityService: IdentityService, private identityUserService: IdentityUserService, ) {} diff --git a/npm/ng-packs/packages/identity/src/lib/models/identity.ts b/npm/ng-packs/packages/identity/src/lib/models/identity.ts index b4c527b0e7..115e0b488f 100644 --- a/npm/ng-packs/packages/identity/src/lib/models/identity.ts +++ b/npm/ng-packs/packages/identity/src/lib/models/identity.ts @@ -1,4 +1,4 @@ -import { ABP, PagedResultDto } from '@abp/ng.core'; +import { PagedResultDto } from '@abp/ng.core'; import { IdentityRoleDto, IdentityUserDto } from '../proxy/identity/models'; export namespace Identity { @@ -9,65 +9,4 @@ export namespace Identity { selectedUser: IdentityUserDto; selectedUserRoles: IdentityRoleDto[]; } - - /** - * @deprecated To be deleted in v4.0. - */ - export type RoleResponse = ABP.PagedResponse; - - /** - * @deprecated To be deleted in v4.0. - */ - export interface RoleSaveRequest { - name: string; - isDefault: boolean; - isPublic: boolean; - } - - /** - * @deprecated To be deleted in v4.0. - */ - export interface RoleItem extends RoleSaveRequest { - isStatic: boolean; - concurrencyStamp: string; - id: string; - } - - /** - * @deprecated To be deleted in v4.0. - */ - export type UserResponse = ABP.PagedResponse; - - /** - * @deprecated To be deleted in v4.0. - */ - export interface UserItem extends User { - tenantId: string; - emailConfirmed: boolean; - phoneNumberConfirmed: boolean; - isLockedOut: boolean; - concurrencyStamp: string; - id: string; - } - - /** - * @deprecated To be deleted in v4.0. - */ - export interface User { - userName: string; - name: string; - surname: string; - email: string; - phoneNumber: string; - twoFactorEnabled: true; - lockoutEnabled: true; - } - - /** - * @deprecated To be deleted in v4.0. - */ - export interface UserSaveRequest extends User { - password: string; - roleNames: string[]; - } } diff --git a/npm/ng-packs/packages/identity/src/lib/services/identity.service.ts b/npm/ng-packs/packages/identity/src/lib/services/identity.service.ts deleted file mode 100644 index 7413079279..0000000000 --- a/npm/ng-packs/packages/identity/src/lib/services/identity.service.ts +++ /dev/null @@ -1,150 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; -import { RestService, Rest, ABP } from '@abp/ng.core'; -import { Identity } from '../models/identity'; - -@Injectable({ - providedIn: 'root', -}) -export class IdentityService { - apiName = 'AbpIdentity'; - - constructor(private rest: RestService) {} - - getRoles(params = {} as ABP.PageQueryParams): Observable { - const request: Rest.Request = { - method: 'GET', - url: '/api/identity/roles', - params, - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - getAllRoles(): Observable { - const request: Rest.Request = { - method: 'GET', - url: '/api/identity/roles/all', - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - getRoleById(id: string): Observable { - const request: Rest.Request = { - method: 'GET', - url: `/api/identity/roles/${id}`, - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - deleteRole(id: string): Observable { - const request: Rest.Request = { - method: 'DELETE', - url: `/api/identity/roles/${id}`, - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - createRole(body: Identity.RoleSaveRequest): Observable { - const request: Rest.Request = { - method: 'POST', - url: '/api/identity/roles', - body, - }; - - return this.rest.request(request, { - apiName: this.apiName, - }); - } - - updateRole(body: Identity.RoleItem): Observable { - const url = `/api/identity/roles/${body.id}`; - delete body.id; - - const request: Rest.Request = { - method: 'PUT', - url, - body, - }; - - return this.rest.request(request, { - apiName: this.apiName, - }); - } - - getUsers(params = {} as ABP.PageQueryParams): Observable { - const request: Rest.Request = { - method: 'GET', - url: '/api/identity/users', - params, - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - getUserById(id: string): Observable { - const request: Rest.Request = { - method: 'GET', - url: `/api/identity/users/${id}`, - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - getUserRoles(id: string): Observable { - const request: Rest.Request = { - method: 'GET', - url: `/api/identity/users/${id}/roles`, - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - getUserAssingableRoles(): Observable { - const request: Rest.Request = { - method: 'GET', - url: '/api/identity/users/assignable-roles', - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - deleteUser(id: string): Observable { - const request: Rest.Request = { - method: 'DELETE', - url: `/api/identity/users/${id}`, - }; - - return this.rest.request(request, { apiName: this.apiName }); - } - - createUser(body: Identity.UserSaveRequest): Observable { - const request: Rest.Request = { - method: 'POST', - url: '/api/identity/users', - body, - }; - - return this.rest.request(request, { - apiName: this.apiName, - }); - } - - updateUser(body: Identity.UserItem): Observable { - const url = `/api/identity/users/${body.id}`; - delete body.id; - - const request: Rest.Request = { - method: 'PUT', - url, - body, - }; - - return this.rest.request(request, { - apiName: this.apiName, - }); - } -} diff --git a/npm/ng-packs/packages/identity/src/lib/services/index.ts b/npm/ng-packs/packages/identity/src/lib/services/index.ts index 8f15a1ebe1..d29e295c98 100644 --- a/npm/ng-packs/packages/identity/src/lib/services/index.ts +++ b/npm/ng-packs/packages/identity/src/lib/services/index.ts @@ -1,2 +1 @@ -export * from './identity.service'; export * from './identity-state.service'; diff --git a/npm/ng-packs/packages/identity/src/lib/states/identity.state.ts b/npm/ng-packs/packages/identity/src/lib/states/identity.state.ts index 565315bfb6..f67661e0d1 100644 --- a/npm/ng-packs/packages/identity/src/lib/states/identity.state.ts +++ b/npm/ng-packs/packages/identity/src/lib/states/identity.state.ts @@ -17,7 +17,7 @@ import { import { Identity } from '../models/identity'; import { IdentityRoleService } from '../proxy/identity/identity-role.service'; import { IdentityUserService } from '../proxy/identity/identity-user.service'; -import { IdentityUserDto } from '../proxy/identity/models'; +import { IdentityRoleDto, IdentityUserDto } from '../proxy/identity/models'; @State({ name: 'IdentityState', @@ -26,7 +26,7 @@ import { IdentityUserDto } from '../proxy/identity/models'; @Injectable() export class IdentityState { @Selector() - static getRoles({ roles }: Identity.State): Identity.RoleItem[] { + static getRoles({ roles }: Identity.State): IdentityRoleDto[] { return roles.items || []; } From 48b8ea28e1c41e14fbaa2f70882579f7608597ac Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Thu, 12 Nov 2020 10:02:15 +0300 Subject: [PATCH 3/7] 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, - }); - } -} From c3387611a571e81719e4d50bfb6787356e577ce9 Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Thu, 12 Nov 2020 10:09:12 +0300 Subject: [PATCH 4/7] chore: remove legacy feature management types and services --- .../lib/actions/feature-management.actions.ts | 17 ------ .../src/lib/actions/index.ts | 1 - .../src/lib/feature-management.module.ts | 12 +--- .../src/lib/models/feature-management.ts | 44 ------------- .../feature-management-state.service.ts | 23 ------- .../services/feature-management.service.ts | 42 ------------- .../src/lib/services/index.ts | 2 - .../lib/states/feature-management.state.ts | 39 ------------ .../src/lib/states/index.ts | 1 - .../feature-management-state.service.spec.ts | 61 ------------------- 10 files changed, 3 insertions(+), 239 deletions(-) delete mode 100644 npm/ng-packs/packages/feature-management/src/lib/actions/feature-management.actions.ts delete mode 100644 npm/ng-packs/packages/feature-management/src/lib/actions/index.ts delete mode 100644 npm/ng-packs/packages/feature-management/src/lib/services/feature-management-state.service.ts delete mode 100644 npm/ng-packs/packages/feature-management/src/lib/services/feature-management.service.ts delete mode 100644 npm/ng-packs/packages/feature-management/src/lib/services/index.ts delete mode 100644 npm/ng-packs/packages/feature-management/src/lib/states/feature-management.state.ts delete mode 100644 npm/ng-packs/packages/feature-management/src/lib/states/index.ts delete mode 100644 npm/ng-packs/packages/feature-management/src/lib/tests/feature-management-state.service.spec.ts diff --git a/npm/ng-packs/packages/feature-management/src/lib/actions/feature-management.actions.ts b/npm/ng-packs/packages/feature-management/src/lib/actions/feature-management.actions.ts deleted file mode 100644 index 65791be948..0000000000 --- a/npm/ng-packs/packages/feature-management/src/lib/actions/feature-management.actions.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { FeatureManagement } from '../models'; - -/** - * @deprecated To be deleted in v4.0. - */ -export class GetFeatures { - static readonly type = '[FeatureManagement] Get Features'; - constructor(public payload: FeatureManagement.Provider) {} -} - -/** - * @deprecated To be deleted in v4.0. - */ -export class UpdateFeatures { - static readonly type = '[FeatureManagement] Update Features'; - constructor(public payload: FeatureManagement.Provider & FeatureManagement.Features) {} -} diff --git a/npm/ng-packs/packages/feature-management/src/lib/actions/index.ts b/npm/ng-packs/packages/feature-management/src/lib/actions/index.ts deleted file mode 100644 index 66678fb322..0000000000 --- a/npm/ng-packs/packages/feature-management/src/lib/actions/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './feature-management.actions'; diff --git a/npm/ng-packs/packages/feature-management/src/lib/feature-management.module.ts b/npm/ng-packs/packages/feature-management/src/lib/feature-management.module.ts index 4061965085..84ab3d6984 100644 --- a/npm/ng-packs/packages/feature-management/src/lib/feature-management.module.ts +++ b/npm/ng-packs/packages/feature-management/src/lib/feature-management.module.ts @@ -1,22 +1,16 @@ import { CoreModule } from '@abp/ng.core'; import { ThemeSharedModule } from '@abp/ng.theme.shared'; import { NgModule } from '@angular/core'; -import { NgxsModule } from '@ngxs/store'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; -import { FreeTextInputDirective } from './directives/free-text-input.directive'; +import { NgxsModule } from '@ngxs/store'; import { FeatureManagementComponent } from './components/feature-management/feature-management.component'; -import { FeatureManagementState } from './states/feature-management.state'; +import { FreeTextInputDirective } from './directives/free-text-input.directive'; const exported = [FeatureManagementComponent, FreeTextInputDirective]; @NgModule({ declarations: [...exported], - imports: [ - CoreModule, - ThemeSharedModule, - NgbNavModule, - NgxsModule.forFeature([FeatureManagementState]), - ], + imports: [CoreModule, ThemeSharedModule, NgbNavModule, NgxsModule.forFeature([])], exports: [...exported], }) export class FeatureManagementModule {} diff --git a/npm/ng-packs/packages/feature-management/src/lib/models/feature-management.ts b/npm/ng-packs/packages/feature-management/src/lib/models/feature-management.ts index ef53e6d11c..c04d917515 100644 --- a/npm/ng-packs/packages/feature-management/src/lib/models/feature-management.ts +++ b/npm/ng-packs/packages/feature-management/src/lib/models/feature-management.ts @@ -1,50 +1,6 @@ import { EventEmitter } from '@angular/core'; export namespace FeatureManagement { - /** - * @deprecated To be deleted in v4.0. - */ - export interface State { - features: Feature[]; - } - - /** - * @deprecated To be deleted in v4.0. - */ - export interface ValueType { - name: string; - properties: object; - validator: object; - } - - /** - * @deprecated To be deleted in v4.0. - */ - export interface Feature { - name: string; - displayName: string; - value: string; - description?: string; - valueType?: ValueType; - depth?: number; - parentName?: string; - } - - /** - * @deprecated To be deleted in v4.0. - */ - export interface Features { - features: Feature[]; - } - - /** - * @deprecated To be deleted in v4.0. - */ - export interface Provider { - providerName: string; - providerKey: string; - } - export interface FeatureManagementComponentInputs { visible: boolean; readonly providerName: string; diff --git a/npm/ng-packs/packages/feature-management/src/lib/services/feature-management-state.service.ts b/npm/ng-packs/packages/feature-management/src/lib/services/feature-management-state.service.ts deleted file mode 100644 index 20c76c41ae..0000000000 --- a/npm/ng-packs/packages/feature-management/src/lib/services/feature-management-state.service.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Store } from '@ngxs/store'; -import { GetFeatures, UpdateFeatures } from '../actions/feature-management.actions'; -import { FeatureManagementState } from '../states/feature-management.state'; - -@Injectable({ - providedIn: 'root', -}) -export class FeatureManagementStateService { - constructor(private store: Store) {} - - getFeatures() { - return this.store.selectSnapshot(FeatureManagementState.getFeatures); - } - - dispatchGetFeatures(...args: ConstructorParameters) { - return this.store.dispatch(new GetFeatures(...args)); - } - - dispatchUpdateFeatures(...args: ConstructorParameters) { - return this.store.dispatch(new UpdateFeatures(...args)); - } -} diff --git a/npm/ng-packs/packages/feature-management/src/lib/services/feature-management.service.ts b/npm/ng-packs/packages/feature-management/src/lib/services/feature-management.service.ts deleted file mode 100644 index ad66f0946e..0000000000 --- a/npm/ng-packs/packages/feature-management/src/lib/services/feature-management.service.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { Injectable } from '@angular/core'; -import { RestService, Rest } from '@abp/ng.core'; -import { Store } from '@ngxs/store'; -import { Observable } from 'rxjs'; -import { FeatureManagement } from '../models'; - -@Injectable({ - providedIn: 'root', -}) -/** - * @deprecated Use FeaturesService instead. To be deleted in v4.0. - */ -export class FeatureManagementService { - apiName = 'FeatureManagement'; - - constructor(private rest: RestService, private store: Store) {} - - getFeatures(params: FeatureManagement.Provider): Observable { - const request: Rest.Request = { - method: 'GET', - url: '/api/feature-management/features', - params, - }; - return this.rest.request(request, { - apiName: this.apiName, - }); - } - - updateFeatures({ - features, - providerKey, - providerName, - }: FeatureManagement.Provider & FeatureManagement.Features): Observable { - const request: Rest.Request = { - method: 'PUT', - url: '/api/feature-management/features', - body: { features }, - params: { providerKey, providerName }, - }; - return this.rest.request(request, { apiName: this.apiName }); - } -} diff --git a/npm/ng-packs/packages/feature-management/src/lib/services/index.ts b/npm/ng-packs/packages/feature-management/src/lib/services/index.ts deleted file mode 100644 index 1243410ea6..0000000000 --- a/npm/ng-packs/packages/feature-management/src/lib/services/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './feature-management.service'; -export * from './feature-management-state.service'; diff --git a/npm/ng-packs/packages/feature-management/src/lib/states/feature-management.state.ts b/npm/ng-packs/packages/feature-management/src/lib/states/feature-management.state.ts deleted file mode 100644 index 4ea68704f2..0000000000 --- a/npm/ng-packs/packages/feature-management/src/lib/states/feature-management.state.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { Action, Selector, State, StateContext } from '@ngxs/store'; -import { tap } from 'rxjs/operators'; -import { GetFeatures, UpdateFeatures } from '../actions/feature-management.actions'; -import { FeatureManagement } from '../models/feature-management'; -import { FeatureManagementService } from '../services/feature-management.service'; -import { Injectable } from '@angular/core'; - -/** - * @deprecated To be deleted in v4.0. - */ -@State({ - name: 'FeatureManagementState', - defaults: { features: {} } as FeatureManagement.State, -}) -@Injectable() -export class FeatureManagementState { - @Selector() - static getFeatures({ features }: FeatureManagement.State) { - return features || []; - } - - constructor(private featureManagementService: FeatureManagementService) {} - - @Action(GetFeatures) - getFeatures({ patchState }: StateContext, { payload }: GetFeatures) { - return this.featureManagementService.getFeatures(payload).pipe( - tap(({ features = [] }) => - patchState({ - features, - }), - ), - ); - } - - @Action(UpdateFeatures) - updateFeatures(_, { payload }: UpdateFeatures) { - return this.featureManagementService.updateFeatures(payload); - } -} diff --git a/npm/ng-packs/packages/feature-management/src/lib/states/index.ts b/npm/ng-packs/packages/feature-management/src/lib/states/index.ts deleted file mode 100644 index 3c9c6e26d6..0000000000 --- a/npm/ng-packs/packages/feature-management/src/lib/states/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './feature-management.state'; diff --git a/npm/ng-packs/packages/feature-management/src/lib/tests/feature-management-state.service.spec.ts b/npm/ng-packs/packages/feature-management/src/lib/tests/feature-management-state.service.spec.ts deleted file mode 100644 index 5d59755cbd..0000000000 --- a/npm/ng-packs/packages/feature-management/src/lib/tests/feature-management-state.service.spec.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { createServiceFactory, SpectatorService, SpyObject } from '@ngneat/spectator/jest'; -import { Store } from '@ngxs/store'; -import { FeatureManagementStateService } from '../services/feature-management-state.service'; -import { FeatureManagementState } from '../states'; -import * as FeatureManagementActions from '../actions'; - -describe('FeatureManagementStateService', () => { - let service: FeatureManagementStateService; - let spectator: SpectatorService; - let store: SpyObject; - - const createService = createServiceFactory({ - service: FeatureManagementStateService, - mocks: [Store], - }); - beforeEach(() => { - spectator = createService(); - service = spectator.service; - store = spectator.inject(Store); - }); - - test('should have the all FeatureManagementState static methods', () => { - const reg = /(?<=static )(.*)(?=\()/gm; - FeatureManagementState.toString() - .match(reg) - .forEach(fnName => { - expect(service[fnName]).toBeTruthy(); - - const spy = jest.spyOn(store, 'selectSnapshot'); - spy.mockClear(); - - const isDynamicSelector = FeatureManagementState[fnName].name !== 'memoized'; - - if (isDynamicSelector) { - FeatureManagementState[fnName] = jest.fn((...args) => args); - service[fnName]('test', 0, {}); - expect(FeatureManagementState[fnName]).toHaveBeenCalledWith('test', 0, {}); - } else { - service[fnName](); - expect(spy).toHaveBeenCalledWith(FeatureManagementState[fnName]); - } - }); - }); - - test('should have a dispatch method for every FeatureManagementState action', () => { - const reg = /(?<=dispatch)(\w+)(?=\()/gm; - FeatureManagementStateService.toString() - .match(reg) - .forEach(fnName => { - expect(FeatureManagementActions[fnName]).toBeTruthy(); - - const spy = jest.spyOn(store, 'dispatch'); - spy.mockClear(); - - const params = Array.from(new Array(FeatureManagementActions[fnName].length)); - - service[`dispatch${fnName}`](...params); - expect(spy).toHaveBeenCalledWith(new FeatureManagementActions[fnName](...params)); - }); - }); -}); From d8a6f24c7ab90150eabea78a3d744b414133e543 Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Thu, 12 Nov 2020 10:16:04 +0300 Subject: [PATCH 5/7] chore: remove legacy permission management types and service --- .../actions/permission-management.actions.ts | 7 ++- .../permission-management.component.ts | 37 +++++++------- .../src/lib/models/permission-management.ts | 50 +------------------ .../src/lib/services/index.ts | 1 - .../services/permission-management.service.ts | 45 ----------------- .../lib/states/permission-management.state.ts | 5 +- 6 files changed, 27 insertions(+), 118 deletions(-) delete mode 100644 npm/ng-packs/packages/permission-management/src/lib/services/permission-management.service.ts diff --git a/npm/ng-packs/packages/permission-management/src/lib/actions/permission-management.actions.ts b/npm/ng-packs/packages/permission-management/src/lib/actions/permission-management.actions.ts index 2c21561a5c..c522ab4c6e 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/actions/permission-management.actions.ts +++ b/npm/ng-packs/packages/permission-management/src/lib/actions/permission-management.actions.ts @@ -1,12 +1,11 @@ -import { PermissionManagement } from '../models/permission-management'; -import { UpdatePermissionsDto } from '../proxy/models'; +import { ProviderInfoDto, UpdatePermissionsDto } from '../proxy/models'; export class GetPermissions { static readonly type = '[PermissionManagement] Get Permissions'; - constructor(public payload: PermissionManagement.GrantedProvider) {} + constructor(public payload: ProviderInfoDto) {} } export class UpdatePermissions { static readonly type = '[PermissionManagement] Update Permissions'; - constructor(public payload: PermissionManagement.GrantedProvider & UpdatePermissionsDto) {} + constructor(public payload: ProviderInfoDto & UpdatePermissionsDto) {} } diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts index 8ee4fa113c..5b4623aeed 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts +++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts @@ -4,16 +4,22 @@ import { ConfigStateService, } from '@abp/ng.core'; import { LocaleDirection } from '@abp/ng.theme.shared'; -import { Component, EventEmitter, Input, Output, Renderer2, TrackByFunction } from '@angular/core'; +import { Component, EventEmitter, Input, Output, TrackByFunction } from '@angular/core'; import { Select, Store } from '@ngxs/store'; import { Observable, of } from 'rxjs'; import { finalize, map, pluck, switchMap, take, tap } from 'rxjs/operators'; import { GetPermissions, UpdatePermissions } from '../actions/permission-management.actions'; import { PermissionManagement } from '../models/permission-management'; -import { UpdatePermissionDto } from '../proxy/models'; +import { + GetPermissionListResultDto, + PermissionGrantInfoDto, + PermissionGroupDto, + ProviderInfoDto, + UpdatePermissionDto, +} from '../proxy/models'; import { PermissionManagementState } from '../states/permission-management.state'; -type PermissionWithStyle = PermissionManagement.Permission & { +type PermissionWithStyle = PermissionGrantInfoDto & { style: string; }; @@ -68,14 +74,14 @@ export class PermissionManagementComponent @Output() readonly visibleChange = new EventEmitter(); @Select(PermissionManagementState.getPermissionGroups) - groups$: Observable; + groups$: Observable; @Select(PermissionManagementState.getEntityDisplayName) entityName$: Observable; - selectedGroup: PermissionManagement.Group; + selectedGroup: PermissionGroupDto; - permissions: PermissionManagement.Permission[] = []; + permissions: PermissionGrantInfoDto[] = []; selectThisTab = false; @@ -83,7 +89,7 @@ export class PermissionManagementComponent modalBusy = false; - trackByFn: TrackByFunction = (_, item) => item.name; + trackByFn: TrackByFunction = (_, item) => item.name; get selectedGroupPermissions$(): Observable { const margin = `margin-${ @@ -96,7 +102,7 @@ export class PermissionManagementComponent ? groups.find(group => group.name === this.selectedGroup.name).permissions : [], ), - map(permissions => + map(permissions => permissions.map( permission => (({ @@ -119,14 +125,14 @@ export class PermissionManagementComponent return (this.permissions.find(per => per.name === name) || { isGranted: false }).isGranted; } - isGrantedByOtherProviderName(grantedProviders: PermissionManagement.GrantedProvider[]): boolean { + isGrantedByOtherProviderName(grantedProviders: ProviderInfoDto[]): boolean { if (grantedProviders.length) { return grantedProviders.findIndex(p => p.providerName !== this.providerName) > -1; } return false; } - onClickCheckbox(clickedPermission: PermissionManagement.Permission, value) { + onClickCheckbox(clickedPermission: PermissionGrantInfoDto, value) { if ( clickedPermission.isGranted && this.isGrantedByOtherProviderName(clickedPermission.grantedProviders) @@ -212,7 +218,7 @@ export class PermissionManagementComponent this.selectThisTab = !this.selectAllTab; } - onChangeGroup(group: PermissionManagement.Group) { + onChangeGroup(group: PermissionGroupDto) { this.selectedGroup = group; this.setTabCheckboxState(); } @@ -274,7 +280,7 @@ export class PermissionManagementComponent ) .pipe( pluck('PermissionManagementState', 'permissionRes'), - tap((permissionRes: PermissionManagement.Response) => { + tap((permissionRes: GetPermissionListResultDto) => { this.selectedGroup = permissionRes.groups[0]; this.permissions = getPermissions(permissionRes.groups); }), @@ -306,10 +312,7 @@ export class PermissionManagementComponent } } -function findMargin( - permissions: PermissionManagement.Permission[], - permission: PermissionManagement.Permission, -) { +function findMargin(permissions: PermissionGrantInfoDto[], permission: PermissionGrantInfoDto) { const parentPermission = permissions.find(per => per.name === permission.parentName); if (parentPermission && parentPermission.parentName) { @@ -320,6 +323,6 @@ function findMargin( return parentPermission ? 20 : 0; } -function getPermissions(groups: PermissionManagement.Group[]): PermissionManagement.Permission[] { +function getPermissions(groups: PermissionGroupDto[]): PermissionGrantInfoDto[] { return groups.reduce((acc, val) => [...acc, ...val.permissions], []); } diff --git a/npm/ng-packs/packages/permission-management/src/lib/models/permission-management.ts b/npm/ng-packs/packages/permission-management/src/lib/models/permission-management.ts index 831fc30523..2202d14b48 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/models/permission-management.ts +++ b/npm/ng-packs/packages/permission-management/src/lib/models/permission-management.ts @@ -1,55 +1,9 @@ import { EventEmitter } from '@angular/core'; +import { GetPermissionListResultDto } from '../proxy/models'; export namespace PermissionManagement { export interface State { - permissionRes: Response; - } - - /** - * @deprecated To be deleted in v4.0. - */ - export interface Response { - entityDisplayName: string; - groups: Group[]; - } - - /** - * @deprecated To be deleted in v4.0. - */ - export interface Group { - name: string; - displayName: string; - permissions: Permission[]; - } - - /** - * @deprecated To be deleted in v4.0. - */ - export interface MinimumPermission { - name: string; - isGranted: boolean; - } - - /** - * @deprecated To be deleted in v4.0. - */ - export interface Permission extends MinimumPermission { - displayName: string; - parentName: string; - allowedProviders: string[]; - grantedProviders: GrantedProvider[]; - } - - export interface GrantedProvider { - providerName: string; - providerKey: string; - } - - /** - * @deprecated To be deleted in v4.0. - */ - export interface UpdateRequest { - permissions: MinimumPermission[]; + permissionRes: GetPermissionListResultDto; } export interface PermissionManagementComponentInputs { diff --git a/npm/ng-packs/packages/permission-management/src/lib/services/index.ts b/npm/ng-packs/packages/permission-management/src/lib/services/index.ts index 8ac3c56f61..1304994db1 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/services/index.ts +++ b/npm/ng-packs/packages/permission-management/src/lib/services/index.ts @@ -1,2 +1 @@ -export * from './permission-management.service'; export * from './permission-management-state.service'; diff --git a/npm/ng-packs/packages/permission-management/src/lib/services/permission-management.service.ts b/npm/ng-packs/packages/permission-management/src/lib/services/permission-management.service.ts deleted file mode 100644 index 4825036f81..0000000000 --- a/npm/ng-packs/packages/permission-management/src/lib/services/permission-management.service.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { Injectable } from '@angular/core'; -import { RestService, Rest } from '@abp/ng.core'; -import { Observable } from 'rxjs'; -import { PermissionManagement } from '../models/permission-management'; - -@Injectable({ - providedIn: 'root', -}) -export class PermissionManagementService { - apiName = 'AbpPermissionManagement'; - - constructor(private rest: RestService) {} - - getPermissions( - params: PermissionManagement.GrantedProvider, - ): Observable { - const request: Rest.Request = { - method: 'GET', - url: '/api/permission-management/permissions', - params, - }; - - return this.rest.request( - request, - { apiName: this.apiName }, - ); - } - - updatePermissions({ - permissions, - providerKey, - providerName, - }: PermissionManagement.GrantedProvider & PermissionManagement.UpdateRequest): Observable { - const request: Rest.Request = { - method: 'PUT', - url: '/api/permission-management/permissions', - body: { permissions }, - params: { providerKey, providerName }, - }; - - return this.rest.request(request, { - apiName: this.apiName, - }); - } -} diff --git a/npm/ng-packs/packages/permission-management/src/lib/states/permission-management.state.ts b/npm/ng-packs/packages/permission-management/src/lib/states/permission-management.state.ts index 0a7f7830a8..e6952f091b 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/states/permission-management.state.ts +++ b/npm/ng-packs/packages/permission-management/src/lib/states/permission-management.state.ts @@ -3,6 +3,7 @@ import { Action, Selector, State, StateContext } from '@ngxs/store'; import { tap } from 'rxjs/operators'; import { GetPermissions, UpdatePermissions } from '../actions/permission-management.actions'; import { PermissionManagement } from '../models/permission-management'; +import { ProviderInfoDto } from '../proxy/models'; import { PermissionsService } from '../proxy/permissions.service'; @State({ @@ -26,9 +27,7 @@ export class PermissionManagementState { @Action(GetPermissions) permissionManagementGet( { patchState }: StateContext, - { - payload: { providerKey, providerName } = {} as PermissionManagement.GrantedProvider, - }: GetPermissions, + { payload: { providerKey, providerName } = {} as ProviderInfoDto }: GetPermissions, ) { return this.service.get(providerName, providerKey).pipe( tap(permissionResponse => From 687c8b5621fa695b116dd5ca1842754c46ce511e Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Thu, 12 Nov 2020 10:25:12 +0300 Subject: [PATCH 6/7] chore: update deprecation warning on request method --- .../packages/core/src/lib/services/rest.service.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/services/rest.service.ts b/npm/ng-packs/packages/core/src/lib/services/rest.service.ts index bd2c41cd29..204118aa56 100644 --- a/npm/ng-packs/packages/core/src/lib/services/rest.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/rest.service.ts @@ -1,13 +1,13 @@ import { HttpClient, HttpRequest } from '@angular/common/http'; -import { Injectable, Inject } from '@angular/core'; +import { Inject, Injectable } from '@angular/core'; import { Store } from '@ngxs/store'; import { Observable, throwError } from 'rxjs'; import { catchError } from 'rxjs/operators'; import { RestOccurError } from '../actions/rest.actions'; -import { Rest } from '../models/rest'; -import { isUndefinedOrEmptyString } from '../utils/common-utils'; import { ABP } from '../models/common'; +import { Rest } from '../models/rest'; import { CORE_OPTIONS } from '../tokens/options.token'; +import { isUndefinedOrEmptyString } from '../utils/common-utils'; import { EnvironmentService } from './environment.service'; @Injectable({ @@ -30,7 +30,7 @@ export class RestService { return throwError(err); } - // TODO: Deprecate service or improve interface in v3.0 + // TODO: Deprecate service or improve interface in v5.0 request( request: HttpRequest | Rest.Request, config?: Rest.Config, From ec9f03d26ad01b531869ed45c79aa854a89da4b5 Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Thu, 12 Nov 2020 10:54:06 +0300 Subject: [PATCH 7/7] chore: update deprecation messages --- .../packages/core/src/lib/directives/visibility.directive.ts | 4 ++-- .../theme-shared/src/lib/components/table/table.component.ts | 2 +- .../theme-shared/src/lib/directives/table-sort.directive.ts | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/directives/visibility.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/visibility.directive.ts index f5f4d22f5e..6cb341117d 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/visibility.directive.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/visibility.directive.ts @@ -1,10 +1,10 @@ -import { Directive, Input, Optional, ElementRef, Renderer2, AfterViewInit } from '@angular/core'; +import { AfterViewInit, Directive, ElementRef, Input, Optional, Renderer2 } from '@angular/core'; import { Subject } from 'rxjs'; import snq from 'snq'; /** * - * @deprecated To be deleted in v3.3 + * @deprecated To be deleted in v5.0 */ @Directive({ selector: '[abpVisibility]', diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.ts index 2199411a1c..0baf78f883 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/table/table.component.ts @@ -13,7 +13,7 @@ import { /** * - * @deprecated use ngx-datatale instead. + * @deprecated To be deleted in v5.0. Use ngx-datatale instead. */ @Component({ selector: 'abp-table', diff --git a/npm/ng-packs/packages/theme-shared/src/lib/directives/table-sort.directive.ts b/npm/ng-packs/packages/theme-shared/src/lib/directives/table-sort.directive.ts index 23638b7fe3..011768be7b 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/directives/table-sort.directive.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/directives/table-sort.directive.ts @@ -18,10 +18,9 @@ export interface TableSortOptions { order: SortOrder; } - /** * - * @deprecated To be deleted in v3.3 + * @deprecated To be deleted in v5.0 */ @Directive({ selector: '[abpTableSort]',