rbbt-rest 1.8.51 → 1.8.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65d315a1aede3fcdac01d916d54cfdabf5dfc132
-  data.tar.gz: f25e1fe1e2d9be5460a4821067c9e6a389582183
+  metadata.gz: e414c27e3ed3a44c1a059d25e2f050391a81a8c6
+  data.tar.gz: 46ac7dc29040a1e1c88d262793cdf756d839870e
 SHA512:
-  metadata.gz: 309ba34ab698e6402651aa00a45fa48156e401bf6051b5c720621dd0989b02cc73284de9fc81b769c2c665cb87464458f27fc86ee8a6978db0257f26c0191367
-  data.tar.gz: 9a6e03686f8d0f6d3d3353cfa3dc8d6e37c69cc87e0f2aac5c6e37044c03790520150ed17576e91ea4e1e8c6a3c899db4fb5319c3ba6c42d4b88cd315ed24c4c
+  metadata.gz: 56807a6bff2ef23869cc5493cb3bec8af634705093c1e4af15f8163ae67b3242fce46343f2e7ce3083cfc86ddeb3bd74e6cd1e320fae431d317a7d5e0bdd9a30
+  data.tar.gz: cf46f5eec18acdc2fafbc10e1eae383a793ea22c47f60ca1abd7b92179d633cd63072ec35807954c9b10ca55edce1093be14d3320eb5bf4342c7d8e7113682db

data/lib/rbbt/rest/knowledge_base.rb

@@ -264,11 +264,17 @@ module Sinatra
             entities.each do |entity|
               _matches_h = kb.neighbours(database, entity)
               _matches_h.each do |key, _matches|
-                target_type = _matches.target_entity_type
-
-                _matches = acc[target_type].concat _matches if acc[target_type] and acc[target_type].any?
-
-                acc.merge!({ target_type => _matches }) if _matches and _matches.any?
+                if _matches  and _matches.any?
+                  target_type = _matches.target_entity_type
+
+                  if acc[target_type].nil?
+                    acc[target_type] = _matches
+                  else
+                    acc[target_type].concat _matches
+                  end
+                else
+                  acc
+                end
               end
             end
             acc

data/share/views/compass/misc.sass

@@ -82,6 +82,8 @@ table, table.responsive
   clear: both
   span.title
     border: none !important
+    > a 
+      padding: 0.5em
 
 table
   .caption, .title
@@ -126,6 +128,20 @@ option[disabled]
     display: inline-block
     text-align: center
 
+.plus_sign
+  white-space: nowrap
+  &:before
+    content: "\002B"
+    display: inline-block
+    text-align: center
+
+.minus_sign
+  white-space: nowrap
+  &:before
+    content: "\002D"
+    display: inline-block
+    text-align: center
+
 a.entity.highlight
   @extend .bulleted
   font-weight: bold
@@ -149,27 +165,46 @@ a.entity[data-aes-color]:not([data-aes-color=none])
     &:before
       color: green
 
-span.bullet
-  @extend .bulleted
+.small_fav_button
   @extend .pointer
   &:hover
-    border: 1px solid rgba(0,0,0,0.12)
+    background: rgba(0,0,0,0.12)
+  &:hover
+    background: rgba(0,0,0,0.12)
+  display: inline-block
   width: 2em
   height: 2.5em
   line-height: 2.5em
   text-align: center
-  position: absolute
-  left: 0
+
+.fav_control_button
+  @extend .small_fav_button
+  //position: absolute
+  //left: 0
+  float: left
+  &+a
+    padding-left: 0em
+    width: calc(100% - 2em) !important
+    overflow: hidden
+    text-overflow: ellipsis
+
+span.open_fav_controls
+  @extend .fav_control_button
+  @extend .plus_sign
+
+span.minus
+  @extend .small_fav_button
+  @extend .minus_sign
+
+span.bullet
+  @extend .small_fav_button
+  @extend .bulleted
   &.red
     color: red
   &.green
     color: green
-  &+a
-    color: red
-    font-style:italic
-    margin-left: 2em !important
-    padding-left: 0em
-    width: calc(100% - 2em) !important
+  &.purple
+    color: purple
 
 //.dropdown.item .dropdown.item > .menu
   overflow-y: auto
@@ -227,3 +262,11 @@ ul.tasks
 .hide_overflow
   overflow: hidden
   text-overflow: ellipsis
+
+.float.right
+  display: inline-block
+  float: right
+
+.float.left
+  display: inline-block
+  float: left

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

@@ -105,6 +105,20 @@ fav_module.draw_favourite_menu = function(){
            })))
 }
 
+fav_module.list_controls = m.prop()
+fav_module.toggle_list_controls = function(list){
+  if (fav_module.list_controls() == list)
+    fav_module.list_controls(undefined)
+  else
+    fav_module.list_controls(list)
+
+  fav_module.update()
+}
+
+fav_module.remove_list = function(type, list){
+  rbbt.post({url: '/remove_favourite_entity_list/' + type + '/' + clean_element(list)}).then(fav_module.update)
+}
+
 fav_module.draw_favourite_list_menu = function(){
  var favourites = fav_module.lists.types()
  var types = Object.keys(favourites)
@@ -122,7 +136,18 @@ fav_module.draw_favourite_list_menu = function(){
    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.highlight', {onclick: function(){_type[list].highlight('green'); return false}},''),link,m('br')] 
+     if (fav_module.list_controls() == list){
+       var highlight_g = m('span.bullet.green.highlight', {onclick: function(){_type[list].highlight('green'); return false}},'')
+       var highlight_r = m('span.bullet.red.highlight', {onclick: function(){_type[list].highlight('red'); return false}},'')
+       var highlight_p = m('span.bullet.purple.highlight', {onclick: function(){_type[list].highlight('purple'); return false}},'')
+       var remove = m('span.minus.remove', {onclick: function(){fav_module.remove_list(type,list); return false}},'')
+       link = [link, m('div.controls', [highlight_g, highlight_p, highlight_r, remove])]
+     }
+     return [
+      m('span.open_fav_controls', {onclick: function(){fav_module.toggle_list_controls(list); return false}},''),
+      link,
+      m('br')
+     ] 
    }))
  })
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.51
+  version: 1.8.52
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake