From 221583a9cb33012d0d3692adbbf6da8ddf92a30e Mon Sep 17 00:00:00 2001 From: Lukasz Lopatowski <llopat@man.poznan.pl> Date: Wed, 7 Apr 2021 15:55:43 +0200 Subject: [PATCH] Passing termsAcceptance as part of app configuration --- build.gradle | 2 +- build_and_publish.sh | 2 +- .../appinstance/appinstance/appinstance.component.ts | 7 +++++++ src/app/model/app-configuration.ts | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 124a7136..67c369db 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id "org.sonarqube" version "3.0" } -version = '1.4.1' +version = '1.4.2-SNAPSHOT' task buildGUI(type: Exec) { println 'Building using Angular CLI' diff --git a/build_and_publish.sh b/build_and_publish.sh index 0255c56f..50c0deaf 100644 --- a/build_and_publish.sh +++ b/build_and_publish.sh @@ -1,6 +1,6 @@ #!/bin/bash -TAG=1.4.1 +TAG=1.4.2 PACKAGE=nmaas-portal REPOSITORY=artifactory.geant.net/nmaas-docker-local sudo docker build --rm -t $REPOSITORY/$PACKAGE:$TAG -f ./Dockerfile .. diff --git a/src/app/appmarket/appinstance/appinstance/appinstance.component.ts b/src/app/appmarket/appinstance/appinstance/appinstance.component.ts index 79f69fc0..65068cfc 100644 --- a/src/app/appmarket/appinstance/appinstance/appinstance.component.ts +++ b/src/app/appmarket/appinstance/appinstance/appinstance.component.ts @@ -362,6 +362,12 @@ export class AppInstanceComponent implements OnInit, OnDestroy { } } + public changeTermsAcceptance(termsAcceptance: any): void { + if (termsAcceptance != null) { + this.appConfiguration.termsAcceptance = termsAcceptance; + } + } + public changeConfiguration(configuration: any): void { if (configuration != null) { this.appConfiguration.jsonInput = configuration; @@ -376,6 +382,7 @@ export class AppInstanceComponent implements OnInit, OnDestroy { this.changeAdditionalParameters(input['additionalParameters']); this.changeConfiguration(input['configuration']); this.changeAccessCredentials(input['accessCredentials']); + this.changeTermsAcceptance(input['termsAcceptance']); if (this.appConfiguration.jsonInput == null) { this.appConfiguration.jsonInput = {}; } diff --git a/src/app/model/app-configuration.ts b/src/app/model/app-configuration.ts index 2fa89d90..a7c63f8b 100644 --- a/src/app/model/app-configuration.ts +++ b/src/app/model/app-configuration.ts @@ -3,5 +3,6 @@ export class AppConfiguration { public additionalParameters: any; public mandatoryParameters: any; public accessCredentials: any; + public termsAcceptance: any; public storageSpace: number; } -- GitLab