do not use remember_me, set cookie expiration

.env.sample

@@ -7,8 +7,6 @@ AWS_SECRET_ACCESS_KEY=
 AWS_REGION=
 
 BRAYNIAC_AI_API_ENDPOINT=https://z99cprg2eg.execute-api.us-east-1.amazonaws.com/dev/v0.0.1
-SOURCE_AUDIO_API_ENDPOINT=https://bigmedia.sourceaudio.com/api
-SOURCE_AUDIO_TOKEN=
 
 # Optional
 REDIS_URL=
@@ -18,7 +16,7 @@ ZOOM_API_KEY=
 ZOOM_API_SECRET=
 ZOOM_PRO_USERS_LIMIT= # defaults to 3
 ZOOM_USER_TYPE= # 'pro' / 'basic'
-ZOOM_ENABLE_RECORDINGS=0 # 0 / 1
+ZOOM_ENABLE_RECORDINGS= # true / false (default: false)
 # Token for webhooks authorization
 ZOOM_VERIFICATION_TOKEN=
 
@@ -27,3 +25,10 @@ MUX_TOKEN_ID=
 MUX_TOKEN_SECRET=
 MUX_BROADCAST_SERVER_URL=rtmp://global-live.mux.com:5222/app
 MUX_TEST_MODE_DISABLED=
+
+# Required for creating user through API
+CUSTOM_API_TOKEN=
+
+# Required for simulcasting to Millicast for director mode
+MILLICAST_API_SECRET=
+MILLICAST_ACCOUNT_ID=

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

@@ -21,11 +21,13 @@ $(document).on "turbolinks:load", ->
 
     refreshBroadcastVideo: (data) ->
       $("#broadcast_updates").html data.status_content
-      if data.streamer_status == 'recording' && data.status == 'active'
+      stream_selected = $("#broadcast_video").data('videoType') == 'stream';
+      if data.streamer_status == 'recording' && data.status == 'active' && stream_selected
         $("#broadcast_video").html data.video_content
         new (Clappr.Player)(
+          <%= "baseUrl: 'http://cdn.clappr.io/latest'," if Rails.env.test? %>
           parentId: '#broadcast_video'
-          source: data.playback_url
+          source: data.full_live_stream_playback_url
           width: '100%',
           height: '100%',
           mute: true,

app/assets/javascripts/directory_files_input.js

@@ -0,0 +1,9 @@
+$(document).on("turbolinks:load", function() {
+    $("#upload_directory_files").on('click', function(e){
+        const newFilesCount = $('input[name = "directory[files][]"][type = "hidden"]').length;
+
+        if (newFilesCount === 0){
+            e.preventDefault();
+        }
+    });
+});

app/assets/javascripts/group_qr_code.js

@@ -0,0 +1,50 @@
+$(document).on("click", "[data-behavior=select_contract_template]", function() {
+  var _this = this;
+  var checkbox = $(this).children("input:checkbox");
+
+  selectContractTemplate(_this, checkbox);
+});
+
+$(document).on("click", "[data-behavior=select_contract_template] input[type='checkbox']", function(e) {
+  e.stopPropagation();
+
+  var _this = this;
+  var checkbox = $(this);
+
+  selectContractTemplate(_this, checkbox);
+});
+
+function selectContractTemplate(clicked_element, checkbox) {
+  if (clicked_element.hasChildNodes()) {
+    if(checkbox.prop("checked")) {
+      checkbox.prop('checked', false);
+    } else {
+      checkbox.prop('checked', true);
+    }
+  }
+
+  var checked = checkbox.prop("checked");
+  var project_id = JSON.parse($('#group_qr_code').attr('data-project-id'));
+  var contract_template_ids = JSON.parse($('#group_qr_code').attr('data-contract-template-ids'));
+  var selected_contract_template_id = checkbox.val();
+
+  if (checked && !contract_template_ids.includes(selected_contract_template_id)) {
+    contract_template_ids.push(selected_contract_template_id);
+  } else if(!checked && contract_template_ids.includes(selected_contract_template_id)) {
+    contract_template_ids.splice( $.inArray(selected_contract_template_id, contract_template_ids), 1 );
+  }
+  
+  $('#group_qr_code').attr('data-contract-template-ids', JSON.stringify(contract_template_ids));
+
+  if (contract_template_ids.length >= 2) {
+    multi_sign_ids = $.param({multi_sign_ids: contract_template_ids});
+    contract_template_url = "/en/contract_templates/" + contract_template_ids[0] + "/qr_codes?" + multi_sign_ids
+
+    $("#group_qr_code").attr("href", contract_template_url);
+    $("#group_qr_code").attr("target", "_blank");
+    $("#group_qr_code").removeClass('disabled');
+  } else if (contract_template_ids.length < 2) {
+    $("#group_qr_code").attr("href", "javascript:void(0);");
+    $("#group_qr_code").addClass('disabled');
+  }
+}

app/assets/javascripts/stream_player.js.erb

@@ -3,7 +3,7 @@ $(document).on("click", "[data-behavior=play_recording]", function() {
         return false;
     }
 
-    console.warn('Play prev : ', playback_url);
+    $("#broadcast_video").data('videoType', 'recording');
 
     var playback_url = $(this).attr("data-playback-url")
     $("#broadcast_video").empty();
@@ -23,4 +23,6 @@ $(document).on("click", "[data-behavior=play_recording]", function() {
     $(this).siblings().children("i").remove();
     $(this).addClass('active');
     $(this).prepend('<i class="fa fa-check">&nbsp;</i>');
-});
+});
+
+$(document).on("click", "[data-behavior=play_stream]", function() { $("#broadcast_video").data('videoType', 'stream'); });

app/channels/broadcasts_channel.rb

@@ -16,6 +16,7 @@ class BroadcastsChannel < ApplicationCable::Channel
       event: :broadcast_stream_update,
       status: broadcast.status,
       playback_url: broadcast.stream_playback_url,
+      full_live_stream_playback_url: broadcast.full_live_stream_playback_url,
       video_content: video_content,
       status_content: status_content,
       streamer_status: broadcast.streamer_status

app/controllers/acquired_media_releases_controller.rb

@@ -18,7 +18,6 @@ class AcquiredMediaReleasesController < ApplicationController
     @acquired_media_release = build_acquired_media_release(acquired_media_release_params)
 
     if @acquired_media_release.save
-      log_create_analytics
       SetTagsForReleasableJob.perform_later(@acquired_media_release)
       redirect_to [@project, :acquired_media_releases], notice: t(".notice")
     else
@@ -56,35 +55,71 @@ class AcquiredMediaReleasesController < ApplicationController
     end
   end
 
+  def person_params
+    %i[
+      person_first_name
+      person_last_name
+      person_phone
+      person_company
+      person_email
+      person_title
+      person_address_street1
+      person_address_street2
+      person_address_city
+      person_address_state
+      person_address_zip
+      person_address_country
+    ]
+  end
+
+  def guardian_params
+    %i[
+      guardian_first_name
+      guardian_last_name
+      guardian_phone
+      guardian_email
+      guardian_photo
+      guardian_address_street1
+      guardian_address_street2
+      guardian_address_city
+      guardian_address_state
+      guardian_address_zip
+      guardian_address_country
+    ]
+  end
+
+  def second_guardian_params
+    %i[
+      guardian_2_first_name
+      guardian_2_last_name
+      guardian_2_phone
+      guardian_2_email
+      guardian_2_photo
+      guardian_2_address_street1
+      guardian_2_address_street2
+      guardian_2_address_city
+      guardian_2_address_state
+      guardian_2_address_zip
+      guardian_2_address_country
+    ]
+  end
+
   def acquired_media_release_params
-    params.require(:acquired_media_release).permit(
-      :name,
-      :territory,
-      :term,
-      :person_first_name,
-      :person_last_name,
-      :person_phone,
-      :person_email,
-      :person_company,
-      :person_title,
-      :person_address_street1,
-      :person_address_street2,
-      :person_address_city,
-      :person_address_state,
-      :person_address_zip,
-      :person_address_country,
-      :contract,
-      :applicable_medium_id, :applicable_medium_text,
-      :territory_id, :territory_text,
-      :term_id, :term_text,
-      :restriction_id, :restriction_text,
-      categories: [],
-      file_infos_attributes: [
-        :filename,
-        :content_type,
-        :byte_size
-      ]
-    )
+    params.require(:acquired_media_release).permit(person_params,
+                                                   guardian_params,
+                                                   second_guardian_params,
+                                                   :minor,
+                                                   :name,
+                                                   :territory,
+                                                   :term,
+                                                   :contract,
+                                                   :applicable_medium_id, :applicable_medium_text,
+                                                   :territory_id, :territory_text,
+                                                   :term_id, :term_text,
+                                                   :restriction_id, :restriction_text,
+                                                   categories: [],
+                                                   files: []
+                                                  )
   end
 
   def build_acquired_media_release(attrs = {})
@@ -100,8 +135,4 @@ class AcquiredMediaReleasesController < ApplicationController
 
     results
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_non_native_release, release_type: AcquiredMediaRelease.to_s, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/admin/accounts_controller.rb

@@ -20,6 +20,7 @@ class Admin::AccountsController < Admin::ApplicationController
 
   def show
     @videos = filtered_account_videos.order(created_at: :desc, project_id: :desc).paginate(page: params[:page])
+    @broadcasts = account_broadcasts.order(created_at: :desc, project_id: :desc).paginate(page: params[:page])
   end
 
   def edit
@@ -70,4 +71,8 @@ class Admin::AccountsController < Admin::ApplicationController
       @account.videos
     end
   end
+
+  def account_broadcasts
+    @account.broadcasts
+  end
 end

app/controllers/admin/broadcasts_controller.rb

@@ -0,0 +1,29 @@
+class Admin::BroadcastsController < Admin::ApplicationController
+  before_action :set_broadcast, only: [:edit, :update]
+
+  def edit
+  end
+
+  def update
+    if @broadcast.update(broadcast_update_params)
+      redirect_to [:admin, @broadcast.project.account], notice: t(".notice")
+    else
+      render :edit
+    end
+  end
+
+  private
+
+  def set_broadcast
+    @broadcast = authorize policy_scope(Broadcast).find(params[:id])
+  end
+
+  def broadcast_update_params
+    params.require(:broadcast).permit(
+      :video_conference_url_override,
+      :stream_url_override, 
+      :stream_key_override, 
+      :director_mode_video_embed
+    )
+  end
+end

app/controllers/api/api_controller.rb

@@ -17,7 +17,9 @@ class Api::ApiController < ActionController::Base
   def return_error(exception)
     raise exception if Rails.env.test? 
 
-    logger.error "==Handled======="
+    Raven.capture_exception(exception)
+
+    logger.error "==Handled======"
     logger.error exception.message
     logger.error exception.backtrace.join("\n")
     logger.error "==Handled=======" 

app/controllers/api/medical_releases_controller.rb

@@ -0,0 +1,11 @@
+class Api::MedicalReleasesController < Api::ReleasesController
+  deserializable_resource :medical_release, only: [:create, :update]
+
+  def model_name
+    "medical_release"
+  end
+
+  def attributes_for_index
+    [:name]
+  end
+end

app/controllers/api/misc_releases_controller.rb

@@ -0,0 +1,11 @@
+class Api::MiscReleasesController < Api::ReleasesController
+  deserializable_resource :misc_release, only: [:create, :update]
+
+  def model_name
+    "misc_release"
+  end
+
+  def attributes_for_index
+    [:name]
+  end
+end

app/controllers/api/releases_controller.rb

@@ -21,7 +21,6 @@ class Api::ReleasesController < Api::ApiController
     release.contract_template_id = @contract_template.id
     handle_attachments(release, release_create_params[:photos])
     release.save!(context: :native)
-    log_create_analytics
     after_create(release)
     handle_response(release, :created)
   end
@@ -181,8 +180,4 @@ class Api::ReleasesController < Api::ApiController
     parameters = parameters.slice(*keys).except(:created_at, :updated_at, :id, :user_id, :signature)
     parameters
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_native_release, release_type: model_constant.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip, application: :ios)
-  end
 end

app/controllers/api/sync_controller.rb

@@ -10,8 +10,10 @@ class Api::SyncController < Api::ApiController
     @appearance_releases = (AppearanceRelease.where(project: accessible_projects))
     @location_releases = (LocationRelease.where(project: accessible_projects))
     @material_releases = (MaterialRelease.where(project: accessible_projects))
+    @medical_releases = MedicalRelease.where(project: accessible_projects)
+    @misc_releases = MiscRelease.where(project: accessible_projects)
     @talent_releases = (TalentRelease.where(project: accessible_projects))
-    @notes = notes_query(Note.where(notable: @appearance_releases + @location_releases + @material_releases + @talent_releases + @acquired_media_releases ))
+    @notes = notes_query(Note.where(notable: @appearance_releases + @location_releases + @material_releases + @medical_releases + @misc_releases + @talent_releases + @acquired_media_releases ))
 
     render json: {
       data: {
@@ -22,6 +24,8 @@ class Api::SyncController < Api::ApiController
         appearance_releases: releases_query(@appearance_releases),
         location_releases: releases_query(@location_releases),
         material_releases: releases_query(@material_releases),
+        medical_releases: releases_query(@medical_releases),
+        misc_releases: releases_query(@misc_releases),
         talent_releases: releases_query(@talent_releases),
         notes: @notes
       }

app/controllers/api/user_token_controller.rb

@@ -1,14 +1,24 @@
+# frozen_string_literal: true
+
+require './lib/knock_monkeypatch'
+
 class Api::UserTokenController < Knock::AuthTokenController
+  include Oath::ControllerHelpers
+  include RememberMe::Controller
+
   skip_before_action :verify_authenticity_token
+  before_action :sign_in_user
 
   rescue_from Exception, :with => :return_error
 
   # Catch exception and return JSON-formatted error
   def return_error(exception)
+    Raven.capture_exception(exception)
+
     logger.error "==Handled======="
     logger.error exception.message
     logger.error exception.backtrace.join("\n")
-    logger.error "==Handled=======" 
+    logger.error "==Handled======="
     case exception
     when ActiveRecord::RecordNotFound
       @status = 404
@@ -25,12 +35,18 @@ class Api::UserTokenController < Knock::AuthTokenController
     end
 
     # for some reason render json_errors is not working
-    # simulating JSON API support 
-    render json: { 
+    # simulating JSON API support
+    render json: {
       errors: [{
         status: @status.to_s,
         title: @message
       }]
     }
   end
+
+  private
+
+  def sign_in_user
+    sign_in(entity)
+  end
 end

app/controllers/api/users_controller.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class Api::UsersController < Api::ApiController
+  skip_before_action :authenticate_user
+  before_action :verify_custom_token, only: :create
+
+  def create
+    if user_params[:email].nil? || user_params[:password].nil?
+      raise ActionController::ParameterMissing.new 'Missing email or password'
+    end
+
+    user = Oath::Services::SignUp.new(user_params).perform
+    render json: user.slice(:email, :created_at, :first_name, :last_name)
+  end
+
+  private
+
+  def user_params
+    params.require(:user).permit(%i[
+                                   email
+                                   password
+                                   first_name
+                                   last_name
+                                 ])
+  end
+
+  def verify_custom_token
+    if token.blank? || token != ENV['CUSTOM_API_TOKEN']
+      unauthorized_entity(:user)
+    end
+  end
+
+end

app/controllers/appearance_releases_controller.rb

@@ -18,7 +18,6 @@ class AppearanceReleasesController < ApplicationController
     @appearance_release = build_appearance_release(appearance_release_params)
 
     if @appearance_release.save(context: :non_native)
-      log_create_analytics
       AddHeadshotCollectionUidToProjectJob.perform_later(@project)
       SetTagsForReleasableJob.perform_later(@appearance_release)
       redirect_to [@project, :appearance_releases], notice: "The release has been imported. #{link_to_import_another}"
@@ -127,8 +126,4 @@ class AppearanceReleasesController < ApplicationController
   def link_to_import_another
     view_context.link_to "Import Another", [:new, @project, :appearance_release]
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_non_native_release, release_type: AppearanceRelease.to_s, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/approvals_controller.rb

@@ -0,0 +1,48 @@
+class ApprovalsController < ApplicationController
+  before_action :set_releasable
+  before_action :set_project
+
+  layout "project"
+
+  def create
+    @releasable.approve_by(current_user)
+    @releasable.approved_by_user_signature.attach(approved_by_user_signature_params) if signature_data.present?
+
+    if @releasable.save(context: :approval)
+      redirect_to [@project, "#{@releasable_param.name.pluralize}"], notice: t('.release_approved', release_type: @releasable.model_name.human)
+    else
+      render :new
+    end
+  end
+
+  private
+
+  def releasable_param
+    @releasable_param ||= ReleasableParam.new(params.to_unsafe_h)
+  end
+
+  def set_releasable
+    @releasable = authorize policy_scope(releasable_param.type).find(releasable_param.id)
+  end
+
+  def set_project
+    @project = @releasable.project
+  end
+
+  def releasable_params
+    params.require(releasable_param.name).permit(approved_by_user_signature: :data)
+  end
+
+  def signature_data
+    releasable_params.dig(:approved_by_user_signature, :data)
+  end
+
+  def approved_by_user_signature_params
+    {
+      data: signature_data,
+      filename: "approved_by_user_signature.png",
+      content_type: "image/png",
+      identify: false,
+    }
+  end
+end

app/controllers/broadcast_recordings_controller.rb

@@ -0,0 +1,26 @@
+class BroadcastRecordingsController < ApplicationController
+  layout "project"
+
+  before_action :set_project
+  before_action :set_broadcast
+  before_action :set_recording
+
+  def destroy
+    @recording.update(hidden: true)
+    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
+  end
+
+  private
+
+  def set_project
+    @project = policy_scope(Project).find(params[:project_id])
+  end
+
+  def set_broadcast
+    @broadcast = authorize policy_scope(@project.broadcasts).find(params[:broadcast_id])
+  end
+
+  def set_recording
+    @recording = authorize policy_scope(@broadcast.broadcast_recordings).find(params[:id])
+  end
+end

app/controllers/broadcasts_controller.rb

@@ -3,7 +3,7 @@ class BroadcastsController < ApplicationController
 
   before_action :set_project
   before_action :build_broadcast, only: [:new, :create]
-  before_action :set_broadcast, only: [:show, :destroy, :update]
+  before_action :set_broadcast, only: [:show, :destroy, :update, :destroy_file]
   before_action :set_multi_view_broadcasts, only: [:show]
   before_action :show_splash_screen, only: :index
 
@@ -23,21 +23,26 @@ class BroadcastsController < ApplicationController
     else
       render :new
     end
+  rescue MuxRuby::ApiError, ActiveResource::ConnectionError => e
+    Raven.capture_exception(e)
+    redirect_to [@project, :broadcasts], alert: t(".alert")
   end
 
   def show
-    @conference_url = url_for [@broadcast.project, @broadcast, :zoom_meeting]
-    @recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
+    @conference_url = conference_url_for(@broadcast)
+    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
     @files = @broadcast.files.order("created_at DESC").paginate(page: params[:files_page])
     render layout: 'application'
   end
 
   def update
-    @broadcast.update(broadcast_params)
-    @files = @broadcast.files.order("created_at DESC").paginate(page: 1)
+    unless params.has_key?(:broadcast)
+      @broadcast.regenerate_token
+      redirect_to([@project, @broadcast], notice: t('.reset_notice')) and return
+    end
 
-    pagination_content = ApplicationController.render html: helpers.will_paginate(@files, params: { active_tab: params[:active_tab], page: params[:page], active_files_tab: params[:active_files_tab] })
-    BroadcastsChannel.broadcast_file_upload_updates(@broadcast, @files, pagination_content)
+    @broadcast.update(broadcast_params)
+    update_files_section
   end
 
   def destroy
@@ -48,14 +53,29 @@ class BroadcastsController < ApplicationController
     end
   end
 
+  def destroy_file
+    authorize Broadcast
+    file = ActiveStorage::Attachment.find(params[:file_id])
+    file.destroy
+
+    update_files_section
+  end
+
   private
 
+  def update_files_section
+    @files = @broadcast.files.order("created_at DESC").paginate(page: 1)
+
+    pagination_content = ApplicationController.render html: helpers.will_paginate(@files, params: { active_tab: params[:active_tab], page: params[:page], active_files_tab: params[:active_files_tab] })
+    BroadcastsChannel.broadcast_file_upload_updates(@broadcast, @files, pagination_content)
+  end
+
   def show_splash_screen
     render :splash if broadcasts.count.zero?
   end
 
   def broadcast_params
-    params.require(:broadcast).permit(:name, files: [])
+    params.require(:broadcast).permit(:name, :shoot_location_time_zone, files: [])
   end
 
   def set_project
@@ -92,6 +112,10 @@ class BroadcastsController < ApplicationController
     results
   end
 
+  def conference_url_for(broadcast)
+    broadcast.video_conference_url_override || url_for([broadcast.project, broadcast, :zoom_meeting])
+  end
+
   def log_create_analytics
     TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_live_stream, user_agent: request.user_agent, user_ip: request.remote_ip)
   end

app/controllers/contract_templates/duplicates_controller.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class ContractTemplates::DuplicatesController < ApplicationController
+  before_action :set_contract_template
+
+  def create
+    authorize(ContractTemplate)
+    new_contract_template = @contract_template.dup
+    new_contract_template.name = I18n.t('contract_templates.duplicate.name_prefix', template_name: @contract_template.name)
+
+    # Duplicate rich text fields
+
+    new_contract_template.body = @contract_template.body
+    new_contract_template.guardian_clause = @contract_template.guardian_clause
+    new_contract_template.signature_legal_text = @contract_template.signature_legal_text
+
+    if new_contract_template.save
+      redirect_to [:edit, new_contract_template]
+    else
+      redirect_to [@contract_template.project, :contract_templates], alert: t('.error')
+    end
+  end
+
+  private
+
+  def contract_templates
+    policy_scope(ContractTemplate)
+  end
+
+  def set_contract_template
+    @contract_template = contract_templates.find(params[:contract_template_id])
+  end
+end

app/controllers/contract_templates/qr_codes_controller.rb

@@ -16,7 +16,12 @@ class ContractTemplates::QrCodesController < ApplicationController
   end
 
   def qr_code
-    authorize QrCode.build_from_contract_template(@contract_template)
+    if params[:multi_sign_ids].present?
+      contract_templates_group = authorize contract_templates.where(id: params[:multi_sign_ids]).order_by_recent
+      authorize QrCode.build_from_multiple_contract_templates(contract_templates_group, @contract_template.project)
+    else
+      authorize QrCode.build_from_contract_template(@contract_template)
+    end
   end
 
   def download_attributes

app/controllers/contract_templates_controller.rb

@@ -5,8 +5,9 @@ class ContractTemplatesController < ApplicationController
 
   layout 'project'
 
-  before_action :set_project, except: [:destroy]
-  before_action :set_contract_template, only: [:destroy]
+  before_action :set_project, except: [:destroy, :edit, :update]
+  before_action :set_contract_template, only: [:destroy, :edit, :update]
+  before_action :set_project_from_contract_template, only: [:edit, :update]
   before_action :show_splash_screen, only: :index
 
   def index
@@ -25,6 +26,7 @@ class ContractTemplatesController < ApplicationController
       contract = Contract.new releasable_instance, true
       send_file contract.to_pdf, download_attributes
     elsif @contract_template.save
+      log_create_analytics
       redirect_to [@project, :contract_templates], notice: t('.notice')
     else
       @release_type = contract_template_params[:release_type]
@@ -32,6 +34,20 @@ class ContractTemplatesController < ApplicationController
     end
   end
 
+  def edit
+    @release_type = @contract_template.release_type
+  end
+
+  def update
+    @contract_template.attributes = contract_template_params
+
+    if @contract_template.save
+      redirect_to [@project, :contract_templates], notice: t('.notice')
+    else
+      render :edit
+    end
+  end
+
   def destroy
     @contract_template.archive
     redirect_to [@contract_template.project, :contract_templates], alert: t('.archived_notice')
@@ -39,6 +55,10 @@ class ContractTemplatesController < ApplicationController
 
   private
 
+  def set_project_from_contract_template
+    @project = @contract_template.project
+  end
+
   def show_splash_screen
     render :splash if contract_templates.non_archived.count.zero?
   end
@@ -62,19 +82,22 @@ class ContractTemplatesController < ApplicationController
   def contract_template_params
     params
       .require(:contract_template)
-      .permit(:name, :release_type, :body, :guardian_clause, :fee,
+      .permit(:name, :release_type, :body, :guardian_clause,
+              :signature_legal_text, :fee, :amendment_clause,
               :applicable_medium_id, :applicable_medium_text,
               :territory_id, :territory_text,
-              :term_id, :term_text,
+              :term_id, :term_text, :accessibility,
               :restriction_id, :restriction_text,
-              :question_1_text, :question_2_text, 
-              :question_3_text, :question_4_text, 
-              :question_5_text, :question_6_text, 
-              :question_7_text, :question_8_text, 
+              :question_1_text, :question_2_text,
+              :question_3_text, :question_4_text,
+              :question_5_text, :question_6_text,
+              :question_7_text, :question_8_text,
               :question_9_text, :question_10_text,
-              :question_11_text, :question_12_text, 
-              :question_13_text, :question_14_text, 
-              :question_15_text)
+              :question_11_text, :question_12_text,
+              :question_13_text, :question_14_text,
+              :question_15_text, :questionnaire_legal_text,
+              :exhibit_a_legal_text, :exhibit_a_question_text,
+              :exhibit_b_legal_text, :exhibit_b_question_text)
   end
 
   def download_attributes
@@ -84,4 +107,8 @@ class ContractTemplatesController < ApplicationController
       type: 'application/pdf'
     }
   end
+
+  def log_create_analytics
+    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_contract_template, user_agent: request.user_agent, user_ip: request.remote_ip)
+  end
 end

app/controllers/files_controller.rb

@@ -1,4 +1,4 @@
-class FileInfosController < ApplicationController
+class FilesController < ApplicationController
   before_action :set_releasable
 
   layout "project"
@@ -16,7 +16,7 @@ class FileInfosController < ApplicationController
     
     if @releasable.update(releasable_params)
       SetTagsForReleasableJob.perform_later(@releasable)
-      redirect_to [@project, @releasable.model_name.plural], notice: t(".notice")
+      redirect_to [@project, @releasable.model_name.plural], notice: "Files added successfully to the release."
     else
       render :edit
     end
@@ -29,16 +29,10 @@ class FileInfosController < ApplicationController
   end
 
   def set_releasable
-    @releasable = authorize policy_scope(releasable_param.type).find(releasable_param.id), :"#{action_name}_file_infos?"
+    @releasable = authorize policy_scope(releasable_param.type).find(releasable_param.id), :edit_files?
   end
 
   def releasable_params
-    params.fetch(releasable_param.name, {}).permit(
-      file_infos_attributes: [
-        :filename,
-        :content_type,
-        :byte_size
-      ],
-    )
+    params.fetch(releasable_param.name, {}).permit(files: [])
   end
 end

app/controllers/location_releases_controller.rb

@@ -18,7 +18,6 @@ class LocationReleasesController < ApplicationController
     @location_release = build_location_release(location_release_params)
 
     if @location_release.save
-      log_create_analytics
       SetTagsForReleasableJob.perform_later(@location_release)
       redirect_to [@project, :location_releases], notice: t(".notice")
     else
@@ -90,8 +89,4 @@ class LocationReleasesController < ApplicationController
 
     results
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_non_native_release, release_type: LocationRelease.to_s, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/material_releases_controller.rb

@@ -18,7 +18,6 @@ class MaterialReleasesController < ApplicationController
     @material_release = build_material_release(material_release_params)
 
     if @material_release.save
-      log_create_analytics
       SetTagsForReleasableJob.perform_later(@material_release)
       redirect_to [@project, :material_releases], notice: t(".notice")
     else
@@ -50,11 +49,58 @@ class MaterialReleasesController < ApplicationController
 
   private
 
+  def person_params
+    %i[
+      person_first_name
+      person_last_name
+      person_phone
+      person_company
+      person_email
+      person_title
+      person_address_street1
+      person_address_street2
+      person_address_city
+      person_address_state
+      person_address_zip
+      person_address_country
+    ]
+  end
+
+  def guardian_params
+    %i[
+      guardian_first_name
+      guardian_last_name
+      guardian_phone
+      guardian_email
+      guardian_photo
+      guardian_address_street1
+      guardian_address_street2
+      guardian_address_city
+      guardian_address_state
+      guardian_address_zip
+      guardian_address_country
+    ]
+  end
+
+  def second_guardian_params
+    %i[
+      guardian_2_first_name
+      guardian_2_last_name
+      guardian_2_phone
+      guardian_2_email
+      guardian_2_photo
+      guardian_2_address_street1
+      guardian_2_address_street2
+      guardian_2_address_city
+      guardian_2_address_state
+      guardian_2_address_zip
+      guardian_2_address_country
+    ]
+  end
+
   def material_release_params
-    params.require(:material_release).permit(
+    params.require(:material_release).permit(person_params, guardian_params, second_guardian_params, :minor,
       :name, :address_street1, :address_street2, :address_city, :address_state, :address_zip, :address_country,
-      :person_first_name, :person_last_name, :person_title, :person_company, :person_phone, :person_email,
-      :person_address_street1, :person_address_street2, :person_address_city, :person_address_state, :person_address_zip, :person_address_country,
       :applicable_medium_id, :applicable_medium_text,
       :territory_id, :territory_text,
       :term_id, :term_text,
@@ -89,8 +135,4 @@ class MaterialReleasesController < ApplicationController
 
     results
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_non_native_release, release_type: MaterialRelease.to_s, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/music_releases_controller.rb

@@ -22,7 +22,6 @@ class MusicReleasesController < ApplicationController
     @music_release = build_music_release(music_release_params)
 
     if @music_release.save
-      log_create_analytics
       SetTagsForReleasableJob.perform_later(@music_release)
       redirect_to [@project, :music_releases], notice: t(".notice")
     else
@@ -111,8 +110,4 @@ class MusicReleasesController < ApplicationController
 
     results
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_non_native_release, release_type: MusicRelease.to_s, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/projects_controller.rb

@@ -6,7 +6,7 @@ class ProjectsController < ApplicationController
   before_action :set_project, only: [:show, :edit, :update, :destroy]
 
   def index
-    @projects = policy_scope(Current.account.projects).order_by_name
+    @projects = filtered_projects.order_by_name
   end
 
   def new
@@ -46,6 +46,20 @@ class ProjectsController < ApplicationController
 
   private
 
+  def filtered_projects
+    results = projects
+    
+    if params[:query].present?
+      results = results.search(params[:query])
+    end
+
+    results
+  end
+
+  def projects
+    authorize policy_scope(Current.account.projects)
+  end
+
   def set_project
     @project = authorize projects.find(params[:id])
   end

app/controllers/public/acquired_media_releases_controller.rb

@@ -10,7 +10,6 @@ class Public::AcquiredMediaReleasesController < Public::BaseController
     @acquired_media_release = build_acquired_media_release(acquired_media_release_params_with_locale_and_contract_template)
 
     if @acquired_media_release.save(context: :native)
-      log_create_analytics
       after_create(@acquired_media_release)
     else
       render :new
@@ -41,31 +40,67 @@ class Public::AcquiredMediaReleasesController < Public::BaseController
     end
   end
 
+  def person_params
+    %i[
+      person_first_name
+      person_last_name
+      person_phone
+      person_fax
+      person_email
+      person_title
+      person_address_street1
+      person_address_street2
+      person_address_city
+      person_address_state
+      person_address_zip
+      person_address_country
+    ]
+  end
+
+  def guardian_params
+    %i[
+      guardian_first_name
+      guardian_last_name
+      guardian_phone
+      guardian_email
+      guardian_photo
+      guardian_address_street1
+      guardian_address_street2
+      guardian_address_city
+      guardian_address_state
+      guardian_address_zip
+      guardian_address_country
+    ]
+  end
+
+  def second_guardian_params
+    %i[
+      guardian_2_first_name
+      guardian_2_last_name
+      guardian_2_phone
+      guardian_2_email
+      guardian_2_photo
+      guardian_2_address_street1
+      guardian_2_address_street2
+      guardian_2_address_city
+      guardian_2_address_state
+      guardian_2_address_zip
+      guardian_2_address_country
+    ]
+  end
+
   def acquired_media_release_params
-    params.require(:acquired_media_release).permit(
-      :name, 
-      :description,
-      :person_first_name,
-      :person_last_name,
-      :person_email,
-      :person_title,
-      :person_phone,
-      :person_fax,
-      :person_address_street1, 
-      :person_address_street2, 
-      :person_address_city, 
-      :person_address_state, 
-      :person_address_zip, 
-      :person_address_country,
-      :signature_base64,
-      :locale, :contract_template,
-      categories: [],
-      file_infos_attributes: [
-        :filename,
-        :content_type,
-        :byte_size
-      ]
-    )
+    params.require(:acquired_media_release).permit(person_params,
+                                                   guardian_params,
+                                                   second_guardian_params,
+                                                   :minor,
+                                                   :name,
+                                                   :description,
+                                                   :signature_base64,
+                                                   :locale, :contract_template,
+                                                   categories: [],
+                                                   files: []
+                                                  )
   end
 
   def acquired_media_release_params_with_locale
@@ -75,8 +110,4 @@ class Public::AcquiredMediaReleasesController < Public::BaseController
   def acquired_media_release_params_with_locale_and_contract_template
     acquired_media_release_params_with_locale.merge(contract_template: @contract_template)
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: AcquiredMediaRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/public/amendments_controller.rb

@@ -0,0 +1,47 @@
+class Public::AmendmentsController < Public::BaseController
+  skip_after_action :verify_authorized, :verify_policy_scoped
+  before_action :set_account, :set_project, :set_contract_template, :set_release
+
+  def new
+    if @release.amendment_signed?
+      render :create, locals: { already_signed: true }
+    end
+  end
+
+  def create
+    if @release.amendment_signed?
+      render :create, locals: { already_signed: true }
+      return
+    end
+
+    @release.attributes = amendment_params
+
+    render :new unless @release.save(context: :amendment)
+  end
+
+  private
+
+  def amendment_params
+    params.require(releasable_param.name).permit(:amendment_signer_name, :amendment_signature_base64)
+  end
+
+  def releasable_param
+    @releasable_param ||= ReleasableParam.new(params.to_unsafe_h)
+  end
+
+  def set_release
+    @release = @contract_template.releases.find(releasable_param.id)
+  end
+
+  def set_contract_template
+    @contract_template = @project.contract_templates.find(params[:contract_template_id])
+  end
+
+  def set_project
+    @project = @account.projects.find(params[:project_id])
+  end
+
+  def set_account
+    @account = Account.find_by(slug: params[:account_id])
+  end
+end

app/controllers/public/appearance_releases_controller.rb

@@ -10,7 +10,6 @@ class Public::AppearanceReleasesController < Public::BaseController
     @appearance_release = build_appearance_release(appearance_release_params_with_locale_and_contract_template)
 
     if @appearance_release.save(context: :native)
-      log_create_analytics
       after_create(@appearance_release)
     else
       render :new
@@ -87,12 +86,35 @@ class Public::AppearanceReleasesController < Public::BaseController
     ]
   end
 
+  def questionnaire_params
+    [
+      :question_1_answer,
+      :question_2_answer,
+      :question_3_answer,
+      :question_4_answer,
+      :question_5_answer,
+      :question_6_answer,
+      :question_7_answer,
+      :question_8_answer,
+      :question_9_answer,
+      :question_10_answer,
+      :question_11_answer,
+      :question_12_answer,
+      :question_13_answer,
+      :question_14_answer,
+      :question_15_answer,
+    ]
+  end
+
   def appearance_release_params
     params.require(:appearance_release).permit(person_params, guardian_params,
                                                second_guardian_params,
+                                               questionnaire_params,
                                                :minor, :signature_base64,
                                                :person_date_of_birth,
-                                               :locale, :contract_template)
+                                               :locale, :contract_template,
+                                               :exhibit_a_answer, :exhibit_b_answer
+                                              )
   end
 
   def appearance_release_params_with_locale
@@ -102,8 +124,4 @@ class Public::AppearanceReleasesController < Public::BaseController
   def appearance_release_params_with_locale_and_contract_template
     appearance_release_params_with_locale.merge(contract_template: @contract_template)
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: AppearanceRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/public/broadcasts_controller.rb

@@ -3,9 +3,9 @@ class Public::BroadcastsController < Public::BaseController
   before_action :set_broadcast, only: [:show, :update]
 
   def show
-    @conference_url = broadcast_zoom_meeting_url(@broadcast.token)
+    @conference_url = conference_url_for(@broadcast)
     @multi_view_broadcasts = multi_view_broadcasts
-    @recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
+    @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
     @files = @broadcast.files.order("created_at DESC").paginate(page: params[:files_page])
 
     render 'broadcasts/show'
@@ -43,6 +43,10 @@ class Public::BroadcastsController < Public::BaseController
     end
   end
 
+  def conference_url_for(broadcast)
+    broadcast.video_conference_url_override || broadcast_zoom_meeting_url(broadcast.token)
+  end
+
   class MultiViewBroadcast
     include Rails.application.routes.url_helpers
 

app/controllers/public/contract_templates_controller.rb

@@ -0,0 +1,18 @@
+class Public::ContractTemplatesController < Public::BaseController
+  skip_after_action :verify_authorized, :verify_policy_scoped
+  before_action :set_account, :set_project
+
+  def index
+    @contract_templates = @project.contract_templates.where(id: params[:contract_template_ids]).order_by_name.paginate(page: params[:page])
+  end
+
+  private
+
+  def set_project
+    @project = @account.projects.find(params[:project_id])
+  end
+
+  def set_account
+    @account = Account.find_by(slug: params[:account_id])
+  end
+end

app/controllers/public/location_releases_controller.rb

@@ -10,7 +10,6 @@ class Public::LocationReleasesController < Public::BaseController
     @location_release = build_location_release(location_release_params_with_locale_and_contract_template)
 
     if @location_release.save(context: :native)
-      log_create_analytics
       after_create(@location_release)
     else
       render :new
@@ -76,8 +75,4 @@ class Public::LocationReleasesController < Public::BaseController
   def location_release_params_with_locale_and_contract_template
     location_release_params_with_locale.merge(contract_template: @contract_template)
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: LocationRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/public/material_releases_controller.rb

@@ -10,7 +10,6 @@ class Public::MaterialReleasesController < Public::BaseController
     @material_release = build_material_release(material_release_params_with_locale_and_contract_template)
 
     if @material_release.save(context: :native)
-      log_create_analytics
       after_create(@material_release)
     else
       render :new
@@ -39,11 +38,59 @@ class Public::MaterialReleasesController < Public::BaseController
     authorize material_releases.build(params)
   end
 
+  def person_params
+    %i[
+      person_first_name
+      person_last_name
+      person_phone
+      person_email
+      person_title
+      person_company
+      person_address_street1
+      person_address_street2
+      person_address_city
+      person_address_state
+      person_address_zip
+      person_address_country
+    ]
+  end
+
+  def guardian_params
+    %i[
+      guardian_first_name
+      guardian_last_name
+      guardian_phone
+      guardian_email
+      guardian_photo
+      guardian_address_street1
+      guardian_address_street2
+      guardian_address_city
+      guardian_address_state
+      guardian_address_zip
+      guardian_address_country
+    ]
+  end
+
+  def second_guardian_params
+    %i[
+      guardian_2_first_name
+      guardian_2_last_name
+      guardian_2_phone
+      guardian_2_email
+      guardian_2_photo
+      guardian_2_address_street1
+      guardian_2_address_street2
+      guardian_2_address_city
+      guardian_2_address_state
+      guardian_2_address_zip
+      guardian_2_address_country
+    ]
+  end
+
+
   def material_release_params
-    params.require(:material_release).permit(
+    params.require(:material_release).permit(person_params, guardian_params, second_guardian_params, :minor,
       :name, :address_street1, :address_street2, :address_city, :address_state, :address_zip, :address_country,
-      :person_first_name, :person_last_name, :person_title, :person_company, :person_phone, :person_email,
-      :person_address_street1, :person_address_street2, :person_address_city, :person_address_state, :person_address_zip, :person_address_country,
       :signature_base64,
       :locale, :contract_template, :description, photos: []
     )
@@ -56,8 +103,4 @@ class Public::MaterialReleasesController < Public::BaseController
   def material_release_params_with_locale_and_contract_template
     material_release_params_with_locale.merge(contract_template: @contract_template)
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: MaterialRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/public/medical_releases_controller.rb

@@ -12,7 +12,6 @@ class Public::MedicalReleasesController < Public::BaseController
       if @medical_release.contract_template.present?
         AttachContractToReleasableJob.perform_later(@medical_release)
       end
-      log_create_analytics
     else
       render :new
     end
@@ -116,8 +115,4 @@ class Public::MedicalReleasesController < Public::BaseController
   def medical_release_params_with_locale_and_contract_template
     medical_release_params_with_locale.merge(contract_template: @contract_template)
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: MedicalRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/public/misc_releases_controller.rb

@@ -12,7 +12,6 @@ class Public::MiscReleasesController < Public::BaseController
       if @misc_release.contract_template.present?
         AttachContractToReleasableJob.perform_later(@misc_release)
       end
-      log_create_analytics
     else
       render :new
     end
@@ -50,6 +49,14 @@ class Public::MiscReleasesController < Public::BaseController
         :signature_base64,
         :locale,
         :contract_template,
+        :applicable_medium_id,
+        :applicable_medium_text,
+        :territory_id,
+        :territory_text,
+        :term_id,
+        :term_text,
+        :restriction_id,
+        :restriction_text,
         photos: [],
       )
   end
@@ -113,8 +120,4 @@ class Public::MiscReleasesController < Public::BaseController
   def misc_release_params_with_locale_and_contract_template
     misc_release_params_with_locale.merge(contract_template: @contract_template)
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: MiscRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/public/talent_releases_controller.rb

@@ -10,7 +10,6 @@ class Public::TalentReleasesController < Public::BaseController
     @talent_release = build_talent_release(talent_release_params_with_locale_and_contract_template)
 
     if @talent_release.save(context: :native)
-      log_create_analytics
       after_create(@talent_release)
     else
       render :new
@@ -108,8 +107,4 @@ class Public::TalentReleasesController < Public::BaseController
   def talent_release_params_with_locale_and_contract_template
     talent_release_params_with_locale.merge(contract_template: @contract_template)
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(nil, nil, :track_create_native_release, release_type: TalentRelease.to_s, account: @account, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/controllers/stream_notifications_controller.rb

@@ -14,6 +14,10 @@ class StreamNotificationsController < ApplicationController
     when "video.live_stream.recording"
       @broadcast.streamer_recording!
       notify_users
+    when "video.asset.ready"
+      full_live_stream_playback_uid = notification.dig(:data, :playback_ids, 0, :id)
+      @broadcast.update(full_live_stream_playback_uid: full_live_stream_playback_uid)
+      notify_users
     when "video.live_stream.active"
       @broadcast.active!
       notify_users
@@ -28,9 +32,10 @@ class StreamNotificationsController < ApplicationController
       asset_uid = notification.dig(:object, :id)
       playback_uid = notification.dig(:data, :playback_ids, 0, :id)
       file_name = notification.dig(:data, :static_renditions, :files, -1, :name)
+      duration = notification.dig(:data, :duration)
 
-      recording = @broadcast.broadcast_recordings.create!(asset_uid: asset_uid, asset_playback_uid: playback_uid, file_name: file_name)
-      recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
+      recording = @broadcast.broadcast_recordings.create!(asset_uid: asset_uid, asset_playback_uid: playback_uid, file_name: file_name, duration: duration)
+      recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page])
 
       link = helpers.link_to(recording.broadcast_name.titleize, recording.download_url, target: "_blank")
       message = "Your recent live stream has been recorded and is available for download here: #{link}"
@@ -58,7 +63,8 @@ class StreamNotificationsController < ApplicationController
   end
 
   def set_broadcast
-    if notification_type == "video.asset.static_renditions.ready"
+    case notification_type
+    when "video.asset.static_renditions.ready", "video.asset.ready"
       live_stream_id = notification.dig(:stream_notification, :data, :live_stream_id)
       @broadcast = Broadcast.find_by(stream_uid: live_stream_id)
     else

app/controllers/talent_releases_controller.rb

@@ -18,7 +18,6 @@ class TalentReleasesController < ApplicationController
     @talent_release = build_talent_release(talent_release_params)
 
     if @talent_release.save
-      log_create_analytics
       AddHeadshotCollectionUidToProjectJob.perform_later(@project)
       SetTagsForReleasableJob.perform_later(@talent_release)
       redirect_to [@project, :talent_releases], notice: t(".notice")
@@ -137,8 +136,4 @@ class TalentReleasesController < ApplicationController
 
     results
   end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_non_native_release, release_type: TalentRelease.to_s, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
 end

app/helpers/mail_helper.rb

@@ -6,6 +6,6 @@ module MailHelper
       "1. Tell us the name of the video: \n\n" \
       "2. Attach each EDL to this email. Please make sure to indicate whether the EDL is a Video Only, Graphics Only, or Audio Only EDL."
 
-    mail_to "info@bigmedia.ai", content, subject: subject, body: body
+    mail_to "info@mesuite.ai", content, subject: subject, body: body
   end
 end

app/helpers/tooltip_helper.rb

@@ -5,4 +5,12 @@ module TooltipHelper
       concat tag.div(class: "tooltip-inner")
     end
   end
+
+  def get_approval_data_for_releasable(release)
+    if release.approved_by_user_name.present?
+      "#{release.approved_by_user_name} [#{release.approved_by_user_email}]"
+    else
+      release.approved_by_user_email
+    end
+  end
 end

app/javascript/packs/active_storage_dropzone.js

@@ -67,6 +67,23 @@ class ActiveStorageDropzone {
           var upload = new that.UploaderClass(file, url, delegate);
           createUpload(this, upload);
         });
+
+        this.on("addedfile", function(file) {
+          // Show download link in dropzone previews
+
+          let div = document.createElement("div");
+          let anchor = document.createElement("a");
+          let download_icon = "<i class='fa fa-download' aria-hidden='true'></i> Download";
+
+          anchor.innerHTML = download_icon;
+          anchor.href = file.dataURL;
+          anchor.setAttribute('target', '_blank');
+          anchor.setAttribute('style', 'background-color: rgba(255, 255, 255, 0.4); padding: 0 0.4em; border: 1px solid transparent; text-decoration: none;');
+          div.append(anchor);
+          div.setAttribute('class', 'dz-download-link')
+          div.setAttribute('style', 'margin-top: 1em;')
+          $(file.previewElement.childNodes[3]).append(div);
+        });
       },
     });
 

app/jobs/generate_contracts_zip_job.rb

@@ -6,8 +6,8 @@ class GenerateContractsZipJob < ApplicationJob
   before_perform do |job|
     @project = job.arguments.first
     @download = job.arguments.second
-    release_type = job.arguments.third
-    @folder_name = "#{@project.name.parameterize}_#{get_release_name(release_type).gsub('_', '-')}"
+    @release_type = job.arguments.third
+    @folder_name = "#{@project.name.parameterize}_#{get_release_name(@release_type).gsub('_', '-')}"
     @download.update!(name: @folder_name, status: :pending)
   end
 
@@ -20,9 +20,14 @@ class GenerateContractsZipJob < ApplicationJob
         files.each do |attachment|
           zipfile.add(attachment, File.join("#{dir}/", attachment))
         end
+
+        if @release_type.constantize.include?(CsvExportable)
+          csv_file = generate_csv releases
+          zipfile.get_output_stream("#{@folder_name}.csv") { |f| f.puts(csv_file) }
+        end
       end
 
-      @download.file.attach(io: File.open(zipfile_name), filename: @folder_name)
+      @download.file.attach(io: File.open(zipfile_name), filename: "#{@folder_name}.zip")
     end
   rescue StandardError => e
     Rails.logger.error("Failed to generate download for project (##{project.id}) with release type #{release_type}\n" + e.message)
@@ -43,6 +48,19 @@ class GenerateContractsZipJob < ApplicationJob
 
   private
 
+  def generate_csv(releases)
+    release_class = @release_type.constantize
+    headers = release_class.csv_headers
+
+    CSV.generate(headers: true) do |csv|
+      csv << headers
+      releases.each do |release|
+        csv_row_data = release.to_csv_row
+        csv << csv_row_data
+      end
+    end
+  end
+
   def get_release_name(release_type)
     release_type.constantize.model_name.plural
   end

app/mailers/admin_mailer.rb

@@ -1,5 +1,5 @@
 class AdminMailer < ApplicationMailer
-  default to: %w(bray@bigmedia.ai lee@bigmedia.ai)
+  default to: %w[bray@mesuite.ai]
 
   def new_video(video)
     @video = video

app/mailers/application_mailer.rb

@@ -1,4 +1,4 @@
 class ApplicationMailer < ActionMailer::Base
-  default from: ENV.fetch("MAILER_FROM_ADDRESS") { "support@bigmedia.ai" }
+  default from: ENV.fetch("MAILER_FROM_ADDRESS") { "support@mesuite.ai" }
   layout "mailer"
 end

app/models/account.rb

@@ -5,6 +5,7 @@ class Account < ApplicationRecord
   has_many :users, through: :account_auths
   has_many :projects, dependent: :destroy
   has_many :videos, through: :projects
+  has_many :broadcasts, through: :projects
   has_many :contract_templates, through: :projects
 
   validates :name, presence: true
@@ -63,6 +64,19 @@ class Account < ApplicationRecord
       ])).sum(:byte_size).to_f
   end
 
+  def total_number_of_releases
+    [
+      MiscRelease.where(project: projects).size,
+      AppearanceRelease.where(project: projects).size,
+      TalentRelease.where(project: projects).size,
+      MaterialRelease.where(project: projects).size,
+      MedicalRelease.where(project: projects).size, 
+      LocationRelease.where(project: projects).size,
+      AcquiredMediaRelease.where(project: projects).size,
+      MusicRelease.where(project: projects).size
+    ].sum
+  end
+
   def to_param
     slug
   end
@@ -84,7 +98,7 @@ class Account < ApplicationRecord
   end
 
   def taskme_enabled?
-    ENV["TASKME_ENABLED"] && (plan_uid.to_s == "me_suite" || plan_uid.to_s == "taskme")
+    plan_uid.to_s == "me_suite" || plan_uid.to_s == "taskme"
   end
 
   def plan_name

app/models/acquired_media_release.rb

@@ -9,10 +9,23 @@ class AcquiredMediaRelease < ApplicationRecord
   include Signable
   include Syncable
   include PersonName
+  include CsvExportable
+  include Approvable
+  include GuardianPhotoable
+  include SecondGuardianPhotoable
+  include GuardianName
+  include SecondGuardianName
 
+  class << self
+    def custom_csv_exportable_headers
+      %i[name files_count owner_info]
+    end
+  end
+
+  # This association needs to be removed after changing the API. Removing it right now will cause failure in API specs.
   has_many :file_infos, as: :releasable, dependent: :destroy
 
-  accepts_nested_attributes_for :file_infos
+  has_many_attached :files
 
   composed_of :person_address,
               class_name: "Address",
@@ -25,6 +38,38 @@ class AcquiredMediaRelease < ApplicationRecord
                 %w(person_address_country country) 
               ]
 
+  composed_of :guardian_address,
+              class_name: 'Address',
+              mapping: [
+                  %w[guardian_address_street1 street1],
+                  %w[guardian_address_street2 street2],
+                  %w[guardian_address_city city],
+                  %w[guardian_address_state state],
+                  %w[guardian_address_zip zip],
+                  %w[guardian_address_country country]
+              ]
+
+  composed_of :guardian_2_address,
+              class_name: 'Address',
+              mapping: [
+                  %w[guardian_2_address_street1 street1],
+                  %w[guardian_2_address_street2 street2],
+                  %w[guardian_2_address_city city],
+                  %w[guardian_2_address_state state],
+                  %w[guardian_2_address_zip zip],
+                  %w[guardian_2_address_country country]
+              ]
+
+  # We don't care for the argument but method WILL receive option name
+  # when called from inside with_option block, hence * argument
+  def self.face_photo_acceptable_content_types(*)
+    ['image/png', 'image/jpeg']
+  end
+
+  def self.acceptable_import_file_extensions
+    ['.png', '.jpeg', '.jpg', '.pdf']
+  end
+
   validates :name, presence: true
   validates :person_email, email: true, allow_blank: true
 
@@ -46,8 +91,8 @@ class AcquiredMediaRelease < ApplicationRecord
   # CATEGORIES = ["Artwork", "Film Footage", "Video Footage", "Still Photograph"].freeze
   CATEGORIES = ["Film Footage", "Video Footage", "Still Photograph"].freeze
 
-  def minor?
-    false
+  def second_guardian_present?
+    guardian_2_first_name.present?
   end
 
   def contact_person
@@ -57,4 +102,20 @@ class AcquiredMediaRelease < ApplicationRecord
   def uses_edl?
     true
   end
+
+  def files_count
+    files.any? ? files.size : I18n.t('acquired_media_releases.acquired_media_release.no_media')
+  end
+
+  def image_files
+    files_blobs.where("content_type ILIKE ?", "%image%")
+  end
+
+  def video_files
+    files_blobs.where("content_type ILIKE ?", "%video%")
+  end
+
+  def other_files
+    files_blobs.where("NOT content_type ILIKE ANY (array[?])", ["%image%", "%video%"])
+  end
 end

app/models/app_host.rb

@@ -40,7 +40,7 @@ class AppHost
       use_ssl: false,
     },
     production: {
-      host: "bigmedia.ai",
+      host: "mesuite.ai",
       use_ssl: true,
     }
   }

app/models/appearance_release.rb

@@ -15,6 +15,17 @@ class AppearanceRelease < ApplicationRecord
   include SecondGuardianPhotoable
   include GuardianName
   include SecondGuardianName
+  include CsvExportable
+  include Approvable
+  include Amendmenable
+
+  NUMBER_OF_CUSTOM_FIELDS = 15
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[name contact_info]
+    end
+  end
 
   has_one_attached :person_photo
 

app/models/broadcast.rb

@@ -30,8 +30,16 @@ class Broadcast < ApplicationRecord
     "https://stream.mux.com/#{stream_playback_uid}.m3u8"
   end
 
+  def full_live_stream_playback_url
+    full_live_stream_playback_uid.blank? ? stream_playback_url : "https://stream.mux.com/#{full_live_stream_playback_uid}.m3u8"
+  end
+
   def stream_server_url
-    ENV['MUX_BROADCAST_SERVER_URL']
+    stream_url_override.presence || ENV["MUX_BROADCAST_SERVER_URL"]
+  end
+
+  def stream_server_key
+    stream_key_override.presence || stream_key
   end
 
   def zoom_meeting_url
@@ -41,11 +49,13 @@ class Broadcast < ApplicationRecord
   private
 
   def create_mux_live_stream
-    stream = MuxLiveStream.new
+    stream = MuxLiveStream.create_with_simulcast
 
     self.stream_uid = stream.id
     self.stream_key = stream.key
     self.stream_playback_uid = stream.playback_id
+    self.simulcast_uid = stream.simulcast_id
+    self.director_mode_video_embed ||= stream.simulcast_destination.try(:playback_embed)
     self.save!
   end
 

app/models/broadcast_recording.rb

@@ -5,6 +5,8 @@ class BroadcastRecording < ApplicationRecord
 
   validates :asset_uid, uniqueness: true
 
+  scope :visible, -> { where(hidden: false) }
+
   def download_url
     "https://stream.mux.com/#{asset_playback_uid}/#{file_name}?download=#{download_file_name}"
   end
@@ -14,6 +16,6 @@ class BroadcastRecording < ApplicationRecord
   end
 
   def download_file_name
-    "#{broadcast_name}_Date_#{created_at.strftime("%Y-%m-%d")}_Time_#{created_at.strftime("%T")}".parameterize
+    "#{broadcast_name}_Date_#{created_at.in_time_zone(broadcast.shoot_location_time_zone).strftime("%Y-%m-%d")}_Time_#{created_at.in_time_zone(broadcast.shoot_location_time_zone).strftime("%T")}".parameterize
   end
 end

app/models/concerns/amendmenable.rb

@@ -0,0 +1,32 @@
+module Amendmenable
+  extend ActiveSupport::Concern
+
+  included do
+    include ActiveStorageSupport::SupportForBase64
+
+    has_one_base64_attached :amendment_signature
+
+    with_options on: :amendment do
+      validates :amendment_signer_name, presence: true
+      validates :amendment_signature, attached: true
+    end
+  end
+
+  def amendment_signable?
+    contract_template.present? && contract_template.amendment_clause.present?
+  end
+
+  def amendment_signed?
+    amendment_signature.attached?
+  end
+
+  def amendment_signature_base64
+    nil
+  end
+
+  def amendment_signature_base64=(data_uri)
+    return if data_uri.blank?
+
+    amendment_signature.attach(data: data_uri, filename: "amendment_signature.png", content_type: "image/png", identify: "false")
+  end
+end

app/models/concerns/approvable.rb

@@ -0,0 +1,26 @@
+module Approvable
+  extend ActiveSupport::Concern
+
+  included do
+    include ActiveStorageSupport::SupportForBase64
+
+    has_one_base64_attached :approved_by_user_signature
+
+    # Requires signature when saving in the approval context
+    with_options on: :approval do
+      validates :approved_by_user_signature, attached: true
+    end
+
+    def approve_by(user)
+      return unless approved_at.nil?
+
+      self.approved_by_user_name = user.full_name
+      self.approved_by_user_email = user.email
+      self.approved_at = BigMediaTime.time_zone_now
+    end
+
+    def approved?
+      self.approved_at.present?
+    end
+  end
+end

app/models/concerns/csv_exportable.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module CsvExportable
+  extend ActiveSupport::Concern
+
+  COMMON_HEADERS = %i[approved notes tags signed_at].freeze
+  COMMON_VALUES = %w[approved? clean_notes clean_tags signed_on].freeze
+
+  included do
+    class << self
+      def custom_csv_exportable_headers
+        []
+      end
+
+      def csv_headers
+        headers = custom_csv_exportable_headers + COMMON_HEADERS
+
+        headers.map do |header|
+          I18n.t("#{model_name.plural}.index.table_headers.#{header}")
+        end
+      end
+    end
+
+    def to_csv_row
+      (self.class.custom_csv_exportable_headers + COMMON_VALUES).map do |function|
+        send(function)
+      end
+    end
+
+    private
+
+    def owner_info
+      compact_contact_info(name: person_name, address: person_address, phone: person_phone, email: person_email)
+    end
+
+    def contact_info
+      owner_info
+    end
+
+    def compact_contact_info(name: nil, address: nil, phone: nil, email: nil)
+      contact_info = ''
+      contact_info += "#{name}; " if name.present?
+      contact_info += "#{address}; " if address.present?
+      contact_info += "P: #{phone}; " if phone.present?
+      contact_info += "E: #{email}" if email.present?
+      contact_info.delete_suffix '; '
+    end
+
+    def clean_notes
+      notes = ''
+      self.notes.order_by_recent.each do |note|
+        notes += "#{note.content}(#{note.email}), "
+      end
+      notes.delete_suffix ', '
+    end
+
+    def clean_tags
+      tags = ''
+      self.tags.each do |tag|
+        tags += "#{tag.name}, "
+      end
+      tags.delete_suffix ', '
+    end
+  end
+end

app/models/contract_template.rb

@@ -21,6 +21,11 @@ class ContractTemplate < ApplicationRecord
   monetize :fee_cents
   has_rich_text :body
   has_rich_text :guardian_clause
+  has_rich_text :signature_legal_text
+  has_rich_text :amendment_clause
+  has_rich_text :exhibit_a_legal_text
+  has_rich_text :exhibit_b_legal_text
+  has_rich_text :questionnaire_legal_text
 
   validates :name, presence: true
   validates :release_type, presence: true
@@ -42,6 +47,8 @@ class ContractTemplate < ApplicationRecord
   scope :non_archived, -> { where(archived_at: nil) }
   scope :order_by_name, -> { order(:name) }
 
+  enum accessibility: [:public_template, :private_template]
+
   def fee?
     !fee.zero?
   end
@@ -65,4 +72,22 @@ class ContractTemplate < ApplicationRecord
   def has_questionnaire?
     (1..NUMBER_OF_CUSTOM_FIELDS).any? { |n| public_send("question_#{n}_text").presence }
   end
+
+  def has_exhibit_a?
+    exhibit_a_legal_text.present?
+  end
+
+  def has_exhibit_b?
+    exhibit_b_legal_text.present?
+  end
+
+  def editable?
+    releases.size.zero?
+  end
+
+  def attributes
+    result = super()
+    result[:signature_legal_text] = signature_legal_text.as_json
+    result
+  end
 end

app/models/location_release.rb

@@ -10,6 +10,15 @@ class LocationRelease < ApplicationRecord
   include Syncable
   include Taggable
   include PersonName
+  include CsvExportable
+  include Approvable
+  include Amendmenable
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[location_info owner_info amendment_signed_column]
+    end
+  end
 
   composed_of :address,
               mapping: [
@@ -58,6 +67,18 @@ class LocationRelease < ApplicationRecord
     true
   end
 
+  def location_info
+    compact_contact_info(name: name, address: address)
+  end
+
+  def amendment_signed_column
+    if amendment_signable?
+      amendment_signed?
+    else
+      I18n.t('location_releases.csv.no_amendment_clause')
+    end
+  end
+
   private
 
   def end_date_after_start_date

app/models/material_release.rb

@@ -10,8 +10,21 @@ class MaterialRelease < ApplicationRecord
   include Syncable
   include Taggable
   include PersonName
-  
-  composed_of :person_address, 
+  include CsvExportable
+  include Approvable
+  include GuardianPhotoable
+  include SecondGuardianPhotoable
+  include GuardianName
+  include SecondGuardianName
+
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[name owner_info]
+    end
+  end
+
+  composed_of :person_address,
               class_name: "Address",
               mapping: [
                 %w(person_address_street1 street1),
@@ -22,6 +35,39 @@ class MaterialRelease < ApplicationRecord
                 %w(person_address_country country)
               ]
 
+  composed_of :guardian_address,
+              class_name: 'Address',
+              mapping: [
+                  %w[guardian_address_street1 street1],
+                  %w[guardian_address_street2 street2],
+                  %w[guardian_address_city city],
+                  %w[guardian_address_state state],
+                  %w[guardian_address_zip zip],
+                  %w[guardian_address_country country]
+              ]
+
+  composed_of :guardian_2_address,
+              class_name: 'Address',
+              mapping: [
+                  %w[guardian_2_address_street1 street1],
+                  %w[guardian_2_address_street2 street2],
+                  %w[guardian_2_address_city city],
+                  %w[guardian_2_address_state state],
+                  %w[guardian_2_address_zip zip],
+                  %w[guardian_2_address_country country]
+              ]
+
+  # We don't care for the argument but method WILL receive option name
+  # when called from inside with_option block, hence * argument
+  def self.face_photo_acceptable_content_types(*)
+    ['image/png', 'image/jpeg']
+  end
+
+  def self.acceptable_import_file_extensions
+    ['.png', '.jpeg', '.jpg', '.pdf']
+  end
+
+
   validates :name, presence: true
   validates :person_email, email: true, allow_blank: true
 
@@ -30,17 +76,17 @@ class MaterialRelease < ApplicationRecord
     validates :signature, attached: true
   end
 
-  searchable_on %i[ 
-    name 
+  searchable_on %i[
+    name
     person_address_street1 person_address_street2 person_address_city person_address_state person_address_zip person_address_country
   ]
 
   def contact_person
     @contact_person ||= Contact.new(person_name, person_address, person_email, person_phone)
   end
-  
-  def minor?
-    false
+
+  def second_guardian_present?
+    guardian_2_first_name.present?
   end
 
   def uses_edl?

app/models/medical_release.rb

@@ -11,6 +11,14 @@ class MedicalRelease < ApplicationRecord
   include SecondGuardianPhotoable
   include GuardianName
   include SecondGuardianName
+  include CsvExportable
+  include Approvable
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[name contact_info]
+    end
+  end
 
   NUMBER_OF_CUSTOM_FIELDS = 15
 

app/models/millicast_destination.rb

@@ -0,0 +1,41 @@
+class MillicastDestination
+  attr_reader :name, :token
+  
+  def self.create
+    token_stream_name = SecureRandom.urlsafe_base64
+
+    publish_token = Millicast::PublishToken.create(
+      label: SecureRandom.urlsafe_base64, 
+      streams: [
+        { streamName: token_stream_name }
+      ]
+    )
+
+    new(token_stream_name, publish_token.data.token)
+  end
+
+  def initialize(name, token)
+    @name = name
+    @token = token
+  end
+
+  def account_id
+    ENV["MILLICAST_ACCOUNT_ID"]
+  end
+
+  def key
+    "#{name}?token=#{token}"
+  end
+
+  def url
+    "rtmp://live-rtmp-pub.millicast.com:1935/v2/pub"
+  end
+
+  def playback_url
+    "https://viewer.millicast.com/v2?streamId=#{account_id}/#{name}"
+  end
+
+  def playback_embed
+    "<iframe src=\"#{playback_url}\" allowfullscreen width=\"640\" height=\"480\"></iframe>"
+  end
+end

app/models/misc_release.rb

@@ -9,6 +9,15 @@ class MiscRelease < ApplicationRecord
   include PersonName
   include GuardianName
   include GuardianPhotoable
+  include CsvExportable
+  include Approvable
+  include Exploitable
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[name contact_info]
+    end
+  end
 
   NUMBER_OF_CUSTOM_FIELDS = 15
 

app/models/music_release.rb

@@ -7,7 +7,15 @@ class MusicRelease < ApplicationRecord
   include Searchable
   include Taggable
   include PersonName
-  
+  include CsvExportable
+  include Approvable
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[name file_infos_count composers_count publishers_count]
+    end
+  end
+
   has_many :file_infos, as: :releasable, dependent: :destroy
   has_many :composers, dependent: :destroy
   has_many :publishers, dependent: :destroy
@@ -72,6 +80,18 @@ class MusicRelease < ApplicationRecord
     false
   end
 
+  def file_infos_count
+    file_infos.size
+  end
+
+  def composers_count
+    composers.size
+  end
+
+  def publishers_count
+    publishers.size
+  end
+
   private
 
   def publisher_percentages_add_up_to_100

app/models/mux_live_stream.rb

@@ -1,4 +1,15 @@
 class MuxLiveStream
+  attr_accessor :simulcast_id, :simulcast_destination
+
+  def self.create_with_simulcast(destination = nil)
+    destination ||= MillicastDestination.create
+
+    MuxLiveStream.new.tap do |stream|
+      stream.id # force the live stream to be created by calling for its id
+      stream.create_simulcast(destination)
+    end
+  end
+
   def id
     live_stream.data.id
   end
@@ -15,6 +26,15 @@ class MuxLiveStream
     client.delete_live_stream(stream_uid)
   end
 
+  def create_simulcast(destination)
+    return if test_mode_enabled?
+
+    request = MuxRuby::CreateSimulcastTargetRequest.new(stream_key: destination.key, url: destination.url)
+    result = client.create_live_stream_simulcast_target(id, request)
+    self.simulcast_destination = destination
+    self.simulcast_id = result.data.id
+  end
+
   private
 
   def live_stream

app/models/project.rb

@@ -2,6 +2,7 @@ class Project < ApplicationRecord
   include Archivable
   include Filterable
   include Syncable
+  include PgSearch
 
   SIGNABLE_RELEASE_TYPES = %w(talent appearance acquired_media location material medical misc)
   AVAILABLE_RELEASE_TYPES = %w(appearance location material acquired_media talent music medical misc)
@@ -42,6 +43,15 @@ class Project < ApplicationRecord
     }
   end
 
+  pg_search_scope :search, {
+    against: [:name],
+    using: {
+      tsearch: {any_word: true, prefix: true},
+      trigram: {},
+      dmetaphone: {any_word: true}
+    }
+  }
+
   validates :name, presence: true, uniqueness: { scope: :account_id }
 
   filterable_by :active, :inactive, :archived

app/models/qr_code.rb

@@ -10,7 +10,19 @@ class QrCode
     url       = Rails.application.routes.url_helpers.url_for(route)
     filename  = [contract_template.project.name, contract_template.name].map(&:parameterize).join("_")
 
-    new(url, filename)
+    new(url, "#{filename}.png")
+  end
+
+  def self.build_from_multiple_contract_templates(contract_templates, project)
+    account   = project.account
+    locale    = I18n.locale
+    host      = AppHost.new.domain_with_port
+    route     = [account, project, :contract_templates, contract_template_ids: contract_templates.ids, locale: I18n.locale, host: AppHost.new.domain_with_port]
+
+    url       = Rails.application.routes.url_helpers.url_for(route)
+    filename  = [project.account.name, project.name].map(&:parameterize).join("_")
+
+    new(url, "#{filename}.png")
   end
 
   def initialize(url, filename = "qrcode.png")

app/models/talent_release.rb

@@ -14,6 +14,14 @@ class TalentRelease < ApplicationRecord
   include SecondGuardianPhotoable
   include GuardianName
   include SecondGuardianName
+  include CsvExportable
+  include Approvable
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[name phone email]
+    end
+  end
 
   composed_of :person_address, 
               class_name: "Address",
@@ -86,6 +94,14 @@ class TalentRelease < ApplicationRecord
     person_name
   end
 
+  def phone
+    person_phone
+  end
+
+  def email
+    person_email
+  end
+
   def filename_suffix
     "#{person_last_name} #{person_first_name}"
   end
@@ -95,7 +111,7 @@ class TalentRelease < ApplicationRecord
   end
 
   def uses_edl?
-    false
+    true
   end
 
   def second_guardian_present?

app/models/task_request.rb

@@ -6,5 +6,5 @@ class TaskRequest < ApplicationRecord
 
   scope :order_by_recent, -> { order(created_at: :desc) }
 
-  validates :time_allowed, numericality: { only_integer: true, greater_than_or_equal_to: 2 }
+  validates :time_allowed, numericality: { only_integer: true, greater_than_or_equal_to: 2 }, allow_blank: true
 end

app/policies/acquired_media_release_policy.rb

@@ -19,15 +19,19 @@ class AcquiredMediaReleasePolicy < ApplicationPolicy
     true
   end
 
-  def edit_file_infos?
-    true
-  end
-
-  def update_file_infos?
+  def edit_files?
     true
   end
 
   def download_multiple?
     true
   end
+
+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
 end

app/policies/appearance_release_policy.rb

@@ -26,4 +26,16 @@ class AppearanceReleasePolicy < ReleasePolicy
   def download_multiple?
     true
   end
+
+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
+
+  def sign_amendment?
+    user.manager? || user.account_manager?
+  end
 end

app/policies/broadcast_policy.rb

@@ -18,4 +18,12 @@ class BroadcastPolicy < ApplicationPolicy
   def update?
     true
   end
+
+  def destroy_file?
+    if user.nil? || user.user.nil?
+      return false
+    end
+
+    user.manager? || user.account_manager?
+  end
 end

app/policies/broadcast_recording_policy.rb

@@ -0,0 +1,9 @@
+class BroadcastRecordingPolicy < ApplicationPolicy
+  def destroy?
+    if user.nil? || user.user.nil?
+      return false
+    end
+    
+    user.manager? || user.account_manager?
+  end
+end

app/policies/contract_template_policy.rb

@@ -3,8 +3,10 @@ class ContractTemplatePolicy < ApplicationPolicy
     def resolve
       if user.account_manager?
         scope.left_outer_joins(:project).where(projects: {account: user.account})
-      else
+      elsif user.manager?
         scope.left_outer_joins(project: :project_memberships).where(project_memberships: { user_id: user.id })
+      else
+        scope.public_template.left_outer_joins(project: :project_memberships).where(project_memberships: { user_id: user.id })
       end
     end
   end
@@ -21,6 +23,18 @@ class ContractTemplatePolicy < ApplicationPolicy
     create?
   end
 
+  def edit?
+    record.editable? && create?
+  end
+
+  def update?
+    edit?
+  end
+
+  def duplicate?
+    create?
+  end
+
   def import?
     if user.account_manager?
       record.project.account = user.account

app/policies/location_release_policy.rb

@@ -34,4 +34,16 @@ class LocationReleasePolicy < ReleasePolicy
   def download_multiple?
     true
   end
+
+  def review?
+    user.account_manager?
+  end
+
+  def sign_amendment?
+    user.manager? || user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
 end

app/policies/material_release_policy.rb

@@ -34,4 +34,12 @@ class MaterialReleasePolicy < ReleasePolicy
   def download_multiple?
     true
   end
+
+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
 end

app/policies/medical_release_policy.rb

@@ -15,6 +15,14 @@ class MedicalReleasePolicy < ReleasePolicy
     user.manager? || user.account_manager?
   end
 
+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
+
   def edit_photos?
     true
   end

app/policies/misc_release_policy.rb

@@ -38,4 +38,12 @@ class MiscReleasePolicy < ReleasePolicy
   def download_multiple?
     download_single?
   end
+
+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
 end

app/policies/music_release_policy.rb

@@ -22,4 +22,12 @@ class MusicReleasePolicy < ReleasePolicy
   def download_multiple?
     true
   end
+
+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
 end

app/policies/talent_release_policy.rb

@@ -34,4 +34,12 @@ class TalentReleasePolicy < ReleasePolicy
   def download_multiple?
     true
   end
+
+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
 end

app/serializers/serializable_acquired_media_release.rb

@@ -16,5 +16,5 @@ class SerializableAcquiredMediaRelease < JSONAPI::Serializable::Resource
     meta do
       { count: @object.file_infos.size }
     end
-  end            
+  end
 end

app/telemetry/analytics.rb

@@ -169,6 +169,24 @@ class Analytics
       )
     end
   end
+
+  def track_create_contract_template(user_agent:, user_ip:)
+    if analytics_enabled?
+      identify
+      track(
+        {
+          user_id: user.id,
+          event: "Contract Template Created",
+          properties: {
+            account: account.try(:name),
+            account_id: account.try(:id),
+            user_agent: user_agent,
+            ip: user_ip,
+          },
+        }
+      )
+    end
+  end
   
   private
 

app/views/account_auths/_account_logo_form.html.erb

@@ -1,4 +1,4 @@
 <%= bootstrap_form_with model: account, url: account_path, html: { autocorrect: :off, autocapitalize: :none, autocomplete: :off, spellcheck: false }, layout: :inline, remote: true do |form| %>
-  <%= form.file_field :logo, hide_label: true, accept: "image/*", placeholder: "Upload Logo", direct_upload: true, wrapper_class: "mr-1" %>
+  <%= form.file_field :logo, hide_label: true, accept: "image/*", placeholder: "Upload Logo", direct_upload: true, wrapper_class: "mr-1", required: true %>
   <%= form.button(fa_icon("upload", text: t(".submit")), class: "btn btn-md btn-primary", data: { disable_with: t("shared.disable_with") }) %>
 <% end %>

app/views/acquired_media_releases/_acquired_media_release.html.erb

@@ -1,15 +1,26 @@
 <tr id="<%= dom_id(acquired_media_release) %>">
   <td data-behavior="select"><%= check_box_tag "acquired_media_release_ids[]", acquired_media_release.id, false %></td>
+  <td class="text-center">
+    <% if acquired_media_release.approved? %>
+      <% tooltip_user_data = get_approval_data_for_releasable(acquired_media_release) %>
+      <i class="fa fa-check-circle fa-2x text-success"
+         data-toggle="tooltip"
+         title="<%= t '.messages.approved_tooltip', user: tooltip_user_data, timestamp: acquired_media_release.approved_at %>"></i>
+    <% end %>
+  </td>
   <td>
     <%= acquired_media_release.name %>
   </td>
   <td>
-    <% if acquired_media_release.file_infos.any? %>
-      <%= acquired_media_release.file_infos.size %>
+    <% if acquired_media_release.files.any? %>
+      <%= acquired_media_release.files.size %>
     <% else %>
       <%= fa_icon("warning", text: t(".no_media"), class: "text-danger") %>
     <% end %>
   </td>
+  <td>
+    <%= contact_info_for(acquired_media_release.contact_person) %>
+  </td>
   <td>
     <%= notes_preview acquired_media_release.notes.order_by_recent %>
   </td>
@@ -29,12 +40,15 @@
         <% if policy(acquired_media_release.tags).new? %>
           <%= link_to fa_icon("tags fw", text: "Tags"), [:new, acquired_media_release, :acts_as_taggable_on_tag], class: "dropdown-item", remote: true %>
         <% end %>
-        <% if policy(acquired_media_release).edit_file_infos? %>
-          <%= link_to fa_icon("file fw", text: "Add Media"), [:edit, acquired_media_release, :file_infos], class: "dropdown-item" %>
+        <% if policy(acquired_media_release).edit_files? %>
+          <%= link_to fa_icon("file fw", text: "Media"), [:edit, acquired_media_release, :files], class: "dropdown-item" %>
         <% end %>
         <% if policy(Contract).show? && (acquired_media_release.contract.attached? || acquired_media_release.contract_template.present?) %>
           <%= link_to fa_icon("download fw", text: "Download"), [acquired_media_release, :contracts, format: "pdf"], class: "dropdown-item", target: "_blank" %>
         <% end %>
+        <% if policy(AcquiredMediaRelease).review? %>
+          <%= link_to fa_icon("search fw", text: t('.actions.review')), new_acquired_media_release_approvals_path(acquired_media_release), class: "dropdown-item" %>
+        <% end %>
         <% if policy(acquired_media_release).edit? %>
           <%= link_to fa_icon("pencil fw", text: "Edit"), [:edit, acquired_media_release], class: "dropdown-item" %>
         <% end %>

app/views/acquired_media_releases/_form.html.erb

@@ -1,6 +1,10 @@
 <%= errors_summary_for acquired_media_release %>
 <%= bootstrap_form_with model: model, local: true do |form| %>
   <%= field_set_tag content_tag(:span, t(".acquired_media_details.heading"), class: "h6 text-muted text-uppercase") do %>
+    <%= form.form_group :minor do %>
+      <%= form.check_box :minor, label: t("helpers.label.talent_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+    <% end %>
+
     <div class="form-row">
       <%= form.text_field :name, required: true, wrapper_class: "col-12" %>
     </div>
@@ -9,6 +13,28 @@
         <%= form.check_box :categories, { multiple: true, label: category }, category, false %>
       <% end %>
     <% end %>
+
+    <div class="<%= class_string("collapse" => !acquired_media_release.minor?) %>" data-ujs-target="guardian-fields">
+      <%= card_field_set_tag t(".guardian_info.heading") do %>
+        <div class="form-row">
+          <%= form.text_field :guardian_first_name, required: acquired_media_release.minor?, wrapper_class: "col-sm-3" %>
+          <%= form.text_field :guardian_last_name, required: acquired_media_release.minor?, wrapper_class: "col-sm-3" %>
+          <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6" %>
+          <%= form.text_field :guardian_email, wrapper_class: "col-sm-6" %>
+        </div>
+        <%= render "shared/address_fields", form: form, subject: "guardian" %>
+      <% end %>
+
+      <%= card_field_set_tag t(".guardian_2_info.heading") do %>
+        <div class="form-row">
+          <%= form.text_field :guardian_2_first_name, wrapper_class: "col-sm-3" %>
+          <%= form.text_field :guardian_2_last_name, wrapper_class: "col-sm-3" %>
+          <%= form.phone_field :guardian_2_phone, wrapper_class: "col-sm-6" %>
+          <%= form.text_field :guardian_2_email, wrapper_class: "col-sm-6" %>
+        </div>
+        <%= render "shared/address_fields", form: form, subject: "guardian_2" %>
+      <% end %>
+    </div>
   <% end %>
 
   <hr>
@@ -18,7 +44,45 @@
       <%= fa_icon "warning" %>
       <strong>For optimal accuracy, please ensure video file names and photo file names match the source file name in the editing sequence.</strong>
     </div>
-    <%= render "shared/file_infos_dropzone", form: form, releasable: acquired_media_release %>
+    <%= render "shared/releasable_files_dropzone", form: form, releasable: acquired_media_release %>
+
+    <div class="<%= class_string("collapse" => !acquired_media_release.minor?) %>" data-ujs-target="guardian-fields">
+      <br>
+      <div class="text-left">
+        <p><%= t(".photos.guardian_photo.heading") %></p>
+        <div id="guardian-photo-preview" class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-photo-input]">
+          <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
+            <span>No photo yet</span>
+          </div>
+        </div>
+        <% if acquired_media_release.guardian_photo.attached? %>
+          <%= javascript_tag nonce: true do %>
+            App.PhotoPreview.set("#guardian-photo-preview", "<%= url_for(acquired_media_release.guardian_photo.variant(auto_orient: true, resize: '200x200')) %>");
+          <% end %>
+        <% end %>
+        <div class="d-inline-block">
+          <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if acquired_media_release.guardian_photo.attached?%>
+          <%= form.file_field :guardian_photo, hide_label: true, data: { ujs_target: "guardian-photo-input" }, help: "PNG or JPG only", accept: acquired_media_release.class.face_photo_acceptable_content_types.join(",") %>
+        </div>
+
+        <p><%= t(".photos.guardian_2_photo.heading") %></p>
+        <div id="guardian-2-photo-preview" class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-2-photo-input]">
+          <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
+            <span>No photo yet</span>
+          </div>
+        </div>
+        <% if acquired_media_release.guardian_2_photo.attached? %>
+          <%= javascript_tag nonce: true do %>
+            App.PhotoPreview.set("#guardian-2-photo-preview", "<%= url_for(acquired_media_release.guardian_2_photo.variant(auto_orient: true, resize: '200x200')) %>");
+          <% end %>
+        <% end %>
+        <div class="d-inline-block">
+          <%= form.hidden_field :guardian_2_photo, value: form.object.guardian_2_photo.signed_id if acquired_media_release.guardian_2_photo.attached?%>
+          <%= form.file_field :guardian_2_photo, hide_label: true, data: { ujs_target: "guardian-2-photo-input" }, help: "PNG or JPG only", accept: acquired_media_release.class.face_photo_acceptable_content_types.join(",") %>
+        </div>
+      </div>
+      <hr>
+    </div>
   <% end %>
 
   <hr>

app/views/acquired_media_releases/index.html.erb

@@ -26,8 +26,10 @@
     <thead class="thead-light">
       <tr>
         <th data-behavior="all-selectable"><%= check_box_tag "acquired_media_release_ids[]", false, false %></th>
+        <th><%= t '.table_headers.approved'%></th>
         <th><%= AcquiredMediaRelease.human_attribute_name(:name) %></th>
-        <th><%= t(".table_headers.file_infos_count") %></th>
+        <th><%= t(".table_headers.files_count") %></th>
+        <th><%= t(".table_headers.owner_info") %></th>
         <th><%= t(".table_headers.notes") %></th>
         <th><%= t(".table_headers.tags") %></th>  
         <th><%= t(".table_headers.signed_at") %></th>

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

@@ -8,6 +8,9 @@
   <td>
     <%= account.projects.size %>
   </td>
+  <td>
+    <%= account.total_number_of_releases %>
+  </td>
   <td>
     <%= number_with_delimiter convert_duration(account.current_month_video_duration_total, from: :seconds, to: :minutes).round %> minutes
   </td>

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

@@ -0,0 +1,13 @@
+<tr>
+  <td><%= broadcast.project.name %></td>
+  <td><%= broadcast.name %></td>
+  <td class="text-right">
+    <div class="btn-group">
+      <%= button_tag "Manage", class: "btn btn-light btn-sm dropdown-toggle border", data: { toggle: "dropdown", boundary: "window" }, aria: { haspopup: true, expanded: false } %>
+      <div class="dropdown-menu dropdown-menu-right">
+        <%= link_to "View on Mux", "#{ENV['MUX_LIVE_STREAM_DASHBOARD_URL']}/#{broadcast.stream_uid}", class: "dropdown-item", target: "_blank" %>
+        <%= link_to "Edit", [:edit, :admin, broadcast, locale: I18n.locale], class: "dropdown-item" %>
+      </div>
+    </div>
+  </td>
+</tr>

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

@@ -15,6 +15,7 @@
         <th>Name</th>
         <th>Plan</th>
         <th># Projects</th>
+        <th># Releases Signed</th>
         <th>Monthly Video Upload Minutes</th>
         <th>Total Video Upload Minutes</th>
         <th>Total Storage</th>

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

@@ -9,6 +9,8 @@
         <dd class="col-sm-10"><%= @account.users.size %></dd>
         <dt class="col-sm-2">Created at</dt>
         <dd class="col-sm-10"><%= time_ago_in_words(@account.created_at) %> ago</dd>
+        <dt class="col-sm-2"># of Releases</dt>
+        <dd class="col-sm-10"><%= @account.total_number_of_releases %></dd>
       </dl>
     <% end %>
 
@@ -34,5 +36,25 @@
         <%= will_paginate @videos %>
       </div>
     <% end %>
+    <hr>
+    <%= card_field_set_tag "Broadcasts" do %>
+      <div class="table-responsive-sm">
+        <table class="table table-striped tr-px-4 align-all-middle">
+          <thead class="thead-light">
+            <tr>
+              <th>Project</th>
+              <th>Name</th>
+              <th></th>
+            </tr>
+          </thead>
+          <tbody id="broadcasts">
+            <%= render partial: "admin/accounts/broadcast", collection: @broadcasts %>
+          </tbody>
+        </table>
+      </div>
+      <div id="broadcasts_pagination">
+        <%= will_paginate @broadcasts %>
+      </div>
+    <% end %>
   </div>
 </div>

app/views/admin/broadcasts/_form.html.erb

@@ -0,0 +1,15 @@
+<%= errors_summary_for broadcast %>
+
+<%= bootstrap_form_with model: model, local: true do |form| %>
+  <%= form.text_field :video_conference_url_override %>
+  <%= form.text_field :stream_url_override %>
+  <%= form.text_field :stream_key_override %>
+  <%= form.text_area :director_mode_video_embed %>
+
+  <div class="row align-items-center text-center mt-4">
+    <%= link_to t("shared.cancel"), [:admin, broadcast.project.account], class: "col-3 text-reset" %>
+    <div class="col-9">
+      <%= form.submit class: class_string("btn btn-block", ["btn-success", "btn-primary"] => broadcast.new_record?), data: { disable_with: t("shared.disable_with") } %>
+    </div>
+  </div>
+<% end %>

app/views/admin/broadcasts/edit.html.erb

@@ -0,0 +1,6 @@
+<div class="card shadow-sm">
+  <%= card_header text: t(".heading"), close_action_path: [:admin, @broadcast.project.account] %>
+  <div class="card-body">
+    <%= render "form", model: [:admin, @broadcast], broadcast: @broadcast %>
+  </div>
+</div>

app/views/appearance_releases/_appearance_release.html.erb

@@ -1,5 +1,13 @@
 <tr id="<%= dom_id(appearance_release) %>">
   <td data-behavior="select"><%= check_box_tag "appearance_release_ids[]", appearance_release.id, false %></td>
+  <td class="text-center">
+    <% if appearance_release.approved? %>
+      <% tooltip_user_data = get_approval_data_for_releasable(appearance_release) %>
+      <i class="fa fa-check-circle fa-2x text-success"
+          data-toggle="tooltip"
+          title="<%= t '.messages.approved_tooltip', user: tooltip_user_data, timestamp: appearance_release.approved_at %>"></i>
+    <% end %>
+  </td>
   <td>
     <% if appearance_release.photo.attached? %>
       <%= image_tag medium_variant(appearance_release.photo) %>
@@ -26,6 +34,17 @@
    <td>
     <%= appearance_release.signed_on %>
   </td>
+  <td class="text-center">
+    <% if appearance_release.amendment_signed? %>
+      <i class="fa fa-check-square-o text-dark"
+         data-toggle="tooltip"
+         title="<%= t '.messages.amendment_signed_tooltip' %>"></i>
+    <% elsif appearance_release.amendment_signable? %>
+      <i class="fa fa-square-o"
+         data-toggle="tooltip"
+         title="<%= t '.messages.amendment_not_signed_tooltip' %>"></i>
+    <% end %>
+  </td>
   <td class="text-right">
     <div class="btn-group">
       <%= button_tag t(".actions.manage"), class: "btn btn-light btn-sm dropdown-toggle border", data: { toggle: "dropdown", boundary: "window" }, aria: { haspopup: true, expanded: false } %>
@@ -36,9 +55,15 @@
         <% if policy(appearance_release.tags).new? %>
           <%= link_to fa_icon("tags fw", text: "Tags"), [:new, appearance_release, :acts_as_taggable_on_tag], class: "dropdown-item", remote: true %>
         <% end %>
+        <% if policy(appearance_release).sign_amendment? && appearance_release.amendment_signable? && !appearance_release.amendment_signed? %>
+          <%= link_to fa_icon("file-text fw", text: t('.actions.sign_amendment')), [:new, appearance_release.project.account, appearance_release.project, appearance_release.contract_template, appearance_release, :amendment], class: "dropdown-item", target: "_blank" %>
+        <% end %>
         <% if policy(Contract).show? && (appearance_release.contract.attached? || appearance_release.contract_template.present?) %>
           <%= link_to fa_icon("download fw", text: "Download"), [appearance_release, :contracts, format: "pdf"], class: "dropdown-item", target: "_blank" %>
         <% end %>
+        <% if policy(AppearanceRelease).review? %>
+          <%= link_to fa_icon("search fw", text: t('.actions.review')), new_appearance_release_approvals_path(appearance_release), class: "dropdown-item" %>
+        <% end %>
         <% if policy(appearance_release).edit? %>
           <%= link_to fa_icon("pencil fw", text: "Edit"), [:edit, appearance_release], class: "dropdown-item" %>
         <% end %>

app/views/appearance_releases/index.html.erb

@@ -44,12 +44,14 @@
     <thead class="thead-light">
       <tr>
         <th data-behavior="all-selectable"><%= check_box_tag "appearance_release_ids[]", false, false %></th>
+        <th><%= t '.table_headers.approved'%></th>
         <th></th>
         <th><%= AppearanceRelease.human_attribute_name(:person_name) %></th>
         <th><%= AppearanceRelease.human_attribute_name(:contact_info) %></th>
         <th><%= t(".table_headers.notes") %></th>
         <th><%= t(".table_headers.tags") %></th>
         <th><%= t(".table_headers.signed_at") %></th>
+        <th><%= t '.table_headers.amendment_signed' %></th>
         <th></th>
       </tr>
     </thead>

app/views/approvals/new.html.erb

@@ -0,0 +1,19 @@
+<div class="card shadow-sm">
+  <%= card_header text: t(".heading", release_type: @releasable_param.name.titleize), close_action_path: [@project, "#{@releasable_param.name.pluralize}"] %>
+  <div class="card-body">
+    <embed class="embeded-contract-preview mb-3" type="application/pdf" src="<%= url_for [@releasable, :contracts, format: "pdf"] %>" width="90%" height="1200" />
+
+    <%= errors_summary_for @releasable %>
+    <%= bootstrap_form_with model: @releasable, method: :post, url: public_send("#{@releasable_param.name}_approvals_path", @releasable), local: true do |form| %>
+      <%= card_field_set_tag 'Signature' do %>
+        <%= render "shared/signature_fields", form: form, signature_field: 'approved_by_user_signature[data]' %>
+      <% end %>
+      <div class="row align-items-center text-center mt-4">
+        <%= link_to t("shared.cancel"), [@releasable.project, "#{@releasable_param.name.pluralize}"], class: "col-3 text-reset" %>
+        <div class="col-9">
+          <%= form.button t('.actions.approve'), id: "approve_release", class: class_string("btn btn-block btn-success btn-primary"), data: { disable_with: t("shared.disable_with") } %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

app/views/broadcast_recordings/destroy.js.erb

@@ -0,0 +1,6 @@
+var dom_id = "<%= dom_id(@recording) %>"
+$('[data-id="' + dom_id + '"]').remove();
+<% if @recordings.empty? %>
+  $("#broadcast_recordings_nav").append('<p class="dropdown-item text-muted">Recordings will appear here</p>')
+<% end %>
+$("#broadcast_recordings").html("<%= j render(partial: 'broadcasts/broadcast_recordings', locals: { recordings: @recordings, broadcast: @broadcast }) %>");

app/views/broadcasts/_broadcast.html.erb

@@ -3,6 +3,9 @@
   <td>
     <%= broadcast.name %>
   </td>
+  <td>
+    <%= broadcast.shoot_location_time_zone %>
+  </td>
   <td>
     <%= broadcast.status.titleize %>
   </td>
@@ -13,8 +16,8 @@
     <div class="btn-group">
       <%= button_tag t(".actions.manage"), class: "btn btn-light btn-sm dropdown-toggle border", data: { toggle: "dropdown", boundary: "window" }, aria: { haspopup: true, expanded: false } %>
       <div class="dropdown-menu dropdown-menu-right">
-        <%= link_to fa_icon("link fw", text: "Copy Stream URL"), ENV['MUX_BROADCAST_SERVER_URL'], class: "dropdown-item", data: { behavior: "clipboard" } %>
-        <%= link_to fa_icon("key fw", text: "Copy Stream Key"), broadcast.stream_key, class: "dropdown-item", data: { behavior: "clipboard" } %>
+        <%= link_to fa_icon("link fw", text: "Copy Stream URL"), broadcast.stream_server_url, class: "dropdown-item", data: { behavior: "clipboard" } %>
+        <%= link_to fa_icon("key fw", text: "Copy Stream Key"), broadcast.stream_server_key, class: "dropdown-item", data: { behavior: "clipboard" } %>
         <% if policy(broadcast).show? %>
           <%= link_to fa_icon("file-video-o fw", text: "View"), [broadcast.project, broadcast], class: "dropdown-item", target: '_blank' %>
         <% end %>

app/views/broadcasts/_broadcast_recording_nav.html.erb

@@ -1,2 +1,3 @@
-<%= link_to broadcast_recording.download_file_name, "javascript:void(0);", class: "dropdown-item", data: { behavior: "play_recording", playback_url: broadcast_recording.playback_url } %>
+<%= link_to broadcast_recording.download_file_name, "javascript:void(0);", class: "dropdown-item", data: { behavior: "play_recording", playback_url: broadcast_recording.playback_url, id: dom_id(broadcast_recording) } %>
+
 

app/views/broadcasts/_broadcast_recordings.html.erb

@@ -2,7 +2,12 @@
   <p>Click below to download the recordings of the live stream.</p>
   <ul class="mt-2">
     <% recordings.each do |recording| %>
-      <li><%= link_to(recording.download_file_name, recording.download_url, target: "_blank") %></li>
+      <li>
+        <%= link_to(recording.download_file_name, recording.download_url, target: "_blank") %> 
+        <% if (controller.class.module_parent.to_s != "Public" && policy(BroadcastRecording).destroy?) %>
+          <%= link_to "Hide", [broadcast.project, broadcast, recording], class: "btn-sm btn-primary ml-1 text-decoration-none", remote: true, method: :delete, data: { confirm: t('.confirm_hide') } %>
+        <% end %>
+      </li>
     <% end %>
   </ul>
   <div id="recordings_pagination" class="row mt-5 justify-content-center">

app/views/broadcasts/_file.html.erb

@@ -1,12 +1,25 @@
-<li class="my-2" id="<%= dom_id(file) %>">
-  <% if file.variable? %>
-    <%= link_to image_tag(file.variant(resize_and_pad: [300, 300, background: "#F7F8F9"]), class: "bg-light img-thumbnail img-fluid"), file, target: "_blank" %>
-  <% else %>
-    <div class="border rounded bg-light text-muted d-flex justify-content-center align-items-center fix-h-and-w">
-      <%= link_to file, target: "_blank" do %>
-        <%= fa_icon("file", style: "font-size: 2rem") %>
-        <div class="mt-2"><%= file.filename %></div>
+<div class="row">
+  <% broadcast = file.record %>
+  <% show_delete = controller.class.module_parent.to_s == "Public" ? false : policy(broadcast).destroy_file? %>
+  <% file_class = show_delete ? "col-8" : "col-12" %>
+  <div class="<%= file_class %>">
+    <li class="my-2" id="<%= dom_id(file) %>">
+      <% if file.variable? %>
+        <%= link_to image_tag(file.variant(resize_and_pad: [300, 300, background: "#F7F8F9"]), class: "bg-light img-thumbnail img-fluid"), file, target: "_blank" %>
+      <% else %>
+        <div class="border rounded bg-light text-muted d-flex justify-content-center align-items-center img-fluid fix-h-and-w">
+          <%= link_to file, target: "_blank" do %>
+            <%= fa_icon("file", style: "font-size: 2rem") %>
+            <div class="mt-2"><%= file.filename %></div>
+          <% end %>
+        </div>
       <% end %>
+    </li>
+  </div>
+  <% if show_delete %>
+    <div class="col-4 align-self-center p-0 m-0">
+      <% url = url_for [:destroy_file, broadcast.project, broadcast, { file_id: file.id }] %>
+      <%= link_to fa_icon("trash fw", text: t('.actions.delete_file')), url, class: "btn btn-danger", remote: true, method: :delete, data: { confirm: t('.confirm_delete') } %>
     </div>
   <% end %>
-</li>
+</div>

app/views/broadcasts/_form.html.erb

@@ -2,6 +2,7 @@
 
 <%= bootstrap_form_with model: model, local: true do |form| %>
   <%= form.text_field :name %>
+  <%= form.time_zone_select(:shoot_location_time_zone, nil, label: "Time zone of shoot location") %>
 
   <div class="row align-items-center text-center mt-4">
     <%= link_to t("shared.cancel"), [project, :broadcasts], class: "col-3 text-reset" %>

app/views/broadcasts/_video.html.erb

@@ -1,7 +1,11 @@
-<% if broadcast.streamer_recording? && broadcast.active? %>
-  <div id="broadcast_video" class="embed-responsive-item"></div>
+<% 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? %>
+  <div id="broadcast_video" class="embed-responsive-item" data-video-type="stream"></div>
 <% else %>
-  <div id="broadcast_video" class="embed-responsive-item">
+  <div id="broadcast_video" class="embed-responsive-item" data-video-type="stream">
     <table class="w-100 h-100 bg-secondary">
       <tbody>
         <tr>
@@ -12,4 +16,4 @@
       </tbody>
     </table>
   </div>
-<% end %>
+<% end %>