adding actions to terminus client api

Author: kevinchekovfeeney

lib/const.js

@@ -39,5 +39,6 @@ module.exports = Object.freeze({
     UPDATE_CSV: 'update_csv',
     DELETE_CSV: 'delete_csv',
     MESSAGE: 'message',
+    ACTION: 'action',
     INFO: 'info'
 })

lib/dispatchRequest.js

@@ -86,6 +86,7 @@ function DispatchRequest(url, action, payload, local_auth, remote_auth = null) {
         case CONST.READ_ORGANIZATION:
         case CONST.CONNECT:
         case CONST.GET_CSV:
+        case CONST.MESSAGE:
         case CONST.INFO:
             if (payload) {
                 const ext = UTILS.URIEncodePayload(payload)
@@ -101,35 +102,10 @@ function DispatchRequest(url, action, payload, local_auth, remote_auth = null) {
                     }
                     throw e
                 })
-        case CONST.MESSAGE:
-            if (payload) {
-                const ext = UTILS.URIEncodePayload(payload)
-                if (ext) url += `?api:message=${ext}`
-            }
-            return axiosInstance
-                .get(url, options)
-                .then(response => response.data)
-                .catch(err => {
-                    let e = new Error(ErrorMessage.getAPIErrorMessage(url, options, err))
-                    if (err.response && err.response.data) {
-                        e.data = err.response.data
-                    }
-                    throw e
-                })
         case CONST.ADD_CSV:
-            options.headers = options.headers ? options.headers : {}
-            options.headers['Content-Type'] = 'application/form-data'
-            return axiosInstance
-                .put(url, payload, options)
-                .then(response => response.data)
-                .catch(err => {
-                    const e = new Error(ErrorMessage.getAPIErrorMessage(url, options, err))
-                    if (err.response && err.response.data) e.data = err.response.data
-                    throw e
-                })
         case CONST.INSERT_TRIPLES:
             options.headers = options.headers ? options.headers : {}
-            options.headers['Content-Type'] = 'application/json'
+            options.headers['Content-Type'] = 'application/form-data'
             return axiosInstance
                 .put(url, payload, options)
                 .then(response => response.data)

lib/query/woqlBuilder.js

@@ -51,11 +51,12 @@ WOQLQuery.prototype.iri = function(s) {
     }
 }
 
-WOQLQuery.prototype.update_triple = function(subject, predicate, new_object) {
+WOQLQuery.prototype.update_triple = function(subject, predicate, new_object, old_object) {
+    old_object = old_object || "v:AnyObject"
     return this.and(
         new WOQLQuery().opt(
-            new WOQLQuery().triple(subject, predicate, "v:AnyObject")
-            .delete_triple(subject, predicate, "v:AnyObject")
+            new WOQLQuery().triple(subject, predicate, old_object)
+            .delete_triple(subject, predicate, old_object)
             .not().triple(subject, predicate, new_object)
         ),
         new WOQLQuery().add_triple(subject, predicate, new_object)

lib/query/woqlCore.js

@@ -262,7 +262,7 @@ WOQLQuery.prototype.cleanPredicate = function(p) {
     return this.expandVariable(pred)
 }
 
-WOQLQuery.prototype.wellKnownPredicate = function(p) {
+WOQLQuery.prototype.wellKnownPredicate = function(p, noxsd) {
     if (this.vocab && this.vocab[p]){
         let full = this.vocab[p]
         let start = full.substring(0, 3)

lib/utils.js

@@ -115,6 +115,8 @@ Utils.compareIDs = function(ida, idb) {
     return false
 }
 
+
+
 /**
  * Shortens a URL to its compressed format - returns the full URL if not possible
  */
@@ -145,6 +147,68 @@ Utils.unshorten = function(url) {
     return url
 }
 
+
+/* shortens a jsonld document to its prefixed form */ 
+Utils.json_shorten = function(jsonld, prefixes) {
+    const shorten_json_val = (val, prefixes) => {
+        if(Array.isArray(val)){
+            let nvals = []
+            for(var i = 0; i<val.length; i++){
+                nvals.push(shorten_json_val(val[i], prefixes))
+            }
+            return nvals
+        }
+        else if(typeof val == "object"){
+            return this.json_shorten(val, prefixes)
+        }
+        else if(typeof val == "string"){
+            return this.shorten(val, prefixes)
+        }
+        else {
+            return val
+        }
+    }
+    prefixes = prefixes || jsonld["@context"]
+    let nujson = {}
+    for(var key in jsonld){
+        let nkey = (key[0] == "@" ? key : this.shorten(key, prefixes))
+        let nval = shorten_json_val(jsonld[key], prefixes)
+        nujson[nkey] = nval
+    }
+    return nujson
+}
+
+/* Unshortens a jsonld document to its full form */ 
+Utils.json_unshorten = function(jsonld, prefixes) {
+    const unshorten_json_val = (val, prefixes) => {
+        if(Array.isArray(val)){
+            let nvals = []
+            for(var i = 0; i<val.length; i++){
+                nvals.push(unshorten_json_val(val[i], prefixes))
+            }
+            return nvals
+        }
+        else if(typeof val == "object"){
+            return this.json_unshorten(val, prefixes)
+        }
+        else if(typeof val == "string"){
+            return this.unshorten(val, prefixes)
+        }
+        else {
+            return val
+        }
+    }
+    prefixes = prefixes || jsonld["@context"]
+    let nujson = {}
+    for(var key in jsonld){
+        let nkey = (key[0] == "@" ? key : this.unshorten(key, prefixes))
+        let nval = unshorten_json_val(jsonld[key], prefixes)
+        nujson[nkey] = nval
+    }
+    return nujson
+}
+
+
 /**
  * Tests a string to see if it is a valid URL -
  * Valid URLs are those that start with http:// or https://

lib/viewer/documentFrame.js

@@ -1,6 +1,7 @@
 const ObjectFrame = require("./objectFrame");
 const FrameConfig = require("./frameConfig");
 const FrameHelper = require("../utils");
+const WOQL = require("../woql");
 
 /**
  * @file Document Frame 

lib/viewer/frameRule.js

@@ -502,7 +502,7 @@ FramePattern.prototype.getRendererType = function (frame) {
 	if (frame.isObject()) return 'object';
 	if (frame.isData()) return 'data';
 	if (frame.renderer_type) return frame.renderer_type;
-	console.log(new Error(`frame configuration passed non-renderer type ${frame.constructor.name}`));
+	console.log(frame, new Error(`frame configuration passed non-renderer type ${frame.constructor.name}`));
 	return false;
 };