rbbt-rest 1.8.94 → 1.8.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f8e071798aafcc038b3fb053a0f052bd527e2e5
-  data.tar.gz: 8d44d86417f78dce1465ddce3e813ecd9bf32492
+  metadata.gz: 6b9fc8304ee87e46f7d53b1807e0de225632bd9b
+  data.tar.gz: e9f65fd208eca9c0c18e1c47c6f5f08c0ffdf8e7
 SHA512:
-  metadata.gz: f74b8e9c3740e7c16f5ce57669674dbcf8bb807f8f8c10f02dca48b3959ed117ddc878c7dea879c60a4c51a2aceb58b81172044b89fcec46a403313164a7d4fd
-  data.tar.gz: be06edf375f660f5fa837a7eb10073e92c7860609ca0c331f238ec98487e7b975955f3de2034864afcaf2a27863c046b9f77449d281ecd61adafd7ad4daf9f51
+  metadata.gz: b236b0cc741d0f47b0772761f1814578905dff43658545ff1220c04654f458fadef836ec5618b8cd380dd7e82cb2646987546c2cb25cb4cd0082c34c9926520b
+  data.tar.gz: 8500666f11d539c3281836e3168be7d5b0d5a9cb0d79e2024b0816902846f9ae4b0cda89a8604c92fc44a1c894d4ce35623005514fb75c7f61246007f431caae

data/lib/rbbt/rest/entity/helpers.rb

@@ -53,6 +53,11 @@ module EntityRESTHelpers
       input_value = values[input]
       input_default = input_defaults[input]
       input_option = input_options[input]
+      input_option ||= {}
+      if form_options[:method] != 'POST' && ! input_option.include?(:no_file)
+        input_option[:no_file] = true 
+        input_options[input] = input_option
+      end
     end
 
     locals = {}

data/lib/rbbt/rest/workflow.rb

@@ -183,6 +183,7 @@ module Sinatra
                 when 'json', 'raw', 'binary'
                   halt 202
                 else
+                  @title = [[job.workflow, job.task_name] * "#", job.clean_name] * " "
                   wait_on job
                 end
               else

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

@@ -24,6 +24,7 @@ module WorkflowRESTHelpers
     if job 
       locals[:job] = job 
       @step = job
+      @title = [[workflow,task] * "#", job.clean_name] * " "
       cache_type = execution_type(workflow, task)
       server_key = $app_name
       html_dir = job.file('.html')

data/share/views/compass/app.sass

@@ -148,7 +148,7 @@ $cyan: rgba(50, 211, 255, 1)
     color: $cyan
   .status.done
     color: $green
-  .status.error
+  .status.error, .status.aborted
     color: $red
   .workflow
     font-weight: bold

data/share/views/partials/dependencies.haml

@@ -25,6 +25,21 @@
         - eta = Misc.format_seconds(eta)
         - ellapsed = Misc.format_seconds(ellapsed)
         - pgr_str = " - " + pgr[:last_percent].to_s + "%" + " " + eta
+
+        :deferjs
+          var percent = '#{pgr[:last_percent]}';
+          var task = '#{dep.task_name}';
+          var title = $('head title');
+          var current = title.text();
+          var newtext;
+          var pos = current.indexOf('%');
+          if (pos == -1){
+            newtext = task + " - " + percent + "% " + current
+          }else{
+            newtext = task + " - " + percent + "% " + current.slice(pos+1)
+          }
+          title.text(newtext)
+
       - else
         - pgr_str = " - " + pgr[:ticks].to_s 
       - status = dep_status.to_s + pgr_str

data/share/views/partials/form.haml

@@ -19,16 +19,55 @@
   - types        = consume_parameter(:input_types, info) || {}
   - defaults     = consume_parameter(:input_defaults, info) || {}
   - descriptions = consume_parameter(:input_descriptions, info) || {}
+  - use          = consume_parameter(:input_use, info) || {}
   - options      = consume_parameter(:input_options, info) || {}
   - values       = consume_parameter(:values, info) || {}
 
+  - workflows = use.values.collect{|i| i.keys}.flatten.collect{|v| v.to_s}.uniq
+  - if workflows.length > 1 && use && use.any?
+    - ws_id = 'workflow_select_' << id
+    .ui.very.basic.segment
+      .header
+        Select workflow inputs to show
+      .description
+        .ui.buttons.workflow_select(id=ws_id)
+          - workflows.each do |wfname|
+            .ui.tiny.button.view_workflow.active= wfname
+    %hr
+    :sass
+      form
+        .ui.buttons.workflow_select
+          margin-bottom: 2em
+    :deferjs
+      $('##{ws_id}').find('.view_workflow').click(function(){
+        var button = $(this);
+        var workflow = button.text()
+        button.toggleClass('active')
+        if (!button.hasClass('active'))
+          $('##{id}').find('div.field[attr-use_tags*=' + workflow + ']').hide()
+        if (button.hasClass('active'))
+          $('##{id}').find('div.field[attr-use_tags*=' + workflow + ']').show()
+      })
+      
   - inputs.each do |input|
+    - uses = use.nil? ? nil : use[input]
+    - use_tags = []
+    - if uses
+      - uses.each do |workflow, tasks|
+        - tasks.each do |task|
+          - use_tags << [workflow, task] * "#"
     - input_id = id.nil? ? nil : id + "__" << input.to_s
     - hide = (options[input] != nil and options[input][:hide])
-    %div(class="field #{types[input]} #{input} #{hide ? 'hide' : ''}")
+    %div(class="field #{types[input]} #{input} #{hide ? 'hide' : ''}" attr-use_tags='#{use_tags * " "}')
       - input_options = options[input]
       - input_options = input_options.dup unless input_options.nil?
-      !~ form_input(input, types[input], defaults[input], values[input] || locals[input], descriptions[input], input_id, input_options)
+      - description = descriptions[input]
+      - if use[input]
+        - description += "\n\nUsed in:\n"
+        - uses.each do |workflow, tasks|
+          - tasks.each do |task|
+            - description << " * " << [workflow.to_s, task] * "#" << "\n"
+      !~ form_input(input, types[input], defaults[input], values[input] || locals[input], description, input_id, input_options)
 
 
   .input.field.submit

data/share/views/tools/Rpng.haml

@@ -1,8 +1,9 @@
 - filename = 'R-png_' << rand(10000).to_s unless defined? filename and filename
 - text = filename unless defined? text and text
 
-- width = 500 unless defined? width and width
-- height = 500 unless defined? height and height
+- size = 500 unless defined? size and size
+- width = size unless defined? width and width
+- height = size unless defined? height and height
 - plot = block.call unless (defined? plot and plot) or not defined? block
 
 - filename += '.png' unless filename =~ /\.png$/i

data/share/views/wait.haml

@@ -29,6 +29,18 @@
             - eta = ellapsed * (1 - ratio)
           - eta = Misc.format_seconds(eta)
           - ellapsed = Misc.format_seconds(ellapsed)
+          :deferjs
+            var percent = '#{progress[:last_percent]}';
+            var title = $('head title');
+            var current = title.text();
+            var newtext;
+            var pos = current.indexOf('%');
+            if (pos == -1){
+              newtext = percent + "% " + current
+            }else{
+              newtext = percent + "% " + current.slice(pos+1)
+            }
+            title.text(newtext)
         - else
           - ellapsed = '?'
           - eta = '?'

metadata

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