Update Interface definition on VFC

Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
Change-Id: I13678c92ae6088016a78554ffaf0da47b82f7e65
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3893
Signed-off-by: andre.schmid <andre.schmid@est.tech>

2 files changed, 182 insertions, 152 deletions

diff --git a/catalog-ui/src/app/ng2/services/component-services/component.service.ts b/catalog-ui/src/app/ng2/services/component-services/component.service.ts
index 8f23f78c9d..8d91eede84 100644
--- a/catalog-ui/src/app/ng2/services/component-services/component.service.ts
+++ b/catalog-ui/src/app/ng2/services/component-services/component.service.ts
@@ -19,32 +19,40 @@
  */
 
 import * as _ from "lodash";
-import {Injectable, Inject} from '@angular/core';
+import {Inject, Injectable} from '@angular/core';
 import {Observable} from 'rxjs/Observable';
 import 'rxjs/add/operator/map';
 import 'rxjs/add/operator/toPromise';
-import { Component, InputBEModel, InstancePropertiesAPIMap, FilterPropertiesAssignmentData, OperationModel, CreateOperationResponse, ArtifactModel} from "app/models";
-import {COMPONENT_FIELDS} from "app/utils";
+import {
+    Component,
+    FilterPropertiesAssignmentData,
+    InputBEModel,
+    InstancePropertiesAPIMap,
+    OperationModel
+} from "app/models";
+import {API_QUERY_PARAMS, COMPONENT_FIELDS} from "app/utils";
 import {ComponentGenericResponse} from "../responses/component-generic-response";
 import {InstanceBePropertiesMap} from "../../../models/properties-inputs/property-fe-map";
-import {API_QUERY_PARAMS} from "app/utils";
 import {ComponentType, ServerTypeUrl, SERVICE_FIELDS} from "../../../utils/constants";
-import {SdcConfigToken, ISdcConfig} from "../../config/sdc-config.config";
+import {ISdcConfig, SdcConfigToken} from "../../config/sdc-config.config";
 import {IDependenciesServerResponse} from "../responses/dependencies-server-response";
 import {AutomatedUpgradeGenericResponse} from "../responses/automated-upgrade-response";
 import {IAutomatedUpgradeRequestObj} from "../../pages/automated-upgrade/automated-upgrade.service";
 import {ComponentInstance} from "../../../models/componentsInstances/componentInstance";
 import {CommonUtils} from "../../../utils/common-utils";
-import {RelationshipModel} from "../../../models/graph/relationship";
-import { HttpClient, HttpParams, HttpHeaders } from "@angular/common/http";
-import { BEOperationModel, InterfaceModel } from "../../../models/operation";
-import { PropertyBEModel } from "../../../models/properties-inputs/property-be-model";
-import { PolicyInstance } from "../../../models/graph/zones/policy-instance";
-import { ConstraintObject } from "../../components/logic/service-dependencies/service-dependencies.component";
-import { Requirement } from "../../../models/requirement";
-import { Capability } from "../../../models/capability";
-import { OutputBEModel } from "app/models/attributes-outputs/output-be-model";
-import { HttpHelperService } from '../http-hepler.service';
+import {HttpClient, HttpHeaders, HttpParams} from "@angular/common/http";
+import {BEOperationModel, InterfaceModel} from "../../../models/operation";
+import {PropertyBEModel} from "../../../models/properties-inputs/property-be-model";
+import {PolicyInstance} from "../../../models/graph/zones/policy-instance";
+import {
+    ConstraintObject
+} from "../../components/logic/service-dependencies/service-dependencies.component";
+import {OutputBEModel} from "app/models/attributes-outputs/output-be-model";
+import {HttpHelperService} from '../http-hepler.service';
+import {
+    BEInterfaceOperationModel,
+    InterfaceOperationModel
+} from "../../../models/interfaceOperation";
 
 /*
 PLEASE DO NOT USE THIS SERVICE IN ANGULAR2! Use the topology-template.service instead
@@ -54,23 +62,24 @@ export class ComponentServiceNg2 {
 
     protected baseUrl;
 
-    constructor(protected http: HttpClient, @Inject(SdcConfigToken) sdcConfig:ISdcConfig) {
+    constructor(protected http: HttpClient, @Inject(SdcConfigToken) sdcConfig: ISdcConfig) {
         this.baseUrl = sdcConfig.api.root + sdcConfig.api.component_api_root;
     }
 
-    protected getComponentDataByFieldsName(componentType:string, componentId:string, fields:Array<string>):Observable<ComponentGenericResponse> {
+    protected getComponentDataByFieldsName(componentType: string, componentId: string, fields: Array<string>): Observable<ComponentGenericResponse> {
 
         let params: HttpParams = new HttpParams();
-        fields.forEach((field:string):void => {
+        fields.forEach((field: string): void => {
             params = params.append(API_QUERY_PARAMS.INCLUDE, field);
         });
 
         return this.http.get<ComponentGenericResponse>(this.baseUrl + this.getServerTypeUrl(componentType) + componentId + '/filteredDataByParams', {params: params})
-            .map((res) => {
-                return new ComponentGenericResponse().deserialize(res);
-            });
+        .map((res) => {
+            return new ComponentGenericResponse().deserialize(res);
+        });
     }
-    protected getServerTypeUrl = (componentType:string):string => {
+
+    protected getServerTypeUrl = (componentType: string): string => {
         switch (componentType) {
             case ComponentType.SERVICE:
                 return ServerTypeUrl.SERVICES;
@@ -79,84 +88,83 @@ export class ComponentServiceNg2 {
         }
     }
 
-    getFullComponent(uniqueId:string):Observable<ComponentGenericResponse> {
+    getFullComponent(uniqueId: string): Observable<ComponentGenericResponse> {
         return this.http.get<ComponentGenericResponse>(this.baseUrl + uniqueId)
-            .map((res) => {
-                return new ComponentGenericResponse().deserialize(res);
-            });
+        .map((res) => {
+            return new ComponentGenericResponse().deserialize(res);
+        });
     }
 
-    getComponentMetadata(uniqueId:string, type:string):Observable<ComponentGenericResponse> {
+    getComponentMetadata(uniqueId: string, type: string): Observable<ComponentGenericResponse> {
         return this.getComponentDataByFieldsName(type, uniqueId, [COMPONENT_FIELDS.COMPONENT_METADATA]);
     }
 
-
-    getComponentInstanceAttributesAndProperties(component:Component):Observable<ComponentGenericResponse> {
+    getComponentInstanceAttributesAndProperties(component: Component): Observable<ComponentGenericResponse> {
         return this.getComponentDataByFieldsName(component.componentType, component.uniqueId, [COMPONENT_FIELDS.COMPONENT_INSTANCES_PROPERTIES, COMPONENT_FIELDS.COMPONENT_INSTANCES_ATTRIBUTES]);
     }
 
-    getComponentInstanceProperties(component:Component): Observable<ComponentGenericResponse> {
+    getComponentInstanceProperties(component: Component): Observable<ComponentGenericResponse> {
         return this.getComponentDataByFieldsName(component.componentType, component.uniqueId, [COMPONENT_FIELDS.COMPONENT_INSTANCES_PROPERTIES]);
     }
 
-    getComponentAttributes(component:Component):Observable<ComponentGenericResponse> {
+    getComponentAttributes(component: Component): Observable<ComponentGenericResponse> {
         return this.getComponentDataByFieldsName(component.componentType, component.uniqueId, [COMPONENT_FIELDS.COMPONENT_ATTRIBUTES]);
     }
 
-    getComponentCompositionData(component:Component):Observable<ComponentGenericResponse> {
+    getComponentCompositionData(component: Component): Observable<ComponentGenericResponse> {
         return this.getComponentDataByFieldsName(component.componentType, component.uniqueId, [COMPONENT_FIELDS.COMPONENT_INSTANCES_RELATION, COMPONENT_FIELDS.COMPONENT_INSTANCES, COMPONENT_FIELDS.COMPONENT_NON_EXCLUDED_POLICIES, COMPONENT_FIELDS.COMPONENT_NON_EXCLUDED_GROUPS]);
     }
 
-    getComponentResourcePropertiesData(component:Component):Observable<ComponentGenericResponse> {
+    getComponentResourcePropertiesData(component: Component): Observable<ComponentGenericResponse> {
         return this.getComponentDataByFieldsName(component.componentType, component.uniqueId, [COMPONENT_FIELDS.COMPONENT_INSTANCES, COMPONENT_FIELDS.COMPONENT_POLICIES, COMPONENT_FIELDS.COMPONENT_NON_EXCLUDED_GROUPS]);
     }
 
-    getComponentResourceAttributesData(component:Component):Observable<ComponentGenericResponse> {
+    getComponentResourceAttributesData(component: Component): Observable<ComponentGenericResponse> {
         return this.getComponentDataByFieldsName(component.componentType, component.uniqueId, [COMPONENT_FIELDS.COMPONENT_INSTANCES, COMPONENT_FIELDS.COMPONENT_NON_EXCLUDED_GROUPS]);
     }
 
-    getComponentResourceInstances(component:Component):Observable<ComponentGenericResponse> {
+    getComponentResourceInstances(component: Component): Observable<ComponentGenericResponse> {
         return this.getComponentDataByFieldsName(component.componentType, component.uniqueId, [COMPONENT_FIELDS.COMPONENT_INSTANCES]);
     }
 
-    getComponentInputs(component:Component):Observable<ComponentGenericResponse> {
+    getComponentInputs(component: Component): Observable<ComponentGenericResponse> {
         return this.getComponentDataByFieldsName(component.componentType, component.uniqueId, [COMPONENT_FIELDS.COMPONENT_INPUTS]);
     }
 
-    getComponentInputsWithProperties(component:Component):Observable<ComponentGenericResponse> {
+    getComponentInputsWithProperties(component: Component): Observable<ComponentGenericResponse> {
         return this.getComponentDataByFieldsName(component.componentType, component.uniqueId, [COMPONENT_FIELDS.COMPONENT_INPUTS, COMPONENT_FIELDS.COMPONENT_INSTANCES, COMPONENT_FIELDS.COMPONENT_INSTANCES_PROPERTIES, COMPONENT_FIELDS.COMPONENT_PROPERTIES]);
     }
 
-    getComponentDeploymentArtifacts(component:Component):Observable<ComponentGenericResponse> {
+    getComponentDeploymentArtifacts(component: Component): Observable<ComponentGenericResponse> {
         return this.getComponentDataByFieldsName(component.componentType, component.uniqueId, [COMPONENT_FIELDS.COMPONENT_DEPLOYMENT_ARTIFACTS]);
     }
 
-    getComponentInformationalArtifacts(component:Component):Observable<ComponentGenericResponse> {
+    getComponentInformationalArtifacts(component: Component): Observable<ComponentGenericResponse> {
         return this.getComponentDataByFieldsName(component.componentType, component.uniqueId, [COMPONENT_FIELDS.COMPONENT_INFORMATIONAL_ARTIFACTS]);
     }
 
-    getComponentInformationalArtifactsAndInstances(component:Component):Observable<ComponentGenericResponse> {
+    getComponentInformationalArtifactsAndInstances(component: Component): Observable<ComponentGenericResponse> {
         return this.getComponentDataByFieldsName(component.componentType, component.uniqueId, [COMPONENT_FIELDS.COMPONENT_INFORMATIONAL_ARTIFACTS, COMPONENT_FIELDS.COMPONENT_INSTANCES]);
     }
 
-    getComponentToscaArtifacts(component:Component):Observable<ComponentGenericResponse> {
+    getComponentToscaArtifacts(component: Component): Observable<ComponentGenericResponse> {
         return this.getComponentDataByFieldsName(component.componentType, component.uniqueId, [COMPONENT_FIELDS.COMPONENT_TOSCA_ARTIFACTS]);
     }
 
-    getComponentProperties(component:Component):Observable<ComponentGenericResponse> {
+    getComponentProperties(component: Component): Observable<ComponentGenericResponse> {
         return this.getComponentDataByFieldsName(component.componentType, component.uniqueId, [COMPONENT_FIELDS.COMPONENT_PROPERTIES]);
     }
 
-    getInterfaceOperations(component:Component):Observable<ComponentGenericResponse> {
+    getInterfaceOperations(component: Component): Observable<ComponentGenericResponse> {
         return this.getComponentDataByFieldsName(component.componentType, component.uniqueId, [COMPONENT_FIELDS.COMPONENT_INTERFACE_OPERATIONS]);
     }
 
-    getInterfaceOperation(component:Component, operation:OperationModel):Observable<OperationModel> {
+    getInterfaceOperation(component: Component, operation: OperationModel): Observable<OperationModel> {
         return this.http.get<OperationModel>(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/interfaceOperations/' + operation.uniqueId);
     }
 
     // tslint:disable-next-line:member-ordering
-    createInterfaceOperation(component:Component, operation:OperationModel):Observable<OperationModel> {
+    createInterfaceOperation(component: Component, operation: OperationModel): Observable<OperationModel> {
         const operationList = {
             'interfaces': {
                 [operation.interfaceType]: {
@@ -168,20 +176,20 @@ export class ComponentServiceNg2 {
             }
         };
         return this.http.post<any>(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/interfaceOperations', operationList)
-            .map((res:any) => {
-                const interf:InterfaceModel = _.find(res.interfaces, interf => interf.type === operation.interfaceType);
-                const newOperation:OperationModel = _.find(interf.operations, op => op.name === operation.name);
-                return new OperationModel({
-                    ...newOperation,
-                    interfaceType: interf.type,
-                    interfaceId: interf.uniqueId,
-                    artifactFileName: operation.artifactFileName
-                });
+        .map((res: any) => {
+            const interf: InterfaceModel = _.find(res.interfaces, interf => interf.type === operation.interfaceType);
+            const newOperation: OperationModel = _.find(interf.operations, op => op.name === operation.name);
+            return new OperationModel({
+                ...newOperation,
+                interfaceType: interf.type,
+                interfaceId: interf.uniqueId,
+                artifactFileName: operation.artifactFileName
             });
+        });
     }
 
     // tslint:disable-next-line:member-ordering
-    updateInterfaceOperation(component:Component, operation:OperationModel):Observable<OperationModel> {
+    updateInterfaceOperation(component: Component, operation: OperationModel): Observable<OperationModel> {
         const operationList = {
             interfaces: {
                 [operation.interfaceType]: {
@@ -193,42 +201,66 @@ export class ComponentServiceNg2 {
             }
         };
         return this.http.put<any>(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/interfaceOperations', operationList)
-            .map((res: any) => {
-                const interf: InterfaceModel = _.find(res.interfaces, interf => interf.type === operation.interfaceType);
-                const newOperation: OperationModel = _.find(interf.operations, op => op.name === operation.name);
-                return new OperationModel({
-                    ...newOperation,
-                    interfaceType: interf.type,
-                    interfaceId: interf.uniqueId,
-                    artifactFileName: operation.artifactFileName
-                });
+        .map((res: any) => {
+            const interf: InterfaceModel = _.find(res.interfaces, interf => interf.type === operation.interfaceType);
+            const newOperation: OperationModel = _.find(interf.operations, op => op.name === operation.name);
+            return new OperationModel({
+                ...newOperation,
+                interfaceType: interf.type,
+                interfaceId: interf.uniqueId,
+                artifactFileName: operation.artifactFileName
             });
+        });
     }
 
+    updateComponentInterfaceOperation(componentMetaDataId: string,
+                                      operation: InterfaceOperationModel): Observable<InterfaceOperationModel> {
+        const operationList = {
+            interfaces: {
+                [operation.interfaceType]: {
+                    type: operation.interfaceType,
+                    operations: {
+                        [operation.name]: new BEInterfaceOperationModel(operation)
+                    }
+                }
+            }
+        };
+        return this.http.put<any>(this.baseUrl + 'resources/' + componentMetaDataId + '/interfaceOperation', operationList)
+        .map((res: any) => {
+            const interf: InterfaceModel = _.find(res.interfaces, interf => interf.type === operation.interfaceType);
+            const newOperation: OperationModel = _.find(interf.operations, op => op.name === operation.name);
+
+            return new InterfaceOperationModel({
+                ...newOperation,
+                interfaceType: interf.type,
+                interfaceId: interf.uniqueId,
+            });
+        });
+    }
 
-    deleteInterfaceOperation(component: Component, operation:OperationModel):Observable<OperationModel> {
+    deleteInterfaceOperation(component: Component, operation: OperationModel): Observable<OperationModel> {
         return this.http.delete<OperationModel>(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/interfaces/' + operation.interfaceId + '/operations/' + operation.uniqueId);
     }
 
-    getInterfaceTypes(component:Component):Observable<{[id:string]: Array<string>}> {
+    getInterfaceTypes(component: Component): Observable<{ [id: string]: Array<string> }> {
         return this.http.get<any>(this.baseUrl + 'interfaceLifecycleTypes' + ((component && component.model) ? '?model=' + component.model : ''))
-            .map((res: any) => {
-                const interfaceMap = {};
-                if (!res) {
-                    return interfaceMap;
-                }
-                Object.keys(res).forEach(interfaceName => {
-                    const interface1 = res[interfaceName];
-                    if (!interface1.toscaPresentation.operations) {
-                        return;
-                    }
-                    interfaceMap[interface1.toscaPresentation.type] = Object.keys(interface1.toscaPresentation.operations);
-                });
+        .map((res: any) => {
+            const interfaceMap = {};
+            if (!res) {
                 return interfaceMap;
+            }
+            Object.keys(res).forEach(interfaceName => {
+                const interface1 = res[interfaceName];
+                if (!interface1.toscaPresentation.operations) {
+                    return;
+                }
+                interfaceMap[interface1.toscaPresentation.type] = Object.keys(interface1.toscaPresentation.operations);
             });
+            return interfaceMap;
+        });
     }
 
-    uploadInterfaceOperationArtifact(component:Component, newOperation:OperationModel, oldOperation:OperationModel) {
+    uploadInterfaceOperationArtifact(component: Component, newOperation: OperationModel, oldOperation: OperationModel) {
         const payload = {
             artifactType: "WORKFLOW",
             artifactName: oldOperation.artifactFileName,
@@ -239,34 +271,30 @@ export class ComponentServiceNg2 {
         const headers = new HttpHeaders().append('Content-MD5', HttpHelperService.getHeaderMd5(payload));
 
         return this.http.post(this.baseUrl + component.getTypeUrl() + component.uuid + '/interfaces/' + newOperation.interfaceId + '/operations/' + newOperation.uniqueId + '/artifacts/' + newOperation.implementation.artifactUUID,
-                payload, {headers: headers}
-            ).map((res: any) => {
-                const fileName = res.artifactDisplayName || res.artifactName;
-                newOperation.artifactFileName = fileName;
-                return res;
-            });
+            payload, {headers: headers}
+        ).map((res: any) => {
+            const fileName = res.artifactDisplayName || res.artifactName;
+            newOperation.artifactFileName = fileName;
+            return res;
+        });
     }
 
-    getCapabilitiesAndRequirements(componentType: string, componentId:string):Observable<ComponentGenericResponse> {
+    getCapabilitiesAndRequirements(componentType: string, componentId: string): Observable<ComponentGenericResponse> {
         return this.getComponentDataByFieldsName(componentType, componentId, [COMPONENT_FIELDS.COMPONENT_REQUIREMENTS, COMPONENT_FIELDS.COMPONENT_CAPABILITIES]);
     }
 
-
-
-
-
-    getDeploymentGraphData(component:Component):Observable<ComponentGenericResponse> {
+    getDeploymentGraphData(component: Component): Observable<ComponentGenericResponse> {
         return this.getComponentDataByFieldsName(component.componentType, component.uniqueId, [COMPONENT_FIELDS.COMPONENT_INSTANCES_RELATION, COMPONENT_FIELDS.COMPONENT_INSTANCES, COMPONENT_FIELDS.COMPONENT_GROUPS]);
     }
 
-    createInput(component:Component, inputsToCreate:InstancePropertiesAPIMap, isSelf:boolean):Observable<any> {
-        const inputs = isSelf ? { serviceProperties: inputsToCreate.componentInstanceProperties } : inputsToCreate;
+    createInput(component: Component, inputsToCreate: InstancePropertiesAPIMap, isSelf: boolean): Observable<any> {
+        const inputs = isSelf ? {serviceProperties: inputsToCreate.componentInstanceProperties} : inputsToCreate;
         return this.http.post<any>(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/create/inputs', inputs);
     }
 
-    createListInput(component:Component, input:any, isSelf:boolean):Observable<any> {
+    createListInput(component: Component, input: any, isSelf: boolean): Observable<any> {
         let inputs: any;
-        if(isSelf) {
+        if (isSelf) {
             // change componentInstanceProperties -> serviceProperties
             inputs = {
                 componentInstInputsMap: {
@@ -280,147 +308,149 @@ export class ComponentServiceNg2 {
         return this.http.post<any>(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/create/listInput', inputs);
     }
 
-    createPolicy(component:Component, policiesToCreate:InstancePropertiesAPIMap, isSelf:boolean):Observable<any> {
+    createPolicy(component: Component, policiesToCreate: InstancePropertiesAPIMap, isSelf: boolean): Observable<any> {
         const policiesList =
             isSelf ?
-                {'componentPropertiesToPolicies': {
+                {
+                    'componentPropertiesToPolicies': {
                         ...policiesToCreate.componentInstanceProperties
                     }
                 } :
-                {'componentInstancePropertiesToPolicies': {
+                {
+                    'componentInstancePropertiesToPolicies': {
                         ...policiesToCreate.componentInstanceProperties
                     }
                 };
         return this.http.post(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/create/policies', policiesList);
     }
 
-    deletePolicy(component:Component, policy: PolicyInstance) {
+    deletePolicy(component: Component, policy: PolicyInstance) {
         return this.http.put<PolicyInstance>(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/policies/' + policy.uniqueId + '/undeclare', policy);
     }
 
-    restoreComponent(componentType:string, componentId:string) {
+    restoreComponent(componentType: string, componentId: string) {
         return this.http.post(this.baseUrl + this.getServerTypeUrl(componentType) + componentId + '/restore', {})
     }
 
-    archiveComponent(componentType:string, componentId:string) {
+    archiveComponent(componentType: string, componentId: string) {
         return this.http.post(this.baseUrl + this.getServerTypeUrl(componentType) + componentId + '/archive', {})
     }
 
-    deleteInput(component:Component, input:InputBEModel):Observable<InputBEModel> {
+    deleteInput(component: Component, input: InputBEModel): Observable<InputBEModel> {
 
         return this.http.delete<InputBEModel>(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/delete/' + input.uniqueId + '/input')
-            .map((res) => {
-                return new InputBEModel(res);
-            })
+        .map((res) => {
+            return new InputBEModel(res);
+        })
     }
 
-    deleteOutput(component:Component, output:OutputBEModel):Observable<OutputBEModel> {
+    deleteOutput(component: Component, output: OutputBEModel): Observable<OutputBEModel> {
 
         return this.http.delete<OutputBEModel>(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/delete/' + output.uniqueId + '/output')
-            .map((res) => {
-                return new OutputBEModel(res);
-            })
+        .map((res) => {
+            return new OutputBEModel(res);
+        })
     }
 
-    updateComponentInputs(component:Component, inputs:InputBEModel[]):Observable<InputBEModel[]> {
+    updateComponentInputs(component: Component, inputs: InputBEModel[]): Observable<InputBEModel[]> {
 
         return this.http.post<InputBEModel[]>(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/update/inputs', inputs)
-            .map((res) => {
-                return res.map((input) => new InputBEModel(input));
-            })
+        .map((res) => {
+            return res.map((input) => new InputBEModel(input));
+        })
     }
 
-    updateComponentOutputs(component:Component, outputs:OutputBEModel[]):Observable<OutputBEModel[]> {
+    updateComponentOutputs(component: Component, outputs: OutputBEModel[]): Observable<OutputBEModel[]> {
 
         return this.http.post<OutputBEModel[]>(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/update/outputs', outputs)
-            .map((res) => {
-                return res.map((output) => new OutputBEModel(output));
-            })
+        .map((res) => {
+            return res.map((output) => new OutputBEModel(output));
+        })
     }
 
-    filterComponentInstanceProperties(component:Component, filterData:FilterPropertiesAssignmentData):Observable<InstanceBePropertiesMap> {//instance-property-be-map
+    filterComponentInstanceProperties(component: Component, filterData: FilterPropertiesAssignmentData): Observable<InstanceBePropertiesMap> {//instance-property-be-map
         let params: HttpParams = new HttpParams();
-        filterData.selectedTypes.forEach((type:string) => {
+        filterData.selectedTypes.forEach((type: string) => {
             params = params.append('resourceType', type);
         });
 
         return this.http.get<InstanceBePropertiesMap>(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/filteredproperties/' + filterData.propertyName, {params: params});
     }
 
-    filterComponentInstanceAttributes(component:Component, filterData:FilterPropertiesAssignmentData):Observable<InstanceBePropertiesMap> {//instance-property-be-map
+    filterComponentInstanceAttributes(component: Component, filterData: FilterPropertiesAssignmentData): Observable<InstanceBePropertiesMap> {//instance-property-be-map
         let params: HttpParams = new HttpParams();
-        filterData.selectedTypes.forEach((type:string) => {
+        filterData.selectedTypes.forEach((type: string) => {
             params = params.append('resourceType', type);
         });
 
         return this.http.get<InstanceBePropertiesMap>(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/filteredproperties/' + filterData.propertyName, {params: params});
     }
 
-    createServiceProperty(component: Component, propertyModel:PropertyBEModel): Observable<PropertyBEModel> {
+    createServiceProperty(component: Component, propertyModel: PropertyBEModel): Observable<PropertyBEModel> {
         let serverObject = {};
         serverObject[propertyModel.name] = propertyModel;
         return this.http.post(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/properties', serverObject)
-            .map((res: PropertyBEModel) => {
-                const property: PropertyBEModel = new PropertyBEModel(res);
-                return property;
-            })
+        .map((res: PropertyBEModel) => {
+            const property: PropertyBEModel = new PropertyBEModel(res);
+            return property;
+        })
     }
 
     getServiceProperties(component: Component): Observable<PropertyBEModel[]> {
         return this.http.get(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/properties')
-            .map((res: PropertyBEModel[]) => {
-                if (!res) {
-                    return new Array<PropertyBEModel>();
-                }
-                return CommonUtils.initBeProperties(res);
-            });
+        .map((res: PropertyBEModel[]) => {
+            if (!res) {
+                return new Array<PropertyBEModel>();
+            }
+            return CommonUtils.initBeProperties(res);
+        });
     }
 
     updateServiceProperties(component: Component, properties: PropertyBEModel[]) {
-        return this.http.put<PropertyBEModel[]>( this.baseUrl + component.getTypeUrl() + component.uniqueId + '/properties', properties)
-            .map((res) => {
-                const resJson = res;
-                return _.map(resJson,
-                    (resValue:PropertyBEModel) => new PropertyBEModel(resValue));
-            });
+        return this.http.put<PropertyBEModel[]>(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/properties', properties)
+        .map((res) => {
+            const resJson = res;
+            return _.map(resJson,
+                (resValue: PropertyBEModel) => new PropertyBEModel(resValue));
+        });
     }
 
-    deleteServiceProperty(component:Component, property:PropertyBEModel):Observable<string> {
-        return this.http.delete(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/properties/' + property.uniqueId )
-            .map((res:Response) => {
-                return property.uniqueId;
-            })
+    deleteServiceProperty(component: Component, property: PropertyBEModel): Observable<string> {
+        return this.http.delete(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/properties/' + property.uniqueId)
+        .map((res: Response) => {
+            return property.uniqueId;
+        })
     }
 
-    getDependencies(componentType:string, componentId: string):Observable<IDependenciesServerResponse[]> {
+    getDependencies(componentType: string, componentId: string): Observable<IDependenciesServerResponse[]> {
         return this.http.get<IDependenciesServerResponse[]>(this.baseUrl + this.getServerTypeUrl(componentType) + componentId + '/dependencies');
     }
 
-    automatedUpgrade(componentType:string, componentId:string, componentsIdsToUpgrade:IAutomatedUpgradeRequestObj[]):Observable<AutomatedUpgradeGenericResponse> {
+    automatedUpgrade(componentType: string, componentId: string, componentsIdsToUpgrade: IAutomatedUpgradeRequestObj[]): Observable<AutomatedUpgradeGenericResponse> {
         return this.http.post<AutomatedUpgradeGenericResponse>(this.baseUrl + this.getServerTypeUrl(componentType) + componentId + '/automatedupgrade', componentsIdsToUpgrade);
     }
 
-    updateMultipleComponentInstances(componentId:string, instances:ComponentInstance[]):Observable<ComponentInstance[]> {
+    updateMultipleComponentInstances(componentId: string, instances: ComponentInstance[]): Observable<ComponentInstance[]> {
         return this.http.post<ComponentInstance[]>(this.baseUrl + componentId + '/resourceInstance/multipleComponentInstance', instances);
     }
 
-    getServiceFilterConstraints(component:Component):Observable<ComponentGenericResponse> {
+    getServiceFilterConstraints(component: Component): Observable<ComponentGenericResponse> {
         return this.getComponentDataByFieldsName(component.componentType, component.uniqueId, [SERVICE_FIELDS.NODE_FILTER]);
     }
 
-    createServiceFilterConstraints(component:Component, componentInstance:ComponentInstance, constraint:ConstraintObject):Observable<any> {
+    createServiceFilterConstraints(component: Component, componentInstance: ComponentInstance, constraint: ConstraintObject): Observable<any> {
         return this.http.post<any>(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/resourceInstances/' + componentInstance.uniqueId + '/nodeFilter', constraint);
     }
 
-    updateServiceFilterConstraints(component:Component, componentInstance:ComponentInstance, constraints:ConstraintObject[]):Observable<any> {
+    updateServiceFilterConstraints(component: Component, componentInstance: ComponentInstance, constraints: ConstraintObject[]): Observable<any> {
         return this.http.put<any>(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/resourceInstances/' + componentInstance.uniqueId + '/nodeFilter/', constraints);
     }
 
-    deleteServiceFilterConstraints(component:Component, componentInstance:ComponentInstance, constraintIndex:number) {
+    deleteServiceFilterConstraints(component: Component, componentInstance: ComponentInstance, constraintIndex: number) {
         return this.http.delete<any>(this.baseUrl + component.getTypeUrl() + component.uniqueId + '/resourceInstances/' + componentInstance.uniqueId + '/nodeFilter/' + constraintIndex);
     }
 
-    protected analyzeComponentDataResponse(res: Response):ComponentGenericResponse {
+    protected analyzeComponentDataResponse(res: Response): ComponentGenericResponse {
         return new ComponentGenericResponse().deserialize(res);
     }
 }
diff --git a/catalog-ui/src/app/ng2/services/component-services/topology-template.service.ts b/catalog-ui/src/app/ng2/services/component-services/topology-template.service.ts
index 65dbdccb75..2911164c4b 100644
--- a/catalog-ui/src/app/ng2/services/component-services/topology-template.service.ts
+++ b/catalog-ui/src/app/ng2/services/component-services/topology-template.service.ts
@@ -67,7 +67,7 @@ import {map} from "rxjs/operators";
 import {CapabilitiesConstraintObject} from "../../components/logic/capabilities-constraint/capabilities-constraint.component";
 import {
     BEInterfaceOperationModel,
-    ComponentInstanceInterfaceModel,
+    ComponentInterfaceDefinitionModel,
     InterfaceOperationModel
 } from "../../../models/interfaceOperation";
 import {AttributeBEModel} from "../../../models/attributes-outputs/attribute-be-model";