From 8214ba9e6726f717cbb79a4f1065f152048c2d80 Mon Sep 17 00:00:00 2001
From: Senad Uka <senaduka@gmail.com>
Date: Mon, 3 Aug 2020 21:52:04 +0000
Subject: [PATCH] Changes

---
 .env.sample                                   |  3 +-
 app/controllers/admin/accounts_controller.rb  |  5 ++
 .../admin/broadcasts_controller.rb            | 24 ++++++
 .../broadcast_recordings_controller.rb        | 26 +++++++
 app/controllers/broadcasts_controller.rb      |  2 +-
 .../public/broadcasts_controller.rb           |  2 +-
 .../stream_notifications_controller.rb        |  2 +-
 app/models/account.rb                         |  1 +
 app/models/broadcast.rb                       |  6 +-
 app/models/broadcast_recording.rb             |  2 +
 app/policies/broadcast_recording_policy.rb    |  9 +++
 app/views/admin/accounts/_broadcast.html.erb  | 13 ++++
 app/views/admin/accounts/show.html.erb        | 20 +++++
 app/views/admin/broadcasts/_form.html.erb     | 14 ++++
 app/views/admin/broadcasts/edit.html.erb      |  6 ++
 app/views/broadcast_recordings/destroy.js.erb |  6 ++
 app/views/broadcasts/_broadcast.html.erb      |  4 +-
 .../_broadcast_recording_nav.html.erb         |  3 +-
 .../broadcasts/_broadcast_recordings.html.erb |  7 +-
 app/views/broadcasts/_video.html.erb          |  6 +-
 app/views/broadcasts/show.html.erb            |  9 +++
 .../_location_release.html.erb                |  4 +-
 app/views/location_releases/index.html.erb    |  4 +-
 app/views/public/amendments/new.html.erb      |  4 +
 config/locales/en.yml                         | 12 ++-
 config/locales/es.yml                         |  1 +
 config/routes.rb                              |  2 +
 ...dd_hidden_field_to_broadcast_recordings.rb |  5 ++
 ...d_stream_and_key_override_to_broadcasts.rb |  7 ++
 ...5912_remove_youtube_uid_from_broadcasts.rb |  5 ++
 ...director_mode_video_embed_to_broadcasts.rb |  5 ++
 db/structure.sql                              | 14 +++-
 spec/channels/broadcasts_channel_spec.rb      |  2 +-
 .../admin/accounts_controller_spec.rb         | 10 +++
 .../admin/broadcasts_controller_spec.rb       | 77 +++++++++++++++++++
 .../broadcast_recordings_controller_spec.rb   | 30 ++++++++
 .../controllers/broadcasts_controller_spec.rb | 29 +++++++
 spec/factories/broadcast_recordings.rb        |  3 +-
 spec/factories/broadcasts.rb                  | 11 +++
 .../features/user_managing_broadcasts_spec.rb | 50 +++++++++++-
 .../user_managing_location_releases_spec.rb   | 11 ++-
 spec/models/broadcast_spec.rb                 | 30 ++++++++
 42 files changed, 462 insertions(+), 24 deletions(-)
 create mode 100644 app/controllers/admin/broadcasts_controller.rb
 create mode 100644 app/controllers/broadcast_recordings_controller.rb
 create mode 100644 app/policies/broadcast_recording_policy.rb
 create mode 100644 app/views/admin/accounts/_broadcast.html.erb
 create mode 100644 app/views/admin/broadcasts/_form.html.erb
 create mode 100644 app/views/admin/broadcasts/edit.html.erb
 create mode 100644 app/views/broadcast_recordings/destroy.js.erb
 create mode 100644 db/migrate/20200724084722_add_hidden_field_to_broadcast_recordings.rb
 create mode 100644 db/migrate/20200730050903_add_stream_and_key_override_to_broadcasts.rb
 create mode 100644 db/migrate/20200803145912_remove_youtube_uid_from_broadcasts.rb
 create mode 100644 db/migrate/20200803150138_add_director_mode_video_embed_to_broadcasts.rb
 create mode 100644 spec/controllers/admin/broadcasts_controller_spec.rb
 create mode 100644 spec/controllers/broadcast_recordings_controller_spec.rb

diff --git a/.env.sample b/.env.sample
index 92c84ee..c506d1a 100644
--- a/.env.sample
+++ b/.env.sample
@@ -16,9 +16,10 @@ REDIS_URL=
 # Required for Zoom.us integration
 ZOOM_API_KEY=
 ZOOM_API_SECRET=
+ZOOM_ACCOUNT_NUMBER=
 ZOOM_PRO_USERS_LIMIT= # defaults to 3
 ZOOM_USER_TYPE= # 'pro' / 'basic'
-ZOOM_ENABLE_RECORDINGS=0 # 0 / 1
+ZOOM_ENABLE_RECORDINGS= # true / false (default: false)
 # Token for webhooks authorization
 ZOOM_VERIFICATION_TOKEN=
 
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb
index aec98e3..b69b710 100644
--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@@ -20,6 +20,7 @@ class Admin::AccountsController < Admin::ApplicationController
 
   def show
     @videos = filtered_account_videos.order(created_at: :desc, project_id: :desc).paginate(page: params[:page])
+    @broadcasts = account_broadcasts.order(created_at: :desc, project_id: :desc).paginate(page: params[:page])
   end
 
   def edit
@@ -70,4 +71,8 @@ class Admin::AccountsController < Admin::ApplicationController
       @account.videos
     end
   end
+
+  def account_broadcasts
+    @account.broadcasts
+  end
 end
diff --git a/app/controllers/admin/broadcasts_controller.rb b/app/controllers/admin/broadcasts_controller.rb
new file mode 100644
index 0000000..8e37c18
--- /dev/null
+++ b/app/controllers/admin/broadcasts_controller.rb
@@ -0,0 +1,24 @@
+class Admin::BroadcastsController < Admin::ApplicationController
+  before_action :set_broadcast, only: [:edit, :update]
+
+  def edit
+  end
+
+  def update
+    if @broadcast.update(broadcast_update_params)
+      redirect_to [:admin, @broadcast.project.account], notice: t(".notice")
+    else
+      render :edit
+    end
+  end
+
+  private
+
+  def set_broadcast
+    @broadcast = authorize policy_scope(Broadcast).find(params[:id])
+  end
+
+  def broadcast_update_params
+    params.require(:broadcast).permit(:stream_url_override, :stream_key_override, :director_mode_video_embed)
+  end
+end
diff --git a/app/controllers/broadcast_recordings_controller.rb b/app/controllers/broadcast_recordings_controller.rb
new file mode 100644
index 0000000..477edda
--- /dev/null
+++ b/app/controllers/broadcast_recordings_controller.rb
@@ -0,0 +1,26 @@
+class BroadcastRecordingsController < ApplicationController
+  layout "project"
+
+  before_action :set_project
+  before_action :set_broadcast
+  before_action :set_recording
+
+  def destroy
+    @recording.update(hidden: true)
+    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
+  end
+
+  private
+
+  def set_project
+    @project = policy_scope(Project).find(params[:project_id])
+  end
+
+  def set_broadcast
+    @broadcast = authorize policy_scope(@project.broadcasts).find(params[:broadcast_id])
+  end
+
+  def set_recording
+    @recording = authorize policy_scope(@broadcast.broadcast_recordings).find(params[:id])
+  end
+end
diff --git a/app/controllers/broadcasts_controller.rb b/app/controllers/broadcasts_controller.rb
index 072498b..22d59bc 100644
--- a/app/controllers/broadcasts_controller.rb
+++ b/app/controllers/broadcasts_controller.rb
@@ -27,7 +27,7 @@ class BroadcastsController < ApplicationController
 
   def show
     @conference_url = url_for [@broadcast.project, @broadcast, :zoom_meeting]
-    @recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
+    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
     @files = @broadcast.files.order("created_at DESC").paginate(page: params[:files_page])
     render layout: 'application'
   end
diff --git a/app/controllers/public/broadcasts_controller.rb b/app/controllers/public/broadcasts_controller.rb
index bad8a1c..aca8f57 100644
--- a/app/controllers/public/broadcasts_controller.rb
+++ b/app/controllers/public/broadcasts_controller.rb
@@ -5,7 +5,7 @@ class Public::BroadcastsController < Public::BaseController
   def show
     @conference_url = broadcast_zoom_meeting_url(@broadcast.token)
     @multi_view_broadcasts = multi_view_broadcasts
-    @recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
+    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
     @files = @broadcast.files.order("created_at DESC").paginate(page: params[:files_page])
 
     render 'broadcasts/show'
diff --git a/app/controllers/stream_notifications_controller.rb b/app/controllers/stream_notifications_controller.rb
index 76a77c8..ad4a7cb 100644
--- a/app/controllers/stream_notifications_controller.rb
+++ b/app/controllers/stream_notifications_controller.rb
@@ -35,7 +35,7 @@ class StreamNotificationsController < ApplicationController
       duration = notification.dig(:data, :duration)
 
       recording = @broadcast.broadcast_recordings.create!(asset_uid: asset_uid, asset_playback_uid: playback_uid, file_name: file_name, duration: duration)
-      recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
+      recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
 
       link = helpers.link_to(recording.broadcast_name.titleize, recording.download_url, target: "_blank")
       message = "Your recent live stream has been recorded and is available for download here: #{link}"
diff --git a/app/models/account.rb b/app/models/account.rb
index de3a812..6c89d62 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -5,6 +5,7 @@ class Account < ApplicationRecord
   has_many :users, through: :account_auths
   has_many :projects, dependent: :destroy
   has_many :videos, through: :projects
+  has_many :broadcasts, through: :projects
   has_many :contract_templates, through: :projects
 
   validates :name, presence: true
diff --git a/app/models/broadcast.rb b/app/models/broadcast.rb
index d1f6943..349ea65 100644
--- a/app/models/broadcast.rb
+++ b/app/models/broadcast.rb
@@ -35,7 +35,11 @@ class Broadcast < ApplicationRecord
   end
 
   def stream_server_url
-    ENV['MUX_BROADCAST_SERVER_URL']
+    stream_url_override.presence || ENV["MUX_BROADCAST_SERVER_URL"]
+  end
+
+  def stream_server_key
+    stream_key_override.presence || stream_key
   end
 
   def zoom_meeting_url
diff --git a/app/models/broadcast_recording.rb b/app/models/broadcast_recording.rb
index 6ad23bd..a7add7d 100644
--- a/app/models/broadcast_recording.rb
+++ b/app/models/broadcast_recording.rb
@@ -5,6 +5,8 @@ class BroadcastRecording < ApplicationRecord
 
   validates :asset_uid, uniqueness: true
 
+  scope :visible, -> { where(hidden: false) }
+
   def download_url
     "https://stream.mux.com/#{asset_playback_uid}/#{file_name}?download=#{download_file_name}"
   end
diff --git a/app/policies/broadcast_recording_policy.rb b/app/policies/broadcast_recording_policy.rb
new file mode 100644
index 0000000..7423f2d
--- /dev/null
+++ b/app/policies/broadcast_recording_policy.rb
@@ -0,0 +1,9 @@
+class BroadcastRecordingPolicy < ApplicationPolicy
+  def destroy?
+    if user.nil? || user.user.nil?
+      return false
+    end
+    
+    user.manager? || user.account_manager?
+  end
+end
diff --git a/app/views/admin/accounts/_broadcast.html.erb b/app/views/admin/accounts/_broadcast.html.erb
new file mode 100644
index 0000000..3d4cc59
--- /dev/null
+++ b/app/views/admin/accounts/_broadcast.html.erb
@@ -0,0 +1,13 @@
+<tr>
+  <td><%= broadcast.project.name %></td>
+  <td><%= broadcast.name %></td>
+  <td class="text-right">
+    <div class="btn-group">
+      <%= button_tag "Manage", class: "btn btn-light btn-sm dropdown-toggle border", data: { toggle: "dropdown", boundary: "window" }, aria: { haspopup: true, expanded: false } %>
+      <div class="dropdown-menu dropdown-menu-right">
+        <%= link_to "View on Mux", "#{ENV['MUX_LIVE_STREAM_DASHBOARD_URL']}/#{broadcast.stream_uid}", class: "dropdown-item", target: "_blank" %>
+        <%= link_to "Edit", [:edit, :admin, broadcast, locale: I18n.locale], class: "dropdown-item" %>
+      </div>
+    </div>
+  </td>
+</tr>
diff --git a/app/views/admin/accounts/show.html.erb b/app/views/admin/accounts/show.html.erb
index dfc6ca1..48b21ed 100644
--- a/app/views/admin/accounts/show.html.erb
+++ b/app/views/admin/accounts/show.html.erb
@@ -34,5 +34,25 @@
         <%= will_paginate @videos %>
       </div>
     <% end %>
+    <hr>
+    <%= card_field_set_tag "Broadcasts" do %>
+      <div class="table-responsive-sm">
+        <table class="table table-striped tr-px-4 align-all-middle">
+          <thead class="thead-light">
+            <tr>
+              <th>Project</th>
+              <th>Name</th>
+              <th></th>
+            </tr>
+          </thead>
+          <tbody id="broadcasts">
+            <%= render partial: "admin/accounts/broadcast", collection: @broadcasts %>
+          </tbody>
+        </table>
+      </div>
+      <div id="broadcasts_pagination">
+        <%= will_paginate @broadcasts %>
+      </div>
+    <% end %>
   </div>
 </div>
diff --git a/app/views/admin/broadcasts/_form.html.erb b/app/views/admin/broadcasts/_form.html.erb
new file mode 100644
index 0000000..acd53ac
--- /dev/null
+++ b/app/views/admin/broadcasts/_form.html.erb
@@ -0,0 +1,14 @@
+<%= errors_summary_for broadcast %>
+
+<%= bootstrap_form_with model: model, local: true do |form| %>
+  <%= form.text_field :stream_url_override %>
+  <%= form.text_field :stream_key_override %>
+  <%= form.text_area :director_mode_video_embed %>
+
+  <div class="row align-items-center text-center mt-4">
+    <%= link_to t("shared.cancel"), [:admin, broadcast.project.account], class: "col-3 text-reset" %>
+    <div class="col-9">
+      <%= form.submit class: class_string("btn btn-block", ["btn-success", "btn-primary"] => broadcast.new_record?), data: { disable_with: t("shared.disable_with") } %>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/admin/broadcasts/edit.html.erb b/app/views/admin/broadcasts/edit.html.erb
new file mode 100644
index 0000000..1dc8bb5
--- /dev/null
+++ b/app/views/admin/broadcasts/edit.html.erb
@@ -0,0 +1,6 @@
+<div class="card shadow-sm">
+  <%= card_header text: t(".heading"), close_action_path: [:admin, @broadcast.project.account] %>
+  <div class="card-body">
+    <%= render "form", model: [:admin, @broadcast], broadcast: @broadcast %>
+  </div>
+</div>
diff --git a/app/views/broadcast_recordings/destroy.js.erb b/app/views/broadcast_recordings/destroy.js.erb
new file mode 100644
index 0000000..0359114
--- /dev/null
+++ b/app/views/broadcast_recordings/destroy.js.erb
@@ -0,0 +1,6 @@
+var dom_id = "<%= dom_id(@recording) %>"
+$('[data-id="' + dom_id + '"]').remove();
+<% if @recordings.empty? %>
+  $("#broadcast_recordings_nav").append('<p class="dropdown-item text-muted">Recordings will appear here</p>')
+<% 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/broadcasts/_broadcast.html.erb b/app/views/broadcasts/_broadcast.html.erb
index 8cfb573..c40b09c 100644
--- a/app/views/broadcasts/_broadcast.html.erb
+++ b/app/views/broadcasts/_broadcast.html.erb
@@ -16,8 +16,8 @@
     <div class="btn-group">
       <%= button_tag t(".actions.manage"), class: "btn btn-light btn-sm dropdown-toggle border", data: { toggle: "dropdown", boundary: "window" }, aria: { haspopup: true, expanded: false } %>
       <div class="dropdown-menu dropdown-menu-right">
-        <%= link_to fa_icon("link fw", text: "Copy Stream URL"), ENV['MUX_BROADCAST_SERVER_URL'], class: "dropdown-item", data: { behavior: "clipboard" } %>
-        <%= link_to fa_icon("key fw", text: "Copy Stream Key"), broadcast.stream_key, class: "dropdown-item", data: { behavior: "clipboard" } %>
+        <%= link_to fa_icon("link fw", text: "Copy Stream URL"), broadcast.stream_server_url, class: "dropdown-item", data: { behavior: "clipboard" } %>
+        <%= link_to fa_icon("key fw", text: "Copy Stream Key"), broadcast.stream_server_key, class: "dropdown-item", data: { behavior: "clipboard" } %>
         <% if policy(broadcast).show? %>
           <%= link_to fa_icon("file-video-o fw", text: "View"), [broadcast.project, broadcast], class: "dropdown-item", target: '_blank' %>
         <% end %>
diff --git a/app/views/broadcasts/_broadcast_recording_nav.html.erb b/app/views/broadcasts/_broadcast_recording_nav.html.erb
index 5ef7ca0..bf80413 100644
--- a/app/views/broadcasts/_broadcast_recording_nav.html.erb
+++ b/app/views/broadcasts/_broadcast_recording_nav.html.erb
@@ -1,2 +1,3 @@
-<%= link_to broadcast_recording.download_file_name, "javascript:void(0);", class: "dropdown-item", data: { behavior: "play_recording", playback_url: broadcast_recording.playback_url } %>
+<%= link_to broadcast_recording.download_file_name, "javascript:void(0);", class: "dropdown-item", data: { behavior: "play_recording", playback_url: broadcast_recording.playback_url, id: dom_id(broadcast_recording) } %>
+
 
diff --git a/app/views/broadcasts/_broadcast_recordings.html.erb b/app/views/broadcasts/_broadcast_recordings.html.erb
index 2dd23fb..73f6f91 100644
--- a/app/views/broadcasts/_broadcast_recordings.html.erb
+++ b/app/views/broadcasts/_broadcast_recordings.html.erb
@@ -2,7 +2,12 @@
   <p>Click below to download the recordings of the live stream.</p>
   <ul class="mt-2">
     <% recordings.each do |recording| %>
-      <li><%= link_to(recording.download_file_name, recording.download_url, target: "_blank") %></li>
+      <li>
+        <%= link_to(recording.download_file_name, recording.download_url, target: "_blank") %> 
+        <% 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 %>
+      </li>
     <% end %>
   </ul>
   <div id="recordings_pagination" class="row mt-5 justify-content-center">
diff --git a/app/views/broadcasts/_video.html.erb b/app/views/broadcasts/_video.html.erb
index 9c44e2a..ff88436 100644
--- a/app/views/broadcasts/_video.html.erb
+++ b/app/views/broadcasts/_video.html.erb
@@ -1,5 +1,9 @@
 <% if broadcast.streamer_recording? && broadcast.active? %>
   <div id="broadcast_video" class="embed-responsive-item" data-video-type="stream"></div>
+<% elsif broadcast.director_mode_video_embed.present? && params[:director_mode] == "true" %>
+  <div class="embed-responsive-item" data-video-type="stream">
+    <%= raw broadcast.director_mode_video_embed %>
+  </div>
 <% else %>
   <div id="broadcast_video" class="embed-responsive-item" data-video-type="stream">
     <table class="w-100 h-100 bg-secondary">
@@ -12,4 +16,4 @@
       </tbody>
     </table>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/broadcasts/show.html.erb b/app/views/broadcasts/show.html.erb
index d36fccc..a63ac4f 100644
--- a/app/views/broadcasts/show.html.erb
+++ b/app/views/broadcasts/show.html.erb
@@ -39,6 +39,15 @@
                   <%= link_to broadcast.name.titleize, broadcast.url, data: { behavior: "play_stream"}, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %>
                 <% end %>
               <% end %>
+              <% if @broadcast.director_mode_video_embed.present? %>
+                <h5 class="dropdown-header">Director Mode</h5>
+                <% unless params[:director_mode] %>
+                  <%= link_to "Enable Director Mode", url_for(params.permit!.merge(director_mode: true)), class: "dropdown-item" %>
+                <% else %>
+                  <%= link_to "Disable Director Mode", url_for(params.permit!.except(:director_mode)), class: "dropdown-item" %>
+
+                <% end %>
+              <% end %>
               <h5 class="dropdown-header">Previous Sessions</h5>
               <div id="broadcast_recordings_nav">
                 <% if @recordings.any? %>
diff --git a/app/views/location_releases/_location_release.html.erb b/app/views/location_releases/_location_release.html.erb
index a829689..1660527 100644
--- a/app/views/location_releases/_location_release.html.erb
+++ b/app/views/location_releases/_location_release.html.erb
@@ -16,10 +16,10 @@
     <% end %>
   </td>
   <td>
-    <%= location_release.name %>
+    <%= contact_info(name: location_release.name, address: location_release.address) %>
   </td>
   <td>
-    <%= contact_info address: location_release.address %>
+    <%= contact_info_for(location_release.contact_person) %>
   </td>
   <td>
     <%= notes_preview location_release.notes.order_by_recent %>
diff --git a/app/views/location_releases/index.html.erb b/app/views/location_releases/index.html.erb
index 2aeb9f8..b69328f 100644
--- a/app/views/location_releases/index.html.erb
+++ b/app/views/location_releases/index.html.erb
@@ -28,8 +28,8 @@
         <th data-behavior="all-selectable"><%= check_box_tag "location_release_ids[]", false, false %></th>
         <th><%= t '.table_headers.approved'%></th>
         <th></th>
-        <th><%= t(".table_headers.name") %></th>
-        <th><%= t(".table_headers.address") %>
+        <th><%= t(".table_headers.location_info") %></th>
+        <th><%= t(".table_headers.owner_info") %>
         <th><%= t(".table_headers.notes") %></th>
         <th><%= t(".table_headers.tags") %></th>
         <th><%= t(".table_headers.signed_at") %></th>
diff --git a/app/views/public/amendments/new.html.erb b/app/views/public/amendments/new.html.erb
index 24b31c3..195aa81 100644
--- a/app/views/public/amendments/new.html.erb
+++ b/app/views/public/amendments/new.html.erb
@@ -8,6 +8,10 @@
   <div class="card-body">
     <%= errors_summary_for @release %>
     <%= bootstrap_form_with model: @release, method: :post, url: public_send("account_project_contract_template_#{@contract_template.release_type}_release_amendments_path"), local: true do |form| %>
+      <%= card_field_set_tag t('.signed_contract_preview') do %>
+        <embed class="embeded-contract-preview" type="application/pdf" src="<%= url_for([@release, :contracts, format: "pdf"]) %>" width="80%" height="1200" />
+      <% end %>
+
       <%= card_field_set_tag t(".amendment.heading") do %>
         <p><%= @contract_template.amendment_clause %></p>
       <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f4dc09b..77285d3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -111,6 +111,11 @@ en:
     application:
       header:
         sign_out: Sign Out
+    broadcasts:
+      edit:
+        heading: Edit Broadcast
+      update:
+        notice: The broadcast has been updated
     task_requests:
       index:
         empty: Task requests will appear here
@@ -218,6 +223,8 @@ en:
     broadcast:
       actions:
         manage: Manage
+    broadcast_recordings:
+      confirm_hide: Are you sure you want to hide this recording from everyone?
     create:
       notice: A live stream has been created
     destroy:
@@ -841,11 +848,11 @@ en:
         search: Search
       empty: Location Releases will appear here
       table_headers:
-        address: Address
         amendment_signed: Amendment
         approved: Approved
-        name: Location Name
+        location_info: Location Info
         notes: Notes
+        owner_info: Owner Info
         signed_at: Date Signed
         tags: Tags
     location_release:
@@ -1138,6 +1145,7 @@ en:
         copy_url: Copy sign amendment URL
         signature:
           heading: Signature
+        signed_contract_preview: Signed Contract Preview
     appearance_releases:
       create: 
         notice: Your release has been signed. Thank you!
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9e1f967..b87f3aa 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -504,6 +504,7 @@ es:
         copy_url: Copy sign amendment URL (ES)
         signature:
           heading: Signature (ES)
+        signed_contract_preview: Signed Contract Preview (ES)
     appearance_releases:
       create:
         notice: La autorización está firmada. ¡Gracias!
diff --git a/config/routes.rb b/config/routes.rb
index 4f0c3ff..7a9f412 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -35,6 +35,7 @@ Rails.application.routes.draw do
         resource :masquerade, only: :create
       end
       resources :task_requests, only: [:index, :edit, :update, :show]
+      resources :broadcasts, only: [:edit, :update]
 
       root to: "accounts#index", as: :signed_in_root
     end
@@ -100,6 +101,7 @@ Rails.application.routes.draw do
           delete :destroy_file
         end
         resource :zoom_meeting, only: [:show]
+        resources :broadcast_recordings, only: :destroy
       end
       resources :directories, except: [:index] do
         member do
diff --git a/db/migrate/20200724084722_add_hidden_field_to_broadcast_recordings.rb b/db/migrate/20200724084722_add_hidden_field_to_broadcast_recordings.rb
new file mode 100644
index 0000000..7e61108
--- /dev/null
+++ b/db/migrate/20200724084722_add_hidden_field_to_broadcast_recordings.rb
@@ -0,0 +1,5 @@
+class AddHiddenFieldToBroadcastRecordings < ActiveRecord::Migration[6.0]
+  def change
+    add_column :broadcast_recordings, :hidden, :boolean, default: false
+  end
+end
diff --git a/db/migrate/20200730050903_add_stream_and_key_override_to_broadcasts.rb b/db/migrate/20200730050903_add_stream_and_key_override_to_broadcasts.rb
new file mode 100644
index 0000000..2caec9a
--- /dev/null
+++ b/db/migrate/20200730050903_add_stream_and_key_override_to_broadcasts.rb
@@ -0,0 +1,7 @@
+class AddStreamAndKeyOverrideToBroadcasts < ActiveRecord::Migration[6.0]
+  def change
+    add_column :broadcasts, :stream_url_override, :string
+    add_column :broadcasts, :stream_key_override, :string
+    add_column :broadcasts, :youtube_uid, :string
+  end
+end
diff --git a/db/migrate/20200803145912_remove_youtube_uid_from_broadcasts.rb b/db/migrate/20200803145912_remove_youtube_uid_from_broadcasts.rb
new file mode 100644
index 0000000..a598496
--- /dev/null
+++ b/db/migrate/20200803145912_remove_youtube_uid_from_broadcasts.rb
@@ -0,0 +1,5 @@
+class RemoveYoutubeUidFromBroadcasts < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :broadcasts, :youtube_uid, :string
+  end
+end
diff --git a/db/migrate/20200803150138_add_director_mode_video_embed_to_broadcasts.rb b/db/migrate/20200803150138_add_director_mode_video_embed_to_broadcasts.rb
new file mode 100644
index 0000000..d9c1287
--- /dev/null
+++ b/db/migrate/20200803150138_add_director_mode_video_embed_to_broadcasts.rb
@@ -0,0 +1,5 @@
+class AddDirectorModeVideoEmbedToBroadcasts < ActiveRecord::Migration[6.0]
+  def change
+    add_column :broadcasts, :director_mode_video_embed, :text
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 7246f09..6a85008 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -536,7 +536,8 @@ CREATE TABLE public.broadcast_recordings (
     file_name character varying NOT NULL,
     created_at timestamp(6) without time zone NOT NULL,
     updated_at timestamp(6) without time zone NOT NULL,
-    duration double precision
+    duration double precision,
+    hidden boolean DEFAULT false
 );
 
 
@@ -576,7 +577,10 @@ CREATE TABLE public.broadcasts (
     token character varying,
     streamer_status integer DEFAULT 0,
     shoot_location_time_zone character varying DEFAULT 'UTC'::character varying,
-    full_live_stream_playback_uid character varying
+    full_live_stream_playback_uid character varying,
+    stream_url_override character varying,
+    stream_key_override character varying,
+    director_mode_video_embed text
 );
 
 
@@ -3998,7 +4002,11 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20200720051634'),
 ('20200720131309'),
 ('20200721140821'),
+('20200724084722'),
 ('20200725231419'),
-('20200727143209');
+('20200727143209'),
+('20200730050903'),
+('20200803145912'),
+('20200803150138');
 
 
diff --git a/spec/channels/broadcasts_channel_spec.rb b/spec/channels/broadcasts_channel_spec.rb
index a540e3f..2d350be 100644
--- a/spec/channels/broadcasts_channel_spec.rb
+++ b/spec/channels/broadcasts_channel_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe BroadcastsChannel, type: :channel do
   describe '#stream_recording_ready' do
     it 'broadcasts to the channel with the right data' do
       create_list(:broadcast_recording, 1, broadcast: broadcast) 
-      recordings = broadcast.broadcast_recordings.paginate(page: 1)
+      recordings = broadcast.broadcast_recordings.visible.paginate(page: 1)
       flash_message = OpenStruct.new(notice: 'Hello world', alert: nil)
       flash_content = ApplicationController.render partial: 'application/flash', locals: { flash: flash_message }
       recordings_content = ApplicationController.render partial: 'broadcasts/broadcast_recordings', locals: { recordings: recordings, broadcast: broadcast }
diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb
index 61f6cd6..da854b8 100644
--- a/spec/controllers/admin/accounts_controller_spec.rb
+++ b/spec/controllers/admin/accounts_controller_spec.rb
@@ -116,6 +116,16 @@ RSpec.describe Admin::AccountsController, type: :controller do
       expect(response.body).to have_link("2", href: admin_account_path(current_user.primary_account, page: 2))
     end
 
+    it "paginates the broadcast list" do
+      allow(MuxLiveStream).to receive(:new).and_return(double(id: "id", key: "key", playback_id: "playback_id"))
+      project = create(:project, account: current_user.primary_account)
+      create_list(:broadcast, 20, project: project )
+
+      get :show, params: { id: current_user.primary_account }
+
+      expect(response.body).to have_link("2", href: admin_account_path(current_user.primary_account, page: 2))
+    end
+
     it "filters the videos by a query param" do
       project = create(:project, account: current_user.primary_account)
       create(:video, project: project, name: "First video")
diff --git a/spec/controllers/admin/broadcasts_controller_spec.rb b/spec/controllers/admin/broadcasts_controller_spec.rb
new file mode 100644
index 0000000..db240dc
--- /dev/null
+++ b/spec/controllers/admin/broadcasts_controller_spec.rb
@@ -0,0 +1,77 @@
+require "rails_helper"
+
+RSpec.describe Admin::BroadcastsController, type: :controller do
+  render_views
+
+  let!(:current_user) { create(:user, :admin) }
+
+  before do
+    sign_in(current_user)
+    allow(MuxLiveStream).to receive(:new).and_return(double(id: "id", key: "key", playback_id: "playback_id"))
+  end
+
+  describe "#edit" do
+    let(:broadcast) { create(:broadcast) }
+
+    it "returns a successful response" do
+      get :edit, params: { id: broadcast }
+
+      expect(response).to be_successful
+    end
+
+    it "assigns broadcast" do
+      get :edit, params: { id: broadcast }
+
+      expect(assigns(:broadcast)).to eq broadcast
+    end
+  end
+
+  describe "#update" do
+    let(:broadcast) { create(:broadcast) }
+  
+    it "redirects to broadcasts page" do
+      patch :update, params: { id: broadcast, broadcast: broadcast_update_params }
+  
+      expect(response).to be_redirect
+      expect(response).to redirect_to [:admin, broadcast.project.account]
+    end
+  
+    it "sets a flash notice" do
+      patch :update, params: { id: broadcast, broadcast: broadcast_update_params }
+  
+      expect(flash.notice).to eq "The broadcast has been updated"
+    end
+  
+    it "updates the broadcast record" do
+      patch :update, params: { id: broadcast, broadcast: broadcast_update_params }
+  
+      expect(assigns(:broadcast)).to have_attributes(
+                                      stream_url_override: "https://example.com/streams/abcd",
+                                      stream_key_override: "abcdef",
+                                    )
+    end
+  
+    context "when record cannot be saved" do
+      before do
+        allow_any_instance_of(Broadcast).to receive(:update).and_return(false)
+      end
+  
+      it "re-displays the form" do
+        patch :update, params: { id: broadcast, broadcast: broadcast_update_params }
+  
+        expect(response).to be_successful
+        expect(flash.notice).to be_nil
+      end
+    end
+  end
+
+  private
+
+  def broadcast_update_params
+    {
+      stream_url_override: "https://example.com/streams/abcd",
+      stream_key_override: "abcdef",
+      director_mode_video_embed: "<iframe>Video player</iframe>",
+    }
+  end
+end
diff --git a/spec/controllers/broadcast_recordings_controller_spec.rb b/spec/controllers/broadcast_recordings_controller_spec.rb
new file mode 100644
index 0000000..28e7ab9
--- /dev/null
+++ b/spec/controllers/broadcast_recordings_controller_spec.rb
@@ -0,0 +1,30 @@
+require 'rails_helper'
+
+RSpec.describe BroadcastRecordingsController, type: :controller do
+  render_views
+
+  let(:user) { create(:user) }
+  let(:account) { user.primary_account }
+  let(:project) { create(:project, account: user.primary_account) }
+
+  before do
+    sign_in user
+  end
+
+  describe "#destroy" do
+    let(:broadcast) { create(:broadcast, project: project, name: "New Broadcast") }
+    let(:recording) { create(:broadcast_recording, broadcast: broadcast) }
+
+    before do
+      allow(MuxLiveStream).to receive(:new).and_return(double(id: "id", key: "key", playback_id: "playback_id"))
+    end
+
+    it "hides the broadcast recording" do
+      expect(recording.hidden).to be false
+
+      post :destroy, params: { project_id: project, broadcast_id: broadcast, id: recording }, xhr: true
+      
+      expect(recording.reload.hidden).to be true
+    end
+  end
+end
diff --git a/spec/controllers/broadcasts_controller_spec.rb b/spec/controllers/broadcasts_controller_spec.rb
index ed37ad2..8d08f2e 100644
--- a/spec/controllers/broadcasts_controller_spec.rb
+++ b/spec/controllers/broadcasts_controller_spec.rb
@@ -184,6 +184,35 @@ RSpec.describe BroadcastsController, type: :controller do
         expect(response.body).to have_selector(".dropdown-menu a.dropdown-item", text: recording.download_file_name)
       end
     end
+
+    context "when virtual director video embed is available" do
+      let(:broadcast) { create(:broadcast, project: project, name: "Another Broadcast",
+                               director_mode_video_embed: "<iframe>video player</iframe>") }
+
+      it "renders the view dropdown with a director mode enable option" do
+        get :show, params: { project_id: project, id: broadcast }
+
+        expect(response.body).to have_content "Switch View"
+        expect(response.body).to have_selector(".dropdown-menu h5.dropdown-header", text: "Director Mode")
+        expect(response.body).to have_selector(".dropdown-menu a.dropdown-item", text: "Enable Director Mode")
+      end
+
+      context "when director mode is enabled" do
+        it "shows the video embed" do
+          get :show, params: { project_id: project, id: broadcast, director_mode: true }
+
+          expect(response.body).to have_selector("iframe", text: "video player")
+        end
+
+        it "renders the view dropdown with a director mode disable option" do
+          get :show, params: { project_id: project, id: broadcast, director_mode: true }
+
+          expect(response.body).to have_content "Switch View"
+          expect(response.body).to have_selector(".dropdown-menu h5.dropdown-header", text: "Director Mode")
+          expect(response.body).to have_selector(".dropdown-menu a.dropdown-item", text: "Disable Director Mode")
+        end
+      end
+    end
   end
 
   describe "#update" do
diff --git a/spec/factories/broadcast_recordings.rb b/spec/factories/broadcast_recordings.rb
index 1cead9a..a30bf80 100644
--- a/spec/factories/broadcast_recordings.rb
+++ b/spec/factories/broadcast_recordings.rb
@@ -3,6 +3,7 @@ FactoryBot.define do
     association :broadcast
     file_name "high.mp4"
     asset_uid "asset_uid"
-    asset_playback_uid "asset_playback_uid"    
+    asset_playback_uid "asset_playback_uid"
+    hidden { false }
   end
 end
diff --git a/spec/factories/broadcasts.rb b/spec/factories/broadcasts.rb
index 4148242..d077ba8 100644
--- a/spec/factories/broadcasts.rb
+++ b/spec/factories/broadcasts.rb
@@ -16,6 +16,17 @@ FactoryBot.define do
       streamer_status "idle"
     end
 
+    trait :with_overriden_stream do
+      stream_uid "mux_stream"
+      stream_key "mux_key"
+      stream_playback_uid "mux_playback_id"
+      full_live_stream_playback_uid "full_live_stream_playback_uid"
+      status "created"
+      streamer_status "idle"
+      stream_url_override "overriden_stream_url"
+      stream_key_override "overriden_stream_key"
+    end
+
     trait :with_files do
       files do
         [
diff --git a/spec/features/user_managing_broadcasts_spec.rb b/spec/features/user_managing_broadcasts_spec.rb
index b4acf4e..5908096 100644
--- a/spec/features/user_managing_broadcasts_spec.rb
+++ b/spec/features/user_managing_broadcasts_spec.rb
@@ -3,6 +3,7 @@
 require 'rails_helper'
 
 feature 'User managing broadcasts' do
+
   let(:current_user) { create(:user, :manager) }
   let(:project) { create(:project, members: current_user, account: current_user.primary_account) }
 
@@ -50,7 +51,7 @@ feature 'User managing broadcasts' do
 
     scenario 'visit show page of broadcast', js: true do
       broadcast = create(:broadcast, :with_stream, :with_files, project: project)
-      recording = create(:broadcast_recording, broadcast: broadcast)
+      recording = create(:broadcast_recording, broadcast: broadcast, asset_uid: "asset_uid_1")
 
       visit project_broadcast_path(project, broadcast)
 
@@ -204,6 +205,24 @@ feature 'User managing broadcasts' do
       end
     end
 
+    scenario 'project manager can hide 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_content('Hide')
+      
+      accept_alert do
+        click_link "Hide"
+      end
+
+      expect(page).not_to have_content(recording.download_file_name)
+      expect(page).to have_content("Recording of the live stream will appear here")
+    end
+
     context 'When the user is associate' do
       let(:current_user) { create(:user, :associate) }
 
@@ -221,6 +240,17 @@ feature 'User managing broadcasts' do
 
         expect(page).to have_content delete_file_button, count: 0
       end
+
+      scenario 'associate does not see hide button in front of recording' 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).not_to have_content('Hide')
+      end
     end
 
     context 'When the user is account manager' do
@@ -247,6 +277,24 @@ feature 'User managing broadcasts' do
         expect(page).to have_content delete_file_button, count: 2
         expect(Broadcast.find(broadcast.id).files.count).to eq 2
       end
+
+      scenario 'account manager can hide 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_content('Hide')
+  
+        accept_alert do
+          click_link "Hide"
+        end
+  
+        expect(page).not_to have_content(recording.download_file_name)
+        expect(page).to have_content("Recording of the live stream will appear here")
+      end
     end
 
   end
diff --git a/spec/features/user_managing_location_releases_spec.rb b/spec/features/user_managing_location_releases_spec.rb
index 3eb55de..b7cf8f7 100644
--- a/spec/features/user_managing_location_releases_spec.rb
+++ b/spec/features/user_managing_location_releases_spec.rb
@@ -251,6 +251,9 @@ feature "User managing location releases" do
       new_window = window_opened_by { click_link sign_amendment_link }
       within_window new_window do
         expect(page).to have_content amendments_heading
+        expect(page).to have_content signed_contract_preview.upcase
+
+        expect(page).to have_selector 'embed'
 
         fill_in amendment_signer_name_field, with: 'Big Signer'
         draw_signature file_fixture("signature.png"), amendment_signature_field
@@ -690,6 +693,10 @@ feature "User managing location releases" do
     t 'public.amendments.new.amendment.heading'
   end
 
+  def signed_contract_preview
+    t 'public.amendments.new.signed_contract_preview'
+  end
+
   def amendment_signer_name_field
     'location_release[amendment_signer_name]'
   end
@@ -741,8 +748,8 @@ feature "User managing location releases" do
   def table_headers
     [
       t('location_releases.index.table_headers.approved'),
-      t('location_releases.index.table_headers.name'),
-      t('location_releases.index.table_headers.address'),
+      t('location_releases.index.table_headers.location_info'),
+      t('location_releases.index.table_headers.owner_info'),
       t('location_releases.index.table_headers.notes'),
       t('location_releases.index.table_headers.tags'),
       t('location_releases.index.table_headers.signed_at'),
diff --git a/spec/models/broadcast_spec.rb b/spec/models/broadcast_spec.rb
index 81abfbc..8813e47 100644
--- a/spec/models/broadcast_spec.rb
+++ b/spec/models/broadcast_spec.rb
@@ -49,6 +49,36 @@ RSpec.describe Broadcast, type: :model do
         expect(broadcast).to have_received(:destroy_mux_live_stream)
       end
     end
+
+    context "#stream_server_url" do
+      it "returns mux stream url when overriden stream url is absent" do
+        ENV["MUX_BROADCAST_SERVER_URL"] = "mux_stream"
+        broadcast = create(:broadcast, :with_stream, skip_create_callback: true, name: "My Broadcast")
+        
+        expect(broadcast.stream_server_url).to eq("mux_stream")
+      end
+
+      it "returns overriden stream url when it is present" do
+        ENV["MUX_BROADCAST_SERVER_URL"] = "mux_stream"
+        broadcast = create(:broadcast, :with_overriden_stream, skip_create_callback: true, name: "My Broadcast")
+        
+        expect(broadcast.stream_server_url).to eq("overriden_stream_url")
+      end
+    end
+
+    context "#stream_server_key" do
+      it "returns mux stream key when overriden stream key is absent" do
+        broadcast = create(:broadcast, :with_stream, skip_create_callback: true, name: "My Broadcast")
+        
+        expect(broadcast.stream_server_key).to eq("mux_key")
+      end
+
+      it "returns overriden stream key when it is present" do
+        broadcast = create(:broadcast, :with_overriden_stream, skip_create_callback: true, name: "My Broadcast")
+        
+        expect(broadcast.stream_server_key).to eq("overriden_stream_key")
+      end
+    end
   end
 
   describe "#zoom_meeting_url" do