rbbt-rest 1.8.98 → 1.8.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 488f00d56c825fadf507fad95868e0449e21ade5
-  data.tar.gz: b34f3f91597655fbff842e6a8b911216cf667f8b
+  metadata.gz: ad6482309191ee32ab32aceb94037c51ccf8b952
+  data.tar.gz: c24b8bce4a0f1ce91e9fa5e63ed9eca65d380e42
 SHA512:
-  metadata.gz: dc358f0408509bb5ad34fd95e8fcb0d0cee793089923e8d7d87e309bb24f8581827c61a4f4d54a1194cb1f622a5a1bf75406122331195c5f135fc41a6c30ca43
-  data.tar.gz: 2deef1ee1b5c50794855f27a62338019254097446dde4efaf1a042ea0a1c0e36d9fe3835dc474042d29825b52af07f0839bd3ac0ffd814997e8a4f7e3ba766f1
+  metadata.gz: 51f84013c9d5d897e0bc174d3a1e1ac2f7a86d2c70b5bb6b9b4e772c097b92e508858dd40168eced7cc30999cbdc735ca368c797f595afcb9b1bea4b16c0fb81
+  data.tar.gz: e61fbef82b893c88f2b0413cf610b896e837e43222e358be3e6074e3cb69344210b685ddaf2cd2d97acc68f1dd3ae05c93e1a6aa21bff171dbe1ffaf96c9086b

data/lib/rbbt/rest/workflow.rb

@@ -134,6 +134,14 @@ module Sinatra
 
         task_parameters = consume_task_parameters(workflow, task, params)
 
+        if params.include?('__input_file_bundle')
+          inputs = workflow.task_info(task)[:inputs]
+          input_types = workflow.task_info(task)[:input_types]
+
+          file = params['__input_file_bundle'][:tempfile].path
+          task_parameters = task_parameters.merge(Workflow.load_inputs(file, inputs, input_types))
+        end
+
         issue_job(workflow, task, jobname, task_parameters)
       end
 

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

@@ -70,7 +70,7 @@ module WorkflowRESTHelpers
       next if value.nil?
       task_inputs[input] = value
     end
-
+ 
     task_inputs
   end
 

data/share/views/compass/app.sass

@@ -159,17 +159,9 @@ $cyan: rgba(50, 211, 255, 1)
   &:before
     content: "@"
 
-.ui.segment.job_inputs
-  max-height: 800px
-  overflow: auto
-
 .job_control
   margin-bottom: 2em
 
 pre.error_message
   white-space: pre-wrap
   word-wrap: break-word
-
-.job_info, .job_inputs
-  max-height: 1200px
-  overflow: auto

data/share/views/form.haml

@@ -19,7 +19,7 @@
       :enctype => "multipart/form-data", :info => task_info, :klass => 'workflow_task', :locals => locals)
 
   - if workflow.libdir.examples[task.to_s].exists?
-    .examples
+    .examples.ui.very.basic.segment
       :javascript
         example_inputs = [];
 

data/share/views/job_info.haml

@@ -3,75 +3,85 @@
 - exception = info[:exception]
 
 - status = info[:status]
-.job_info.clean_list.ui.segment
-  .ui.header 
-    Info:
-    %span.status(class=status)= job.name
+- require 'rbbt/rest/common/tabs'
+= tabs do |tab|
+  - tab.add "Info" do
+    .job_info.clean_list
+      .ui.header 
+        Info:
+        %span.status(class=status)= job.name
 
-  = hash2dl(new_info)
+      = hash2dl(new_info)
 
-.ui.segment.job_inputs
-  .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("#");
+  - tab.add "Inputs" do
 
-        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.zip(inputs.fields).each do |i,f|
-        %dt= f
-        %dd
-          - case i
-          - when Array
-            %ul
-              - i.each do |e|
-                - if String === e
-                  %li= e
-                - else
-                  %li= e.inspect
-          - when String
-            %pre= i
-          - else
-            %pre
-              = i.inspect
+    .job_inputs
+      .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("#");
 
-- if exception
-  - backtrace = exception[:backtrace]
-  .error_backtrace.clean_list.ui.segment
-    .ui.header Backtrace
-    %pre.ui.content
-      - require 'rbbt/util/colorize'
-      - pallete = {}
-      - matches = %w(views workflows rbbt).collect{|w| /\/#{w}/ }
-      - colors = Colorize.distinct(matches)
-      %ul
-        - backtrace.each do |line|
-          - color = nil
-          - matches.each_with_index do |m,i|
-            - if m.match(line)
-              - color = colors[i].darken(0.3).to_s 
-              - break
+            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.zip(inputs.fields).each do |i,f|
+            %dt= f
+            %dd
+              - case i
+              - when Array
+                %ul
+                  - i.each do |e|
+                    - if String === e
+                      %li= e
+                    - else
+                      %li= e.inspect
+              - when String
+                %pre= i
+              - else
+                %pre
+                  = i.inspect
 
-          - style = color ? ';color:'+color : ""
-          %li(style="font-size:0.9em;font-family:monospace#{style}")= line.sub('`',"'")
+  - if exception
+    - tab.active "Exception"
+    - tab.add "Exception" do
+      - backtrace = exception[:backtrace]
+      .error_backtrace.clean_list
+        .ui.header Backtrace
+        %pre.ui.content
+          - require 'rbbt/util/colorize'
+          - pallete = {}
+          - matches = %w(views workflows rbbt).collect{|w| /\/#{w}/ }
+          - colors = Colorize.distinct(matches)
+          %ul
+            - backtrace.each do |line|
+              - color = nil
+              - matches.each_with_index do |m,i|
+                - if m.match(line)
+                  - color = colors[i].darken(0.3).to_s 
+                  - break
 
-- if info[:dependencies] and info[:dependencies].any?
-  .ui.segment
-    .ui.header
-      %h3 Dependencies
-    .ui.content
-      = partial_render('partials/dependencies', :job => job)
+              - style = color ? ';color:'+color : ""
+              %li(style="font-size:0.9em;font-family:monospace#{style}")= line.sub('`',"'")
+  - else
+    - tab.active "Info"
+
+  
+  - if info[:dependencies] and info[:dependencies].any?
+    - tab.add "Dependencies" do
+      .ui.header
+        %h3 Dependencies
+      .ui.content
+        = partial_render('partials/dependencies', :job => job)

data/share/views/partials/dependencies.haml

@@ -73,7 +73,7 @@
 
       - if dep.dependencies.any?
         - if cache[dep.path]
-          = reveal "(deps)", nil, :title => "Dependencies already shown above", "attr-reveal_title" => "#{[dep_workflow, dep.task_name, dep.name] * " &#x3e "}"  do
+          = reveal "(deps)", nil, :title => "Dependencies already shown above", "attr-reveal_title" => "#{[dep_workflow, dep.task_name, dep.name] * " # "}"  do
             = cache[dep.path]
         - else
           = cache[dep.path] ||= partial_render('partials/dependencies', :job => dep, :cache => cache)

data/share/views/partials/form.haml

@@ -70,6 +70,11 @@
       !~ form_input(input, types[input], defaults[input], values[input] || locals[input], description, input_id, input_options)
 
 
+  - if inputs.any?
+    .bundle.ui.very.basic.segment.field
+      Input file bundle in tar.gz (overrides page inputs)
+      %input(type='file' name='__input_file_bundle' id='SINTEF_ROC__input_file_bundle')
+
   .input.field.submit
     %input.ui.submit.button(type="submit")
     - if klass =~ /workflow_task/

metadata

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