edit of macro services in new view edit screen

Fix Vid Notion Builder behavior according -
all macro non transport services should open the new view edit screen
Issue-ID: VID-378
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Change-Id: Icd45fcbfcb4bf8928f44f73fb3ddd84ac1f1d341

1 files changed, 6 insertions, 7 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/asdc/parser/VidNotionsBuilder.java b/vid-app-common/src/main/java/org/onap/vid/asdc/parser/VidNotionsBuilder.java
index c9c2649ae..d35c8df9c 100644
--- a/vid-app-common/src/main/java/org/onap/vid/asdc/parser/VidNotionsBuilder.java
+++ b/vid-app-common/src/main/java/org/onap/vid/asdc/parser/VidNotionsBuilder.java
@@ -170,16 +170,15 @@ public class VidNotionsBuilder {
             return VidNotions.InstantiationUI.SERVICE_WITH_VNF_GROUPING;
         }
 
-        if (featureManager.isActive(Features.FLAG_1908_COLLECTION_RESOURCE_NEW_INSTANTIATION_UI) &&
-                featureManager.isActive(Features.FLAG_1908_RESUME_MACRO_SERVICE) &&
-                isServiceWithCollectionResource(serviceModel)) {
-            return VidNotions.InstantiationUI.SERVICE_WITH_COLLECTION_RESOURCE;
+        if (featureManager.isActive(Features.FLAG_1908_MACRO_NOT_TRANSPORT_NEW_VIEW_EDIT) &&
+            isMacro(serviceModel) &&
+            !isTransportService(csarHelper) &&
+            //till new view/edit would support fabric service activation
+            !hasFabricConfiguration(csarHelper)) {
+            return VidNotions.InstantiationUI.MACRO_SERVICE;
         }
 
         if (featureManager.isActive(Features.FLAG_1902_NEW_VIEW_EDIT)) {
-            if (isMacro(serviceModel) && !isMacroExcludedFromAsyncFlow(serviceModel)) {
-                return VidNotions.InstantiationUI.MACRO_SERVICE;
-            }
             VidNotions.InstantiationUI instantiationUISuggestion = suggestInstantiationUI(csarHelper, serviceModel);
             if (instantiationUISuggestion!=VidNotions.InstantiationUI.LEGACY) {
                 return instantiationUISuggestion;