Class keywords basic editing, better error display, missed errors display

Author: nikitaeverywhere

package.json

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

source/cache/REST/Editor.cls

@@ -7,11 +7,37 @@ XData UrlMap
 {
 <Routes>
    <Route Url="/save" Method="POST" Call="Save"/>
+   <Route Url="/test" Method="POST" Call="Test"/>
 </Routes>
 }
 
+/// Saves keywords of class members and a class itself.
+ClassMethod SaveKeywords(memberKind As %String, definitionObj, assignObj As %ZEN.proxyObject) As %String [ Private ]
+{
+    set errors = ""
+    #define logError(%e) if (%e '= "") { set errors = errors _ %e _ $Char(10) }
+    set propDefinition =
+        ##class(%Dictionary.ClassDefinition).%OpenId("%Dictionary."_memberKind_"Definition").Properties
+
+    set pName = $order(assignObj.%data(""))
+    while (pName '= "") {
+        if (pName = "$add") { set pName = $order(assignObj.%data(pName)) continue }
+        if (propDefinition.FindObjectId("%Dictionary."_memberKind_"Definition||"_pName) > 0) {
+            if (('$IsObject($PROPERTY(assignObj, pName)))) {
+                set $PROPERTY(definitionObj, pName) = $PROPERTY(assignObj, pName)
+            }
+        } else {
+            $$$logError("Unable to set """_pName_""" property of """_memberKind_""" in "_definitionObj.Name)
+        }
+        set pName = $order(assignObj.%data(pName))
+    }
+    $$$logError($System.Status.GetErrorText(definitionObj.%Save()))
+
+    return errors
+}
+
 /// Saves properties of class properties.
-ClassMethod SaveClassMember(memberKind As %String, classDef As %Dictionary.ClassDefinition, prps As %ZEN.proxyObject) As %String
+ClassMethod SaveClassMember(memberKind As %String, classDef As %Dictionary.ClassDefinition, prps As %ZEN.proxyObject) As %String [ Private ]
 {
     set errors = ""
 
@@ -24,8 +50,6 @@ ClassMethod SaveClassMember(memberKind As %String, classDef As %Dictionary.Class
     #define nextProperty set memberName = $order(properties(memberName)) continue
     #define logError(%e) if (%e '= "") { set errors = errors _ %e _ $Char(10) }
     #define hasErrors errors '= ""
-    set propDefs =
-        ##class(%Dictionary.ClassDefinition).%OpenId("%Dictionary."_memberKind_"Definition").Properties
 
     set memberName = $order(properties(""))
     while (memberName '= "") {
@@ -39,24 +63,14 @@ ClassMethod SaveClassMember(memberKind As %String, classDef As %Dictionary.Class
             set pDef = $System.OBJ.OpenId("%Dictionary."_memberKind_"Definition", classDef.Name_"||"_memberName)
         }
         if (pDef = "") {
-            $$$logError(memberKind_" "_memberName_" not found in "_className)
+            $$$logError("Member """_memberKind_""" named """_memberName_""" not found in "_classDef.Name)
             $$$nextProperty
         }
 
         if ($data(props.%data("$delete"))) {
             set error = $System.Status.GetErrorText(pDef.%Delete(pDef.%Oid()))
         } else { // iterate over properties defined in props and save
-            set pName = $order(props.%data(""))
-            while (pName '= "") {
-                if (pName = "$add") { set pName = $order(props.%data(pName)) continue }
-                if (propDefs.FindObjectId("%Dictionary."_memberKind_"Definition||"_pName) > 0) {
-                    set $PROPERTY(pDef, pName) = $PROPERTY(props, pName)
-                } else {
-                    $$$logError("Unable to set """_pName_""" property of """_memberName_""" in class "_classDef.Name)
-                }
-                set pName = $order(props.%data(pName))
-            }
-            $$$logError($System.Status.GetErrorText(pDef.%Save()))
+            do ..SaveKeywords(memberKind, pDef, props)
         }
 
         $$$nextProperty
@@ -118,6 +132,7 @@ ClassMethod Save() As %Status
         $$$logError(..SaveClassMember("Method", classDef, $PROPERTY(classData, "Methods")))
         $$$logError(..SaveClassMember("Query", classDef, $PROPERTY(classData, "Queries")))
         $$$logError(..SaveClassMember("XData", classDef, $PROPERTY(classData, "XDatas")))
+        $$$logError(..SaveKeywords("Class", classDef, classData))
 
         if ($$$hasErrors) { $$$nextClass }
 
@@ -139,6 +154,12 @@ ClassMethod Save() As %Status
 
 }
 
+ClassMethod Test() As %Status
+{
+    write %request.Content
+    return $$$OK
+}
+
 /// This method is a handler that is executed before each request.
 ClassMethod OnPreDispatch() As %Status
 {

source/client/js/classEditor/class/MANIFEST.js

@@ -136,6 +136,10 @@ export default {
             default: 0,
             type: "boolean"
         },
+        Super: {
+            type: "string",
+            default: ""
+        },
         TimeChanged: {
             ignore: true
         },

source/client/js/classEditor/index.js

@@ -61,7 +61,7 @@ let backButton = onInit(() => {
                     changeIsMade(false);
                     new Toast(Toast.TYPE_DONE, `Saved!`);
                 } else {
-                    new Toast(Toast.TYPE_ERROR, res["error"]);
+                    new Toast(Toast.TYPE_ERROR, res["error"], Toast.TIME_LONG);
                 }
             });
         });

source/client/js/server.js

@@ -15,10 +15,11 @@ function load (url, data, callback) {
 
     xhr.onreadystatechange = () => {
         if (xhr.readyState === 4 && xhr.status === 200) {
-            let data = {};
+            let data = { error: `Unable to parse server response: ` };
             try {
                 data = JSON.parse(xhr.responseText);
             } catch (e) {
+                data.error += xhr.responseText;
                 console.error(e, url, "Unable to parse:", { data: xhr.responseText });
             }
             return callback(data);