blacklight-spotlight 3.0.0.alpha.8 → 3.0.0.rc3

data/app/assets/stylesheets/spotlight/_header.scss

@@ -79,7 +79,7 @@
 .image-masthead {
   background-color: $black;
 
-  .navbar {
+  .exhibit-navbar {
     @extend .navbar-dark;
     background-color: $navbar-transparent-page-bg;
 

data/app/assets/stylesheets/spotlight/_item_text_block.scss

@@ -21,6 +21,12 @@
   }
 }
 
+.item-text {
+  .items-col {
+    z-index: 1;
+  }
+}
+
 .item-text-admin {
   .text-align {
     margin-top: 15px;

data/app/assets/stylesheets/spotlight/_pages.scss

@@ -58,13 +58,18 @@
   }
 
   .contact-properties {
-    padding-left: 1rem;
-    text-indent: -1rem;
+    padding-left: 0.125rem;
+
+    > div {
+      padding-bottom: 5px;
+    }
   }
 
   ol.contacts {
+    line-height: 1.33;
+
     li {
-      margin-bottom: $spacer * .5;
+      margin-bottom: 1rem;
       margin-top: $spacer * .5;
       word-break: break-word;
       .name {
@@ -76,7 +81,7 @@
   ol.sidenav {
     li {
       color: $gray-900;
-      margin-top: $spacer * .25;
+      margin-top: $spacer * .5;
     }
 
     ol.subsection {
@@ -102,7 +107,7 @@
   height: 70px;
   margin-right: 15px;
   margin-top: 3px;
-  width: 70px;
+  min-width: 70px;
 }
 
 // Indent contact fields so they align evenly, only when there is a contact photo

data/app/assets/stylesheets/spotlight/_report_a_problem.scss

@@ -1,7 +1,10 @@
 #report-problem-form {
   display: none;
-  background-color: #e7e7e7;
-  border-bottom: 1px dotted $gray-600;
+  border-bottom: 1px solid $gray-600;
+
+  h2 {
+    @extend .sr-only;
+  }
 }
 
 @include media-breakpoint-up(sm) {

data/app/assets/stylesheets/spotlight/_spotlight.scss

@@ -5,7 +5,9 @@
 @import "spotlight/sir-trevor_overrides";
 @import "spotlight/attachments";
 @import "spotlight/pages";
+@import "spotlight/breadcrumbs";
 @import "spotlight/browse";
+@import "spotlight/browse_group_categories_block";
 @import "spotlight/header";
 @import "spotlight/footer";
 @import "spotlight/catalog";

data/app/assets/stylesheets/spotlight/_translations.scss

@@ -36,6 +36,7 @@
   }
 }
 
+.translation-subtitle-toggle,
 .translation-description-toggle {
   margin: 0;
   padding: 0;
@@ -77,3 +78,9 @@
   margin-top: $spacer;
   padding-bottom: 3px;
 }
+
+.translation-import-export-label {
+  @media (min-width: 576px) {
+    text-align: right;
+  }
+}

data/app/assets/stylesheets/spotlight/browse_group_categories_block.scss

@@ -0,0 +1,69 @@
+@import "tiny-slider";
+
+.browse-group-categories-block {
+  padding-bottom: $spacer * .75;
+  padding-top: $spacer * .75;
+  
+  .spotlight-flexbox.browse-categories .box {
+    display: flex;
+  }
+
+  .browse-group-categories-controls {
+    list-style: none;
+    li {
+      display: inline-block;
+      cursor: pointer;
+    }
+
+    .blacklight-icon-arrow-alt-circle-left, .blacklight-icon-arrow-alt-circle-right {
+      display: inline-block;
+      fill: $gray-600;
+      height: 44px;
+      width: 44px;
+      
+      &:hover,&:focus {
+        fill: $gray-700;
+      }
+    }
+
+    li[aria-disabled="true"] {
+      cursor: auto;
+    }
+
+    [aria-disabled="true"] {
+      .blacklight-icon-arrow-alt-circle-left, .blacklight-icon-arrow-alt-circle-right {
+        fill: $gray-400;
+
+        &:hover,&:focus {
+          fill: $gray-400;
+        }
+      }
+    }
+  }
+
+  // Coming from tiny-slider, make sure these disappear when navigating via turbolinks
+  .tns-controls {
+    display: none;
+  }
+
+  @media screen and (min-width: breakpoint-min("md")) {
+    .browse-group-categories-controls {
+      .blacklight-icon-arrow-alt-circle-left, .blacklight-icon-arrow-alt-circle-right {
+        height: 32px;
+        width: 32px;
+      }
+    }
+
+    &[data-browse-group-categories-count="2"],&[data-browse-group-categories-count="3"] {
+      .browse-group-categories-controls {
+        display: none !important;
+      }
+    }
+  }
+}
+
+[dir="rtl"] {
+  .browse-group-categories-block .blacklight-icon-arrow-alt-circle-left, .blacklight-icon-arrow-alt-circle-right{
+    transform: rotate(180deg);
+  }
+}

data/app/builders/spotlight/bootstrap_breadcrumbs_builder.rb

@@ -31,8 +31,7 @@ module Spotlight
     private
 
     def element_label(element)
-      label = compute_name(element)
-      @context.truncate(label, escape: !label.html_safe?, length: 30, separator: ' ')
+      @context.content_tag(:span, class: 'truncated-value') { compute_name(element) }
     end
   end
 end

data/app/controllers/concerns/spotlight/search_helper.rb

@@ -4,15 +4,9 @@ module Spotlight
   # ...
   module SearchHelper
     def search_service(user_params = respond_to?(:search_state, true) ? search_state.to_h : {})
-      search_service_class.new(config: blacklight_config, user_params: user_params, **search_service_context)
-    end
+      klass = respond_to?(:search_service_class) ? search_service_class : Blacklight::SearchService
 
-    def search_service_class
-      if defined?(super)
-        super
-      else
-        Blacklight::SearchService
-      end
+      klass.new(config: blacklight_config, user_params: user_params, **search_service_context)
     end
 
     # @return [Hash] a hash of context information to pass through to the search service

data/app/controllers/spotlight/appearances_controller.rb

@@ -30,17 +30,5 @@ module Spotlight
                                       masthead_attributes: featured_image_params,
                                       thumbnail_attributes: featured_image_params)
     end
-
-    def featured_image_params
-      %i[
-        iiif_region iiif_tilesource
-        iiif_manifest_url iiif_canvas_id
-        iiif_image_id
-        display
-        source
-        image
-        document_global_id
-      ]
-    end
   end
 end

data/app/controllers/spotlight/browse_controller.rb

@@ -9,7 +9,8 @@ module Spotlight
     include Spotlight::Catalog
     include Blacklight::Facet
 
-    load_and_authorize_resource :search, except: :index, through: :exhibit, parent: false
+    load_and_authorize_resource :group, through: :exhibit
+    load_and_authorize_resource :search, through: %i[group exhibit], parent: false
     before_action :attach_breadcrumbs
     before_action :attach_search_breadcrumb, only: :show
     record_search_parameters only: :show
@@ -20,10 +21,12 @@ module Spotlight
 
     before_action do
       blacklight_config.track_search_session = false
+      blacklight_config.view.gallery.classes = 'row-cols-2 row-cols-md-4'
     end
 
     def index
-      @searches = @exhibit.searches.published
+      @groups = @exhibit.groups.published
+      @searches = @searches.published
     end
 
     def show
@@ -66,10 +69,11 @@ module Spotlight
     def attach_breadcrumbs
       add_breadcrumb t(:'spotlight.curation.nav.home', title: @exhibit.title), @exhibit
       add_breadcrumb(@exhibit.main_navigations.browse.label_or_default, exhibit_browse_index_path(@exhibit))
+      add_breadcrumb(@group.title, exhibit_browse_groups_path(@exhibit, @group)) if @group.present?
     end
 
     def attach_search_breadcrumb
-      add_breadcrumb @search.title, exhibit_browse_path(@exhibit, @search)
+      add_breadcrumb @search.full_title, (@group.present? ? exhibit_browse_group_path(@exhibit, @group, @search) : exhibit_browse_path(@exhibit, @search))
     end
 
     def _prefixes

data/app/controllers/spotlight/catalog_controller.rb

@@ -127,7 +127,7 @@ module Spotlight
       # /exhibits/1?f%5Bgenre_sim%5D%5B%5D=map&q= is not the same as /exhibits/1
       # Otherwise the exhibit breadcrumb won't be a link.
       # see http://api.rubyonrails.org/classes/ActionView/Helpers/UrlHelper.html#method-i-current_page-3F
-      if view_context.current_page?(action: :admin)
+      if view_context.current_page?({ action: :admin })
         add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), exhibit_root_path(@exhibit, q: '')
       else
         # When not on the admin page, get the translated value for the "Home" breadcrumb

data/app/controllers/spotlight/concerns/application_controller.rb

@@ -38,7 +38,6 @@ module Spotlight
         end
       end
 
-      # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
       def field_enabled?(field, *args)
         if !field.enabled
           false
@@ -52,7 +51,6 @@ module Spotlight
           field.send(document_index_view_type)
         end
       end
-      # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
 
       private
 
@@ -82,6 +80,19 @@ module Spotlight
       def default_document_index_view_type
         document_index_views.select { |_k, config| config.respond_to?(:default) && config.default }.keys.first || document_index_views.keys.first
       end
+
+      def featured_image_params
+        %i[
+          iiif_region iiif_tilesource
+          iiif_manifest_url iiif_canvas_id
+          iiif_image_id
+          display
+          source
+          image
+          document_global_id
+          upload_id
+        ]
+      end
     end
   end
 end

data/app/controllers/spotlight/exhibits_controller.rb

@@ -27,8 +27,7 @@ module Spotlight
     end
 
     def process_import
-      @exhibit.import(JSON.parse(import_exhibit_params.read))
-      if @exhibit.save && @exhibit.reindex_later
+      if @exhibit.import(JSON.parse(import_exhibit_params.read)) && @exhibit.reindex_later
         redirect_to spotlight.exhibit_dashboard_path(@exhibit), notice: t(:'helpers.submit.exhibit.updated', model: @exhibit.class.model_name.human.downcase)
       else
         render action: :import
@@ -50,7 +49,7 @@ module Spotlight
       respond_to do |format|
         format.json do
           authorize! :export, @exhibit
-          send_data JSON.pretty_generate(Spotlight::ExhibitExportSerializer.new(@exhibit).as_json),
+          send_data JSON.pretty_generate(Spotlight::ExhibitImportExportService.new(@exhibit).as_json),
                     type: 'application/json',
                     disposition: 'attachment',
                     filename: "#{@exhibit.friendly_id}-export.json"

data/app/controllers/spotlight/featured_images_controller.rb

@@ -3,7 +3,7 @@
 module Spotlight
   # Handles requests to upload images for exhibit thumbnails
   class FeaturedImagesController < Spotlight::ApplicationController
-    load_and_authorize_resource instance_name: :featured_image
+    load_and_authorize_resource instance_name: :featured_image, class: 'Spotlight::TemporaryImage'
 
     def create
       if @featured_image.save && @featured_image.file_present?

data/app/controllers/spotlight/groups_controller.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module Spotlight
+  ##
+  # Base CRUD controller for groups
+  class GroupsController < Spotlight::ApplicationController
+    before_action :authenticate_user!
+    load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
+    load_and_authorize_resource through: :exhibit
+
+    def index
+      respond_to do |format|
+        format.json do
+          render json: @groups.as_json, root: false
+        end
+      end
+    end
+
+    # POST /exhibits/1/groups
+    def create
+      @group.attributes = group_params
+
+      if @group.save
+        redirect_to(
+          spotlight.exhibit_searches_path(anchor: 'browse-groups'),
+          notice: t(:'helpers.submit.group.created', model: human_name)
+        )
+      else
+        redirect_to spotlight.exhibit_searches_path(anchor: 'browse-groups')
+      end
+    end
+
+    # PATCH/PUT /groups/1
+    def update
+      @group.update(group_params)
+
+      redirect_to spotlight.exhibit_searches_path(anchor: 'browse-groups'), notice: t(:'helpers.submit.group.updated', model: human_name)
+    end
+
+    # DELETE /groups/1
+    def destroy
+      @group.destroy
+
+      redirect_to spotlight.exhibit_searches_path(anchor: 'browse-groups'), alert: t(:'helpers.submit.group.destroyed', model: human_name)
+    end
+
+    def update_all
+      notice = if @exhibit.update update_all_group_params
+                 t(:'helpers.submit.group.batch_updated', model: human_name)
+               else
+                 t(:'helpers.submit.group.batch_error', model: human_name)
+               end
+      redirect_to spotlight.exhibit_searches_path(anchor: 'browse-groups'), notice: notice
+    end
+
+    protected
+
+    def allowed_group_params
+      [:title]
+    end
+
+    private
+
+    def human_name
+      @human_name ||= @group ? @group.class.model_name.human.downcase : Spotlight::Group.model_name.human.pluralize
+    end
+
+    alias group_collection_name controller_name
+
+    def update_all_group_params
+      params.require(:exhibit).permit(
+        groups_attributes: %i[id title published weight]
+      )
+    end
+
+    def group_params
+      params.require(controller_name.singularize).permit(allowed_group_params)
+    end
+  end
+end

data/app/controllers/spotlight/pages_controller.rb

@@ -19,6 +19,10 @@ module Spotlight
 
     helper_method :get_search_results, :search_results, :fetch, :page_collection_name, :presenter
 
+    before_action do
+      blacklight_config.view.gallery.classes = 'row-cols-2 row-cols-md-4' unless @page&.display_sidebar
+    end
+
     # GET /exhibits/1/pages
     def index
       # set up a model the inline "add a new page" form
@@ -70,7 +74,7 @@ module Spotlight
       @page.lock&.delete
 
       if @page.update(page_params.merge(last_edited_by: current_user))
-        redirect_to [spotlight, @page.exhibit, @page], flash: { html_safe: true }, notice: undo_notice(:updated)
+        redirect_to [spotlight, @page.exhibit, @page, format: params.permit(:format)], flash: { html_safe: true }, notice: undo_notice(:updated)
       else
         render action: 'edit'
       end
@@ -146,14 +150,7 @@ module Spotlight
     end
 
     def allowed_page_params
-      [:title, :content, thumbnail_attributes: featured_image_attributes]
-    end
-
-    def featured_image_attributes
-      %i[
-        source image document_global_id iiif_region iiif_tilesource
-        iiif_manifest_url iiif_canvas_id iiif_image_id
-      ]
+      [:title, :content, thumbnail_attributes: featured_image_params]
     end
 
     def human_name