Merge branch 'dev' of https://github.com/terminusdb/terminus-client into dev

Author: KittyJose

lib/dispatchRequest.js

@@ -85,7 +85,6 @@ function DispatchRequest(url, action, payload, local_auth, remote_auth = null) {
         case CONST.READ_DATABASE:
         case CONST.READ_ORGANIZATION:
         case CONST.CONNECT:
-        case CONST.CLASS_FRAME:
         case CONST.GET_CSV:
             if (payload) {
                 const ext = UTILS.URIEncodePayload(payload)

lib/viewer/documentFrame.js

@@ -24,24 +24,6 @@ DocumentFrame.prototype.db = function(dburl){
     return this;
 }
 
-DocumentFrame.prototype.load = function(url, cls){
-	if(url) {
-		if(url.substring(0,4) == "doc:"){
-			url = url.substring(4);
-		}
-		if(this.config.load_schema()){
-			return this.loadComplete(url, cls)
-		}
-		else {
-			return this.loadDocument(url);
-		}
-	}
-	if(cls){
-		return this.loadSchema(cls);
-	}
-	//return Promise.reject
-}
-
 /**
  *  @param {String} url - loads the document frame from the document API in frame form
  *  - loads the frame encapsulates more meta-data in the json and reduces the number of api calls we need to make
@@ -90,28 +72,36 @@ DocumentFrame.prototype.loadJSON = function(json, type){
     console.error("Either docid or clid must be set before load is called")
 }
 
-DocumentFrame.prototype.loadDataFrames = function(dataframes, cls, classframes){
+DocumentFrame.prototype.loadData = function(jsonld, cls, classframes){
 	if(!cls){
 		if(this.document) cls = this.document.cls;
 		else {
-			if(dataframes && dataframes.length && dataframes[0] && dataframes[0].domain){
-				cls = dataframes[0].domain;
+			if(jsonld && jsonld["@type"]){
+				cls = jsonld["@type"];
 			}
 		}
 	}
 	if(cls){
 		if(!this.document){
-			this.document = new ObjectFrame(cls, dataframes, classframes);
+            alert("Yo")
+            this.document = new ObjectFrame(cls, jsonld, classframes);
 		}
 		else {
-			this.document.loadDataFrames(dataframes);
-		}
+            alert("Yo2")
+			this.document.loadJSONLDDocument(jsonld);
+        }
+        alert(this.document.subjid)
 	}
 	else {
 		console.log("Missing Class" + " " + "Failed to add dataframes due to missing class");
 	}
 }
 
+DocumentFrame.prototype.load = function(classframes, doc){
+    this.document = new ObjectFrame(doc["@type"], doc, classframes)    
+}
+
+
 DocumentFrame.prototype.loadSchemaFrames = function(classframes, cls){
 	if(!cls){
 		if(classframes && classframes.length && classframes[0] && classframes[0].domain){
@@ -135,6 +125,29 @@ DocumentFrame.prototype.loadSchemaFrames = function(classframes, cls){
 	}
 }
 
+DocumentFrame.prototype.filterFrame = function(loadRenderer){
+	var myfilt = function(frame, rule){
+		if(typeof rule.render() != "undefined"){
+			frame.render = rule.render();
+		}
+		else {
+			if(rule.renderer()){
+				var renderer = loadRenderer(rule.renderer(), frame, rule.args);		
+			}
+			if(renderer){
+				frame.render = function(fframe){
+					return renderer(fframe);
+				}
+			}
+		}
+		if(rule.compare()){
+			frame.compare = rule.compare();
+		}
+	}
+	this.applyRules(false, false, myfilt);
+}
+
+
 /*
  * adds render and compare functions to object frames
  */

lib/viewer/frameConfig.js

@@ -1,4 +1,3 @@
-
 const Config  = require('./viewConfig.js');
 const FrameRule  = require('./frameRule.js');
 const DocumentFrame  = require('./documentFrame.js');