diff --git a/package.json b/package.json index c6a2665e45..91130f62a0 100644 --- a/package.json +++ b/package.json @@ -78,9 +78,9 @@ "@angular/upgrade": "2.2.3", "@angularclass/bootloader": "1.0.1", "@angularclass/idle-preload": "1.0.4", - "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.24", + "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.18", "@ngrx/core": "^1.2.0", - "@ngrx/effects": "^2.0.0", + "@ngrx/effects": "2.0.2", "@ngrx/router-store": "^1.2.5", "@ngrx/store": "^2.2.1", "@ngrx/store-devtools": "^3.2.2", diff --git a/src/app/shared/pagination/pagination.component.spec.ts b/src/app/shared/pagination/pagination.component.spec.ts index b238ad57fd..b1e1390dd8 100644 --- a/src/app/shared/pagination/pagination.component.spec.ts +++ b/src/app/shared/pagination/pagination.component.spec.ts @@ -56,7 +56,7 @@ function expectPages(fixture: ComponentFixture, pagesDef: string[]): void { if (classIndicator === '+') { expect(pages[i].classList.contains("active")).toBeTruthy(); expect(pages[i].classList.contains("disabled")).toBeFalsy(); - expect(normalizeText(pages[i].textContent)).toEqual(pageDef.substr(1) + ' (current)'); + expect(normalizeText(pages[i].textContent)).toEqual(pageDef.substr(1)); } else if (classIndicator === '-') { expect(pages[i].classList.contains("active")).toBeFalsy(); expect(pages[i].classList.contains("disabled")).toBeTruthy(); @@ -178,44 +178,44 @@ describe('Pagination component', () => { expect(testComp.paginationOptions.id).toEqual('test'); expect(testComp.paginationOptions.currentPage).toEqual(1); expect(testComp.paginationOptions.pageSize).toEqual(10); - expectPages(testFixture, ['-«', '+1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '»']); + expectPages(testFixture, ['-« Previous', '+1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '» Next']); }); it('should render and respond to page change', () => { testComp.collectionSize = 30; changePage(testFixture, 3); - expectPages(testFixture, ['«', '1', '2', '+3', '-»']); + expectPages(testFixture, ['« Previous', '1', '2', '+3', '-» Next']); changePage(testFixture, 0); - expectPages(testFixture, ['«', '1', '+2', '3', '»']); + expectPages(testFixture, ['« Previous', '1', '+2', '3', '» Next']); }); it('should render and respond to collectionSize change', () => { testComp.collectionSize = 30; testFixture.detectChanges(); - expectPages(testFixture, ['-«', '+1', '2', '3', '»']); + expectPages(testFixture, ['-« Previous', '+1', '2', '3', '» Next']); testComp.collectionSize = 40; testFixture.detectChanges(); - expectPages(testFixture, ['-«', '+1', '2', '3', '4', '»']); + expectPages(testFixture, ['-« Previous', '+1', '2', '3', '4', '» Next']); }); it('should render and respond to pageSize change', () => { testComp.collectionSize = 30; testFixture.detectChanges(); - expectPages(testFixture, ['-«', '+1', '2', '3', '»']); + expectPages(testFixture, ['-« Previous', '+1', '2', '3', '» Next']); changePageSize(testFixture, '5'); - expectPages(testFixture, ['-«', '+1', '2', '3', '4', '5', '6', '»']); + expectPages(testFixture, ['-« Previous', '+1', '2', '3', '4', '5', '6', '» Next']); changePageSize(testFixture, '10'); - expectPages(testFixture, ['-«', '+1', '2', '3', '»']); + expectPages(testFixture, ['-« Previous', '+1', '2', '3', '» Next']); changePageSize(testFixture, '20'); - expectPages(testFixture, ['-«', '+1', '2', '»']); + expectPages(testFixture, ['-« Previous', '+1', '2', '» Next']); }); it('should emit pageChange event with correct value', fakeAsync(() => { @@ -267,7 +267,7 @@ describe('Pagination component', () => { testFixture.detectChanges(); - expectPages(testFixture, ['«', '1', '+2', '3', '4', '5', '»']); + expectPages(testFixture, ['« Previous', '1', '+2', '3', '4', '5', '» Next']); expect(testComp.paginationOptions.currentPage).toEqual(2); expect(testComp.paginationOptions.pageSize).toEqual(20); @@ -279,7 +279,7 @@ describe('Pagination component', () => { testFixture.detectChanges(); - expectPages(testFixture, ['«', '1', '2', '+3', '-»']); + expectPages(testFixture, ['« Previous', '1', '2', '+3', '-» Next']); expect(testComp.paginationOptions.currentPage).toEqual(3); expect(testComp.paginationOptions.pageSize).toEqual(40); }); @@ -294,7 +294,7 @@ describe('Pagination component', () => { hostWindowServiceStub.isXs().subscribe((status) => { paginationComponent.isXs = status; testFixture.detectChanges(); - expectPages(testFixture, ['-«', '+1', '2', '3', '4', '5', '-...', '10', '»']); + expectPages(testFixture, ['-« Previous', '+1', '2', '3', '4', '5', '-...', '10', '» Next']); de = testFixture.debugElement.query(By.css('ul.pagination')); expect(de.nativeElement.classList.contains("pagination-sm")).toBeTruthy(); }); diff --git a/src/app/shared/window.service.ts b/src/app/shared/window.service.ts index ff4e93f703..cc2547784a 100644 --- a/src/app/shared/window.service.ts +++ b/src/app/shared/window.service.ts @@ -13,6 +13,6 @@ export class NativeWindowRef { } export function NativeWindowFactory() { - return new NativeWindowRef(); + return new NativeWindowRef(); } diff --git a/yarn.lock b/yarn.lock index f6faae585d..17ed417d48 100644 --- a/yarn.lock +++ b/yarn.lock @@ -81,17 +81,17 @@ version "1.0.4" resolved "https://registry.yarnpkg.com/@angularclass/idle-preload/-/idle-preload-1.0.4.tgz#41eeea532cc4998167c825f6dca62cb98f4b7028" -"@ng-bootstrap/ng-bootstrap@1.0.0-alpha.24": - version "1.0.0-alpha.24" - resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-1.0.0-alpha.24.tgz#c452a75444861ecb424aeb215348c2287a60bc53" +"@ng-bootstrap/ng-bootstrap@1.0.0-alpha.18": + version "1.0.0-alpha.18" + resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-1.0.0-alpha.18.tgz#e2be574f75dfafab27fe32769bfbc0a923736f1d" "@ngrx/core@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@ngrx/core/-/core-1.2.0.tgz#882b46abafa2e0e6d887cb71a1b2c2fa3e6d0dc6" -"@ngrx/effects@^2.0.0": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@ngrx/effects/-/effects-2.0.3.tgz#e54ce340806dd91a81826796f13e2446aeeafb77" +"@ngrx/effects@2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@ngrx/effects/-/effects-2.0.2.tgz#8255e29cc0276f108784c90481e3b96e6713154b" "@ngrx/router-store@^1.2.5": version "1.2.6" @@ -612,9 +612,9 @@ basic-auth@~1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-1.0.4.tgz#030935b01de7c9b94a824b29f3fccb750d3a5290" -batch@0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/batch/-/batch-0.5.3.tgz#3f3414f380321743bfc1042f9a83ff1d5824d464" +batch@0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" bcrypt-pbkdf@^1.0.0: version "1.0.1" @@ -904,8 +904,8 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000539, caniuse-db@^1.0.30000597, caniuse-db@^1.0.30000639: - version "1.0.30000671" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000671.tgz#9f071bbc7b96994638ccbaf47829d58a1577a8ed" + version "1.0.30000672" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000672.tgz#f40f4bf126cb7e063f6a2e1df1c955c803d12265" capture-stack-trace@^1.0.0: version "1.0.0" @@ -1464,13 +1464,13 @@ debug@0.7.4: version "0.7.4" resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39" -debug@2, debug@^2.6.8: +debug@2, debug@2.6.8, debug@^2.6.8: version "2.6.8" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" dependencies: ms "2.0.0" -debug@2.2.0, debug@~2.2.0: +debug@2.2.0, debug@^2.2.0, debug@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da" dependencies: @@ -1482,7 +1482,7 @@ debug@2.3.3: dependencies: ms "0.7.2" -debug@2.6.7, debug@^2.2.0: +debug@2.6.7: version "2.6.7" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.7.tgz#92bad1f6d05bbb6bba22cca88bcd0ec894c2861e" dependencies: @@ -1695,8 +1695,8 @@ ejs@^2.5.2: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88" electron-to-chromium@^1.2.7: - version "1.3.11" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.11.tgz#744761df1d67b492b322ce9aa0aba5393260eb61" + version "1.3.12" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.12.tgz#62f33e4a59b4855f0de4bb8972bf1b841b98b6d2" elliptic@^6.0.0: version "6.4.0" @@ -3521,7 +3521,11 @@ lowercase-keys@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306" -lru-cache@2, lru-cache@2.2.x: +lru-cache@2: + version "2.7.3" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952" + +lru-cache@2.2.x: version "2.2.4" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d" @@ -5059,13 +5063,13 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.2.8, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.6.0, rimraf@^2.6.1: +rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.6.0, rimraf@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d" dependencies: glob "^7.0.5" -rimraf@2.5.4: +rimraf@2.5.4, rimraf@^2.4.4: version "2.5.4" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04" dependencies: @@ -5241,15 +5245,15 @@ send@0.14.2: statuses "~1.3.1" serve-index@^1.7.2: - version "1.8.0" - resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.8.0.tgz#7c5d96c13fb131101f93c1c5774f8516a1e78d3b" + version "1.9.0" + resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.0.tgz#d2b280fc560d616ee81b48bf0fa82abed2485ce7" dependencies: accepts "~1.3.3" - batch "0.5.3" - debug "~2.2.0" + batch "0.6.1" + debug "2.6.8" escape-html "~1.0.3" - http-errors "~1.5.0" - mime-types "~2.1.11" + http-errors "~1.6.1" + mime-types "~2.1.15" parseurl "~1.3.1" serve-static@~1.11.1: