From 1519c8a7a200e008e0fe3f0d11244078f7cdcf69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 17:10:15 +0000 Subject: [PATCH 1/3] build(deps): bump @ng-bootstrap/ng-bootstrap from 17.0.1 to 18.0.0 Bumps [@ng-bootstrap/ng-bootstrap](https://github.com/ng-bootstrap/ng-bootstrap) from 17.0.1 to 18.0.0. - [Release notes](https://github.com/ng-bootstrap/ng-bootstrap/releases) - [Changelog](https://github.com/ng-bootstrap/ng-bootstrap/blob/master/CHANGELOG.md) - [Commits](https://github.com/ng-bootstrap/ng-bootstrap/compare/17.0.1...18.0.0) --- updated-dependencies: - dependency-name: "@ng-bootstrap/ng-bootstrap" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 28acf9661..273f4d13b 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "@fortawesome/angular-fontawesome": "^1.0.0", "@fortawesome/free-solid-svg-icons": "^6.7.2", "@kolkov/ngx-gallery": "2.0.1", - "@ng-bootstrap/ng-bootstrap": "^17.0.1", + "@ng-bootstrap/ng-bootstrap": "^18.0.0", "@popperjs/core": "^2.11.8", "bootstrap": "^5.3.3", "codemirror": "^6.0.1", diff --git a/yarn.lock b/yarn.lock index f1763a838..4a8743a55 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3536,19 +3536,19 @@ __metadata: languageName: node linkType: hard -"@ng-bootstrap/ng-bootstrap@npm:^17.0.1": - version: 17.0.1 - resolution: "@ng-bootstrap/ng-bootstrap@npm:17.0.1" +"@ng-bootstrap/ng-bootstrap@npm:^18.0.0": + version: 18.0.0 + resolution: "@ng-bootstrap/ng-bootstrap@npm:18.0.0" dependencies: tslib: "npm:^2.3.0" peerDependencies: - "@angular/common": ^18.0.0 - "@angular/core": ^18.0.0 - "@angular/forms": ^18.0.0 - "@angular/localize": ^18.0.0 + "@angular/common": ^19.0.0 + "@angular/core": ^19.0.0 + "@angular/forms": ^19.0.0 + "@angular/localize": ^19.0.0 "@popperjs/core": ^2.11.8 rxjs: ^6.5.3 || ^7.4.0 - checksum: 10c0/9892a7b99596491f9144669c6ccc28574160ed79e6c7045fea9c922cac0896dc02b6de00cc115ae1830f46233a5fafbca5af985533a02085e409769ff7c210af + checksum: 10c0/289b6793116a69422b72d64950315f987db1f3e5b0059655853176cb2970748c9c4b575cc8856fee5acf6446372d52fbfa8fc928c98d5258c7515d3ee4503451 languageName: node linkType: hard @@ -5875,7 +5875,7 @@ __metadata: "@fortawesome/angular-fontawesome": "npm:^1.0.0" "@fortawesome/free-solid-svg-icons": "npm:^6.7.2" "@kolkov/ngx-gallery": "npm:2.0.1" - "@ng-bootstrap/ng-bootstrap": "npm:^17.0.1" + "@ng-bootstrap/ng-bootstrap": "npm:^18.0.0" "@popperjs/core": "npm:^2.11.8" "@types/d3": "npm:^7.4.3" "@types/jasmine": "npm:~5.1.4" From 31d66c0b9513b80bd97a6566aff6bb13f26ddcaa Mon Sep 17 00:00:00 2001 From: musicEnfanthen Date: Mon, 23 Dec 2024 19:23:42 +0100 Subject: [PATCH 2/3] test(edition): update tests after ng-bootstrap update --- .../construct-results.component.spec.ts | 38 +++++++++---------- .../select-results.component.spec.ts | 34 ++++++++--------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/construct-results/construct-results.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/construct-results/construct-results.component.spec.ts index efb4e3dc5..9ce424dce 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/construct-results/construct-results.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/construct-results/construct-results.component.spec.ts @@ -906,11 +906,11 @@ describe('ConstructResultsComponent (DONE)', () => { }); it('... should be triggered from ngbAccordionBody', () => { - expectSpyCall(isQueryResultNotEmptySpy, 2, expectedQueryResult[0]); + expectSpyCall(isQueryResultNotEmptySpy, 3, expectedQueryResult[0]); }); it('... should be triggered by change of queryResult', () => { - expectSpyCall(isQueryResultNotEmptySpy, 2, expectedQueryResult[0]); + expectSpyCall(isQueryResultNotEmptySpy, 3, expectedQueryResult[0]); // Mock another queryResult const anotherQueryResult = { @@ -921,24 +921,24 @@ describe('ConstructResultsComponent (DONE)', () => { component.queryResult$ = observableOf([anotherQueryResult]); detectChangesOnPush(fixture); - expectSpyCall(isQueryResultNotEmptySpy, 3, anotherQueryResult[0]); + expectSpyCall(isQueryResultNotEmptySpy, 4, anotherQueryResult[0]); }); describe('... should return false if ...', () => { it('... queryResult is empty array', () => { - expectSpyCall(isQueryResultNotEmptySpy, 2, expectedQueryResult[0]); + expectSpyCall(isQueryResultNotEmptySpy, 3, expectedQueryResult[0]); // Mock empty response const emptyQueryResult = []; component.queryResult$ = observableOf(emptyQueryResult); detectChangesOnPush(fixture); - expectSpyCall(isQueryResultNotEmptySpy, 3, emptyQueryResult); + expectSpyCall(isQueryResultNotEmptySpy, 4, emptyQueryResult); expectToBe(component.isQueryResultNotEmpty(emptyQueryResult), false); }); it('... queryResult.subject is undefined or empty string', () => { - expectSpyCall(isQueryResultNotEmptySpy, 2, expectedQueryResult[0]); + expectSpyCall(isQueryResultNotEmptySpy, 3, expectedQueryResult[0]); // Mock undefined response const undefinedQueryResult = { @@ -949,7 +949,7 @@ describe('ConstructResultsComponent (DONE)', () => { component.queryResult$ = observableOf([undefinedQueryResult]); detectChangesOnPush(fixture); - expectSpyCall(isQueryResultNotEmptySpy, 3, undefinedQueryResult[0]); + expectSpyCall(isQueryResultNotEmptySpy, 4, undefinedQueryResult[0]); expectToBe(component.isQueryResultNotEmpty([undefinedQueryResult]), false); // Mock empty response @@ -961,12 +961,12 @@ describe('ConstructResultsComponent (DONE)', () => { component.queryResult$ = observableOf([emptyQueryResult]); detectChangesOnPush(fixture); - expectSpyCall(isQueryResultNotEmptySpy, 5, emptyQueryResult[0]); + expectSpyCall(isQueryResultNotEmptySpy, 6, emptyQueryResult[0]); expectToBe(component.isQueryResultNotEmpty([emptyQueryResult]), false); }); it('... queryResult.predicate is undefined or empty string', () => { - expectSpyCall(isQueryResultNotEmptySpy, 2, expectedQueryResult[0]); + expectSpyCall(isQueryResultNotEmptySpy, 3, expectedQueryResult[0]); // Mock undefined response const undefinedQueryResult = { @@ -977,7 +977,7 @@ describe('ConstructResultsComponent (DONE)', () => { component.queryResult$ = observableOf([undefinedQueryResult]); detectChangesOnPush(fixture); - expectSpyCall(isQueryResultNotEmptySpy, 3, undefinedQueryResult[0]); + expectSpyCall(isQueryResultNotEmptySpy, 4, undefinedQueryResult[0]); expectToBe(component.isQueryResultNotEmpty([undefinedQueryResult]), false); // Mock empty response @@ -989,12 +989,12 @@ describe('ConstructResultsComponent (DONE)', () => { component.queryResult$ = observableOf([emptyQueryResult]); detectChangesOnPush(fixture); - expectSpyCall(isQueryResultNotEmptySpy, 5, emptyQueryResult[0]); + expectSpyCall(isQueryResultNotEmptySpy, 6, emptyQueryResult[0]); expectToBe(component.isQueryResultNotEmpty([emptyQueryResult]), false); }); it('... queryResult.object is undefined or empty string', () => { - expectSpyCall(isQueryResultNotEmptySpy, 2, expectedQueryResult[0]); + expectSpyCall(isQueryResultNotEmptySpy, 3, expectedQueryResult[0]); // Mock undefined response const undefinedQueryResult = { @@ -1005,7 +1005,7 @@ describe('ConstructResultsComponent (DONE)', () => { component.queryResult$ = observableOf([undefinedQueryResult]); detectChangesOnPush(fixture); - expectSpyCall(isQueryResultNotEmptySpy, 3, undefinedQueryResult[0]); + expectSpyCall(isQueryResultNotEmptySpy, 4, undefinedQueryResult[0]); expectToBe(component.isQueryResultNotEmpty([undefinedQueryResult]), false); // Mock empty response @@ -1017,19 +1017,19 @@ describe('ConstructResultsComponent (DONE)', () => { component.queryResult$ = observableOf([emptyQueryResult]); detectChangesOnPush(fixture); - expectSpyCall(isQueryResultNotEmptySpy, 5, emptyQueryResult[0]); + expectSpyCall(isQueryResultNotEmptySpy, 6, emptyQueryResult[0]); expectToBe(component.isQueryResultNotEmpty([emptyQueryResult]), false); }); it('... queryResult.subject, queryResult.predicate and queryResult.object are undefined or empty string', () => { - expectSpyCall(isQueryResultNotEmptySpy, 2, expectedQueryResult[0]); + expectSpyCall(isQueryResultNotEmptySpy, 3, expectedQueryResult[0]); // Mock undefined response const undefinedQueryResult = { subject: undefined, predicate: undefined, object: undefined }; component.queryResult$ = observableOf([undefinedQueryResult]); detectChangesOnPush(fixture); - expectSpyCall(isQueryResultNotEmptySpy, 3, undefinedQueryResult[0]); + expectSpyCall(isQueryResultNotEmptySpy, 4, undefinedQueryResult[0]); expectToBe(component.isQueryResultNotEmpty([undefinedQueryResult]), false); // Mock empty response @@ -1037,13 +1037,13 @@ describe('ConstructResultsComponent (DONE)', () => { component.queryResult$ = observableOf([emptyQueryResult]); detectChangesOnPush(fixture); - expectSpyCall(isQueryResultNotEmptySpy, 5, emptyQueryResult[0]); + expectSpyCall(isQueryResultNotEmptySpy, 6, emptyQueryResult[0]); expectToBe(component.isQueryResultNotEmpty([emptyQueryResult]), false); }); }); it('... should return true if queryResult is not empty', () => { - expectSpyCall(isQueryResultNotEmptySpy, 2, expectedQueryResult[0]); + expectSpyCall(isQueryResultNotEmptySpy, 3, expectedQueryResult[0]); // Mock non-empty response const nonEmptyQueryResult = { @@ -1054,7 +1054,7 @@ describe('ConstructResultsComponent (DONE)', () => { component.queryResult$ = observableOf([nonEmptyQueryResult]); detectChangesOnPush(fixture); - expectSpyCall(isQueryResultNotEmptySpy, 3, nonEmptyQueryResult[0]); + expectSpyCall(isQueryResultNotEmptySpy, 4, nonEmptyQueryResult[0]); expectToBe(component.isQueryResultNotEmpty([nonEmptyQueryResult]), true); }); }); diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/select-results/select-results.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/select-results/select-results.component.spec.ts index 347b280bf..45fb179bb 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/select-results/select-results.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-detail/edition-graph/graph-visualizer/select-results/select-results.component.spec.ts @@ -668,11 +668,11 @@ describe('SelectResultsComponent (DONE)', () => { }); it('... should be triggered from ngbAccordionBody', () => { - expectSpyCall(isQueryResultNotEmptySpy, 2, expectedQueryResult[0]); + expectSpyCall(isQueryResultNotEmptySpy, 3, expectedQueryResult[0]); }); it('... should be triggered by change of queryResult', () => { - expectSpyCall(isQueryResultNotEmptySpy, 2, expectedQueryResult); + expectSpyCall(isQueryResultNotEmptySpy, 3, expectedQueryResult); // Mock another queryResult const queryResult = { @@ -683,48 +683,48 @@ describe('SelectResultsComponent (DONE)', () => { detectChangesOnPush(fixture); - expectSpyCall(isQueryResultNotEmptySpy, 3, queryResult); + expectSpyCall(isQueryResultNotEmptySpy, 4, queryResult); }); describe('... should return false if ...', () => { it('... queryResult.head is undefined', () => { - expectSpyCall(isQueryResultNotEmptySpy, 2, expectedQueryResult); + expectSpyCall(isQueryResultNotEmptySpy, 3, expectedQueryResult); // Mock undefined response const undefinedQueryResult = { head: undefined, body: { bindings: [{ test: 'Test' }] } }; component.queryResult$ = observableOf(undefinedQueryResult); detectChangesOnPush(fixture); - expectSpyCall(isQueryResultNotEmptySpy, 3, undefinedQueryResult); + expectSpyCall(isQueryResultNotEmptySpy, 4, undefinedQueryResult); expectToBe(component.isQueryResultNotEmpty(undefinedQueryResult), false); }); it('... queryResult.body is undefined', () => { - expectSpyCall(isQueryResultNotEmptySpy, 2, expectedQueryResult); + expectSpyCall(isQueryResultNotEmptySpy, 3, expectedQueryResult); // Mock undefined response const undefinedQueryResult = { head: { vars: ['Test'] }, body: undefined }; component.queryResult$ = observableOf(undefinedQueryResult); detectChangesOnPush(fixture); - expectSpyCall(isQueryResultNotEmptySpy, 3, undefinedQueryResult); + expectSpyCall(isQueryResultNotEmptySpy, 4, undefinedQueryResult); expectToBe(component.isQueryResultNotEmpty(undefinedQueryResult), false); }); it('... queryResult.head and queryResult.body are undefined', () => { - expectSpyCall(isQueryResultNotEmptySpy, 2, expectedQueryResult); + expectSpyCall(isQueryResultNotEmptySpy, 3, expectedQueryResult); // Mock undefined response const undefinedQueryResult = { head: undefined, body: undefined }; component.queryResult$ = observableOf(undefinedQueryResult); detectChangesOnPush(fixture); - expectSpyCall(isQueryResultNotEmptySpy, 3, undefinedQueryResult); + expectSpyCall(isQueryResultNotEmptySpy, 4, undefinedQueryResult); expectToBe(component.isQueryResultNotEmpty(undefinedQueryResult), false); }); it('... queryResult.head.vars is empty array', () => { - expectSpyCall(isQueryResultNotEmptySpy, 2, expectedQueryResult); + expectSpyCall(isQueryResultNotEmptySpy, 3, expectedQueryResult); // Mock empty response const emptyQueryResult = { head: { vars: [] }, body: { bindings: [{ testKey: 'TestValue' }] } }; @@ -732,12 +732,12 @@ describe('SelectResultsComponent (DONE)', () => { detectChangesOnPush(fixture); - expectSpyCall(isQueryResultNotEmptySpy, 3, emptyQueryResult); + expectSpyCall(isQueryResultNotEmptySpy, 4, emptyQueryResult); expectToBe(component.isQueryResultNotEmpty(emptyQueryResult), false); }); it('... queryResult.body.bindings is empty array', () => { - expectSpyCall(isQueryResultNotEmptySpy, 2, expectedQueryResult); + expectSpyCall(isQueryResultNotEmptySpy, 3, expectedQueryResult); // Mock empty response const emptyQueryResult = { head: { vars: ['TestHeader'] }, body: { bindings: [] } }; @@ -745,12 +745,12 @@ describe('SelectResultsComponent (DONE)', () => { detectChangesOnPush(fixture); - expectSpyCall(isQueryResultNotEmptySpy, 3, emptyQueryResult); + expectSpyCall(isQueryResultNotEmptySpy, 4, emptyQueryResult); expectToBe(component.isQueryResultNotEmpty(emptyQueryResult), false); }); it('... queryResult.head.vars & queryResult.body.bindings are empty arrays', () => { - expectSpyCall(isQueryResultNotEmptySpy, 2, expectedQueryResult); + expectSpyCall(isQueryResultNotEmptySpy, 3, expectedQueryResult); // Mock empty response const emptyQueryResult = { head: { vars: [] }, body: { bindings: [] } }; @@ -758,13 +758,13 @@ describe('SelectResultsComponent (DONE)', () => { detectChangesOnPush(fixture); - expectSpyCall(isQueryResultNotEmptySpy, 3, emptyQueryResult); + expectSpyCall(isQueryResultNotEmptySpy, 4, emptyQueryResult); expectToBe(component.isQueryResultNotEmpty(emptyQueryResult), false); }); }); it('... should return true if queryResult.head.vars && queryResult.body.bindings is not empty (length > 0)', () => { - expectSpyCall(isQueryResultNotEmptySpy, 2, expectedQueryResult); + expectSpyCall(isQueryResultNotEmptySpy, 3, expectedQueryResult); // Mock non-empty response const nonEmptyQueryResult = { @@ -774,7 +774,7 @@ describe('SelectResultsComponent (DONE)', () => { component.queryResult$ = observableOf(nonEmptyQueryResult); detectChangesOnPush(fixture); - expectSpyCall(isQueryResultNotEmptySpy, 3, nonEmptyQueryResult); + expectSpyCall(isQueryResultNotEmptySpy, 4, nonEmptyQueryResult); expectToBe(component.isQueryResultNotEmpty(nonEmptyQueryResult), true); }); }); From 176a5c299115478cdc4b77215407cf3e3effbe2a Mon Sep 17 00:00:00 2001 From: musicEnfanthen Date: Mon, 23 Dec 2024 19:26:10 +0100 Subject: [PATCH 3/3] build(app): update eslint rules --- eslint.config.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index a96653e00..f7c68d21d 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -81,12 +81,12 @@ export default typescriptEslint.config( rules: { '@angular-eslint/component-class-suffix': 'error', '@angular-eslint/directive-class-suffix': 'error', - '@angular-eslint/no-host-metadata-property': 'error', '@angular-eslint/no-input-rename': 'error', '@angular-eslint/no-inputs-metadata-property': 'error', '@angular-eslint/no-output-on-prefix': 'error', '@angular-eslint/no-output-rename': 'error', '@angular-eslint/no-outputs-metadata-property': 'error', + '@angular-eslint/prefer-standalone': 'off', '@angular-eslint/use-lifecycle-interface': 'error', '@angular-eslint/use-pipe-transform-interface': 'error', '@typescript-eslint/consistent-type-definitions': 'error',