Support for concat TOSCA function

Adds support for the concat TOSCA function in an instance property.
Refactors the TOSCA function structure so it can be more generic to
support other functions in the future.

Change-Id: I338e4138d26afe21779da57c4eeb3f2d486c20a9
Issue-ID: SDC-4095
Signed-off-by: andre.schmid <andre.schmid@est.tech>

1 files changed, 2 insertions, 43 deletions

diff --git a/catalog-ui/src/app/models/tosca-get-function-dto.ts b/catalog-ui/src/app/models/tosca-get-function-dto.ts
index b5ddad7b71..b16ae8be9a 100644
--- a/catalog-ui/src/app/models/tosca-get-function-dto.ts
+++ b/catalog-ui/src/app/models/tosca-get-function-dto.ts
@@ -21,8 +21,10 @@
 
 import {ToscaGetFunctionType} from './tosca-get-function-type';
 import {PropertySource} from './property-source';
+import {ToscaFunctionType} from "./tosca-function-type.enum";
 
 export class ToscaGetFunctionDto {
+    type: ToscaFunctionType;
     propertyUniqueId: string;
     propertyName: string;
     propertySource: PropertySource;
@@ -31,46 +33,3 @@ export class ToscaGetFunctionDto {
     functionType: ToscaGetFunctionType;
     propertyPathFromSource: Array<string>;
 }
-
-export class ToscaGetFunctionDtoBuilder {
-    toscaGetFunctionDto: ToscaGetFunctionDto = new ToscaGetFunctionDto();
-
-    withPropertyUniqueId(propertyUniqueId: string): ToscaGetFunctionDtoBuilder {
-        this.toscaGetFunctionDto.propertyUniqueId = propertyUniqueId;
-        return this;
-    }
-
-    withPropertyName(propertyName: string): ToscaGetFunctionDtoBuilder {
-        this.toscaGetFunctionDto.propertyName = propertyName;
-        return this;
-    }
-
-    withPropertySource(propertySource: PropertySource): ToscaGetFunctionDtoBuilder {
-        this.toscaGetFunctionDto.propertySource = propertySource;
-        return this;
-    }
-
-    withSourceUniqueId(sourceUniqueId: string): ToscaGetFunctionDtoBuilder {
-        this.toscaGetFunctionDto.sourceUniqueId = sourceUniqueId;
-        return this;
-    }
-
-    withSourceName(sourceName: string): ToscaGetFunctionDtoBuilder {
-        this.toscaGetFunctionDto.sourceName = sourceName;
-        return this;
-    }
-
-    withFunctionType(functionType: ToscaGetFunctionType): ToscaGetFunctionDtoBuilder {
-        this.toscaGetFunctionDto.functionType = functionType;
-        return this;
-    }
-
-    withPropertyPathFromSource(propertyPathFromSource: Array<string>): ToscaGetFunctionDtoBuilder {
-        this.toscaGetFunctionDto.propertyPathFromSource = propertyPathFromSource;
-        return this;
-    }
-
-    build(): ToscaGetFunctionDto {
-        return this.toscaGetFunctionDto;
-    }
-}