blacklight-spotlight 5.0.1 → 5.1.0

data/app/components/spotlight/uneditable_non_default_language_component.html.erb

@@ -0,0 +1,5 @@
+<p>
+  <%= t('spotlight.exhibits.form.uneditable_non_default_language_form.instructions') %>
+</p>
+<%= edit_translations_button %>
+<%= switch_to_default_language_button %>

data/app/components/spotlight/uneditable_non_default_language_component.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Spotlight
+  # Displays a message that this exhibit information cannot be edited in the
+  # currently selected language and provides other options.
+  class UneditableNonDefaultLanguageComponent < ViewComponent::Base
+    def initialize(current_exhibit:, current_language:)
+      @current_exhibit = current_exhibit
+      @current_language = current_language
+      super
+    end
+
+    def edit_translations_button
+      link_to I18n.t('spotlight.exhibits.form.uneditable_non_default_language_form.translations'),
+              helpers.spotlight.edit_exhibit_translations_path(@current_exhibit, locale: @current_language),
+              class: 'btn btn-primary'
+    end
+
+    def switch_to_default_language_button
+      link_to I18n.t('spotlight.exhibits.form.uneditable_non_default_language_form.default_language'),
+              helpers.spotlight.edit_exhibit_path(@current_exhibit, locale: I18n.default_locale),
+              class: 'btn btn-primary'
+    end
+  end
+end

data/app/controllers/spotlight/catalog_controller.rb

@@ -226,7 +226,7 @@ module Spotlight
       redirect_to spotlight.exhibit_root_path(@exhibit) unless has_search_parameters?
     end
 
-    def has_search_parameters? # rubocop:disable Naming/PredicateName
+    def has_search_parameters? # rubocop:disable Naming/PredicatePrefix
       super || params[:browse_category_id].present?
     end
 

data/app/models/spotlight/page.rb

@@ -52,6 +52,13 @@ module Spotlight
       translated_page_for(I18n.locale)&.title || super
     end
 
+    # Returns the title of the page in the default locale regardless of the current locale.
+    def default_locale_title
+      return self[:title] if I18n.locale == I18n.default_locale || default_locale_page.blank?
+
+      default_locale_page[:title]
+    end
+
     def content_changed!
       @content = nil
     end

data/app/views/spotlight/accessibility/alt_text.html.erb

@@ -43,6 +43,9 @@
                 </svg>
               <% end %>
             </span>
+            <% unless page.published? %>
+              <div class="badge bg-info unpublished align-baseline p-1"><%= t('.unpublished') %></div>
+            <% end %>
           </h4>
           <%= render Spotlight::EditViewLinksComponent.new(page:, classes:'page-links pt-0') %>
         </td>

data/app/views/spotlight/appearances/edit.html.erb

@@ -66,15 +66,20 @@
       </div>
 
       <div role="tabpanel" class="tab-pane" id="main-menu">
-        <%= field_set_tag do %>
-          <p class="instructions"><%= t(:'.main_navigation.help') %></p>
-          <div class="card-group dd main_navigation_admin col-sm-7" id="nested-navigation" data-behavior="nestable" data-max-depth="1">
-            <ol class="dd-list">
-              <%= f.fields_for :main_navigations do |label| %>
-                <%= render layout: 'spotlight/shared/dd3_item', locals: { id: label.object.nav_type, field: label, label: label.object.label_or_default, default_value: label.object.default_label, index: label.index, enabled_method: :display } do; end %>
-              <% end %>
-            </ol>
-          </div>
+        <%# These fields are translatable and should only be edited here in the default locale %>
+        <% if default_language? %>
+          <%= field_set_tag do %>
+            <p class="instructions"><%= t(:'.main_navigation.help') %></p>
+            <div class="card-group dd main_navigation_admin col-sm-7" id="nested-navigation" data-behavior="nestable" data-max-depth="1">
+              <ol class="dd-list">
+                <%= f.fields_for :main_navigations do |label| %>
+                  <%= render layout: 'spotlight/shared/dd3_item', locals: { id: label.object.nav_type, field: label, label: label.object.label_or_default, default_value: label.object.default_label, index: label.index, enabled_method: :display } do; end %>
+                <% end %>
+              </ol>
+            </div>
+          <% end %>
+        <% else %>
+          <%= render Spotlight::UneditableNonDefaultLanguageComponent.new(current_exhibit:, current_language: I18n.locale)%>
         <% end %>
       </div>
     </div>

data/app/views/spotlight/exhibits/_form.html.erb

@@ -1,8 +1,8 @@
 <%= bootstrap_form_for @exhibit, url: ((spotlight.exhibit_path(@exhibit) if @exhibit.persisted?) || spotlight.exhibits_path), layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10', html: {class: "row"} do |f| %>
 <div class="col-md-12">
   <%= f.text_field :title, disabled: !default_language?, help: !default_language? ? t('.uneditable_non_default_language') : '' %>
-  <%= f.text_field :subtitle %>
-  <%= f.text_area :description %>
+  <%= f.text_field :subtitle, disabled: !default_language?, help: !default_language? ? t('.uneditable_non_default_language') : '' %>
+  <%= f.text_area :description, disabled: !default_language?, help: !default_language? ? t('.uneditable_non_default_language') : '' %>
   <%= render Spotlight::TagListFormComponent.new(form: f) %>
   <%= f.form_group(:contact_emails, label: { text: nil, class: nil, for: 'exhibit_contact_email_0' }, class: 'form-group mb-3', help: nil) do %>
     <%= f.fields_for :contact_emails do |contact| %> 

data/app/views/spotlight/metadata_configurations/edit.html.erb

@@ -3,59 +3,59 @@
 <% end %>
 
 <%= configuration_page_title %>
-<%= bootstrap_form_for @blacklight_configuration, url: spotlight.exhibit_metadata_configuration_path(@exhibit), layout: :horizontal, label_col: 'col-md-3 col-sm-3', control_col: 'col-md-5 col-sm-5' do |f| %>
-    <h2><%= t(:'.order_header') %></h2>
+<%# These fields are translatable and should only be edited here in the default locale %>
+<% if default_language? %>
+  <%= bootstrap_form_for @blacklight_configuration, url: spotlight.exhibit_metadata_configuration_path(@exhibit), layout: :horizontal, label_col: 'col-md-3 col-sm-3', control_col: 'col-md-5 col-sm-5' do |f| %>
+      <h2><%= t(:'.order_header') %></h2>
 
-    <p class="instructions"><%= t :'.instructions' %></p>
+      <p class="instructions"><%= t :'.instructions' %></p>
 
-    <table id="nested-fields" class="metadata-configuration table table-striped dd-table">
-      <thead>
-        <tr>
-          <th class="w-50"><%= t :'.field.label' %></th>
-          <th class="text-center">
-            <div>
-              <%= t :'.view.show' %>
-            </div>
-            <div class="text-center">
-               <%= label_tag 'item_details', class: 'select-label'  do %>
-                  <%= select_deselect_action(t :'.view.select_id') %>
-                  <%= t(:'.select_all') %>
-                <% end %>
-             </div>
-          </th>
-          <% available_view_fields.keys.each do |type| %>
+      <table id="nested-fields" class="metadata-configuration table table-striped dd-table">
+        <thead>
+          <tr>
+            <th class="w-50"><%= t :'.field.label' %></th>
             <th class="text-center">
-              <div> 
-                <%= t :".view.#{type}", default: t("blacklight.search.view.#{type}", default: type.to_s.humanize.titleize) %>
+              <div>
+                <%= t :'.view.show' %>
               </div>
               <div class="text-center">
-                <%= label_tag t(:'.deselect_all') + type.to_s, class: 'select-label'  do %>
-                  <%= select_deselect_action(t(:'.deselect_all') + type.to_s) %>
-                  <%= t(:'.select_all') %>
-                <% end %>
+                <%= label_tag 'item_details', class: 'select-label'  do %>
+                    <%= select_deselect_action(t :'.view.select_id') %>
+                    <%= t(:'.select_all') %>
+                  <% end %>
               </div>
             </th>
+            <% available_view_fields.keys.each do |type| %>
+              <th class="text-center">
+                <div> 
+                  <%= t :".view.#{type}", default: t("blacklight.search.view.#{type}", default: type.to_s.humanize.titleize) %>
+                </div>
+                <div class="text-center">
+                  <%= label_tag t(:'.deselect_all') + type.to_s, class: 'select-label'  do %>
+                    <%= select_deselect_action(t(:'.deselect_all') + type.to_s) %>
+                    <%= t(:'.select_all') %>
+                  <% end %>
+                </div>
+              </th>
+            <% end %>
+            <th class="text-center"><%= t :'.type_label' %></th>
+          </tr>
+        </thead>
+        <tbody class="metadata_fields dd dd-list" data-behavior="nestable" data-max-depth="1" data-list-node-name="tbody" data-item-node-name="tr" data-expand-btn-HTML=" " data-collapse-btn-HTML=" ">
+          <%= f.fields_for :index_fields do |idxf| %>
+            <% @blacklight_configuration.blacklight_config.index_fields.select { |k, v| blacklight_configuration_context.evaluate_if_unless_configuration(v.original) }.each do |key, config| %>
+              <%= render partial: 'metadata_field', locals: { key: key, config: config, f: idxf } %>
+            <% end %>
           <% end %>
-          <th class="text-center"><%= t :'.type_label' %></th>
-        </tr>
-      </thead>
-      <tbody class="metadata_fields dd dd-list" data-behavior="nestable" data-max-depth="1" data-list-node-name="tbody" data-item-node-name="tr" data-expand-btn-HTML=" " data-collapse-btn-HTML=" ">
-        <%= f.fields_for :index_fields do |idxf| %>
-          <% @blacklight_configuration.blacklight_config.index_fields.select { |k, v| blacklight_configuration_context.evaluate_if_unless_configuration(v.original) }.each do |key, config| %>
-            <%= render partial: 'metadata_field', locals: { key: key, config: config, f: idxf } %>
-          <% end %>
-        <% end %>
-     </tbody>
-  </table>
+      </tbody>
+    </table>
 
-  <div class="form-actions">
-    <div class="primary-actions">
-      <%= f.submit nil, class: 'btn btn-primary' %>
+    <div class="form-actions">
+      <div class="primary-actions">
+        <%= f.submit nil, class: 'btn btn-primary' %>
+      </div>
     </div>
-  </div>
-<% end %>
-
-
+  <% end %>
     <h2 class="mt-4"><%= t(:'.exhibit_specific.header') %></h2>
     <p class="instructions"><%= t(:'.exhibit_specific.instructions') %></p>
 
@@ -80,4 +80,7 @@
     </table>
 
 
-<%= exhibit_create_link Spotlight::CustomField.new, class: 'btn btn-primary' %>
+  <%= exhibit_create_link Spotlight::CustomField.new, class: 'btn btn-primary' %>
+<% else %>
+  <%= render Spotlight::UneditableNonDefaultLanguageComponent.new(current_exhibit:, current_language: I18n.locale) %>
+<% end %>

data/app/views/spotlight/pages/_order_pages.html.erb

@@ -1,33 +1,38 @@
 <%= curation_page_title t(:"spotlight.pages.index.#{page_collection_name}.header") %>
-<%= bootstrap_form_for @exhibit, url: polymorphic_path([:update_all, @exhibit, page_collection_name.to_sym]), layout: :horizontal, control_col: 'col-sm-10', html: {:'data-form-observer' => true} do |f| %>
+<%# These fields are translatable and should only be edited here in the default locale %>
+<% if default_language? %>
+  <%= bootstrap_form_for @exhibit, url: polymorphic_path([:update_all, @exhibit, page_collection_name.to_sym]), layout: :horizontal, control_col: 'col-sm-10', html: {:'data-form-observer' => true} do |f| %>
 
-    <%= render partial: 'header', locals: {f: f} %>
-    <h2 class="mt-4"><%= t :'.pages_header' %></h2>
-    <p class="instructions"><%= t :'.instructions' %></p>
-    <div class="panel-group dd <%= page_collection_name %>_admin" id="nested-pages" data-behavior="nestable" <%= nestable_data_attributes(page_collection_name).html_safe %> >
-      <ol class="dd-list">
-        <%= f.fields_for page_collection_name do |p| %>
-          <%- if p.object.about_page? || p.object.top_level_page? -%>
-            <%= render partial: 'page', locals: {f: p, parent_form: f} %>
-          <%- end -%>
-        <% end %>
-      </ol>
-    </div>
-    <div class="form-actions float-end">
-      <div class="primary-actions">
-        <%= button_tag action_label(page_collection_name, :update_all), class: "btn btn-primary", disabled: disable_save_pages_button? %>
+      <%= render partial: 'header', locals: {f: f} %>
+      <h2 class="mt-4"><%= t :'.pages_header' %></h2>
+      <p class="instructions"><%= t :'.instructions' %></p>
+      <div class="panel-group dd <%= page_collection_name %>_admin" id="nested-pages" data-behavior="nestable" <%= nestable_data_attributes(page_collection_name).html_safe %> >
+        <ol class="dd-list">
+          <%= f.fields_for page_collection_name do |p| %>
+            <%- if p.object.about_page? || p.object.top_level_page? -%>
+              <%= render partial: 'page', locals: {f: p, parent_form: f} %>
+            <%- end -%>
+          <% end %>
+        </ol>
+      </div>
+      <div class="form-actions float-end">
+        <div class="primary-actions">
+          <%= button_tag action_label(page_collection_name, :update_all), class: "btn btn-primary", disabled: disable_save_pages_button? %>
+        </div>
       </div>
-    </div>
-<%- end -%>
-<div>
-  <%= form_for @page, url: spotlight.polymorphic_path([@exhibit, page_collection_name.to_sym]), html: {class: "expanded-add-button"} do |f|%>
-    <a href='#add-new' class="btn btn-primary" data-turbo="false" data-turbolinks="false" data-expanded-add-button="true" data-field-target="[data-title-field]">
-      <%= t(:'.new_page') %> <%= blacklight_icon('chevron_right') %>
-      <span data-title-field="true" class="input-field">
-        <%= f.text_field(:title) %>
-        <%= f.submit t(:'.save'), data: {behavior: "save"} %>
-        <%= f.submit t(:'.cancel'), data: {behavior: "cancel"} %>
-      </span>
-    </a>
   <%- end -%>
-</div>
+  <div>
+    <%= form_for @page, url: spotlight.polymorphic_path([@exhibit, page_collection_name.to_sym]), html: {class: "expanded-add-button"} do |f|%>
+      <a href='#add-new' class="btn btn-primary" data-turbo="false" data-turbolinks="false" data-expanded-add-button="true" data-field-target="[data-title-field]">
+        <%= t(:'.new_page') %> <%= blacklight_icon('chevron_right') %>
+        <span data-title-field="true" class="input-field">
+          <%= f.text_field(:title) %>
+          <%= f.submit t(:'.save'), data: {behavior: "save"} %>
+          <%= f.submit t(:'.cancel'), data: {behavior: "cancel"} %>
+        </span>
+      </a>
+    <%- end -%>
+  </div>
+<% else %>
+  <%= render Spotlight::UneditableNonDefaultLanguageComponent.new(current_exhibit:, current_language: I18n.locale)%>
+<% end %>

data/app/views/spotlight/search_configurations/edit.html.erb

@@ -3,45 +3,51 @@
 <% end %>
 
 <%= configuration_page_title %>
-<%= bootstrap_form_for @blacklight_configuration, url: spotlight.exhibit_search_configuration_path(@exhibit), layout: :horizontal, label_col: 'col-md-3 col-sm-3', control_col: 'col-md-5 col-sm-5' do |f| %>
-
-  <div role="tabpanel">
-    <ul class="nav nav-tabs" role="tablist">
-      <li role="presentation" class="nav-item">
-        <a href="#options" aria-controls="options" role="tab" data-bs-toggle="tab" class="nav-link active"><%= t(:'.tab.options') %></a>
-      </li>
-      <li role="presentation" class="nav-item">
-        <a href="#facets" aria-controls="facets" role="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.tab.facets') %></a>
-      </li>
-      <li role="presentation" class="nav-item">
-        <a href="#results" aria-controls="results" role="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.tab.results') %></a>
-      </li>
-    </ul>
-    <div class="tab-content">
-      <div role="tabpanel" class="tab-pane active" id="options">
-        <%= render 'search_fields', f: f %>
-      </div>
-
-      <div role="tabpanel" class="tab-pane" id="facets">
-        <%= render 'facets', f: f %>
-      </div>
 
-      <div role="tabpanel" class="tab-pane" id="results">
-        <%= field_set_tag do %>
-          <%= render 'document_index_view_types', f: f %>
-          <%= render 'default_per_page', f: f %>
-        <% end %>
+<%# These fields are translatable and should only be edited here in the default locale %>
+<% if default_language? %>
+  <%= bootstrap_form_for @blacklight_configuration, url: spotlight.exhibit_search_configuration_path(@exhibit), layout: :horizontal, label_col: 'col-md-3 col-sm-3', control_col: 'col-md-5 col-sm-5' do |f| %>
+
+    <div role="tabpanel">
+      <ul class="nav nav-tabs" role="tablist">
+        <li role="presentation" class="nav-item">
+          <a href="#options" aria-controls="options" role="tab" data-bs-toggle="tab" class="nav-link active"><%= t(:'.tab.options') %></a>
+        </li>
+        <li role="presentation" class="nav-item">
+          <a href="#facets" aria-controls="facets" role="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.tab.facets') %></a>
+        </li>
+        <li role="presentation" class="nav-item">
+          <a href="#results" aria-controls="results" role="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.tab.results') %></a>
+        </li>
+      </ul>
+      <div class="tab-content">
+        <div role="tabpanel" class="tab-pane active" id="options">
+          <%= render 'search_fields', f: f %>
+        </div>
+
+        <div role="tabpanel" class="tab-pane" id="facets">
+          <%= render 'facets', f: f %>
+        </div>
+
+        <div role="tabpanel" class="tab-pane" id="results">
+          <%= field_set_tag do %>
+            <%= render 'document_index_view_types', f: f %>
+            <%= render 'default_per_page', f: f %>
+          <% end %>
+
+          <%= render 'sort', f: f %>
+        </div>
 
-        <%= render 'sort', f: f %>
       </div>
-
     </div>
-  </div>
 
-  <div class="form-actions">
-    <div class="primary-actions">
-      <%= f.submit nil, class: 'btn btn-primary' %>
+    <div class="form-actions">
+      <div class="primary-actions">
+        <%= f.submit nil, class: 'btn btn-primary' %>
+      </div>
     </div>
-  </div>
 
+  <% end %>
+<% else %>
+  <%= render Spotlight::UneditableNonDefaultLanguageComponent.new(current_exhibit:, current_language: I18n.locale)%>
 <% end %>

data/app/views/spotlight/searches/index.html.erb

@@ -4,14 +4,14 @@
 
 <%= curation_page_title %>
 
-<% if @searches.empty? %>
+<% if @searches.empty? && default_language? %>
   <%= t :'.no_saved_searches' %>
   <% unless @exhibit.searchable? %>
     <p class="instructions alert-warning">
       <%= t(:'.not_searchable_html', href: link_to(t(:'spotlight.configuration.sidebar.search_configuration'), spotlight.edit_exhibit_search_configuration_path(@exhibit))) %>
     </p>
   <% end %>
-<% else %>
+<% elsif default_language? %>
   <div role="tabpanel">
     <ul class="nav nav-tabs" role="tablist">
       <li role="presentation" class="nav-item">
@@ -74,4 +74,6 @@
       </div>
     </div>
   </div>
+<% else %>
+  <%= render Spotlight::UneditableNonDefaultLanguageComponent.new(current_exhibit:, current_language: I18n.locale) %>
 <% end %>

data/app/views/spotlight/translations/_page.html.erb

@@ -1,7 +1,7 @@
 <% translated_page = page.translated_page_for(@language) %>
 <tr data-translation-progress-item="true">
   <td>
-    <%= link_to page.title, polymorphic_path([spotlight, current_exhibit, page]) %>
+    <%= link_to page.default_locale_title, polymorphic_path([spotlight, current_exhibit, page], locale: I18n.default_locale) %>
     <p class="<%= 'default-page-outdated' if page.updated_after? translated_page %>">
       <%= l(page.updated_at, format: :long) %>
     </p>

data/config/locales/spotlight.en.yml

@@ -200,6 +200,7 @@ en:
           has_alt_text: Items with alt text
           page_title: Page title
         total_items: Of the items displayed via widgets, <b>%{has_alt_text} of %{total_alt_items}</b> have entered alt text (or a checked decorative box).
+        unpublished: Unpublished
       header: Accessibility
     admin_users:
       create:
@@ -575,6 +576,10 @@ en:
           published:
             help_block: ''
         uneditable_non_default_language: This field is not editable in the current language. Switch to the default language to edit it.
+        uneditable_non_default_language_form:
+          default_language: Switch to default language
+          instructions: Please use the translations editor or switch to the default language to make configuration changes.
+          translations: Edit translations
       groups:
         all: All
       import:

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '5.0.1'
+  VERSION = '5.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-24 00:00:00.000000000 Z
+date: 2025-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status
@@ -865,8 +865,6 @@ files:
 - app/components/spotlight/analytics/aggregation_component.rb
 - app/components/spotlight/analytics/dashboard_component.html.erb
 - app/components/spotlight/analytics/dashboard_component.rb
-- app/components/spotlight/blocks/heading_block_component.erb
-- app/components/spotlight/blocks/heading_block_component.rb
 - app/components/spotlight/breadcrumbs_component.html.erb
 - app/components/spotlight/breadcrumbs_component.rb
 - app/components/spotlight/bulk_action_component.html.erb
@@ -899,6 +897,8 @@ files:
 - app/components/spotlight/title_component.rb
 - app/components/spotlight/translations/subheading_component.html.erb
 - app/components/spotlight/translations/subheading_component.rb
+- app/components/spotlight/uneditable_non_default_language_component.html.erb
+- app/components/spotlight/uneditable_non_default_language_component.rb
 - app/controllers/concerns/spotlight/base.rb
 - app/controllers/concerns/spotlight/catalog.rb
 - app/controllers/concerns/spotlight/config.rb
@@ -1548,7 +1548,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections

data/app/components/spotlight/blocks/heading_block_component.erb

@@ -1,2 +0,0 @@
-<p>I am in the component</p>
-<%= content_tag heading_tag, text %>

data/app/components/spotlight/blocks/heading_block_component.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-module Spotlight
-  module Blocks
-    # Sir Trevor Heading Block
-    class HeadingBlockComponent < ViewComponent::Base
-      def initialize(heading_block:)
-        @heading_block = heading_block
-        super
-      end
-
-      attr_reader :heading_block
-
-      delegate :level, to: :heading_block
-      delegate :format, to: :heading_block
-      delegate :text, to: :heading_block
-
-      def heading_tag
-        return "h#{level}" if html? && valid_level?
-
-        # h2 was Spotlight's default heading tag for 10+ years.
-        'h2'
-      end
-
-      private
-
-      def valid_level?
-        level.to_i.between?(1, 6)
-      end
-
-      def html?
-        heading_block.format.to_s == 'html'
-      end
-    end
-  end
-end