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