diff --git a/npm/ng-packs/packages/account-config/ng-package.json b/npm/ng-packs/packages/account-config/ng-package.json index 4b4e97b93f..75c8479ea8 100644 --- a/npm/ng-packs/packages/account-config/ng-package.json +++ b/npm/ng-packs/packages/account-config/ng-package.json @@ -1,7 +1,7 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../out-tsc/account-config", + "dest": "../../dist/account-config", "lib": { "entryFile": "src/public-api.ts" } -} \ No newline at end of file +} diff --git a/npm/ng-packs/packages/account/ng-package.json b/npm/ng-packs/packages/account/ng-package.json index f690848158..0d03a54224 100644 --- a/npm/ng-packs/packages/account/ng-package.json +++ b/npm/ng-packs/packages/account/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../out-tsc/account", + "dest": "../../dist/account", "lib": { "entryFile": "src/public-api.ts" }, diff --git a/npm/ng-packs/packages/core/ng-package.json b/npm/ng-packs/packages/core/ng-package.json index bd1eaadc36..7bdb6d9da8 100644 --- a/npm/ng-packs/packages/core/ng-package.json +++ b/npm/ng-packs/packages/core/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../out-tsc/core", + "dest": "../../dist/core", "lib": { "entryFile": "src/public-api.ts" }, diff --git a/npm/ng-packs/packages/feature-management/ng-package.json b/npm/ng-packs/packages/feature-management/ng-package.json index b22252c8c5..36ae3f8b13 100644 --- a/npm/ng-packs/packages/feature-management/ng-package.json +++ b/npm/ng-packs/packages/feature-management/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../out-tsc/feature-management", + "dest": "../../dist/feature-management", "lib": { "entryFile": "src/public-api.ts" }, diff --git a/npm/ng-packs/packages/identity-config/ng-package.json b/npm/ng-packs/packages/identity-config/ng-package.json index e7bf35c33f..d72870cd39 100644 --- a/npm/ng-packs/packages/identity-config/ng-package.json +++ b/npm/ng-packs/packages/identity-config/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../out-tsc/identity-config", + "dest": "../../dist/identity-config", "lib": { "entryFile": "src/public-api.ts" } diff --git a/npm/ng-packs/packages/identity/ng-package.json b/npm/ng-packs/packages/identity/ng-package.json index 66997f3e19..450d7324a0 100644 --- a/npm/ng-packs/packages/identity/ng-package.json +++ b/npm/ng-packs/packages/identity/ng-package.json @@ -1,8 +1,12 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../out-tsc/identity", + "dest": "../../dist/identity", "lib": { "entryFile": "src/public-api.ts" }, - "whitelistedNonPeerDependencies": ["@abp/ng.theme.shared", "@abp/ng.permission-management", "@abp/ng.identity.config"] + "whitelistedNonPeerDependencies": [ + "@abp/ng.theme.shared", + "@abp/ng.permission-management", + "@abp/ng.identity.config" + ] } 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 44d57639c9..6b9639f2b6 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 @@ -1,5 +1,5 @@ import { ABP, ConfigState } from '@abp/ng.core'; -import { ConfirmationService, Toaster } from '@abp/ng.theme.shared'; +import { ConfirmationService, Confirmation } from '@abp/ng.theme.shared'; import { Component, OnInit, TemplateRef, TrackByFunction, ViewChild } from '@angular/core'; import { AbstractControl, @@ -223,8 +223,8 @@ export class UsersComponent implements OnInit { .warn('AbpIdentity::UserDeletionConfirmationMessage', 'AbpIdentity::AreYouSure', { messageLocalizationParams: [userName], }) - .subscribe((status: Toaster.Status) => { - if (status === Toaster.Status.confirm) { + .subscribe((status: Confirmation.Status) => { + if (status === Confirmation.Status.confirm) { this.store.dispatch(new DeleteUser(id)).subscribe(() => this.get()); } }); diff --git a/npm/ng-packs/packages/permission-management/ng-package.json b/npm/ng-packs/packages/permission-management/ng-package.json index d1646bcd93..03f80c37cc 100644 --- a/npm/ng-packs/packages/permission-management/ng-package.json +++ b/npm/ng-packs/packages/permission-management/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../out-tsc/permission-management", + "dest": "../../dist/permission-management", "lib": { "entryFile": "src/public-api.ts" }, diff --git a/npm/ng-packs/packages/setting-management-config/ng-package.json b/npm/ng-packs/packages/setting-management-config/ng-package.json index 5051f5f734..95273dc0a7 100644 --- a/npm/ng-packs/packages/setting-management-config/ng-package.json +++ b/npm/ng-packs/packages/setting-management-config/ng-package.json @@ -1,7 +1,7 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../out-tsc/setting-management-config", + "dest": "../../dist/setting-management-config", "lib": { "entryFile": "src/public-api.ts" } -} \ No newline at end of file +} diff --git a/npm/ng-packs/packages/setting-management/ng-package.json b/npm/ng-packs/packages/setting-management/ng-package.json index f8165824b8..7a08dda36b 100644 --- a/npm/ng-packs/packages/setting-management/ng-package.json +++ b/npm/ng-packs/packages/setting-management/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../out-tsc/setting-management", + "dest": "../../dist/setting-management", "lib": { "entryFile": "src/public-api.ts" }, diff --git a/npm/ng-packs/packages/tenant-management-config/ng-package.json b/npm/ng-packs/packages/tenant-management-config/ng-package.json index 6d8d1b381a..d061bd7c44 100644 --- a/npm/ng-packs/packages/tenant-management-config/ng-package.json +++ b/npm/ng-packs/packages/tenant-management-config/ng-package.json @@ -1,7 +1,7 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../out-tsc/tenant-management-config", + "dest": "../../dist/tenant-management-config", "lib": { "entryFile": "src/public-api.ts" } -} \ No newline at end of file +} diff --git a/npm/ng-packs/packages/tenant-management/ng-package.json b/npm/ng-packs/packages/tenant-management/ng-package.json index 26bb3db4e5..959eae44ab 100644 --- a/npm/ng-packs/packages/tenant-management/ng-package.json +++ b/npm/ng-packs/packages/tenant-management/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../out-tsc/tenant-management", + "dest": "../../dist/tenant-management", "lib": { "entryFile": "src/public-api.ts" }, diff --git a/npm/ng-packs/packages/theme-basic/ng-package.json b/npm/ng-packs/packages/theme-basic/ng-package.json index 104bb0b1ab..600c112dee 100644 --- a/npm/ng-packs/packages/theme-basic/ng-package.json +++ b/npm/ng-packs/packages/theme-basic/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../out-tsc/theme-basic", + "dest": "../../dist/theme-basic", "lib": { "entryFile": "src/public-api.ts" }, diff --git a/npm/ng-packs/packages/theme-shared/ng-package.json b/npm/ng-packs/packages/theme-shared/ng-package.json index ebcf105b89..18bd4865dc 100644 --- a/npm/ng-packs/packages/theme-shared/ng-package.json +++ b/npm/ng-packs/packages/theme-shared/ng-package.json @@ -1,12 +1,12 @@ { "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../out-tsc/theme-shared", + "dest": "../../dist/theme-shared", "lib": { "entryFile": "src/public-api.ts" }, "whitelistedNonPeerDependencies": [ "@abp/ng.core", - "@angular/cdk", + "@angular/cdk", "@angular/localize", "@fortawesome/fontawesome-free", "@ng-bootstrap/ng-bootstrap", diff --git a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts index 1f221a42e9..c84bf30470 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts @@ -17,7 +17,7 @@ import { Observable, Subject } from 'rxjs'; import snq from 'snq'; import { HttpErrorWrapperComponent } from '../components/http-error-wrapper/http-error-wrapper.component'; import { HttpErrorConfig, ErrorScreenErrorCodes } from '../models/common'; -import { Toaster } from '../models/toaster'; +import { Confirmation } from '../models/confirmation'; import { ConfirmationService } from '../services/confirmation.service'; export const DEFAULT_ERROR_MESSAGES = { @@ -185,7 +185,7 @@ export class ErrorHandler { message?: Config.LocalizationParam, title?: Config.LocalizationParam, body?: any, - ): Observable { + ): Observable { if (body) { if (body.details) { message = body.details;