delete flag FLAG_1911_INSTANTIATION_ORDER_BUTTON_IN_ASYNC_ALACARTE

Issue-ID: VID-646
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
Change-Id: I828f40fe908dc9608527934f3e6aae32b7d70b96

5 files changed, 4 insertions, 11 deletions

diff --git a/features.properties.md b/features.properties.md
index 32b139ace..a7f9c633e 100644
--- a/features.properties.md
+++ b/features.properties.md
@@ -178,9 +178,6 @@
   enables showing/hiding (true/false) column with orchestration type in Service Model browser.
   The types are fetched from aai.
   
-* FLAG_1911_INSTANTIATION_ORDER_BUTTON_IN_ASYNC_ALACARTE
-   Let the user set the order of resource instantiation with the button (Move up / Move down) while using drawing board (new view edit)
-   for a-la-carte instantiation.
    
 * FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI
   Any a-la-carte new service deployment will be open in modern UI, besides excluded services : Port mirroring, VLAN Tagging
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 649a2ff87..fea76e83e 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
@@ -80,7 +80,6 @@ public enum Features implements Feature {
     FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT,
     FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH,
     FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE,
-    FLAG_1911_INSTANTIATION_ORDER_BUTTON_IN_ASYNC_ALACARTE,
     FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI,
     ;
 
diff --git a/vid-automation/src/main/java/vid/automation/test/infra/Features.java b/vid-automation/src/main/java/vid/automation/test/infra/Features.java
index b316fda1b..93e444701 100644
--- a/vid-automation/src/main/java/vid/automation/test/infra/Features.java
+++ b/vid-automation/src/main/java/vid/automation/test/infra/Features.java
@@ -55,7 +55,6 @@ public enum Features implements Feature {
     FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG,
     FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH,
     FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE,
-    FLAG_1911_INSTANTIATION_ORDER_BUTTON_IN_ASYNC_ALACARTE,
     FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI,
     ;
 
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.json
index dc14736cf..93b5e15dd 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.json
@@ -6,19 +6,18 @@
   "FLAG_SERVICE_MODEL_CACHE": false,
   "FLAG_SHOW_ASSIGNMENTS": true,
   "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
-  "FLAG_DEFAULT_VNF" : true,
-  "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD" : true,
+  "FLAG_DEFAULT_VNF": true,
+  "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
   "FLAG_A_LA_CARTE_AUDIT_INFO": true,
   "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST": true,
   "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true,
   "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE": true,
   "FLAG_1902_NEW_VIEW_EDIT": true,
-  "FLAG_VF_MODULE_RESUME_STATUS_CREATE" : true,
+  "FLAG_VF_MODULE_RESUME_STATUS_CREATE": true,
   "FLAG_1906_COMPONENT_INFO": true,
   "FLAG_1908_RESUME_MACRO_SERVICE": true,
   "FLAG_ENABLE_WEBPACK_MODERN_UI": true,
   "FLAG_FLASH_REPLACE_VF_MODULE": true,
   "FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT": true,
-  "FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE": false,
-  "FLAG_1911_INSTANTIATION_ORDER_BUTTON_IN_ASYNC_ALACARTE": false
+  "FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE": false
 }
diff --git a/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts b/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts
index d6c37c936..689465c69 100644
--- a/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts
+++ b/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts
@@ -8,7 +8,6 @@ export enum Features {
   FLAG_1902_VNF_GROUPING='FLAG_1902_VNF_GROUPING',
   FLAG_VF_MODULE_RESUME_STATUS_CREATE = 'FLAG_VF_MODULE_RESUME_STATUS_CREATE',
   FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE = 'FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE',
-  FLAG_1911_INSTANTIATION_ORDER_BUTTON_IN_ASYNC_ALACARTE = 'FLAG_1911_INSTANTIATION_ORDER_BUTTON_IN_ASYNC_ALACARTE',
   FLAG_1906_COMPONENT_INFO = 'FLAG_1906_COMPONENT_INFO',
   FLAG_1908_RESUME_MACRO_SERVICE = 'FLAG_1908_RESUME_MACRO_SERVICE',
   FLAG_FLASH_REPLACE_VF_MODULE ='FLAG_FLASH_REPLACE_VF_MODULE',