diff --git a/package.json b/package.json index fc5366e8d5..a5db0b77a2 100644 --- a/package.json +++ b/package.json @@ -102,19 +102,19 @@ "jsonschema": "1.1.1", "methods": "1.1.2", "morgan": "1.8.2", - "ng2-pagination": "2.0.2", + "ngx-pagination": "3.0.1", "pem": "1.9.7", "reflect-metadata": "0.1.10", "rxjs": "5.4.2", "ts-md5": "1.2.0", "webfontloader": "1.6.28", - "zone.js": "0.8.12" + "zone.js": "0.8.13" }, "devDependencies": { "@angular/compiler": "4.2.6", "@angular/compiler-cli": "4.2.6", "@ngrx/store-devtools": "3.2.4", - "@ngtools/webpack": "1.5.0", + "@ngtools/webpack": "1.5.1", "@types/cookie-parser": "1.3.30", "@types/deep-freeze": "0.1.1", "@types/express": "4.0.36", @@ -172,7 +172,7 @@ "raw-loader": "0.5.1", "resolve-url-loader": "2.1.0", "rimraf": "2.6.1", - "rollup": "0.45.1", + "rollup": "0.45.2", "rollup-plugin-commonjs": "8.0.2", "rollup-plugin-node-globals": "1.1.0", "rollup-plugin-node-resolve": "3.0.0", @@ -189,7 +189,7 @@ "typedoc": "0.7.1", "typescript": "2.4.1", "webpack": "2.6.1", - "webpack-bundle-analyzer": "2.8.2", + "webpack-bundle-analyzer": "2.8.3", "webpack-dev-middleware": "1.11.0", "webpack-dev-server": "2.5.1", "webpack-merge": "4.1.0" diff --git a/src/app/app.component.ts b/src/app/app.component.ts index cde9e977e6..e1fdbf6edb 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,10 +1,12 @@ import { + ChangeDetectionStrategy, Component, Inject, ViewEncapsulation, OnInit, HostListener } from "@angular/core"; + import { TranslateService } from "@ngx-translate/core"; import { Store } from "@ngrx/store"; @@ -21,9 +23,10 @@ import { GLOBAL_CONFIG, GlobalConfig } from '../config'; @Component({ selector: 'ds-app', - encapsulation: ViewEncapsulation.None, templateUrl: './app.component.html', - styleUrls: ['./app.component.scss'] + styleUrls: ['./app.component.scss'], + changeDetection: ChangeDetectionStrategy.Default, + encapsulation: ViewEncapsulation.None }) export class AppComponent implements OnInit { diff --git a/src/app/shared/pagination/pagination.component.spec.ts b/src/app/shared/pagination/pagination.component.spec.ts index ec298548f1..4f9aa17e47 100644 --- a/src/app/shared/pagination/pagination.component.spec.ts +++ b/src/app/shared/pagination/pagination.component.spec.ts @@ -24,7 +24,8 @@ import { Observable } from 'rxjs/Observable'; import { TranslateModule, TranslateLoader } from '@ngx-translate/core'; import { StoreModule } from '@ngrx/store'; -import { Ng2PaginationModule } from 'ng2-pagination'; +import { NgxPaginationModule } from 'ngx-pagination'; + import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import Spy = jasmine.Spy; @@ -136,16 +137,25 @@ describe('Pagination component', () => { hostWindowServiceStub = new HostWindowServiceStub(_initialState.width); TestBed.configureTestingModule({ - imports: [CommonModule, StoreModule.provideStore({}), TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useClass: MockTranslateLoader - } - }), Ng2PaginationModule, NgbModule.forRoot(), + imports: [ + CommonModule, + StoreModule.provideStore({}), + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: MockTranslateLoader + } + }), + NgxPaginationModule, + NgbModule.forRoot(), RouterTestingModule.withRoutes([ { path: 'home', component: TestComponent } ])], - declarations: [PaginationComponent, TestComponent, EnumKeysPipe], // declare the test component + declarations: [ + PaginationComponent, + TestComponent, + EnumKeysPipe + ], // declare the test component providers: [ { provide: ActivatedRoute, useValue: activatedRouteStub }, { provide: GLOBAL_CONFIG, useValue: ENV_CONFIG }, diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts index 19d01f62a0..2192ae3367 100644 --- a/src/app/shared/pagination/pagination.component.ts +++ b/src/app/shared/pagination/pagination.component.ts @@ -18,9 +18,6 @@ import { isNumeric } from 'rxjs/util/isNumeric'; import { Observable } from 'rxjs/Observable'; -// It is necessary to use ng2-pagination -import { DEFAULT_TEMPLATE, DEFAULT_STYLES } from 'ng2-pagination/dist/template'; - import { HostWindowService } from '../host-window.service'; import { HostWindowState } from '../host-window.reducer'; import { PaginationComponentOptions } from './pagination-component-options.model'; diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index e738a0bd18..d1699537b6 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { Ng2PaginationModule } from 'ng2-pagination'; +import { NgxPaginationModule } from 'ngx-pagination'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; @@ -32,7 +32,7 @@ const MODULES = [ TranslateModule, FormsModule, ReactiveFormsModule, - Ng2PaginationModule, + NgxPaginationModule, NgbModule ]; diff --git a/yarn.lock b/yarn.lock index 4d6f6ead3f..b13b5f09b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -110,9 +110,9 @@ version "2.2.3" resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-2.2.3.tgz#e7bd1149f1c44208f1cc4744353f0f98a0f1f57b" -"@ngtools/webpack@1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.5.0.tgz#b6be58d857d41f8999751d6bbc3d21e84bc977ca" +"@ngtools/webpack@1.5.1": + version "1.5.1" + resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.5.1.tgz#6b00ed8bfb6706ab0672b93d294e9e15f69e19be" dependencies: enhanced-resolve "^3.1.0" loader-utils "^1.0.2" @@ -254,7 +254,7 @@ acorn@^4.0.1, acorn@^4.0.3: version "4.0.13" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" -acorn@^5.0.0, acorn@^5.0.3: +acorn@^5.0.0, acorn@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.1.tgz#53fe161111f912ab999ee887a90a0bc52822fd75" @@ -4285,16 +4285,16 @@ nested-error-stacks@^1.0.0: dependencies: inherits "~2.0.1" -ng2-pagination@2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/ng2-pagination/-/ng2-pagination-2.0.2.tgz#532dc9154de1f15e19e94edf554b96884b5f83d6" - ngrx-store-freeze@0.1.9: version "0.1.9" resolved "https://registry.yarnpkg.com/ngrx-store-freeze/-/ngrx-store-freeze-0.1.9.tgz#b20f18f21fd5efc4e1b1e05f6f279674d0f70c81" dependencies: deep-freeze-strict "^1.1.1" +ngx-pagination@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/ngx-pagination/-/ngx-pagination-3.0.1.tgz#5a8000e40c0424d9c41c9d6d592562e1547abf24" + no-case@^2.2.0: version "2.3.1" resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.1.tgz#7aeba1c73a52184265554b7dc03baf720df80081" @@ -6107,9 +6107,9 @@ rollup-pluginutils@^2.0.1: estree-walker "^0.3.0" micromatch "^2.3.11" -rollup@0.45.1: - version "0.45.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.45.1.tgz#af67ded79974079095b5fede8817b4ec26d610e1" +rollup@0.45.2: + version "0.45.2" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.45.2.tgz#63a284c2b31234656f24e9e9717fabb6a7f0fa43" dependencies: source-map-support "^0.4.0" @@ -7392,11 +7392,11 @@ webfontloader@1.6.28: version "1.6.28" resolved "https://registry.yarnpkg.com/webfontloader/-/webfontloader-1.6.28.tgz#db786129253cb6e8eae54c2fb05f870af6675bae" -webpack-bundle-analyzer@2.8.2: - version "2.8.2" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.8.2.tgz#8b6240c29a9d63bc72f09d920fb050adbcce9fe8" +webpack-bundle-analyzer@2.8.3: + version "2.8.3" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.8.3.tgz#8e7b3deb3832698c24b09c84dfe5b43902a83991" dependencies: - acorn "^5.0.3" + acorn "^5.1.1" chalk "^1.1.3" commander "^2.9.0" ejs "^2.5.6" @@ -7730,6 +7730,6 @@ zip-stream@^1.1.0: lodash "^4.8.0" readable-stream "^2.0.0" -zone.js@0.8.12: - version "0.8.12" - resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.12.tgz#86ff5053c98aec291a0bf4bbac501d694a05cfbb" +zone.js@0.8.13: + version "0.8.13" + resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.13.tgz#f0822525fad941582a03bbfe71eb21740315ddd0"