improve download releases button

app/assets/javascripts/download_releases.js

@@ -0,0 +1,20 @@
+$(document).on("click", "#download_releases", function(event) {
+    event.preventDefault();
+
+    const releasable_ids = JSON.parse($("#selected_releases_form").attr('data-releasable-ids'));
+    const total_entries = $('#total_entries').val();
+
+    const input_ids = $('<input>').attr({ type: 'hidden', name: 'release_ids', value: JSON.stringify(releasable_ids) });
+    const search_query = $('<input>').attr({ type: 'hidden', name: 'search_query', value: $("form input[type='search']").val() });
+    const type_filter = $('<input>').attr({ type: 'hidden', name: 'type_filter', value: $('#type_filter_value').val() });
+
+    const download_count = releasable_ids.length > 0 ? releasable_ids.length : total_entries;
+
+    $(this).parent().append(input_ids);
+    $(this).parent().append(search_query);
+    $(this).parent().append(type_filter);
+
+    if (confirm(`${download_count} release(s) will be downloaded. Is this correct?`)){
+        Rails.fire($(this).parent()[0], 'submit');
+    }
+});

app/controllers/contract_downloads_controller.rb

@@ -7,28 +7,41 @@ class ContractDownloadsController < ApplicationController
 
   def create
     authorize policy_scope(Download).create
-    fetch_releases
-    
-    download = @project.downloads.create!(release_type: params[:release_type])
+
+    download = @project.downloads.create!(release_type: release_type)
     other_downloads_in_progress = @project.downloads.unfinished_desc_order.offset(1)
 
     if other_downloads_in_progress.any?
-      in_progress_downloads_details = render_to_string "_other_pending_downloads", locals: { downloads: other_downloads_in_progress, release_type: params[:release_type] }, :layout => false
+      in_progress_downloads_details = render_to_string "_other_pending_downloads", locals: { downloads: other_downloads_in_progress, release_type: release_type }, :layout => false
       ProjectsChannel.broadcast_download_generation_update(download, in_progress_downloads_details)
     else
-      ProjectsChannel.broadcast_download_generation_update(download, I18n.t("contract_downloads.download.pending", release_type: params[:release_type].titleize))
+      ProjectsChannel.broadcast_download_generation_update(download, I18n.t("contract_downloads.download.pending", release_type: release_type.titleize))
     end
 
-    GenerateContractsZipJob.perform_later(@project, download, params[:release_type], @releases.ids)
+    GenerateContractsZipJob.perform_later(@project, download, release_type, release_ids, search_query, type_filter)
   end
 
   private
 
-  def fetch_releases
-    @releases = policy_scope(@project.public_send(releases))
+  def release_type
+    params[:release_type]
   end
 
-  def releases
-    params[:release_type].constantize.model_name.plural
+  def search_query
+    params[:search_query]
+  end
+
+  def type_filter
+    params[:type_filter]
+  end
+
+  def release_ids
+    JSON.parse(params[:release_ids])
+  rescue StandardError
+    []
+  end
+
+  def release_name(release_type)
+    release_type.constantize.model_name.plural
   end
 end

app/helpers/tags_helper.rb

@@ -17,6 +17,7 @@ module TagsHelper
         disable_with: disabled_content,
       },
       form: {
+        id: "selected_releases_form",
         data: {
           releasable_ids: [],
         },

app/jobs/generate_contracts_zip_job.rb

@@ -7,13 +7,14 @@ class GenerateContractsZipJob < ApplicationJob
     @project = job.arguments.first
     @download = job.arguments.second
     @release_type = job.arguments.third
-    @folder_name = "#{@project.name.parameterize}_#{get_release_name(@release_type).gsub('_', '-')}"
+    @release_ids = job.arguments.fourth
+    @search_query = job.arguments.fifth
+    @type_filter = job.arguments[5]
+    @folder_name = "#{@project.name.parameterize}_#{release_name.gsub('_', '-')}"
     @download.update!(name: @folder_name, status: :pending)
   end
 
-  def perform(project, download, release_type, release_ids)
-    releases = project.public_send(get_release_name(release_type)).where(id: release_ids)
-
+  def perform(project, download, release_type, release_ids, search_query, type_filter)
     ::ReleaseContractCollectionService.new(releases, @folder_name).build do |dir, files|
       zipfile_name = "#{dir}/#{@folder_name}.zip"
       Zip::File.open(zipfile_name, Zip::File::CREATE) do |zipfile|
@@ -31,7 +32,7 @@ class GenerateContractsZipJob < ApplicationJob
     end
   rescue StandardError => e
     Rails.logger.error("Failed to generate download for project (##{project.id}) with release type #{release_type}\n" + e.message)
-    
+
     @download.failure!
     ProjectsChannel.broadcast_download_generation_update(@download, I18n.t("contract_downloads.download.failure"))
   end
@@ -61,7 +62,32 @@ class GenerateContractsZipJob < ApplicationJob
     end
   end
 
-  def get_release_name(release_type)
-    release_type.constantize.model_name.plural
+  def release_name
+    @release_type.constantize.model_name.plural
+  end
+
+  def all_releases
+    @project.public_send(release_name)
+  end
+
+  def releases
+    if @release_ids.any?
+      return all_releases.where(id: @release_ids)
+    end
+
+    results = all_releases
+    if all_releases.respond_to?(:complete, :incomplete)
+      results = case @type_filter
+                when 'complete'
+                  all_releases.complete
+                when 'incomplete'
+                  all_releases.incomplete
+                else
+                  all_releases
+                end
+    end
+
+    results = results.search(@search_query) if @search_query.present?
+    results
   end
 end

app/models/appearance_release.rb

@@ -164,6 +164,10 @@ class AppearanceRelease < ApplicationRecord
     "#{project.name.parameterize}_#{contract_template.release_type}_#{(signed_at || created_at).strftime('%Y.%m.%d')}_#{release_number}_#{filename_suffix.parameterize}"
   end
 
+  def complete?
+    person_photo.attached? && contract.attached?
+  end
+
   private
 
   # Validates the quality of the person photo

app/services/release_contract_collection_service.rb

@@ -24,7 +24,7 @@ class ReleaseContractCollectionService
       end
 
       files = Dir.entries("#{dir}/").select { |f| !File.directory? f }
-      raise StandardError.new "Contracts or Contract Templates not found." unless files.any?
+      # raise StandardError.new "Contracts or Contract Templates not found." unless files.any?
       yield(dir, files)
     }
   end

app/views/appearance_releases/index.html.erb

@@ -1,5 +1,6 @@
 <div class="row">
   <div class="col-md-12">
+    <input id="total_entries" type=hidden value=<%= @appearance_releases.total_entries %> />
     <div id="upload-progress-container" class="mb-1"></div>
     <div class="d-md-flex d-sm-flex flex-sm-column flex-md-row flex-md-wrap mb-2">
       <% if policy(AppearanceRelease).new? %>
@@ -16,7 +17,7 @@
       <% end %>
 
       <% if @appearance_releases.any? && policy(AppearanceRelease).download_multiple? %>
-        <%= link_to "Download All", [@project, :contract_downloads, release_type: @appearance_releases.name], method: :post, remote: true, class: "btn btn-light border mr-2 mb-2", data: { disable_with: "Please wait..." } %>
+        <%= button_to "Download", [@project, :contract_downloads, release_type: @appearance_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border mr-2 mb-2", data: { disable_with: "Please wait..." } %>
       <% end %>
     </div>
   </div>

app/views/appearance_releases/index.js.erb

@@ -3,3 +3,5 @@ $("form input[type='search']").val("<%= params[:query] %>");
 $("#type_filter_actions").html("<%= j render 'type_filter_actions' %>");
 $("#appearance_releases_pagination").html("<%= j will_paginate(@appearance_releases) %>");
 $('#type_filter_value').val("<%= params[:type_filter] %>");
+$("#selected_releases_form").attr('data-releasable-ids', JSON.stringify([]));
+$("#total_entries").val(<%= @appearance_releases.total_entries %>);