From ee9a56da7b109c16fcf51c6d3c415a70a380ef77 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Wed, 18 Sep 2019 16:44:26 +0300 Subject: [PATCH] feature(theme-shared): validation-error.component moved from theme-shared to theme-basic --- .../theme-basic/src/lib/components/index.ts | 1 + .../validation-error.component.ts | 0 .../theme-basic/src/lib/theme-basic.module.ts | 18 +++++++++++-- .../theme-shared/src/lib/components/index.ts | 1 + .../src/lib/theme-shared.module.ts | 26 ++++--------------- 5 files changed, 23 insertions(+), 23 deletions(-) rename npm/ng-packs/packages/{theme-shared/src/lib/components/errors => theme-basic/src/lib/components/validation-error}/validation-error.component.ts (100%) diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/index.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/index.ts index ca8f7982bc..cd1e7e8757 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/index.ts +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/index.ts @@ -1,3 +1,4 @@ export * from './account-layout/account-layout.component'; export * from './application-layout/application-layout.component'; export * from './empty-layout/empty-layout.component'; +export * from './validation-error/validation-error.component'; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/errors/validation-error.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/validation-error/validation-error.component.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/src/lib/components/errors/validation-error.component.ts rename to npm/ng-packs/packages/theme-basic/src/lib/components/validation-error/validation-error.component.ts diff --git a/npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts b/npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts index 2fe5dabae4..3c04faa784 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts +++ b/npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts @@ -10,11 +10,12 @@ import { ApplicationLayoutComponent } from './components/application-layout/appl import { EmptyLayoutComponent } from './components/empty-layout/empty-layout.component'; import { LayoutComponent } from './components/layout/layout.component'; import { LayoutState } from './states/layout.state'; +import { ValidationErrorComponent } from './components/validation-error/validation-error.component'; export const LAYOUTS = [ApplicationLayoutComponent, AccountLayoutComponent, EmptyLayoutComponent]; @NgModule({ - declarations: [...LAYOUTS, LayoutComponent], + declarations: [...LAYOUTS, LayoutComponent, ValidationErrorComponent], imports: [ CoreModule, ThemeSharedModule, @@ -23,8 +24,21 @@ export const LAYOUTS = [ApplicationLayoutComponent, AccountLayoutComponent, Empt ToastModule, NgxValidateCoreModule, NgxsModule.forFeature([LayoutState]), + NgxValidateCoreModule.forRoot({ + targetSelector: '.form-group', + blueprints: { + email: `AbpAccount::ThisFieldIsNotAValidEmailAddress.`, + max: `AbpAccount::ThisFieldMustBeBetween{0}And{1}[{{ min }},{{ max }}]`, + maxlength: `AbpAccount::ThisFieldMustBeAStringWithAMaximumLengthOf{1}[{{ requiredLength }}]`, + min: `AbpAccount::ThisFieldMustBeBetween{0}And{1}[{{ min }},{{ max }}]`, + minlength: `AbpAccount::ThisFieldMustBeAStringOrArrayTypeWithAMinimumLengthOf[{{ min }},{{ max }}]`, + required: `AbpAccount::ThisFieldIsRequired.`, + passwordMismatch: `AbpIdentity::Identity.PasswordConfirmationFailed`, + }, + errorTemplate: ValidationErrorComponent, + }), ], exports: [...LAYOUTS], - entryComponents: [...LAYOUTS], + entryComponents: [...LAYOUTS, ValidationErrorComponent], }) export class ThemeBasicModule {} diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts index e4bcb47597..0792538400 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts @@ -6,4 +6,5 @@ export * from './confirmation/confirmation.component'; export * from './loader-bar/loader-bar.component'; export * from './modal/modal.component'; export * from './profile/profile.component'; +export * from './table-empty-message/table-empty-message.component'; export * from './toast/toast.component'; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts index 9323565f7f..40f09d6c5f 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts @@ -1,6 +1,5 @@ import { CoreModule, LazyLoadService } from '@abp/ng.core'; import { APP_INITIALIZER, Injector, ModuleWithProviders, NgModule } from '@angular/core'; -import { NgxValidateCoreModule } from '@ngx-validate/core'; import { MessageService } from 'primeng/components/common/messageservice'; import { ToastModule } from 'primeng/toast'; import { forkJoin } from 'rxjs'; @@ -11,7 +10,6 @@ import { ChangePasswordComponent } from './components/change-password/change-pas import { ChartComponent } from './components/chart/chart.component'; import { ConfirmationComponent } from './components/confirmation/confirmation.component'; import { ErrorComponent } from './components/errors/error.component'; -import { ValidationErrorComponent } from './components/errors/validation-error.component'; import { LoaderBarComponent } from './components/loader-bar/loader-bar.component'; import { ModalComponent } from './components/modal/modal.component'; import { ProfileComponent } from './components/profile/profile.component'; @@ -19,6 +17,7 @@ import { ToastComponent } from './components/toast/toast.component'; import styles from './contants/styles'; import { ErrorHandler } from './handlers/error.handler'; import { chartJsLoaded$ } from './utils/widget-utils'; +import { TableEmptyMessageComponent } from './components/table-empty-message/table-empty-message.component'; export function appendScript(injector: Injector) { const fn = function() { @@ -41,23 +40,7 @@ export function appendScript(injector: Injector) { } @NgModule({ - imports: [ - CoreModule, - ToastModule, - NgxValidateCoreModule.forRoot({ - targetSelector: '.form-group', - blueprints: { - email: `AbpAccount::ThisFieldIsNotAValidEmailAddress.`, - max: `AbpAccount::ThisFieldMustBeBetween{0}And{1}[{{ min }},{{ max }}]`, - maxlength: `AbpAccount::ThisFieldMustBeAStringWithAMaximumLengthOf{1}[{{ requiredLength }}]`, - min: `AbpAccount::ThisFieldMustBeBetween{0}And{1}[{{ min }},{{ max }}]`, - minlength: `AbpAccount::ThisFieldMustBeAStringOrArrayTypeWithAMinimumLengthOf[{{ min }},{{ max }}]`, - required: `AbpAccount::ThisFieldIsRequired.`, - passwordMismatch: `AbpIdentity::Identity.PasswordConfirmationFailed`, - }, - errorTemplate: ValidationErrorComponent, - }), - ], + imports: [CoreModule, ToastModule], declarations: [ BreadcrumbComponent, ButtonComponent, @@ -68,8 +51,8 @@ export function appendScript(injector: Injector) { LoaderBarComponent, ModalComponent, ProfileComponent, + TableEmptyMessageComponent, ToastComponent, - ValidationErrorComponent, ], exports: [ BreadcrumbComponent, @@ -80,9 +63,10 @@ export function appendScript(injector: Injector) { LoaderBarComponent, ModalComponent, ProfileComponent, + TableEmptyMessageComponent, ToastComponent, ], - entryComponents: [ErrorComponent, ValidationErrorComponent], + entryComponents: [ErrorComponent], }) export class ThemeSharedModule { static forRoot(): ModuleWithProviders {