Recordings will appear here
') +<% end %> +$("#broadcast_recordings").html("<%= j render(partial: 'broadcasts/broadcast_recordings', locals: { recordings: @recordings, broadcast: @broadcast }) %>"); \ No newline at end of file diff --git a/app/views/broadcast_recordings/destroy.js.erb b/app/views/broadcast_recordings/destroy.js.erb index 0359114..de2425d 100644 --- a/app/views/broadcast_recordings/destroy.js.erb +++ b/app/views/broadcast_recordings/destroy.js.erb @@ -1,6 +1 @@ -var dom_id = "<%= dom_id(@recording) %>" -$('[data-id="' + dom_id + '"]').remove(); -<% if @recordings.empty? %> - $("#broadcast_recordings_nav").append('Recordings will appear here
') -<% end %> -$("#broadcast_recordings").html("<%= j render(partial: 'broadcasts/broadcast_recordings', locals: { recordings: @recordings, broadcast: @broadcast }) %>"); \ No newline at end of file +<%= render("broadcast_recordings/refresh_recordings_list") %> \ No newline at end of file diff --git a/app/views/broadcast_recordings/update.js.erb b/app/views/broadcast_recordings/update.js.erb new file mode 100644 index 0000000..de2425d --- /dev/null +++ b/app/views/broadcast_recordings/update.js.erb @@ -0,0 +1 @@ +<%= render("broadcast_recordings/refresh_recordings_list") %> \ No newline at end of file diff --git a/app/views/broadcasts/_broadcast_recordings.html.erb b/app/views/broadcasts/_broadcast_recordings.html.erb index 73f6f91..52e6483 100644 --- a/app/views/broadcasts/_broadcast_recordings.html.erb +++ b/app/views/broadcasts/_broadcast_recordings.html.erb @@ -7,6 +7,9 @@ <% if (controller.class.module_parent.to_s != "Public" && policy(BroadcastRecording).destroy?) %> <%= link_to "Hide", [broadcast.project, broadcast, recording], class: "btn-sm btn-primary ml-1 text-decoration-none", remote: true, method: :delete, data: { confirm: t('.confirm_hide') } %> <% end %> + <% if (controller.class.module_parent.to_s != "Public" && policy(BroadcastRecording).destroy?) %> + <%= link_to fa_icon("#{recording.star ? 'star' : 'star-o'} fw"), [broadcast.project, broadcast, recording], class: "text-warning", method: :put, remote: true %> + <% end %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index 79bb52d..6b853d7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -101,7 +101,7 @@ Rails.application.routes.draw do delete :destroy_file end resource :zoom_meeting, only: [:show] - resources :broadcast_recordings, only: :destroy + resources :broadcast_recordings, only: [:destroy, :update] end resources :directories, except: [:index] do member do diff --git a/db/migrate/20200824171649_add_star_to_broadcast_recordings.rb b/db/migrate/20200824171649_add_star_to_broadcast_recordings.rb new file mode 100644 index 0000000..a8b115d --- /dev/null +++ b/db/migrate/20200824171649_add_star_to_broadcast_recordings.rb @@ -0,0 +1,5 @@ +class AddStarToBroadcastRecordings < ActiveRecord::Migration[6.0] + def change + add_column :broadcast_recordings, :star, :boolean + end +end diff --git a/db/structure.sql b/db/structure.sql index 6fa0d3d..28a72af 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -9,20 +9,6 @@ SET xmloption = content; SET client_min_messages = warning; SET row_security = off; --- --- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: - --- - -CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog; - - --- --- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: - --- - -COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language'; - - -- -- Name: fuzzystrmatch; Type: EXTENSION; Schema: -; Owner: - -- @@ -555,7 +541,8 @@ CREATE TABLE public.broadcast_recordings ( created_at timestamp(6) without time zone NOT NULL, updated_at timestamp(6) without time zone NOT NULL, duration double precision, - hidden boolean DEFAULT false + hidden boolean DEFAULT false, + star boolean ); @@ -4036,6 +4023,7 @@ INSERT INTO "schema_migrations" (version) VALUES ('20200807190607'), ('20200811102720'), ('20200812060406'), -('20200819070738'); +('20200819070738'), +('20200824171649'); diff --git a/spec/controllers/broadcast_recordings_controller_spec.rb b/spec/controllers/broadcast_recordings_controller_spec.rb index 0254a16..397333b 100644 --- a/spec/controllers/broadcast_recordings_controller_spec.rb +++ b/spec/controllers/broadcast_recordings_controller_spec.rb @@ -9,16 +9,47 @@ RSpec.describe BroadcastRecordingsController, type: :controller do before do sign_in user + stub_mux_live_stream + end + + describe "#update" do + let(:broadcast) { create(:broadcast, project: project, name: "New Broadcast") } + let(:recordings) { create_list(:broadcast_recording, 5, :with_random_asset_uid, broadcast: broadcast) } + let(:starred_recordings) { create_list(:broadcast_recording, 5, :with_random_asset_uid, broadcast: broadcast, star: true) } + + it "sets star property to true when recording is starred" do + recordings.each do |recording| + expect(recording.star).to be_falsey + end + + put :update, params: { project_id: project, broadcast_id: broadcast, id: recordings.first.id }, xhr: true + + expect(recordings.first.reload.star).to eq true + + recordings[1..5].each do |recording| + expect(recording.reload.star).to be_falsey + end + end + + it "sets star property to false when recording is unstarred" do + starred_recordings.each do |recording| + expect(recording.star).to be_truthy + end + + put :update, params: { project_id: project, broadcast_id: broadcast, id: starred_recordings.first.id }, xhr: true + + expect(starred_recordings.first.reload.star).to eq false + + starred_recordings[1..5].each do |recording| + expect(recording.reload.star).to eq true + end + end end describe "#destroy" do let(:broadcast) { create(:broadcast, project: project, name: "New Broadcast") } let(:recording) { create(:broadcast_recording, broadcast: broadcast) } - before do - stub_mux_live_stream - end - it "hides the broadcast recording" do expect(recording.hidden).to be false diff --git a/spec/factories/broadcast_recordings.rb b/spec/factories/broadcast_recordings.rb index a30bf80..89c2e3c 100644 --- a/spec/factories/broadcast_recordings.rb +++ b/spec/factories/broadcast_recordings.rb @@ -5,5 +5,9 @@ FactoryBot.define do asset_uid "asset_uid" asset_playback_uid "asset_playback_uid" hidden { false } + + trait :with_random_asset_uid do + sequence(:asset_uid, 'a') + end end end diff --git a/spec/features/user_managing_broadcasts_spec.rb b/spec/features/user_managing_broadcasts_spec.rb index 9c40b71..0707e75 100644 --- a/spec/features/user_managing_broadcasts_spec.rb +++ b/spec/features/user_managing_broadcasts_spec.rb @@ -223,6 +223,42 @@ feature 'User managing broadcasts' do expect(page).to have_content("Recording of the live stream will appear here") end + scenario 'project manager can star broadcast recordings', js: true do + broadcast = create(:broadcast, :with_stream, :with_files, project: project) + recording = create(:broadcast_recording, broadcast: broadcast, asset_uid: "another_asset_uid") + + visit project_broadcast_path(project, broadcast) + + click_on 'Previous Sessions' + + expect(page).to have_content(recording.download_file_name) + expect(page).to have_css('i.fa-star-o') + expect(page).not_to have_css('i.fa-star') + + find('i.fa-star-o').find(:xpath, '..').click + + expect(page).not_to have_css('i.fa-star-o') + expect(page).to have_css('i.fa-star') + end + + scenario 'project manager can unstar broadcast recordings', js: true do + broadcast = create(:broadcast, :with_stream, :with_files, project: project) + recording = create(:broadcast_recording, broadcast: broadcast, asset_uid: "another_asset_uid", star: true) + + visit project_broadcast_path(project, broadcast) + + click_on 'Previous Sessions' + + expect(page).to have_content(recording.download_file_name) + expect(page).to have_css('i.fa-star') + expect(page).not_to have_css('i.fa-star-o') + + find('i.fa-star').find(:xpath, '..').click + + expect(page).not_to have_css('i.fa-star') + expect(page).to have_css('i.fa-star-o') + end + context 'When the user is associate' do let(:current_user) { create(:user, :associate) } @@ -251,6 +287,19 @@ feature 'User managing broadcasts' do expect(page).to have_content(recording.download_file_name) expect(page).not_to have_content('Hide') end + + scenario 'associate does not see broadcast recordings star', js: true do + broadcast = create(:broadcast, :with_stream, :with_files, project: project) + recording = create(:broadcast_recording, broadcast: broadcast, asset_uid: "another_asset_uid", star: true) + + visit project_broadcast_path(project, broadcast) + + click_on 'Previous Sessions' + + expect(page).to have_content(recording.download_file_name) + expect(page).not_to have_css('i.fa-star') + expect(page).not_to have_css('i.fa-star-o') + end end context 'When the user is account manager' do @@ -295,6 +344,42 @@ feature 'User managing broadcasts' do expect(page).not_to have_content(recording.download_file_name) expect(page).to have_content("Recording of the live stream will appear here") end + + scenario 'account manager can star broadcast recordings', js: true do + broadcast = create(:broadcast, :with_stream, :with_files, project: project) + recording = create(:broadcast_recording, broadcast: broadcast, asset_uid: "another_asset_uid") + + visit project_broadcast_path(project, broadcast) + + click_on 'Previous Sessions' + + expect(page).to have_content(recording.download_file_name) + expect(page).to have_css('i.fa-star-o') + expect(page).not_to have_css('i.fa-star') + + find('i.fa-star-o').find(:xpath, '..').click + + expect(page).not_to have_css('i.fa-star-o') + expect(page).to have_css('i.fa-star') + end + + scenario 'account manager can unstar broadcast recordings', js: true do + broadcast = create(:broadcast, :with_stream, :with_files, project: project) + recording = create(:broadcast_recording, broadcast: broadcast, asset_uid: "another_asset_uid", star: true) + + visit project_broadcast_path(project, broadcast) + + click_on 'Previous Sessions' + + expect(page).to have_content(recording.download_file_name) + expect(page).to have_css('i.fa-star') + expect(page).not_to have_css('i.fa-star-o') + + find('i.fa-star').find(:xpath, '..').click + + expect(page).not_to have_css('i.fa-star') + expect(page).to have_css('i.fa-star-o') + end end end