UI changes to support value of extra vars as nested hash

UI changes to support extra vars format in ManageIQ/manageiq#14697
h-kataria · Apr 24, 2017 · a473755 · a473755
1 parent d63ee8f
commit a473755
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/app/assets/javascripts/controllers/catalog/catalog_item_form_controller.js b/app/assets/javascripts/controllers/catalog/catalog_item_form_controller.js
@@ -112,7 +112,7 @@ ManageIQ.angular.app.controller('catalogItemFormController', ['$scope', 'catalog
     vm.catalogItemModel.provisioning_dialog_name = configData.provision.new_dialog_name;
     vm.catalogItemModel.provisioning_key = '';
     vm.catalogItemModel.provisioning_value = '';
-    setExtraVars('provisioning_variables', configData.provision.extra_vars);
+    setExtraVars('provisioning_variables', extra_vars);
 
     if (typeof configData.retirement.repository_id !== 'undefined') {
       vm.catalogItemModel.retirement_repository_id = configData.retirement.repository_id;
@@ -130,8 +130,12 @@ ManageIQ.angular.app.controller('catalogItemFormController', ['$scope', 'catalog
   };
 
   var setExtraVars = function (variableName, extraVars) {
-    if (typeof extraVars !== 'undefined')
-      vm.catalogItemModel[variableName] = extraVars;
+    if (typeof extraVars !== 'undefined') {
+      vm.catalogItemModel[variableName] = {};
+      for (var key in extraVars){
+        vm.catalogItemModel[variableName][key] = extraVars[key]['default'];
+      };
+    }
     $scope.checkFormPristine();
   }
 
@@ -173,6 +177,16 @@ ManageIQ.angular.app.controller('catalogItemFormController', ['$scope', 'catalog
     $scope.angularForm.$setPristine(true);
   };
 
+  var formatExtraVars = function(extraVars){
+    if (typeof extraVars !== 'undefined') {
+      formattedExtraVars = {};
+      for (var key in extraVars){
+        formattedExtraVars[key] = {'default': extraVars[key]};
+      };
+    }
+    return formattedExtraVars;
+  }
+
   var setConfigInfo = function(configData) {
     catalog_item = {
       name: configData.name,
@@ -187,7 +201,7 @@ ManageIQ.angular.app.controller('catalogItemFormController', ['$scope', 'catalog
           playbook_id: configData.provisioning_playbook_id,
           credential_id: configData.provisioning_machine_credential_id,
           hosts: configData.provisioning_inventory,
-          extra_vars: configData.provisioning_variables
+          extra_vars: formatExtraVars(configData.provisioning_variables)
         }
       }
     }
@@ -209,7 +223,7 @@ ManageIQ.angular.app.controller('catalogItemFormController', ['$scope', 'catalog
 
     var retirement = catalog_item['config_info']['retirement'];
     retirement['hosts'] = configData.retirement_inventory;
-    retirement['extra_vars'] = configData.retirement_variables;
+    retirement['extra_vars'] = formatExtraVars(configData.retirement_variables);
     if (vm.catalogItemModel.retirement_repository_id !== undefined && configData.retirement_repository_id !== '') {
       retirement['repository_id'] = configData.retirement_repository_id;
       retirement['playbook_id'] = configData.retirement_playbook_id;

diff --git a/app/views/catalog/_sandt_tree_show.html.haml b/app/views/catalog/_sandt_tree_show.html.haml
@@ -246,7 +246,7 @@
                         %td
                           = h(key)
                         %td
-                          = h(value)
+                          = h(value[:default])
             .form-group
               %label.col-md-3.control-label
                 = _('Dialog')
@@ -321,7 +321,7 @@
                             %td
                               = h(key)
                             %td
-                              = h(value)
+                              = h(value[:default])
 
 :javascript
   miq_tabs_init("#st_tabs");