Issue/#81 json schema for json diagram config (#96)

* Intermediate commit. Already setup editor and part of schema * Add outstanding json editor files * Intermediate commit. Done with schema * JSON validation & save * Outstanding icons for JSON editor * Fix: remove JSON data and leave structure only
basicrum · Apr 13, 2020 · fa15d1f · fa15d1f
1 parent 6ca4413
commit fa15d1f
Show file tree

Hide file tree

Showing 8 changed files with 993 additions and 13 deletions.
diff --git a/public/js/widgets/widget_actions.js b/public/js/widgets/widget_actions.js
@@ -3,8 +3,10 @@ var itemActions = (function($){
         createURL   = '/widget/save';
 
     var saveItem    = function(formId, crud=null){
-        var formData    = $(formId).serialize();
-        requestAJAX.post(`${editURL}${appData.itemId}`, formData)
+        var formData    = $(formId).serializeArray(),
+            jsonData    = JSON.stringify(appData.jsonEditor.get());
+        formData.push({name: "widget", value: jsonData});
+        requestAJAX.post(`${editURL}${appData.itemId}`, $.param(formData))
             .done(function(response){
                 var res = JSON.parse(response);
                 if (res.status == 'error')
@@ -29,8 +31,11 @@ var itemActions = (function($){
     }
 
     var createItem  = function(){
-        formData    = $(appData.modalFormId).serialize();
-        requestAJAX.post(createURL, formData)
+        var formData    = $(appData.modalFormId).serializeArray(),
+            jsonData    = JSON.stringify(appData.jsonEditor.get());
+
+        formData.push({name: "widget", value: jsonData});
+        requestAJAX.post(createURL, $.param(formData))
             .done(function(response){
                 var res = JSON.parse(response);
                 if (res.status == 'error') // error occured

diff --git a/public/js/widgets/widget_crud_actions.js b/public/js/widgets/widget_crud_actions.js
@@ -71,7 +71,7 @@ var crudActions = (function($){
             .done(function(response){
                 var info = JSON.parse(response);
                 $('#name').val(info.name);
-                $('#widget').val(info.widget);
+                appData.jsonEditor.set(JSON.parse(info.widget));
             });
 
         modalShow(formModalId);
@@ -82,8 +82,6 @@ var crudActions = (function($){
         itemActions.itemInfo(itemId)
             .done(function(response){
                 var info = JSON.parse(response);
-                /*$('#name').val(info.name);
-                $('#widget').val(info.widget);*/
                 $('#modalWidgetLabel').html(info.name);
                 $.ajax('/widget/generate_diagram',{
                     method: 'post',