diff --git a/npm/ng-packs/packages/account/src/lib/account.module.ts b/npm/ng-packs/packages/account/src/lib/account.module.ts index 341f687d60..3923ff4e17 100644 --- a/npm/ng-packs/packages/account/src/lib/account.module.ts +++ b/npm/ng-packs/packages/account/src/lib/account.module.ts @@ -25,22 +25,14 @@ import { AuthWrapperComponent } from './components/auth-wrapper/auth-wrapper.com ManageProfileComponent, PersonalSettingsComponent, ], - imports: [CoreModule, AccountRoutingModule, ThemeSharedModule, TableModule, NgbDropdownModule, NgxValidateCoreModule], + imports: [ + CoreModule, + AccountRoutingModule, + ThemeSharedModule, + TableModule, + NgbDropdownModule, + NgxValidateCoreModule, + ], exports: [], }) export class AccountModule {} - -/** - * - * @deprecated since version 0.9 - */ -export function AccountProviders(options = {} as Options): Provider[] { - return [ - { provide: ACCOUNT_OPTIONS, useValue: options }, - { - provide: 'ACCOUNT_OPTIONS', - useFactory: optionsFactory, - deps: [ACCOUNT_OPTIONS], - }, - ]; -} diff --git a/npm/ng-packs/packages/account/src/lib/constants/routes.ts b/npm/ng-packs/packages/account/src/lib/constants/routes.ts deleted file mode 100644 index 119bde1e7f..0000000000 --- a/npm/ng-packs/packages/account/src/lib/constants/routes.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { ABP, eLayoutType } from '@abp/ng.core'; - -/** - * - * @deprecated since version 0.9 - */ -export const ACCOUNT_ROUTES = { - routes: [ - { - name: 'Account', - path: 'account', - invisible: true, - layout: eLayoutType.application, - children: [{ path: 'login', name: 'Login', order: 1 }, { path: 'register', name: 'Register', order: 2 }], - }, - ] as ABP.FullRoute[], -}; diff --git a/npm/ng-packs/packages/account/src/public-api.ts b/npm/ng-packs/packages/account/src/public-api.ts index c81bfdc9d6..173cb6ea89 100644 --- a/npm/ng-packs/packages/account/src/public-api.ts +++ b/npm/ng-packs/packages/account/src/public-api.ts @@ -1,6 +1,5 @@ export * from './lib/account.module'; export * from './lib/components'; -export * from './lib/constants/routes'; export * from './lib/tokens'; export * from './lib/models'; export * from './lib/services'; diff --git a/npm/ng-packs/packages/core/src/lib/enums/common.ts b/npm/ng-packs/packages/core/src/lib/enums/common.ts index 1ecc29406c..08ddf05b6d 100644 --- a/npm/ng-packs/packages/core/src/lib/enums/common.ts +++ b/npm/ng-packs/packages/core/src/lib/enums/common.ts @@ -2,8 +2,4 @@ export const enum eLayoutType { account = 'account', application = 'application', empty = 'empty', - /** - * @deprecated since version 0.9.0 - */ - setting = 'setting', } diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html index 99569afefc..0e8bd7ccd4 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html +++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html @@ -54,8 +54,8 @@ {{ 'AbpIdentity::RoleName' | abpLocalization }} diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html index eab3339318..9097ca87ea 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html +++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html @@ -62,8 +62,8 @@ {{ 'AbpIdentity::UserName' | abpLocalization }} @@ -71,14 +71,14 @@ {{ 'AbpIdentity::EmailAddress' | abpLocalization }} {{ 'AbpIdentity::PhoneNumber' | abpLocalization }} - + diff --git a/npm/ng-packs/packages/identity/src/lib/constants/routes.ts b/npm/ng-packs/packages/identity/src/lib/constants/routes.ts deleted file mode 100644 index 1dfc53245e..0000000000 --- a/npm/ng-packs/packages/identity/src/lib/constants/routes.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { eLayoutType, ABP } from '@abp/ng.core'; - -/** - * - * @deprecated - */ -export const IDENTITY_ROUTES = { - routes: [ - { - name: 'AbpUiNavigation::Menu:Administration', - path: '', - order: 1, - wrapper: true, - }, - { - name: 'AbpIdentity::Menu:IdentityManagement', - path: 'identity', - order: 1, - parentName: 'AbpUiNavigation::Menu:Administration', - layout: eLayoutType.application, - iconClass: 'fa fa-id-card-o', - children: [ - { path: 'roles', name: 'AbpIdentity::Roles', order: 2, requiredPolicy: 'AbpIdentity.Roles' }, - { path: 'users', name: 'AbpIdentity::Users', order: 1, requiredPolicy: 'AbpIdentity.Users' }, - ], - }, - ] as ABP.FullRoute[], -}; diff --git a/npm/ng-packs/packages/identity/src/lib/identity.module.ts b/npm/ng-packs/packages/identity/src/lib/identity.module.ts index 15b1b1c7cb..20a332c6ce 100644 --- a/npm/ng-packs/packages/identity/src/lib/identity.module.ts +++ b/npm/ng-packs/packages/identity/src/lib/identity.module.ts @@ -26,11 +26,3 @@ import { NgxValidateCoreModule } from '@ngx-validate/core'; ], }) export class IdentityModule {} - -/** - * - * @deprecated - */ -export function IdentityProviders(): Provider[] { - return []; -} diff --git a/npm/ng-packs/packages/identity/src/public-api.ts b/npm/ng-packs/packages/identity/src/public-api.ts index b86c993f13..b401fed1c6 100644 --- a/npm/ng-packs/packages/identity/src/public-api.ts +++ b/npm/ng-packs/packages/identity/src/public-api.ts @@ -5,7 +5,6 @@ export * from './lib/identity.module'; export * from './lib/actions/identity.actions'; export * from './lib/components'; -export * from './lib/constants/routes'; export * from './lib/models/identity'; export * from './lib/services'; export * from './lib/states/identity.state'; diff --git a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html index 8602c4dc95..f4ac631533 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html +++ b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html @@ -62,8 +62,8 @@ {{ 'AbpTenantManagement::TenantName' | abpLocalization }} diff --git a/npm/ng-packs/packages/tenant-management/src/lib/constants/index.ts b/npm/ng-packs/packages/tenant-management/src/lib/constants/index.ts deleted file mode 100644 index a3820983e2..0000000000 --- a/npm/ng-packs/packages/tenant-management/src/lib/constants/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './routes'; diff --git a/npm/ng-packs/packages/tenant-management/src/lib/constants/routes.ts b/npm/ng-packs/packages/tenant-management/src/lib/constants/routes.ts deleted file mode 100644 index ad919c8ee1..0000000000 --- a/npm/ng-packs/packages/tenant-management/src/lib/constants/routes.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ABP, eLayoutType } from '@abp/ng.core'; - -/** - * - * @deprecated since version 0.9.0 - */ -export const TENANT_MANAGEMENT_ROUTES = { - routes: [ - { - name: 'AbpTenantManagement::Menu:TenantManagement', - path: 'tenant-management', - parentName: 'AbpUiNavigation::Menu:Administration', - layout: eLayoutType.application, - iconClass: 'fa fa-users', - children: [ - { - path: 'tenants', - name: 'AbpTenantManagement::Tenants', - order: 1, - requiredPolicy: 'AbpTenantManagement.Tenants', - }, - ], - }, - ] as ABP.FullRoute[], -}; diff --git a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts b/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts index 5ab4f20716..218eda45fa 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts @@ -24,11 +24,3 @@ import { NgxValidateCoreModule } from '@ngx-validate/core'; ], }) export class TenantManagementModule {} - -/** - * - * @deprecated since version 0.9.0 - */ -export function TenantManagementProviders(): Provider[] { - return []; -} diff --git a/npm/ng-packs/packages/tenant-management/src/public-api.ts b/npm/ng-packs/packages/tenant-management/src/public-api.ts index 67fcf7f195..20cecd353f 100644 --- a/npm/ng-packs/packages/tenant-management/src/public-api.ts +++ b/npm/ng-packs/packages/tenant-management/src/public-api.ts @@ -1,7 +1,6 @@ export * from './lib/tenant-management.module'; export * from './lib/actions'; export * from './lib/components'; -export * from './lib/constants'; export * from './lib/models'; export * from './lib/services'; export * from './lib/states'; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts index 86382b974b..9ff4d1e24e 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts @@ -19,9 +19,9 @@ import { ABP } from '@abp/ng.core'; [attr.type]="buttonType" [ngClass]="buttonClass" [disabled]="loading || disabled" - (click.stop)="click.next($event); abpClick.next($event)" - (focus)="focus.next($event); abpFocus.next($event)" - (blur)="blur.next($event); abpBlur.next($event)" + (click.stop)="abpClick.next($event)" + (focus)="abpFocus.next($event)" + (blur)="abpBlur.next($event)" > @@ -49,24 +49,6 @@ export class ButtonComponent implements OnInit { @Input() attributes: ABP.Dictionary; - // tslint:disable - /** - * @deprecated use abpClick instead - */ - @Output() readonly click = new EventEmitter(); - - /** - * @deprecated use abpFocus instead - */ - // tslint:disable-next-line: no-output-native - @Output() readonly focus = new EventEmitter(); - - /** - * @deprecated use abpBlur instead - */ - @Output() readonly blur = new EventEmitter(); - // tslint:enable - @Output() readonly abpClick = new EventEmitter(); @Output() readonly abpFocus = new EventEmitter(); diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/sort-order-icon/sort-order-icon.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/sort-order-icon/sort-order-icon.component.ts index feaad56c5b..1e80f8f585 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/sort-order-icon/sort-order-icon.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/sort-order-icon/sort-order-icon.component.ts @@ -8,17 +8,8 @@ export class SortOrderIconComponent { private _order: 'asc' | 'desc' | ''; private _selectedSortKey: string; - /** - * @deprecated use selectedSortKey instead. - */ @Input() - set selectedKey(value: string) { - this.selectedSortKey = value; - this.selectedKeyChange.emit(value); - } - get selectedKey(): string { - return this._selectedSortKey; - } + sortKey: string; @Input() set selectedSortKey(value: string) { @@ -29,23 +20,6 @@ export class SortOrderIconComponent { return this._selectedSortKey; } - @Output() readonly selectedKeyChange = new EventEmitter(); - @Output() readonly selectedSortKeyChange = new EventEmitter(); - - /** - * @deprecated use sortKey instead. - */ - @Input() - get key(): string { - return this.sortKey; - } - set key(value: string) { - this.sortKey = value; - } - - @Input() - sortKey: string; - @Input() set order(value: 'asc' | 'desc' | '') { this._order = value; @@ -56,6 +30,7 @@ export class SortOrderIconComponent { } @Output() readonly orderChange = new EventEmitter(); + @Output() readonly selectedSortKeyChange = new EventEmitter(); @Input() iconClass: string; @@ -67,7 +42,6 @@ export class SortOrderIconComponent { } sort(key: string) { - this.selectedKey = key; // TODO: To be removed this.selectedSortKey = key; switch (this.order) { case '': @@ -80,7 +54,6 @@ export class SortOrderIconComponent { break; case 'desc': this.order = ''; - this.selectedKey = ''; // TODO: To be removed this.orderChange.emit(''); break; } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/models/confirmation.ts b/npm/ng-packs/packages/theme-shared/src/lib/models/confirmation.ts index c3e203cded..3249860214 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/models/confirmation.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/models/confirmation.ts @@ -7,13 +7,5 @@ export namespace Confirmation { hideYesBtn?: boolean; cancelText?: Config.LocalizationParam; yesText?: Config.LocalizationParam; - /** - * @deprecated to be deleted in v2 - */ - cancelCopy?: Config.LocalizationParam; - /** - * @deprecated to be deleted in v2 - */ - yesCopy?: Config.LocalizationParam; } } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/sort-order-icon.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/sort-order-icon.component.spec.ts index f37d7e7ef6..d351c39a74 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/sort-order-icon.component.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/sort-order-icon.component.spec.ts @@ -8,7 +8,7 @@ describe('SortOrderIconComponent', () => { beforeEach(() => { spectator = createHost( - '', + '', { hostProps: { selectedSortKey: '',