From d00648c47ae3cf74c55baca821fa42a5d3ab65cd Mon Sep 17 00:00:00 2001 From: junjiequan Date: Tue, 6 Aug 2024 13:50:13 +0200 Subject: [PATCH 1/4] updated rxjs to 7.4.0 --- package-lock.json | 99 +++++-------------- package.json | 2 +- src/app/shared/sdk/models/FireLoopRef.ts | 6 +- .../shared/sdk/sockets/socket.connections.ts | 2 +- 4 files changed, 28 insertions(+), 81 deletions(-) diff --git a/package-lock.json b/package-lock.json index 888a0bea2..d34a706ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,7 +37,7 @@ "ngx-json-viewer": "^3", "ngx-linky": "^4.0.0", "ngx-material-luxon": "^1.1.1", - "rxjs": "^6.6.6", + "rxjs": "^7.4.0", "shortid": "^2.2.16", "socket.io-client": "^4.7.2", "tslib": "^2.4.0", @@ -128,15 +128,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@angular-devkit/architect/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/@angular-devkit/build-angular": { "version": "16.2.15", "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-16.2.15.tgz", @@ -259,15 +250,6 @@ } } }, - "node_modules/@angular-devkit/build-angular/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/@angular-devkit/build-angular/node_modules/tslib": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", @@ -293,15 +275,6 @@ "webpack-dev-server": "^4.0.0" } }, - "node_modules/@angular-devkit/build-webpack/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/@angular-devkit/core": { "version": "16.2.15", "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.15.tgz", @@ -329,15 +302,6 @@ } } }, - "node_modules/@angular-devkit/core/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/@angular-devkit/schematics": { "version": "16.2.15", "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.2.15.tgz", @@ -356,15 +320,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@angular-devkit/schematics/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/@angular-eslint/builder": { "version": "16.3.1", "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-16.3.1.tgz", @@ -9518,6 +9473,18 @@ "sourcemap-codec": "^1.4.4" } }, + "node_modules/eslint-plugin-ngrx/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/eslint-plugin-ngrx/node_modules/source-map": { "version": "0.7.3", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", @@ -9527,6 +9494,12 @@ "node": ">= 8" } }, + "node_modules/eslint-plugin-ngrx/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/eslint-plugin-prettier": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz", @@ -11496,15 +11469,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", @@ -13207,15 +13171,6 @@ } } }, - "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/loader-runner": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", @@ -16563,21 +16518,13 @@ } }, "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/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-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", diff --git a/package.json b/package.json index 3ec659024..e90ff47cb 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "ngx-json-viewer": "^3", "ngx-linky": "^4.0.0", "ngx-material-luxon": "^1.1.1", - "rxjs": "^6.6.6", + "rxjs": "^7.4.0", "shortid": "^2.2.16", "socket.io-client": "^4.7.2", "tslib": "^2.4.0", diff --git a/src/app/shared/sdk/models/FireLoopRef.ts b/src/app/shared/sdk/models/FireLoopRef.ts index 291de8349..ad93b6b96 100644 --- a/src/app/shared/sdk/models/FireLoopRef.ts +++ b/src/app/shared/sdk/models/FireLoopRef.ts @@ -1,5 +1,5 @@ /* eslint-disable */ -import { merge, Observable, Subject } from "rxjs"; +import { merge, Observable, Subject, throwError } from "rxjs"; import { catchError } from "rxjs/operators"; import { LoopBackFilter, StatFilter } from "./index"; import { SocketConnection } from "../sockets/socket.connections"; @@ -331,7 +331,7 @@ export class FireLoopRef { } }); if (event.match("dispose")) { - setTimeout(() => subject.next()); + setTimeout(() => subject.next(null)); } // This event listener will be wiped within socket.connections this.socket.sharedObservables.sharedOnDisconnect.subscribe(() => @@ -339,7 +339,7 @@ export class FireLoopRef { ); return subject .asObservable() - .pipe(catchError((error: any) => Observable.throw(error))); + .pipe(catchError((error: any) => throwError(() => new Error(error)))); } /** * @method buildId diff --git a/src/app/shared/sdk/sockets/socket.connections.ts b/src/app/shared/sdk/sockets/socket.connections.ts index 8bca4505f..e0644a3cc 100644 --- a/src/app/shared/sdk/sockets/socket.connections.ts +++ b/src/app/shared/sdk/sockets/socket.connections.ts @@ -98,7 +98,7 @@ export class SocketConnection { // Listen for authentication this.on("authenticated", () => { this.authenticated = true; - this.subjects.onAuthenticated.next(); + this.subjects.onAuthenticated.next("authenticated"); this.heartbeater(); }); // Listen for authentication From 619c6fab64415a5cb963ebaf8478ccc1d92d901f Mon Sep 17 00:00:00 2001 From: junjiequan Date: Tue, 6 Aug 2024 14:13:41 +0200 Subject: [PATCH 2/4] update jasmine-marbles from 0.6.0 to 0.9.0 --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index d34a706ee..d634787a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -75,7 +75,7 @@ "eslint-plugin-prettier": "^5.0.0", "jasmine": "^5.0.0", "jasmine-core": "^5.0.0", - "jasmine-marbles": "^0.6.0", + "jasmine-marbles": "^0.9.0", "jasmine-spec-reporter": "^7.0.0", "karma": "~6.4.2", "karma-chrome-launcher": "~3.2.0", @@ -12227,15 +12227,15 @@ "dev": true }, "node_modules/jasmine-marbles": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/jasmine-marbles/-/jasmine-marbles-0.6.0.tgz", - "integrity": "sha512-1uzgjEesEeCb+r+v46qn5x326TiGqk5SUZa+A3O+XnMCjG/pGcUOhL9Xsg5L7gLC6RFHyWGTkB5fei4rcvIOiQ==", + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/jasmine-marbles/-/jasmine-marbles-0.9.2.tgz", + "integrity": "sha512-T7RjG4fRsdiGGzbQZ6Kj39qYt6O1/KIcR4FkUNsD3DUGkd/AzpwzN+xtk0DXlLWEz5BaVdK1SzMgQDVw879c4Q==", "dev": true, "dependencies": { - "lodash": "^4.5.0" + "lodash": "^4.17.20" }, "peerDependencies": { - "rxjs": "^6.4.0" + "rxjs": "^7.0.0" } }, "node_modules/jasmine-spec-reporter": { diff --git a/package.json b/package.json index e90ff47cb..fc8ffff0b 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "eslint-plugin-prettier": "^5.0.0", "jasmine": "^5.0.0", "jasmine-core": "^5.0.0", - "jasmine-marbles": "^0.6.0", + "jasmine-marbles": "^0.9.0", "jasmine-spec-reporter": "^7.0.0", "karma": "~6.4.2", "karma-chrome-launcher": "~3.2.0", From 8e4591412c0e47b0b156d25b31b1b4d71101569f Mon Sep 17 00:00:00 2001 From: junjiequan Date: Tue, 6 Aug 2024 14:19:07 +0200 Subject: [PATCH 3/4] replace docker-compose command with docker compose --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 223e5bca8..026a53711 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -94,7 +94,6 @@ jobs: name: coverage path: coverage/ - e2etests: name: Run E2E Tests runs-on: ubuntu-latest From fa2ac3326f1efb5e7a44a1eeaa4b85984a6595ff Mon Sep 17 00:00:00 2001 From: junjiequan Date: Tue, 6 Aug 2024 14:46:19 +0200 Subject: [PATCH 4/4] fix test case type error --- src/app/state-management/effects/user.effects.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/state-management/effects/user.effects.spec.ts b/src/app/state-management/effects/user.effects.spec.ts index fcec9b3a8..47a025979 100644 --- a/src/app/state-management/effects/user.effects.spec.ts +++ b/src/app/state-management/effects/user.effects.spec.ts @@ -429,7 +429,7 @@ describe("UserEffects", () => { actions = hot("-a", { a: action }); - expect(effects.logoutNavigate$).toBeObservable(actions); + expect(effects.logoutNavigate$).toBeObservable(actions as any); expect(router.navigate).toHaveBeenCalledTimes(1); expect(router.navigate).toHaveBeenCalledWith(["/login"]); });