X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b9b45283eb987cb59419b8714f8a06d7f7b6b8c3..2d911a46e2698f18200bf2170bdb4c18452439a1:/apps/workbench/app/controllers/actions_controller.rb

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 695f770320..347644bdbd 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -1,5 +1,8 @@
 class ActionsController < ApplicationController
 
+  skip_filter :require_thread_api_token, only: [:report_issue_popup, :report_issue]
+  skip_filter :check_user_agreements, only: [:report_issue_popup, :report_issue]
+
   @@exposed_actions = {}
   def self.expose_action method, &block
     @@exposed_actions[method] = true
@@ -42,12 +45,13 @@ class ActionsController < ApplicationController
 
   def move_or_copy action
     uuids_to_add = params["selection"]
+    uuids_to_add = [ uuids_to_add ] unless uuids_to_add.is_a? Array
     uuids_to_add.
       collect { |x| ArvadosBase::resource_class_for_uuid(x) }.
       uniq.
       each do |resource_class|
       resource_class.filter([['uuid','in',uuids_to_add]]).each do |src|
-        if resource_class == Collection
+        if resource_class == Collection and not Collection.attribute_info.include?(:name)
           dst = Link.new(owner_uuid: @object.uuid,
                          tail_uuid: @object.uuid,
                          head_uuid: src.uuid,
@@ -64,6 +68,9 @@ class ActionsController < ApplicationController
                 dst.name = "Copy of unnamed #{dst.class_for_display.downcase}"
               end
             end
+            if resource_class == Collection
+              dst.manifest_text = Collection.select([:manifest_text]).where(uuid: src.uuid).first.manifest_text
+            end
           when :move
             dst = src
           else
@@ -85,7 +92,16 @@ class ActionsController < ApplicationController
 
   def arv_normalize mt, *opts
     r = ""
-    IO.popen(['arv-normalize'] + opts, 'w+b') do |io|
+    env = Hash[ENV].
+      merge({'ARVADOS_API_HOST' =>
+              arvados_api_client.arvados_v1_base.
+              sub(/\/arvados\/v1/, '').
+              sub(/^https?:\/\//, ''),
+              'ARVADOS_API_TOKEN' => 'x',
+              'ARVADOS_API_HOST_INSECURE' =>
+              Rails.configuration.arvados_insecure_https ? 'true' : 'false'
+            })
+    IO.popen([env, 'arv-normalize'] + opts, 'w+b') do |io|
       io.write mt
       io.close_write
       while buf = io.read(2**16)
@@ -96,89 +112,74 @@ class ActionsController < ApplicationController
   end
 
   expose_action :combine_selected_files_into_collection do
-    lst = []
+    uuids = []
+    pdhs = []
     files = []
     params["selection"].each do |s|
       a = ArvadosBase::resource_class_for_uuid s
-      m = nil
       if a == Link
         begin
-          m = CollectionsHelper.match(Link.find(s).head_uuid)
+          if (m = CollectionsHelper.match(Link.find(s).head_uuid))
+            pdhs.append(m[1] + m[2])
+            files.append(m)
+          end
         rescue
         end
-      else
-        m = CollectionsHelper.match(s)
-      end
-
-      if m and m[1] and m[2]
-        lst.append(m[1] + m[2])
+      elsif (m = CollectionsHelper.match(s))
+        pdhs.append(m[1] + m[2])
+        files.append(m)
+      elsif (m = CollectionsHelper.match_uuid_with_optional_filepath(s))
+        uuids.append(m[1])
         files.append(m)
       end
     end
 
-    collections = Collection.where(uuid: lst)
-
+    pdhs = pdhs.uniq
+    uuids = uuids.uniq
     chash = {}
-    collections.each do |c|
-      c.reload()
+
+    Collection.select([:uuid, :manifest_text]).where(uuid: uuids).each do |c|
       chash[c.uuid] = c
     end
 
+    Collection.select([:portable_data_hash, :manifest_text]).where(portable_data_hash: pdhs).each do |c|
+      chash[c.portable_data_hash] = c
+    end
+
     combined = ""
     files.each do |m|
-      mt = chash[m[1]+m[2]].manifest_text
-      if m[4]
+      mt = chash[m[1]+m[2]].andand.manifest_text
+      if not m[4].nil? and m[4].size > 1
         combined += arv_normalize mt, '--extract', m[4][1..-1]
       else
-        combined += chash[m[1]+m[2]].manifest_text
+        combined += mt
       end
     end
 
     normalized = arv_normalize combined
-    normalized_stripped = arv_normalize combined, '--strip'
-
-    require 'digest/md5'
-
-    d = Digest::MD5.new()
-    d << normalized_stripped
-    newuuid = "#{d.hexdigest}+#{normalized_stripped.length}"
-
-    env = Hash[ENV].
-      merge({
-              'ARVADOS_API_HOST' =>
-              arvados_api_client.arvados_v1_base.
-              sub(/\/arvados\/v1/, '').
-              sub(/^https?:\/\//, ''),
-              'ARVADOS_API_TOKEN' => Thread.current[:arvados_api_token],
-              'ARVADOS_API_HOST_INSECURE' =>
-              Rails.configuration.arvados_insecure_https ? 'true' : 'false'
-            })
-
-    IO.popen([env, 'arv-put', '--raw'], 'w+b') do |io|
-      io.write normalized_stripped
-      io.close_write
-      while buf = io.read(2**16)
-      end
-    end
-
-    newc = Collection.new({:uuid => newuuid, :manifest_text => normalized})
+    newc = Collection.new({:manifest_text => normalized})
+    newc.name = newc.name || "Collection created at #{Time.now.localtime}"
     newc.save!
 
     chash.each do |k,v|
       l = Link.new({
                      tail_uuid: k,
-                     head_uuid: newuuid,
+                     head_uuid: newc.uuid,
                      link_class: "provenance",
                      name: "provided"
                    })
       l.save!
     end
 
-    redirect_to controller: 'collections', action: :show, id: newc.uuid
+    action_data = JSON.parse(params['action_data']) if params['action_data']
+    if action_data && action_data['selection_param'].eql?('project')
+      redirect_to :back
+    else
+      redirect_to url_for(controller: 'collections', action: :show, id: newc.uuid)
+    end
   end
 
   def report_issue_popup
-    @popup_params = params
     respond_to do |format|
       format.js
       format.html
@@ -186,12 +187,11 @@ class ActionsController < ApplicationController
   end
 
   def report_issue
-    $stderr.puts "Issue being reported with these parameters: #{params.inspect}"
-    logger.warn "Issue being reported with these parameters: #{params.inspect}"
+    logger.warn "report_issue: #{params.inspect}"
 
     respond_to do |format|
       IssueReporter.send_report(current_user, params).deliver
-      format.js
+      format.js {render nothing: true}
     end
   end