Class update after save experimental function

Author: nikitaeverywhere

package.json

@@ -2,7 +2,7 @@
   "name": "cache-visual-editor",
   "printableName": "Cache Visual Editor",
   "packageName": "VisualEditor",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "Visual class editor for InterSystems Caché",
   "main": "index.js",
   "keywords": [

source/cache/REST/Editor.cls

@@ -91,7 +91,7 @@ ClassMethod Save() As %Status
     set classes = %request.Content
     set response = {}
     set response.error = ""
-    set response.modified = 0
+    set response.modified = {}
 
     #define logError(%e) if (%e '= "") { set response.error = response.error _ %e _ $Char(10) }
 
@@ -132,7 +132,10 @@ ClassMethod Save() As %Status
             continue
         }
 
-        set response.modified = response.modified + 1
+        do response.modified.$set(className, {
+            "success": 1,
+            "class": ##class(VisualEditor.REST.Informer).GetClassData(className)
+        })
 
     }
 

source/cache/REST/Informer.cls

@@ -71,6 +71,9 @@ ClassMethod GetClassData(className As %String) As %Object
     set oClass = {}
     if (class = "") { return oClass }
 
+    do oClass.$set("_type", "class")
+    do oClass.$set("_fullName", className)
+    do oClass.$set("_name", $PIECE(className, ".", *))
     do oClass.$set("_isDataType", class.ClientDataTypeIsDefined())
     do oClass.$set("_isOdbcType", class.OdbcTypeIsDefined())
     do oClass.$set("_isSoapBindingStyle", class.SoapBindingStyleIsDefined())
@@ -133,9 +136,6 @@ ClassMethod List() As %Status
         } elseif ($LENGTH(clsName, ".") = $LENGTH(baseLevel, ".")) {
             set className = $PIECE(clsName, ".", $LENGTH(baseLevel, "."))
             set oClass = ..GetClassData(clsName)
-            do oClass.$set("_type", "class")
-            do oClass.$set("_fullName", clsName)
-            do oClass.$set("_name", className)
             do data.$set(className, oClass)
         } else {
             continue

source/client/js/AutoGrid

@@ -20,7 +20,7 @@ export function getClassElement (data, serviceData = {}) {
         }`),
         header = block(`div`, `header`);
 
-    serviceData[`visualClassElement`] = card;
+    serviceData[`cardElement`] = card;
     serviceData[`cardWidth`] = 1;
 
     if (type === "class") // float priority

source/client/js/classEditor/class/index.js

@@ -194,7 +194,7 @@ function enableMember ({
 
         if (classBlockName === "Methods" || classBlockName === "XDatas") {
             serviceData[`visualCodeBlocksOpened`] += opened ? 1 : -1;
-            updateGridElement(serviceData[`visualClassElement`], {
+            updateGridElement(serviceData[`cardElement`], {
                 width: serviceData[`cardWidth`] = serviceData[`visualCodeBlocksOpened`] > 0 ? 2 : 1
             });
         }

source/client/js/classEditor/class/member.js

@@ -12,7 +12,7 @@ export const MEMBER_SECTIONS = [
     "XDatas"
 ];
 
-function getMemberControls (body, classData, classBlockName) {
+function getMemberControls (body, classData, classBlockName, serviceData) {
 
     let controls = block(`div`, `controls`),
         add = block(`div`, `interactive normal icon add`);
@@ -34,7 +34,7 @@ function getMemberControls (body, classData, classBlockName) {
 
             classData[classBlockName][propName] = { Name: propName };
             body.appendChild(getMemberBlock({
-                classData, classBlockName, classBlockPropName: propName
+                classData, classBlockName, classBlockPropName: propName, serviceData
             }));
 
             updateGrid();
@@ -62,7 +62,7 @@ export function getMemberSection (classBlockName, classData, serviceData) {
     let header = block(`div`, `header`),
         span = block(`span`, `title`);
     body = block(`div`, `body`);
-    header.appendChild(getMemberControls(body, classData, classBlockName));
+    header.appendChild(getMemberControls(body, classData, classBlockName, serviceData));
     header.appendChild(span);
     span.textContent = classBlockName;
     section.appendChild(header);

source/client/js/classEditor/class/memberSection.js

@@ -9,7 +9,8 @@ import { init as initTerminal } from "./modules/terminal";
 
 var PATH = "",
     INITIALIZED = false,
-    NAMESPACE = "";
+    NAMESPACE = "",
+    CLASSES_RENDERED = {}; // { className: serviceData }
 
 let initCallbacks = [];
 
@@ -65,12 +66,32 @@ let footer = onInit(() => {
         saveButton = document.querySelector("#saveIndicator");
         saveButton.addEventListener("click", () => {
             saveChanges(NAMESPACE, (res) => {
+
                 if (!res["error"]) {
                     changeIsMade(false);
                     new Toast(Toast.TYPE_DONE, `Saved!`);
                 } else {
                     new Toast(Toast.TYPE_ERROR, res["error"], Toast.TIME_LONG);
                 }
+
+                // // REPLACES CLASS ON SAVE (temporary commented as side effects appear)
+                // for (let className in res[`modified`] || {}) { // update modified classes
+                //     let renderedServiceData = CLASSES_RENDERED[className];
+                //     // [`cardElement`] is assigned during new class spawn.
+                //     if (
+                //         !(renderedServiceData || {})[`cardElement`]
+                //         || !res[`modified`][className][`success`]
+                //         || !res[`modified`][className][`class`]
+                //     )
+                //         continue;
+                //     let b, a;
+                //     grid.replaceChild(
+                //         b = renderedServiceData[`cardElement`],
+                //         a = applyClass(res[`modified`][className][`class`], renderedServiceData)
+                //     );
+                //     console.log("replacing", b, a);
+                // }
+
             });
         });
     }),
@@ -124,8 +145,8 @@ let footer = onInit(() => {
                 } else {
                     setup["_fullName"] = fullName;
                 }
-                
-                grid.applyChild(getClassElement(setup));
+
+                grid.applyChild(applyClass(setup));
 
                 if (type !== "package")
                     addChange([fullName, "$add"], true);
@@ -256,6 +277,16 @@ function setTitle (text) {
     document.querySelector("#topTitle").textContent = text;
 }
 
+/**
+ * Attaches new class to the body and returns it's element.
+ * @param classMetadata
+ * @param serviceData
+ */
+function applyClass (classMetadata, serviceData = {}) {
+    CLASSES_RENDERED[classMetadata[`_fullName`] || classMetadata[`Name`]] = serviceData;
+    return getClassElement(classMetadata, serviceData);
+}
+
 /**
  * Displays the classes and packages located on the current level.
  * @param {string} level - Class part.
@@ -273,11 +304,12 @@ export function loadLevel (level) {
 
     getList(NAMESPACE, PATH, (data) => {
         grid.clear();
+        CLASSES_RENDERED = {};
         if (PATH !== "")
             backButton.style.display = "";
         data = orderData(data);
         for (let obj in data) {
-            grid.applyChild(getClassElement(data[obj]));
+            grid.applyChild(applyClass(data[obj]));
         }
     });