Fix deploy window

[clamp.git] / src / main / resources / META-INF / resources / designer / scripts / DeploymentCtrl.js

diff --git a/src/main/resources/META-INF/resources/designer/scripts/DeploymentCtrl.js b/src/main/resources/META-INF/resources/designer/scripts/DeploymentCtrl.js
index 3a5faf5..9350912 100644 (file)
--- a/src/main/resources/META-INF/resources/designer/scripts/DeploymentCtrl.js
+++ b/src/main/resources/META-INF/resources/designer/scripts/DeploymentCtrl.js
@@ -18,35 +18,59 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  * ===================================================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * 
  */
 
 app.controller('DeploymentCtrl',
                ['$scope','$rootScope','$modalInstance','data','dialogs', 'cldsModelService',
        function( $scope,  $rootScope,  $modalInstance,  data,  dialogs,   cldsModelService) {
 
+           function validate_and_set_deploy_parameters () {
+                  var inputList = document.getElementsByClassName("deployFormId");
+                  var jsonParameters="{";
+                  $.each(inputList, function(key) {
+                          if (jsonParameters !== "{") {
+                                  jsonParameters = jsonParameters+",";
+                          }
+                         jsonParameters = jsonParameters+'"'+inputList[key].id+'":'+'"'+inputList[key].value+'"'
+                  });
+                  jsonParameters = jsonParameters+"}";
+               try {
+                   //Try to validate the json
+                   set_deploy_parameters(JSON.parse(jsonParameters));
+               } catch (e) {
+                   console.error("Couldn't parse deploy parameters json");
+               }
+           }
+
            function set_deploy_parameters(parameters) {
                if (!'global' in elementMap) {
                    elementMap["global"] = [];
                }
+               var index = elementMap["global"].findIndex(function (e) { return (typeof e == "object" && !(e instanceof Array)) && "deployParameters" == e["name"]; }); 
+               if (index == -1) { 
+                   elementMap["global"].push({"name": "deployParameters", "value": parameters}); 
+               } else { 
+                   elementMap["global"][index]["value"] =  parameters; 
+               }
+           }
 
-               var index = elementMap["global"].findIndex(function (e) { return (typeof e == "object" && !(e instanceof Array)) && "deployParameters" in e; });
-               if (index == -1) {
-                   elementMap["global"].push({"deployParameters": parameters});
-               } else {
-                   elementMap["global"][index]["deployParameters"] =  parameters;
+           $scope.load_deploy_parameters = function () {
+                  var index = elementMap["global"].findIndex(function (e) { return (typeof e == "object" && !(e instanceof Array)) && "deployParameters" == e["name"]; }); 
+               if (index != -1) {
+                  $('#deployPropertiesDiv').append($('<br/>'));
+                  $.each(elementMap["global"][index].value, function(key) {
+                          var propertyValue=elementMap["global"][index].value[key];
+                          $('#deployPropertiesDiv').append($('<label class="control-label">'+key+'  </label>'));
+                          $('#deployPropertiesDiv').append($('<input style="width: 100%; clear: both;" class="deployFormId" id="'+key+'"></input>').val(propertyValue).html(propertyValue));
+                          $('#deployPropertiesDiv').append($('<br/>'));
+               });
                }
            }
 
            $scope.deploy = function() {
-               var parameters = $("#deployProperties").val();
-               try {
-                   parameters = JSON.parse(parameters);
-                   set_deploy_parameters(parameters);
-                   $modalInstance.close();
-               } catch (e) {
-                   console.error("Couldn't parse deploy parameters json");
-               }
+                  validate_and_set_deploy_parameters ();
+               $modalInstance.close();
            };
 
            $scope.close = function() {