Merge "identify macro services without instantiation type in BE by feature flag"

[vid.git] / vid-app-common / src / main / webapp / app / vid / scripts / controller / aaiSubscriberController.js

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
index bf3d54a..110f24e 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
@@ -489,8 +489,7 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER",
             if (model && model.vnfs && !_.isEmpty(model.vnfs)) {\r
                 Object.keys(model.vnfs).forEach(function (key) {\r
                     var vnf = model.vnfs[key];\r
-                    if (vnf.vfcInstanceGroups && !_.isEmpty(vnf.vfcInstanceGroups)) {\r
-                        if (vnf.uuid === genericVnf.modelVersionId) {\r
+                    if (vnf.vfcInstanceGroups && !_.isEmpty(vnf.vfcInstanceGroups) && vnf.uuid === genericVnf.modelVersionId) {\r
                             AaiService.getInstanceGroupsByVNFInstanceId(genericVnf.nodeId,\r
                                 function (response) { //success\r
                                     handleGetRelatedInstanceGroupsResponseForVnf(response, genericVnf);\r
@@ -502,7 +501,6 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER",
                                 }\r
                             )\r
                         }\r
-                    }\r
                 });\r
             }\r
         }\r
@@ -797,11 +795,9 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER",
         };\r
 \r
         $scope.isShowAssignmentsEnabled = function () {\r
-            if (featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_SHOW_ASSIGNMENTS)) {\r
-                if ($scope.serviceOrchestrationStatus) {\r
+            if (featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_SHOW_ASSIGNMENTS) && $scope.serviceOrchestrationStatus) {\r
                     return $scope.serviceOrchestrationStatus.toLowerCase() === 'assigned';\r
                 }\r
-            }\r
             return false;\r
         };\r
 \r