diff options
| author |   Eylon Malin <eylon.malin@intl.att.com> | 2019-08-01 11:05:37 +0300 |
|---|---|---|
| committer |   Ittay Stern <ittay.stern@att.com> | 2019-08-01 08:12:47 +0000 |
| commit | f75ace38ec02707694f11e385a26c8fed32882ea (patch) | |
| tree | 987868a2eaafc8ac5acad68bb047f727790fadb6 /vid-app-common/src/main/webapp | |
| parent | 2f1394c149cdbb61c0ac481a7580298b1ddd0829 (diff) | |
Handling legacy region in vfModule creation
Issue-ID: VID-482
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Change-Id: I2c55587d86a77eb0c6c2fa410b212efb074894e2
Diffstat (limited to 'vid-app-common/src/main/webapp')
3 files changed, 6 insertions, 11 deletions
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js b/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js index 87f0f301d..3b5384e14 100644 --- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js @@ -47,6 +47,7 @@ var vfModuleActionModalController = function(COMPONENT, FIELD, $scope, $uibModal AaiService.getLcpCloudRegionTenantList(DataService .getGlobalCustomerId(), DataService.getServiceType(), function( response) { + DataService.setCloudRegionTenantList(response); $scope.lcpAndTenant = response; $scope.isFeatureFlagCloudOwner = featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST); $scope.lcpRegionList = _.uniqBy(response, 'cloudRegionId'); diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js index 17adf77ce..1949f5aa2 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js @@ -626,8 +626,6 @@ var CreationService = function($log, AaiService, AsdcService, DataService,VIDCON var getMsoRequestDetails = function(parameterList) { console.log("getMsoRequestDetails invoked, parameterList="); console.log(JSON.stringify(parameterList,null,4)); - //console.log("getMsoRequestDetails invoked, DataService.getArbitraryParameters()="); - //console.log(JSON.stringify(DataService.getArbitraryParameters(),null,4)); //VoLTE logic goes here if(DataService.getE2EService() === true) { @@ -781,8 +779,8 @@ var CreationService = function($log, AaiService, AsdcService, DataService,VIDCON var cloudOwner; var lcpRegionOptionId = getValueFromList(FIELD.ID.LCP_REGION, parameterList); - - if (lcpRegionOptionId === FIELD.KEY.LCP_REGION_TEXT) { + var cloudOwnerAndLcpCloudRegion = getCloudOwnerAndLcpCloudRegionFromOptionId(lcpRegionOptionId); + if (cloudOwnerAndLcpCloudRegion.cloudRegionId === FIELD.KEY.LCP_REGION_TEXT) { lcpRegion = getValueFromList(FIELD.ID.LCP_REGION_TEXT, parameterList); cloudOwner = undefined; @@ -1258,7 +1256,9 @@ var CreationService = function($log, AaiService, AsdcService, DataService,VIDCON parameterListControl .updateList([ FIELD.PARAMETER.TENANT_DISABLED ]); } - if (list[0].value === FIELD.KEY.LCP_REGION_TEXT) { + + var cloudOwnerAndLcpCloudRegion = getCloudOwnerAndLcpCloudRegionFromOptionId(list[0].value); + if (cloudOwnerAndLcpCloudRegion.cloudRegionId === FIELD.KEY.LCP_REGION_TEXT) { parameterListControl .updateList([ FIELD.PARAMETER.LCP_REGION_TEXT_VISIBLE ]); } else { diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js index 36e962b73..817bef670 100644 --- a/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js @@ -45,12 +45,6 @@ var DeleteResumeService = function($log, AaiService, AsdcService, DataService, }; var getLcpCloudRegionTenantList = function() { - //console.log ( "global customer id: " ); - //console.log ( JSON.stringify (DataService.getGlobalCustomerId()) ); - - //console.log ( "service type: " ); - //console.log ( JSON.stringify (DataService.getServiceType()) ); - AaiService.getLcpCloudRegionTenantList(DataService .getGlobalCustomerId(), DataService.getServiceType(), function( response) { |