From c9707d48ef35950b5cbd9a62a57154cd4b1596ca Mon Sep 17 00:00:00 2001 From: Eylon Malin Date: Thu, 28 Nov 2019 10:53:54 +0200 Subject: remove FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE Issue-ID: VID-721 Signed-off-by: Eylon Malin Change-Id: I80e3f8edbc187acaf13fdcc089ba15da33dc0ec5 --- .../vid/scripts/constants/componentConstants.js | 1 - .../scripts/controller/InstantiationController.js | 45 ++++++---------------- 2 files changed, 12 insertions(+), 34 deletions(-) (limited to 'vid-app-common/src/main/webapp/app/vid/scripts') diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js b/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js index 3575c382d..ba9f0f533 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js @@ -256,7 +256,6 @@ appDS2 FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS: "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS", FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST: "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST", FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY: "FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY", - FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE: "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE", FLAG_HANDLE_SO_WORKFLOWS: "FLAG_HANDLE_SO_WORKFLOWS", FLAG_CREATE_ERROR_REPORTS: "FLAG_CREATE_ERROR_REPORTS", FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH: "FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH", 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 4b6b0f47a..12dd77953 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 @@ -361,24 +361,14 @@ populate_popup_vfModule(serviceObject, vfModule, vnf); - if (featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE)) { - - if (DataService.getLoggedInUserId()) { - openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule); - } - else { - AaiService.getLoggedInUserID(function (response) { - var userID = response.data; - DataService.setLoggedInUserId(userID); - openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule); - }); - } + if (DataService.getLoggedInUserId()) { + openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule); } else { - $scope.$broadcast(COMPONENT.DELETE_RESUME_COMPONENT, { - componentId: COMPONENT.VF_MODULE, - callbackFunction: deleteOrResumeCallback, - dialogMethod: COMPONENT.DELETE + AaiService.getLoggedInUserID(function (response) { + var userID = response.data; + DataService.setLoggedInUserId(userID); + openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule); }); } console.log("Removing VF-Module", vfModule); @@ -1245,25 +1235,14 @@ DataService.setVfModuleInstanceName(vfModule.object[FIELD.ID.VF_MODULE_NAME]); setCurrentServiceModelInfoFromScope(); - if (featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE)) { - - if (DataService.getLoggedInUserId()) { - openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule); - } - else { - AaiService.getLoggedInUserID(function (response) { - var userID = response.data; - DataService.setLoggedInUserId(userID); - openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule); - }); - } + if (DataService.getLoggedInUserId()) { + openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule); } else { - $scope.$broadcast(COMPONENT.DELETE_RESUME_COMPONENT, { - componentId: COMPONENT.VF_MODULE, - volumeGroups: vfModule.volumeGroups, - callbackFunction: deleteOrResumeCallback, - dialogMethod: COMPONENT.RESUME + AaiService.getLoggedInUserID(function (response) { + var userID = response.data; + DataService.setLoggedInUserId(userID); + openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule); }); } }; -- cgit 1.2.3-korg