VFC operation not clearing artifact details when unchecked

Issue-ID: SDC-4420
Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
Change-Id: I338eda3e714782585a69cf15347afdebe467e312

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceInterfacesMerge.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceInterfacesMerge.java
index ecbeb21..cf5395d 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceInterfacesMerge.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceInterfacesMerge.java
@@ -77,7 +77,7 @@ public class ComponentInstanceInterfacesMerge implements ComponentInstanceMergeI
         }
         currentComponent.getComponentInstancesInterfaces().get(instanceId).forEach(
             newInterfaceDef -> {
-                Map<String, Operation> newInterfaceDefOperationMap = new HashMap<>();
+                Map<String, Operation> newInterfaceDefOperationMap = newInterfaceDef.getOperationsMap();
                 newInterfaceDef.getOperationsMap().forEach(
                     (newOperationDefKey, newOperationDefKeyValue) -> prevInstanceInterfaces.stream()
                         .filter(in -> in.getUniqueId().equals(newInterfaceDef.getUniqueId())).forEach(

diff --git a/catalog-ui/src/app/ng2/pages/composition/interface-operatons/operation-creator/interface-operation-handler.component.ts b/catalog-ui/src/app/ng2/pages/composition/interface-operatons/operation-creator/interface-operation-handler.component.ts
index c7fcea0..a1f72ac 100644 (file)
--- a/catalog-ui/src/app/ng2/pages/composition/interface-operatons/operation-creator/interface-operation-handler.component.ts
+++ b/catalog-ui/src/app/ng2/pages/composition/interface-operatons/operation-creator/interface-operation-handler.component.ts
@@ -197,8 +197,8 @@ export class InterfaceOperationHandlerComponent {
             this.toscaArtifactTypeSelected = undefined;
             this.artifactVersion = undefined;
             if (this.operationToUpdate.implementation.artifactType) {
-                this.operationToUpdate.implementation.artifactName = '';
                 this.operationToUpdate.implementation.artifactVersion = '';
+                this.operationToUpdate.implementation.artifactType = '';
             }
             this.toscaArtifactTypeProperties = undefined;
             this.artifactTypeProperties = undefined;