From 86e441eebde24ff42fccd3e5806dd120981969a8 Mon Sep 17 00:00:00 2001
From: Bilal <bilal@saburly.com>
Date: Wed, 22 Jul 2020 18:16:14 +0200
Subject: [PATCH 1/4] add delete button to the files in broadcast page

---
 app/channels/broadcasts_channel.rb            |  2 +-
 app/controllers/broadcasts_controller.rb      | 22 +++++++---
 app/policies/broadcast_policy.rb              |  4 ++
 app/views/broadcasts/_file.html.erb           | 31 ++++++++++----
 app/views/broadcasts/_files_section.html.erb  |  2 +-
 app/views/broadcasts/_update_file_list.js.erb |  9 ++++
 app/views/broadcasts/destroy_file.js.erb      |  1 +
 app/views/broadcasts/update.js.erb            | 10 +----
 config/locales/en.yml                         |  4 ++
 config/locales/es.yml                         |  4 ++
 config/routes.rb                              |  3 ++
 spec/factories/broadcasts.rb                  |  8 +++-
 .../features/user_managing_broadcasts_spec.rb | 42 +++++++++++++++++++
 13 files changed, 116 insertions(+), 26 deletions(-)
 create mode 100644 app/views/broadcasts/_update_file_list.js.erb
 create mode 100644 app/views/broadcasts/destroy_file.js.erb

diff --git a/app/channels/broadcasts_channel.rb b/app/channels/broadcasts_channel.rb
index ad96756..f503c01 100644
--- a/app/channels/broadcasts_channel.rb
+++ b/app/channels/broadcasts_channel.rb
@@ -37,7 +37,7 @@ class BroadcastsChannel < ApplicationCable::Channel
   end
 
   def self.broadcast_file_upload_updates(broadcast, files, pagination_content)
-    files_content = ApplicationController.render partial: "broadcasts/file", collection: files
+    files_content = ApplicationController.render partial: "broadcasts/file", locals: { broadcast: broadcast }, collection: files
 
     broadcast_to broadcast, {
       event: :file_upload_update,
diff --git a/app/controllers/broadcasts_controller.rb b/app/controllers/broadcasts_controller.rb
index d778ba8..6f886b7 100644
--- a/app/controllers/broadcasts_controller.rb
+++ b/app/controllers/broadcasts_controller.rb
@@ -3,7 +3,7 @@ class BroadcastsController < ApplicationController
 
   before_action :set_project
   before_action :build_broadcast, only: [:new, :create]
-  before_action :set_broadcast, only: [:show, :destroy, :update]
+  before_action :set_broadcast, only: [:show, :destroy, :update, :destroy_file]
   before_action :set_multi_view_broadcasts, only: [:show]
   before_action :show_splash_screen, only: :index
 
@@ -39,10 +39,7 @@ class BroadcastsController < ApplicationController
     end
 
     @broadcast.update(broadcast_params)
-    @files = @broadcast.files.order("created_at DESC").paginate(page: 1)
-
-    pagination_content = ApplicationController.render html: helpers.will_paginate(@files, params: { active_tab: params[:active_tab], page: params[:page], active_files_tab: params[:active_files_tab] })
-    BroadcastsChannel.broadcast_file_upload_updates(@broadcast, @files, pagination_content)
+    update_files_section
   end
 
   def destroy
@@ -53,8 +50,23 @@ class BroadcastsController < ApplicationController
     end
   end
 
+  def destroy_file
+    authorize Broadcast
+    file = ActiveStorage::Attachment.find(params[:file_id])
+    file.purge
+
+    update_files_section
+  end
+
   private
 
+  def update_files_section
+    @files = @broadcast.files.order("created_at DESC").paginate(page: 1)
+
+    pagination_content = ApplicationController.render html: helpers.will_paginate(@files, params: { active_tab: params[:active_tab], page: params[:page], active_files_tab: params[:active_files_tab] })
+    BroadcastsChannel.broadcast_file_upload_updates(@broadcast, @files, pagination_content)
+  end
+
   def show_splash_screen
     render :splash if broadcasts.count.zero?
   end
diff --git a/app/policies/broadcast_policy.rb b/app/policies/broadcast_policy.rb
index 1a9d9be..15e7524 100644
--- a/app/policies/broadcast_policy.rb
+++ b/app/policies/broadcast_policy.rb
@@ -18,4 +18,8 @@ class BroadcastPolicy < ApplicationPolicy
   def update?
     true
   end
+
+  def destroy_file?
+    user.manager? || user.account_manager?
+  end
 end
diff --git a/app/views/broadcasts/_file.html.erb b/app/views/broadcasts/_file.html.erb
index b0c90a8..670050d 100644
--- a/app/views/broadcasts/_file.html.erb
+++ b/app/views/broadcasts/_file.html.erb
@@ -1,12 +1,25 @@
-<li class="my-2" id="<%= dom_id(file) %>">
-  <% if file.variable? %>
-    <%= link_to image_tag(file.variant(resize_and_pad: [300, 300, background: "#F7F8F9"]), class: "bg-light img-thumbnail img-fluid"), file, target: "_blank" %>
-  <% else %>
-    <div class="border rounded bg-light text-muted d-flex justify-content-center align-items-center fix-h-and-w">
-      <%= link_to file, target: "_blank" do %>
-        <%= fa_icon("file", style: "font-size: 2rem") %>
-        <div class="mt-2"><%= file.filename %></div>
+<div class="row">
+  <% show_delete = policy(broadcast).destroy_file? %>
+  <% file_class = show_delete ? "col-8" : "col-12" %>
+  <div class="<%= file_class %>">
+    <li class="my-2" id="<%= dom_id(file) %>">
+      <% if file.variable? %>
+        <%= link_to image_tag(file.variant(resize_and_pad: [300, 300, background: "#F7F8F9"]), class: "bg-light img-thumbnail img-fluid"), file, target: "_blank" %>
+      <% else %>
+        <div class="border rounded bg-light text-muted d-flex justify-content-center align-items-center img-fluid fix-h-and-w">
+          <%= link_to file, target: "_blank" do %>
+            <%= fa_icon("file", style: "font-size: 2rem") %>
+            <div class="mt-2"><%= file.filename %></div>
+          <% end %>
+        </div>
       <% end %>
+    </li>
+  </div>
+  <% if show_delete %>
+    <div class="col-4 align-self-center p-0 m-0">
+      <% broadcast = local_assigns[:broadcast] %>
+      <% url = url_for [:destroy_file, broadcast.project, broadcast, { file_id: file.id }] %>
+      <%= link_to fa_icon("trash fw", text: t('.actions.delete_file')), url, class: "btn btn-danger", remote: true, method: :delete, data: { confirm: t('.confirm_delete') } %>
     </div>
   <% end %>
-</li>
+</div>
\ No newline at end of file
diff --git a/app/views/broadcasts/_files_section.html.erb b/app/views/broadcasts/_files_section.html.erb
index 86865c8..17e9ee3 100644
--- a/app/views/broadcasts/_files_section.html.erb
+++ b/app/views/broadcasts/_files_section.html.erb
@@ -8,7 +8,7 @@
 <div class="overflow-auto mh-30">
   <ul class="list-unstyled d-flex flex-column align-items-center text-center" id="broadcast_file_list_<%= broadcast.token %>">
     <% if files.present? %>
-      <%= render partial: "broadcasts/file", collection: files %>
+      <%= render partial: "broadcasts/file", locals: { broadcast: broadcast }, collection: files %>
     <% else %>
       <li class="my-3">
         Files will appear here.
diff --git a/app/views/broadcasts/_update_file_list.js.erb b/app/views/broadcasts/_update_file_list.js.erb
new file mode 100644
index 0000000..d8fefc6
--- /dev/null
+++ b/app/views/broadcasts/_update_file_list.js.erb
@@ -0,0 +1,9 @@
+$("#broadcast_file_form_<%= @broadcast.token %>").html("<%= j render(partial: "broadcasts/file_form", locals: { model: [@project, @broadcast], token: @broadcast.token }) %>");
+
+var file_id = "#<%= dom_id(@files.first) %>"
+if ($("#broadcast_file_list_<%= @broadcast.token %>").has(file_id).length == 0) {
+    $("#broadcast_file_list_<%= @broadcast.token %>").html("<%= j render(partial: "broadcasts/file", locals: { broadcast: @broadcast }, collection: @files) %>");
+    $("#broadcast_files_pagination_<%= @broadcast.token %>").html("<%= j will_paginate(@files, param_name: 'files_page', params: { active_files_tab: @broadcast.token }) %>");
+}
+
+bsCustomFileInput.init();
diff --git a/app/views/broadcasts/destroy_file.js.erb b/app/views/broadcasts/destroy_file.js.erb
new file mode 100644
index 0000000..6c4f45d
--- /dev/null
+++ b/app/views/broadcasts/destroy_file.js.erb
@@ -0,0 +1 @@
+<% render "update_file_list" %>
\ No newline at end of file
diff --git a/app/views/broadcasts/update.js.erb b/app/views/broadcasts/update.js.erb
index a46716a..6c4f45d 100644
--- a/app/views/broadcasts/update.js.erb
+++ b/app/views/broadcasts/update.js.erb
@@ -1,9 +1 @@
-$("#broadcast_file_form_<%= @broadcast.token %>").html("<%= j render(partial: "broadcasts/file_form", locals: { model: [@project, @broadcast], token: @broadcast.token }) %>");
-
-var file_id = "#<%= dom_id(@files.first) %>"
-if ($("#broadcast_file_list_<%= @broadcast.token %>").has(file_id).length == 0) {
-  $("#broadcast_file_list_<%= @broadcast.token %>").html("<%= j render(partial: "broadcasts/file", collection: @files) %>");
-  $("#broadcast_files_pagination_<%= @broadcast.token %>").html("<%= j will_paginate(@files, param_name: 'files_page', params: { active_files_tab: @broadcast.token }) %>");
-}
-
-bsCustomFileInput.init();
+<% render "update_file_list" %>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0031f0f..5bc2fbb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -214,6 +214,10 @@ en:
     destroy:
       alert: A live stream has been deleted
       api_error: Something went wrong, please try again later after some time
+    file:
+      actions:
+        delete_file: Delete
+      confirm_delete: Are you sure?
     index:
       actions:
         new: Create New Live Stream
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 00d454a..52d5faf 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -81,6 +81,10 @@ es:
       do_not_copy_warning: "Do not copy (ES)"
       serial_number_label: "Serial Number (ES)"
   broadcasts:
+    file:
+      actions:
+        delete_file: Delete
+      confirm_delete: Are you sure? (ES)
     show:
       actions:
         reset_url: Reset URL (ES)
diff --git a/config/routes.rb b/config/routes.rb
index 6f2e9a9..bd619ac 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -96,6 +96,9 @@ Rails.application.routes.draw do
     end
     resources :projects, only: [] do
       resources :broadcasts, except: [:edit] do
+        member do
+          delete :destroy_file
+        end
         resource :zoom_meeting, only: [:show]
       end
       resources :directories, except: [:index] do
diff --git a/spec/factories/broadcasts.rb b/spec/factories/broadcasts.rb
index 3b022c2..4148242 100644
--- a/spec/factories/broadcasts.rb
+++ b/spec/factories/broadcasts.rb
@@ -17,7 +17,13 @@ FactoryBot.define do
     end
 
     trait :with_files do
-      files { [Rack::Test::UploadedFile.new('spec/fixtures/files/contract.pdf', 'application/pdf')] }
+      files do
+        [
+            Rack::Test::UploadedFile.new('spec/fixtures/files/contract.pdf', 'application/pdf'),
+            Rack::Test::UploadedFile.new('spec/fixtures/files/audio.mp3', 'audio/mpeg'),
+            Rack::Test::UploadedFile.new('spec/fixtures/files/video_file.mp4', 'video/mp4')
+        ]
+      end
     end
 
     after(:build) do |broadcast, evaluator|
diff --git a/spec/features/user_managing_broadcasts_spec.rb b/spec/features/user_managing_broadcasts_spec.rb
index b20cabc..5805ee2 100644
--- a/spec/features/user_managing_broadcasts_spec.rb
+++ b/spec/features/user_managing_broadcasts_spec.rb
@@ -164,6 +164,21 @@ feature 'User managing broadcasts' do
       click_on add_file_button
     end
 
+    scenario 'manager user can click delete button next to the file and delete file', js: true do
+      broadcast = create(:broadcast, :with_stream, :with_files, project: project)
+
+      visit project_broadcast_path(project, broadcast)
+
+      expect(page).to have_content delete_file_button, count: 3
+
+      accept_alert do
+        first('a', text: delete_file_button).click
+      end
+
+      expect(page).to have_content delete_file_button, count: 2
+      expect(Broadcast.find(broadcast.id).files.count).to eq 2
+    end
+
     scenario 'visit multi-view broadcast page', js: true do
       broadcast_one = create(:broadcast, :with_stream, :with_files, name: 'Broadcast 1', project: project)
       broadcast_two = create(:broadcast, :with_stream, :with_files, name: 'Broadcast 2', project: project)
@@ -198,6 +213,14 @@ feature 'User managing broadcasts' do
         expect(page).to have_content schedule_demo
         expect(page).not_to have_content create_stream
       end
+
+      scenario 'associate user does not see delete button next to the file', js: true do
+        broadcast = create(:broadcast, :with_stream, :with_files, project: project)
+
+        visit project_broadcast_path(project, broadcast)
+
+        expect(page).to have_content delete_file_button, count: 0
+      end
     end
 
     context 'When the user is account manager' do
@@ -209,6 +232,21 @@ feature 'User managing broadcasts' do
         expect(page).to have_content schedule_demo
         expect(page).to have_content create_stream
       end
+
+      scenario 'account manager user can click delete button next to the file and delete file', js: true do
+        broadcast = create(:broadcast, :with_stream, :with_files, project: project)
+
+        visit project_broadcast_path(project, broadcast)
+
+        expect(page).to have_content delete_file_button, count: 3
+
+        accept_alert do
+          first('a', text: delete_file_button).click
+        end
+
+        expect(page).to have_content delete_file_button, count: 2
+        expect(Broadcast.find(broadcast.id).files.count).to eq 2
+      end
     end
 
   end
@@ -262,5 +300,9 @@ feature 'User managing broadcasts' do
     'Live stream is waiting to begin'
   end
 
+  def delete_file_button
+    t 'broadcasts.file.actions.delete_file'
+  end
+
 
 end
-- 
2.47.3


From f8bdc5bce55543adc17898f4951cfab7995b6b47 Mon Sep 17 00:00:00 2001
From: Bilal <bilal@saburly.com>
Date: Wed, 22 Jul 2020 23:51:55 +0200
Subject: [PATCH 2/4] fix

---
 app/policies/broadcast_policy.rb                      | 4 ++++
 app/views/broadcasts/_file.html.erb                   | 2 +-
 spec/channels/broadcasts_channel_spec.rb              | 2 +-
 spec/controllers/api/broadcasts_controller_spec.rb    | 2 +-
 spec/controllers/public/broadcasts_controller_spec.rb | 1 +
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/policies/broadcast_policy.rb b/app/policies/broadcast_policy.rb
index 15e7524..4c562e5 100644
--- a/app/policies/broadcast_policy.rb
+++ b/app/policies/broadcast_policy.rb
@@ -20,6 +20,10 @@ class BroadcastPolicy < ApplicationPolicy
   end
 
   def destroy_file?
+    if user.nil? || user.user.nil?
+      return false
+    end
+
     user.manager? || user.account_manager?
   end
 end
diff --git a/app/views/broadcasts/_file.html.erb b/app/views/broadcasts/_file.html.erb
index 670050d..dec0579 100644
--- a/app/views/broadcasts/_file.html.erb
+++ b/app/views/broadcasts/_file.html.erb
@@ -1,5 +1,5 @@
 <div class="row">
-  <% show_delete = policy(broadcast).destroy_file? %>
+  <% show_delete = controller.class.module_parent.to_s == "Public" ? false : policy(broadcast).destroy_file? %>
   <% file_class = show_delete ? "col-8" : "col-12" %>
   <div class="<%= file_class %>">
     <li class="my-2" id="<%= dom_id(file) %>">
diff --git a/spec/channels/broadcasts_channel_spec.rb b/spec/channels/broadcasts_channel_spec.rb
index a540e3f..633ccd2 100644
--- a/spec/channels/broadcasts_channel_spec.rb
+++ b/spec/channels/broadcasts_channel_spec.rb
@@ -56,7 +56,7 @@ RSpec.describe BroadcastsChannel, type: :channel do
   describe ".broadcast_file_upload_updates" do
     it 'broadcasts to the channel with the right data' do
       broadcast = create(:broadcast, :with_stream, :with_files, skip_create_callback: true)
-      files_content = ApplicationController.render partial: "broadcasts/file", collection: broadcast.files
+      files_content = ApplicationController.render partial: "broadcasts/file", locals: { broadcast: broadcast }, collection: broadcast.files
 
       expect {
         BroadcastsChannel.broadcast_file_upload_updates(broadcast, broadcast.files, "pagination_content")
diff --git a/spec/controllers/api/broadcasts_controller_spec.rb b/spec/controllers/api/broadcasts_controller_spec.rb
index ee5e3af..5927bca 100644
--- a/spec/controllers/api/broadcasts_controller_spec.rb
+++ b/spec/controllers/api/broadcasts_controller_spec.rb
@@ -106,7 +106,7 @@ RSpec.describe Api::BroadcastsController, type: :controller do
       included = JSON.parse(response.body).dig('included')
 
       expect(relationships.keys).to include('files')
-      expect(included.size).to eq 1
+      expect(included.size).to eq 3
       expect(included.first.dig("id")).to eq broadcast.files.first.id.to_s
       expect(included.first.dig("type")).to eq 'active_storage_attachment'
     end
diff --git a/spec/controllers/public/broadcasts_controller_spec.rb b/spec/controllers/public/broadcasts_controller_spec.rb
index 8850bd7..f42338d 100644
--- a/spec/controllers/public/broadcasts_controller_spec.rb
+++ b/spec/controllers/public/broadcasts_controller_spec.rb
@@ -87,6 +87,7 @@ RSpec.describe Public::BroadcastsController, type: :controller do
     let!(:broadcast) { create(:broadcast, :with_stream, skip_create_callback: true, project: project ) }
   
     it "uploads files to broadcast" do
+      allow(BroadcastsChannel).to receive(:broadcast_file_upload_updates)
       patch :update, params: { token: broadcast.token, broadcast: file_params }, xhr: true
 
       expect(broadcast.files.count).to eq(1)
-- 
2.47.3


From 7ef27d4c1df5cb91462fbd429d8e207a2983e0e3 Mon Sep 17 00:00:00 2001
From: Bilal <bilal@saburly.com>
Date: Fri, 24 Jul 2020 14:57:35 +0200
Subject: [PATCH 3/4] fix MR comments

---
 app/channels/broadcasts_channel.rb            |  2 +-
 app/controllers/broadcasts_controller.rb      |  2 +-
 app/views/broadcasts/_file.html.erb           |  2 +-
 app/views/broadcasts/_files_section.html.erb  |  2 +-
 app/views/broadcasts/_update_file_list.js.erb |  9 ---------
 app/views/broadcasts/destroy_file.js.erb      |  1 -
 app/views/broadcasts/update.js.erb            | 10 +++++++++-
 spec/channels/broadcasts_channel_spec.rb      |  2 +-
 8 files changed, 14 insertions(+), 16 deletions(-)
 delete mode 100644 app/views/broadcasts/_update_file_list.js.erb
 delete mode 100644 app/views/broadcasts/destroy_file.js.erb

diff --git a/app/channels/broadcasts_channel.rb b/app/channels/broadcasts_channel.rb
index f503c01..ad96756 100644
--- a/app/channels/broadcasts_channel.rb
+++ b/app/channels/broadcasts_channel.rb
@@ -37,7 +37,7 @@ class BroadcastsChannel < ApplicationCable::Channel
   end
 
   def self.broadcast_file_upload_updates(broadcast, files, pagination_content)
-    files_content = ApplicationController.render partial: "broadcasts/file", locals: { broadcast: broadcast }, collection: files
+    files_content = ApplicationController.render partial: "broadcasts/file", collection: files
 
     broadcast_to broadcast, {
       event: :file_upload_update,
diff --git a/app/controllers/broadcasts_controller.rb b/app/controllers/broadcasts_controller.rb
index 6f886b7..072498b 100644
--- a/app/controllers/broadcasts_controller.rb
+++ b/app/controllers/broadcasts_controller.rb
@@ -53,7 +53,7 @@ class BroadcastsController < ApplicationController
   def destroy_file
     authorize Broadcast
     file = ActiveStorage::Attachment.find(params[:file_id])
-    file.purge
+    file.destroy
 
     update_files_section
   end
diff --git a/app/views/broadcasts/_file.html.erb b/app/views/broadcasts/_file.html.erb
index dec0579..f3b919d 100644
--- a/app/views/broadcasts/_file.html.erb
+++ b/app/views/broadcasts/_file.html.erb
@@ -1,4 +1,5 @@
 <div class="row">
+  <% broadcast = file.record %>
   <% show_delete = controller.class.module_parent.to_s == "Public" ? false : policy(broadcast).destroy_file? %>
   <% file_class = show_delete ? "col-8" : "col-12" %>
   <div class="<%= file_class %>">
@@ -17,7 +18,6 @@
   </div>
   <% if show_delete %>
     <div class="col-4 align-self-center p-0 m-0">
-      <% broadcast = local_assigns[:broadcast] %>
       <% url = url_for [:destroy_file, broadcast.project, broadcast, { file_id: file.id }] %>
       <%= link_to fa_icon("trash fw", text: t('.actions.delete_file')), url, class: "btn btn-danger", remote: true, method: :delete, data: { confirm: t('.confirm_delete') } %>
     </div>
diff --git a/app/views/broadcasts/_files_section.html.erb b/app/views/broadcasts/_files_section.html.erb
index 17e9ee3..86865c8 100644
--- a/app/views/broadcasts/_files_section.html.erb
+++ b/app/views/broadcasts/_files_section.html.erb
@@ -8,7 +8,7 @@
 <div class="overflow-auto mh-30">
   <ul class="list-unstyled d-flex flex-column align-items-center text-center" id="broadcast_file_list_<%= broadcast.token %>">
     <% if files.present? %>
-      <%= render partial: "broadcasts/file", locals: { broadcast: broadcast }, collection: files %>
+      <%= render partial: "broadcasts/file", collection: files %>
     <% else %>
       <li class="my-3">
         Files will appear here.
diff --git a/app/views/broadcasts/_update_file_list.js.erb b/app/views/broadcasts/_update_file_list.js.erb
deleted file mode 100644
index d8fefc6..0000000
--- a/app/views/broadcasts/_update_file_list.js.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-$("#broadcast_file_form_<%= @broadcast.token %>").html("<%= j render(partial: "broadcasts/file_form", locals: { model: [@project, @broadcast], token: @broadcast.token }) %>");
-
-var file_id = "#<%= dom_id(@files.first) %>"
-if ($("#broadcast_file_list_<%= @broadcast.token %>").has(file_id).length == 0) {
-    $("#broadcast_file_list_<%= @broadcast.token %>").html("<%= j render(partial: "broadcasts/file", locals: { broadcast: @broadcast }, collection: @files) %>");
-    $("#broadcast_files_pagination_<%= @broadcast.token %>").html("<%= j will_paginate(@files, param_name: 'files_page', params: { active_files_tab: @broadcast.token }) %>");
-}
-
-bsCustomFileInput.init();
diff --git a/app/views/broadcasts/destroy_file.js.erb b/app/views/broadcasts/destroy_file.js.erb
deleted file mode 100644
index 6c4f45d..0000000
--- a/app/views/broadcasts/destroy_file.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-<% render "update_file_list" %>
\ No newline at end of file
diff --git a/app/views/broadcasts/update.js.erb b/app/views/broadcasts/update.js.erb
index 6c4f45d..f64dcc2 100644
--- a/app/views/broadcasts/update.js.erb
+++ b/app/views/broadcasts/update.js.erb
@@ -1 +1,9 @@
-<% render "update_file_list" %>
\ No newline at end of file
+$("#broadcast_file_form_<%= @broadcast.token %>").html("<%= j render(partial: "broadcasts/file_form", locals: { model: [@project, @broadcast], token: @broadcast.token }) %>");
+
+var file_id = "#<%= dom_id(@files.first) %>"
+if ($("#broadcast_file_list_<%= @broadcast.token %>").has(file_id).length == 0) {
+    $("#broadcast_file_list_<%= @broadcast.token %>").html("<%= j render(partial: "broadcasts/file", collection: @files) %>");
+    $("#broadcast_files_pagination_<%= @broadcast.token %>").html("<%= j will_paginate(@files, param_name: 'files_page', params: { active_files_tab: @broadcast.token }) %>");
+}
+
+bsCustomFileInput.init();
\ No newline at end of file
diff --git a/spec/channels/broadcasts_channel_spec.rb b/spec/channels/broadcasts_channel_spec.rb
index 633ccd2..a540e3f 100644
--- a/spec/channels/broadcasts_channel_spec.rb
+++ b/spec/channels/broadcasts_channel_spec.rb
@@ -56,7 +56,7 @@ RSpec.describe BroadcastsChannel, type: :channel do
   describe ".broadcast_file_upload_updates" do
     it 'broadcasts to the channel with the right data' do
       broadcast = create(:broadcast, :with_stream, :with_files, skip_create_callback: true)
-      files_content = ApplicationController.render partial: "broadcasts/file", locals: { broadcast: broadcast }, collection: broadcast.files
+      files_content = ApplicationController.render partial: "broadcasts/file", collection: broadcast.files
 
       expect {
         BroadcastsChannel.broadcast_file_upload_updates(broadcast, broadcast.files, "pagination_content")
-- 
2.47.3


From 9edfe3d29189cc3f939a9cc03efef7782eff698c Mon Sep 17 00:00:00 2001
From: Bilal <bilal@saburly.com>
Date: Fri, 24 Jul 2020 14:58:44 +0200
Subject: [PATCH 4/4] fix MR comments

---
 app/views/broadcasts/update.js.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/broadcasts/update.js.erb b/app/views/broadcasts/update.js.erb
index f64dcc2..a46716a 100644
--- a/app/views/broadcasts/update.js.erb
+++ b/app/views/broadcasts/update.js.erb
@@ -2,8 +2,8 @@ $("#broadcast_file_form_<%= @broadcast.token %>").html("<%= j render(partial: "b
 
 var file_id = "#<%= dom_id(@files.first) %>"
 if ($("#broadcast_file_list_<%= @broadcast.token %>").has(file_id).length == 0) {
-    $("#broadcast_file_list_<%= @broadcast.token %>").html("<%= j render(partial: "broadcasts/file", collection: @files) %>");
-    $("#broadcast_files_pagination_<%= @broadcast.token %>").html("<%= j will_paginate(@files, param_name: 'files_page', params: { active_files_tab: @broadcast.token }) %>");
+  $("#broadcast_file_list_<%= @broadcast.token %>").html("<%= j render(partial: "broadcasts/file", collection: @files) %>");
+  $("#broadcast_files_pagination_<%= @broadcast.token %>").html("<%= j will_paginate(@files, param_name: 'files_page', params: { active_files_tab: @broadcast.token }) %>");
 }
 
-bsCustomFileInput.init();
\ No newline at end of file
+bsCustomFileInput.init();
-- 
2.47.3