rbbt-rest 1.6.8 → 1.6.9

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

@@ -1,5 +1,3 @@
-rbbt.entity = {}
-
 var Entity = function(data){
  this.id = data.id
  this.code = data.code

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

@@ -9,7 +9,7 @@ var EntityList = function(data){
  }
 
  this.url = function(){
-  var url = "/entity_list/" + this.full_type() + "/" + this.id
+  var url = "/entity_list/" + this.full_type() + "/" + clean_element(this.id)
   return url
  }
 

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

@@ -39,9 +39,9 @@ fav_module.toggleFavourite_entity = function(){
  var entity = rbbt.page.entity();
 
  if (fav_module.isFavourite_entity(entity)){
-  rbbt.post({url: '/remove_favourite_entity/' + entity.type + '/' + entity.code}).then(fav_module.update)
+  rbbt.post({url: '/remove_favourite_entity/' + entity.type + '/' + clean_element(entity.code)}).then(fav_module.update)
  }else{
-  rbbt.post({url: '/add_favourite_entity/' + entity.type + '/' + entity.code, data: entity.info}).then(fav_module.update)
+  rbbt.post({url: '/add_favourite_entity/' + entity.type + '/' + clean_element(entity.code), data: entity.info}).then(fav_module.update)
  }
 }
 
@@ -49,9 +49,9 @@ fav_module.toggleFavourite_list = function(){
  var list = rbbt.page.list();
 
  if (fav_module.isFavourite_list(list)){
-  rbbt.post({url: '/remove_favourite_entity_list/' + list.type + '/' + list.id}).then(fav_module.update)
+  rbbt.post({url: '/remove_favourite_entity_list/' + list.type + '/' + clean_element(list.id)}).then(fav_module.update)
  }else{
-  rbbt.post({url: '/add_favourite_entity_list/' + list.type + '/' + list.id}).then(fav_module.update)
+  rbbt.post({url: '/add_favourite_entity_list/' + list.type + '/' + clean_element(list.id)}).then(fav_module.update)
  }
 }
 
@@ -59,9 +59,9 @@ fav_module.toggleFavourite_map = function(){
  var map = rbbt.page.map();
 
  if (fav_module.isFavourite_map(map)){
-  rbbt.post({url: '/remove_favourite_entity_map/' + map.type + '/' + map.column + '/' + map.id}).then(fav_module.update)
+  rbbt.post({url: '/remove_favourite_entity_map/' + map.type + '/' + map.column + '/' + clean_element(map.id)}).then(fav_module.update)
  }else{
-  rbbt.post({url: '/add_favourite_entity_map/' + map.type + '/' + map.column + '/' + map.id}).then(fav_module.update)
+  rbbt.post({url: '/add_favourite_entity_map/' + map.type + '/' + map.column + '/' + clean_element(map.id)}).then(fav_module.update)
  }
 }
 
@@ -97,119 +97,106 @@ fav_module.draw_favourite_menu = function(){
  var favourites = fav_module.entities.types()
  var types = Object.keys(favourites)
 
- return m('.ui.menu',
-          m('.ui.dropdown.item', [
-           m('i.icon.dropdown'), 
-           'Entities',
-           m('.menu', [m('a.item',{onclick: fav_module.highlight}, 'highlight')].concat(types.map(function(type, index){ 
-            var _type = favourites[type]
-            var entities = Object.keys(_type)
-
-            return m('.ui.dropdown.item', [
-             m('i.icon.dropdown'), 
-             type,
-             m('.menu', entities.map(function(entity, index){ url = _type[entity].url(); return m('a.item', {href: url}, _type[entity].name) }))
-            ]);
+ return rbbt.mview.dropdown('Entities',
+           [m('a.item',{onclick: fav_module.highlight}, 'highlight')].concat(types.map(function(type, index){ 
+             var _type = favourites[type]
+             var entities = Object.keys(_type)
+
+             return m('.ui.dropdown.item', [
+               m('i.icon.dropdown'), 
+               type,
+               m('.menu', entities.map(function(entity, index){ url = _type[entity].url(); return m('a.item', {href: url}, _type[entity].name) }))
+             ]);
            })))
-          ])
-         )
 }
 
 fav_module.draw_favourite_list_menu = function(){
  var favourites = fav_module.lists.types()
  var types = Object.keys(favourites)
 
- return m('.ui.menu',
-          m('.ui.dropdown.item', [
-           m('i.icon.dropdown'), 
-           'Lists',
-           m('.menu', types.map(function(type, index){ 
-            var _type = favourites[type]
-            var lists = Object.keys(_type)
-
-            return m('.ui.dropdown.item', [
-             m('i.icon.dropdown'), 
-             type,
-             m('.menu', lists.map(function(list, index){ 
-              url = _type[list].url()
-              var link = m('a.item', {href: url, style: 'display: inline-block; width: 100%'}, _type[list].name)
-              //return [link, m('span.bullet.green', {onclick: function(){_type[list].highlight('green'); return false}},''),m('br')] 
-              return [link, m('span.bullet.green', {onclick: function(){_type[list].highlight('green'); return false}},''),m('br')] 
-             }))
-            ]);
-           }))
-          ])
-         )
+ var new_list_types = known_types.map(function(type,index){
+   return m('.item', {'data-type': type, onclick: m.withAttr('data-type', fav_module.new_list)}, type)
+ })
+
+ var new_lists = rbbt.mview.dropdown("New list", new_list_types)
+
+ var type_items = types.map(function(type, index){ 
+   var _type = favourites[type]
+   var lists = Object.keys(_type)
+
+   return rbbt.mview.dropdown(type, lists.map(function(list, index){ 
+     url = _type[list].url()
+     var link = m('a.item', {href: url, style: 'display: inline-block'}, _type[list].name)
+     return [m('span.bullet.green', {onclick: function(){_type[list].highlight('green'); return false}},''),link,m('br')] 
+   }))
+ })
+
+ type_items.unshift(new_lists)
+ return rbbt.mview.dropdown('Lists', type_items)
 }
 
 fav_module.draw_favourite_map_menu = function(){
- var favourites = fav_module.maps.types()
- var types = Object.keys(favourites)
-
- return m('.ui.menu',
-          m('.ui.dropdown.item', [
-           m('i.icon.dropdown'), 
-           'Maps',
-           m('.menu', types.map(function(type, index){ 
-            var _type = favourites[type]
-            var maps = Object.keys(_type)
-
-            return m('.ui.dropdown.item', [
-             m('i.icon.dropdown'), 
-             type,
-             m('.menu', maps.map(function(map, index){ 
-              url = _type[map].url()
-              var link = m('a.item', {href: url, _style: 'display: inline-block;width:100%'}, _type[map].name)
-              //return [link, m('span.bullet.green', {onclick: function(){_type[map].highlight('green'); return false}},''),m('br')] 
-              return link
-             }))
-            ]);
-           }))
-          ])
-         )
+  var favourites = fav_module.maps.types()
+  var types = Object.keys(favourites)
+
+  return rbbt.mview.dropdown('Maps',types.map(function(type, index){ 
+    var _type = favourites[type]
+    var maps = Object.keys(_type)
+
+    return m('.ui.dropdown.item', [
+      m('i.icon.dropdown'), 
+      type,
+      m('.menu', maps.map(function(map, index){ 
+        url = _type[map].url()
+        var link = m('a.item', {href: url, _style: 'display: inline-block;width:100%'}, _type[map].name)
+        //return [link, m('span.bullet.green', {onclick: function(){_type[map].highlight('green'); return false}},''),m('br')] 
+        return link
+      }))
+    ]);
+  }))
 }
 
 fav_module.view = function(){
- m.render($('#top_menu > .favourite')[0], [
-  m('.item.pointer', {onclick: fav_module.toggleFavourite}, fav_module.star_view()), 
-  m('.item', {style: 'padding: 0px'}, fav_module.draw_favourite_menu()),
-  m('.item', {style: 'padding: 0px'}, fav_module.draw_favourite_list_menu()),
-  m('.item', {style: 'padding: 0px'}, fav_module.draw_favourite_map_menu())
- ])
+  m.render($('#top_menu > .favourite')[0], [
+    m('.item.pointer', {onclick: fav_module.toggleFavourite}, fav_module.star_view()), 
+    m('.item', {style: 'padding: 0px'}, fav_module.draw_favourite_menu()),
+    m('.item', {style: 'padding: 0px'}, fav_module.draw_favourite_list_menu()),
+    m('.item', {style: 'padding: 0px'}, fav_module.draw_favourite_map_menu())
+  ])
 }
 
 //{{{ HOOKS
 
 fav_module._update_list_select= function(select, type, lists){
- if (select.attr('attr-allow-empty') == 'true'){
-  var option = $('<option value="none" class="loaded">none</option>')
-  select.append(option);
- }
-
- var selected = null;
+  if (select.attr('attr-allow-empty') == 'true'){
+    var option = $('<option value="none" class="loaded">none</option>')
+    select.append(option);
+  }
 
- if (select.attr('attr-selected') != undefined ){
-  selected = select.attr('attr-selected');
- }
+  var selected = null;
 
- $.each(lists, function(name, elems){
-  var option = null;
-  var name = elems
-  if (selected == null || name != selected){
-   option = $('<option attr-entity_type="' + type + '" class="automatic_load" value="' + name.id + '">' + name.id + '</option>');
-  }else{
-   option = $('<option attr-entity_type="' + type + '" class="automatic_load" selected=selected value="' + name.id + '">' + name.id + '</option>');
+  if (select.attr('attr-selected') != undefined ){
+    selected = select.attr('attr-selected');
   }
-  select.append(option);
-  return true
- })
+
+  $.each(lists, function(name, elems){
+    var option = null;
+    var name = elems
+    if (selected == null || name != selected){
+      option = $('<option attr-entity_type="' + type + '" class="automatic_load" value="' + name.id + '">' + name.id + '</option>');
+    }else{
+      option = $('<option attr-entity_type="' + type + '" class="automatic_load" selected=selected value="' + name.id + '">' + name.id + '</option>');
+    }
+    select.append(option);
+    return true
+  })
 },
 
 fav_module.update_list_selects= function(){
- $('select.favourite_lists').find('option.automatic_load').remove()
+  $('select.favourite_lists').find('option.automatic_load').remove()
 
- $.each(fav_module.lists.types(), function(type, lists){
-  $('select.favourite_lists[type=' + type + ']').each(function(){
+  $.each(fav_module.lists.types(), function(type, lists){
+    $('select.favourite_lists[type=' + type + ']').each(function(){
    var select = $(this);
    fav_module._update_list_select(select, type, lists);
   })
@@ -273,6 +260,10 @@ fav_module.highlight = function(){
  rbbt.aesthetics.apply_aesthetic({selector: targets, aes: 'color', value: 'gold'})
 }
 
+fav_module.new_list = function(type){
+  rbbt.modal.controller.show_url('/entity_list/' + type + '/new/?_layout=false')
+}
+
 fav_module.hooks = function(){
  fav_module.update_list_selects()
  fav_module.update_map_selects()
@@ -281,5 +272,3 @@ fav_module.hooks = function(){
 fav_module.update = function(){
  fav_module.update_favourites().then(fav_module.view).then(function(){ $('.dropdown:not([tabindex])').dropdown()}).then(fav_module.hooks)
 }
-
-if (user != 'none') fav_module.update()

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

@@ -0,0 +1,127 @@
+
+rbbt.Job = function(workflow, task, inputs){
+  this.workflow = workflow
+  this.task = task
+  this.inputs = inputs
+
+  this.jobname = m.prop()
+  this.jobURL = function(){ return '/' + workflow + '/' + task + '/' + this.jobname() }
+  this.result = m.prop()
+  this.info = m.prop()
+
+  this.issue = function(){
+    var deferred = m.deferred()
+    
+    if (this.jobname() !== undefined){
+      deferred.resolve(this.jobname())
+      return deferred.promise
+    }
+
+    var url = '/' + workflow + '/' + task
+
+    var data = new FormData()
+    data.append("_format", 'jobname')
+    for (i in inputs){
+      data.append(i, inputs[i])
+    }
+
+    var params = {
+      url: url, 
+      method: 'POST', 
+      serialize: function(data) {return data},
+      data: data,
+      deserialize: function(value) {return value},
+    }
+
+    return rbbt.insist_request(params, deferred).then(this.jobname)
+  }.bind(this)
+
+  this.load = function(){
+    var deferred = m.deferred()
+
+    if (this.result() !== undefined){
+      deferred.resolve(this.result())
+      return deferred.promise
+    }
+
+    var url = add_parameter(this.jobURL(), '_format','raw')
+
+    var data = new FormData()
+    data.append("_format", 'raw')
+
+
+    var params = {
+      url: url, 
+      method: 'GET', 
+      serialize: function(data) {return data},
+      deserialize: function(value) {return value},
+    }
+
+    return rbbt.insist_request(params, deferred).then(this.result)
+  }.bind(this)
+
+  this.get_info = function(){
+    var deferred = m.deferred()
+
+    if (this.info() !== undefined && (this.info().status == 'done' || this.info().status == 'error' || this.info().status == 'aborted')){
+      deferred.resolve(this.info())
+      return deferred.promise
+    }
+
+    var url = add_parameter(this.jobURL() + '/info', '_format','json')
+
+    var params = {
+      url: url, 
+      method: 'GET', 
+      serialize: function(data) {return data},
+      //deserialize: function(value) {return value},
+    }
+
+    return rbbt.insist_request(params, deferred).then(this.info)
+  }.bind(this)
+
+  this.join = function(deferred, timeout){
+    if (undefined === deferred) deferred = m.deferred()
+    if (undefined === timeout) timeout = 1000
+    if (timeout > 5000) timeout = 5000
+
+    this.get_info().then(function(info){
+      var status = info.status
+      switch(status){
+        case "done":
+        case "error":
+        case "aborted":
+          deferred.resolve(info)
+          break;
+        default:
+          setTimeout(function(){this.join(deferred, timeout*1.5)}.bind(this), timeout)
+      }
+    }.bind(this))
+
+    return deferred.promise
+  }.bind(this)
+
+  this.run = function(){
+    var deferred = m.deferred()
+
+    this.issue().then(function(){
+      this.join().then(function(){ this.load().then(deferred.resolve, deferred.reject) }.bind(this))
+    }.bind(this))
+
+    return deferred.promise
+  }.bind(this)
+
+  this.success = function(callback){
+    return this.run()
+  }.bind(this)
+
+  this.error = function(callback){
+    return this.run().then(null, callback)
+  }.bind(this)
+
+}
+
+rbbt.job = function(workflow, task, inputs){
+  var job = new rbbt.Job(workflow, task, inputs)
+  return job.run()
+}

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

@@ -1,3 +1,4 @@
+var rbbt = {}
 
 rbbt.post = function(params){
   var req_params = {config: rbbt.post.asFormUrlEncoded, serialize: rbbt.post.serialize_data, method: 'POST'}
@@ -25,16 +26,3 @@ rbbt.log = function(obj){
  console.log(obj)
 }
 
-rbbt.LS = {}
-
-rbbt.LS.load = function(key){
- var content = localStorage[key]
- if (content === undefined)
-  return undefined
- else
-  return JSON.parse(content)
-}
-
-rbbt.LS.store = function(key, value){
- localStorage[key] = JSON.stringify(value)
-}

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

@@ -1,8 +1,9 @@
-
 var KB = rbbt.knowledge_base = {}
 
 KB.children = function(database, entity){
- var url = '/kb/user/' + database + '/children/' + entity.id
+ var id = undefined
+ if (typeof entity == 'string'){ id = entity}else{id = entity.id}
+ var url = '/kb/user/' + database + '/children/' + id
  url = add_parameter(url, '_format', 'json')
  return m.request({url: url, method: "GET", type: Entity})
 }

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

@@ -0,0 +1,56 @@
+rbbt.modal = {}
+rbbt.modal.element = document.getElementById('modal')
+
+rbbt.modal.vm = (function(){
+  var vm = {}
+  vm.init = function(){
+    vm.visible = m.prop(false)
+    vm.content = m.prop("")
+    vm.title = m.prop("")
+  }
+
+  return vm
+}())
+
+rbbt.modal.controller = function(){
+  var controller = rbbt.modal.controller
+  var vm = rbbt.modal.vm
+  vm.init()
+
+  controller.show = function(content, title){
+    vm.content(content)
+    if (undefined !== title)
+      vm.title(title)
+    vm.visible(true)
+    $(rbbt.modal.element).addClass('active')
+    m.redraw()
+  }
+
+  controller.show_url = function(url, title){
+    if (typeof url == 'string') params = {url: url, method: 'GET',deserialize: function(v){return v}}
+    else params = url
+    return rbbt.insist_request(params).then(function(content){
+      controller.show(content, title)
+    })
+  }
+
+  controller.close = function(){
+    vm.visible(false)
+    $(rbbt.modal.element).removeClass('active')
+    m.redraw()
+  }
+
+  return
+}
+
+rbbt.modal.view = function(controller){
+  if (rbbt.modal.vm.visible()){
+    var header = [m.trust(rbbt.modal.vm.title()), rbbt.mview.ibutton({}, m('i.icon.close',{onclick: rbbt.modal.controller.close}))]
+    var modal_content = [m('.header', header), m('.content', m.trust(rbbt.modal.vm.content()))]
+    return modal_content
+  }else{
+    return ""
+  }
+}
+
+if (rbbt.modal.element) m.module(rbbt.modal.element, rbbt.modal)