From: anushadasari <danush10@in.ibm.com>
Date: Thu, 7 Nov 2019 07:18:23 +0000 (+0530)
Subject: Merge this if statement with the nested one
X-Git-Tag: 6.0.1~170
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a7498b8b59c7872ae3de2237b681500384cbdc9b;p=vid.git

Merge this if statement with the nested one

Merging collapsible if statements increases the code's readability.

Issue-ID: VID-699
Change-Id: Icb52f1e1fcaec6ebfec3711c32c4cfcca9582af6
Signed-off-by: anushadasari <danush10@in.ibm.com>
---

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
index 6d8dde844..4b6b0f47a 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
@@ -1016,8 +1016,7 @@
             var isVfc = false;
 
             _.map($scope.service.model.vnfs, function (value, key) {
-                if (value.uuid == vnf.uuid) {
-                    if (!_.isEmpty(value.vfcInstanceGroups)) {
+                if (value.uuid == vnf.uuid && !_.isEmpty(value.vfcInstanceGroups)) {
                         isVfc = true;
                         var queryData = {
                             serviceModelId: $scope.service.model.service.uuid,
@@ -1033,7 +1032,6 @@
                         $scope.$broadcast(COMPONENT.IFRAME_DIALOG, queryData);
                         return;
                     }
-                }
             });
 
             DataService.setSubscriberName($scope.service.instance.subscriberName);