prevent submitting form without selected files

app/controllers/release_template_imports_controller.rb

@@ -11,9 +11,7 @@ class ReleaseTemplateImportsController < ApplicationController
 
     templates = []
     filtered_contract_templates.each do |contract_template|
-      next if contract_template.duplicated? ||
-              contract_template.archived? ||
-              contract_template.project == @project
+      next if contract_template.duplicated? || contract_template.project == @project
 
       already_imported = contract_template.duplicates.non_archived.pluck(:project_id).include?(@project.id)
       templates << OpenStruct.new(template: contract_template, already_imported?: already_imported)

app/models/contract_template.rb

@@ -51,10 +51,6 @@ class ContractTemplate < ApplicationRecord
     parent.present?
   end
 
-  def archived?
-    archived_at.present?
-  end
-
   def archive
     update(archived_at: Time.zone.now)
   end

app/views/broadcasts/_file_form.html.erb

@@ -1,4 +1,4 @@
 <%= bootstrap_form_for model, layout: :inline, remote: true do |form| %>
-  <%= form.file_field :files, direct_upload: true, multiple: true, accept: "*", hide_label: true, wrapper_class: "w-65 mr-2", id: "broadcast_files_#{token}" %>
+  <%= form.file_field :files, direct_upload: true, multiple: true, accept: "*", hide_label: true, required: true, wrapper_class: "w-65 mr-2", id: "broadcast_files_#{token}" %>
   <%= form.button fa_icon("upload", text: "Add File"), class: "btn btn-primary", type: :submit, data: { disable_with: fa_icon("spinner", text: "Adding File") } %>
 <% end %>

app/views/public/broadcasts/_file_form.html.erb

@@ -1,4 +1,4 @@
 <%= bootstrap_form_for model, url: broadcast_url(token: token), layout: :inline, remote: true do |form| %>
-  <%= form.file_field :files, direct_upload: true, multiple: true, accept: "*", hide_label: true, wrapper_class: "w-65 mr-2", id: "broadcast_files_#{token}" %>
+  <%= form.file_field :files, direct_upload: true, multiple: true, accept: "*", hide_label: true, required: true, wrapper_class: "w-65 mr-2", id: "broadcast_files_#{token}" %>
   <%= form.button fa_icon("upload", text: "Add File"), class: "btn btn-primary", type: :submit, data: { disable_with: fa_icon("spinner", text: "Adding File") } %>
 <% end %>

spec/factories/contract_templates.rb

@@ -8,10 +8,6 @@ FactoryBot.define do
     guardian_clause "Is the signer a minor?"
     fee "$0.00"
 
-    trait :archived do
-      archived_at Time.zone.now
-    end
-
     factory :appearance_release_contract_template do
       release_type "appearance" 
     end

spec/features/user_manages_contract_templates_spec.rb

@@ -5,7 +5,6 @@ require 'rails_helper'
 RSpec.feature 'User manages contract templates', type: :feature do
   let(:current_user) { create(:user, :manager) }
   let(:project) { create(:project, members: current_user, account: current_user.primary_account) }
-  let(:project2) { create(:project, members: current_user, account: current_user.primary_account, name: 'New project') }
 
   before do
     sign_in(current_user)
@@ -192,21 +191,6 @@ RSpec.feature 'User manages contract templates', type: :feature do
     expect(page).not_to have_content('Test template')
   end
 
-  scenario 'archived contract templates from other projects are not shown when importing contract templates' do
-    create(:contract_template, :archived, project: project2, name: 'Archived template')
-    create(:contract_template, project: project2, name: 'Active template')
-    create(:contract_template, project: project)
-
-    visit project_contract_templates_path(project)
-    expect(page).to have_content('Test template')
-
-    click_on import_template_button
-
-    expect(page).not_to have_content('Test template')
-    expect(page).not_to have_content('Archived template')
-    expect(page).to have_content('Active template')
-  end
-
   context 'When the user is associate' do
     let(:current_user) { create(:user, :associate) }
 
@@ -214,7 +198,7 @@ RSpec.feature 'User manages contract templates', type: :feature do
       visit project_contract_templates_path(project)
 
       expect(page).not_to have_content('Create New Release Template')
-      expect(page).not_to have_content(import_template_button)
+      expect(page).not_to have_content('Import Release Template')
       expect(page).not_to have_content('Delete')
     end
   end
@@ -234,14 +218,6 @@ RSpec.feature 'User manages contract templates', type: :feature do
 
   private
 
-  def import_template_button
-    t 'contract_templates.index.actions.import'
-  end
-
-  def import_selected_templates_button
-    t 'release_template_imports.new.actions.import'
-  end
-
   def preview_heading
     t 'blank_contracts.new.preview_heading'
   end

spec/features/user_managing_broadcasts_spec.rb

@@ -40,12 +40,12 @@ feature "User managing broadcasts" do
     scenario "visit show page of broadcast", js: true do
       broadcast = create(:broadcast, :with_stream, :with_files, project: project)
       recording = create(:broadcast_recording, broadcast: broadcast)
-      
+
       visit project_broadcast_path(project, broadcast)
 
       expect(page).to have_content("Live stream is waiting to begin.")
       expect(page).to have_content("Copy URL")
-      
+
       within "#files" do
         expect(page).to have_content("contract.pdf")
       end
@@ -54,6 +54,17 @@ feature "User managing broadcasts" do
       expect(page).to have_content(recording.download_file_name)
     end
 
+    scenario "form will not submit if user clicks Add files without selected files", js: true do
+      broadcast = create(:broadcast, :with_stream, :with_files, project: project)
+
+      visit project_broadcast_path(project, broadcast)
+
+      expect(page).to have_content("Live stream is waiting to begin.")
+      expect(page).to have_content add_file_button
+
+      click_on add_file_button
+    end
+
     scenario "visit multi-view broadcast page", js: true do
       broadcast_one = create(:broadcast, :with_stream, :with_files, name: "Broadcast 1", project: project)
       broadcast_two = create(:broadcast, :with_stream, :with_files, name: "Broadcast 2", project: project)
@@ -80,8 +91,13 @@ feature "User managing broadcasts" do
     end
   end
 
+
   private
 
+  def add_file_button
+    'Add File'
+  end
+
   def broadcast_name_field
     "broadcast[name]"
   end