\r
populate_popup_vfModule(serviceObject, vfModule, vnf);\r
\r
- if (featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE)) {\r
-\r
- if (DataService.getLoggedInUserId()) {\r
- openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule);\r
- }\r
- else {\r
- AaiService.getLoggedInUserID(function (response) {\r
- var userID = response.data;\r
- DataService.setLoggedInUserId(userID);\r
- openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule);\r
- });\r
- }\r
+ if (DataService.getLoggedInUserId()) {\r
+ openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule);\r
}\r
else {\r
- $scope.$broadcast(COMPONENT.DELETE_RESUME_COMPONENT, {\r
- componentId: COMPONENT.VF_MODULE,\r
- callbackFunction: deleteOrResumeCallback,\r
- dialogMethod: COMPONENT.DELETE\r
+ AaiService.getLoggedInUserID(function (response) {\r
+ var userID = response.data;\r
+ DataService.setLoggedInUserId(userID);\r
+ openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule);\r
});\r
}\r
console.log("Removing VF-Module", vfModule);\r
var isVfc = false;\r
\r
_.map($scope.service.model.vnfs, function (value, key) {\r
- if (value.uuid == vnf.uuid) {\r
- if (!_.isEmpty(value.vfcInstanceGroups)) {\r
+ if (value.uuid == vnf.uuid && !_.isEmpty(value.vfcInstanceGroups)) {\r
isVfc = true;\r
var queryData = {\r
serviceModelId: $scope.service.model.service.uuid,\r
$scope.$broadcast(COMPONENT.IFRAME_DIALOG, queryData);\r
return;\r
}\r
- }\r
});\r
\r
DataService.setSubscriberName($scope.service.instance.subscriberName);\r
DataService.setVfModuleInstanceName(vfModule.object[FIELD.ID.VF_MODULE_NAME]);\r
setCurrentServiceModelInfoFromScope();\r
\r
- if (featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE)) {\r
-\r
- if (DataService.getLoggedInUserId()) {\r
- openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule);\r
- }\r
- else {\r
- AaiService.getLoggedInUserID(function (response) {\r
- var userID = response.data;\r
- DataService.setLoggedInUserId(userID);\r
- openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule);\r
- });\r
- }\r
+ if (DataService.getLoggedInUserId()) {\r
+ openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule);\r
}\r
else {\r
- $scope.$broadcast(COMPONENT.DELETE_RESUME_COMPONENT, {\r
- componentId: COMPONENT.VF_MODULE,\r
- volumeGroups: vfModule.volumeGroups,\r
- callbackFunction: deleteOrResumeCallback,\r
- dialogMethod: COMPONENT.RESUME\r
+ AaiService.getLoggedInUserID(function (response) {\r
+ var userID = response.data;\r
+ DataService.setLoggedInUserId(userID);\r
+ openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule);\r
});\r
}\r
};\r