diff --git a/package-lock.json b/package-lock.json index 31ffbb687d..ef7dbf4b25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,9 +34,9 @@ "@nationalbankbelgium/eslint-config": "^13.0.0-rc.0", "@ng-idle/core": "^11.0.3", "@ng-idle/keepalive": "^11.0.3", - "@ngrx/effects": "^12.3.0", - "@ngrx/store": "^12.3.0", - "@ngrx/store-devtools": "^12.3.0", + "@ngrx/effects": "^13.2.0", + "@ngrx/store": "^13.2.0", + "@ngrx/store-devtools": "^13.2.0", "@ngtools/json-schema": "^1.1.0", "@ngx-translate/core": "^13.0.0", "@npmcli/ci-detect": "^1.3.0", @@ -90,7 +90,7 @@ "protractor": "^7.0.0", "puppeteer": "^13.5.1", "release-it": "^14.12.5", - "rxjs": "^6.6.7", + "rxjs": "^7.8.1", "stream-concat": "^1.0.0", "stylelint": "^13.11.0", "stylelint-config-prettier": "^8.0.2", @@ -169,6 +169,24 @@ "yarn": ">= 1.13.0" } }, + "node_modules/@angular-devkit/architect/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/@angular-devkit/architect/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/@angular-devkit/build-angular": { "version": "13.3.11", "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-13.3.11.tgz", @@ -291,6 +309,24 @@ "url": "https://opencollective.com/core-js" } }, + "node_modules/@angular-devkit/build-angular/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/rxjs/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/@angular-devkit/build-angular/node_modules/tslib": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", @@ -329,6 +365,24 @@ "webpack-dev-server": "^4.0.0" } }, + "node_modules/@angular-devkit/build-webpack/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/@angular-devkit/build-webpack/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/@angular-devkit/core": { "version": "13.3.11", "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-13.3.11.tgz", @@ -356,6 +410,24 @@ } } }, + "node_modules/@angular-devkit/core/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/@angular-devkit/core/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/@angular-devkit/schematics": { "version": "13.3.11", "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.3.11.tgz", @@ -374,6 +446,24 @@ "yarn": ">= 1.13.0" } }, + "node_modules/@angular-devkit/schematics/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/@angular-devkit/schematics/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/@angular-eslint/builder": { "version": "13.5.0", "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-13.5.0.tgz", @@ -4149,43 +4239,43 @@ } }, "node_modules/@ngrx/effects": { - "version": "12.5.1", - "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-12.5.1.tgz", - "integrity": "sha512-fVNGIIntYLRWW1XWe0os2XOv03L22S4WTkX0OPZ9O6ztwuaNq0yzxWN7UeAC6H385F+g0k76KwRV78zHyP0bfQ==", + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-13.2.0.tgz", + "integrity": "sha512-HmWggpl3xGQFfUzON/uel5jSyUWsrGZsR5qR/oFLGjPRWzwKfdHrl0OcBl5IhFgFxT74cAi9F4JTICUytGRbFA==", "dev": true, "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/core": "^12.0.0", - "@ngrx/store": "12.5.1", - "rxjs": "^6.5.3 || ^7.0.0" + "@angular/core": "^13.0.0", + "@ngrx/store": "13.2.0", + "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@ngrx/store": { - "version": "12.5.1", - "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-12.5.1.tgz", - "integrity": "sha512-NLVkHLVeZc7IboXSDZlFoq1QrupmwYTYKRHS6se7ZasAv/lrIjHWsVVdICKSVRBsHZYu3+dmCXmu+YgulP7iHw==", + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-13.2.0.tgz", + "integrity": "sha512-3wlGMkfe0EXsiS6E6W0wCksuGapa5Z6JVFvKQMHFpXZ3XeixXKlULnemlcdMT7Yrnry+CGOtRHqkmKxLoQzhTw==", "dev": true, "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/core": "^12.0.0", - "rxjs": "^6.5.3 || ^7.0.0" + "@angular/core": "^13.0.0", + "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@ngrx/store-devtools": { - "version": "12.5.1", - "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-12.5.1.tgz", - "integrity": "sha512-SXMxVO3KzQUfB9G20gdNT5t/RcbtbaUySXLuH+b69z/eb34wH9AOYifdSdcEi8oqPjDrWYBq6a8Uh+yDHf9IfA==", + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-13.2.0.tgz", + "integrity": "sha512-k1NifkR/4OjbjAxauVZODCsgs2owMJXvEX2XoTWth7zscbHE8L3pLd0k1ox5pMPUEqWIptWTaJDzYqnQSoJaaw==", "dev": true, "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@ngrx/store": "12.5.1", - "rxjs": "^6.5.3 || ^7.0.0" + "@ngrx/store": "13.2.0", + "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@ngtools/json-schema": { @@ -4731,6 +4821,24 @@ "node": ">=10" } }, + "node_modules/@nrwl/devkit/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/@nrwl/devkit/node_modules/rxjs/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/@nrwl/devkit/node_modules/semver": { "version": "7.3.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", @@ -5003,6 +5111,24 @@ "node": ">=10" } }, + "node_modules/@nrwl/tao/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/@nrwl/tao/node_modules/rxjs/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/@nrwl/tao/node_modules/semver": { "version": "7.3.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", @@ -8861,15 +8987,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/commitizen/node_modules/rxjs": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", - "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", - "dev": true, - "dependencies": { - "tslib": "^2.1.0" - } - }, "node_modules/commitizen/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -10130,6 +10247,18 @@ "node": ">=4" } }, + "node_modules/cz-customizable/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, "node_modules/cz-customizable/node_modules/string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -10176,6 +10305,12 @@ "node": ">=6" } }, + "node_modules/cz-customizable/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/d": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", @@ -15137,15 +15272,6 @@ "node": ">=8" } }, - "node_modules/inquirer/node_modules/rxjs": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", - "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", - "dev": true, - "dependencies": { - "tslib": "^2.1.0" - } - }, "node_modules/inquirer/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -17019,15 +17145,6 @@ "node": ">=8" } }, - "node_modules/listr2/node_modules/rxjs": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", - "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", - "dev": true, - "dependencies": { - "tslib": "^2.1.0" - } - }, "node_modules/listr2/node_modules/slice-ansi": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", @@ -18441,15 +18558,6 @@ "node": ">= 12" } }, - "node_modules/ng-packagr/node_modules/rxjs": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", - "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", - "dev": true, - "dependencies": { - "tslib": "^2.1.0" - } - }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -22656,15 +22764,12 @@ } }, "node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dev": true, "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" + "tslib": "^2.1.0" } }, "node_modules/rxjs-for-await": { @@ -22676,12 +22781,6 @@ "rxjs": "^6.0.0" } }, - "node_modules/rxjs/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, "node_modules/safe-array-concat": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz", diff --git a/package.json b/package.json index 59df916a18..f8ea88a984 100644 --- a/package.json +++ b/package.json @@ -43,9 +43,9 @@ "@nationalbankbelgium/eslint-config": "^13.0.0-rc.0", "@ng-idle/core": "^11.0.3", "@ng-idle/keepalive": "^11.0.3", - "@ngrx/effects": "^12.3.0", - "@ngrx/store": "^12.3.0", - "@ngrx/store-devtools": "^12.3.0", + "@ngrx/effects": "^13.2.0", + "@ngrx/store": "^13.2.0", + "@ngrx/store-devtools": "^13.2.0", "@ngtools/json-schema": "^1.1.0", "@ngx-translate/core": "^13.0.0", "@npmcli/ci-detect": "^1.3.0", @@ -99,7 +99,7 @@ "protractor": "^7.0.0", "puppeteer": "^13.5.1", "release-it": "^14.12.5", - "rxjs": "^6.6.7", + "rxjs": "^7.8.1", "stream-concat": "^1.0.0", "stylelint": "^13.11.0", "stylelint-config-prettier": "^8.0.2", @@ -236,4 +236,4 @@ }, "nightlyVersion": "11.0.0" } -} +} \ No newline at end of file diff --git a/packages/stark-core/package.json b/packages/stark-core/package.json index 783fb26df1..7ddc7f8bc3 100644 --- a/packages/stark-core/package.json +++ b/packages/stark-core/package.json @@ -21,9 +21,9 @@ "@angularclass/hmr": "^3.0.0", "@ng-idle/core": "^11.0.3", "@ng-idle/keepalive": "^11.0.3", - "@ngrx/effects": "^12.3.0", - "@ngrx/store": "^12.3.0", - "@ngrx/store-devtools": "^12.3.0", + "@ngrx/effects": "^13.2.0", + "@ngrx/store": "^13.2.0", + "@ngrx/store-devtools": "^13.2.0", "@ngx-translate/core": "^13.0.0", "@types/lodash-es": "^4.17.4", "@types/uuid": "^8.3.0", diff --git a/packages/stark-core/src/modules/routing/services/routing.service.spec.ts b/packages/stark-core/src/modules/routing/services/routing.service.spec.ts index 71db29a2f1..58dfd52c14 100644 --- a/packages/stark-core/src/modules/routing/services/routing.service.spec.ts +++ b/packages/stark-core/src/modules/routing/services/routing.service.spec.ts @@ -989,7 +989,7 @@ describe("Service: StarkRoutingService", () => { }); it("should reload the current page", (done: DoneFn) => { - spyOn($state, "reload").and.returnValue(throwError("Reload has failed").toPromise()); + spyOn($state, "reload").and.returnValue(throwError("Reload has failed").toPromise()); const statesConfig: StateDeclaration[] = $state.get(); expect(statesConfig.length).toBe(numberOfMockStates); diff --git a/packages/stark-core/src/modules/session/services/session.service.ts b/packages/stark-core/src/modules/session/services/session.service.ts index 21b6428b7f..224868f66d 100644 --- a/packages/stark-core/src/modules/session/services/session.service.ts +++ b/packages/stark-core/src/modules/session/services/session.service.ts @@ -159,7 +159,7 @@ export class StarkSessionServiceImpl implements StarkSessionService { return true; }) ) - .toPromise(), + .toPromise(), { priority: 1000 } // very high priority (this hook should be the first one to be called to reject transitions immediately) ); } diff --git a/packages/stark-ui/src/modules/generic-search/classes/abstract-search-component.spec.ts b/packages/stark-ui/src/modules/generic-search/classes/abstract-search-component.spec.ts index bb13cf8d05..277c6fe3c1 100644 --- a/packages/stark-ui/src/modules/generic-search/classes/abstract-search-component.spec.ts +++ b/packages/stark-ui/src/modules/generic-search/classes/abstract-search-component.spec.ts @@ -1,5 +1,5 @@ /* eslint-disable @angular-eslint/no-lifecycle-call */ -import { Observable, Observer, of, Subject, Subscriber, throwError } from "rxjs"; +import { Observable, Observer, of, Subject, Subscriber, TeardownLogic, throwError } from "rxjs"; import { AbstractStarkSearchComponent, StarkGenericSearchService } from "../classes"; import { MockStarkLoggingService } from "@nationalbankbelgium/stark-core/testing"; import { StarkResource } from "@nationalbankbelgium/stark-core"; @@ -412,8 +412,8 @@ interface SearchCriteria { uuid: string; } -function createObservableOf(value: T, teardown: Function): Observable { - return new Observable((subscriber: Subscriber): Function => { +function createObservableOf(value: T, teardown: TeardownLogic): Observable { + return new Observable((subscriber: Subscriber): TeardownLogic => { subscriber.next(value); return teardown; }); diff --git a/packages/stark-ui/src/modules/toast-notification/services/toast-notification.service.spec.ts b/packages/stark-ui/src/modules/toast-notification/services/toast-notification.service.spec.ts index 4f20ed8462..27831f49fb 100644 --- a/packages/stark-ui/src/modules/toast-notification/services/toast-notification.service.spec.ts +++ b/packages/stark-ui/src/modules/toast-notification/services/toast-notification.service.spec.ts @@ -96,7 +96,7 @@ describe("ToastNotificationService", () => { expect(service.snackBar.openFromComponent).toHaveBeenCalledTimes(0); - expect(service.currentToastResult$).not.toBeDefined(); + expect((service).currentToastResult$).not.toBeDefined(); showObs.subscribe((ret: StarkToastNotificationResult) => { expect(ret).toBe(StarkToastNotificationResult.CLOSED_BY_NEW_TOAST); @@ -106,11 +106,8 @@ describe("ToastNotificationService", () => { expect(service.snackBar.openFromComponent).toHaveBeenCalledTimes(1); - expect(service.currentToastResult$).not.toBeNull(); - expect(service.currentToastResult$).toBeDefined(); - if (service.currentToastResult$) { - expect(service.currentToastResult$.closed).toBe(false); - } + expect((service).currentToastResult$).not.toBeNull(); + expect((service).currentToastResult$).toBeDefined(); showObs = service.show(message); @@ -120,7 +117,7 @@ describe("ToastNotificationService", () => { expect(showObs).not.toBeNull(); expect(showObs).toBeDefined(); - expect(service.currentToastResult$).not.toBeDefined(); + expect((service).currentToastResult$).not.toBeDefined(); expect(service.snackBar.openFromComponent).toHaveBeenCalledTimes(1); @@ -132,11 +129,8 @@ describe("ToastNotificationService", () => { expect(service.snackBar.openFromComponent).toHaveBeenCalledTimes(2); - expect(service.currentToastResult$).not.toBeNull(); - expect(service.currentToastResult$).toBeDefined(); - if (service.currentToastResult$) { - expect(service.currentToastResult$.closed).toBe(false); - } + expect((service).currentToastResult$).not.toBeNull(); + expect((service).currentToastResult$).toBeDefined(); /** Mimic MatSnackBar's behavior */ observer.next({ dismissedByAction: false }); @@ -153,9 +147,11 @@ describe("ToastNotificationService", () => { tick(); - if (service.currentToastResult$) { - expect(service.currentToastResult$.closed).toBe(false); - } + spyOn((service).currentToastResult$, "complete"); + + const privateObserver: Observer = (service).currentToastResult$; + + expect(privateObserver.complete).not.toHaveBeenCalled(); service.hide(); @@ -164,9 +160,7 @@ describe("ToastNotificationService", () => { tick(); - if (service.currentToastResult$) { - expect(service.currentToastResult$.closed).toBe(true); - } + expect(privateObserver.complete).toHaveBeenCalled(); })); }); }); diff --git a/packages/stark-ui/src/modules/toast-notification/services/toast-notification.service.ts b/packages/stark-ui/src/modules/toast-notification/services/toast-notification.service.ts index fa64e8ec6e..795e9bfdf5 100644 --- a/packages/stark-ui/src/modules/toast-notification/services/toast-notification.service.ts +++ b/packages/stark-ui/src/modules/toast-notification/services/toast-notification.service.ts @@ -23,7 +23,7 @@ export class StarkToastNotificationServiceImpl implements StarkToastNotification /** * Observer linked to the currently displayed toast notification */ - public currentToastResult$?: Observer; + private currentToastResult$?: Observer; /** * Reference of the currently displayed toast notification @@ -58,7 +58,7 @@ export class StarkToastNotificationServiceImpl implements StarkToastNotification } public show(message: StarkToastMessage): Observable { - if (this.currentToastResult$ && !this.currentToastResult$.closed) { + if (this.currentToastResult$) { this.currentToastResult$.next(StarkToastNotificationResult.CLOSED_BY_NEW_TOAST); this.currentToastResult$.complete(); this.currentToastResult$ = undefined; @@ -73,7 +73,7 @@ export class StarkToastNotificationServiceImpl implements StarkToastNotification tap((toastDismissedEvent: MatSnackBarDismiss) => { // emit on the observer only if it is the current toast // otherwise, it means it is a previous toast that is being closed by a new one - if (this.currentToastResult$ === observer && !observer.closed) { + if (this.currentToastResult$ === observer) { if (!toastDismissedEvent.dismissedByAction) { observer.next(StarkToastNotificationResult.CLOSED_ON_DELAY_TIMEOUT); } else { @@ -82,6 +82,7 @@ export class StarkToastNotificationServiceImpl implements StarkToastNotification this.ref.tick(); } observer.complete(); + this.currentToastResult$ = undefined; }) ) .subscribe(); @@ -89,7 +90,7 @@ export class StarkToastNotificationServiceImpl implements StarkToastNotification } public hide(): void { - if (this.currentToastResult$ && !this.currentToastResult$.closed) { + if (this.currentToastResult$) { this.currentToastResult$.next(StarkToastNotificationResult.HIDDEN); this.currentToastResult$.complete(); this.currentToastResult$ = undefined; diff --git a/showcase/package-lock.json b/showcase/package-lock.json index f4ad4a5999..d6a3bb048f 100644 --- a/showcase/package-lock.json +++ b/showcase/package-lock.json @@ -26,9 +26,9 @@ "@angular/router": "^13.4.0", "@nationalbankbelgium/code-style": "^1.7.0", "@nationalbankbelgium/ngx-form-errors": "2.0.0-rc.0", - "@nationalbankbelgium/stark-core": "file:../dist/packages-dist/stark-core/nationalbankbelgium-stark-core-10.2.0-609ce9a98-1704451577.tgz", - "@nationalbankbelgium/stark-rbac": "file:../dist/packages-dist/stark-rbac/nationalbankbelgium-stark-rbac-10.2.0-609ce9a98-1704451577.tgz", - "@nationalbankbelgium/stark-ui": "file:../dist/packages-dist/stark-ui/nationalbankbelgium-stark-ui-10.2.0-609ce9a98-1704451577.tgz", + "@nationalbankbelgium/stark-core": "file:../dist/packages-dist/stark-core/nationalbankbelgium-stark-core-12.0.0-beta.0-a83e0f149-1706533486.tgz", + "@nationalbankbelgium/stark-rbac": "file:../dist/packages-dist/stark-rbac/nationalbankbelgium-stark-rbac-12.0.0-beta.0-a83e0f149-1706533486.tgz", + "@nationalbankbelgium/stark-ui": "file:../dist/packages-dist/stark-ui/nationalbankbelgium-stark-ui-12.0.0-beta.0-a83e0f149-1706533486.tgz", "@uirouter/visualizer": "~7.2.1", "angular-in-memory-web-api": "~0.11.0", "basscss": "~8.1.0", @@ -38,14 +38,14 @@ "http-server": "~14.1.0", "ngrx-store-logger": "~0.2.2", "reflect-metadata": "~0.1.13", - "rxjs": "^6.6.7", + "rxjs": "^7.8.1", "zone.js": "~0.11.5" }, "devDependencies": { "@compodoc/compodoc": "1.1.19", "@nationalbankbelgium/eslint-config": "^13.0.0-rc.0", - "@nationalbankbelgium/stark-build": "file:../dist/packages-dist/stark-build/nationalbankbelgium-stark-build-10.2.0-609ce9a98-1704451577.tgz", - "@nationalbankbelgium/stark-testing": "file:../dist/packages-dist/stark-testing/nationalbankbelgium-stark-testing-10.2.0-609ce9a98-1704451577.tgz", + "@nationalbankbelgium/stark-build": "file:../dist/packages-dist/stark-build/nationalbankbelgium-stark-build-12.0.0-beta.0-a83e0f149-1706533486.tgz", + "@nationalbankbelgium/stark-testing": "file:../dist/packages-dist/stark-testing/nationalbankbelgium-stark-testing-12.0.0-beta.0-a83e0f149-1706533486.tgz", "@types/core-js": "~2.5.4", "@types/hammerjs": "~2.0.39", "@types/node": "^18.19.4", @@ -125,6 +125,22 @@ "yarn": ">= 1.13.0" } }, + "node_modules/@angular-devkit/architect/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/@angular-devkit/architect/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, "node_modules/@angular-devkit/build-angular": { "version": "13.3.11", "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-13.3.11.tgz", @@ -607,6 +623,24 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/@angular-devkit/build-angular/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/rxjs/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/@angular-devkit/build-angular/node_modules/source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", @@ -654,6 +688,24 @@ "webpack-dev-server": "^4.0.0" } }, + "node_modules/@angular-devkit/build-webpack/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/@angular-devkit/build-webpack/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/@angular-devkit/core": { "version": "13.3.11", "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-13.3.11.tgz", @@ -680,6 +732,22 @@ } } }, + "node_modules/@angular-devkit/core/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/@angular-devkit/core/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, "node_modules/@angular-devkit/schematics": { "version": "13.3.11", "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.3.11.tgz", @@ -697,6 +765,22 @@ "yarn": ">= 1.13.0" } }, + "node_modules/@angular-devkit/schematics/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/@angular-devkit/schematics/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, "node_modules/@angular-eslint/builder": { "version": "13.5.0", "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-13.5.0.tgz", @@ -3751,9 +3835,9 @@ } }, "node_modules/@nationalbankbelgium/stark-build": { - "version": "10.2.0-609ce9a98-1704451577", - "resolved": "file:../dist/packages-dist/stark-build/nationalbankbelgium-stark-build-10.2.0-609ce9a98-1704451577.tgz", - "integrity": "sha512-9nWwLQwNwr9W4mXHiVvwwwOi0fKx+RwjJtIAz8+TjHucoEq8J6GnrC3ns7VP0Yg6AmnV+95g71uEwrfmlZv/7g==", + "version": "12.0.0-beta.0-a83e0f149-1706533085", + "resolved": "file:../dist/packages-dist/stark-build/nationalbankbelgium-stark-build-12.0.0-beta.0-a83e0f149-1706533486.tgz", + "integrity": "sha512-H2nV6INAFgYXw2OIFRNL97adDF+H7tP3VgPhnXrMMZo1niLIj0guc8txAkuvpyS/cgg4QKrAmK40NmMmkJNThw==", "dev": true, "license": "MIT", "dependencies": { @@ -3781,17 +3865,17 @@ } }, "node_modules/@nationalbankbelgium/stark-core": { - "version": "10.2.0-609ce9a98-1704451577", - "resolved": "file:../dist/packages-dist/stark-core/nationalbankbelgium-stark-core-10.2.0-609ce9a98-1704451577.tgz", - "integrity": "sha512-R8r6gtJfc7m2fZz6vri3r8n42kfgiJKAU5tnlQ835+RNMjNJb8JRZ1yDXE00YycOPCbred531sOQ9VCS2Ri63g==", + "version": "12.0.0-beta.0-a83e0f149-1706533085", + "resolved": "file:../dist/packages-dist/stark-core/nationalbankbelgium-stark-core-12.0.0-beta.0-a83e0f149-1706533486.tgz", + "integrity": "sha512-5xZ/QSF+o26Qe4SEpYE3aTFPsv4OY7FfVeovKdaye8pbQp/R+LYyjnFX5jk92n+bmGQtR17Ybju2Io1UKth1og==", "license": "MIT", "dependencies": { "@angularclass/hmr": "^3.0.0", "@ng-idle/core": "^11.0.3", "@ng-idle/keepalive": "^11.0.3", - "@ngrx/effects": "^12.3.0", - "@ngrx/store": "^12.3.0", - "@ngrx/store-devtools": "^12.3.0", + "@ngrx/effects": "^13.2.0", + "@ngrx/store": "^13.2.0", + "@ngrx/store-devtools": "^13.2.0", "@ngx-translate/core": "^13.0.0", "@types/lodash-es": "^4.17.4", "@types/uuid": "^8.3.0", @@ -3819,9 +3903,9 @@ } }, "node_modules/@nationalbankbelgium/stark-rbac": { - "version": "10.2.0-609ce9a98-1704451577", - "resolved": "file:../dist/packages-dist/stark-rbac/nationalbankbelgium-stark-rbac-10.2.0-609ce9a98-1704451577.tgz", - "integrity": "sha512-F9h5CZ4qsEr1ASRwmo9Zi13Uz7yiELZJHLEiRRwatcw9r/3ObpuMF4KG/MowcWz5gK1FvB1dq/fbf/hE4hhvtA==", + "version": "12.0.0-beta.0-a83e0f149-1706533085", + "resolved": "file:../dist/packages-dist/stark-rbac/nationalbankbelgium-stark-rbac-12.0.0-beta.0-a83e0f149-1706533486.tgz", + "integrity": "sha512-vUhZe5zYyIYHwhhJiZjMU3N1281v4LaIfjUwCzxTiKiGXKVHvMt5aWJnsXRXrOISD6moSTbO6PY8IIMKhBjiQA==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -3831,13 +3915,13 @@ "npm": ">=8.19.1" }, "peerDependencies": { - "@nationalbankbelgium/stark-core": "10.2.0-609ce9a98-1704451577" + "@nationalbankbelgium/stark-core": "12.0.0-beta.0-a83e0f149-1706533085" } }, "node_modules/@nationalbankbelgium/stark-testing": { - "version": "10.2.0-609ce9a98-1704451577", - "resolved": "file:../dist/packages-dist/stark-testing/nationalbankbelgium-stark-testing-10.2.0-609ce9a98-1704451577.tgz", - "integrity": "sha512-HyGoaFDLGshb/W0/rOb7U2tc0+pLSguQR3LhDA9lSKmbzEmQKZJMi8ObIm4I3VYRXHgQHdOnF3aTLwwDhcoyNw==", + "version": "12.0.0-beta.0-a83e0f149-1706533085", + "resolved": "file:../dist/packages-dist/stark-testing/nationalbankbelgium-stark-testing-12.0.0-beta.0-a83e0f149-1706533486.tgz", + "integrity": "sha512-VhSgUaYRCAW1E4mJveDaIHjw5BcBGx8hGEj9I/DftubdKu0tIuB0J6YqhUPQ9RGnFo1rD6DLLMvfgXvyEO/9Lw==", "dev": true, "license": "MIT", "dependencies": { @@ -3865,9 +3949,9 @@ } }, "node_modules/@nationalbankbelgium/stark-ui": { - "version": "10.2.0-609ce9a98-1704451577", - "resolved": "file:../dist/packages-dist/stark-ui/nationalbankbelgium-stark-ui-10.2.0-609ce9a98-1704451577.tgz", - "integrity": "sha512-IyH9+QZkc6JJ/pYEYXx/sIS6UtHedDzlhURx2W4Q/pThaIxdwPYnXGqrGF3y4rez2fPVTpoyXYMOz+33+N2UwQ==", + "version": "12.0.0-beta.0-a83e0f149-1706533085", + "resolved": "file:../dist/packages-dist/stark-ui/nationalbankbelgium-stark-ui-12.0.0-beta.0-a83e0f149-1706533486.tgz", + "integrity": "sha512-WfI/E+mkyqGxVXsV1KHPrTeBfz98nmscgbQHpEcgoMsObujiDJVlz1uzSheSOW1zB4F8GmuaxAlZYlDla02N4Q==", "license": "MIT", "dependencies": { "@angular/material-moment-adapter": "^13.3.9", @@ -3893,7 +3977,7 @@ "@angular/cdk": "^13.3.9", "@angular/forms": "^13.4.0", "@angular/material": "^13.3.9", - "@nationalbankbelgium/stark-core": "10.2.0-609ce9a98-1704451577" + "@nationalbankbelgium/stark-core": "12.0.0-beta.0-a83e0f149-1706533085" } }, "node_modules/@ng-idle/core": { @@ -3922,40 +4006,40 @@ } }, "node_modules/@ngrx/effects": { - "version": "12.5.1", - "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-12.5.1.tgz", - "integrity": "sha512-fVNGIIntYLRWW1XWe0os2XOv03L22S4WTkX0OPZ9O6ztwuaNq0yzxWN7UeAC6H385F+g0k76KwRV78zHyP0bfQ==", + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-13.2.0.tgz", + "integrity": "sha512-HmWggpl3xGQFfUzON/uel5jSyUWsrGZsR5qR/oFLGjPRWzwKfdHrl0OcBl5IhFgFxT74cAi9F4JTICUytGRbFA==", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/core": "^12.0.0", - "@ngrx/store": "12.5.1", - "rxjs": "^6.5.3 || ^7.0.0" + "@angular/core": "^13.0.0", + "@ngrx/store": "13.2.0", + "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@ngrx/store": { - "version": "12.5.1", - "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-12.5.1.tgz", - "integrity": "sha512-NLVkHLVeZc7IboXSDZlFoq1QrupmwYTYKRHS6se7ZasAv/lrIjHWsVVdICKSVRBsHZYu3+dmCXmu+YgulP7iHw==", + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-13.2.0.tgz", + "integrity": "sha512-3wlGMkfe0EXsiS6E6W0wCksuGapa5Z6JVFvKQMHFpXZ3XeixXKlULnemlcdMT7Yrnry+CGOtRHqkmKxLoQzhTw==", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/core": "^12.0.0", - "rxjs": "^6.5.3 || ^7.0.0" + "@angular/core": "^13.0.0", + "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@ngrx/store-devtools": { - "version": "12.5.1", - "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-12.5.1.tgz", - "integrity": "sha512-SXMxVO3KzQUfB9G20gdNT5t/RcbtbaUySXLuH+b69z/eb34wH9AOYifdSdcEi8oqPjDrWYBq6a8Uh+yDHf9IfA==", + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-13.2.0.tgz", + "integrity": "sha512-k1NifkR/4OjbjAxauVZODCsgs2owMJXvEX2XoTWth7zscbHE8L3pLd0k1ox5pMPUEqWIptWTaJDzYqnQSoJaaw==", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@ngrx/store": "12.5.1", - "rxjs": "^6.5.3 || ^7.0.0" + "@ngrx/store": "13.2.0", + "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@ngtools/webpack": { @@ -4472,6 +4556,24 @@ "node": ">=10" } }, + "node_modules/@nrwl/devkit/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/@nrwl/devkit/node_modules/rxjs/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/@nrwl/devkit/node_modules/semver": { "version": "7.3.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", @@ -4744,6 +4846,24 @@ "node": ">=10" } }, + "node_modules/@nrwl/tao/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/@nrwl/tao/node_modules/rxjs/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/@nrwl/tao/node_modules/semver": { "version": "7.3.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", @@ -12981,14 +13101,6 @@ "node": ">=8" } }, - "node_modules/inquirer/node_modules/rxjs": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", - "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", - "dependencies": { - "tslib": "^2.1.0" - } - }, "node_modules/inquirer/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -18932,14 +19044,11 @@ } }, "node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" + "tslib": "^2.1.0" } }, "node_modules/rxjs-for-await": { @@ -18951,11 +19060,6 @@ "rxjs": "^6.0.0" } }, - "node_modules/rxjs/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, "node_modules/safe-array-concat": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz", diff --git a/showcase/package.json b/showcase/package.json index 4b7edf46b1..20043e7f40 100644 --- a/showcase/package.json +++ b/showcase/package.json @@ -119,9 +119,9 @@ "@angular/router": "^13.4.0", "@nationalbankbelgium/code-style": "^1.7.0", "@nationalbankbelgium/ngx-form-errors": "2.0.0-rc.0", - "@nationalbankbelgium/stark-core": "file:../dist/packages-dist/stark-core/nationalbankbelgium-stark-core-10.2.0-609ce9a98-1704451577.tgz", - "@nationalbankbelgium/stark-rbac": "file:../dist/packages-dist/stark-rbac/nationalbankbelgium-stark-rbac-10.2.0-609ce9a98-1704451577.tgz", - "@nationalbankbelgium/stark-ui": "file:../dist/packages-dist/stark-ui/nationalbankbelgium-stark-ui-10.2.0-609ce9a98-1704451577.tgz", + "@nationalbankbelgium/stark-core": "file:../dist/packages-dist/stark-core/nationalbankbelgium-stark-core-12.0.0-beta.0-a83e0f149-1706533486.tgz", + "@nationalbankbelgium/stark-rbac": "file:../dist/packages-dist/stark-rbac/nationalbankbelgium-stark-rbac-12.0.0-beta.0-a83e0f149-1706533486.tgz", + "@nationalbankbelgium/stark-ui": "file:../dist/packages-dist/stark-ui/nationalbankbelgium-stark-ui-12.0.0-beta.0-a83e0f149-1706533486.tgz", "@uirouter/visualizer": "~7.2.1", "angular-in-memory-web-api": "~0.11.0", "basscss": "~8.1.0", @@ -131,14 +131,14 @@ "http-server": "~14.1.0", "ngrx-store-logger": "~0.2.2", "reflect-metadata": "~0.1.13", - "rxjs": "^6.6.7", + "rxjs": "^7.8.1", "zone.js": "~0.11.5" }, "devDependencies": { "@compodoc/compodoc": "1.1.19", "@nationalbankbelgium/eslint-config": "^13.0.0-rc.0", - "@nationalbankbelgium/stark-build": "file:../dist/packages-dist/stark-build/nationalbankbelgium-stark-build-10.2.0-609ce9a98-1704451577.tgz", - "@nationalbankbelgium/stark-testing": "file:../dist/packages-dist/stark-testing/nationalbankbelgium-stark-testing-10.2.0-609ce9a98-1704451577.tgz", + "@nationalbankbelgium/stark-build": "file:../dist/packages-dist/stark-build/nationalbankbelgium-stark-build-12.0.0-beta.0-a83e0f149-1706533486.tgz", + "@nationalbankbelgium/stark-testing": "file:../dist/packages-dist/stark-testing/nationalbankbelgium-stark-testing-12.0.0-beta.0-a83e0f149-1706533486.tgz", "@types/core-js": "~2.5.4", "@types/hammerjs": "~2.0.39", "@types/node": "^18.19.4", @@ -154,4 +154,4 @@ "ts-node": "~10.0.0", "typescript": "~4.6.4" } -} +} \ No newline at end of file diff --git a/showcase/src/app/shared/components/table-of-contents/table-of-contents.component.ts b/showcase/src/app/shared/components/table-of-contents/table-of-contents.component.ts index f8b48d7fc9..faa2ea10fa 100644 --- a/showcase/src/app/shared/components/table-of-contents/table-of-contents.component.ts +++ b/showcase/src/app/shared/components/table-of-contents/table-of-contents.component.ts @@ -22,7 +22,7 @@ export class TableOfContentsComponent implements OnInit, AfterViewInit, OnDestro public headerSelectors?: string; private _scrollContainer: Window = window; - private _destroyed: Subject = new Subject(); + private _destroyed: Subject = new Subject(); private _urlFragment = ""; public ngOnInit(): void { diff --git a/starter/package.json b/starter/package.json index 5d3dbd0d76..67f68f2800 100644 --- a/starter/package.json +++ b/starter/package.json @@ -120,8 +120,8 @@ "@angular/platform-server": "^13.4.0", "@angular/router": "^13.4.0", "@nationalbankbelgium/code-style": "^1.7.0", - "@nationalbankbelgium/stark-core": "latest", - "@nationalbankbelgium/stark-ui": "latest", + "@nationalbankbelgium/stark-core": "file:../dist/packages-dist/stark-core/nationalbankbelgium-stark-core-12.0.0-beta.0-f77a8ef0e-1706535335.tgz", + "@nationalbankbelgium/stark-ui": "file:../dist/packages-dist/stark-ui/nationalbankbelgium-stark-ui-12.0.0-beta.0-f77a8ef0e-1706535335.tgz", "@uirouter/visualizer": "~7.2.1", "core-js": "~3.21.1", "eligrey-classlist-js-polyfill": "~1.2.20180112", @@ -129,14 +129,14 @@ "http-server": "~14.1.0", "ngrx-store-logger": "~0.2.2", "reflect-metadata": "~0.1.13", - "rxjs": "^6.6.6", + "rxjs": "^7.8.1", "zone.js": "~0.11.4" }, "devDependencies": { "@compodoc/compodoc": "1.1.19", "@nationalbankbelgium/eslint-config": "^13.0.0", - "@nationalbankbelgium/stark-build": "latest", - "@nationalbankbelgium/stark-testing": "latest", + "@nationalbankbelgium/stark-build": "file:../dist/packages-dist/stark-build/nationalbankbelgium-stark-build-12.0.0-beta.0-f77a8ef0e-1706535335.tgz", + "@nationalbankbelgium/stark-testing": "file:../dist/packages-dist/stark-testing/nationalbankbelgium-stark-testing-12.0.0-beta.0-f77a8ef0e-1706535335.tgz", "@types/core-js": "~2.5.4", "@types/hammerjs": "~2.0.39", "@types/node": "^18.19.4", @@ -152,4 +152,4 @@ "ts-node": "~10.7.0", "typescript": "~4.6.4" } -} +} \ No newline at end of file