Merge pull request #6 from masterbeer/master

Nikita · Nikita · commit deb3baf0f63d · 2016-01-17T14:23:57.000+02:00
Dependency level control
diff --git a/cache/projectTemplate.xml b/cache/projectTemplate.xml
@@ -83,10 +83,12 @@ Returns structured class tree with all classes available in current namespace</D
 <Description>
 Return structured data about class.</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>oData:%ZEN.proxyObject,className:%String</FormalSpec>
+<FormalSpec>oData:%ZEN.proxyObject,className:%String,level:%String="",currLevel:%Integer=0</FormalSpec>
 <Private>1</Private>
 <ReturnType>%ZEN.proxyObject</ReturnType>
 <Implementation><![CDATA[
+	if ((level'="")&&(+currLevel>+level)) quit ""
+	set currLevel=$increment(currLevel)
     set classDefinition = ##class(%Dictionary.ClassDefinition).%OpenId(className)
     set compiledClassDefinition = ##class(%Dictionary.CompiledClass).%OpenId(className)
     if (classDefinition = "") || (oData.classes.%DispatchGetProperty(classDefinition.Name) '= "") quit ""
@@ -135,10 +137,10 @@ Return structured data about class.</Description>
         }
         if (..classExists(package _ "." _ p.Type)) {
             set oProp.Type = package _ "." _ p.Type
-            do ..fillClassData(oData, package _ "." _ p.Type)
+            do ..fillClassData(oData, package _ "." _ p.Type, level, currLevel)
         } elseif (..classExists(..extendClassFromType(p.Type))) {
             set oProp.Type = ..extendClassFromType(p.Type)
-            do ..fillClassData(oData, ..extendClassFromType(p.Type))
+            do ..fillClassData(oData, ..extendClassFromType(p.Type), level, currLevel)
         }  else {
             set oProp.Type = ..extendClassFromType(p.Type)
         }
@@ -353,14 +355,14 @@ Returns if class with given name exists.</Description>
 <Description>
 Returns structured class data</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>className:%String,namespace:%String</FormalSpec>
+<FormalSpec>className:%String,namespace:%String,level:%Integer</FormalSpec>
 <ReturnType>%ZEN.proxyObject</ReturnType>
 <Implementation><![CDATA[
     set baseNamespace = $namespace
     zn:$GET(namespace)'="" namespace
     set package = $LISTTOSTRING($LIST($LISTFROMSTRING(className, "."), 1, *-1), ".")
     set oData = ..getBaseOData(package, baseNamespace, "CLASS:"_className)
-    do ..fillClassData(oData, className)
+    do ..fillClassData(oData, className, level)
     quit oData
 ]]></Implementation>
 </Method>
@@ -447,7 +449,7 @@ Returns classTree by given class name</Description>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
     set className = %request.Get("name")
-    set classData = ##class(ClassView).getClassView(className, %request.Get("namespace"))
+    set classData = ##class(ClassView).getClassView(className, %request.Get("namespace"), %request.Get("level"))
     do classData.%ToJSON(, "o")
     return $$$OK
 ]]></Implementation>
@@ -461,7 +463,6 @@ Saves the view preferences</Description>
 <Implementation><![CDATA[
     set name = %request.Get("name")
     set content = %request.Content.Read($$$MaxStringLength) // ~ 7mb
-    set ^test = name
     set ^ClassExplorer("savedView", name) = content
     write "{""OK"":true}"
     return $$$OK
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CacheClassExplorer",
-  "version": "1.13.1",
+  "version": "1.13.4",
   "description": "Class Explorer for InterSystems Caché",
   "directories": {
     "test": "test"
diff --git a/web/index.html b/web/index.html
@@ -135,10 +135,15 @@ <h1>
                                 <td><label for="setting.showQueries">Show Queries</label></td>
                                 <td>Display block with class queries</td>
                             </tr>
-                            <tr>
+							<tr>
                                 <td><input id="setting.showXDatas" type="checkbox"/></td>
                                 <td><label for="setting.showXDatas">Show xDatas</label></td>
                                 <td>Display block with class xDatas</td>
+                            </tr>
+							<tr>
+                                <td><input id="setting.dependencyLevel" type="number" min="0" max="9" step="1" style="width:30px;text-align: center;"></td>
+                                <td><label for="setting.dependencyLevel">Dependency level</label></td>
+                                <td>Dependency level of classes (leave blank for full structure)</td>
                             </tr>
                             </tbody>
                         </table>
diff --git a/web/js/CacheClassExplorer.js b/web/js/CacheClassExplorer.js
@@ -50,13 +50,25 @@ var CacheClassExplorer = function (treeViewContainer, classViewContainer) {
             showProperties: id("setting.showProperties"),
             showMethods: id("setting.showMethods"),
             showQueries: id("setting.showQueries"),
-            showXDatas: id("setting.showXDatas")
+			showXDatas: id("setting.showXDatas"),
+            dependencyLevel: id("setting.dependencyLevel")
         }
     };
-
+	var selfAux = this;
     var settingsValue = function (name, defaultVal) {
-        return localStorage.getItem(name) === null ? (defaultVal || false)
-            : localStorage.getItem(name) === "true"
+		try{
+			if (selfAux.elements.settings[name].type=="checkbox") {
+				return localStorage.getItem(name) === null ? (defaultVal || false)
+					: localStorage.getItem(name) === "true" 
+			}			
+			if (["text", "number"].indexOf(selfAux.elements.settings[name].type) >= 0) {
+				var ret = localStorage.getItem(name);
+				if (ret === null) ret = defaultVal;
+				return ret;
+			}
+		} catch (error) { 
+			return localStorage.getItem(name) === null ? (defaultVal || false)
+				: localStorage.getItem(name) === "true" }
     };
 
     // note: this.elements is required to be modified with the same name as settings keys
@@ -68,7 +80,8 @@ var CacheClassExplorer = function (treeViewContainer, classViewContainer) {
         showProperties: settingsValue("showProperties", true),
         showMethods: settingsValue("showMethods", true),
         showQueries: settingsValue("showQueries", true),
-        showXDatas: settingsValue("showXDatas", true)
+		showXDatas: settingsValue("showXDatas", true),
+        dependencyLevel: settingsValue("dependencyLevel", "")
     };
 
     this.UI = new UI(this);
@@ -97,16 +110,21 @@ CacheClassExplorer.prototype.initSettings = function () {
             console.warn(st, "is Bred Sivoi Cobyly.");
             continue;
         }
-        this.elements.settings[st].checked = this.settings[st];
-        this.elements.settings[st].addEventListener("change", (function (st) {
-            return function (e) {
-                self.elements.settingsExtraText.innerHTML = textChanged;
-                localStorage.setItem(
-                    st,
-                    self.settings[st] = (e.target || e.srcElement).checked
-                );
-            };
-        })(st));
+		
+		if (["text", "number"].indexOf(this.elements.settings[st].type) >= 0) this.elements.settings[st].value = this.settings[st];
+		if (this.elements.settings[st].type == "checkbox")  this.elements.settings[st].checked = this.settings[st];
+		
+		this.elements.settings[st].addEventListener("change", (function (st) {
+			return function (e) {
+				self.elements.settingsExtraText.innerHTML = textChanged;
+				if (["text", "number"].indexOf((e.target || e.srcElement).type) >= 0) self.settings[st] = (e.target || e.srcElement).value
+				if ((e.target || e.srcElement).type == "checkbox") self.settings[st] = (e.target || e.srcElement).checked
+				localStorage.setItem(
+					st,
+					self.settings[st]
+				);
+			};
+		})(st));
     }
 
 };
@@ -153,7 +171,8 @@ CacheClassExplorer.prototype.updateURL = function () {
 
     var obj = {
         name: this.classTree.SELECTED_NAME,
-        type: this.classTree.SELECTED_TYPE
+        type: this.classTree.SELECTED_TYPE,
+		level: this.classTree.SELECTED_LEVEL,
     };
 
     if (this.NAMESPACE) obj["namespace"] = this.NAMESPACE;
diff --git a/web/js/ClassTree.js b/web/js/ClassTree.js
@@ -14,6 +14,7 @@ var ClassTree = function (parent, treeViewContainer) {
     this.SELECTED_NAME = null;
     this.SELECTED_TYPE = null; // "class" || "package"
     this.SELECTED_ELEMENT = null;
+	this.SELECTED_LEVEL = null;
     this.treeObject = null;
 
     this.cacheClassExplorer.elements.classTreeSearch.addEventListener("input", function (e) {
diff --git a/web/js/ClassView.js b/web/js/ClassView.js
@@ -901,8 +901,9 @@ ClassView.prototype.loadClass = function (className) {
 
     this.cacheClassExplorer.classTree.SELECTED_NAME = className;
     this.cacheClassExplorer.classTree.SELECTED_TYPE = "class";
+	this.cacheClassExplorer.classTree.SELECTED_LEVEL = this.cacheClassExplorer.elements.settings["dependencyLevel"].value;
     this.showLoader();
-    this.cacheClassExplorer.source.getClassView(className, function (err, data) {
+    this.cacheClassExplorer.source.getClassView(className, this.cacheClassExplorer.classTree.SELECTED_LEVEL, function (err, data) {
         //console.log(data);
         self.removeLoader();
         if (err) {
diff --git a/web/js/Source.js b/web/js/Source.js
@@ -55,10 +55,10 @@ Source.prototype.getMethod = function (className, methodName, callback) {
  * @param {string} className
  * @param {Source~dataCallback} callback
  */
-Source.prototype.getClassView = function (className, callback) {
-
+Source.prototype.getClassView = function (className, level, callback) { 
     lib.load(
         this.URL + "/GetClassView?name=" + encodeURIComponent(className)
+			+ "&level=" + encodeURIComponent(level)
             + (this.cue.NAMESPACE ? "&namespace=" + encodeURIComponent(this.cue.NAMESPACE) : ""),
         null,
         callback

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "CacheClassExplorer",`
`3`		`- "version": "1.13.1",`
	`3`	`+ "version": "1.13.4",`
`4`	`4`	`"description": "Class Explorer for InterSystems Caché",`
`5`	`5`	`"directories": {`
`6`	`6`	`"test": "test"`