Browse Source

chore: remove primeng imports from modules

pull/2824/head
mehmet-erim 7 years ago
parent
commit
48145a45f0
  1. 2
      npm/ng-packs/packages/account/src/lib/account.module.ts
  2. 2
      npm/ng-packs/packages/core/src/lib/actions/config.actions.ts
  3. 7
      npm/ng-packs/packages/core/src/lib/utils/route-utils.ts
  4. 2
      npm/ng-packs/packages/identity/src/lib/identity.module.ts
  5. 2
      npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts
  6. 8
      npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts
  7. 4
      npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts
  8. 2
      npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts
  9. 1
      npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts
  10. 5
      npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts
  11. 6
      npm/ng-packs/packages/theme-shared/src/lib/tests/table-sort.directive.spec.ts
  12. 2
      npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts
  13. 5
      npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts

2
npm/ng-packs/packages/account/src/lib/account.module.ts

@ -3,7 +3,6 @@ import { ThemeSharedModule } from '@abp/ng.theme.shared';
import { NgModule, Provider } from '@angular/core'; import { NgModule, Provider } from '@angular/core';
import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
import { NgxValidateCoreModule } from '@ngx-validate/core'; import { NgxValidateCoreModule } from '@ngx-validate/core';
import { TableModule } from 'primeng/table';
import { AccountRoutingModule } from './account-routing.module'; import { AccountRoutingModule } from './account-routing.module';
import { ChangePasswordComponent } from './components/change-password/change-password.component'; import { ChangePasswordComponent } from './components/change-password/change-password.component';
import { LoginComponent } from './components/login/login.component'; import { LoginComponent } from './components/login/login.component';
@ -29,7 +28,6 @@ import { AuthWrapperComponent } from './components/auth-wrapper/auth-wrapper.com
CoreModule, CoreModule,
AccountRoutingModule, AccountRoutingModule,
ThemeSharedModule, ThemeSharedModule,
TableModule,
NgbDropdownModule, NgbDropdownModule,
NgxValidateCoreModule, NgxValidateCoreModule,
], ],

2
npm/ng-packs/packages/core/src/lib/actions/config.actions.ts

@ -1,4 +1,4 @@
import { ABP } from '../models'; import { ABP } from '../models/common';
export class PatchRouteByName { export class PatchRouteByName {
static readonly type = '[Config] Patch Route By Name'; static readonly type = '[Config] Patch Route By Name';

7
npm/ng-packs/packages/core/src/lib/utils/route-utils.ts

@ -1,4 +1,4 @@
import { ABP } from '../models'; import { ABP } from '../models/common';
export function organizeRoutes( export function organizeRoutes(
routes: ABP.FullRoute[], routes: ABP.FullRoute[],
@ -33,7 +33,10 @@ export function organizeRoutes(
return filteredRoutes; return filteredRoutes;
} }
export function setChildRoute(routes: ABP.FullRoute[], parentNameArr: ABP.FullRoute[]): ABP.FullRoute[] { export function setChildRoute(
routes: ABP.FullRoute[],
parentNameArr: ABP.FullRoute[],
): ABP.FullRoute[] {
return routes.map(route => { return routes.map(route => {
if (route.children && route.children.length) { if (route.children && route.children.length) {
route.children = setChildRoute(route.children, parentNameArr); route.children = setChildRoute(route.children, parentNameArr);

2
npm/ng-packs/packages/identity/src/lib/identity.module.ts

@ -8,7 +8,6 @@ import { NgbTabsetModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
import { ThemeSharedModule } from '@abp/ng.theme.shared'; import { ThemeSharedModule } from '@abp/ng.theme.shared';
import { UsersComponent } from './components/users/users.component'; import { UsersComponent } from './components/users/users.component';
import { PermissionManagementModule } from '@abp/ng.permission-management'; import { PermissionManagementModule } from '@abp/ng.permission-management';
import { TableModule } from 'primeng/table';
import { NgxValidateCoreModule } from '@ngx-validate/core'; import { NgxValidateCoreModule } from '@ngx-validate/core';
@NgModule({ @NgModule({
@ -19,7 +18,6 @@ import { NgxValidateCoreModule } from '@ngx-validate/core';
IdentityRoutingModule, IdentityRoutingModule,
NgbTabsetModule, NgbTabsetModule,
ThemeSharedModule, ThemeSharedModule,
TableModule,
NgbDropdownModule, NgbDropdownModule,
PermissionManagementModule, PermissionManagementModule,
NgxValidateCoreModule, NgxValidateCoreModule,

2
npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts

@ -3,7 +3,6 @@ import { ThemeSharedModule } from '@abp/ng.theme.shared';
import { NgModule, Provider } from '@angular/core'; import { NgModule, Provider } from '@angular/core';
import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
import { NgxsModule } from '@ngxs/store'; import { NgxsModule } from '@ngxs/store';
import { TableModule } from 'primeng/table';
import { TenantsComponent } from './components/tenants/tenants.component'; import { TenantsComponent } from './components/tenants/tenants.component';
import { TenantManagementState } from './states/tenant-management.state'; import { TenantManagementState } from './states/tenant-management.state';
import { TenantManagementRoutingModule } from './tenant-management-routing.module'; import { TenantManagementRoutingModule } from './tenant-management-routing.module';
@ -17,7 +16,6 @@ import { NgxValidateCoreModule } from '@ngx-validate/core';
NgxsModule.forFeature([TenantManagementState]), NgxsModule.forFeature([TenantManagementState]),
NgxValidateCoreModule, NgxValidateCoreModule,
CoreModule, CoreModule,
TableModule,
ThemeSharedModule, ThemeSharedModule,
NgbDropdownModule, NgbDropdownModule,
FeatureManagementModule, FeatureManagementModule,

8
npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts

@ -4,7 +4,6 @@ import { NgModule } from '@angular/core';
import { NgbCollapseModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbCollapseModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
import { NgxValidateCoreModule } from '@ngx-validate/core'; import { NgxValidateCoreModule } from '@ngx-validate/core';
import { NgxsModule } from '@ngxs/store'; import { NgxsModule } from '@ngxs/store';
import { ToastModule } from 'primeng/toast';
import { AccountLayoutComponent } from './components/account-layout/account-layout.component'; import { AccountLayoutComponent } from './components/account-layout/account-layout.component';
import { ApplicationLayoutComponent } from './components/application-layout/application-layout.component'; import { ApplicationLayoutComponent } from './components/application-layout/application-layout.component';
import { EmptyLayoutComponent } from './components/empty-layout/empty-layout.component'; import { EmptyLayoutComponent } from './components/empty-layout/empty-layout.component';
@ -21,7 +20,6 @@ export const LAYOUTS = [ApplicationLayoutComponent, AccountLayoutComponent, Empt
ThemeSharedModule, ThemeSharedModule,
NgbCollapseModule, NgbCollapseModule,
NgbDropdownModule, NgbDropdownModule,
ToastModule,
NgxValidateCoreModule, NgxValidateCoreModule,
NgxsModule.forFeature([LayoutState]), NgxsModule.forFeature([LayoutState]),
NgxValidateCoreModule.forRoot({ NgxValidateCoreModule.forRoot({
@ -29,9 +27,11 @@ export const LAYOUTS = [ApplicationLayoutComponent, AccountLayoutComponent, Empt
blueprints: { blueprints: {
email: 'AbpAccount::ThisFieldIsNotAValidEmailAddress.', email: 'AbpAccount::ThisFieldIsNotAValidEmailAddress.',
max: 'AbpAccount::ThisFieldMustBeBetween{0}And{1}[{{ min }},{{ max }}]', max: 'AbpAccount::ThisFieldMustBeBetween{0}And{1}[{{ min }},{{ max }}]',
maxlength: 'AbpAccount::ThisFieldMustBeAStringOrArrayTypeWithAMaximumLengthoOf{0}[{{ requiredLength }}]', maxlength:
'AbpAccount::ThisFieldMustBeAStringOrArrayTypeWithAMaximumLengthoOf{0}[{{ requiredLength }}]',
min: 'AbpAccount::ThisFieldMustBeBetween{0}And{1}[{{ min }},{{ max }}]', min: 'AbpAccount::ThisFieldMustBeBetween{0}And{1}[{{ min }},{{ max }}]',
minlength: 'AbpAccount::ThisFieldMustBeAStringOrArrayTypeWithAMinimumLengthOf{0}[{{ requiredLength }}]', minlength:
'AbpAccount::ThisFieldMustBeAStringOrArrayTypeWithAMinimumLengthOf{0}[{{ requiredLength }}]',
required: 'AbpAccount::ThisFieldIsRequired.', required: 'AbpAccount::ThisFieldIsRequired.',
passwordMismatch: 'AbpIdentity::Identity.PasswordConfirmationFailed', passwordMismatch: 'AbpIdentity::Identity.PasswordConfirmationFailed',
}, },

4
npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts

@ -190,8 +190,8 @@ export class ErrorHandler {
if (body.details) { if (body.details) {
message = body.details; message = body.details;
title = body.message; title = body.message;
} else if (body.code) { } else if (body.message) {
title = body.code; title = DEFAULT_ERROR_MESSAGES.defaultError.title;
message = body.message; message = body.message;
} else { } else {
message = body.message || DEFAULT_ERROR_MESSAGES.defaultError.title; message = body.message || DEFAULT_ERROR_MESSAGES.defaultError.title;

2
npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts

@ -3,7 +3,6 @@ import { Component } from '@angular/core';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { createComponentFactory, Spectator } from '@ngneat/spectator/jest'; import { createComponentFactory, Spectator } from '@ngneat/spectator/jest';
import { NgxsModule } from '@ngxs/store'; import { NgxsModule } from '@ngxs/store';
import { MessageService } from 'primeng/components/common/messageservice';
import { ConfirmationService } from '../services/confirmation.service'; import { ConfirmationService } from '../services/confirmation.service';
import { ThemeSharedModule } from '../theme-shared.module'; import { ThemeSharedModule } from '../theme-shared.module';
import { OAuthModule, OAuthService } from 'angular-oauth2-oidc'; import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@ -24,7 +23,6 @@ describe('ConfirmationService', () => {
const createComponent = createComponentFactory({ const createComponent = createComponentFactory({
component: DummyComponent, component: DummyComponent,
imports: [CoreModule, ThemeSharedModule.forRoot(), NgxsModule.forRoot(), RouterTestingModule], imports: [CoreModule, ThemeSharedModule.forRoot(), NgxsModule.forRoot(), RouterTestingModule],
providers: [MessageService],
mocks: [OAuthService], mocks: [OAuthService],
}); });

1
npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts

@ -6,7 +6,6 @@ import { createRoutingFactory, SpectatorRouting } from '@ngneat/spectator/jest';
import { NgxsModule, Store } from '@ngxs/store'; import { NgxsModule, Store } from '@ngxs/store';
import { DEFAULT_ERROR_MESSAGES, ErrorHandler } from '../handlers'; import { DEFAULT_ERROR_MESSAGES, ErrorHandler } from '../handlers';
import { ThemeSharedModule } from '../theme-shared.module'; import { ThemeSharedModule } from '../theme-shared.module';
import { MessageService } from 'primeng/components/common/messageservice';
import { RouterError, RouterDataResolved } from '@ngxs/router-plugin'; import { RouterError, RouterDataResolved } from '@ngxs/router-plugin';
import { NavigationError, ResolveEnd } from '@angular/router'; import { NavigationError, ResolveEnd } from '@angular/router';
import { OAuthModule, OAuthService } from 'angular-oauth2-oidc'; import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';

5
npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts

@ -1,8 +1,6 @@
import { LocalizationPipe } from '@abp/ng.core'; import { LocalizationPipe } from '@abp/ng.core';
import { createHostFactory, SpectatorHost } from '@ngneat/spectator/jest'; import { createHostFactory, SpectatorHost } from '@ngneat/spectator/jest';
import { Store } from '@ngxs/store'; import { Store } from '@ngxs/store';
import { MessageService } from 'primeng/components/common/messageservice';
import { ToastModule } from 'primeng/toast';
import { timer } from 'rxjs'; import { timer } from 'rxjs';
import { ButtonComponent, ConfirmationComponent, ModalComponent } from '../components'; import { ButtonComponent, ConfirmationComponent, ModalComponent } from '../components';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
@ -16,9 +14,8 @@ describe('ModalComponent', () => {
let disappearFn; let disappearFn;
const createHost = createHostFactory({ const createHost = createHostFactory({
component: ModalComponent, component: ModalComponent,
imports: [ToastModule, RouterTestingModule], imports: [RouterTestingModule],
declarations: [ConfirmationComponent, LocalizationPipe, ButtonComponent], declarations: [ConfirmationComponent, LocalizationPipe, ButtonComponent],
providers: [MessageService],
mocks: [Store], mocks: [Store],
}); });

6
npm/ng-packs/packages/theme-shared/src/lib/tests/table-sort.directive.spec.ts

@ -1,5 +1,4 @@
import { SpectatorDirective, createDirectiveFactory } from '@ngneat/spectator/jest'; import { SpectatorDirective, createDirectiveFactory } from '@ngneat/spectator/jest';
import { TableModule, Table } from 'primeng/table';
import { TableSortDirective } from '../directives/table-sort.directive'; import { TableSortDirective } from '../directives/table-sort.directive';
describe('TableSortDirective', () => { describe('TableSortDirective', () => {
@ -7,11 +6,12 @@ describe('TableSortDirective', () => {
let directive: TableSortDirective; let directive: TableSortDirective;
const createDirective = createDirectiveFactory({ const createDirective = createDirectiveFactory({
directive: TableSortDirective, directive: TableSortDirective,
imports: [TableModule],
}); });
beforeEach(() => { beforeEach(() => {
spectator = createDirective(`<p-table [value]="[1,4,2]" [abpTableSort]="{ order: 'asc' }"></p-table>`); spectator = createDirective(
`<p-table [value]="[1,4,2]" [abpTableSort]="{ order: 'asc' }"></p-table>`,
);
directive = spectator.directive; directive = spectator.directive;
}); });

2
npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts

@ -3,7 +3,6 @@ import { Component } from '@angular/core';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { createComponentFactory, Spectator } from '@ngneat/spectator/jest'; import { createComponentFactory, Spectator } from '@ngneat/spectator/jest';
import { NgxsModule } from '@ngxs/store'; import { NgxsModule } from '@ngxs/store';
import { MessageService } from 'primeng/components/common/messageservice';
import { ToasterService } from '../services/toaster.service'; import { ToasterService } from '../services/toaster.service';
import { ThemeSharedModule } from '../theme-shared.module'; import { ThemeSharedModule } from '../theme-shared.module';
import { OAuthService } from 'angular-oauth2-oidc'; import { OAuthService } from 'angular-oauth2-oidc';
@ -24,7 +23,6 @@ describe('ToasterService', () => {
const createComponent = createComponentFactory({ const createComponent = createComponentFactory({
component: DummyComponent, component: DummyComponent,
imports: [CoreModule, ThemeSharedModule.forRoot(), NgxsModule.forRoot(), RouterTestingModule], imports: [CoreModule, ThemeSharedModule.forRoot(), NgxsModule.forRoot(), RouterTestingModule],
providers: [MessageService],
mocks: [OAuthService], mocks: [OAuthService],
}); });

5
npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts

@ -3,8 +3,6 @@ import { DatePipe } from '@angular/common';
import { APP_INITIALIZER, Injector, ModuleWithProviders, NgModule } from '@angular/core'; import { APP_INITIALIZER, Injector, ModuleWithProviders, NgModule } from '@angular/core';
import { NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap'; import { NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap';
import { NgxValidateCoreModule } from '@ngx-validate/core'; import { NgxValidateCoreModule } from '@ngx-validate/core';
import { MessageService } from 'primeng/components/common/messageservice';
import { ToastModule } from 'primeng/toast';
import { BreadcrumbComponent } from './components/breadcrumb/breadcrumb.component'; import { BreadcrumbComponent } from './components/breadcrumb/breadcrumb.component';
import { ButtonComponent } from './components/button/button.component'; import { ButtonComponent } from './components/button/button.component';
import { ChartComponent } from './components/chart/chart.component'; import { ChartComponent } from './components/chart/chart.component';
@ -40,7 +38,7 @@ export function appendScript(injector: Injector) {
} }
@NgModule({ @NgModule({
imports: [CoreModule, ToastModule, NgxValidateCoreModule], imports: [CoreModule, NgxValidateCoreModule],
declarations: [ declarations: [
BreadcrumbComponent, BreadcrumbComponent,
ButtonComponent, ButtonComponent,
@ -92,7 +90,6 @@ export class ThemeSharedModule {
deps: [Injector], deps: [Injector],
useFactory: appendScript, useFactory: appendScript,
}, },
{ provide: MessageService, useClass: MessageService },
{ provide: HTTP_ERROR_CONFIG, useValue: options.httpErrorConfig }, { provide: HTTP_ERROR_CONFIG, useValue: options.httpErrorConfig },
{ {
provide: 'HTTP_ERROR_CONFIG', provide: 'HTTP_ERROR_CONFIG',

Loading…
Cancel
Save