arclight 0.2.0 → 0.3.0

data/app/views/catalog/_sort_and_per_page.html.erb

@@ -0,0 +1,8 @@
+<% # overidden from Blacklight to handle our responsive needs %>
+<div id="sortAndPerPage" class="sort-pagination clearfix">
+  <div>
+    <%= render partial: "paginate_compact", object: @response if show_pagination? %>
+  </div>
+  <%= render partial: 'group_toggle' unless current_page?(controller: 'bookmarks')  %>
+  <%= render_results_collection_tools wrapping_class: "search-widgets float-md-right" %>
+</div>

data/app/views/catalog/_within_collection_dropdown.html.erb

@@ -0,0 +1,26 @@
+<div class="input-group within-collection-dropdown flex-nowrap flex-shrink-1 mb-2 mb-md-0 mr-md-2">
+  <span class="input-group-prepend">
+    <label class="input-group-text" for="within_collection">
+      <%= t('arclight.within_collection_dropdown.label_html') %>
+    </label>
+  </span>
+  <select
+    id="within_collection"
+    class="custom-select search-field rounded-right"
+    <%= 'name="f[collection_sim][]"'.html_safe if within_collection_context? %>
+  >
+    <option
+      <%= "selected" unless within_collection_context? %>
+      value=""
+    >
+      <%= t('arclight.within_collection_dropdown.all_collections') %>
+    </option>
+    <option
+      value="<%= Array(params.dig(:f, :collection_sim)).first || @document && @document.collection_name %>"
+      <%= 'selected' if within_collection_context? %>
+      <%= 'disabled' unless within_collection_context? %>
+    >
+      <%= t('arclight.within_collection_dropdown.this_collection') %>
+    </option>
+  </select>
+</div>

data/app/views/shared/_breadcrumbs.html.erb

@@ -1,15 +1,15 @@
-<div class='al-search-breadcrumb'>
+<nav class='al-search-breadcrumb' role='navigation' aria-label=<%= t('arclight.breadcrumbs.aria_label') %> >
   <%= link_to t('arclight.routes.home'), root_path %>
-  <%= t('arclight.breadcrumb_separator') %>
+  <span aria-hidden="true"><%= t('arclight.breadcrumb_separator') %></span>
   <% if collection_active? %>
     <%= t('arclight.routes.collections') %>
   <% elsif on_repositories_index? %>
     <%= t('arclight.routes.repositories') %>
   <% elsif on_repositories_show? %>
     <%= link_to t('arclight.routes.repositories'), arclight_engine.repositories_path %>
-    <%= t('arclight.breadcrumb_separator') %>
+    <span aria-hidden="true"><%= t('arclight.breadcrumb_separator') %></span>
     <%= @repository.name %>
   <% else %>
     <%= t('arclight.routes.search_results') %>
   <% end %>
-</div>
+</nav>

data/app/views/shared/_context_sidebar.html.erb

@@ -1,6 +1,6 @@
-<% unless blacklight_config.show.context_sidebar_items.nil? %>
+<% unless blacklight_config.show.context_access_tab_items.nil? %>
   <div id="accordion" role="tablist" aria-multiselectable="true">
-    <% items = blacklight_config.show.context_sidebar_items.select { |i|  fields_have_content?(@document, i) }  %>
+    <% items = blacklight_config.show.context_access_tab_items.select { |i|  fields_have_content?(@document, i) }  %>
     <% items.each_with_index do |item, index| %>
       <%= render partial: 'context_card', locals: { document: @document, field_accessor: item, card_index: index} %>
     <% end %>

data/app/views/shared/_header_navbar.html.erb

@@ -21,16 +21,17 @@
           </div>
 
           <div class="col-md-4 nav-links d-flex justify-content-end" >
-            <span class="navbar-nav" aria-label="browse" role="navigation">
+            <ul class="navbar-nav" aria-label="browse" role="navigation">
               <%= render 'shared/main_menu_links' %>
-            </span>
+            </ul>
           </div>
         </div>
-      </div>
-      <div class='row justify-content-md-center'>
-        <div class='col-md-6 col-sm-12'>
-          <div class='navbar-search'>
-            <%= render_search_bar %>
+
+        <div class='row justify-content-md-center'>
+          <div class='col-12'>
+            <div class='navbar-search'>
+              <%= render_search_bar %>
+            </div>
           </div>
         </div>
       </div>
@@ -40,25 +41,20 @@
       <div class="container">
         <div class="row align-items-center">
           <div class="col-md-8" >
-            <h1><%= t('arclight.masthead_heading') %></h1>
+            <span class="h1"><%= t('arclight.masthead_heading') %></span>
           </div>
 
           <div class="col-md-4 nav-links d-flex justify-content-end" >
-            <span class="navbar-nav" aria-label="browse" role="navigation">
+            <ul class="navbar-nav" aria-label="browse" role="navigation">
               <%= render 'shared/main_menu_links' %>
-            </span>
+            </ul>
           </div>
         </div>
       </div>
     </div>
-    <div class="navbar-search navbar navbar-expand-sm bg-faded">
+    <div class="navbar-search navbar">
       <div class="<%= container_classes %>">
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-          <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse" id="navbarSupportedContent">
-          <%= render_search_bar  %>
-        </div>
+        <%= render_search_bar  %>
       </div>
     </div>
   <% end %>

data/app/views/shared/_show_breadcrumbs.html.erb

@@ -0,0 +1,27 @@
+<% parents = Arclight::Parents.from_solr_document(document).as_parents %>
+<nav aria-label="breadcrumb">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-home-link">
+      <%= link_to t('arclight.routes.home'), root_path %>
+    </li>
+    <li class="media breadcrumb-item  breadcrumb-item-1">
+      <% if document.repository_config.present? %>
+        <span class="media-body" aria-hidden="true"><%= blacklight_icon :repository, classes: 'al-repository-content-icon' %></span>
+        <span class="col"><%= link_to(document.repository_config.name, arclight_engine.repository_path(document.repository_config.slug)) %></span>
+      <% else %>
+          <span class="media-body" aria-hidden="true"><%= blacklight_icon :repository, classes: 'al-repository-content-icon' %></span><span class="col"><%= t('arclight.show_breadcrumb_label') %></span>
+      <% end %>
+    </li>
+    <% parents.each_with_index.map do |parent, index| %>
+      <%= content_tag :li, class: "breadcrumb-item breadcrumb-item-#{index + 1} media" do %>
+        <span class="media-body" aria-hidden="true"><%= blacklight_icon document_or_parent_icon(parent) %></span>
+        <span class="col"><%= link_to parent.label, solr_document_path(parent.global_id) %></span>
+      <% end %> 
+    <% end %>
+  </ol>
+
+  <%= content_tag :h1, class: "breadcrumb-item breadcrumb-item-#{parents.length + 2} media" do %>
+    <span class="media-body" aria-hidden="true"><%= blacklight_icon document_or_parent_icon(document) %></span>
+    <span class="col"><%= document.normalized_title %></span>
+  <% end %>
+</nav>

data/arclight.gemspec

@@ -1,7 +1,6 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'arclight/version'
 
@@ -23,21 +22,21 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'blacklight', '~> 7.0', '>= 7.0.1'
+  spec.add_dependency 'blacklight', '~> 7.2'
   spec.add_dependency 'blacklight_range_limit', '~> 7.1'
   spec.add_dependency 'rails', '~> 5.0'
-  spec.add_dependency 'solr_ead'
+  spec.add_dependency 'sprockets-bumble_d'
   spec.add_dependency 'traject', '~> 3.0'
-  spec.add_dependency 'traject_plus'
+  spec.add_dependency 'traject_plus', '~> 1.2'
 
   spec.add_development_dependency 'bundler', '> 1.14'
   spec.add_development_dependency 'capybara'
   spec.add_development_dependency 'engine_cart'
   spec.add_development_dependency 'i18n-tasks'
   spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rspec-rails', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.74.0'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.35'
-  spec.add_development_dependency 'rspec-rails', '~> 3.0'
   spec.add_development_dependency 'selenium-webdriver'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'solr_wrapper'

data/config/i18n-tasks.yml

@@ -96,7 +96,8 @@ ignore_missing:
 - '{blacklight}.*'
 
 ## Consider these keys used:
-# ignore_unused:
+ignore_unused:
+  - '{blacklight}.*'
 # - 'activerecord.attributes.*'
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'

data/config/locales/arclight.en.yml

@@ -2,13 +2,14 @@
 en:
   arclight:
     breadcrumb_separator: " » "
-    date_range_histogram:
-      hide: Hide date distribution
-      show: Show date distribution
+    breadcrumbs:
+      aria_label: breadcrumb
     hierarchy:
       scope_and_contents: Scope and Contents
+      scope_note: 'Scope note: '
       view_all: View
     masthead_heading: Archival Collections at Institution
+    repositories: Repositories
     request:
       container: Request
     routes:
@@ -16,46 +17,64 @@ en:
       home: Home
       repositories: Repositories
       search_results: Search results
+    search:
+      collections_header: Collections
+      repository_header: 'Collections : [%{repository}]'
+    show_breadcrumb_label: Repository
     truncation:
       view_less: view less ▼
       view_more: view more ▶
     views:
+      home:
+        title: Archival Collections at Institution - Arclight
       index:
-        collection_search:
-          count: collection
-        number_of_children:
-          one: 1 child
-          other: "%{count} children"
-          zero: No children
-      online_content_indicator: online content
+        all_group_results: view all %{count}
+        all_results: All results
+        group_by_collection: Grouped by collection
+        group_results: Group results
+        group_results_count:
+          one: 1 result
+          other: "%{count} results"
+          zero: 0 results
+        number_of_components:
+          one: component
+          other: components
+        top_group_results:
+          one: Top %{count} result
+          other: Top %{count} results
       repositories:
         number_of_collections:
           one: 1 collection
           other: "%{count} collections"
           zero: No collections
+        show: "%{name} - Arclight"
+        title: Repositories - Arclight
         view_all_collections: View all of our collections
         view_more: View more
       show:
+        access: Access
+        collapse: Collapse
         collection_id: 'Collection ID: %{id}'
-        context_sidebar:
-          cite_field: How to cite this collection
-          component_terms_field: Terms & Conditions
-          in_person_field: In person
-          terms_field: Terms & Conditions
+        context: Collection context
+        context_nav:
+          title: Collection context navigation
         download:
           default: Download
-          ead: Collection EAD (%{size})
-          pdf: Collection PDF (%{size})
-        navigation_sidebar:
-          title: Navigation overview
+          ead: Download EAD
+          pdf: Download finding aid
+        download_with_size:
+          default: Download (%{size})
+          ead: Download EAD (%{size})
+          pdf: Download finding aid (%{size})
+        expand: Expand
+        has_content: Contents
         no_contents: No content inventory
-        no_online_content: No online content
         online_content: Online content
+        online_content_upper: ONLINE CONTENT
         our_collections: Our Collections
         overview: Overview
         sections:
           access_field: Access and Use
-          admin_info_field: Administrative Information
           background_field: Background
           collection_context_field: Collection Context
           component_field: About this %{level}
@@ -64,3 +83,17 @@ en:
           related_field: Related
           scope_and_arrangement_field: Scope and Arrangement
           summary_field: Summary
+        tablist_nav: Context
+    within_collection_dropdown:
+      all_collections: all collections
+      label_html: Search<span class="sr-only"> within</span>
+      this_collection: this collection
+  blacklight:
+    entry_name:
+      grouped:
+        collection_ssi: collection
+    search:
+      pagination_info:
+        pages:
+          one: "<strong>%{start_num}</strong> - <strong>%{end_num}</strong> of <strong>%{total_num} %{entry_name}</strong>"
+          other: "<strong>%{start_num}</strong> - <strong>%{end_num}</strong> of <strong>%{total_num} %{entry_name}</strong>"

data/lib/arclight/engine.rb

@@ -1,34 +1,36 @@
 # frozen_string_literal: true
 
+require 'sprockets/bumble_d'
 require 'blacklight'
-require 'solr_ead'
 require 'traject'
+require 'active_model'
 require 'arclight/exceptions'
 require 'arclight/normalized_date'
 require 'arclight/normalized_id'
 require 'arclight/normalized_title'
 require 'arclight/digital_object'
-require 'arclight/shared_indexing_behavior'
-require 'arclight/shared_terminology_behavior'
-require 'arclight/custom_document'
-require 'arclight/custom_component'
-require 'arclight/solr_ead_indexer_ext'
-require 'arclight/indexer'
 require 'arclight/viewer'
 
 module Arclight
   ##
   # This is the defining class for the Arclight Rails Engine
   class Engine < ::Rails::Engine
+    extend ::Sprockets::BumbleD::DSL
+
+    # We're not sure this is right, but we aren't doing module imports
+    # at the moment anyway
+    register_umd_globals :arclight,
+                         'blacklight' => 'Blacklight'
+
     config.viewer_class = Arclight::Viewers::OEmbed
     config.oembed_resource_exclude_patterns = [/\.pdf$/, /\.ppt$/]
 
     Arclight::Engine.config.catalog_controller_field_accessors = %i[
       summary_field
       access_field
+      contact_field
       background_field
       related_field
-      admin_info_field
       terms_field
       cite_field
       indexed_terms_field
@@ -39,6 +41,18 @@ module Arclight
       component_indexed_terms_field
     ]
 
+    Arclight::Engine.config.catalog_controller_group_query_params = {
+      group: true,
+      'group.field': 'collection_ssi',
+      'group.ngroups': true,
+      'group.limit': 3,
+      fl: '*,parent:[subquery]',
+      'parent.fl': '*',
+      'parent.q': '{!term f=collection_sim v=$row.collection_ssi}',
+      'parent.fq': '{!term f=level_sim v="Collection"}',
+      'parent.defType': 'lucene'
+    }
+
     initializer 'arclight.fields' do
       Arclight::Engine.config.catalog_controller_field_accessors.each do |field|
         Blacklight::Configuration.define_field_access field
@@ -48,9 +62,5 @@ module Arclight
     initializer 'arclight.helpers' do
       ActionView::Base.send :include, ArclightHelper
     end
-
-    initializer 'arclight.views' do
-      Blacklight::Configuration.default_values[:view].hierarchy
-    end
   end
 end

data/lib/arclight/hash_absolute_xpath.rb

@@ -24,17 +24,12 @@ module Arclight
     end
 
     def to_hexdigest
-      self.class.hash_algorithm.hexdigest(absolute_xpath)
+      self.class.hash_algorithm.hexdigest(absolute_xpath).prepend('al_')
     end
 
     def absolute_xpath
       ancestor_tree = node.ancestors.map do |ancestor|
-        if ancestor.name =~ COMPONENT_NODE_NAME_REGEX
-          index = component_siblings_for_node(ancestor).index(ancestor)
-          "#{ancestor.name}#{index}"
-        else
-          ancestor.name
-        end
+        ancestor_name_and_index(ancestor)
       end
 
       "#{[ancestor_tree.reverse, node.name].flatten.join('/')}#{current_index}"
@@ -53,5 +48,14 @@ module Arclight
     def siblings
       @siblings ||= component_siblings_for_node(node)
     end
+
+    def ancestor_name_and_index(ancestor)
+      if ancestor.name =~ COMPONENT_NODE_NAME_REGEX
+        index = component_siblings_for_node(ancestor).index(ancestor)
+        "#{ancestor.name}#{index}"
+      else
+        ancestor.name
+      end
+    end
   end
 end

data/lib/arclight/level_label.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Arclight
+  ##
+  # A utility class to return a human-readable label for an EAD @level code.
+  # Can use the value from @otherlevel if provided.
+  # Examples from @level: recordgrp = "Record Group"
+  #                       collection = "Collection"
+  #                       subseries = "Subseries"
+  #                       otherlevel = (text provided in @otherlevel)
+  class LevelLabel
+    # @param [String] `level` from the collection or component @level
+    # @param [String] `other_level` from the collection or component @otherlevel
+    def initialize(level, other_level = nil)
+      @level = level
+      @other_level = other_level if other_level.present?
+    end
+
+    # @return [String] the human-readable label
+    def to_s
+      human_readable_level
+    end
+
+    private
+
+    attr_reader :level, :other_level
+
+    CUSTOM_LEVEL_LABELS = {
+      recordgrp: 'Record Group',
+      subgrp: 'Subgroup'
+    }.freeze
+
+    def human_readable_level
+      if level == 'otherlevel'
+        alternative_level
+      elsif level.present?
+        CUSTOM_LEVEL_LABELS.fetch(level.to_sym, level.capitalize).to_s
+      end
+    end
+
+    def alternative_level
+      alternative_level = other_level if other_level
+      alternative_level.present? ? alternative_level.capitalize : 'Other'
+    end
+  end
+end