diff options
| author |   Rina Roi <rina.roi@intl.att.com> | 2019-08-01 12:51:30 +0300 |
|---|---|---|
| committer | Rina Roi <rina.roi@intl.att.com> | 2019-08-01 14:29:59 +0300 |
| commit | 0a078bb56030f0311081b8a24b2977d8a52e331e (patch) | |
| tree | f3d03e7e788425742e02ce9372369b863c5ebf1c /vid-app-common/src/main/webapp/app | |
| parent | 1c4cea59f9190c8a96bcd40233df0559ed03af2f (diff) | |
Add flag for modern UI
Issue-ID: VID-544
Change-Id: Iad79353ff9f55416d87b5bef56e38dd01357003b
Signed-off-by: Rina Roi <rina.roi@intl.att.com>
Diffstat (limited to 'vid-app-common/src/main/webapp/app')
| -rwxr-xr-x | vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js | 2 | ||||
| -rwxr-xr-x | vid-app-common/src/main/webapp/app/vid/scripts/services/asdcService.js | 13 |
2 files changed, 10 insertions, 5 deletions
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 3d6ed67ae..01b8e8acf 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 @@ -246,7 +246,7 @@ appDS2 }, FEATURE_FLAGS: { - FLAG_ASYNC_INSTANTIATION: "FLAG_ASYNC_INSTANTIATION", + FLAG_ENABLE_WEBPACK_MODERN_UI: "FLAG_ENABLE_WEBPACK_MODERN_UI", FLAG_NETWORK_TO_ASYNC_INSTANTIATION: "FLAG_NETWORK_TO_ASYNC_INSTANTIATION", FLAG_ADD_MSO_TESTAPI_FIELD: "FLAG_ADD_MSO_TESTAPI_FIELD", FLAG_SHOW_ASSIGNMENTS: "FLAG_SHOW_ASSIGNMENTS", diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/asdcService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/asdcService.js index b9bab0eaf..eb3ea46da 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/services/asdcService.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/asdcService.js @@ -22,8 +22,6 @@ var AsdcService = function ($http, $log, PropertyService, UtilityService, VIDCONFIGURATION, COMPONENT, DataService, featureFlags) {
var shouldExcludeMacroFromAsyncInstantiationFlow = function(serviceModel){
- if (!featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_ASYNC_INSTANTIATION))
- return true;
if (DataService.getE2EService())
return true;
if (!_.isEmpty(serviceModel.pnfs))
@@ -51,7 +49,8 @@ var AsdcService = function ($http, $log, PropertyService, UtilityService, VIDCON },
shouldTakeTheDrawingBoardViewEdit: function(serviceModel) {
- if (serviceModel.service.vidNotions
+ if (this.enableWebpackModernUi()
+ && serviceModel.service.vidNotions
&& serviceModel.service.vidNotions.viewEditUI
&& serviceModel.service.vidNotions.viewEditUI !== 'legacy'
) return true;
@@ -59,8 +58,14 @@ var AsdcService = function ($http, $log, PropertyService, UtilityService, VIDCON return false;
},
+ enableWebpackModernUi: function(){
+ return featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_ENABLE_WEBPACK_MODERN_UI);
+ },
+
shouldTakeTheAsyncInstantiationFlow: function(serviceModel) {
- // First of all, respect serviceModel.service.vidNotions.instantiationUI
+ if (!(this.enableWebpackModernUi()))
+ return false;
+ // Assuming positive flag - first of all, respect serviceModel.service.vidNotions.instantiationUI
if (serviceModel.service.vidNotions
&& serviceModel.service.vidNotions.instantiationUI
&& serviceModel.service.vidNotions.instantiationUI !== 'legacy'
|