From bc638c7c4e3ae3faef865c153e9aeda8dc8aaee2 Mon Sep 17 00:00:00 2001 From: Lukas Harzenetter Date: Mon, 16 Jan 2023 14:30:24 +0100 Subject: [PATCH] fix Dockerfile --- Dockerfile.cli | 4 ++-- .../src/app/services/multi-participants.service.ts | 2 +- .../sharedComponents/interfaces/interfaces.component.ts | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile.cli b/Dockerfile.cli index 07ca96e590..c1ebabb650 100644 --- a/Dockerfile.cli +++ b/Dockerfile.cli @@ -1,5 +1,5 @@ -FROM openjdk:17 -LABEL maintainer "Oliver Kopp , Lukas Harzenetter " +FROM openjdk:17-bullseye +LABEL maintainer = "Oliver Kopp , Lukas Harzenetter " RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash RUN apt-get update && apt-get install -y git git-lfs diff --git a/org.eclipse.winery.frontends/app/topologymodeler/src/app/services/multi-participants.service.ts b/org.eclipse.winery.frontends/app/topologymodeler/src/app/services/multi-participants.service.ts index fc33cf8dea..0abc9d4c3c 100644 --- a/org.eclipse.winery.frontends/app/topologymodeler/src/app/services/multi-participants.service.ts +++ b/org.eclipse.winery.frontends/app/topologymodeler/src/app/services/multi-participants.service.ts @@ -46,7 +46,7 @@ export class MultiParticipantsService { + '/' + encodeURIComponent(this.backendService.configuration.id) + '/placeholdersubstitution'; - console.log(url); + return this.httpClient.post( url, { headers: this.httpHeaders, observe: 'response', responseType: 'json' } diff --git a/org.eclipse.winery.frontends/app/tosca-management/src/app/instance/sharedComponents/interfaces/interfaces.component.ts b/org.eclipse.winery.frontends/app/tosca-management/src/app/instance/sharedComponents/interfaces/interfaces.component.ts index 73789b9041..f1c5c79a4f 100644 --- a/org.eclipse.winery.frontends/app/tosca-management/src/app/instance/sharedComponents/interfaces/interfaces.component.ts +++ b/org.eclipse.winery.frontends/app/tosca-management/src/app/instance/sharedComponents/interfaces/interfaces.component.ts @@ -291,6 +291,7 @@ export class InterfacesComponent implements OnInit { this.interfacesData.push(lifecycle); this.interfaceComponent.selectItem(lifecycle); } + containsDefaultLifecycle(): boolean { if (this.sharedData.currentVersion.editable) { if (this.interfacesData === null || this.interfacesData === undefined) { @@ -321,6 +322,7 @@ export class InterfacesComponent implements OnInit { ); } } + checkArtifactTemplateExists(): void { if (!this.generateArtifactApiData.artifactTemplateNamespace.endsWith('/')) { this.existService.check(backendBaseURL + '/artifacttemplates/' @@ -416,6 +418,7 @@ export class InterfacesComponent implements OnInit { this.interfacesData = data ? data : []; } + private handleInheritedInterfaceData(data: InheritedInterface[]) { this.inheritedInterfacesData = data ? data : []; @@ -443,7 +446,6 @@ export class InterfacesComponent implements OnInit { } private handleError(error: HttpErrorResponse) { - console.log(error); this.generating = false; this.notify.error(error.error); } @@ -453,7 +455,7 @@ export class InterfacesComponent implements OnInit { this.generateArtifactApiData.artifactTemplateName = this.generateArtifactApiData.artifactName = this.artifactTemplate.name; this.generateArtifactApiData.artifactTemplateNamespace = this.artifactTemplate.namespace; this.generateArtifactApiData.artifactType = this.artifactTemplate.artifactTypeQName; - console.log(this.generateArtifactApiData); + this.service.createArtifactTemplate(this.implementation.name, this.implementation.namespace, this.generateArtifactApiData) .subscribe( (response) => this.handleGeneratedArtifact(response),