[VID-15] fixes for various issues

Change-Id: I392a0427078d337a5d501a813dff73c1959481e2
Signed-off-by: jimmydot <jf2512@att.com>

2 files changed, 199 insertions, 72 deletions

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
index 00c141483..496c06f1c 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
@@ -41,7 +41,7 @@ appDS2.controller("aaiSubscriberController", [ "COMPONENT", "FIELD", "PARAMETER"
 	$scope.defaultBaseUrl = "";

 	$scope.responseTimeoutMsec = 60000;

 

-	$scope.serviceTypes=[ FIELD.PROMPT.SELECT_SERVICE ];

+	$scope.serviceTypes=[ FIELD.PROMPT.SELECT_SERVICE];

 	$scope.defaultSubscriberName=[ FIELD.PROMPT.SELECT_SUB ];

 

 	var callbackFunction = function(response) {

@@ -142,6 +142,7 @@ appDS2.controller("aaiSubscriberController", [ "COMPONENT", "FIELD", "PARAMETER"
 		    for(var i=0; i<$scope.custSubList.length;i++){

 						if($scope.createSubscriberName === $scope.custSubList[i].subscriberName){

 							globalCustomerId = $scope.custSubList[i].globalCustomerId;

+							globalCustId = globalCustomerId;

 						}

 					};

 			

@@ -182,6 +183,7 @@ appDS2.controller("aaiSubscriberController", [ "COMPONENT", "FIELD", "PARAMETER"
 			

 			};

 			

+			var globalCustId;// This value will be assigned only on create new service instance screen-macro

 			$scope.createType = "a la carte";

 		$scope.deployService = function(service,hideServiceFields) {

 			hideServiceFields = hideServiceFields|| false;

@@ -208,6 +210,11 @@ appDS2.controller("aaiSubscriberController", [ "COMPONENT", "FIELD", "PARAMETER"
 						"createSubscriberName":serviceModel.service.createSubscriberName

 					});

 					DataService.setHideServiceFields(hideServiceFields);

+					if(hideServiceFields){

+						DataService.setServiceType($scope.serviceTypeName);

+						DataService.setGlobalCustomerId(globalCustId);

+					}

+

 					DataService.setALaCarte (true);

 					$scope.createType = "a la carte";

 					var broadcastType = "createComponent";

@@ -227,6 +234,7 @@ appDS2.controller("aaiSubscriberController", [ "COMPONENT", "FIELD", "PARAMETER"
 							"modelName": serviceModel.service.name,

 							"description": serviceModel.service.description,

 							"category":serviceModel.service.category,

+							"serviceEcompNaming": serviceModel.service.serviceEcompNaming,

 							"inputs": serviceModel.service.inputs,

 							"displayInputs": convertedAsdcModel.completeDisplayInputs,

 							"serviceTypeName":serviceModel.service.serviceTypeName,

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js
index eb170915a..b400cc6ea 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js
@@ -107,91 +107,210 @@ var creationDialogController = function( COMPONENT, FIELD, PARAMETER, $scope, $h
 			showError(FIELD.ERROR.MISSING_DATA, requiredFields);

 			return;

 		}

-	

+		

+		var isUploadAvailable = false;

+		var uploadIndex =0;

 		var paramList = $scope.userProvidedControl.getList();

-		var instanceName = "";

-

-		if ( DataService.getALaCarte() ) {

-			if ( paramList != null ) {

-				for (var i = 0; i < paramList.length; i++) {

-					if (paramList[i].id === FIELD.ID.INSTANCE_NAME) {

-						instanceName = paramList[i].value;

-						break;

+		

+		for (var i = 0; i < paramList.length; i++) {

+			if (paramList[i].id === FIELD.ID.SUPPLEMENTORY_DATA_FILE) {

+				isUploadAvailable = true;

+				uploadIndex=i;

+				break;

+			}

+		}

+		

+		if(isUploadAvailable){

+			var errorMsg = "";

+			var fileInput = document.getElementById(FIELD.ID.SUPPLEMENTORY_DATA_FILE);

+			var file = fileInput.files[0];

+			var reader = new FileReader();

+			reader.onload = function(e) {

+				try{

+					paramList[uploadIndex].value = JSON.parse(reader.result);

+					FIELD.PARAMETER.SUPPLEMENTORY_DATA_FILE['value'] = JSON.stringify(paramList[uploadIndex].value);

+					$scope.userProvidedControl.updateList([ FIELD.PARAMETER.SUPPLEMENTORY_DATA_FILE ]);

+					

+					var instanceName = "";

+

+					if ( DataService.getALaCarte() ) {

+						if ( paramList != null ) {

+							for (var i = 0; i < paramList.length; i++) {

+								if (paramList[i].id === FIELD.ID.INSTANCE_NAME) {

+									instanceName = paramList[i].value;

+									break;

+								}

+							}

+						}

+						var isValid = validateInstanceName (instanceName);

+						if ( isValid ) {

+							$scope.isErrorVisible = false;

+						} else {

+							showError(FIELD.ERROR.INVALID_INSTANCE_NAME + instanceName, 

+									FIELD.ERROR.INSTANCE_NAME_VALIDATE);

+							return;

+						}

 					}

-				}

+					var arbitraryParametersList = DataService.getArbitraryParameters();

+					var p = null;

+					if (UtilityService.hasContents (arbitraryParametersList)) {

+						for (var i = 0; i < arbitraryParametersList.length; i++) {

+							p = arbitraryParametersList[i];

+							if (p.type === PARAMETER.MAP) {

+								//validate a map: { <entry_key_1>: <entry_value_1>, ... , <entry_key_n>: <entry_value_n> }

+								// need to find the value in paramList

+								for (var j = 0; j < paramList.length; j++) {

+									if (paramList[j].id === p.id) {

+										p.value = paramList[j].value;

+										var isValid = validateMap (p.value);

+										if ( isValid ) {

+											$scope.isErrorVisible = false;

+											break;

+										} 

+										else {

+											showError(FIELD.ERROR.INVALID_MAP + p.id, 

+													FIELD.ERROR.MAP_VALIDATE);

+											return;

+										}	

+									}

+								}

+							} else if (p.type === PARAMETER.LIST) {

+								//validate a list: { value or a list of comma separated values }

+								// need to find the value in paramList

+								for (var j = 0; j < paramList.length; j++) {

+									if (paramList[j].id === p.id) {

+										p.value = paramList[j].value;

+										var isValid = validateList (p.value);

+										if ( isValid ) {

+											$scope.isErrorVisible = false;

+											break;

+										} 

+										else {

+											showError(FIELD.ERROR.INVALID_LIST + p.id, 

+													FIELD.ERROR.LIST_VALIDATE);

+											return;

+										}	

+									}

+								}

+							}

+						}

+					}

+					var requestDetails = CreationService

+							.getMsoRequestDetails($scope.userProvidedControl.getList());

+

+					$scope.isDialogVisible = false;

+

+					$scope.$broadcast(COMPONENT.MSO_CREATE_REQ, {

+						url : CreationService.getMsoUrl(),

+						requestDetails : requestDetails,

+						componentId: componentId,

+						callbackFunction : function(response) {

+							if (response.isSuccessful) {

+								$scope.popup.isVisible = false;

+								runCallback(response);

+							} else {

+								$scope.isDialogVisible = false;

+								$scope.popup.isVisible = false;

+							}

+						}

+					});

+					

+				}catch(e){

+				errorMsg = errorMsg+ FIELD.ERROR.INVALID_DATA_FORMAT;

 			}

-			var isValid = validateInstanceName (instanceName);

-			if ( isValid ) {

-				$scope.isErrorVisible = false;

-			} else {

-				showError(FIELD.ERROR.INVALID_INSTANCE_NAME + instanceName, 

-						FIELD.ERROR.INSTANCE_NAME_VALIDATE);

+			if (errorMsg !== "") {

+				showError(FIELD.ERROR.SYSTEM_FAILURE, errorMsg);

 				return;

 			}

-		}

-		var arbitraryParametersList = DataService.getArbitraryParameters();

-		var p = null;

-		if (UtilityService.hasContents (arbitraryParametersList)) {

-			for (var i = 0; i < arbitraryParametersList.length; i++) {

-				p = arbitraryParametersList[i];

-				if (p.type === PARAMETER.MAP) {

-					//validate a map: { <entry_key_1>: <entry_value_1>, ... , <entry_key_n>: <entry_value_n> }

-					// need to find the value in paramList

-					for (var j = 0; j < paramList.length; j++) {

-						if (paramList[j].id === p.id) {

-							p.value = paramList[j].value;

-							var isValid = validateMap (p.value);

-							if ( isValid ) {

-								$scope.isErrorVisible = false;

-								break;

-							} 

-							else {

-								showError(FIELD.ERROR.INVALID_MAP + p.id, 

-										FIELD.ERROR.MAP_VALIDATE);

-								return;

-							}	

+			}

+			reader.readAsText(file);

+		}else{

+	

+			var paramList = $scope.userProvidedControl.getList();

+			var instanceName = "";

+

+			if ( DataService.getALaCarte() ) {

+				if ( paramList != null ) {

+					for (var i = 0; i < paramList.length; i++) {

+						if (paramList[i].id === FIELD.ID.INSTANCE_NAME) {

+							instanceName = paramList[i].value;

+							break;

 						}

 					}

-				} else if (p.type === PARAMETER.LIST) {

-					//validate a list: { value or a list of comma separated values }

-					// need to find the value in paramList

-					for (var j = 0; j < paramList.length; j++) {

-						if (paramList[j].id === p.id) {

-							p.value = paramList[j].value;

-							var isValid = validateList (p.value);

-							if ( isValid ) {

-								$scope.isErrorVisible = false;

-								break;

-							} 

-							else {

-								showError(FIELD.ERROR.INVALID_LIST + p.id, 

-										FIELD.ERROR.LIST_VALIDATE);

-								return;

-							}	

+				}

+				var isValid = validateInstanceName (instanceName);

+				if ( isValid ) {

+					$scope.isErrorVisible = false;

+				} else {

+					showError(FIELD.ERROR.INVALID_INSTANCE_NAME + instanceName, 

+							FIELD.ERROR.INSTANCE_NAME_VALIDATE);

+					return;

+				}

+			}

+			var arbitraryParametersList = DataService.getArbitraryParameters();

+			var p = null;

+			if (UtilityService.hasContents (arbitraryParametersList)) {

+				for (var i = 0; i < arbitraryParametersList.length; i++) {

+					p = arbitraryParametersList[i];

+					if (p.type === PARAMETER.MAP) {

+						//validate a map: { <entry_key_1>: <entry_value_1>, ... , <entry_key_n>: <entry_value_n> }

+						// need to find the value in paramList

+						for (var j = 0; j < paramList.length; j++) {

+							if (paramList[j].id === p.id) {

+								p.value = paramList[j].value;

+								var isValid = validateMap (p.value);

+								if ( isValid ) {

+									$scope.isErrorVisible = false;

+									break;

+								} 

+								else {

+									showError(FIELD.ERROR.INVALID_MAP + p.id, 

+											FIELD.ERROR.MAP_VALIDATE);

+									return;

+								}	

+							}

+						}

+					} else if (p.type === PARAMETER.LIST) {

+						//validate a list: { value or a list of comma separated values }

+						// need to find the value in paramList

+						for (var j = 0; j < paramList.length; j++) {

+							if (paramList[j].id === p.id) {

+								p.value = paramList[j].value;

+								var isValid = validateList (p.value);

+								if ( isValid ) {

+									$scope.isErrorVisible = false;

+									break;

+								} 

+								else {

+									showError(FIELD.ERROR.INVALID_LIST + p.id, 

+											FIELD.ERROR.LIST_VALIDATE);

+									return;

+								}	

+							}

 						}

 					}

 				}

 			}

-		}

-		var requestDetails = CreationService

-				.getMsoRequestDetails($scope.userProvidedControl.getList());

+			var requestDetails = CreationService

+					.getMsoRequestDetails($scope.userProvidedControl.getList());

 

-		$scope.isDialogVisible = false;

+			$scope.isDialogVisible = false;

 

-		$scope.$broadcast(COMPONENT.MSO_CREATE_REQ, {

-			url : CreationService.getMsoUrl(),

-			requestDetails : requestDetails,

-			componentId: componentId,

-			callbackFunction : function(response) {

-				if (response.isSuccessful) {

-					$scope.popup.isVisible = false;

-					runCallback(response);

-				} else {

-					$scope.isDialogVisible = false;

-					$scope.popup.isVisible = false;

+			$scope.$broadcast(COMPONENT.MSO_CREATE_REQ, {

+				url : CreationService.getMsoUrl(),

+				requestDetails : requestDetails,

+				componentId: componentId,

+				callbackFunction : function(response) {

+					if (response.isSuccessful) {

+						$scope.popup.isVisible = false;

+						runCallback(response);

+					} else {

+						$scope.isDialogVisible = false;

+						$scope.popup.isVisible = false;

+					}

 				}

-			}

-		});

+			});

+		}

 	}

 

 	$scope.cancel = function() {