remove FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE

Issue-ID: VID-721
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Change-Id: I80e3f8edbc187acaf13fdcc089ba15da33dc0ec5

5 files changed, 12 insertions, 37 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java
index 6a6ac6898..507ebbe2b 100644
--- a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java
+++ b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java
@@ -49,7 +49,6 @@ public enum Features implements Feature {
     FLAG_ENABLE_WEBPACK_MODERN_UI,
     FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY,
     FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST,
-    FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE,
     FLAG_1810_AAI_LOCAL_CACHE,
     FLAG_1810_IDENTIFY_SERVICE_FOR_NEW_UI,
     FLAG_1902_NEW_VIEW_EDIT,
diff --git a/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties b/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties
index 7baa08690..a45f6db34 100644
--- a/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties
+++ b/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties
@@ -24,7 +24,6 @@ FLAG_SHIFT_VFMODULE_PARAMS_TO_VNF = true
 FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI=false
 FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST=true
 FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY=true
-FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE = false
 FLAG_1810_AAI_LOCAL_CACHE = true
 FLAG_1902_NEW_VIEW_EDIT= false
 FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER = false
diff --git a/vid-app-common/src/main/webapp/WEB-INF/conf/onap.features.properties b/vid-app-common/src/main/webapp/WEB-INF/conf/onap.features.properties
index 1f7244c3d..461d63fbc 100644
--- a/vid-app-common/src/main/webapp/WEB-INF/conf/onap.features.properties
+++ b/vid-app-common/src/main/webapp/WEB-INF/conf/onap.features.properties
@@ -9,7 +9,6 @@ FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS = true
 FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS = true
 FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST = true
 FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY = true
-FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE = false
 FLAG_1810_AAI_LOCAL_CACHE = true
 FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER = false
 FLAG_HANDLE_SO_WORKFLOWS = true
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);

                 });

             }

         };