2781 translation page bug (#2782)

Author: corylown

.rubocop.yml

@@ -60,7 +60,7 @@ Metrics/BlockLength:
     - 'app/models/spotlight/resource.rb'
 
 Metrics/ClassLength:
-  Max: 120
+  Max: 150
   Exclude:
     - 'app/models/spotlight/resources/iiif_manifest.rb'
     - 'app/controllers/spotlight/browse_controller.rb'

app/controllers/spotlight/pages_controller.rb

@@ -3,9 +3,6 @@
 module Spotlight
   ##
   # Base CRUD controller for pages
-  # rubocop:disable Metrics/ClassLength
-  # Disableing class length because this is a base
-  # controller that gives other controllers their behavior
   class PagesController < Spotlight::ApplicationController
     before_action :authenticate_user!, except: [:show]
     before_action :load_locale_specific_page, only: %i[destroy edit show update]
@@ -32,7 +29,7 @@ def index
 
       respond_to do |format|
         format.html
-        format.json { render json: @pages.for_locale.published.to_json(methods: [:thumbnail_image_url]) }
+        format.json { render json: @pages.for_default_locale.published.to_json(methods: [:thumbnail_image_url]) }
       end
     end
 
@@ -208,5 +205,4 @@ def redirect_page_to_related_locale_version
       end
     end
   end
-  # rubocop:enable Metrics/ClassLength
 end

app/helpers/spotlight/job_trackers_helper.rb

@@ -4,7 +4,7 @@ module Spotlight
   # HTML <meta> tag helpers
   module JobTrackersHelper
     def job_status_icon(job_tracker)
-      content_tag :span, title: t(job_tracker.status || 'missing', scope: 'spotlight.job_trackers.status') do # rubocop:disable Rails/ContentTag
+      content_tag :span, title: t(job_tracker.status || 'missing', scope: 'spotlight.job_trackers.status') do
         if job_tracker.enqueued? || job_tracker.in_progress?
           '⏱'
         elsif job_tracker.completed?

app/models/sir_trevor_rails/blocks/featured_pages_block.rb

@@ -12,7 +12,7 @@ def page_options(id)
       end
 
       def pages
-        @pages ||= parent.exhibit.pages.published.where(slug: item_ids).sort do |a, b|
+        @pages ||= parent.exhibit.pages.for_default_locale.published.where(slug: item_ids).sort do |a, b|
           ordered_items.index(a.slug) <=> ordered_items.index(b.slug)
         end
       end
@@ -28,7 +28,7 @@ def as_json(*)
 
         result[:data][:item].transform_values! do |v|
           begin
-            v['thumbnail_image_url'] = parent.exhibit.pages.find(v['id']).thumbnail_image_url
+            v['thumbnail_image_url'] = parent.exhibit.pages.for_default_locale.find(v['id']).thumbnail_image_url
           rescue ActiveRecord::RecordNotFound
             v = nil
           end

app/models/spotlight/page.rb

@@ -46,6 +46,12 @@ class Page < ActiveRecord::Base
 
     after_update :update_translated_pages_weights_and_parent_page
 
+    def title
+      return super if I18n.locale == I18n.default_locale
+
+      translated_page_for(I18n.locale)&.title || super
+    end
+
     def content_changed!
       @content = nil
     end
@@ -133,6 +139,8 @@ def updated_after?(other_page)
     end
 
     def translated_page_for(locale)
+      return self if locale == self.locale
+
       translated_pages.for_locale(locale).first
     end
 

spec/models/sir_trevor_rails/blocks/featured_pages_block_spec.rb

@@ -3,7 +3,8 @@
 describe SirTrevorRails::Blocks::FeaturedPagesBlock do
   subject { described_class.new({ type: '', data: block_data }, page) }
 
-  let(:page) { FactoryBot.create(:feature_page) }
+  let(:page) { FactoryBot.create(:feature_page, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:block_data) { {} }
 
   describe '#items' do
@@ -21,6 +22,23 @@
     end
   end
 
+  describe '#pages' do
+    let!(:page_a) { FactoryBot.create(:feature_page, slug: 'a', exhibit: exhibit) }
+    let!(:translated_page_a) { page_a.clone_for_locale('a').tap { |x| x.update(published: true) && x.save } }
+    let!(:page_b) { FactoryBot.create(:feature_page, slug: 'b', exhibit: exhibit) }
+
+    before do
+      block_data[:item] = {
+        '0': { id: 'a', display: 'true' },
+        '1': { id: 'b', display: 'true' }
+      }
+    end
+
+    it 'retrieves the pages from the default locale' do
+      expect(subject.pages.length).to eq 2
+    end
+  end
+
   describe '#as_json' do
     context 'when no items are present' do
       it 'returns an empty items value' do