rbbt-rest 1.7.17 → 1.7.18

data/share/views/public/js/rbbt.aesthetics.js

@@ -12,9 +12,21 @@ aes_module.map_aesthetic = function(aes, mapper, map_obj){
     case 'gradient':
       return get_gradient(aes, 'green', 'red')
     case 'sign-gradient':
-      return get_sign_gradient(aes, 'green', 'white', 'red')
+      return get_sign_gradient(aes, 'green', 'grey', 'red')
     case 'map':
-      return aes.map(function(value){ map_obj[value] })
+      if (typeof aes == 'object')
+        return aes.map(function(value){ return map_obj[value] })
+      else
+        return map_obj[aes]
+    case 'function':
+      var res = []
+      if (typeof aes == 'object')
+        for (i in aes) res.push(map_obj(aes[i]))
+      else
+        res = map_obj(aes)
+      return res
+    case 'list_function':
+      return map_obj(aes)
   }
 }
 

data/share/views/public/js/rbbt.basic.js

@@ -5,39 +5,13 @@ rbbt.mlog = function(data){
 // AJAX
 
 rbbt.ajax = function(params){
-  params.config = function(xhr, options){ xhr.setRequestHeader( "X-Requested-With", "XMLHttpRequest"); return xhr; }
   if (undefined === params.method) params.method = "GET"
-  return m.request(params)
-}
-
-rbbt.post = function(url, data, params){
-  var request_params
-  if (typeof url === 'object'){
-    request_params = url
-    if (data) request_params.data = data
+  if (rbbt.proxy && params.url.indexOf('//') < 0 && params.url.indexOf('/') == 0){
+    params.url = rbbt.proxy + params.url
   }else{
-
-    if (undefined === params)  params = {}
-    if (undefined === params.url) params.url = url
-
-    request_params = {url: url, method: "POST", data: data, serialize: function(formData){return formData} }
+    params.config = function(xhr, options){ xhr.setRequestHeader( "X-Requested-With", "XMLHttpRequest"); return xhr; }
   }
-
-  if (undefined === request_params.method) request_params.method = 'POST'
-  if (undefined === request_params.serialize) request_params.serialize = function(formData) {return formData}
-
-  if (request_params.data){
-    var formData = new FormData()
-    forHash(request_params.data, function(key,value){
-      if (typeof value == 'object')
-        formData.append(key, JSON.stringify(value))
-      else
-        formData.append(key, value)
-    })
-    request_params.data = formData
-  }
-
-  return rbbt.ajax(request_params)
+  return m.request(params)
 }
 
 rbbt.insist_request = function(params, deferred, timeout, missing){
@@ -70,6 +44,38 @@ rbbt.insist_request = function(params, deferred, timeout, missing){
   return deferred.promise
 }
 
+rbbt.post = function(url, data, params){
+  var request_params
+  if (typeof url === 'object'){
+    request_params = url
+    if (data) request_params.data = data
+  }else{
+
+    if (undefined === params)  params = {}
+    if (undefined === params.url) params.url = url
+
+    request_params = {url: url, method: "POST", data: data, serialize: function(formData){return formData} }
+  }
+
+  if (undefined === request_params.method) request_params.method = 'POST'
+  if (undefined === request_params.serialize) request_params.serialize = function(formData) {return formData}
+
+  if (request_params.data){
+    var formData = new FormData()
+    forHash(request_params.data, function(key,value){
+      if (typeof value == 'object')
+        formData.append(key, JSON.stringify(value))
+      else
+        if (undefined !== value) formData.append(key, value)
+    })
+    request_params.data = formData
+  }
+
+  //return rbbt.ajax(request_params)
+  return rbbt.insist_request(request_params)
+}
+
+
 // LocalStorage
 
 rbbt.LS = {}

data/share/views/public/js/rbbt.entity.basic.js

@@ -0,0 +1,77 @@
+rbbt.entity = {}
+rbbt.entity_array = {}
+rbbt.entity_list = {}
+
+rbbt.entity.property = function(code, type, info, name, args){
+  if (info.format && ! type.indexOf(":") < 0){
+    type = type + ':' + info.format
+  }
+  var url = "/entity_property/" + name + "/" + type + "/" + code
+  url = add_parameters(url, info)
+  if (undefined !== args){ 
+    var arg_str
+    if (typeof args == 'string'){
+      arg_str = args
+    }else{
+      arg_str = JSON.stringify(args)
+    }
+    url = add_parameter(url, "args", arg_str)
+  }
+  return rbbt.insist_request({url: url})
+}
+
+rbbt.entity_array.property = function(codes, type, info, name, args){
+  var promises = []
+  forArray(codes, function(code){
+    promises.push(rbbt.entity.property(code,type,info,name,args))
+  })
+  return m.sync(promises)
+}
+
+rbbt.entity_array.property = function(codes, type, info, name, args){
+  if (info.format && ! type.indexOf(":") < 0){
+    type = type + ':' + info.format
+  }
+  var url = "/entity_list_property/" + name + "/" + type
+
+  var data = {list: codes.join(","), args: args, info: info}
+  return rbbt.post(url, data)
+}
+
+rbbt.entity_array.parents = function(codes, type, database){
+   var url = '/knowledge_base/user/' + database + '/collection_parents' 
+   
+   var collection = {}
+   collection[type] = codes
+   
+   var data = {}
+   data.collection = collection
+   data._format = 'tsv_json'
+   
+   return rbbt.post(url, data)
+}
+
+rbbt.entity_array.children = function(codes, type, database){
+   var url = '/knowledge_base/user/' + database + '/collection_parents' 
+   
+   var collection = {}
+   collection[type] = codes
+   
+   var data = {}
+   data.collection = collection
+   data._format = 'tsv_json'
+   
+   return rbbt.post(url, data)
+}
+
+rbbt.entity_array.subset = function(database, source, target){
+   var url = '/knowledge_base/user/' + database + '/subset' 
+
+   var data = {}
+   var source = source.join(",")
+   data._format = 'tsv_json'
+   data.source = source
+   if (target) data.target = target.join(",")
+
+   return rbbt.post(url, data)
+}

data/share/views/public/js/rbbt.entity_list.js

@@ -1,63 +1,123 @@
 
+var EntityArray = function(array){
+  this.entities = array
+
+  this.get = function(){ 
+    var result = m.deferred();
+
+    var codes = []
+    for (i in this.entities){
+      codes.push(this.entities[i].code)
+    }
+    type = this.entities[0].type
+    format = this.entities[0].format
+    info = this.entities[0].info
+    result.resolve({entities: codes, entity_type: type, info: info})
+
+    return(result.promise)
+  }
+
+  this.get_entities = function(func){
+    var result = m.deferred();
+
+    result.resolve(this.entities)
+
+    return(result.promise)
+  }
+
+
+  this.property = function(name, args){
+    var result = m.deferred();
+    var promises = []
+
+    for (i in this.entities){
+      var entity = this.entities[i];
+      promises.push(entity.property(name, args))
+    }
+
+    m.sync(promises).then(result.resolve)
+
+    return(result.promise)
+  }
+
+  this.codes = function(){
+  }
+
+  this.children = function(knowledgebase, database){
+    var db_key = [database, knowledgebase].join("@")
+    return rbbt.knowledge_base.list_children(db_key, this)
+  }
+
+  this.parents = function(knowledgebase, database){
+    var db_key = [database, knowledgebase].join("@")
+    return rbbt.knowledge_base.list_parents(db_key, this)
+  }
+
+  this.subset = function(knowledgebase, database){
+    var db_key = [database, knowledgebase].join("@")
+    return rbbt.knowledge_base.list_subset(db_key, this)
+  }
+}
+
 var EntityList = function(data){
- this.id = data.id
- this.name = data.id
- this.type = data.type
+  this.id = data.id
+  this.name = data.id
+  this.type = data.type
 
- this.full_type = function(){
-  return this.type
- }
+  this.full_type = function(){
+    return this.type
+  }
 
- this.url = function(){
-  var url = "/entity_list/" + this.full_type() + "/" + clean_element(this.id)
-  return url
- }
+  this.url = function(){
+    var url = "/entity_list/" + this.full_type() + "/" + clean_element(this.id)
+    return url
+  }
 
- this.get = function(){ 
-  if (undefined === this.entities && ! this.loading){
-    var url = this.url()
-    url = add_parameter(url, '_format', 'json')
-    list = this
-    this.loading = m.request({url: url, method: 'GET'}).then(this.entities).then(function(x){ list.loading = undefined; return x})
-    return this.loading
-  }else{
-    var deferred = m.deferred()
-    if (this.loading)
-      this.loading.then(function(x){ deferred.resolve(x)})
-    else
-      deferred.resolve(this.entities)
-    return deferred.promise
+  this.get = function(){ 
+    if (undefined === this.entities && ! this.loading){
+      var url = this.url()
+      url = add_parameter(url, '_format', 'json')
+      list = this
+      this.loading = m.request({url: url, method: 'GET'}).then(this.entities).then(function(x){ list.loading = undefined; return x})
+      return this.loading
+    }else{
+      var deferred = m.deferred()
+      if (this.loading)
+        this.loading.then(function(x){ deferred.resolve(x)})
+      else
+        deferred.resolve(this.entities)
+      return deferred.promise
+    }
   }
- }
 
- this.get_entities = function(func){
-   var result = m.deferred();
+  this.get_entities = function(func){
+    var result = m.deferred();
 
-   this.get().then(function(list_data){
-     var item_values = []
-     forArray(list_data.entities, function(entity_code){
-       item_values.push(new Entity({code: entity_code, info: list_data.info}))
-     })
-     result.resolve(item_values)
-   })
+    this.get().then(function(list_data){
+      var item_values = []
+      forArray(list_data.entities, function(entity_code){
+        item_values.push(new Entity({code: entity_code, info: list_data.info}))
+      })
+      result.resolve(item_values)
+    })
 
-   return(result.promise)
- }
+    return(result.promise)
+  }
 
- this.property = function(name, args){
-  var url = "/entity_list_property/" + name + "/" + this.full_type() + "/" + clean_element(this.id)
-  if (undefined !== args) 
-    if ('string' === typeof args)
-      url = add_parameter(url, "args", args)
+  this.property = function(name, args){
+    var url = "/entity_list_property/" + name + "/" + this.full_type() + "/" + clean_element(this.id)
+    if (undefined !== args) 
+      if ('string' === typeof args)
+        url = add_parameter(url, "args", args)
     else
       url = add_parameter(url, "args", JSON.stringify(args))
-  return rbbt.insist_request({url: url})
- }
+    return rbbt.insist_request({url: url})
+  }
 
- this.children = function(knowledgebase, database){
-   var db_key = [database, knowledgebase].join("@")
-   return rbbt.knowledge_base.list_children(db_key, this)
- }
+  this.children = function(knowledgebase, database){
+    var db_key = [database, knowledgebase].join("@")
+    return rbbt.knowledge_base.list_children(db_key, this)
+  }
 
  this.parents = function(knowledgebase, database){
    var db_key = [database, knowledgebase].join("@")

data/share/views/public/js/rbbt.exception.js

@@ -10,7 +10,7 @@ rbbt.exception.report = function(err){
   var stack = err.stack
   if(undefined === stack) stack = "No stack trace"
   if (rbbt.modal){
-    stack = "<ul><li>" + stack.replace(/\n/g, '</li><li>') + '<li/></ul>'
+    stack = "<ul class='stacktrace'><li>" + stack.replace(/\n/g, '</li><li>') + '<li/></ul>'
     stack = stack.replace(/<li><li\/>/g,'').replace(/<li>(.*?)@(.*?):(\d+:\d+)<\/li>/g, '<li>$2<span style="font-weight:bold">$3</span><br/><em>$1</em></li>')
     rbbt.modal.controller.error(m('.ui.error.message', [m('.header', err), m('.description', m.trust(stack))]), "Application Error")
   }else{

data/share/views/public/js/rbbt.knowledge_base.js

@@ -45,7 +45,7 @@ KB.list_children = function(database, list){
    var url = '/knowledge_base/user/' + database + '/collection_children' 
 
    var collection = {}
-   collection[list.type] = list_info.entities
+   collection[list_info.entity_type] = list_info.entities
 
    var data = {}
    data.collection = JSON.stringify(collection)

data/share/views/public/js/rbbt.plots.js

@@ -227,14 +227,14 @@ rbbt.plots.svg_obj = function(aes){
   return m('foreignObject', location, m('body[xmlns="http://www.w3.org/1999/xhtml"]',tile))
 }
 
-rbbt.plots.d3js_graph = function(graph, object){
-  var xsize = 300, ysize = 200
-  var width = 1200
-      height = 800
+rbbt.plots.d3js_graph = function(graph, object, node_obj){
+  var xsize = 40, ysize = 40
+  var width = 1000
+      height = 500
 
   var color = d3.scale.category20();
 
-  forArray(graph.nodes, function(node){node.width=300; node.height=200})
+  forArray(graph.nodes, function(node){node.width=40; node.height=40})
 
   var svg = d3.select(object)
       .attr("width", "100%")
@@ -249,28 +249,35 @@ rbbt.plots.d3js_graph = function(graph, object){
       .start()
 
   force.on("tick", function() {
-    link.attr("x1", function(d) { return d.source.x + xsize/2; })
-        .attr("y1", function(d) { return d.source.y + ysize/2; })
-        .attr("x2", function(d) { return d.target.x + xsize/2; })
-        .attr("y2", function(d) { return d.target.y + ysize/2; });
+    link.attr("x1", function(d) { return d.source.x + 0*xsize/2; })
+        .attr("y1", function(d) { return d.source.y + 0*ysize/2; })
+        .attr("x2", function(d) { return d.target.x + 0*xsize/2; })
+        .attr("y2", function(d) { return d.target.y + 0*ysize/2; });
 
-    node.attr("x", function(d) { return d.x; })
-        .attr("y", function(d) { return d.y; });
+    node.attr("transform", function(d) { return 'translate('+d.x+','+d.y+')'; })
   })
 
   var link = svg.selectAll(".link").data(graph.links).enter()
       .append("line").attr("class", "link")
-        .style("stroke-width", 5)
+        .style("stroke-width", 5).style('stroke', 'grey')
 
-  var node = svg.selectAll(".node").data(graph.nodes).enter()
-      .append("foreignObject").attr("class", "node")
-        .attr('width',xsize)
-        .attr('height',ysize).html(function(d){ return mrender(rbbt.plots.card_obj(d)) })
-      .call(force.drag)
+  var node = svg.selectAll(".node").
+      data(graph.nodes).
+      enter()
+
+  if (undefined === node_obj){
+      node = node.append("foreignObject").html(function(d){ 
+            return mrender(rbbt.plots.card_obj(d)) 
+        }).attr('width',xsize).attr('height',ysize)
+  }else{
+      node = node_obj(node)
+  }
+
+  node.call(force.drag)
 
 
   rbbt.log("force:warmup")
-  for(i=0; i<1000; i++) force.tick()
+  for(i=0; i<100; i++) force.tick()
 
   rbbt.log("force:panZoom")
   svgPanZoom(object)
@@ -354,7 +361,7 @@ rbbt.plots.make_groups = function(graph, nodes, rbbt_groups){
 }
 
 
-rbbt.plots.d3js_group_graph = function(graph, object){
+rbbt.plots.d3js_group_graph = function(graph, object, node_obj){
   var xsize = 300, ysize = 200, pad = 20
   var width = 1200
       height = 800
@@ -438,7 +445,12 @@ rbbt.plots.d3js_group_graph = function(graph, object){
 
   var node = svg.selectAll(".node").data(graph.nodes).enter()
       .append("foreignObject").attr("class", "node").attr('width',xsize).attr('height',ysize)
-      .html(function(d){ return mrender(rbbt.plots.card_obj(d)) })
+      .html(function(d){ 
+          if (undefined == node_obj)
+              return mrender(rbbt.plots.card_obj(d)) 
+          else
+              return node_obj(d)
+      })
       .call(force.drag)
 
   //var node = svg.selectAll(".node").data(graph.nodes).enter()