Merge pull request #6572 from avalonmediasystem/staging

Release Avalon 8.1.1

Author: joncameron

app/assets/stylesheets/avalon.scss

@@ -909,7 +909,7 @@ h5.card-title {
   div.file_view {
     margin: 10px 0 5px 20px;
 
-    ul {
+    ul:not(.autocomplete_popup) {
       padding-left: 20px;
 
       li {

app/views/media_objects/_supplemental_files_list.html.erb

@@ -40,16 +40,12 @@ Unless required by applicable law or agreed to in writing, software distributed
               <%= form.text_field :label, id: "supplemental_file_input_#{section.id}_#{file.id}", value: file.label %>
             </div>
             <% if tag == 'transcript' %>
-              <div class="mb-3 col-md-6 col p-0">
-                <%= render partial: 'modules/autocomplete_input', locals: { field_name: :language,
+              <div class="mb-3 col-md-6 col p-0" style='display: flex;'>
+                <%= render partial: 'modules/autocomplete_input', locals: { field_name: "supplemental_file[language]",
+                                                                            for_field: "language_#{file.id}",
                                                                             field_id: "supplemental_file_language_#{section.id}_#{file.id}",
                                                                             value: display_supplemental_file_language(file.language),
                                                                             model: 'languageTerm'} %>
-                <%= form.text_field :language, 
-                    id: "supplemental_file_language_#{section.id}_#{file.id}", 
-                    value: display_supplemental_file_language(file.language),
-                    class: "typeahead from-model form-control",
-                    data: { model: 'languageTerm', validate: false } %>
               </div>
               <div class="row-col-sm-9 row-col-md-8 row-col-9 p-0">
                 <span class="form-check-inline col-md-6 col-sm-6 col-6 p-0">
@@ -61,12 +57,12 @@ Unless required by applicable law or agreed to in writing, software distributed
               </div>
             <% end %>
             <% if tag == 'caption' %>
-              <div class="mb-3 col-md-6 col p-0">
-                <%= form.text_field :language, 
-                    id: "supplemental_file_language_#{section.id}_#{file.id}", 
-                    value: display_supplemental_file_language(file.language),
-                    class: "typeahead from-model form-control",
-                    data: { model: 'languageTerm', validate: false } %>
+              <div class="mb-3 col-md-6 col p-0" style='display: flex;'>
+                <%= render partial: 'modules/autocomplete_input', locals: { field_name: "supplemental_file[language]",
+                                                                            for_field: "language_#{file.id}",
+                                                                            field_id: "supplemental_file_language_#{section.id}_#{file.id}",
+                                                                            value: display_supplemental_file_language(file.language),
+                                                                            model: 'languageTerm'} %>
               </div>
               <div class="row-col-sm-9 row-col-md-8 row-col-9 p-0">
                 <div class="form-check-inline col-md-6 col-sm-6 col-6 p-0">

config/application.rb

@@ -9,7 +9,7 @@
 Bundler.require(*Rails.groups)
 
 module Avalon
-  VERSION = '8.1.0'
+  VERSION = '8.1.1'
 
   class Application < Rails::Application
     require 'avalon/configuration'

lib/avalon/transcript_search.rb

@@ -25,6 +25,8 @@ def initialize(query:, master_file:, request_url: nil)
     end
 
     def perform_search(phrase_searching: true)
+      return {} if query.blank?
+
       subquery = if phrase_searching
                    "transcript_tsim:\"#{RSolr.solr_escape(query)}\""
                  else
@@ -56,13 +58,13 @@ def iiif_content_search(phrase_searching: true)
 
     def items_builder search_results
       formatted_response = []
-      search_results["highlighting"].each do |result|
-        transcript_id = result.first.split('/').last.to_i
-        mime_type = search_results["response"]["docs"].filter { |doc| doc["id"] == result.first }.first["mime_type_ssi"]
+      search_results["highlighting"]&.each do |id, matches|
+        transcript_id = id.split('/').last.to_i
+        mime_type = search_results["response"]["docs"].filter { |doc| doc["id"] == id }.first["mime_type_ssi"]
         canvas = "#{Rails.application.routes.url_helpers.media_object_url(master_file.media_object_id).to_s}/manifest/canvas/#{master_file.id}"
         target = Rails.application.routes.url_helpers.transcripts_master_file_supplemental_file_url(master_file.id, transcript_id)
 
-        text_matches = result[1]["transcript_tsim"]
+        text_matches = matches["transcript_tsim"]
 
         formatted_response += process_items(text_matches, mime_type, canvas, target)
       end

spec/controllers/master_files_controller_spec.rb

@@ -901,5 +901,16 @@ class << file
       expect(items[0]["body"]["value"]).to eq "Just <em>before</em> <em>lunch</em> one day, a puppet show was put on at school."
       expect(items[0]["target"]).to eq "#{Rails.application.routes.url_helpers.transcripts_master_file_supplemental_file_url(parent_master_file.id, transcript_1.id)}#t=00:00:22.200,00:00:26.600"
     end
+
+    context 'with empty search' do
+      it 'returns an empty valid IIIF content search response' do
+        get('search', params: { id: parent_master_file.id })
+        result = JSON.parse(response.body)
+        expect(result["@context"]).to eq "http://iiif.io/api/search/2/context.json"
+        expect(result["id"]).to eq "#{Rails.application.routes.url_helpers.search_master_file_url(parent_master_file.id)}"
+        expect(result["type"]).to eq "AnnotationPage"
+        expect(result["items"]).to be_blank
+      end
+    end
   end
 end

spec/controllers/playlist_items_controller_spec.rb

@@ -142,20 +142,20 @@
   end
   describe 'PATCH #update' do
     let!(:video_master_file) { FactoryBot.create(:master_file, duration: "200000") }
-    let!(:clip) { AvalonClip.create(master_file: video_master_file, title: Faker::Lorem.word, comment: Faker::Lorem.sentence, start_time: 1000, end_time: 2000) }
+    let!(:clip) { AvalonClip.create(master_file: video_master_file, title: Faker::Lorem.unique.word, comment: Faker::Lorem.sentence, start_time: 1000, end_time: 2000) }
     let!(:playlist_item) { PlaylistItem.create!(playlist: playlist, clip: clip) }
 
     context 'with valid params' do
       it 'updates Playlist Item' do
         expect do
-          patch :update, params: { playlist_id: playlist.id, id: playlist_item.id, playlist_item: { title: Faker::Lorem.word, start_time:'00:20', end_time:'1:20' } }, session: valid_session
+          patch :update, params: { playlist_id: playlist.id, id: playlist_item.id, playlist_item: { title: Faker::Lorem.unique.word, start_time:'00:20', end_time:'1:20' } }, session: valid_session
         end.to change{ playlist_item.reload.title }
       end
     end
     context 'with invalid params' do
       it 'fails to update Playlist Item' do
         expect do
-          patch :update, params: { playlist_id: playlist.id, id: playlist_item.id, playlist_item: { title: Faker::Lorem.word, start_time:'00:20', end_time:'not-a-time' } }, session: valid_session
+          patch :update, params: { playlist_id: playlist.id, id: playlist_item.id, playlist_item: { title: Faker::Lorem.unique.word, start_time:'00:20', end_time:'not-a-time' } }, session: valid_session
         end.not_to change{ playlist_item.reload.title }
       end
     end

spec/lib/avalon/transcript_search.rb renamed to spec/lib/avalon/transcript_search_spec.rb

@@ -64,6 +64,16 @@
         end
       end
     end
+
+    context 'with empty search' do
+      subject { described_class.new(query: '', master_file: parent_master_file) }
+
+      it 'returns an empty hash' do
+        search = subject.perform_search
+        expect(search).to be_a Hash
+        expect(search).to be_blank
+      end
+    end
   end
 
   describe '#iiif_content_search' do
@@ -117,5 +127,18 @@
         end
       end
     end
+
+    context 'with empty search' do
+      subject { described_class.new(query: '', master_file: parent_master_file) }
+
+      it 'returns valid empty IIIF content search response' do
+        allow(SecureRandom).to receive(:uuid).and_return('abc1234')
+        search = subject.iiif_content_search
+        expect(search["@context".to_sym]).to eq "http://iiif.io/api/search/2/context.json"
+        expect(search[:id]).to eq "#{Rails.application.routes.url_helpers.search_master_file_url(parent_master_file.id)}?q="
+        expect(search[:type]).to eq "AnnotationPage"
+        expect(search[:items]).to be_blank
+      end
+    end
   end
 end

spec/support/supplemental_files_controller_examples.rb

@@ -390,12 +390,13 @@
         request.headers['Content-Type'] = 'application/json'
       end
       context "with valid metadata params" do
-        let(:valid_update_attributes) { { label: 'new label', type: 'transcript', machine_generated: true }.to_json }
+        let(:valid_update_attributes) { { label: 'new label', type: 'transcript', machine_generated: true, language: 'French' }.to_json }
         it "updates the SupplementalFile metadata for #{object_class}" do
           expect {
             put :update, params: { class_id => object.id, id: supplemental_file.id, metadata: valid_update_attributes, format: :json }, session: valid_session
           }.to change { object.reload.supplemental_files.first.label }.from('label').to('new label')
            .and change { object.reload.supplemental_files.first.tags }.from([]).to(['transcript', 'machine_generated'])
+           .and change { object.reload.supplemental_files.first.language }.from('eng').to('fre')
 
           expect(response).to have_http_status(:ok)
           expect(response.body).to eq({ "id": supplemental_file.id }.to_json)
@@ -507,7 +508,7 @@
             # so we only test against the MasterFile case.
             if object.is_a?(MasterFile)
               expect{
-                put :update, params: { class_id => object.id, id: supplemental_file.id, supplemental_file:valid_update_attributes, format: :html}, session: valid_session
+                put :update, params: { class_id => object.id, id: supplemental_file.id, supplemental_file: valid_update_attributes, format: :html}, session: valid_session
               }.to change { object.reload.media_object.to_solr(include_child_fields: true)['has_transcripts_bsi'] }.from(true).to(false)
             end
           end