fix buttons position

app/assets/javascripts/bs_component_init.js

@@ -1,7 +0,0 @@
-$(document).on("turbolinks:load", function() {
-  bsCustomFileInput.init();
-})
-
-$(document).on("turbolinks:load", function() {
-  $(".toast").toast('show');
-})

app/assets/javascripts/channels/broadcasts.coffee.erb

@@ -24,7 +24,7 @@ $(document).on "turbolinks:load", ->
       stream_selected = $("#broadcast_video").data('videoType') == 'stream';
       if data.streamer_status == 'recording' && data.status == 'active' && stream_selected
         $("#broadcast_video").html data.video_content
-        $("#recording_status").html data.recording_status_content
+        $("#live_take").html data.live_take_content
 
         new (Clappr.Player)(
           <%= "baseUrl: 'http://cdn.clappr.io/latest'," if Rails.env.test? %>
@@ -37,13 +37,12 @@ $(document).on "turbolinks:load", ->
           hlsMinimumDvrSize: 1)
       if data.streamer_status == "idle" && data.status == "idle"
         $("#broadcast_video").html data.video_content
-        $("#recording_status").html data.recording_status_content
+        $("#live_take").html data.live_take_content
 
     showBroadcastRecordings: (data) ->
       $(".flash-message").html data.flash_content
       $("#broadcast_recordings").html data.recordings_content
       $("#broadcast_recordings_nav").html data.recordings_nav_content
-      $(".toast").toast('show')
 
     refreshBroadcastFilesTab: (data) ->
       $("#broadcast_file_list_#{data.broadcast_token}").html data.files_content

app/assets/javascripts/channels/projects.coffee

@@ -23,4 +23,3 @@ $(document).on "turbolinks:load", ->
 
     showDownloadStatusUpdate: (content) ->
       $(".flash-message").html content
-      $(".toast").toast('show')

app/assets/javascripts/custom_file_input.js

@@ -0,0 +1,3 @@
+$(document).on("turbolinks:load", function() {
+  bsCustomFileInput.init()
+})

app/assets/javascripts/stream_player.js.erb

@@ -1,7 +1,4 @@
 $(document).on("click", "[data-behavior=play_recording]", function() {
-    clearPlayingHighlight();
-    $(this).parent().parent().addClass('playing-highlight');
-
     $("#broadcast_video").data('videoType', 'recording');
 
     var playback_url = $(this).attr("data-playback-url")
@@ -17,11 +14,4 @@ $(document).on("click", "[data-behavior=play_recording]", function() {
     });
 });
 
-$(document).on("click", "[data-behavior=play_stream]", function() {
-//    clearPlayingHighlight();
-    $("#broadcast_video").data('videoType', 'stream');
-});
-
-function clearPlayingHighlight() {
-    $(".playing-highlight").removeClass("playing-highlight");
-}
+$(document).on("click", "[data-behavior=play_stream]", function() { $("#broadcast_video").data('videoType', 'stream'); });

app/assets/javascripts/trix.js

@@ -1,30 +1,4 @@
 // Do not allow file attachments in rich text content
 addEventListener("trix-file-accept", function(event) {
   event.preventDefault();
-});
-
-Trix.config.textAttributes.underline = {
-    style: { "textDecoration": "underline" },
-    inheritable: true,
-    parser: function (element) {
-        var style = window.getComputedStyle(element);
-        return style.textDecoration === "underline";
-    }
-}
-
-document.addEventListener('trix-initialize', function (e) {
-    const trix = e.target;
-    const toolBar = trix.toolbarElement;
-
-    // // Creation of the button
-    const button = document.createElement("button");
-    button.setAttribute("type", "button");
-    button.setAttribute("class", "trix-button trix-button--icon trix-button--icon-underline");
-    button.setAttribute("data-trix-attribute", "underline");
-    button.setAttribute("title", "underline");
-    button.setAttribute("tabindex", "-1");
-    button.innerText = "U";
-
-    // Attachment of the button to the toolBar
-    toolBar.querySelector('.trix-button-group--text-tools').appendChild(button);
-});
+})

app/assets/stylesheets/application.scss

@@ -461,64 +461,3 @@ a[data-behavior=seekable-timecode] {
   border-color: transparent;
   border-bottom: 3px solid #ff0000;
 }
-
-//Trix underline style
-trix-toolbar {
-  .trix-button--icon-underline::before {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M12 17c3.31 0 6-2.69 6-6V3h-2.5v8c0 1.93-1.57 3.5-3.5 3.5S8.5 12.93 8.5 11V3H6v8c0 3.31 2.69 6 6 6zm-7 2v2h14v-2H5z'/%3E%3C/svg%3E");
-  }
-}
-
-// Play button SVG
-.play-btn {
-  width: 60%;
-  height: auto;
-}
-
-.play-btn-svg{
-  transition: 0.3s;
-  stroke:#fedfc2;
-  opacity: 0;
-}
-
-.play-btn:hover .play-btn-svg {
-  fill-opacity: 0;
-  opacity: 1;
-}
-
-// Play button in video thumbnail preview
-.play-thumbnail { position: relative; }
-.play-thumbnail img { display: block; }
-.play-thumbnail .play-btn { position: absolute; bottom:5px; left:10px; }
-
-// Active recording highlight
-.playing-highlight {
-  background-color: scale-color($primary, $lightness: 80%);
-}
-
-// Toast min width and border radius
-.toast-min-w-border-radius {
-  min-width: 18rem; 
-  border-radius: 0.8rem;
-}
-
-// Toast left border primary
-.toast-border-left-primary {
-  border-left: 8px solid $primary;
-}
-
-// Toast left border danger
-.toast-border-left-danger {
-  border-left: 8px solid $danger;
-}
-
-// Change link color to primary on toast notifications
-.toast {
-  a {
-    color: $primary;
-  }
-
-  a.btn {
-    color: white;
-  }
-}

app/assets/stylesheets/contract_pdf.scss

@@ -48,10 +48,6 @@ u {
   margin-right: -30px;
 }
 
-.embed-person-photo {
-  text-align: right;
-}
-
 .do-not-copy-warning {
   padding-right: 15px;
 }

app/channels/broadcasts_channel.rb

@@ -11,7 +11,7 @@ class BroadcastsChannel < ApplicationCable::Channel
   def self.broadcast_stream_updates(broadcast)
     status_content = ApplicationController.render partial: "broadcasts/broadcast_status", locals: { broadcast: broadcast }
     video_content = ApplicationController.render partial: "broadcasts/video", locals: { broadcast: broadcast }
-    recording_status_content = ApplicationController.render partial: "broadcasts/recording_status", locals: { broadcast: broadcast }
+    live_take = ApplicationController.render partial: "broadcasts/live_take", locals: { broadcast: broadcast }
 
     broadcast_to broadcast, {
       event: :broadcast_stream_update,
@@ -19,7 +19,7 @@ class BroadcastsChannel < ApplicationCable::Channel
       playback_url: broadcast.stream_playback_url,
       full_live_stream_playback_url: broadcast.full_live_stream_playback_url,
       video_content: video_content,
-      recording_status_content: recording_status_content,
+      live_take_content: live_take,
       status_content: status_content,
       streamer_status: broadcast.streamer_status
     }

app/controllers/account_sessions_controller.rb

@@ -1,5 +1,4 @@
 class AccountSessionsController < ApplicationController
-  skip_before_action :redirect_locked_accounts
   def update
     authorize :account_session, :update?
     session[:active_account] = account_session_params[:account_id]

app/controllers/admin/account_locks_controller.rb

@@ -1,31 +0,0 @@
-class Admin::AccountLocksController < Admin::ApplicationController
-  before_action :set_account
-
-  def create
-    authorize :account_lock, :create?
-    @account.update(locked: true)
-    redirect_to admin_accounts_path, notice: 'Account locked'
-  end
-
-  def destroy
-    authorize :account_lock, :destroy?
-    @account.update(locked: false)
-    redirect_to admin_accounts_path, notice: 'Account unlocked'
-  end
-
-  private
-
-  def set_account
-    if params[:account_id].present?
-      @account = Account.find_by(slug: params[:account_id])
-    else
-      failure_redirect
-    end
-  rescue ActiveRecord::RecordNotFound
-    failure_redirect
-  end
-
-  def failure_redirect
-    redirect_to admin_accounts_path, alert: 'Failed to find the account'
-  end
-end

app/controllers/application_controller.rb

@@ -13,7 +13,6 @@ class ApplicationController < ActionController::Base
 
   include SetCurrentRequestDetails
   before_action :redirect_accountless
-  before_action :redirect_locked_accounts
 
   private
 
@@ -30,12 +29,6 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def redirect_locked_accounts
-    if Current.user && !Current.user.admin? && Current.account.present? && Current.account.locked?
-      redirect_to locked_account_path
-    end
-  end
-
   def signed_in_as_admin?
     signed_in? && current_user.admin?
   end

app/controllers/broadcast_recording_starrings_controller.rb

@@ -0,0 +1,34 @@
+class BroadcastRecordingStarringsController < ApplicationController
+  layout "project"
+
+  before_action :set_project
+  before_action :set_broadcast
+  before_action :set_recording
+
+  def create
+    @recording.toggle_star
+    set_recordings
+  end
+
+  private
+
+  def broadcast_recording_params
+    params.require(:broadcast_recording).permit(:name, :description)
+  end
+
+  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[:broadcast_recording_id])
+  end
+
+  def set_recordings
+    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
+  end
+end

app/controllers/broadcast_recordings_controller.rb

@@ -5,6 +5,14 @@ class BroadcastRecordingsController < ApplicationController
   before_action :set_broadcast
   before_action :set_recording
 
+  def edit
+  end
+
+  def update
+    @recording.update(broadcast_recording_params)
+    set_recordings
+  end
+
   def destroy
     @recording.update(hidden: true)
     set_recordings
@@ -12,6 +20,10 @@ class BroadcastRecordingsController < ApplicationController
 
   private
 
+  def broadcast_recording_params
+    params.require(:broadcast_recording).permit(:name, :description)
+  end
+
   def set_project
     @project = policy_scope(Project).find(params[:project_id])
   end

app/controllers/contracts_controller.rb

@@ -3,7 +3,7 @@ class ContractsController < ApplicationController
     respond_to do |format|
       format.pdf { send_contract_pdf }
 
-      if Rails.env.development? || Rails.env.test?
+      if Rails.env.development?
         format.html { render_sample_html }
       end
     end

app/controllers/locked_accounts_controller.rb

@@ -1,10 +0,0 @@
-class LockedAccountsController < ApplicationController
-  skip_before_action :redirect_locked_accounts
-  skip_after_action :verify_policy_scoped
-
-  def index
-    unless Current.account.locked?
-      redirect_to projects_path
-    end
-  end
-end

app/controllers/public/broadcast_recording_starrings_controller.rb

@@ -1,24 +0,0 @@
-class Public::BroadcastRecordingStarringsController < Public::BaseController
-  skip_after_action :verify_authorized
-  before_action :set_broadcast
-  before_action :set_recording
-  
-  def create
-    @recording.toggle_star
-    set_recordings
-  end
-
-  private
-
-  def set_broadcast
-    @broadcast = Broadcast.find_by_token(params[:broadcast_token])
-  end
-
-  def set_recording
-    @recording = @broadcast.broadcast_recordings.find(params[:broadcast_recording_id])
-  end
-
-  def set_recordings
-    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
-  end
-end

app/controllers/public/broadcast_recordings_controller.rb

@@ -1,31 +0,0 @@
-class Public::BroadcastRecordingsController < Public::BaseController
-  skip_after_action :verify_authorized
-  before_action :set_broadcast, only: [:edit, :update]
-  before_action :set_recording, only: [:edit, :update]
-  
-  def edit
-  end
-
-  def update
-    @recording.update(broadcast_recording_params)
-    set_recordings
-  end
-
-  private
-
-  def broadcast_recording_params
-    params.require(:broadcast_recording).permit(:name, :description)
-  end
-
-  def set_broadcast
-    @broadcast = Broadcast.find_by_token(params[:broadcast_token])
-  end
-
-  def set_recording
-    @recording = @broadcast.broadcast_recordings.find(params[:id])
-  end
-
-  def set_recordings
-    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
-  end
-end

app/controllers/video_analyses/acquired_media_releases_controller.rb

@@ -2,7 +2,7 @@ class VideoAnalyses::AcquiredMediaReleasesController < ApplicationController
   before_action :set_video
 
   def index
-    @acquired_media_files = filtered_files
+    @acquired_media_file_infos = filtered_file_infos
   end
 
   private
@@ -15,12 +15,12 @@ class VideoAnalyses::AcquiredMediaReleasesController < ApplicationController
     params[:query]
   end
   
-  def filtered_files
+  def filtered_file_infos
     releasables = policy_scope(@video.acquired_media_releases)
-    results = ActiveStorage::Attachment.where(record: releasables, name: "files")
+    results = FileInfo.where(releasable: releasables)
 
     if query_param.present?
-      results = results.joins(:blob).where("active_storage_blobs.filename ILIKE ?", "%#{query_param}%")
+      results = results.search_filename(query_param)
     end
 
     results

app/controllers/video_release_confirmations_controller.rb

@@ -74,7 +74,6 @@ class VideoReleaseConfirmationsController < ApplicationController
     params.require(:video_release_confirmation).permit(
       :time_elapsed,
       :file_info_id,
-      :file_id,
       :channel,
       :timecode_in,
       :timecode_out,

app/helpers/dropzone_helper.rb

@@ -40,13 +40,4 @@ module DropzoneHelper
       { name: file_info.filename, size: file_info.byte_size, type: file_info.content_type }
     end.to_json
   end
-  
-  def dropzone_file_size_limit_for(releasable)
-    case releasable.model_name.param_key
-    when "material_release", "acquired_media_release"
-      1000000
-    else
-      256
-    end
-  end
 end

app/javascript/packs/active_storage_dropzone.js

@@ -12,7 +12,6 @@ class ActiveStorageDropzone {
     var acceptedFiles = $(element).data("accepted-files") || "image/*";
     var dictDefaultMessage = $(element).data("placeholder") || "Drop files here";
     var submitButton = $($(element).data("submit-button"));
-    var maxFileSize = $(element).data("max-file-size");
     var that = this;
 
     this.myDropzone = new this.DropzoneClass(element, {
@@ -21,7 +20,6 @@ class ActiveStorageDropzone {
       acceptedFiles: acceptedFiles,
       parallelUploads: 30,
       dictDefaultMessage: dictDefaultMessage,
-      maxFilesize: maxFileSize,
 
       init: function () {
         this.on("sending", (file, xhr, formData) => {

app/jobs/match_appearance_releases_job.rb

@@ -15,7 +15,6 @@ class MatchAppearanceReleasesJob < ApplicationJob
     matches = response.matches || []
     key_signed_id_hash = Hash[filtered_attachments_object[:keys].zip(filtered_attachments_object[:signed_ids])]
     handle_matches matches, project, key_signed_id_hash
-    handle_unmatches matches, project, key_signed_id_hash
     matching_request.destroy
   end
 
@@ -41,21 +40,6 @@ class MatchAppearanceReleasesJob < ApplicationJob
     end
   end
 
-  def handle_unmatches(matches, project, key_signed_id_hash)
-    matched_keys = matches.flat_map { |match| match.contracts + match.headshots }
-    unmatches = key_signed_id_hash.find_all { |key, _| !key.in?(matched_keys) }
-
-    unmatches.each do |key, signed_id|
-      blob = ActiveStorage::Blob.find_signed signed_id
-
-      if blob.image?
-        create_release(project, nil, signed_id, nil)
-      else
-        create_release(project, signed_id, nil, nil)
-      end
-    end
-  end
-
   def create_release(project, contract, headshot, identifier)
     random_contract_no = AppearanceRelease.random_contract_number.to_s
     is_incomplete = contract.nil? || headshot.nil?

app/models/contract_template.rb

@@ -18,7 +18,7 @@ class ContractTemplate < ApplicationRecord
   has_many :medical_releases, dependent: :restrict_with_error
   has_many :misc_releases, dependent: :restrict_with_error
 
-  monetize :fee_old_cents
+  monetize :fee_cents
   has_rich_text :body
   has_rich_text :guardian_clause
   has_rich_text :signature_legal_text
@@ -29,7 +29,7 @@ class ContractTemplate < ApplicationRecord
 
   validates :name, presence: true
   validates :release_type, presence: true
-  validates :fee_old_cents, numericality: {
+  validates :fee_cents, numericality: {
     greater_than_or_equal_to: 0,
     less_than_or_equal_to: 99_999_999_99
   }
@@ -50,11 +50,7 @@ class ContractTemplate < ApplicationRecord
   enum accessibility: [:public_template, :private_template]
 
   def fee?
-    fee.present?
-  end
-
-  def fee_old?
-    !fee_old.zero?
+    !fee.zero?
   end
 
   def releases

app/models/video_release_confirmation.rb

@@ -9,10 +9,6 @@ class VideoReleaseConfirmation < ApplicationRecord
     Timecode.from_seconds(time_elapsed.to_f).to_s
   end
 
-  def file
-    ActiveStorage::Attachment.find(file_id)
-  end
-
   private
 
   class ReleaseRankOrder

app/policies/account_lock_policy.rb

@@ -1,9 +0,0 @@
-class AccountLockPolicy < ApplicationPolicy
-  def create?
-    user.admin?
-  end
-
-  def destroy?
-    user.admin?
-  end
-end

app/views/accounts/_form.html.erb

@@ -6,7 +6,7 @@
   <%= form.email_field :email, class: "form-group" %>
   <%= form.password_field :password %>
   <%= form.text_field :account_name, label: 'Account Name' %>
-  <%= form.select :interested_product_name, options_for_select(["I'm interested in all products", "ME Suite PRO", "DirectME", "ReleaseME", "CastME", "EditME", "DeliverME", "ExpenseME"]), { label: "What product are you most interested in?" }, { class: "form-control custom-select" } %>
+  <%= form.select :interested_product_name, options_for_select(["I'm interested in all products", "DirectME", "ReleaseME", "CastME", "EditME", "DeliverME", "ExpenseME"]), { label: "What product are you most interested in?" }, { class: "form-control custom-select" } %>
   <div class="pt-3">
     <%= form.submit "Start Free Trial", class: "btn btn-block btn-danger font-weight-bold" %>
   </div>

app/views/accounts/new.html.erb

@@ -4,9 +4,6 @@
       <h3>Welcome To <%= suite_wordmark("d-inline-block") %></h3>
       <div class="mt-4">
         <p>Sign up for a <strong>14 Day Free Trial</strong> which includes full access to the following products. No credit card required!</p>
-        <div class="d-flex justify-content-between pb-2">
-          <div><%= image_tag "ME_PRO_black.png", width: "96.66%" %></div>
-        </div>
         <div class="d-flex justify-content-between pb-2">
           <div><%= image_tag "logo_directme.png", width: "90%" %></div>
           <div><%= image_tag "logo_releaseme.png", width: "90%" %></div>

app/views/admin/accounts/_account.html.erb

@@ -30,11 +30,6 @@
         <%= link_to fa_icon("arrow-right", text: "Overview"), admin_account_path(account), class: "dropdown-item" %>
         <%= link_to fa_icon("pencil", text: "Edit"), edit_admin_account_path(account), class: "dropdown-item" %>
         <%= link_to fa_icon("arrow-right", text: "Account Managers"), account_auths_path({ account_id: account.id}), class: "dropdown-item" %>
-        <% if account.locked? %>
-          <%= link_to fa_icon("unlock", text: "Unlock Account"), [:admin, account, :lock], method: :delete, class: "dropdown-item" %>
-        <% else %>
-          <%= link_to fa_icon("lock", text: "Lock Account"), [:admin, account, :lock], method: :post, class: "dropdown-item" %>
-        <% end %>
       </div>
     </div>
   </td>

app/views/application/_flash.html.erb

@@ -1,22 +1,5 @@
-<!-- Wrapping element flash message-->
-<div class="position-relative" style="z-index: 9999;">
-  <!-- Position toasts -->
-  <div class="position-absolute" style="top: 0.5rem; right: 0.5rem;">
-    <% if flash.alert.present? %>
-      <div class="toast fade show bg-black text-white toast-min-w-border-radius" data-autohide="false">
-        <div class="toast-body toast-border-left-danger">
-          <button type="button" class="close text-white ml-2" data-dismiss="toast">&times;</button>
-          <p><%= flash.alert.html_safe %></p>
-        </div>
-      </div>
-    <% elsif flash.notice.present? %>
-      <div class="toast fade show bg-black text-white toast-min-w-border-radius" data-autohide="false">
-        <div class="toast-body toast-border-left-primary">
-          <button type="button" class="close text-white ml-2" data-dismiss="toast">&times;</button>
-          <p><%= flash.notice.html_safe %></p>
-        </div>
-      </div>
-    <% end %>
-  </div>
-</div>
-
+<% if flash.alert.present? %>
+  <div class="alert alert-danger text-center text-md-left"><%= flash.alert.html_safe %></div>
+<% elsif flash.notice.present? %>
+  <div class="alert alert-primary text-center text-md-left"><%= flash.notice.html_safe %></div>
+<% end %>

app/views/broadcast_recording_starrings/create.js.erb

@@ -1 +1 @@
-$("#broadcast_recordings").html("<%= j render(partial: 'broadcasts/broadcast_recordings', locals: { recordings: @recordings, broadcast: @broadcast }) %>");
+$("#broadcast_recordings").html("<%= j render(partial: 'broadcasts/broadcast_recordings', locals: { recordings: @recordings, broadcast: @broadcast }) %>");

app/views/broadcast_recordings/_edit_broadcast_recording_modal.html.erb

@@ -7,7 +7,7 @@
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
-      <%= bootstrap_form_with model: [broadcast, recording], url: broadcast_broadcast_recording_path(broadcast.token, recording), layout: :horizontal, label_col: "col-3", control_col: "col-9" do |form| %>
+      <%= bootstrap_form_with model: [broadcast.project, broadcast, recording], layout: :horizontal, label_col: "col-3", control_col: "col-9" do |form| %>
         <div class="modal-body">
           <div id="broadcast_recording_fields">
             <%= form.text_field :name %>

app/views/broadcast_recordings/edit.js.erb

@@ -2,5 +2,5 @@
 $("#edit_broadcast_recording_modal").remove();
 
 <% # Create and show the modal %>
-$("body").append("<%= j render(partial: 'edit_broadcast_recording_modal', locals: { broadcast: @broadcast, recording: @recording }) %>");
+$("body").append("<%= j render(partial: 'edit_broadcast_recording_modal', locals: { project: @project, broadcast: @broadcast, recording: @recording }) %>");
 $("#edit_broadcast_recording_modal").modal("toggle");

app/views/broadcast_recordings/update.js.erb

@@ -0,0 +1 @@
+<%= render("broadcast_recordings/refresh_recordings_list") %>

app/views/broadcasts/_broadcast_recordings.html.erb

@@ -1,31 +1,29 @@
-<ul class="list-unstyled">
-  <% recordings.each do |recording| %>
-    <li class="media p-3">
-      <% if policy(BroadcastRecording).update? %>
-        <%= link_to fa_icon("#{recording.starred ? 'star' : 'star-o'} fw"), broadcast_broadcast_recording_broadcast_recording_starrings_path(broadcast.token, recording), method: :post, class: "text-warning mr-3", remote: true %>
-      <% end %>
-
-      <div class="play-thumbnail">
-        <%= image_tag(recording.thumbnail_url, class: 'mr-2', size: "64x64") %>
-        <%= content_tag :div, class: "play-btn", data: { behavior: "play_recording", playback_url: recording.playback_url, id: dom_id(recording) } do %>
-          <%= render "broadcasts/play_button_svg" %>
-        <% end %>
+<% if recordings.present? %>
+  <div class="list-group">
+    <% recordings.each do |recording| %>
+      <div class="list-group-item list-group-item-action">
+        <div class="d-flex align-items-start">
+          <% if policy(BroadcastRecording).update? %>
+            <%= link_to fa_icon("#{recording.starred ? 'star' : 'star-o'} fw"), [broadcast.project, broadcast, recording, :broadcast_recording_starrings], method: :post, class: "text-warning mr-3", remote: true %>
+          <% end %>
+          <%= image_tag(recording.thumbnail_url, class: 'img-thumbnail img-fluid max-w-75', data: { behavior: "play_recording", playback_url: recording.playback_url, id: dom_id(recording) }) %>
+          <div class="ml-auto">
+            <% if policy(BroadcastRecording).edit? %>
+              <%= link_to fa_icon('edit'), [:edit, broadcast.project, broadcast, recording], remote: true %>
+            <% end %>
+            <%= link_to(fa_icon('download'), recording.download_url, target: "_blank") %>
+          </div>
+        </div>
+        <div class="d-flex flex-column align-items-start justify-content-start p-4">
+          <h5><%= recording.name %></h5>
+          <p><%= recording.description %></p>
+        </div>
       </div>
-
-      <div class="media-body">
-        <h5 class="mt-0 mb-1"><%= recording.name %></h5>
-        <small class="text-muted"><%= recording.description %></small>
-      </div>
-
-      <% if policy(BroadcastRecording).edit? %>
-        <%= link_to fa_icon('edit'), edit_broadcast_broadcast_recording_path(broadcast.token, recording), remote: true %>
-      <% end %>
-
-      <%= link_to(fa_icon('download'), recording.download_url, target: "_blank") %>
-    </li>
-  <% end %>
-</ul>
-
-<div id="recordings_pagination" class="row mt-5 justify-content-center">
-  <%= will_paginate(recordings, params: {controller: "broadcasts", action: "show", project_id: broadcast.project_id, id: broadcast.id, page: params[:page], active_tab: 'recordings'}) %>
-</div>
+    <% end %>
+  </div>
+  <div id="recordings_pagination" class="row mt-5 justify-content-center">
+    <%= will_paginate(recordings, params: {controller: "broadcasts", action: "show", project_id: broadcast.project_id, id: broadcast.id, page: params[:page], active_tab: 'recordings'}) %>
+  </div>
+<% else %>
+  <p class="mt-4">Recording of the live stream will appear here.</p>
+<% end %>

app/views/broadcasts/_broadcast_status.html.erb

@@ -1,9 +1,13 @@
 <% if broadcast.streamer_connected? || (broadcast.streamer_recording? && !broadcast.active?) %>
   <p class="mb-1">Live stream has connected successfully and will be available soon.</p>
+  <div class="badge badge-pill badge-success mb-2 text-uppercase">Connected</div>
 <% elsif broadcast.streamer_recording? && broadcast.active? %>
   <p class="mb-1">Live stream has begun, click play to watch it.</p>
+  <div class="badge badge-pill badge-danger mb-2 text-uppercase">Live</div>
 <% elsif broadcast.streamer_disconnected? %>
   <p class="mb-1">Live stream got disconnected.</p>
+  <div class="badge badge-pill badge-warning mb-2 text-uppercase">Disconnected</div>
 <% elsif (broadcast.idle? && broadcast.streamer_idle?) || (broadcast.created? && broadcast.streamer_idle?) %>
   <p class="mb-1">Live stream is waiting to begin.</p>
+  <div class="badge badge-pill badge-primary mb-2 text-uppercase">Idle</div>
 <% end %>

app/views/broadcasts/_files_section.html.erb

@@ -1,4 +1,4 @@
-<div class="text-center p-3" id="broadcast_file_form_<%= broadcast.token %>">
+<div class="text-center pb-2" id="broadcast_file_form_<%= broadcast.token %>">
   <% if controller.class.module_parent.to_s == "Public" %>
     <%= render partial: "public/broadcasts/file_form", locals: { model: [broadcast], token: broadcast.token } %>
   <% else %>

app/views/broadcasts/_live_take.html.erb

@@ -1,35 +1,12 @@
-<% # TODO: Refactor this %>
-<% if params[:director_mode] %>
-  <% if controller.class.module_parent.to_s == "Public" %>
-    <% live_take_url = url_for(params.permit!.merge(director_mode: true, token: broadcast.token)) %>
-  <% else %>
-    <% live_take_url = url_for(params.permit!.merge(director_mode: true, id: broadcast.id)) %>
-  <% end %>
-  <hr/>
-<% else %>
-  <% if controller.class.module_parent.to_s == "Public" %>
-    <% live_take_url = url_for(params.permit!.merge(token: broadcast.token).except(:director_mode)) %>
-  <% else %>
-    <% live_take_url = url_for(params.permit!.merge(id: broadcast.id).except(:director_mode)) %>
-  <% end %>
-<% end %>
-
-<div id="live-take" class="media p-3 playing-highlight">
-  <div id="recording_status">
-    <%= render 'broadcasts/recording_status', broadcast: broadcast %>
-  </div>
-
-  <div class="play-thumbnail">
-    <%= image_tag "live_icon.png", class: "mr-2", width: 64, alt: "Live stream thumbnail" %>
-    <%= link_to live_take_url, class: "play-btn", data: { behavior: "play_stream" } do %>
-      <%= render "broadcasts/play_button_svg" %>
-    <% end %>
-  </div>
-
-  <div class="media-body">
-    <h5 class="mt-0"><%= broadcast.name %></h5>
-    <small id="broadcast_updates" class="text-muted">
+<div class="list-group">
+  <div class="list-group-item list-group-item-action flex-column align-items-start">
+    <div class="d-flex w-100 justify-content-between mb-1">
+      <h5 class="mb-1"><%= broadcast.name %></h5>
+      <small>Created - <%= time_ago_in_words(broadcast.created_at) + " ago" %></small>
+    </div>
+    <div id="broadcast_updates">
       <%= render partial: 'broadcasts/broadcast_status', locals: { broadcast: broadcast } %>
-    </small>
+    </div>
   </div>
 </div>
+

app/views/broadcasts/_play_button_svg.html.erb

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 26 26">
-  <polygon class="play-btn-svg" points="9.33 6.69 9.33 19.39 19.3 13.04 9.33 6.69"/>
-</svg>

app/views/broadcasts/_recording_status.html.erb

@@ -1 +0,0 @@
-<%= fa_icon "circle fw", class: class_string('mr-2', 'text-danger' => broadcast.streamer_recording? && broadcast.active?) %>

app/views/broadcasts/_video.html.erb

@@ -1,5 +1,5 @@
-<% if broadcast.director_mode_video_embed.present? && params[:non_director_mode].nil? %>
-  <div id="director_broadcast_video" class="embed-responsive-item" data-video-type="stream">
+<% if broadcast.director_mode_video_embed.present? && params[:director_mode].present? %>
+  <div class="embed-responsive-item" data-video-type="stream">
     <%= raw broadcast.director_mode_video_embed %>
   </div>
 <% elsif broadcast.streamer_recording? && broadcast.active? %>

app/views/broadcasts/show.html.erb

@@ -13,18 +13,12 @@
   <% end %>
 <% end %>
 
-<style>
-  body {
-    overflow-x: hidden;
-  }
-</style>
-
 <% content_for :header do %>
   <header></header>
 <% end %>
 
 <div class="row no-gutters m-n3">
-  <div class="col-lg-9 col-md-12 bg-black vh-100">
+  <div class="col-lg-8 col-md-12 bg-black">
     <div class="d-flex justify-content-start align-items-center flex-row p-3 mb-5 bg-dark">
       <%= product_wordmark(:direct_me, class: 'navbar-brand text-white') %>
       <div class="ml-4 dropdown">
@@ -41,17 +35,17 @@
           <%= link_to fa_icon("check", text: @broadcast.name.titleize), "#", data: { behavior: "play_stream"}, class: "dropdown-item active" %>
           <% @multi_view_broadcasts.each do |broadcast| %>
             <% if broadcast.id != @broadcast.id %>
-              <% if params[:non_director_mode] %>
+              <% if params[:director_mode] %>
                 <% if controller.class.module_parent.to_s == "Public" %>
-                  <%= link_to broadcast.name.titleize, url_for(params.permit!.merge(non_director_mode: true, token: broadcast.token)), data: { behavior: "play_stream"}, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %>
+                  <%= link_to broadcast.name.titleize, url_for(params.permit!.merge(director_mode: true, token: broadcast.token)), data: { behavior: "play_stream"}, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %>
                 <% else %>
-                  <%= link_to broadcast.name.titleize, url_for(params.permit!.merge(non_director_mode: true, id: broadcast.id)), data: { behavior: "play_stream"}, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %>
+                  <%= link_to broadcast.name.titleize, url_for(params.permit!.merge(director_mode: true, id: broadcast.id)), data: { behavior: "play_stream"}, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %>
                 <% end %>
               <% else %>
                 <% if controller.class.module_parent.to_s == "Public" %>
-                  <%= link_to broadcast.name.titleize, url_for(params.permit!.merge(token: broadcast.token).except(:non_director_mode)), data: { behavior: "play_stream"}, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %>
+                  <%= link_to broadcast.name.titleize, url_for(params.permit!.merge(token: broadcast.token).except(:director_mode)), data: { behavior: "play_stream"}, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %>
                 <% else %>
-                  <%= link_to broadcast.name.titleize, url_for(params.permit!.merge(id: broadcast.id).except(:non_director_mode)), data: { behavior: "play_stream"}, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %>
+                  <%= link_to broadcast.name.titleize, url_for(params.permit!.merge(id: broadcast.id).except(:director_mode)), data: { behavior: "play_stream"}, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %>
                 <% end %>
               <% end %>
             <% end %>
@@ -59,18 +53,18 @@
         </div>
       </div>
       <% if @broadcast.director_mode_video_embed.present? %>
-        <% if params[:non_director_mode] %>
+        <% if params[:director_mode] %>
           <div class="custom-control custom-switch ml-auto">
-            <input type="checkbox" name="non_director_mode" value="true" class="custom-control-input" id="director_mode_switch" />
+            <input type="checkbox" name="director_mode" value="true" class="custom-control-input" id="director_mode_switch" checked="checked" />
             <label class="custom-control-label text-white override-custom-control-label" for="director_mode_switch">Director Mode</label>
           </div>
-          <%= link_to "Enable Director Mode", url_for(params.permit!.except(:non_director_mode)), class: "d-none", id: "director_mode_link" %>
+          <%= link_to "Disable Director Mode", url_for(params.permit!.except(:director_mode)), class: "d-none", id: "director_mode_link" %>
         <% else %>
           <div class="custom-control custom-switch ml-auto">
-            <input type="checkbox" name="non_director_mode" value="true" class="custom-control-input" id="director_mode_switch" checked="checked" />
+            <input type="checkbox" name="director_mode" value="true" class="custom-control-input" id="director_mode_switch" />
             <label class="custom-control-label text-white override-custom-control-label" for="director_mode_switch">Director Mode</label>
           </div>
-          <%= link_to "Disable Director Mode", url_for(params.permit!.merge(non_director_mode: true)), class: "d-none", id: "director_mode_link" %>
+          <%= link_to "Enable Director Mode", url_for(params.permit!.merge(director_mode: true)), class: "d-none", id: "director_mode_link" %>
         <% end %>
       <% end %>
     </div>
@@ -91,34 +85,32 @@
       <% end %>
     </div>
   </div>
-  <div class="col-lg-3 col-md-12 bg-white vh-100 overflow-auto">
-    <div class="px-3 pt-3">
-      <% unless controller.class.module_parent.to_s == "Public" %>
-        <% if @multi_view_broadcasts.present? %>
-          <% tokens = @multi_view_broadcasts.map(&:token) %>
-          <div class="btn-group">
-            <button type="button" class="btn btn-primary" id="broadcast_share_url" data-behavior="clipboard" href="<%= broadcast_url(@broadcast.token, multi_view_tokens: tokens) %>">Share URL</button>
-            <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-              <span class="sr-only">Toggle Dropdown</span>
-            </button>
-            <div class="dropdown-menu">
-              <%= link_to t('.actions.reset_url'), [@project, @broadcast], method: :patch, class: "dropdown-item" %>
-            </div>
+  <div class="col-lg-4 col-md-12 bg-white p-3 min-vh-100 overflow-auto">
+    <% unless controller.class.module_parent.to_s == "Public" %>
+      <% if @multi_view_broadcasts.present? %>
+        <% tokens = @multi_view_broadcasts.map(&:token) %>
+        <div class="btn-group">
+          <button type="button" class="btn btn-primary" id="broadcast_share_url" data-behavior="clipboard" href="<%= broadcast_url(@broadcast.token, multi_view_tokens: tokens) %>">Share URL</button>
+          <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <span class="sr-only">Toggle Dropdown</span>
+          </button>
+          <div class="dropdown-menu">
+            <%= link_to t('.actions.reset_url'), [@project, @broadcast], method: :patch, class: "dropdown-item" %>
           </div>
-        <% else %>
-          <div class="btn-group">
-            <button type="button" class="btn btn-primary" id="broadcast_share_url" data-behavior="clipboard" href="<%= broadcast_url(@broadcast.token) %>">Share URL</button>
-            <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-              <span class="sr-only">Toggle Dropdown</span>
-            </button>
-            <div class="dropdown-menu">
-              <%= link_to t('.actions.reset_url'), [@project, @broadcast], method: :patch, class: "dropdown-item" %>
-            </div>
+        </div>
+      <% else %>
+        <div class="btn-group">
+          <button type="button" class="btn btn-primary" id="broadcast_share_url" data-behavior="clipboard" href="<%= broadcast_url(@broadcast.token) %>">Share URL</button>
+          <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <span class="sr-only">Toggle Dropdown</span>
+          </button>
+          <div class="dropdown-menu">
+            <%= link_to t('.actions.reset_url'), [@project, @broadcast], method: :patch, class: "dropdown-item" %>
           </div>
-        <% end %>
+        </div>
       <% end %>
-      <%= link_to 'Video Conference', @conference_url, class: 'btn btn-primary', target: '_blank' %>
-    </div>
+    <% end %>
+    <%= link_to 'Video Conference', @conference_url, class: 'btn btn-primary', target: '_blank' %>
     <hr/>
     <ul class="nav nav-tabs override-nav-tabs mb-3">
       <li class="nav-item">
@@ -133,18 +125,18 @@
         <div id="live_take">
           <%= render partial: 'broadcasts/live_take', locals: { broadcast: @broadcast } %>
         </div>
-        <% if params[:non_director_mode] %>
+        <% if params[:director_mode] %>
           <% if controller.class.module_parent.to_s == "Public" %>
-            <%= link_to "Play #{@broadcast.name.titleize}", url_for(params.permit!.merge(non_director_mode: true, token: @broadcast.token)), data: { behavior: "play_stream"}, class: "mt-2 btn btn-primary" %>
+            <%= link_to "Play #{@broadcast.name.titleize}", url_for(params.permit!.merge(director_mode: true, token: @broadcast.token)), data: { behavior: "play_stream"}, class: "mt-2 btn btn-primary" %>
           <% else %>
-            <%= link_to "Play #{@broadcast.name.titleize}", url_for(params.permit!.merge(non_director_mode: true, id: @broadcast.id)), data: { behavior: "play_stream"}, class: "mt-2 btn btn-primary" %>
+            <%= link_to "Play #{@broadcast.name.titleize}", url_for(params.permit!.merge(director_mode: true, id: @broadcast.id)), data: { behavior: "play_stream"}, class: "mt-2 btn btn-primary" %>
           <% end %>
           <hr/>
         <% else %>
           <% if controller.class.module_parent.to_s == "Public" %>
-            <%= link_to "Play #{@broadcast.name.titleize}", url_for(params.permit!.merge(token: @broadcast.token).except(:non_director_mode)), data: { behavior: "play_stream"}, class: "mt-2 btn btn-primary" %>
+            <%= link_to "Play #{@broadcast.name.titleize}", url_for(params.permit!.merge(token: @broadcast.token).except(:director_mode)), data: { behavior: "play_stream"}, class: "mt-2 btn btn-primary" %>
           <% else %>
-            <%= link_to "Play #{@broadcast.name.titleize}", url_for(params.permit!.merge(id: @broadcast.id).except(:non_director_mode)), data: { behavior: "play_stream"}, class: "mt-2 btn btn-primary" %>
+            <%= link_to "Play #{@broadcast.name.titleize}", url_for(params.permit!.merge(id: @broadcast.id).except(:director_mode)), data: { behavior: "play_stream"}, class: "mt-2 btn btn-primary" %>
           <% end %>
           <hr/>
         <% end %>
@@ -161,12 +153,12 @@
               </li>
             <% end %>
           </ul>
-          <div class="tab-content">
+          <div class="tab-content pt-4">
             <% @multi_view_broadcasts.each_with_index do |mvb, index| %>
               <div class="<%= class_string("tab-pane fade show", "active" => (params[:active_files_tab] == mvb.token || (params[:active_files_tab].nil? && index == 0))) %>" id="files_broadcast_<%= mvb.token %>">
                 <%= render partial: 'broadcasts/files_section', locals: { broadcast: mvb, files: mvb.files } %>
               </div>
-            <% end %>
+            <% end %>  
           </div>
         <% else %>
           <%= render partial: 'broadcasts/files_section', locals: { broadcast: @broadcast, files: @files } %>

app/views/contract_templates/_contract_template.html.erb

@@ -5,7 +5,7 @@
   </td>
   <td>
     <% if contract_template.fee? %>
-      <%= contract_template.fee %>
+      <%= number_to_currency(contract_template.fee) %>
     <% else %>
       <%= t(".no_fee") %>
     <% end %>

app/views/contract_templates/_form.html.erb

@@ -9,7 +9,7 @@
       <%= form.radio_button :accessibility, :private_template, label: "Private" %>
     </div>
     <div class="form-row" id="fee_field">
-      <%= form.text_field :fee, wrapper_class: "col-sm-6" %>
+      <%= form.number_field :fee, min:"0", max:"99999999", step: "0.01", prepend: "$", wrapper_class: "col-sm-6" %>
     </div>
   <% end %>
 

app/views/contracts/_logo_page.html.erb

@@ -1,37 +0,0 @@
-<% has_logo = local_assigns[:logo] %>
-<% has_user_photo = releasable.model_name == "AppearanceRelease" && releasable.person_photo.attached? %>
-
-<% if has_logo || has_user_photo %>
-  <table class="heading-table">
-    <tr>
-      <td>
-        <% if has_logo %>
-          <div class="logo">
-            <%= render "blank_contracts/logo", logo: logo %>
-          </div>
-        <% end %>
-      </td>
-      <td class="embed-person-photo">
-        <% if has_user_photo %>
-          <%= image_tag releasable.photos.first.variant(auto_orient: true, resize: "200x200"), id: "top-person-photo" %>
-        <% end %>
-      </td>
-    </tr>
-  </table>
-
-  <hr>
-<% end %>
-
-<% if preview %>
-  <h1>PREVIEW ONLY</h1>
-<% end %>
-
-<% if contract_template.body.present? %>
-  <%= contract_template.body %>
-  <br/>
-<% end %>
-
-<% if releasable.minor? && contract_template.guardian_clause.present? %>
-  <p class="text-left"><strong>Guardian Clause</strong></p>
-  <%= contract_template.guardian_clause %>
-<% end %>

app/views/contracts/_signature_page.html.erb

@@ -36,7 +36,7 @@
     <%= description_list_pair "Filming Hours:", releasable&.filming_hours %>
   <% end %>
   <% if contract_template.fee? %>
-    <%= description_list_pair "Fee:", contract_template.fee %>
+    <%= description_list_pair "Fee:", number_to_currency(contract_template.fee) %>
   <% end %>
   <% if releasable.model_name == "MaterialRelease" %>
     <%= description_list_pair "Description:", releasable.description %>

app/views/contracts/pdf.html.erb

@@ -1,13 +1,22 @@
-<% logo = local_assigns[:logo] ? local_assigns[:logo] : nil %>
-
-<% if logo || (releasable.model_name == 'AppearanceRelease' && releasable.person_photo.attached?) ||
-    contract_template.body.present? || (releasable.minor? && contract_template.guardian_clause.present?) %>
-  <div class="page">
-    <%= render "contracts/logo_page", logo: logo, preview: preview, releasable: releasable, contract_template: contract_template %>
+<% if local_assigns[:logo] %>
+  <div class="logo">
+    <%= render "contracts/logo", logo: logo %>
   </div>
+  <hr>
+<% end %>
+<% if preview %>
+  <h1>PREVIEW ONLY</h1>
+<% end %>
+<% if contract_template.body.present? %>
+  <%= contract_template.body %>
+  <br/>
+<% end %>
+<% if releasable.minor? && contract_template.guardian_clause.present? %>
+  <p class="text-left"><strong>Guardian Clause</strong></p>
+  <%= contract_template.guardian_clause %>
 <% end %>
 
-<% if contract_template.present? && contract_template.has_questionnaire? %>
+<% if releasable.respond_to?(:question_1_answer) %>
   <div class="page">
     <%= render "contracts/questionnaire", releasable: releasable, contract_template: contract_template, preview: preview %>
   </div>

app/views/layouts/application.html.erb

@@ -17,12 +17,12 @@
   </head>
 
   <body>
-    <div class="flash-message">
-      <%= render "flash" %>
-    </div>
     <%= content_for?(:header) ? yield(:header) : render("header") %>
     <%= render "masquerade" if masquerading? %>
     <main class="container-fluid py-3">
+      <div class="flash-message"></div>
+        <%= render "flash" %>
+      </div>
       <%= content_for?(:content) ? yield(:content) : yield %>
     </main>
   </body>

app/views/locked_accounts/index.html.erb

@@ -1 +0,0 @@
-<p><%= t '.account_locked_message' %></p>

app/views/material_releases/_material_release.html.erb

@@ -42,7 +42,7 @@
           <%= link_to fa_icon("tags fw", text: "Tags"), [:new, material_release, :acts_as_taggable_on_tag], class: "dropdown-item", remote: true %>
         <% end %>
         <% if policy(material_release).edit_files? %>
-          <%= link_to fa_icon("file-o fw", text: "Media"), [:edit, material_release, :files], class: "dropdown-item" %>
+          <%= link_to fa_icon("file-o fw", text: "Add Media"), [:edit, material_release, :files], class: "dropdown-item" %>
         <% end %>
         <% if policy(Contract).show? && (material_release.contract.attached? || material_release.contract_template.present?) %>
           <%= link_to fa_icon("download fw", text: "Download"), [material_release, :contracts, format: "pdf"], class: "dropdown-item", target: "_blank" %>

app/views/public/acquired_media_releases/new.html.erb

@@ -6,7 +6,7 @@
         <p><%= @contract_template.body %></p>
         <% if @contract_template.fee? %>
           <p>
-            Fee <span class="font-weight-bold text-success"><%= @contract_template.fee %></span>
+            Fee <span class="font-weight-bold text-success"><%= number_to_currency @contract_template.fee %></span>
           </p>
         <% end %>
       <% end %>

app/views/public/appearance_releases/new.html.erb

@@ -7,7 +7,7 @@
         <p><%= @contract_template.body %></p>
         <% if @contract_template.fee? %>
           <p>
-            Fee <span class="font-weight-bold text-success"><%= @contract_template.fee %></span>
+            Fee <span class="font-weight-bold text-success"><%= number_to_currency @contract_template.fee %></span>
           </p>
         <% end %>
       <% end %>

app/views/public/broadcast_recordings/_refresh_recordings_list.js.erb

@@ -1,11 +0,0 @@
-$('[data-id="<%= dom_id(@recording) %>"]').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 }) %>");
-
-// Close and remove the modal
-$("#edit_broadcast_recording_modal").on("hidden.bs.modal", function (e) {
-  $("#edit_broadcast_recording_modal").remove();
-});
-$("#edit_broadcast_recording_modal").modal("hide");

app/views/public/broadcast_recordings/update.js.erb

@@ -1 +0,0 @@
-<%= render("public/broadcast_recordings/refresh_recordings_list") %>

app/views/public/location_releases/new.html.erb

@@ -6,7 +6,7 @@
         <p><%= @contract_template.body %></p>
         <% if @contract_template.fee? %>
           <p>
-            Fee <span class="font-weight-bold text-success"><%= @contract_template.fee %></span>
+            Fee <span class="font-weight-bold text-success"><%= number_to_currency @contract_template.fee %></span>
           </p>
         <% end %>
       <% end %>

app/views/public/material_releases/new.html.erb

@@ -6,7 +6,7 @@
         <p><%= @contract_template.body %></p>
         <% if @contract_template.fee? %>
           <p>
-            Fee <span class="font-weight-bold text-success"><%= @contract_template.fee %></span>
+            Fee <span class="font-weight-bold text-success"><%= number_to_currency @contract_template.fee %></span>
           </p>
         <% end %>
       <% end %>

app/views/public/medical_releases/new.html.erb

@@ -7,7 +7,7 @@
         <%= @contract_template.body %>
         <% if @contract_template.fee? %>
           <p>
-            Fee <span class="font-weight-bold text-success"><%= @contract_template.fee %></span>
+            Fee <span class="font-weight-bold text-success"><%= number_to_currency @contract_template.fee %></span>
           </p>
         <% end %>
       <% end %>
@@ -24,7 +24,7 @@
         <% end %>
         <hr>
       <% end %>
-
+      
       <% if (1..MedicalRelease::NUMBER_OF_CUSTOM_FIELDS).map {|n| @contract_template.public_send("question_#{n}_text").presence }.compact.any? %>
         <%= card_field_set_tag t(".questionnaire.heading") do %>
           <% (1..MedicalRelease::NUMBER_OF_CUSTOM_FIELDS).each do |n| %>

app/views/public/talent_releases/new.html.erb

@@ -7,7 +7,7 @@
         <p><%= @contract_template.body %></p>
         <% if @contract_template.fee? %>
           <p>
-            Fee <span class="font-weight-bold text-success"><%= @contract_template.fee %></span>
+            Fee <span class="font-weight-bold text-success"><%= number_to_currency @contract_template.fee %></span>
           </p>
         <% end %>
       <% end %>
@@ -139,4 +139,4 @@
       </div>
     <% end %>
   </div>
-</div>
+</div>

app/views/shared/_releasable_files_dropzone.html.erb

@@ -14,5 +14,4 @@
   data-file-input-id="releasable_files" 
   data-existing-files="<%= mock_photos_json(releasable.files) %>" 
   data-placeholder="<%= dropzone_placeholder_message_for(releasable) %>"
-  data-submit-button="#submit_folder"
-  data-max-file-size="<%= dropzone_file_size_limit_for(releasable) %>"></div>
+  data-submit-button="#submit_folder"></div>

app/views/video_analyses/_acquired_media_file_infos.html.erb

@@ -1,7 +1,7 @@
-<% if acquired_media_files.any? %>
-  <% acquired_media_files.each do |file| %>
-    <li class="acquired-media-releasable list-inline-item" data-ujs-target="<%= dom_id(file.record, dom_id(file)) %>" data-hidden="false">
-      <%= render "video_analyses/file_releasable", releasable: file.record, video: video, file: file %>
+<% if acquired_media_file_infos.any? %>
+  <% acquired_media_file_infos.each do |file_info| %>
+    <li class="acquired-media-releasable list-inline-item" data-ujs-target="<%= dom_id(file_info.releasable, dom_id(file_info)) %>" data-hidden="false">
+      <%= render "video_analyses/file_info_releasable", releasable: file_info.releasable, video: video, file_info: file_info %>
     </li>
   <% end %>
 <% else %>

app/views/video_analyses/_acquired_media_release.html.erb

@@ -1,7 +1,7 @@
-<% if acquired_media_release.files.any? %>
-  <% acquired_media_release.files.each do |file| %>
-    <li class="acquired-media-releasable list-inline-item" data-ujs-target="<%= dom_id(acquired_media_release, "attachment_#{file.id}") %>" data-confirmed="<%= video.has_confirmed_release?(acquired_media_release) && video.video_release_confirmations.any? { |video_release_confirmation| video_release_confirmation.file_id == file.id } %>" data-hidden="false">
-      <%= render "video_analyses/file_releasable", releasable: acquired_media_release, video: video, file: file %>
+<% if acquired_media_release.file_infos.any? %>
+  <% acquired_media_release.file_infos.each do |file_info| %>
+    <li class="acquired-media-releasable list-inline-item" data-ujs-target="<%= dom_id(acquired_media_release, "file_info_#{file_info.id}") %>" data-confirmed="<%= video.has_confirmed_release?(acquired_media_release) && video.video_release_confirmations.any? { |video_release_confirmation| video_release_confirmation.file_info_id == file_info.id } %>" data-hidden="false">
+      <%= render "video_analyses/file_info_releasable", releasable: acquired_media_release, video: video, file_info: file_info %>
     </li>
   <% end %>
 <% else %>

app/views/video_analyses/_file_info_releasable.html.erb

@@ -0,0 +1,8 @@
+<%= button_to_video_release_confirmation video, releasable, additional_video_release_params: { file_info_id: file_info.id } do %>
+  <figure class="figure mb-0">
+    <div class="figure-img border text-muted d-flex justify-content-center align-items-center text-wrap text-break" style="width:200px;height:200px;">
+      <%= file_info.filename %>
+    </div>
+    <figcaption class="figure-caption text-center"><%= truncate releasable.name, length: 25 %></figcaption>
+  </figure>
+<% end %>

app/views/video_analyses/_file_releasable.html.erb

@@ -1,12 +0,0 @@
-<%= button_to_video_release_confirmation video, releasable, additional_video_release_params: { file_id: file.id } do %>
-  <figure class="figure mb-0">
-    <% if file.content_type.include? "image" %>
-      <%= image_tag large_variant(file), class: "figure-img border", style: "width:200px;height:200px;" %>
-    <% else %>
-      <div class="figure-img border text-muted d-flex justify-content-center align-items-center text-wrap text-break" style="width:200px;height:200px;">
-        <%= file.filename %>
-      </div>
-    <% end %>
-    <figcaption class="figure-caption text-center"><%= truncate releasable.name, length: 25 %></figcaption>
-  </figure>
-<% end %>

app/views/video_analyses/_material_release.html.erb

@@ -1,18 +1,3 @@
-<% if material_release.files.any? %>
-  <% material_release.files.each do |file| %>
-    <li class="releasable list-inline-item hidden-when-confirmed" id="<%= dom_id(material_release) %>" data-ujs-target="<%= dom_id(material_release, "attachment_#{file.id}") %>" data-confirmed="<%= video.confirmed_material_releases.include?(material_release) %>" data-hidden="<%= video.confirmed_material_releases.include?(material_release) %>">
-      <%= render "video_analyses/file_releasable", releasable: material_release, video: video, file: file %>
-    </li>
-  <% end %>
-<% else %>
-  <li class="releasable list-inline-item" data-confirmed="false" data-hidden="false">
-    <figure class="figure mb-0">
-
-      <div class="figure-img border text-muted d-flex justify-content-center align-items-center" style="width:200px;height:200px;">
-        <small>No File Uploaded</small>
-      </div>
-
-      <figcaption class="figure-caption text-center"><%= truncate material_release.name, length: 25 %></figcaption>
-    </figure>
-  </li>
-<% end %>
+<li class="releasable list-inline-item hidden-when-confirmed" id="<%= dom_id(material_release) %>" data-confirmed="<%= video.confirmed_material_releases.include?(material_release) %>" data-hidden="<%= video.confirmed_material_releases.include?(material_release) %>">
+  <%= render "video_analyses/releasable", releasable: material_release, video: video %>
+</li>

app/views/video_analyses/_video_release_confirmations.html.erb

@@ -22,8 +22,8 @@
             <td><a data-behavior="seekable-timecode"><%= confirmation.appears_at %></a></td>
             <td><%= confirmation.releasable.name %></td>
             <td>
-              <% if confirmation.file_id.present? %>
-                <%= confirmation.file.filename %></div>
+              <% if confirmation.file_info.present? %>
+                <%= confirmation.file_info.filename %></div>
               <% elsif confirmation.releasable.respond_to?(:photo) && confirmation.releasable.photo.attached? %>
                 <%= image_tag thumbnail_variant(confirmation.releasable.photo), class: "img-fluid figure-img" %>
               <% else %>

app/views/video_analyses/acquired_media_releases/index.js.erb

@@ -2,7 +2,7 @@
 $("#acquired_media_releases [data-toggle=tooltip]").tooltip("dispose");
 
 // Update the release list
-$("#acquired_media_releases").html("<%= j render("video_analyses/acquired_media_files", acquired_media_files: @acquired_media_files, video: @video) %>");
+$("#acquired_media_releases").html("<%= j render("video_analyses/acquired_media_file_infos", acquired_media_file_infos: @acquired_media_file_infos, video: @video) %>");
 
 // # Reset the search form
 $("#acquired_media_releases_section form input[name='query']").val("<%= params[:query] %>");

app/views/video_release_confirmations/_new_video_release_confirmation_modal.html.erb

@@ -14,7 +14,7 @@
 
           <div id="video_release_confirmation_fields">
             <%= form.hidden_field :time_elapsed, value: video_release_confirmation.time_elapsed %>
-            <%= form.hidden_field :file_id, value: video_release_confirmation.file_id %>
+            <%= form.hidden_field :file_info_id, value: video_release_confirmation.file_info_id %>
             <%= form.static_control nil, name: nil, label: "Video Timecode", value: video_release_confirmation.appears_at %>
             <%= form.text_field :channel %>
             <%= form.text_field :timecode_in %>

app/views/video_release_confirmations/create.js.erb

@@ -1,8 +1,8 @@
 var hideConfirmed = $("input[name=hide_confirmed]:checked").length > 0;
 
 // Mark the release as confirmed
-if (<%= @releasable.respond_to?(:files) %>) {
-  $("[data-ujs-target=<%= dom_id(@releasable, "attachment_#{@video_release_confirmation.file_id}") %>]").attr("data-confirmed", true).data("confirmed", true)
+if (<%= @releasable.respond_to?(:file_infos) %>) {
+  $("[data-ujs-target=<%= dom_id(@releasable, "file_info_#{@video_release_confirmation.file_info_id}") %>]").attr("data-confirmed", true).data("confirmed", true)
 } else {
   $("#<%= dom_id(@releasable) %>").attr("data-confirmed", true).data("confirmed", true)
 }

app/views/video_release_confirmations/destroy.js.erb

@@ -1,7 +1,7 @@
 // Mark the release as no longer confirmed and show
-if (<%= @releasable.respond_to?(:files) && @video_release_confirmation.respond_to?(:file_id) %>) {
-  if (<%= @video_release_confirmations.none? { |video_release_confirmation| video_release_confirmation.respond_to?(:file_id) && video_release_confirmation.file_id == @video_release_confirmation.file_id } %>) {
-    $("[data-ujs-target=<%= dom_id(@releasable, "attachment_#{@video_release_confirmation.file_id}") %>]")
+if (<%= @releasable.respond_to?(:file_infos) && @video_release_confirmation.respond_to?(:file_info_id) %>) {
+  if (<%= @video_release_confirmations.none? { |video_release_confirmation| video_release_confirmation.respond_to?(:file_info_id) && video_release_confirmation.file_info_id == @video_release_confirmation.file_info_id } %>) {
+    $("[data-ujs-target=<%= dom_id(@releasable, "file_info_#{@video_release_confirmation.file_info_id}") %>]")
       .attr("data-confirmed", false).data("confirmed", false)
       .attr("data-hidden", false).data("hidden", false);
   }

config/locales/en.yml

@@ -457,7 +457,7 @@ en:
     help:
       contract_template:
         amendment_clause: Leave blank if not required for this contract
-        fee: Please enter all necessary details about fees. Leave it blank for no-fee
+        fee: Leave at $0.00 for no-fee
         guardian_clause: Leave blank if not required for this contract
         questionnaire_legal_text: Leave blank if not required for this contract
         signature_legal_text: Leave blank if not required for this contract
@@ -1651,6 +1651,3 @@ en:
         edit: Edit
         report: Report
       generating: Generating...
-  locked_accounts:
-    index:
-      account_locked_message: This account is locked. Please contact a BIG admin.

config/locales/es.yml

@@ -705,6 +705,3 @@ es:
         production_elements_logs: Production Elements Logs, and more (ES)
         reduces_labor_cost: Reduces labor costs (ES)
         simplifies_cue_sheets: Simplifies Music Cue Sheets, Graphic Cue Sheets (ES)
-  locked_accounts:
-    index:
-      account_locked_message: This account is locked. Please contact a BIG admin. (ES)

config/routes.rb

@@ -30,9 +30,7 @@ Rails.application.routes.draw do
     namespace :admin do
       mount Sidekiq::Web => '/background_queue', as: :background_queue
 
-      resources :accounts, only: [:index, :new, :create, :edit, :update, :show] do
-        resource :account_lock, path: :lock, as: :lock, only: [:create, :destroy]
-      end
+      resources :accounts, only: [:index, :new, :create, :edit, :update, :show]
       resources :users, only: [:index, :new, :create, :edit, :update, :destroy] do
         resource :masquerade, only: :create
       end
@@ -50,9 +48,7 @@ Rails.application.routes.draw do
   scope "(:locale)", locale: AVAILABLE_LOCALES_REGEX do
     resource :account_session, only: [:update]
     resource :session, only: [:destroy]
-    resource :account, only: [:new, :create, :update] do
-      get 'locked' => 'locked_accounts#index'
-    end
+    resource :account, only: [:new, :create, :update]
     resources :account_auths, only: [:index, :create, :update, :destroy]
     resources :projects, shallow: true do
       resources :acquired_media_releases, except: [:show], concerns: [:contractable, :notable, :file_uploadable]
@@ -105,7 +101,9 @@ Rails.application.routes.draw do
           delete :destroy_file
         end
         resource :zoom_meeting, only: [:show]
-        resources :broadcast_recordings, only: [:destroy]
+        resources :broadcast_recordings, only: [:destroy, :edit, :update] do
+          resources :broadcast_recording_starrings, only: :create
+        end
       end
       resources :directories, except: [:index] do
         member do
@@ -150,9 +148,6 @@ Rails.application.routes.draw do
       end
       resources :broadcasts, param: :token, only: [:show, :update] do
         resource :zoom_meeting, only: [:show]
-        resources :broadcast_recordings, only: [:edit, :update] do
-          resources :broadcast_recording_starrings, only: :create
-        end
       end
     end
 

db/data_migrations/20200914163508_set_fee_from_fee_cents_and_currency.rb

@@ -1,14 +0,0 @@
-class SetFeeFromFeeCentsAndCurrency < ActiveRecord::DataMigration
-  def up
-    ContractTemplate.find_each do |contract_template|
-      if contract_template.fee_old?
-        fee = contract_template.fee_old.format
-        contract_template.update_column(:fee, fee)
-      end
-    end
-  end
-
-  def down
-    ContractTemplate.update_all(fee: nil)
-  end
-end

db/migrate/20200810185526_add_file_id_to_video_release_confirmations.rb

@@ -1,9 +0,0 @@
-class AddFileIdToVideoReleaseConfirmations < ActiveRecord::Migration[6.0]
-  def up
-    add_column :video_release_confirmations, :file_id, :bigint, index: true
-  end
-
-  def down
-    remove_column :video_release_confirmations, :file_id
-  end
-end

db/migrate/20200908085319_add_locked_to_accounts.rb

@@ -1,5 +0,0 @@
-class AddLockedToAccounts < ActiveRecord::Migration[6.0]
-  def change
-    add_column :accounts, :locked, :boolean, default: false
-  end
-end

db/migrate/20200914163203_convert_fee_to_string_type.rb

@@ -1,7 +0,0 @@
-class ConvertFeeToStringType < ActiveRecord::Migration[6.0]
-  def change
-    rename_column :contract_templates, :fee_cents, :fee_old_cents
-    rename_column :contract_templates, :fee_currency, :fee_old_currency
-    add_column :contract_templates, :fee, :string
-  end
-end

db/structure.sql

@@ -95,8 +95,7 @@ CREATE TABLE public.accounts (
     slug character varying,
     plan_uid character varying,
     created_at timestamp without time zone NOT NULL,
-    updated_at timestamp without time zone NOT NULL,
-    locked boolean DEFAULT false
+    updated_at timestamp without time zone NOT NULL
 );
 
 
@@ -658,8 +657,8 @@ CREATE TABLE public.contract_templates (
     name character varying,
     body text,
     guardian_clause text,
-    fee_old_cents bigint DEFAULT 0 NOT NULL,
-    fee_old_currency character varying DEFAULT 'USD'::character varying NOT NULL,
+    fee_cents bigint DEFAULT 0 NOT NULL,
+    fee_currency character varying DEFAULT 'USD'::character varying NOT NULL,
     created_at timestamp without time zone NOT NULL,
     updated_at timestamp without time zone NOT NULL,
     release_type character varying,
@@ -692,8 +691,7 @@ CREATE TABLE public.contract_templates (
     exhibit_a_legal_text text,
     exhibit_a_question_text text,
     exhibit_b_legal_text text,
-    exhibit_b_question_text text,
-    fee character varying
+    exhibit_b_question_text text
 );
 
 
@@ -716,15 +714,6 @@ CREATE SEQUENCE public.contract_templates_id_seq
 ALTER SEQUENCE public.contract_templates_id_seq OWNED BY public.contract_templates.id;
 
 
---
--- Name: data_migrations; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.data_migrations (
-    version character varying NOT NULL
-);
-
-
 --
 -- Name: directories; Type: TABLE; Schema: public; Owner: -
 --
@@ -1857,8 +1846,7 @@ CREATE TABLE public.video_release_confirmations (
     source_file_name character varying,
     clip_name character varying,
     description character varying,
-    channel character varying,
-    file_id bigint
+    channel character varying
 );
 
 
@@ -2411,14 +2399,6 @@ ALTER TABLE ONLY public.contract_templates
     ADD CONSTRAINT contract_templates_pkey PRIMARY KEY (id);
 
 
---
--- Name: data_migrations data_migrations_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.data_migrations
-    ADD CONSTRAINT data_migrations_pkey PRIMARY KEY (version);
-
-
 --
 -- Name: directories directories_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
@@ -3267,6 +3247,7 @@ CREATE UNIQUE INDEX index_users_on_email ON public.users USING btree (email);
 
 CREATE UNIQUE INDEX index_users_on_password_reset_token ON public.users USING btree (password_reset_token);
 
+
 --
 -- Name: index_video_release_confirmations_on_file_info_id; Type: INDEX; Schema: public; Owner: -
 --
@@ -3472,6 +3453,14 @@ ALTER TABLE ONLY public.contract_templates
     ADD CONSTRAINT fk_rails_21d503cdcd FOREIGN KEY (project_id) REFERENCES public.projects(id);
 
 
+--
+-- Name: video_release_confirmations fk_rails_2787252ceb; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.video_release_confirmations
+    ADD CONSTRAINT fk_rails_2787252ceb FOREIGN KEY (file_info_id) REFERENCES public.file_infos(id);
+
+
 --
 -- Name: medical_releases fk_rails_325442c794; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -4034,13 +4023,10 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20200803150138'),
 ('20200804093409'),
 ('20200807190607'),
-('20200810185526'),
 ('20200811102720'),
 ('20200812060406'),
 ('20200819070738'),
 ('20200820082501'),
-('20200824171649'),
-('20200908085319'),
-('20200914163203');
+('20200824171649');
 
 

spec/channels/broadcasts_channel_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe BroadcastsChannel, type: :channel do
     it "broadcasts to the channel" do
       status_content = ApplicationController.render partial: "broadcasts/broadcast_status", locals: { broadcast: broadcast }
       video_content = ApplicationController.render partial: "broadcasts/video", locals: { broadcast: broadcast }
-      recording_status_content = ApplicationController.render partial: "broadcasts/recording_status", locals: { broadcast: broadcast }
+      live_take = ApplicationController.render partial: "broadcasts/live_take", locals: { broadcast: broadcast }
 
       expect {
         BroadcastsChannel.broadcast_stream_updates(broadcast)
@@ -28,7 +28,7 @@ RSpec.describe BroadcastsChannel, type: :channel do
         full_live_stream_playback_url: broadcast.full_live_stream_playback_url,
         status_content: status_content,
         video_content: video_content,
-        recording_status_content: recording_status_content,
+        live_take_content: live_take,
         streamer_status: broadcast.streamer_status
       })
     end
@@ -36,7 +36,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)
+      create_list(:broadcast_recording, 1, broadcast: broadcast) 
       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 }
@@ -47,7 +47,7 @@ RSpec.describe BroadcastsChannel, type: :channel do
         BroadcastsChannel.stream_recording_ready(broadcast, recordings, 'Hello world')
       }.to have_broadcasted_to(broadcast).with({
         event: 'stream_recording_ready',
-        flash_content: flash_content,
+        flash_content: flash_content, 
         recordings_content: recordings_content,
         recordings_nav_content: recordings_nav_content
       })

spec/controllers/broadcast_recording_starrings_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Public::BroadcastRecordingStarringsController, type: :controller do
+RSpec.describe BroadcastRecordingStarringsController, type: :controller do
   render_views
 
   let(:user) { create(:user) }
@@ -8,6 +8,7 @@ RSpec.describe Public::BroadcastRecordingStarringsController, type: :controller
   let(:project) { create(:project, account: user.primary_account) }
 
   before do
+    sign_in user
     stub_mux_live_stream
   end
 
@@ -21,7 +22,7 @@ RSpec.describe Public::BroadcastRecordingStarringsController, type: :controller
         expect(recording.starred).to be_falsey
       end
 
-      post :create, params: { broadcast_token: broadcast.token, broadcast_recording_id: recordings.first.id }, xhr: true
+      post :create, params: { project_id: project, broadcast_id: broadcast, broadcast_recording_id: recordings.first.id }, xhr: true
 
       expect(recordings.first.reload.starred).to eq true
 
@@ -35,7 +36,7 @@ RSpec.describe Public::BroadcastRecordingStarringsController, type: :controller
         expect(recording.starred).to be_truthy
       end
 
-      post :create, params: { broadcast_token: broadcast.token, broadcast_recording_id: starred_recordings.first.id }, xhr: true
+      post :create, params: { project_id: project, broadcast_id: broadcast, broadcast_recording_id: starred_recordings.first.id }, xhr: true
 
       expect(starred_recordings.first.reload.starred).to eq false
 

spec/controllers/broadcast_recordings_controller_spec.rb

@@ -12,6 +12,59 @@ RSpec.describe BroadcastRecordingsController, type: :controller do
     stub_mux_live_stream
   end
 
+  describe "#edit" 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 "assigns project, broadcast, broadcast recording" do
+      get :edit, params: { project_id: project, broadcast_id: broadcast, id: recording }, xhr: true
+
+      expect(assigns(:project)).to have_attributes({
+        id: project.id,
+        name: project.name,
+        account_id: project.account_id
+      })
+
+      expect(assigns(:broadcast)).to have_attributes({
+        id: broadcast.id,
+        name: broadcast.name,
+        project_id: project.id
+      })
+
+      expect(assigns(:recording)).to have_attributes({
+        id: recording.id,
+        broadcast_id: broadcast.id,
+        file_name: "high.mp4"
+      })
+    end
+  end
+
+  describe "#update" do
+    let(:broadcast) { create(:broadcast, project: project, name: "New Broadcast") }
+    let(:recording) { create(:broadcast_recording, broadcast: 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, starred: true) }
+
+    before do
+      stub_mux_live_stream
+    end
+
+    it "updates the recording's name and description" do
+      expect(recording.name).to eq(recording.download_file_name)
+      expect(recording.description).to eq("No description provided for this recording.")
+
+      patch :update, params: { project_id: project, broadcast_id: broadcast, id: recording, broadcast_recording: { name: "Just for fun", description: "I had fun while making this stream." } }, xhr: true
+      recording.reload
+
+      expect(recording.name).to eq("Just for fun")
+      expect(recording.description).to eq("I had fun while making this stream.")
+    end
+  end
+
   describe "#destroy" do
     let(:broadcast) { create(:broadcast, project: project, name: "New Broadcast") }
     let(:recording) { create(:broadcast_recording, broadcast: broadcast) }

spec/controllers/broadcasts_controller_spec.rb

@@ -195,15 +195,15 @@ RSpec.describe BroadcastsController, type: :controller do
         expect(response.body).to have_selector(".custom-control-label", text: "Director Mode")
       end
 
-      context "director mode is enabled by default" do
+      context "when director mode is enabled" do
         it "shows the video embed" do
-          get :show, params: { project_id: project, id: broadcast }
+          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 }
+          get :show, params: { project_id: project, id: broadcast, director_mode: true }
 
           expect(response.body).to have_content broadcast.name
           expect(response.body).to have_selector(".custom-control-label", text: "Director Mode")

spec/controllers/public/broadcast_recordings_controller_spec.rb

@@ -1,59 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Public::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
-    stub_mux_live_stream
-  end
-
-  describe "#edit" 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 "assigns project, broadcast, broadcast recording" do
-      get :edit, params: { broadcast_token: broadcast.token, id: recording }, xhr: true
-
-      expect(assigns(:broadcast)).to have_attributes({
-        id: broadcast.id,
-        name: broadcast.name,
-        project_id: project.id
-      })
-
-      expect(assigns(:recording)).to have_attributes({
-        id: recording.id,
-        broadcast_id: broadcast.id,
-        file_name: "high.mp4"
-      })
-    end
-  end
-
-  describe "#update" do
-    let(:broadcast) { create(:broadcast, project: project, name: "New Broadcast") }
-    let(:recording) { create(:broadcast_recording, broadcast: broadcast) }
-    let(:recordings) { create_list(:broadcast_recording, 5, :with_random_asset_uid, broadcast: broadcast) }
-
-    before do
-      stub_mux_live_stream
-    end
-
-    it "updates the recording's name and description" do
-      expect(recording.name).to eq(recording.download_file_name)
-      expect(recording.description).to eq("No description provided for this recording.")
-
-      patch :update, params: { broadcast_token: broadcast.token, id: recording, broadcast_recording: { name: "Just for fun", description: "I had fun while making this stream." } }, xhr: true
-      recording.reload
-
-      expect(recording.name).to eq("Just for fun")
-      expect(recording.description).to eq("I had fun while making this stream.")
-    end
-  end
-end

spec/controllers/video_release_confirmations_controller_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe VideoReleaseConfirmationsController, type: :controller do
   end
 
   describe "acquired_media_release" do
-    let(:acquired_media_release) { create(:acquired_media_release, :with_files) }
+    let(:acquired_media_release) { create(:acquired_media_release) }
 
     describe "#new" do
       let(:edl_event_gateway) { instance_double(EdlEventGateway) }
@@ -21,6 +21,8 @@ RSpec.describe VideoReleaseConfirmationsController, type: :controller do
       end
 
       it "assigns video_release_confirmation, video, edl_events_data" do
+        file_info = create(:file_info)
+
         post :new,
           params: {
             video_id: video,
@@ -33,7 +35,7 @@ RSpec.describe VideoReleaseConfirmationsController, type: :controller do
               source_file_name: nil,
               clip_name: nil,
               description: nil,
-              file_id: acquired_media_release.files.first.id,
+              file_info_id: file_info,
             },
             use_route: new_video_acquired_media_release_video_release_confirmation_path(video, acquired_media_release)
           },
@@ -51,7 +53,7 @@ RSpec.describe VideoReleaseConfirmationsController, type: :controller do
           source_file_name: "source_file_name",
           clip_name: "clip_name",
           description: "description",
-          file_id: acquired_media_release.files.first.id,
+          file_info_id: file_info.id,
         })
         expect(assigns(:video)).to have_attributes({
           id: video.id,
@@ -80,6 +82,8 @@ RSpec.describe VideoReleaseConfirmationsController, type: :controller do
 
     describe "#create" do
       it "assigns video_release_confirmations, video_release_confirmation" do
+        file_info = create(:file_info)
+
         post :create,
           params: {
             video_id: video,
@@ -93,7 +97,7 @@ RSpec.describe VideoReleaseConfirmationsController, type: :controller do
               source_file_name: "DISCLAIMER.AVI",
               clip_name: "DISCLAIMER.AVI.NEW.02",
               description: "Boat",
-              file_id: acquired_media_release.files.first.id,
+              file_info_id: file_info,
             },
             use_route: video_acquired_media_release_video_release_confirmations_path(video, acquired_media_release)
           },
@@ -108,7 +112,7 @@ RSpec.describe VideoReleaseConfirmationsController, type: :controller do
           source_file_name: "DISCLAIMER.AVI",
           clip_name: "DISCLAIMER.AVI.NEW.02",
           description: "Boat",
-          file_id: acquired_media_release.files.first.id,
+          file_info_id: file_info.id,
         })
       end
 

spec/factories/acquired_media_releases.rb

@@ -44,16 +44,6 @@ FactoryBot.define do
       guardian_2_phone "2222"
     end
 
-    trait :with_files do
-      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
-
     factory :acquired_media_release_with_contract_template do
       after(:build) do |acquired_media_release, _|
         acquired_media_release.contract_template = build(:acquired_media_release_contract_template)

spec/factories/contract_templates.rb

@@ -19,22 +19,6 @@ FactoryBot.define do
       amendment_clause "Amendment Legal Language"
     end
 
-    trait :with_questionnaire_legal_text do
-      questionnaire_legal_text "Questionnaire Legal Text"
-    end
-
-    trait :with_one_question do
-      question_1_text "Is this a question?"
-    end
-
-    trait :with_exhibits do
-      exhibit_a_legal_text "Exhibit A legal text"
-      exhibit_b_legal_text "Exhibit B legal text"
-
-      exhibit_a_question_text "Exhibit A question text"
-      exhibit_b_question_text "Exhibit B question text"
-    end
-
     factory :appearance_release_contract_template do
       release_type "appearance" 
     end

spec/features/admin_managing_accounts_spec.rb

@@ -30,24 +30,6 @@ feature "Admin managing accounts" do
     expect(page).to have_content "Created at less than a minute ago"
   end
 
-  scenario "locks and unlocks account" do
-    sign_in current_user
-    visit admin_signed_in_root_path
-    expect(Account.last.locked?).to eq false
-
-    click_button "Manage"
-    expect(page).not_to have_content "Unlock Account"
-    click_link "Lock Account"
-
-    expect(Account.last.locked?).to eq true
-
-    click_button "Manage"
-    expect(page).not_to have_content "Lock Account"
-    click_link "Unlock Account"
-
-    expect(Account.last.locked?).to eq false
-  end
-
   scenario "sees videos for an account in the system" do
     visit_account_overview_page
 

spec/features/guest_account_signup_spec.rb

@@ -1,13 +1,6 @@
 require "rails_helper"
 
 feature "Guest account sign up" do
-  scenario "guest can select ME Suite PRO in 'interested in' dropdown" do
-    visit new_account_path
-
-    expect(page).to have_selector("img[src*='ME_PRO_black']")
-    select "ME Suite PRO", from: interested_in_product_dropdown
-  end
-
   scenario "creates a new account and signs in successfully" do
     visit new_account_path
 
@@ -45,10 +38,4 @@ feature "Guest account sign up" do
 
     expect(page).to have_content "Sign Up"
   end
-
-  private
-
-  def interested_in_product_dropdown
-    "user[interested_product_name]"
-  end
 end

spec/features/user_manages_contract_templates_spec.rb

@@ -205,6 +205,34 @@ RSpec.feature 'User manages contract templates', type: :feature do
     expect(pdf_body).to have_content('Guardian')
   end
 
+  context 'preventing creation of release template with wrong fee value' do
+    before do
+      visit new_project_contract_template_path(project)
+
+      fill_in 'Name', with: 'My Release Template'
+      select 'Appearance Release', from: 'Release type'
+      fill_in_trix body_field, with: 'You agree to this release.'
+      fill_hidden guardian_clause_field, with: 'Your minor agrees to this release.'
+      select 'All', from: 'Applicable Media'
+      select 'Other', from: 'Territory'
+      fill_in 'Describe other territory', with: 'North America only'
+      select 'In perpetuity', from: 'Term'
+      select 'None', from: 'Restriction'
+    end
+
+    scenario 'Should not allow negative fees' do
+      fill_in 'Fee', with: '-200'
+      click_on create_release_template_button
+      expect(page).not_to have_content(create_contract_template_success_message)
+    end
+
+    scenario 'Should not allow fees with more than 9 digits' do
+      fill_in 'Fee', with: '9999999999'
+      click_on create_release_template_button
+      expect(page).not_to have_content(create_contract_template_success_message)
+    end
+  end
+
   scenario 'contract template preview is shown before printing' do
     create(:appearance_release_contract_template, body: 'Contract legal language', project: project)
     visit project_contract_templates_path(project)
@@ -358,13 +386,6 @@ RSpec.feature 'User manages contract templates', type: :feature do
     expect(ct.signature_legal_text.id).not_to eq ContractTemplate.last.signature_legal_text.id
   end
 
-  scenario 'trix editor has underline button', js: true do
-    visit new_project_contract_template_path(project)
-
-    select 'Appearance Release', from: 'Release type'
-    expect(page).to have_selector("button[data-trix-attribute='underline']")
-  end
-
   context 'When the user is associate' do
     let(:current_user) { create(:user, :associate) }
 

spec/features/user_managing_appearance_releases_spec.rb

@@ -544,7 +544,7 @@ feature 'User managing appearance releases' do
       expect(pdf_body).to have_content('Guardian Email')
     end
 
-    scenario "viewing the contract PDF when exhibit A is signed and without questionnaire" do
+    scenario "viewing the contract PDF when exhibit A is signed" do
       contract_template = create(:appearance_release_contract_template, project: project, exhibit_a_legal_text: "Exhibit A legal text", exhibit_a_question_text: "Exhibit A question text")
       appearance_release = create(:appearance_release,
                                 :amendment_signed,
@@ -566,131 +566,10 @@ feature 'User managing appearance releases' do
 
       expect(pdf_body).to have_content("John Doe")
 
-      expect(pdf_body).to have_content exhibit_a_heading
+      expect(pdf_body).to have_content "Exhibit A"
       expect(pdf_body).to have_content "Exhibit A legal text"
       expect(pdf_body).to have_content "Exhibit A question text"
       expect(pdf_body).to have_content "Answer to exhibit A question"
-
-      expect(pdf_body).not_to have_content questionnaire_heading
-      expect(pdf_body).not_to have_content exhibit_b_heading
-    end
-
-    scenario "viewing the contract PDF when exhibit B is signed and without questionnaire" do
-      contract_template = create(:appearance_release_contract_template, project: project, exhibit_b_legal_text: "Exhibit B legal text", exhibit_b_question_text: "Exhibit B question text")
-      appearance_release = create(:appearance_release,
-                                  :amendment_signed,
-                                  :native,
-                                  contract_template: contract_template,
-                                  project: project,
-                                  person_first_name: "John",
-                                  person_last_name: "Doe",
-                                  exhibit_b_answer: "Answer to exhibit B question"
-      )
-
-      sign_in(current_user)
-      visit project_appearance_releases_path(project)
-      click_link *view_release_pdf_link_for(appearance_release)
-
-      expect(content_type).to eq("application/pdf")
-      expect(content_disposition).to include("inline")
-      expect(pdf_filename).to include("doe-john")
-
-      expect(pdf_body).to have_content("John Doe")
-
-      expect(pdf_body).to have_content exhibit_b_heading
-      expect(pdf_body).to have_content "Exhibit B legal text"
-      expect(pdf_body).to have_content "Exhibit B question text"
-      expect(pdf_body).to have_content "Answer to exhibit B question"
-
-      expect(pdf_body).not_to have_content questionnaire_heading
-      expect(pdf_body).not_to have_content exhibit_a_heading
-    end
-
-    scenario "viewing the contract PDF with questionnaire and without exhibits" do
-      contract_template = create(:appearance_release_contract_template, :with_questionnaire_legal_text, :with_one_question, project: project)
-      appearance_release = create(:appearance_release,
-                                  :amendment_signed,
-                                  :native,
-                                  contract_template: contract_template,
-                                  project: project,
-                                  person_first_name: "John",
-                                  person_last_name: "Doe",
-                                  question_1_answer: "Yes"
-      )
-
-      sign_in(current_user)
-      visit project_appearance_releases_path(project)
-      click_link *view_release_pdf_link_for(appearance_release)
-
-      expect(content_type).to eq("application/pdf")
-      expect(content_disposition).to include("inline")
-      expect(pdf_filename).to include("doe-john")
-
-      expect(pdf_body).to have_content questionnaire_heading
-      expect(pdf_body).to have_content contract_template.question_1_text
-      expect(pdf_body).to have_content appearance_release.question_1_answer
-
-      expect(pdf_body).not_to have_content exhibit_a_heading
-      expect(pdf_body).not_to have_content exhibit_b_heading
-    end
-
-    scenario "viewing the contract PDF with questionnaire and with exhibits" do
-      contract_template = create(:appearance_release_contract_template,
-                                 :with_questionnaire_legal_text,
-                                 :with_one_question,
-                                 :with_exhibits,
-                                 project: project)
-      appearance_release = create(:appearance_release,
-                                  :amendment_signed,
-                                  :native,
-                                  contract_template: contract_template,
-                                  project: project,
-                                  person_first_name: "John",
-                                  person_last_name: "Doe",
-                                  question_1_answer: "Yes",
-                                  exhibit_a_answer: "Exhibit A answer",
-                                  exhibit_b_answer: "Exhibit B answer"
-      )
-
-      sign_in(current_user)
-      visit project_appearance_releases_path(project)
-      click_link *view_release_pdf_link_for(appearance_release)
-
-      expect(content_type).to eq("application/pdf")
-      expect(content_disposition).to include("inline")
-      expect(pdf_filename).to include("doe-john")
-
-      expect(pdf_body).to have_content questionnaire_heading
-      expect(pdf_body).to have_content contract_template.question_1_text
-      expect(pdf_body).to have_content appearance_release.question_1_answer
-
-      expect(pdf_body).to have_content exhibit_a_heading
-      expect(pdf_body).to have_content contract_template.exhibit_a_legal_text.to_plain_text
-      expect(pdf_body).to have_content contract_template.exhibit_a_question_text
-      expect(pdf_body).to have_content appearance_release.exhibit_a_answer
-
-      expect(pdf_body).to have_content exhibit_b_heading
-      expect(pdf_body).to have_content contract_template.exhibit_b_legal_text.to_plain_text
-      expect(pdf_body).to have_content contract_template.exhibit_b_question_text
-      expect(pdf_body).to have_content appearance_release.exhibit_b_answer
-    end
-
-    scenario "viewing the contract PDF - it shows person photo on first page if person photo is attached" do
-      appearance_release = create(:appearance_release_with_contract_template, :native, :minor_with_guardian_photo, project: project)
-
-      visit view_release_pdf_html_preview_link_for(appearance_release)
-
-      person_photo_url = url_for(appearance_release.person_photo.variant(auto_orient: true, resize: "200x200")).to_s
-      expect(page).to have_selector("#top-person-photo[src^='#{person_photo_url}']")
-    end
-
-    scenario "viewing the contract PDF - it shows person photo on first page if person photo is attached" do
-      appearance_release = create(:appearance_release_with_contract_template, :native, :minor_with_guardian_photo, project: project)
-
-      visit view_release_pdf_html_preview_link_for(appearance_release)
-
-      person_photo_url = url_for(appearance_release.person_photo.variant(auto_orient: true, resize: "200x200")).to_s
-      expect(page).to have_selector("#top-person-photo[src^='#{person_photo_url}']")
     end
 
     scenario 'deleting a release', js: true do
@@ -1029,10 +908,6 @@ feature 'User managing appearance releases' do
     ['Download', href: appearance_release_contracts_path(appearance_release, format: 'pdf')]
   end
 
-  def view_release_pdf_html_preview_link_for(appearance_release)
-    appearance_release_contracts_path(appearance_release)
-  end
-
   def successful_submission_message
     'Your release was successfully submitted. Thank you.'
   end
@@ -1112,16 +987,4 @@ feature 'User managing appearance releases' do
   def amendment_signature_label
     t 'contracts.amendment_page.description_labels.amendment_signature'
   end
-
-  def questionnaire_heading
-    t 'contracts.questionnaire.heading.appearance_release'
-  end
-
-  def exhibit_a_heading
-    t 'contracts.exhibit_a_page.heading.appearance_release'
-  end
-
-  def exhibit_b_heading
-    t 'contracts.exhibit_b_page.heading.appearance_release'
-  end
 end

spec/features/user_managing_broadcasts_spec.rb

@@ -151,65 +151,6 @@ feature 'User managing broadcasts' do
       end
     end
 
-    scenario 'broadcast recordings are shown in correct layout', js: true do
-      broadcast = create(:broadcast, :with_stream, :with_files, project: project)
-      create(:broadcast_recording, broadcast: broadcast, asset_uid: "asset_uid_1")
-      
-      visit project_broadcast_path(project, broadcast)
-
-      expect(page).to have_selector("li.media")
-      expect(page).to have_selector("div.play-thumbnail")
-      expect(page).to have_selector("div.media-body")
-      expect(page).to have_selector("div.play-btn")
-    end
-
-    scenario 'active playing media has highlighted background (live take or recording)', js: true do
-      broadcast = create(:broadcast, :with_stream, :with_files, project: project)
-      create(:broadcast_recording, broadcast: broadcast, asset_uid: "asset_uid_1")
-      create(:broadcast_recording, broadcast: broadcast, asset_uid: "asset_uid_2")
-
-      visit project_broadcast_path(project, broadcast)
-
-      expect(page).to have_selector("#live-take.playing-highlight")
-      expect(page).to have_selector(".play-btn-svg", count: 3, visible: false)
-
-      first("[data-behavior='play_recording']").click
-
-      expect(page).not_to have_selector("#live-take.playing-highlight")
-      expect(page).to have_selector("li.media.playing-highlight", count: 1)
-      expect(page).to have_selector("li.media", count: 2)
-
-      first("[data-behavior='play_stream']").click
-
-      expect(page).to have_selector("#live-take.playing-highlight")
-      expect(page).to have_selector("li.media", count: 2)
-      expect(page).not_to have_selector("li.media.playing-highlight")
-    end
-
-    scenario 'opening broadcast page starts in normal mode if director mode is not available' do
-      broadcast = create(:broadcast, :with_stream, :with_files, project: project)
-      broadcast.director_mode_video_embed = nil
-      broadcast.save
-
-      visit project_broadcast_path(project, broadcast)
-
-      expect(page).not_to have_selector('#director_broadcast_video')
-      expect(page).to have_selector('#broadcast_video')
-
-      expect(page).not_to have_selector('#director_mode_switch')
-    end
-
-    scenario 'opening broadcast page starts in director mode if available' do
-      broadcast = create(:broadcast, :with_stream, :with_files, project: project, director_mode_video_embed: 'director_mode')
-
-      visit project_broadcast_path(project, broadcast)
-
-      expect(page).not_to have_selector('#broadcast_video')
-      expect(page).to have_selector('#director_broadcast_video')
-
-      expect(page).to have_selector('#director_mode_switch')
-    end
-
     context 'When the user is associate' do
       let(:current_user) { create(:user, :associate) }
 

spec/features/user_managing_locked_account_spec.rb

@@ -1,34 +0,0 @@
-require "rails_helper"
-
-feature "User managing locked account" do
-  let(:user) { create(:user, :account_manager) }
-  let(:project) { create(:project) }
-
-  before do
-    sign_in(user)
-    user.accounts.first.update(locked: true)
-  end
-
-  scenario "user is redirected to custom landing page when opens projects index page" do
-    paths = [
-      projects_path,
-      project_path(project),
-      project_task_requests_path(project),
-      project_contract_templates_path(project),
-      project_broadcasts_path(project),
-      project_videos_path(project),
-    ]
-
-    paths.each do |path|
-      visit path
-
-      expect(page).to have_content locked_account_warning
-    end
-  end
-
-  private
-
-  def locked_account_warning
-    t 'locked_accounts.index.account_locked_message'
-  end
-end

spec/features/user_managing_material_releases_spec.rb

@@ -367,7 +367,7 @@ feature "User managing material releases" do
       expect(page).to have_content("No Media")
 
       click_on "Manage"
-      click_on "Media"
+      click_on "Add Media"
 
       expect(page).to have_content("Add Files")
       expect(page).to have_content("Apple MacBook Air")

spec/features/user_managing_medical_releases_spec.rb

@@ -244,32 +244,11 @@ feature "User managing medical releases" do
       expect(pdf_filename).to include("doe-john")
 
       expect(pdf_body).to have_content("John Doe")
-      expect(pdf_body).to have_content questionnaire_heading.upcase
+      expect(pdf_body).to have_content "MEDICAL QUESTIONNAIRE"
       expect(pdf_body).to have_content "Question 1 text"
       expect(pdf_body).to have_content "Question 1 answer"
       expect(pdf_body).to have_content "Questionnaire legal text"
     end
-
-    scenario 'viewing contract PDF without medical questionnaire' do
-      contract_template = create(:medical_release_contract_template, project: project)
-      medical_release = create(:medical_release,
-                               :native,
-                               contract_template: contract_template,
-                               project: project,
-                               person_first_name: "John",
-                               person_last_name: "Doe",
-                               )
-
-      sign_in(current_user)
-      visit project_medical_releases_path(project)
-      click_link *view_release_pdf_link_for(medical_release)
-
-      expect(content_type).to eq("application/pdf")
-      expect(content_disposition).to include("inline")
-      expect(pdf_filename).to include("doe-john")
-
-      expect(pdf_body).not_to have_content questionnaire_heading.upcase
-    end
   end
 
   context "when the user is manager(project manager)" do
@@ -520,8 +499,4 @@ feature "User managing medical releases" do
   def dummy_signature_legal_text
     'Some signature legal language'
   end
-
-  def questionnaire_heading
-    t 'contracts.questionnaire.heading.medical_release'
-  end
 end

spec/features/user_managing_misc_releases_spec.rb

@@ -80,7 +80,7 @@ feature "User managing misc releases" do
     end
 
 
-    scenario 'viewing the contract PDF with questionnaire' do
+    scenario 'viewing the contract PDF' do
       misc_release = create(:misc_release,
                             :native,
                             contract_template: build(:misc_release_contract_template, question_1_text: 'Q1'),
@@ -121,30 +121,10 @@ feature "User managing misc releases" do
       expect(pdf_body).to have_content('Woman')
       expect(pdf_body).to have_content('Brunette')
       expect(pdf_body).not_to have_content('Guardian Email')
-      expect(pdf_body).to have_content questionnaire_heading.upcase
+      expect(pdf_body).to have_content('QUESTIONNAIRE')
       expect(pdf_body).to have_content('Q1')
       expect(pdf_body).to have_content('A1')
     end
-
-    scenario 'viewing the contract PDF without questionnaire' do
-      misc_release = create(:misc_release,
-                            :native,
-                            contract_template: build(:misc_release_contract_template),
-                            project: project,
-                            person_first_name: 'Jane',
-                            person_last_name: 'Doe'
-      )
-
-      sign_in(current_user)
-      visit project_misc_releases_path(project)
-      click_link *view_release_pdf_link_for(misc_release)
-
-      expect(content_type).to eq('application/pdf')
-      expect(content_disposition).to include('inline')
-      expect(pdf_filename).to include('doe-jane')
-
-      expect(pdf_body).not_to have_content questionnaire_heading.upcase
-    end
   end
 
   context "when the user is manager(project manager)" do
@@ -235,8 +215,4 @@ feature "User managing misc releases" do
   def view_release_pdf_link_for(release)
     ['Download', href: misc_release_contracts_path(release, format: 'pdf')]
   end
-
-  def questionnaire_heading
-    t 'contracts.questionnaire.heading.misc_release'
-  end
 end

spec/features/user_performs_video_analysis_spec.rb

@@ -83,7 +83,11 @@ feature "User performs video analysis" do
       create(:material_release, name: "Apple MacBook Air", project: project),
       create(:material_release, name: "Microsoft Surface Pro", project: project)
     ]
-    acquired_media = create(:acquired_media_release, :with_files, project: project)
+    acquired_media = create(:acquired_media_release, project: project)
+    acquired_file_info_1, acquired_file_info_2 = [
+      create(:file_info, filename: "Still Image", releasable: acquired_media),
+      create(:file_info, filename: "Artwork", releasable: acquired_media)
+    ]
     music_release = create(:music_release, project: project)
     music_file_info_1, music_file_info_2 = [
       create(:file_info, filename: "I'm not afraid", releasable: music_release),
@@ -112,10 +116,9 @@ feature "User performs video analysis" do
     end
 
     within "#acquired_media_releases_section" do
-      search_for(:acquired_media_releases, text: "cont")
-      expect(page).to have_content("contract.pdf")
-      expect(page).not_to have_content("audio.mp3")
-      expect(page).not_to have_content("video_file.mp4")
+      search_for(:acquired_media_releases, text: "till")
+      expect(page).to have_content("Still Image")
+      expect(page).not_to have_content("Artwork")
     end
 
     within "#music_releases_section" do
@@ -347,31 +350,34 @@ feature "User performs video analysis" do
     end
 
     scenario "confirming an acquired media release", js: true do
-      acquired_media_release = create(:acquired_media_release, :with_files, project: project)
+      acquired_media_release = create(:acquired_media_release_with_file_infos, project: project)
+      acquired_media_release.file_infos.first.update(filename: "shark jumping")
+      acquired_media_release.file_infos.second.update(filename: "pig flying")
+      acquired_media_release.file_infos.third.update(filename: "panda sneezing")
 
       sign_in current_user
       visit video_video_analyses_path(video)
 
-      expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "contract.pdf", count: 1)
-      expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "audio.mp3", count: 1)
-      expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "video_file.mp4", count: 1)
+      expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "shark jumping", count: 1)
+      expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "pig flying", count: 1)
+      expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "panda sneezing", count: 1)
 
-      confirm_first_release_using_edl_modal(video, acquired_media_release, text: "contract.pdf")
+      confirm_first_release_using_edl_modal(video, acquired_media_release, text: "shark jumping")
 
-      expect(page).to have_confirmed_release(acquired_media_release, text: "contract.pdf")
-      expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "audio.mp3", count: 1)
-      expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "video_file.mp4", count: 1)
+      expect(page).to have_confirmed_release(acquired_media_release, text: "shark jumping")
+      expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "pig flying", count: 1)
+      expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "panda sneezing", count: 1)
 
       unconfirm_release(VideoReleaseConfirmation.last)
 
-      expect(page).not_to have_confirmed_release(acquired_media_release, text: "contract.pdf")
-      expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "contract.pdf", count: 1)
-      expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "audio.mp3", count: 1)
-      expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "video_file.mp4", count: 1)
+      expect(page).not_to have_confirmed_release(acquired_media_release, text: "shark jumping")
+      expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "shark jumping", count: 1)
+      expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "pig flying", count: 1)
+      expect(page).to have_unconfirmed_file_info_release(acquired_media_release, "panda sneezing", count: 1)
     end
 
     scenario "confirming a material release", js: true do
-      material_release = create(:material_release, :with_file, project: project)
+      material_release = create(:material_release, project: project)
 
       sign_in current_user
       visit video_video_analyses_path(video)
@@ -381,6 +387,7 @@ feature "User performs video analysis" do
       confirm_first_release_using_edl_modal(video, material_release)
 
       expect(page).to have_confirmed_release(material_release)
+      expect(page).not_to have_unconfirmed_release(material_release)
 
       unconfirm_release(VideoReleaseConfirmation.last)
 

spec/jobs/match_appearance_releases_job_spec.rb

@@ -23,7 +23,7 @@ describe MatchAppearanceReleasesJob do
       MatchAppearanceReleasesJob.perform_now project, attachments
     end
 
-    it "creates a new incomplete appearance release for headshots which cannot be matched by BrayniacAI" do
+    it "does not create new appearance release if BrayniacAI returns empty matches array" do
       signed_ids = [dummy_appearance_release.person_photo.blob.signed_id]
       keys = [dummy_appearance_release.person_photo.key]
       payload = {
@@ -44,41 +44,9 @@ describe MatchAppearanceReleasesJob do
       expect(BrayniacAI::QrMatching).to receive(:create!).with(qr_matching_payload).and_return(qr_matching_mock_response)
       expect(dummy_matching_request).to receive(:destroy)
 
-      expect {
-        MatchAppearanceReleasesJob.perform_now project, signed_ids
-      }.to change{AppearanceRelease.count}.by(1)
+      MatchAppearanceReleasesJob.perform_now project, signed_ids
 
-      expect(AppearanceRelease.last.contract).not_to be_attached
-      expect(AppearanceRelease.last.person_photo).to be_attached
-    end
-
-    it "creates a new incomplete appearance release for contracts which cannot be matched by BrayniacAI" do
-      signed_ids = [dummy_appearance_release.contract.blob.signed_id]
-      keys = [dummy_appearance_release.contract.key]
-      payload = {
-        project: project,
-        attachments: signed_ids
-      }
-      qr_matching_payload = {
-        bucket: '',
-        files: keys,
-        request_id: dummy_matching_request.id
-      }
-      qr_matching_mock_response = double(
-        request_id: dummy_matching_request.id,
-        matches: []
-      )
-
-      expect(MatchingRequest).to receive(:create).with(payload).and_return(dummy_matching_request)
-      expect(BrayniacAI::QrMatching).to receive(:create!).with(qr_matching_payload).and_return(qr_matching_mock_response)
-      expect(dummy_matching_request).to receive(:destroy)
-
-      expect {
-        MatchAppearanceReleasesJob.perform_now project, signed_ids
-      }.to change{AppearanceRelease.count}.by(1)
-
-      expect(AppearanceRelease.last.contract).to be_attached
-      expect(AppearanceRelease.last.person_photo).not_to be_attached
+      expect(AppearanceRelease.last).to eq dummy_appearance_release
     end
 
     it "creates new incomplete appearance release if BrayniacAI returns single headshot match" do
@@ -116,49 +84,6 @@ describe MatchAppearanceReleasesJob do
       expect(AppearanceRelease.last.contract).not_to be_attached
     end
 
-    it "creates new appearance releases for matches and unmatches at the same time" do
-      signed_ids = [dummy_appearance_release.contract.blob.signed_id, dummy_appearance_release.person_photo.blob.signed_id]
-      keys = [dummy_appearance_release.contract.key, dummy_appearance_release.person_photo.blob.key]
-      payload = {
-        project: project,
-        attachments: signed_ids
-      }
-      qr_matching_payload = {
-        bucket: '',
-        files: keys,
-        request_id: dummy_matching_request.id
-      }
-      mock_match = double(
-        headshots: [],
-        contracts: [keys.first],
-        unknowns: [],
-        identifier: 'some/identifier/123'
-      )
-      matches = [mock_match]
-      qr_matching_mock_response = double(
-        request_id: dummy_matching_request.id,
-        matches: matches
-      )
-
-      expect(MatchingRequest).to receive(:create).with(payload).and_return(dummy_matching_request)
-      expect(BrayniacAI::QrMatching).to receive(:create!).with(qr_matching_payload).and_return(qr_matching_mock_response)
-      expect(dummy_matching_request).to receive(:destroy)
-
-      expect {
-        MatchAppearanceReleasesJob.perform_now project, signed_ids
-      }.to change{AppearanceRelease.count}.by(2)
-
-      matched_release, unmatched_release = AppearanceRelease.last(2)
-
-      expect(matched_release.identifier).to eq mock_match.identifier
-      expect(matched_release.person_photo).not_to be_attached
-      expect(matched_release.contract).to be_attached
-
-      expect(unmatched_release.identifier).to be_nil
-      expect(unmatched_release.person_photo).to be_attached
-      expect(unmatched_release.contract).not_to be_attached
-    end
-
     it "creates new incomplete appearance release if BrayniacAI returns single contract match" do
       signed_ids = [dummy_appearance_release.contract.blob.signed_id]
       keys = [dummy_appearance_release.contract.key]
@@ -288,4 +213,4 @@ describe MatchAppearanceReleasesJob do
       expect(releases[1].contract.attached?).to eq true
     end
   end
-end
+end

spec/models/contract_template_spec.rb

@@ -22,10 +22,14 @@ describe ContractTemplate do
     it { is_expected.to validate_presence_of(:release_type) }
   end
 
+  describe '#fee' do
+    it { is_expected.to monetize(:fee) }
+  end
+
   describe '#fee?' do
     it 'returns true when there is a fee amount' do
       fee_contract    = build(:contract_template, fee: 500)
-      no_fee_contract = build(:contract_template, fee: nil)
+      no_fee_contract = build(:contract_template, fee: 0)
 
       expect(fee_contract).to be_fee
       expect(no_fee_contract).not_to be_fee

spec/models/video_release_confirmation_spec.rb

@@ -4,6 +4,7 @@ RSpec.describe VideoReleaseConfirmation do
   describe "associations" do
     it { is_expected.to belong_to(:releasable) }
     it { is_expected.to belong_to(:video) }
+    it { is_expected.to belong_to(:file_info).optional }
   end
 
   describe "#appears_at" do