From a77cf9344c4bbd42e4c94c7f81a8255a68fcb122 Mon Sep 17 00:00:00 2001
From: Bilal <bilal@saburly.com>
Date: Mon, 7 Sep 2020 12:04:34 +0300
Subject: [PATCH 01/10] improve Download button for Acq.Media releases

---
 .../acquired_media_releases/index.html.erb    |  3 +-
 .../acquired_media_releases/index.js.erb      |  2 +
 spec/jobs/generate_contracts_zip_job_spec.rb  | 49 ++++++++++---------
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/app/views/acquired_media_releases/index.html.erb b/app/views/acquired_media_releases/index.html.erb
index edd521c..9a9f33a 100644
--- a/app/views/acquired_media_releases/index.html.erb
+++ b/app/views/acquired_media_releases/index.html.erb
@@ -1,5 +1,6 @@
 <div class="row">
   <div class="col-md-12">
+    <input id="total_entries" type=hidden value=<%= @acquired_media_releases.total_entries %> />
     <div class="d-md-flex d-sm-flex flex-sm-column flex-md-row flex-md-wrap mb-3">
       <% if policy(AcquiredMediaRelease).new? %>
         <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :acquired_media_release], class: "btn btn-primary mr-2 mb-2" %>
@@ -10,7 +11,7 @@
       <% end %>
       
       <% if @acquired_media_releases.any? && policy(AcquiredMediaRelease).download_multiple? %>
-        <%= link_to "Download All", [@project, :contract_downloads, release_type: @acquired_media_releases.name], method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
+        <%= button_to "Download", [@project, :contract_downloads, release_type: @acquired_media_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
             disable_with: "Please wait..." } %>
       <% end %>
 
diff --git a/app/views/acquired_media_releases/index.js.erb b/app/views/acquired_media_releases/index.js.erb
index 4bc7e72..4ffebf9 100644
--- a/app/views/acquired_media_releases/index.js.erb
+++ b/app/views/acquired_media_releases/index.js.erb
@@ -1,3 +1,5 @@
 $("#acquired_media_releases").html("<%= j render(@acquired_media_releases) %>");
 $("form input[type='search']").val("<%= params[:query] %>");
 $("#acquired_media_releases_pagination").html("<%= j will_paginate(@acquired_media_releases) %>");
+$("#selected_releases_form").attr('data-releasable-ids', JSON.stringify([]));
+$("#total_entries").val(<%= @acquired_media_releases.total_entries %>);
\ No newline at end of file
diff --git a/spec/jobs/generate_contracts_zip_job_spec.rb b/spec/jobs/generate_contracts_zip_job_spec.rb
index 48e9cfc..3c83eb7 100644
--- a/spec/jobs/generate_contracts_zip_job_spec.rb
+++ b/spec/jobs/generate_contracts_zip_job_spec.rb
@@ -86,34 +86,36 @@ describe GenerateContractsZipJob do
       end
 
       it "generates ZIP containing CSV file with all filtered releases data for filtered releases" do
-        lowercase_plural = subject.constantize.model_name.plural
-        GenerateContractsZipJob.perform_now(project, download, subject, [], '', 'complete')
+        if subject.respond_to?(:complete) && subject.respond_to?(:incomplete)
+          lowercase_plural = subject.constantize.model_name.plural
+          GenerateContractsZipJob.perform_now(project, download, subject, [], '', 'complete')
 
-        complete_releases = project.public_send(lowercase_plural).complete
-        incomplete_releases = project.public_send(lowercase_plural).incomplete
+          complete_releases = project.public_send(lowercase_plural).complete
+          incomplete_releases = project.public_send(lowercase_plural).incomplete
 
-        generated_zip = download.file.blob.download
-        csv_file_name = "#{project.name.parameterize}_#{lowercase_plural.gsub('_', '-')}.csv"
-        Zip::InputStream.open(StringIO.new(generated_zip)) do |io|
-          while entry = io.get_next_entry
-            next unless entry.name == csv_file_name
+          generated_zip = download.file.blob.download
+          csv_file_name = "#{project.name.parameterize}_#{lowercase_plural.gsub('_', '-')}.csv"
+          Zip::InputStream.open(StringIO.new(generated_zip)) do |io|
+            while entry = io.get_next_entry
+              next unless entry.name == csv_file_name
 
-            csv_file = entry.get_input_stream.read
+              csv_file = entry.get_input_stream.read
 
-            release_class = Object.const_get subject
-            release_headers = release_class.csv_headers
+              release_class = Object.const_get subject
+              release_headers = release_class.csv_headers
 
-            release_headers.each do |header|
-              expect(csv_file).to match header
-              expect(csv_file).not_to match translation_missing
-            end
+              release_headers.each do |header|
+                expect(csv_file).to match header
+                expect(csv_file).not_to match translation_missing
+              end
 
-            complete_releases.each do |release|
-              expect(csv_file).to match release.person_first_name
-            end
+              complete_releases.each do |release|
+                expect(csv_file).to match release.person_first_name
+              end
 
-            incomplete_releases.each do |release|
-              expect(csv_file).not_to match release.person_first_name
+              incomplete_releases.each do |release|
+                expect(csv_file).not_to match release.person_first_name
+              end
             end
           end
         end
@@ -164,10 +166,13 @@ describe GenerateContractsZipJob do
     end
 
     context "generates ZIP for acquired media releases" do
-      let(:release) { create(:acquired_media_release_with_contract_template, :native, project: project) }
+      let(:release) { create(:acquired_media_release_with_contract_template, :native, project: project, person_name: "John Doe") }
+      let(:release2) { create(:acquired_media_release_with_contract_template, :native, project: project, person_name: "Jane Doe") }
+      let(:release3) { create(:acquired_media_release_with_contract_template, :native, project: project, person_name: "Brad Doe") }
       subject { 'AcquiredMediaRelease' }
 
       it_behaves_like "generates ZIP containig CSV file with all releases data"
+      it_behaves_like "generates ZIP containig CSV file with specific releases data"
     end
 
     context "generates ZIP for appearance releases" do
-- 
2.47.3


From 3694817fef8aa3ca29e1fec56f53a3a51c8c70fd Mon Sep 17 00:00:00 2001
From: Bilal <bilal@saburly.com>
Date: Mon, 7 Sep 2020 12:15:09 +0300
Subject: [PATCH 02/10] improve Download button for Location releases

---
 app/views/location_releases/index.html.erb   | 3 ++-
 app/views/location_releases/index.js.erb     | 2 ++
 spec/jobs/generate_contracts_zip_job_spec.rb | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/location_releases/index.html.erb b/app/views/location_releases/index.html.erb
index b69328f..afc39b5 100644
--- a/app/views/location_releases/index.html.erb
+++ b/app/views/location_releases/index.html.erb
@@ -1,5 +1,6 @@
 <div class="row">
   <div class="col-md-12">
+    <input id="total_entries" type=hidden value=<%= @location_releases.total_entries %> />
     <div class="d-md-flex d-sm-flex flex-sm-column flex-md-row flex-md-wrap mb-3">
       <% if policy(LocationRelease).new? %>
         <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :location_release], class: "btn btn-primary mr-2 mb-2" %>
@@ -10,7 +11,7 @@
       <% end %>
 
       <% if @location_releases.any? && policy(LocationRelease).download_multiple? %>
-        <%= link_to "Download All", [@project, :contract_downloads, release_type: @location_releases.name], method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
+        <%=  button_to "Download", [@project, :contract_downloads, release_type: @location_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
             disable_with: "Please wait..." } %>
       <% end %>
 
diff --git a/app/views/location_releases/index.js.erb b/app/views/location_releases/index.js.erb
index 263a8a6..0ce1d89 100644
--- a/app/views/location_releases/index.js.erb
+++ b/app/views/location_releases/index.js.erb
@@ -1,3 +1,5 @@
 $("#location_releases").html("<%= j render(@location_releases) %>");
 $("form input[type='search']").val("<%= params[:query] %>");
 $("#location_releases_pagination").html("<%= j will_paginate(@location_releases) %>");
+$("#selected_releases_form").attr('data-releasable-ids', JSON.stringify([]));
+$("#total_entries").val(<%= @location_releases.total_entries %>);
\ No newline at end of file
diff --git a/spec/jobs/generate_contracts_zip_job_spec.rb b/spec/jobs/generate_contracts_zip_job_spec.rb
index 3c83eb7..dfddd38 100644
--- a/spec/jobs/generate_contracts_zip_job_spec.rb
+++ b/spec/jobs/generate_contracts_zip_job_spec.rb
@@ -186,10 +186,13 @@ describe GenerateContractsZipJob do
     end
 
     context "generates ZIP for location releases" do
-      let(:release) { create(:location_release_with_contract_template, :native, project: project) }
+      let(:release) { create(:location_release_with_contract_template, :native, project: project, person_name: "John Doe") }
+      let(:release2) { create(:location_release_with_contract_template, :native, project: project, person_name: "Jane Doe") }
+      let(:release3) { create(:location_release_with_contract_template, :native, project: project, person_name: "Brad Doe") }
       subject { 'LocationRelease' }
 
       it_behaves_like "generates ZIP containig CSV file with all releases data"
+      it_behaves_like "generates ZIP containig CSV file with specific releases data"
     end
 
     context "generates ZIP for material releases" do
-- 
2.47.3


From 1cf18e8f85b6e106bf8c867d7ecdad8e702ae841 Mon Sep 17 00:00:00 2001
From: Bilal <bilal@saburly.com>
Date: Mon, 7 Sep 2020 12:41:55 +0300
Subject: [PATCH 03/10] fix search match specs for generating contracts

---
 spec/jobs/generate_contracts_zip_job_spec.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/spec/jobs/generate_contracts_zip_job_spec.rb b/spec/jobs/generate_contracts_zip_job_spec.rb
index dfddd38..d2a2420 100644
--- a/spec/jobs/generate_contracts_zip_job_spec.rb
+++ b/spec/jobs/generate_contracts_zip_job_spec.rb
@@ -166,9 +166,9 @@ describe GenerateContractsZipJob do
     end
 
     context "generates ZIP for acquired media releases" do
-      let(:release) { create(:acquired_media_release_with_contract_template, :native, project: project, person_name: "John Doe") }
-      let(:release2) { create(:acquired_media_release_with_contract_template, :native, project: project, person_name: "Jane Doe") }
-      let(:release3) { create(:acquired_media_release_with_contract_template, :native, project: project, person_name: "Brad Doe") }
+      let(:release) { create(:acquired_media_release_with_contract_template, :native, project: project, name: "John Doe") }
+      let(:release2) { create(:acquired_media_release_with_contract_template, :native, project: project, name: "Jane Doe") }
+      let(:release3) { create(:acquired_media_release_with_contract_template, :native, project: project, name: "Brad Doe") }
       subject { 'AcquiredMediaRelease' }
 
       it_behaves_like "generates ZIP containig CSV file with all releases data"
@@ -176,9 +176,9 @@ describe GenerateContractsZipJob do
     end
 
     context "generates ZIP for appearance releases" do
-      let(:release) { create(:appearance_release_with_contract_template, :native, project: project, person_name: "John Doe") }
-      let(:incomplete_release) { create(:appearance_release_with_contract_template, project: project, person_name: "Jane Doe") }
-      let(:complete_release) { create(:appearance_release_with_contract_template, :non_native, project: project, person_name: "Brad Doe") }
+      let(:release) { create(:appearance_release_with_contract_template, :native, project: project, person_name: "John") }
+      let(:incomplete_release) { create(:appearance_release_with_contract_template, project: project, person_name: "Jane") }
+      let(:complete_release) { create(:appearance_release_with_contract_template, :non_native, project: project, person_name: "Brad") }
       subject { 'AppearanceRelease' }
 
       it_behaves_like "generates ZIP containig CSV file with all releases data"
@@ -186,9 +186,9 @@ describe GenerateContractsZipJob do
     end
 
     context "generates ZIP for location releases" do
-      let(:release) { create(:location_release_with_contract_template, :native, project: project, person_name: "John Doe") }
-      let(:release2) { create(:location_release_with_contract_template, :native, project: project, person_name: "Jane Doe") }
-      let(:release3) { create(:location_release_with_contract_template, :native, project: project, person_name: "Brad Doe") }
+      let(:release) { create(:location_release_with_contract_template, :native, project: project, name: "John") }
+      let(:release2) { create(:location_release_with_contract_template, :native, project: project, name: "Jane") }
+      let(:release3) { create(:location_release_with_contract_template, :native, project: project, name: "Brad") }
       subject { 'LocationRelease' }
 
       it_behaves_like "generates ZIP containig CSV file with all releases data"
-- 
2.47.3


From 4128d96941fa66b8372a05e0f3932f05ce9cb4a0 Mon Sep 17 00:00:00 2001
From: Bilal <bilal@saburly.com>
Date: Mon, 7 Sep 2020 12:47:31 +0300
Subject: [PATCH 04/10] improve Download button for Material releases

---
 app/views/material_releases/index.html.erb   | 3 ++-
 app/views/material_releases/index.js.erb     | 2 ++
 spec/jobs/generate_contracts_zip_job_spec.rb | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/material_releases/index.html.erb b/app/views/material_releases/index.html.erb
index d9caf62..bf06d21 100644
--- a/app/views/material_releases/index.html.erb
+++ b/app/views/material_releases/index.html.erb
@@ -1,5 +1,6 @@
 <div class="row">
   <div class="col-md-12">
+    <input id="total_entries" type=hidden value=<%= @material_releases.total_entries %> />
     <div class="d-md-flex d-sm-flex flex-sm-column flex-md-row flex-md-wrap mb-3">
       <% if policy(MaterialRelease).new? %>
         <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :material_release], class: "btn btn-primary mr-2 mb-2" %>
@@ -10,7 +11,7 @@
       <% end %>
 
       <% if @material_releases.any? && policy(MaterialRelease).download_multiple? %>
-        <%= link_to "Download All", [@project, :contract_downloads, release_type: @material_releases.name], method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
+        <%= button_to "Download", [@project, :contract_downloads, release_type: @material_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
             disable_with: "Please wait..." } %>
       <% end %>
 
diff --git a/app/views/material_releases/index.js.erb b/app/views/material_releases/index.js.erb
index 69a9833..ac2d433 100644
--- a/app/views/material_releases/index.js.erb
+++ b/app/views/material_releases/index.js.erb
@@ -1,3 +1,5 @@
 $("#material_releases").html("<%= j render(@material_releases) %>");
 $("form input[type='search']").val("<%= params[:query] %>");
 $("#material_releases_pagination").html("<%= j will_paginate(@material_releases) %>");
+$("#selected_releases_form").attr('data-releasable-ids', JSON.stringify([]));
+$("#total_entries").val(<%= @material_releases.total_entries %>);
\ No newline at end of file
diff --git a/spec/jobs/generate_contracts_zip_job_spec.rb b/spec/jobs/generate_contracts_zip_job_spec.rb
index d2a2420..dc20325 100644
--- a/spec/jobs/generate_contracts_zip_job_spec.rb
+++ b/spec/jobs/generate_contracts_zip_job_spec.rb
@@ -196,10 +196,13 @@ describe GenerateContractsZipJob do
     end
 
     context "generates ZIP for material releases" do
-      let(:release) { create(:material_release_with_contract_template, :native, project: project) }
+      let(:release) { create(:material_release_with_contract_template, :native, project: project, name: "John") }
+      let(:release2) { create(:material_release_with_contract_template, :native, project: project, name: "Jane") }
+      let(:release3) { create(:material_release_with_contract_template, :native, project: project, name: "Brad") }
       subject { 'MaterialRelease' }
 
       it_behaves_like "generates ZIP containig CSV file with all releases data"
+      it_behaves_like "generates ZIP containig CSV file with specific releases data"
     end
 
     context "generates ZIP for medical releases" do
-- 
2.47.3


From 7d93d89e8e658f8f6b9fc9d1425a09fbb4e69c03 Mon Sep 17 00:00:00 2001
From: Bilal <bilal@saburly.com>
Date: Mon, 7 Sep 2020 12:54:00 +0300
Subject: [PATCH 05/10] improve Download button for Medical releases

---
 app/views/medical_releases/index.html.erb    | 3 ++-
 app/views/medical_releases/index.js.erb      | 2 ++
 spec/jobs/generate_contracts_zip_job_spec.rb | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/medical_releases/index.html.erb b/app/views/medical_releases/index.html.erb
index abba148..5519695 100644
--- a/app/views/medical_releases/index.html.erb
+++ b/app/views/medical_releases/index.html.erb
@@ -1,12 +1,13 @@
 <div class="row">
   <div class="col-md-12">
+    <input id="total_entries" type=hidden value=<%= @medical_releases.total_entries %> />
     <div class="d-md-flex d-sm-flex flex-sm-column flex-md-row flex-md-wrap mb-3">
       <% if @medical_releases.any? && policy(MedicalRelease).tag_multiple? %>
         <%= button_to_bulk_tagging(@project) %>
       <% end %>
 
       <% if @medical_releases.any? && policy(MedicalRelease).download_multiple? %>
-        <%= link_to "Download All", [@project, :contract_downloads, release_type: @medical_releases.name], method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
+        <%= button_to "Download", [@project, :contract_downloads, release_type: @medical_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
             disable_with: "Please wait..." } %>
       <% end %>
 
diff --git a/app/views/medical_releases/index.js.erb b/app/views/medical_releases/index.js.erb
index e720a01..e6d506c 100644
--- a/app/views/medical_releases/index.js.erb
+++ b/app/views/medical_releases/index.js.erb
@@ -1,3 +1,5 @@
 $("#medical_releases").html("<%= j render(@medical_releases) %>");
 $("form input[type='search']").val("<%= params[:query] %>");
 $("#medical_releases_pagination").html("<%= j will_paginate(@medical_releases) %>");
+$("#selected_releases_form").attr('data-releasable-ids', JSON.stringify([]));
+$("#total_entries").val(<%= @medical_releases.total_entries %>);
\ No newline at end of file
diff --git a/spec/jobs/generate_contracts_zip_job_spec.rb b/spec/jobs/generate_contracts_zip_job_spec.rb
index dc20325..2a4f77c 100644
--- a/spec/jobs/generate_contracts_zip_job_spec.rb
+++ b/spec/jobs/generate_contracts_zip_job_spec.rb
@@ -206,10 +206,13 @@ describe GenerateContractsZipJob do
     end
 
     context "generates ZIP for medical releases" do
-      let(:release) { create(:medical_release_with_contract_template, :native, project: project) }
+      let(:release) { create(:medical_release_with_contract_template, :native, project: project, person_name: "John Doe") }
+      let(:release2) { create(:medical_release_with_contract_template, :native, project: project, person_name: "Jane Doe") }
+      let(:release3) { create(:medical_release_with_contract_template, :native, project: project, person_name: "Brad Doe") }
       subject { 'MedicalRelease' }
 
       it_behaves_like "generates ZIP containig CSV file with all releases data"
+      it_behaves_like "generates ZIP containig CSV file with specific releases data"
     end
 
     context "generates ZIP for misc releases" do
-- 
2.47.3


From f7c5bb7b0f07356ec6da0ad10eb9eb5ce59ba6e2 Mon Sep 17 00:00:00 2001
From: Bilal <bilal@saburly.com>
Date: Mon, 7 Sep 2020 13:00:38 +0300
Subject: [PATCH 06/10] improve Download button for Misc releases

---
 app/views/misc_releases/index.html.erb       | 3 ++-
 app/views/misc_releases/index.js.erb         | 2 ++
 spec/jobs/generate_contracts_zip_job_spec.rb | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/misc_releases/index.html.erb b/app/views/misc_releases/index.html.erb
index 010786f..6dcbda8 100644
--- a/app/views/misc_releases/index.html.erb
+++ b/app/views/misc_releases/index.html.erb
@@ -1,12 +1,13 @@
 <div class="row">
   <div class="col-md-12">
+    <input id="total_entries" type=hidden value=<%= @misc_releases.total_entries %> />
     <div class="d-md-flex d-sm-flex flex-sm-column flex-md-row flex-md-wrap mb-3">
       <% if @misc_releases.any? && policy(MiscRelease).tag_multiple? %>
         <%= button_to_bulk_tagging(@project) %>
       <% end %>
 
       <% if @misc_releases.any? && policy(MiscRelease).download_multiple? %>
-        <%= link_to "Download All", [@project, :contract_downloads, release_type: @misc_releases.name], method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
+        <%= button_to "Download", [@project, :contract_downloads, release_type: @misc_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
             disable_with: "Please wait..." } %>
       <% end %>
 
diff --git a/app/views/misc_releases/index.js.erb b/app/views/misc_releases/index.js.erb
index 24f3ccf..558f9f7 100644
--- a/app/views/misc_releases/index.js.erb
+++ b/app/views/misc_releases/index.js.erb
@@ -1,3 +1,5 @@
 $("#misc_releases").html("<%= j render(@misc_releases) %>");
 $("form input[type='search']").val("<%= params[:query] %>");
 $("#misc_releases_pagination").html("<%= j will_paginate(@misc_releases) %>");
+$("#selected_releases_form").attr('data-releasable-ids', JSON.stringify([]));
+$("#total_entries").val(<%= @misc_releases.total_entries %>);
\ No newline at end of file
diff --git a/spec/jobs/generate_contracts_zip_job_spec.rb b/spec/jobs/generate_contracts_zip_job_spec.rb
index 2a4f77c..ab6cdc5 100644
--- a/spec/jobs/generate_contracts_zip_job_spec.rb
+++ b/spec/jobs/generate_contracts_zip_job_spec.rb
@@ -216,10 +216,13 @@ describe GenerateContractsZipJob do
     end
 
     context "generates ZIP for misc releases" do
-      let(:release) { create(:misc_release_with_contract_template, :native, project: project) }
+      let(:release) { create(:misc_release_with_contract_template, :native, project: project, person_name: "John Doe") }
+      let(:release2) { create(:misc_release_with_contract_template, :native, project: project, person_name: "Jane Doe") }
+      let(:release3) { create(:misc_release_with_contract_template, :native, project: project, person_name: "Brad Doe") }
       subject { 'MiscRelease' }
 
       it_behaves_like "generates ZIP containig CSV file with all releases data"
+      it_behaves_like "generates ZIP containig CSV file with specific releases data"
     end
 
     context "generates ZIP for music releases" do
-- 
2.47.3


From c32e8f51090d1d7f1a4f37873ce54b9ff6ed35ed Mon Sep 17 00:00:00 2001
From: Bilal <bilal@saburly.com>
Date: Mon, 7 Sep 2020 13:03:01 +0300
Subject: [PATCH 07/10] improve Download button for Music releases

---
 app/views/music_releases/index.html.erb      | 3 ++-
 app/views/music_releases/index.js.erb        | 2 ++
 spec/jobs/generate_contracts_zip_job_spec.rb | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/music_releases/index.html.erb b/app/views/music_releases/index.html.erb
index 3bb28ef..0b4cfc2 100644
--- a/app/views/music_releases/index.html.erb
+++ b/app/views/music_releases/index.html.erb
@@ -1,5 +1,6 @@
 <div class="row">
   <div class="col-md-12">
+    <input id="total_entries" type=hidden value=<%= @music_releases.total_entries %> />
     <div class="d-md-flex d-sm-flex flex-sm-column flex-md-row flex-md-wrap mb-3">
       <% if policy(MusicRelease).new? %>
         <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :music_release], class: "btn btn-primary mr-2 mb-2" %>
@@ -10,7 +11,7 @@
       <% end %>
 
       <% if @music_releases.any? && policy(MusicRelease).download_multiple? %>
-        <%= link_to "Download All", [@project, :contract_downloads, release_type: @music_releases.name], method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2" %>
+        <%= button_to "Download", [@project, :contract_downloads, release_type: @music_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2" %>
       <% end %>
 
       <%= bootstrap_form_with url: [@project, :music_releases], method: :get, remote: true, layout: :inline, id: "search" do |form| %>
diff --git a/app/views/music_releases/index.js.erb b/app/views/music_releases/index.js.erb
index 6c1706d..f3fc928 100644
--- a/app/views/music_releases/index.js.erb
+++ b/app/views/music_releases/index.js.erb
@@ -1,3 +1,5 @@
 $("#music_releases").html("<%= j render(@music_releases) %>");
 $("form input[type='search']").val("<%= params[:query] %>");
 $("#music_releases_pagination").html("<%= j will_paginate(@music_releases) %>");
+$("#selected_releases_form").attr('data-releasable-ids', JSON.stringify([]));
+$("#total_entries").val(<%= @music_releases.total_entries %>);
\ No newline at end of file
diff --git a/spec/jobs/generate_contracts_zip_job_spec.rb b/spec/jobs/generate_contracts_zip_job_spec.rb
index ab6cdc5..aefe5b2 100644
--- a/spec/jobs/generate_contracts_zip_job_spec.rb
+++ b/spec/jobs/generate_contracts_zip_job_spec.rb
@@ -226,10 +226,13 @@ describe GenerateContractsZipJob do
     end
 
     context "generates ZIP for music releases" do
-      let(:release) { create(:music_release_with_contract_template, project: project) }
+      let(:release) { create(:music_release_with_contract_template, project: project, name: "John") }
+      let(:release2) { create(:music_release_with_contract_template, project: project, name: "Jane") }
+      let(:release3) { create(:music_release_with_contract_template, project: project, name: "Brad") }
       subject { 'MusicRelease' }
 
       it_behaves_like "generates ZIP containig CSV file with all releases data"
+      it_behaves_like "generates ZIP containig CSV file with specific releases data"
     end
 
     context "generates ZIP for talent releases" do
-- 
2.47.3


From 25fa5347609ef65784f71eb344e9130913048896 Mon Sep 17 00:00:00 2001
From: Bilal <bilal@saburly.com>
Date: Mon, 7 Sep 2020 13:07:27 +0300
Subject: [PATCH 08/10] improve Download button for Talent releases

---
 app/views/talent_releases/index.html.erb     | 3 ++-
 app/views/talent_releases/index.js.erb       | 2 ++
 spec/jobs/generate_contracts_zip_job_spec.rb | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/talent_releases/index.html.erb b/app/views/talent_releases/index.html.erb
index 08a629d..b16edcb 100644
--- a/app/views/talent_releases/index.html.erb
+++ b/app/views/talent_releases/index.html.erb
@@ -1,5 +1,6 @@
 <div class="row">
   <div class="col-md-12">
+    <input id="total_entries" type=hidden value=<%= @talent_releases.total_entries %> />
     <div class="d-md-flex d-sm-flex flex-sm-column flex-md-row flex-md-wrap mb-3">
       <% if policy(TalentRelease).new? %>
         <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :talent_release], class: "btn btn-primary mr-2 mb-2" %>
@@ -10,7 +11,7 @@
       <% end %>
 
       <% if @talent_releases.any? && policy(TalentRelease).download_multiple? %>
-        <%= link_to "Download All", [@project, :contract_downloads, release_type: @talent_releases.name], method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
+        <%= button_to "Download", [@project, :contract_downloads, release_type: @talent_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
             disable_with: "Please wait..." } %>
       <% end %>
 
diff --git a/app/views/talent_releases/index.js.erb b/app/views/talent_releases/index.js.erb
index e396385..76e549f 100644
--- a/app/views/talent_releases/index.js.erb
+++ b/app/views/talent_releases/index.js.erb
@@ -1,3 +1,5 @@
 $("#talent_releases").html("<%= j render(@talent_releases) %>");
 $("form input[type='search']").val("<%= params[:query] %>");
 $("#talent_releases_pagination").html("<%= j will_paginate(@talent_releases) %>");
+$("#selected_releases_form").attr('data-releasable-ids', JSON.stringify([]));
+$("#total_entries").val(<%= @talent_releases.total_entries %>);
\ No newline at end of file
diff --git a/spec/jobs/generate_contracts_zip_job_spec.rb b/spec/jobs/generate_contracts_zip_job_spec.rb
index aefe5b2..74d1e80 100644
--- a/spec/jobs/generate_contracts_zip_job_spec.rb
+++ b/spec/jobs/generate_contracts_zip_job_spec.rb
@@ -236,10 +236,13 @@ describe GenerateContractsZipJob do
     end
 
     context "generates ZIP for talent releases" do
-      let(:release) { create(:talent_release_with_contract_template, :native, project: project) }
+      let(:release) { create(:talent_release_with_contract_template, :native, project: project, person_name: "John Doe") }
+      let(:release2) { create(:talent_release_with_contract_template, :native, project: project, person_name: "Jane Doe") }
+      let(:release3) { create(:talent_release_with_contract_template, :native, project: project, person_name: "Brad Doe") }
       subject { 'TalentRelease' }
 
       it_behaves_like "generates ZIP containig CSV file with all releases data"
+      it_behaves_like "generates ZIP containig CSV file with specific releases data"
     end
 
     context "When there are errors" do
-- 
2.47.3


From 08a07c2a2229e0727b34ce4543140017837d5e1f Mon Sep 17 00:00:00 2001
From: Bilal <bilal@saburly.com>
Date: Mon, 7 Sep 2020 13:19:46 +0300
Subject: [PATCH 09/10] fix specs

---
 spec/features/user_managing_medical_releases_spec.rb | 12 ++++++------
 spec/features/user_managing_misc_releases_spec.rb    |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/spec/features/user_managing_medical_releases_spec.rb b/spec/features/user_managing_medical_releases_spec.rb
index 7c43ddc..fa25a4e 100644
--- a/spec/features/user_managing_medical_releases_spec.rb
+++ b/spec/features/user_managing_medical_releases_spec.rb
@@ -197,13 +197,13 @@ feature "User managing medical releases" do
       expect(page).to have_css('i.fa.fa-check-circle.fa-2x', count: 1)
     end
 
-    scenario "Download All is visible" do
+    scenario "Download button is visible" do
       create(:medical_release_with_contract_template, :native, project: project)
       create(:medical_release_with_contract_template, :non_native, project: project)
 
       visit project_medical_releases_path(project)
 
-      expect(page).to have_content download_all_button
+      expect(page).to have_content download_button
     end
 
     scenario "Download action in Manage menu is visible" do
@@ -264,7 +264,7 @@ feature "User managing medical releases" do
 
       visit project_medical_releases_path(project)
 
-      expect(page).not_to have_content download_all_button
+      expect(page).not_to have_content download_button
     end
 
     scenario "Download action in Manage menu is not visible" do
@@ -308,7 +308,7 @@ feature "User managing medical releases" do
 
       visit project_medical_releases_path(project)
 
-      expect(page).not_to have_content download_all_button
+      expect(page).not_to have_content download_button
     end
 
     scenario "Download action in Manage menu is not visible" do
@@ -341,8 +341,8 @@ feature "User managing medical releases" do
 
   private
 
-  def download_all_button
-    'Download All'
+  def download_button
+    'Download'
   end
 
   def download_action
diff --git a/spec/features/user_managing_misc_releases_spec.rb b/spec/features/user_managing_misc_releases_spec.rb
index 81beb63..ba6a56b 100644
--- a/spec/features/user_managing_misc_releases_spec.rb
+++ b/spec/features/user_managing_misc_releases_spec.rb
@@ -62,12 +62,12 @@ feature "User managing misc releases" do
       sign_in current_user
     end
 
-    scenario "Download All is visible" do
+    scenario "Download is visible" do
       create(:misc_release_with_contract_template, :native, project: project)
 
       visit project_misc_releases_path(project)
 
-      expect(page).to have_content download_all_button
+      expect(page).to have_content download_button
     end
 
     scenario "Downloading PDF of native misc release is possible" do
@@ -145,8 +145,8 @@ feature "User managing misc releases" do
 
   private
 
-  def download_all_button
-    'Download All'
+  def download_button
+    'Download'
   end
 
   def view_release_pdf_link_for(release)
-- 
2.47.3


From 76940714b01dccd221cdfa8a53437bbd8aa24506 Mon Sep 17 00:00:00 2001
From: Bilal <bilal@saburly.com>
Date: Mon, 7 Sep 2020 13:34:18 +0300
Subject: [PATCH 10/10] fix buttons position

---
 app/views/acquired_media_releases/index.html.erb | 8 +++++---
 app/views/location_releases/index.html.erb       | 6 ++++--
 app/views/material_releases/index.html.erb       | 6 ++++--
 app/views/medical_releases/index.html.erb        | 6 ++++--
 app/views/misc_releases/index.html.erb           | 6 ++++--
 app/views/music_releases/index.html.erb          | 6 ++++--
 app/views/talent_releases/index.html.erb         | 6 ++++--
 7 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/app/views/acquired_media_releases/index.html.erb b/app/views/acquired_media_releases/index.html.erb
index 9a9f33a..9218015 100644
--- a/app/views/acquired_media_releases/index.html.erb
+++ b/app/views/acquired_media_releases/index.html.erb
@@ -3,15 +3,17 @@
     <input id="total_entries" type=hidden value=<%= @acquired_media_releases.total_entries %> />
     <div class="d-md-flex d-sm-flex flex-sm-column flex-md-row flex-md-wrap mb-3">
       <% if policy(AcquiredMediaRelease).new? %>
-        <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :acquired_media_release], class: "btn btn-primary mr-2 mb-2" %>
+        <div class="mr-auto">
+          <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :acquired_media_release], class: "btn btn-primary mr-2 mb-2" %>
+        </div>
       <% end %>
 
       <% if @acquired_media_releases.any? && policy(AcquiredMediaRelease).tag_multiple? %>
         <%= button_to_bulk_tagging(@project) %>
       <% end %>
-      
+
       <% if @acquired_media_releases.any? && policy(AcquiredMediaRelease).download_multiple? %>
-        <%= button_to "Download", [@project, :contract_downloads, release_type: @acquired_media_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
+        <%= button_to "Download", [@project, :contract_downloads, release_type: @acquired_media_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border mr-2 mb-2", data: {
             disable_with: "Please wait..." } %>
       <% end %>
 
diff --git a/app/views/location_releases/index.html.erb b/app/views/location_releases/index.html.erb
index afc39b5..e1227b8 100644
--- a/app/views/location_releases/index.html.erb
+++ b/app/views/location_releases/index.html.erb
@@ -3,7 +3,9 @@
     <input id="total_entries" type=hidden value=<%= @location_releases.total_entries %> />
     <div class="d-md-flex d-sm-flex flex-sm-column flex-md-row flex-md-wrap mb-3">
       <% if policy(LocationRelease).new? %>
-        <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :location_release], class: "btn btn-primary mr-2 mb-2" %>
+        <div class="mr-auto">
+          <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :location_release], class: "btn btn-primary mr-2 mb-2" %>
+        </div>
       <% end %>
 
       <% if @location_releases.any? && policy(LocationRelease).tag_multiple? %>
@@ -11,7 +13,7 @@
       <% end %>
 
       <% if @location_releases.any? && policy(LocationRelease).download_multiple? %>
-        <%=  button_to "Download", [@project, :contract_downloads, release_type: @location_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
+        <%=  button_to "Download", [@project, :contract_downloads, release_type: @location_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border mr-2 mb-2", data: {
             disable_with: "Please wait..." } %>
       <% end %>
 
diff --git a/app/views/material_releases/index.html.erb b/app/views/material_releases/index.html.erb
index bf06d21..e2c518d 100644
--- a/app/views/material_releases/index.html.erb
+++ b/app/views/material_releases/index.html.erb
@@ -3,7 +3,9 @@
     <input id="total_entries" type=hidden value=<%= @material_releases.total_entries %> />
     <div class="d-md-flex d-sm-flex flex-sm-column flex-md-row flex-md-wrap mb-3">
       <% if policy(MaterialRelease).new? %>
-        <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :material_release], class: "btn btn-primary mr-2 mb-2" %>
+        <div class="mr-auto">
+          <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :material_release], class: "btn btn-primary mr-2 mb-2" %>
+        </div>
       <% end %>
 
       <% if @material_releases.any? && policy(MaterialRelease).tag_multiple? %>
@@ -11,7 +13,7 @@
       <% end %>
 
       <% if @material_releases.any? && policy(MaterialRelease).download_multiple? %>
-        <%= button_to "Download", [@project, :contract_downloads, release_type: @material_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
+        <%= button_to "Download", [@project, :contract_downloads, release_type: @material_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border mr-2 mb-2", data: {
             disable_with: "Please wait..." } %>
       <% end %>
 
diff --git a/app/views/medical_releases/index.html.erb b/app/views/medical_releases/index.html.erb
index 5519695..f30d323 100644
--- a/app/views/medical_releases/index.html.erb
+++ b/app/views/medical_releases/index.html.erb
@@ -3,11 +3,13 @@
     <input id="total_entries" type=hidden value=<%= @medical_releases.total_entries %> />
     <div class="d-md-flex d-sm-flex flex-sm-column flex-md-row flex-md-wrap mb-3">
       <% if @medical_releases.any? && policy(MedicalRelease).tag_multiple? %>
-        <%= button_to_bulk_tagging(@project) %>
+        <div class="ml-auto">
+          <%= button_to_bulk_tagging(@project) %>
+        </div>
       <% end %>
 
       <% if @medical_releases.any? && policy(MedicalRelease).download_multiple? %>
-        <%= button_to "Download", [@project, :contract_downloads, release_type: @medical_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
+        <%= button_to "Download", [@project, :contract_downloads, release_type: @medical_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border mr-2 mb-2", data: {
             disable_with: "Please wait..." } %>
       <% end %>
 
diff --git a/app/views/misc_releases/index.html.erb b/app/views/misc_releases/index.html.erb
index 6dcbda8..a0b296a 100644
--- a/app/views/misc_releases/index.html.erb
+++ b/app/views/misc_releases/index.html.erb
@@ -3,11 +3,13 @@
     <input id="total_entries" type=hidden value=<%= @misc_releases.total_entries %> />
     <div class="d-md-flex d-sm-flex flex-sm-column flex-md-row flex-md-wrap mb-3">
       <% if @misc_releases.any? && policy(MiscRelease).tag_multiple? %>
-        <%= button_to_bulk_tagging(@project) %>
+        <div class="ml-auto">
+          <%= button_to_bulk_tagging(@project) %>
+        </div>
       <% end %>
 
       <% if @misc_releases.any? && policy(MiscRelease).download_multiple? %>
-        <%= button_to "Download", [@project, :contract_downloads, release_type: @misc_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
+        <%= button_to "Download", [@project, :contract_downloads, release_type: @misc_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border mr-2 mb-2", data: {
             disable_with: "Please wait..." } %>
       <% end %>
 
diff --git a/app/views/music_releases/index.html.erb b/app/views/music_releases/index.html.erb
index 0b4cfc2..5f52754 100644
--- a/app/views/music_releases/index.html.erb
+++ b/app/views/music_releases/index.html.erb
@@ -3,7 +3,9 @@
     <input id="total_entries" type=hidden value=<%= @music_releases.total_entries %> />
     <div class="d-md-flex d-sm-flex flex-sm-column flex-md-row flex-md-wrap mb-3">
       <% if policy(MusicRelease).new? %>
-        <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :music_release], class: "btn btn-primary mr-2 mb-2" %>
+        <div class="mr-auto">
+          <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :music_release], class: "btn btn-primary mr-2 mb-2" %>
+        </div>
       <% end %>
 
       <% if @music_releases.any? && policy(MusicRelease).tag_multiple? %>
@@ -11,7 +13,7 @@
       <% end %>
 
       <% if @music_releases.any? && policy(MusicRelease).download_multiple? %>
-        <%= button_to "Download", [@project, :contract_downloads, release_type: @music_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2" %>
+        <%= button_to "Download", [@project, :contract_downloads, release_type: @music_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border mr-2 mb-2" %>
       <% end %>
 
       <%= bootstrap_form_with url: [@project, :music_releases], method: :get, remote: true, layout: :inline, id: "search" do |form| %>
diff --git a/app/views/talent_releases/index.html.erb b/app/views/talent_releases/index.html.erb
index b16edcb..6182f78 100644
--- a/app/views/talent_releases/index.html.erb
+++ b/app/views/talent_releases/index.html.erb
@@ -3,7 +3,9 @@
     <input id="total_entries" type=hidden value=<%= @talent_releases.total_entries %> />
     <div class="d-md-flex d-sm-flex flex-sm-column flex-md-row flex-md-wrap mb-3">
       <% if policy(TalentRelease).new? %>
-        <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :talent_release], class: "btn btn-primary mr-2 mb-2" %>
+        <div class="mr-auto">
+          <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :talent_release], class: "btn btn-primary mr-2 mb-2" %>
+        </div>
       <% end %>
 
       <% if @talent_releases.any? && policy(TalentRelease).tag_multiple? %>
@@ -11,7 +13,7 @@
       <% end %>
 
       <% if @talent_releases.any? && policy(TalentRelease).download_multiple? %>
-        <%= button_to "Download", [@project, :contract_downloads, release_type: @talent_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: {
+        <%= button_to "Download", [@project, :contract_downloads, release_type: @talent_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border mr-2 mb-2", data: {
             disable_with: "Please wait..." } %>
       <% end %>
 
-- 
2.47.3