Editor property edit fixes, class compilation add, little refactoring

Author: nikitaeverywhere

import.bat

@@ -1,5 +1,8 @@
-:: This batch script makes the Caché application deployment faster. Replace the path below to your
-:: Caché installation and build & import application to Caché only by one command.
+:: This batch script makes the Caché application deployment much faster by building and importing
+:: the project. Replace the path below to your Caché installation and build & import application to
+:: Caché using only one command.
+
+:: Latest NodeJS & Caché 2016.2+ IS REQUIRED TO PROCEED
 
 :: CHANGE THIS PATH TO YOUR CACHÉ INSTALLATION PATH ON WINDOWS
 set CACHE_DIR=C:\Program Files\InterSystems\Cache20162

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cache-visual-editor",
   "printableName": "Cache Visual Editor",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "Visual class editor for InterSystems Caché",
   "main": "index.js",
   "keywords": [

source/cache/VisualEditor.REST.Editor.cls

@@ -21,6 +21,9 @@ ClassMethod Save() As %Status
         znspace ns
     }
 
+    set propDefs =
+        ##class(%Dictionary.ClassDefinition).%OpenId("%Dictionary.PropertyDefinition").Properties
+
     do %request.Content.%CopyToArray(.classes)
     set response = ##class(%ZEN.proxyObject).%New()
     set response.error = ""
@@ -29,8 +32,12 @@ ClassMethod Save() As %Status
     while (className '= "") {
 
         set errorLog = ""
+        set changes = 0
 
-        do classes(className).Properties.%CopyToArray(.properties)
+        set properties = ""
+        if ($ClassName(classes(className).Properties) = "%ZEN.proxyObject") {
+            do classes(className).Properties.%CopyToArray(.properties)
+        }
         set propertyName = $order(properties(""))
         while (propertyName '= "") {
             set pDef = ##class(%Dictionary.PropertyDefinition).%OpenId(className_"||"_propertyName)
@@ -41,31 +48,43 @@ ClassMethod Save() As %Status
                 continue
             }
 
-            set pDef.Description = properties(propertyName).Description
+            // iterate over properties defined
+            set props = properties(propertyName)
+            for j=1:1:propDefs.Count() {
+                set pname = propDefs.GetAt(j).Name
+                if ($data(props.%data(pname))) {
+                    set $PROPERTY(pDef, pname) = $PROPERTY(props, pname)
+                }
+            }
+
             set error = $System.Status.GetErrorText(pDef.%Save())
             if (error '= "") {
                 set errorLog = errorLog _ error _ $Char(10)
             } else {
-                set response.modified = response.modified + 1
+                set changes = changes + 1
             }
 
             set propertyName = $order(properties(propertyName))
         }
 
-        set className = $order(classes(className))
-
         if (errorLog '= "") {
             set response.error = response.error _ errorLog
+            set className = $order(classes(className))
             continue
         }
 
-        set st = $system.OBJ.Compile(className, , .errorLog)
+        set st = $system.OBJ.Compile(className, "cuk-d", .errorLog)
 
-        if (errorLog '= "") {
+        if (errorLog '= 0) {
             set response.error = response.error _ $CHAR(10) _ errorLog
+            set className = $order(classes(className))
             continue
         }
 
+        set response.modified = response.modified + changes
+
+        set className = $order(classes(className))
+
     }
 
     do response.%ToJSON(, "o")

source/client/js/classEditor/card.js

@@ -66,6 +66,7 @@ export function getCardElement (data) {
     head.appendChild(headIcon);
     head.appendChild(header);
     card.appendChild(head);
+    //enableItem(head, data);
 
     card.appendChild(getBlock("Parameters", data));
     card.appendChild(getBlock("Properties", data));

source/client/js/classEditor/card/item.js

@@ -4,14 +4,15 @@ import { addChange } from "../changes";
 
 /**
  * Creates and returns interactive class block property editor.
- * @param data
  * @param classData
  * @param classBlockName
  * @param classBlockPropName
  * @returns {Element}
  */
-function createView (data, classData, classBlockName, classBlockPropName) {
-    let container = block(`div`, `detailed`),
+function createView (classData, classBlockName, classBlockPropName) {
+    let isClass = !classBlockName,
+        data = isClass ? classData : classData[classBlockName][classBlockPropName],
+        container = block(`div`, `detailed`),
         comment = block(`div`, `comment`);
     container.appendChild(comment);
     comment.setAttribute("contenteditable", "true");
@@ -30,17 +31,20 @@ function createView (data, classData, classBlockName, classBlockPropName) {
  * Enables block item interactivity.
  * @param {HTMLElement} element
  * @param {*} classData
- * @param classBlockName
- * @param classBlockPropName
+ * @param [classBlockName]
+ * @param [classBlockPropName]
  */
 export function enableItem (element, classData, classBlockName, classBlockPropName) {
 
-    let data = classData[classBlockName][classBlockPropName],
+    let isClass = !classBlockName,
         opened = false,
         container;
 
     element.addEventListener("click", () => {
-        if (!container) container = createView(data, classData, classBlockName, classBlockPropName);
+        if (!container)
+            container = isClass
+                ? createView(classData)
+                : createView(classData, classBlockName, classBlockPropName);
         if (opened = !opened) {
             insertAfter(container, element);
         } else if (container.parentNode) {