Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps(#3463): Bump Angular to v18 #3464

Merged
merged 4 commits into from
Feb 9, 2025
Merged

deps(#3463): Bump Angular to v18 #3464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc90067
deps(#3463): Bump Angular to v18
dominikriemer Feb 7, 2025
08e77c5
Fix linting
dominikriemer Feb 7, 2025
eca4bb8
Fix tree node component
dominikriemer Feb 7, 2025
1db713c
Update tree component
dominikriemer Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13,090 changes: 6,639 additions & 6,451 deletions ui/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

68 changes: 34 additions & 34 deletions ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,29 +29,29 @@
"prepare": "cd ../ && husky install ./ui/.husky"
},
"dependencies": {
"@ali-hm/angular-tree-component": "12.0.5",
"@angular-architects/native-federation": "^17.1.8",
"@angular/animations": "^17.3.3",
"@angular/cdk": "^17.3.3",
"@angular/common": "^17.3.3",
"@angular/compiler": "^17.3.3",
"@angular/core": "^17.3.3",
"@angular/forms": "^17.3.3",
"@angular/material": "^17.3.3",
"@angular/platform-browser": "^17.3.3",
"@angular/platform-browser-dynamic": "^17.3.3",
"@angular/router": "^17.3.3",
"@asymmetrik/ngx-leaflet": "^17.0.0",
"@ali-hm/angular-tree-component": "18.0.5",
"@angular-architects/native-federation": "^18.2.7",
"@angular/animations": "^18.2.13",
"@angular/cdk": "^18.2.14",
"@angular/common": "^18.2.13",
"@angular/compiler": "^18.2.13",
"@angular/core": "^18.2.13",
"@angular/forms": "^18.2.13",
"@angular/material": "^18.2.14",
"@angular/platform-browser": "^18.2.13",
"@angular/platform-browser-dynamic": "^18.2.13",
"@angular/router": "^18.2.13",
"@bluehalo/ngx-leaflet": "18.0.2",
"@auth0/angular-jwt": "^5.2.0",
"@ctrl/ngx-codemirror": "7.0.0",
"@fortawesome/fontawesome-free": "6.5.1",
"@jsplumb/browser-ui": "^6.2.10",
"@ngbracket/ngx-layout": "^17.0.1",
"@ngbracket/ngx-layout": "^18.0.0",
"@ngx-loading-bar/core": "6.0.2",
"@ngx-loading-bar/http-client": "6.0.2",
"@panzoom/panzoom": "^4.5.1",
"@swimlane/ngx-charts": "^20.5.0",
"angular-gridster2": "^17.0.0",
"angular-gridster2": "^18.0.1",
"codemirror": "^5.65.11",
"console-browserify": "^1.2.0",
"d3-array": "^3.2.4",
Expand All @@ -71,28 +71,28 @@
"lodash": "4.17.21",
"marked": "^9.0.0",
"material-icons": "^1.13.1",
"ngx-color-picker": "^14.0.0",
"ngx-echarts": "^17.1.0",
"ngx-markdown": "17.2.0",
"ngx-quill": "^24.0.4",
"quill": "1.3.7",
"ngx-color-picker": "^17.0.0",
"ngx-echarts": "^18.0.0",
"ngx-markdown": "18.1.0",
"ngx-quill": "26.0.10",
"quill": "^2.0.3",
"roboto-fontface": "0.10.0",
"rxjs": "^7.8.0",
"shepherd.js": "^11.2.0",
"stream-browserify": "3.0.0",
"swagger-ui-dist": "5.15.1",
"tslib": "^2.6.2",
"zone.js": "~0.14.4"
"zone.js": "~0.14.10"
},
"devDependencies": {
"@angular-devkit/build-angular": "^17.3.3",
"@angular-eslint/builder": "17.3.0",
"@angular-eslint/eslint-plugin": "^17.3.0",
"@angular-eslint/eslint-plugin-template": "^17.3.0",
"@angular-eslint/schematics": "^17.3.0",
"@angular-eslint/template-parser": "^17.3.0",
"@angular/cli": "^17.3.3",
"@angular/compiler-cli": "^17.3.3",
"@angular-devkit/build-angular": "^18.2.14",
"@angular-eslint/builder": "18.4.3",
"@angular-eslint/eslint-plugin": "^18.4.3",
"@angular-eslint/eslint-plugin-template": "^18.4.3",
"@angular-eslint/schematics": "^18.4.3",
"@angular-eslint/template-parser": "^18.4.3",
"@angular/cli": "^18.2.14",
"@angular/compiler-cli": "^18.2.13",
"@types/angular": "^1.8.4",
"@types/jasmine": "~5.1.0",
"@types/jqueryui": "^1.12.16",
Expand All @@ -101,15 +101,15 @@
"@types/node": "^20.12.5",
"@types/rx": "^4.1.2",
"@types/showdown": "2.0.6",
"@typescript-eslint/eslint-plugin": "5.62.0",
"@typescript-eslint/parser": "5.62.0",
"@typescript-eslint/eslint-plugin": "8.15.0",
"@typescript-eslint/parser": "8.15.0",
"ajv-keywords": "^5.1.0",
"assert": "^2.1.0",
"csv-string": "^4.1.1",
"cypress": "^13.6.2",
"cypress-file-upload": "^5.0.8",
"eslint": "8.57.0",
"eslint-config-prettier": "^9.0.0",
"eslint": "9.19.0",
"eslint-config-prettier": "^10.0.1",
"husky": "^8.0.2",
"jasmine-core": "^5.1.1",
"js-yaml": "^4.1.0",
Expand All @@ -123,7 +123,7 @@
"lint-staged": "^15.2.0",
"mustache": "^4.2.0",
"ng-lint-staged": "^12.0.4",
"ng-packagr": "^17.3.0",
"ng-packagr": "^18.2.1",
"path": "^0.12.7",
"prettier": "3.2.5",
"resize-observer-polyfill": "^1.5.1",
Expand Down
8 changes: 4 additions & 4 deletions ui/projects/streampipes/platform-services/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"name": "@streampipes/platform-services",
"version": "0.0.1",
"peerDependencies": {
"@angular/common": "^17.3.3",
"@angular/core": "^17.3.3",
"rxjs": "^7.5.7",
"angular-gridster2": "^17.0.0"
"@angular/common": "^18.2.13",
"@angular/core": "^18.2.13",
"rxjs": "^7.8.0",
"angular-gridster2": "^18.0.1"
},
"dependencies": {
"tslib": "^2.6.2"
Expand Down
12 changes: 10 additions & 2 deletions ui/projects/streampipes/platform-services/src/lib/apis/pipeline.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,14 @@
import { TestBed } from '@angular/core/testing';
import { PipelineService } from './pipeline.service';
import {
HttpClientTestingModule,
HttpTestingController,
provideHttpClientTesting,
} from '@angular/common/http/testing';
import { Pipeline } from '../model/gen/streampipes-model';
import {
provideHttpClient,
withInterceptorsFromDi,
} from '@angular/common/http';

describe('PipelineService', () => {
const mockPath = 'mock';
Expand All @@ -31,7 +35,11 @@ describe('PipelineService', () => {

beforeEach(() => {
TestBed.configureTestingModule({
imports: [HttpClientTestingModule],
imports: [],
providers: [
provideHttpClient(withInterceptorsFromDi()),
provideHttpClientTesting(),
],
});
httpMock = TestBed.inject(HttpTestingController);
pipelineService = TestBed.inject(PipelineService);
Expand Down
16 changes: 8 additions & 8 deletions ui/projects/streampipes/shared-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"name": "@streampipes/shared-ui",
"version": "0.0.1",
"peerDependencies": {
"@angular/animations": "^17.3.3",
"@angular/cdk": "^17.3.3",
"@angular/common": "^17.3.3",
"@angular/core": "^17.3.3",
"@ngbracket/ngx-layout": "^17.0.1",
"@angular/material": "^17.3.3",
"@angular/router": "^17.3.3",
"@angular/animations": "^18.2.13",
"@angular/cdk": "^18.2.14",
"@angular/common": "^18.2.13",
"@angular/core": "^18.2.13",
"@ngbracket/ngx-layout": "^18.0.0",
"@angular/material": "^18.2.14",
"@angular/router": "^18.2.13",
"@streampipes/platform-services": "0.0.1",
"rxjs": "^7.5.7",
"rxjs": "^7.8.0",
"date-fns": "^3.6.0"
},
"dependencies": {
Expand Down
16 changes: 8 additions & 8 deletions ...ation/service-configs/service-configs-password/service-configs-password.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import { DebugElement } from '@angular/core';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { provideHttpClientTesting } from '@angular/common/http/testing';
import { ServiceConfigsPasswordComponent } from './service-configs-password.component';
import { ConfigurationService } from '../../../../shared/configuration.service';
import { CommonModule } from '@angular/common';
Expand All @@ -32,6 +32,10 @@ import { MatButtonModule } from '@angular/material/button';
import { MatInputModule } from '@angular/material/input';
import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatTooltipModule } from '@angular/material/tooltip';
import {
provideHttpClient,
withInterceptorsFromDi,
} from '@angular/common/http';

describe('ServiceConfigsPasswordComponent', () => {
let fixture: ComponentFixture<ServiceConfigsPasswordComponent>;
Expand All @@ -40,8 +44,6 @@ describe('ServiceConfigsPasswordComponent', () => {

let component: ServiceConfigsPasswordComponent;

let configurationServcie: ConfigurationService;

beforeEach(waitForAsync(() => {
configurationServiceStub = {
adjustConfigurationKey(key) {
Expand All @@ -55,6 +57,7 @@ describe('ServiceConfigsPasswordComponent', () => {
};

TestBed.configureTestingModule({
declarations: [ServiceConfigsPasswordComponent],
imports: [
CommonModule,
BrowserAnimationsModule,
Expand All @@ -66,22 +69,19 @@ describe('ServiceConfigsPasswordComponent', () => {
MatCheckboxModule,
MatTooltipModule,
FormsModule,
HttpClientTestingModule,
],
declarations: [ServiceConfigsPasswordComponent],
providers: [
{
provide: ConfigurationService,
useValue: configurationServiceStub,
},
provideHttpClient(withInterceptorsFromDi()),
provideHttpClientTesting(),
],
}).compileComponents();

fixture = TestBed.createComponent(ServiceConfigsPasswordComponent);

configurationServcie =
fixture.debugElement.injector.get(ConfigurationService);

component = fixture.componentInstance;
}));

Expand Down
14 changes: 11 additions & 3 deletions ui/src/app/configuration/shared/configuration.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,15 @@

import { getTestBed, TestBed } from '@angular/core/testing';
import {
HttpClientTestingModule,
HttpTestingController,
provideHttpClientTesting,
} from '@angular/common/http/testing';
import { ConfigurationService } from './configuration.service';
import { SpServiceConfiguration } from '../../../../projects/streampipes/platform-services/src/lib/model/gen/streampipes-model';
import {
provideHttpClient,
withInterceptorsFromDi,
} from '@angular/common/http';

describe('ConfigurationService', () => {
let injector: TestBed;
Expand All @@ -31,8 +35,12 @@ describe('ConfigurationService', () => {

beforeEach(() => {
TestBed.configureTestingModule({
imports: [HttpClientTestingModule],
providers: [ConfigurationService],
imports: [],
providers: [
ConfigurationService,
provideHttpClient(withInterceptorsFromDi()),
provideHttpClientTesting(),
],
});
injector = getTestBed();
service = injector.get(ConfigurationService);
Expand Down
4 changes: 2 additions & 2 deletions ui/src/app/configuration/shared/configuration.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export class ConfigurationService {

updateExtensionsServiceConfigs(
config: SpServiceConfiguration,
): Observable<Object> {
): Observable<object> {
return this.http.put(
this.getServerUrl() +
`/api/v2/extensions-services-configurations/${config.serviceGroup}`,
Expand All @@ -93,7 +93,7 @@ export class ConfigurationService {

updateMessagingSettings(
messagingSettings: MessagingSettings,
): Observable<Object> {
): Observable<object> {
return this.http.post(
this.getServerUrl() + '/api/v2/messaging',
messagingSettings,
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/core-ui/core-ui.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ import { StaticTreeInputSelectedNodesComponent } from './static-properties/stati
import { StaticTreeInputBrowseNodesComponent } from './static-properties/static-runtime-resolvable-tree-input/static-tree-input-browse-nodes/static-tree-input-browse-nodes.component';
import { StaticTreeInputNodeDetailsComponent } from './static-properties/static-runtime-resolvable-tree-input/static-tree-input-node-details/static-tree-input-node-details.component';
import { SingleMarkerMapComponent } from './single-marker-map/single-marker-map.component';
import { LeafletModule } from '@asymmetrik/ngx-leaflet';
import { LeafletModule } from '@bluehalo/ngx-leaflet';
import { StaticTreeInputTextEditorComponent } from './static-properties/static-runtime-resolvable-tree-input/static-tree-input-text-editor/static-tree-input-text-editor.component';
import { PipelineElementTemplateConfigItemComponent } from './pipeline-element-template-config/pipeline-element-template-config-item/pipeline-element-template-config-item.component';
import { ConfigurationCodePanelComponent } from './configuration-code-panel/configuration-code-panel.component';
Expand Down
4 changes: 3 additions & 1 deletion ui/src/app/core-ui/object-permission-dialog/object-permission-dialog.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,9 @@ export class ObjectPermissionDialogComponent implements OnInit {

private addUserToSelection(authority: PermissionEntry) {
const user = this.allUsers.find(u => u.principalId === authority.sid);
user && this.grantedUserAuthorities.push(user);
if (user !== undefined) {
this.grantedUserAuthorities.push(user);
}
}

private addGroupToSelection(authority: PermissionEntry) {
Expand Down
10 changes: 6 additions & 4 deletions ui/src/app/core-ui/static-properties/static-code-input/static-code-input.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,12 @@ export class StaticCodeInputComponent
}

applyLanguage() {
this.staticProperty.language === 'None'
? (this.editorOptions.mode = '')
: (this.editorOptions.mode =
this.staticProperty.language.toLowerCase());
if (this.staticProperty.language === 'None') {
this.editorOptions.mode = '';
} else {
this.editorOptions.mode =
this.staticProperty.language.toLowerCase();
}
}

ngAfterViewInit() {
Expand Down
16 changes: 10 additions & 6 deletions ui/src/app/core-ui/static-properties/static-property-util.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,11 @@ export class StaticPropertyUtilService {
val instanceof RuntimeResolvableAnyStaticProperty ||
val instanceof RuntimeResolvableOneOfStaticProperty
) {
val instanceof RuntimeResolvableAnyStaticProperty
? (clone = new RuntimeResolvableAnyStaticProperty())
: (clone = new RuntimeResolvableOneOfStaticProperty());
if (val instanceof RuntimeResolvableAnyStaticProperty) {
clone = new RuntimeResolvableAnyStaticProperty();
} else {
clone = new RuntimeResolvableOneOfStaticProperty();
}

clone.elementId = id;
clone.dependsOn = val.dependsOn;
Expand All @@ -167,9 +169,11 @@ export class StaticPropertyUtilService {
val instanceof AnyStaticProperty ||
val instanceof OneOfStaticProperty
) {
val instanceof AnyStaticProperty
? (clone = new AnyStaticProperty())
: (clone = new OneOfStaticProperty());
if (val instanceof AnyStaticProperty) {
clone = new AnyStaticProperty();
} else {
clone = new OneOfStaticProperty();
}

clone.elementId = id;
clone.options = val.options.map(option => this.cloneOption(option));
Expand Down
2 changes: 1 addition & 1 deletion ...es/static-runtime-resolvable-tree-input/static-runtime-resolvable-tree-input.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export class StaticRuntimeResolvableTreeInputComponent
) {
if (
staticProperty.latestFetchedNodes &&
staticProperty.latestFetchedNodes.length > 0
staticProperty.nextBaseNodeToResolve !== null
) {
this.latestFetchedNodes = staticProperty.latestFetchedNodes;
if (node) {
Expand Down
Loading
Loading