3706: Merge branch 'master' into 3706-keep-warning

[arvados.git] / apps / workbench / app / views / collections / _show_files.html.erb

diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index 020f16dd5a4d46b903f42739051abb63903efd74..9cd77b02e1a51a21c05291a5907699fb88aa24fd 100644 (file)
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -5,8 +5,10 @@
       <div class="btn-group btn-group-sm">
         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <span class="caret"></span></button>
         <ul class="dropdown-menu" role="menu">
-          <li><%= link_to "Combine selected files into a new collection", '#',
-                  'data-href' => combine_selected_path,
+          <li><%= link_to "Create new collection with selected files", '#',
+                  'data-href' => combine_selected_path(
+                    action_data: {current_project_uuid: @object.owner_uuid}.to_json
+                  ),
                   'data-selection-param-name' => 'selection[]',
                   'data-selection-action' => 'combine-collections',
                   'method' => 'post',
@@ -15,17 +17,48 @@
         </ul>
       </div>
     </div>
+    <div class="pull-right col-lg-3">
+      <%= form_tag collection_path(@object.uuid), {method: 'get'} do %>
+        <div class="input-group">
+          <input class="form-control" id="file_regex" name="file_regex" placeholder="regular expression" value="<%= params[:file_regex] %>" type="text"/>
+          <span class="input-group-btn">
+            <button id="file_regex_submit" type="submit" class="btn btn-primary" autofocus>Filter</button>
+          </span>
+        </div>
+      <% end %>
+    </div>
   </div>
   <p/>
   <% end %>
 
+<% file_regex = nil %>
+<% if params[:file_regex] %>
+  <% begin %>
+    <% file_regex = Regexp.new(params[:file_regex]) %>
+  <% rescue RegexpError %>
+    <% # If the pattern is not a valid regex, quote it %>
+    <% # (i.e. use it as a simple substring search) %>
+    <div class="alert alert-info">
+      <p>The search term <code><%= params[:file_regex] %></code> could not be parsed as a regular expression.</p>
+      <p>Searching for files named <code><%= params[:file_regex] %></code> instead.</p>
+    </div>
+    <% file_regex = Regexp.new(Regexp.quote(params[:file_regex])) %>
+  <% end %>
+<% end %>
+
 <% file_tree = @object.andand.files_tree %>
 <% if file_tree.nil? or file_tree.empty? %>
   <p>This collection is empty.</p>
 <% else %>
   <ul id="collection_files" class="collection_files">
   <% dirstack = [file_tree.first.first] %>
-  <% file_tree.take(10000).each_with_index do |(dirname, filename, size), index| %>
+  <% file_tree.reject { |(dirname, filename, size)|
+       # Eliminate any files that don't match file_regex
+       # (or accept all files if no file_regex was given)
+       size and file_regex and !file_regex.match(filename)
+       }
+       .take(10000)
+       .each_with_index do |(dirname, filename, size), index| %>
     <% file_path = CollectionsHelper::file_path([dirname, filename]) %>
     <% while dirstack.any? and (dirstack.last != dirname) %>
       <% dirstack.pop %></ul></li>
@@ -43,12 +76,10 @@
        <div class="collection_files_row">
         <div class="collection_files_buttons pull-right">
           <%= raw(human_readable_bytes_html(size)) %>
-          <% if Rails.configuration.filename_suffixes_with_view_icon.include? file_path.split('.')[-1] %>
+          <% disable_search = (Rails.configuration.filename_suffixes_with_view_icon.include? file_path.split('.')[-1]) ? false : true %>
           <%= link_to(raw('<i class="fa fa-search"></i>'),
                       link_params.merge(disposition: 'inline'),
-                      {title: "View #{file_path}", class: "btn btn-info btn-sm"}) %>
-          <% end %>
-
+                      {title: "View #{file_path}", class: "btn btn-info btn-sm", disabled: disable_search}) %>
           <%= link_to(raw('<i class="fa fa-download"></i>'),
                       link_params.merge(disposition: 'attachment'),
                       {title: "Download #{file_path}", class: "btn btn-info btn-sm"}) %>
@@ -64,6 +95,7 @@
                                  uuid: @object.portable_data_hash, file: file_path),
                 :title => "Include #{file_path} in your selections",
               } %>
+          <span>&nbsp;</span>
           <% end %>
       <% if CollectionsHelper::is_image(filename) %>
           <i class="fa fa-fw fa-bar-chart-o"></i> <%= filename %></div>