rbbt-rest 1.8.95 → 1.8.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b9fc8304ee87e46f7d53b1807e0de225632bd9b
-  data.tar.gz: e9f65fd208eca9c0c18e1c47c6f5f08c0ffdf8e7
+  metadata.gz: '0429c45627c2177b14bb51e6a648f162394873db'
+  data.tar.gz: c96ed9340c6998578a371cdcf899a39bf1ae9434
 SHA512:
-  metadata.gz: b236b0cc741d0f47b0772761f1814578905dff43658545ff1220c04654f458fadef836ec5618b8cd380dd7e82cb2646987546c2cb25cb4cd0082c34c9926520b
-  data.tar.gz: 8500666f11d539c3281836e3168be7d5b0d5a9cb0d79e2024b0816902846f9ae4b0cda89a8604c92fc44a1c894d4ce35623005514fb75c7f61246007f431caae
+  metadata.gz: 93ecbc69ba55b7607a092fa84ec846dff70970cda74580e52c7538737df3be15478229cdb2b527cee4dbbced7afda99246c5c0e66ad39a788b0a57b6e1147447
+  data.tar.gz: 8a1c4ecc6ba94b28348f7f0f784bca9d702415baf36b6aad0580a387e6e986a6788c94345caee5e1d9c4dafaa13f5d533fdf3c6fc0a70df632ffd65be5fc9d6e

data/lib/rbbt/rest/common/cache.rb

@@ -183,6 +183,19 @@ module RbbtRESTHelpers
           excel_file = TmpFile.tmp_file
           tsv.excel(excel_file, :sort_by => @excel_sort_by, :sort_by_cast => @excel_sort_by_cast, :name => true, :remove_links => true)
           send_file excel_file, :type => 'application/vnd.ms-excel', :filename => 'table.xls'
+        when "heatmap"
+          tsv, tsv_options = load_tsv(fragment_file)
+          content_type "text/html"
+          data = nil
+          png_file = TmpFile.tmp_file
+          width = tsv.fields.length * 10 + 500
+          height = tsv.size * 10 + 500
+          width = 10000 if width > 10000
+          height = 10000 if height > 10000
+          tsv.R <<-EOF
+            rbbt.pheatmap(file='#{png_file}', data, width=#{width}, height=#{height})
+          EOF
+          send_file png_file, :type => 'image/png', :filename => fragment_file + ".heatmap.png"
         else
           content_type "text/html"
 

data/lib/rbbt/rest/common/table.rb

@@ -451,10 +451,13 @@ module RbbtRESTHelpers
       tsv, table_options = load_tsv(file)
     end
 
-    content_type "text/html"
-    rows, length = tsv_rows(tsv)
+    table_options[:heatmap] = tsv.cast && %w(to_i to_f).include?(tsv.cast.to_s) unless table_options.include? :heatmap
 
     table_options = default_table_options.merge(table_options)
+
+    content_type "text/html"
+    rows, length = tsv_rows(tsv, @page || table_options[:page], @filter || table_options[:filter], @column || table_options[:column])
+
     partial_render('partials/table', {:total_size => length, :rows => rows, :header => tsv.all_fields, :table_options => table_options})
   end
 end

data/lib/rbbt/rest/workflow/jobs.rb

@@ -166,6 +166,19 @@ module WorkflowRESTHelpers
       result = job.load
       result.excel(excel_file, :name => @excel_use_name,:sort_by => @excel_sort_by, :sort_by_cast => @excel_sort_by_cast, :remove_links => true)
       send_file excel_file, :type => 'application/vnd.ms-excel', :filename => job.clean_name + '.xls'
+    when :heatmap 
+      tsv = job.load
+      content_type "text/html"
+      data = nil
+      png_file = TmpFile.tmp_file
+      width = tsv.fields.length * 10 + 500
+      height = tsv.size * 10 + 500
+      width = 10000 if width > 10000
+      height = 10000 if height > 10000
+      tsv.R <<-EOF
+        rbbt.pheatmap(file='#{png_file}', data, width=#{width}, height=#{height})
+      EOF
+      send_file png_file, :type => 'image/png', :filename => job.name + ".heatmap.png"
     else
       raise "Unsupported format: #{ format }"
     end

data/share/views/form.haml

@@ -59,3 +59,29 @@
             return false
           })
         })
+
+:deferjs
+  var autofill = rbbt.LS.load('autofill')
+  var workflow = '#{workflow}'
+  var task_name = '#{task}'
+  var key = [workflow, task_name].join("#")
+
+  if (autofill != undefined && autofill[key]){
+    var inputs = autofill[key]
+    var form = $('.workflow_task[id=#{id}] > .form > form')
+    forHash(inputs, function(name,value){
+      var input = form.find('[name=' + name + ']');
+      if (input.length > 0 && typeof value == 'string' && value.match(/TRUNCATED/)){
+        var err= "Error loading input " + name + ". It was truncated due to it length.";
+        rbbt.modal.controller.error(m('.ui.error.message', [m('.header', err), m('.description', m('pre', m.trust(value)))]), "Form entry not loaded correctly")
+      }
+      if (input.is('[type=checkbox]')){
+        input.prop('checked', value);
+      }else{
+        input.val(value);
+      }
+    })
+  }
+  rbbt.LS.delete('autofill')
+    
+

data/share/views/job_info.haml

@@ -14,8 +14,24 @@
   .ui.header
     %h3 Inputs (recursive)
   .ui.content
+    - inputs = job.recursive_inputs
+    - autofill_id = "autofill_" << Misc.digest(job.name)
+    .ui.button.autofill(id=autofill_id) Auto-fill form with inputs
+    :deferjs
+      $('##{autofill_id}').click(function(){
+        var inputs = #{inputs.to_hash.to_json};
+        inputs['jobname'] = '#{job.clean_name}';
+        var workflow = '#{job.workflow.to_s}';
+        var task_name = '#{job.task_name.to_s}';
+        var key = [workflow, task_name].join("#");
+
+        var info = {};
+        info[key] = inputs;
+        rbbt.LS.store('autofill', info);
+        var url = '/' + workflow + '/' + task_name;
+        window.location = rbbt.url_add_script_name(url);
+      })
     %dl
-      - inputs = job.recursive_inputs
       - inputs.zip(inputs.fields).each do |i,f|
         %dt= f
         %dd

data/share/views/job_result/tsv.haml

@@ -1,16 +1,22 @@
 - if result.any?
   - table_id = [workflow.to_s, task, jobname] * "_"
   - table_class = 'workflow_tsv_result'
-  - begin
-    - page = result.size > 50 ? "1" : nil
-  - rescue
-    - page = "1" 
+  - page = result.size > 50 ? "1" : nil
 
-  - rows, total_size = tsv_rows(result, page)
-  - header = result.all_fields
+  = table :table_id => table_id, :page => page, :table_class => table_class, :row_ids => :use, :table_url => jobname ? to(File.join('/', workflow.to_s, task, jobname)) : nil do
+    - result
 
-  = workflow_partial('partials/table', workflow, task, 
-    locals.merge(:table_id => table_id, :page => page, :table_class => table_class, :rows => rows, :total_size => total_size, :header => result.all_fields, :row_ids => :use, :table_url => jobname ? to(File.join('/', workflow.to_s, task, jobname)) : nil))
+  -#
+    - begin
+      - page = result.size > 50 ? "1" : nil
+    - rescue
+      - page = "1" 
+
+    - rows, total_size = tsv_rows(result, page)
+    - header = result.all_fields
+
+    = workflow_partial('partials/table', workflow, task, 
+      locals.merge(:table_id => table_id, :page => page, :table_class => table_class, :rows => rows, :total_size => total_size, :header => result.all_fields, :row_ids => :use, :table_url => jobname ? to(File.join('/', workflow.to_s, task, jobname)) : nil))
 
 - else
 

data/share/views/partials/table.haml

@@ -11,6 +11,7 @@
 - total_size  = table_options[:total_size]   unless defined? total_size and total_size
 - filters     = table_options[:filters]   unless defined? filters and filters
 - span        = table_options[:span]  unless defined? span and not span.nil?
+- heatmap     = table_options[:heatmap]  unless defined? heatmap and not heatmap.nil?
 
 - list_links  = table_options[:list_links]  unless defined? list_links and list_links
 
@@ -76,7 +77,7 @@
                 
               = partial_render('partials/table/column', :table_url => table_url, :header => header, :entity_headers => entity_headers) 
 
-              = partial_render('partials/table/files', :table_url => table_url) 
+              = partial_render('partials/table/files', :table_url => table_url, :heatmap => heatmap) 
               
               
               

data/share/views/partials/table/files.haml

@@ -2,3 +2,6 @@
   %a(href="#{add_GET_param(table_url, "_format", "tsv")}") tsv
 .excel.ui.wrap.compact.button
   %a(href="#{add_GET_param(table_url, "_format", "excel")}") excel
+- if heatmap
+  .excel.ui.wrap.compact.button
+    %a(href="#{add_GET_param(table_url, "_format", "heatmap")}") heatmap

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

@@ -168,7 +168,11 @@ rbbt.LS.load = function(key){
 }
 
 rbbt.LS.store = function(key, value){
- localStorage[key] = JSON.stringify(value)
+ localStorage[key] = JSON.stringify(value);
+}
+
+rbbt.LS.delete = function(key){
+  delete(localStorage[key]);
 }
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.95
+  version: 1.8.96
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake