Rework deploy/undeploy UI

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

diff --git a/src/main/resources/META-INF/resources/designer/scripts/ToscaModelCtrl.js b/src/main/resources/META-INF/resources/designer/scripts/ToscaModelCtrl.js
index 09a1d0c..2ef866c 100644 (file)
--- a/src/main/resources/META-INF/resources/designer/scripts/ToscaModelCtrl.js
+++ b/src/main/resources/META-INF/resources/designer/scripts/ToscaModelCtrl.js
@@ -36,11 +36,11 @@ app.controller('ToscaModelCtrl',
                                }
                                var editorData = getMsProperty(selectedPolicy);
 
-                               JSONEditor.defaults.options.theme = 'bootstrap3';
-                               JSONEditor.defaults.options.iconlib = 'bootstrap2';
+                               JSONEditor.defaults.options.theme = 'bootstrap4';
+                               //JSONEditor.defaults.options.iconlib = 'bootstrap2';
                                JSONEditor.defaults.options.object_layout = 'grid';
                                JSONEditor.defaults.options.disable_properties = true;
-                               JSONEditor.defaults.options.disable_edit_json = true;
+                               JSONEditor.defaults.options.disable_edit_json = false;
                                JSONEditor.defaults.options.disable_array_reorder = true;
                                JSONEditor.defaults.options.disable_array_delete_last_row = true;
                                JSONEditor.defaults.options.disable_array_delete_all_rows = false;
@@ -64,7 +64,7 @@ app.controller('ToscaModelCtrl',
             if($rootScope.selectedBoxName) {
                var policyType = $rootScope.selectedBoxName.split('_')[0].toLowerCase();
                $scope.toscaModelName = policyType.toUpperCase() + " Microservice";
-               $scope.jsonByPolicyType(policyType, '', '');
+               $scope.jsonByPolicyType($rootScope.selectedBoxName, '', '');
             }
        });
 
@@ -86,14 +86,18 @@ app.controller('ToscaModelCtrl',
         }
 
         $scope.saveToscaProps = function(){
-               var policyType = $rootScope.selectedBoxName.split('_')[0].toLowerCase();
-               var data = $scope.getEditorData();
-
+               var policyType = $rootScope.selectedBoxName;
+            var data = $scope.getEditorData();
             if(data !== null) {
-               saveMsProperties(policyType,data);
-                       if($scope.editor) { $scope.editor.destroy(); $scope.editor = null; }
-                       $modalInstance.close('closed');
-               }
+               var msJson = getMsJson(policyType);
+               msJson["properties"] = data[0];
+               toscaModelService.saveMsProperties(msJson).then(function(pars) {
+                       updateMsProperties(policyType, msJson);
+               }, function(data) {
+               });
+               if($scope.editor) { $scope.editor.destroy(); $scope.editor = null; }
+               $modalInstance.close('closed');
+            }
         }
 
         $scope.displayErrorMessage = function(errors){