arclight 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fa0be8b6a63486a158607273080d3bc226029d05c8d8b76b73f72a60dc6afa3
-  data.tar.gz: 155b435d83af03435aff13db82a1509148da62a84fa960135d1c73b5dfa335ae
+  metadata.gz: fdbe09a3fa39235bc0ad186308ec24b786c984e4abbcbabafb87e07ad2ebb8e3
+  data.tar.gz: fca899fbe2740f3f1220b59129297991b1975aa10a24ed1033c0e4b59bd870da
 SHA512:
-  metadata.gz: 22eeea5a79c6fc8a777a42eff6f9c0ebd2be7bead5a4a3e92277be5a88936b5628b89042999c7b21c3963824767dadc0448f9912ebf9d76fbd9b630e98dfa7e6
-  data.tar.gz: d5b7a8fa47adfa754db93b8fe0012b7bf51c38f6c10a801b762610b4ca0621fae43a9f80cef4bb71264a90ecebb2bfe002f6b99b02ab36698e86fda7e10e6842
+  metadata.gz: 3a6c9812f1e88a5150e3bb645e00092633ff8d67ba4075dc6654bad4baebd21abea209ae917a9c6babaa01387beffaabc8a45e3b37ac2fd83da1142f25fc0650
+  data.tar.gz: 6436d64454bd0ea806806265e333ca5c588875640f812773f4b41d7ae4495ff3baf5f4797bd86991e8ba262818756ea71f8f7851740c479be562638988fe9e2c

data/app/assets/stylesheets/arclight/modules/hierarchy_and_online_contents.scss

@@ -46,8 +46,8 @@ $hierarchy-view-collapse-icon: url("data:image/svg+xml,<svg xmlns='http://www.w3
     display: none;
   }
 
-  turbo-frame[loading]:not([complete]) {
-    &::after {
+  turbo-frame[busy] {
+    &::before {
       @extend .placeholder !optional;
       animation: placeholder-glow 2s ease-in-out infinite;
       content: 'Loading...';

data/app/components/arclight/collection_sidebar_component.rb

@@ -29,13 +29,11 @@ module Arclight
     end
 
     def document_path
-      @document_path ||= solr_document_path(normalized_eadid)
+      @document_path ||= solr_document_path(document.collection_id)
     end
 
     def section_anchor(section)
       "##{t("arclight.views.show.sections.#{section}").parameterize}"
     end
-
-    delegate :normalized_eadid, to: :document
   end
 end

data/app/models/arclight/parents.rb

@@ -29,7 +29,7 @@ module Arclight
     # @param [SolrDocument] document
     def self.from_solr_document(document)
       ids = document.parent_ids
-      legacy_ids = document.legacy_parent_ids.map { |legacy_id| document.eadid == legacy_id ? legacy_id : "#{document.eadid}#{legacy_id}" }
+      legacy_ids = document.legacy_parent_ids.map { |legacy_id| document.collection_id == legacy_id ? legacy_id : "#{document.collection_id}#{legacy_id}" }
       labels = document.parent_labels
       eadid = document.eadid
       levels = document.parent_levels

data/app/models/concerns/arclight/solr_document.rb

@@ -7,6 +7,7 @@ module Arclight
     extend ActiveSupport::Concern
 
     included do
+      attribute :collection_id, :string, '_root_'
       attribute :parent_ids, :array, 'parent_ids_ssim'
       attribute :legacy_parent_ids, :array, 'parent_ssim'
       Arclight.deprecation.deprecate_methods(self, legacy_parent_ids: 'Use `parent_ids` instead')
@@ -50,6 +51,7 @@ module Arclight
     def normalized_eadid
       Arclight::NormalizedId.new(eadid).to_s
     end
+    Arclight.deprecation.deprecate_methods(self, normalized_eadid: 'Use `collection_id` instead')
 
     def repository
       first('repository_ssm') || collection&.first('repository_ssm')

data/lib/arclight/normalized_id.rb

@@ -5,9 +5,11 @@ require 'arclight/exceptions'
 module Arclight
   ##
   # A simple utility class to normalize identifiers
-  # to be used around the application for linking
   class NormalizedId
-    def initialize(id)
+    # Accepts unused kwargs from the ead2_config.rb id to_field directive
+    # (:title and :repository) so that applications can provide a custom
+    # id_normalizer class to traject to form the collection id from these attributes.
+    def initialize(id, **_kwargs)
       @id = id
     end
 

data/lib/arclight/traject/ead2_config.rb

@@ -6,6 +6,7 @@ require 'traject/nokogiri_reader'
 require 'traject_plus'
 require 'traject_plus/macros'
 require 'arclight/level_label'
+require 'arclight/normalized_id'
 require 'arclight/normalized_date'
 require 'arclight/normalized_title'
 require 'active_model/conversion' ## Needed for Arclight::Repository
@@ -53,6 +54,7 @@ DID_SEARCHABLE_NOTES_FIELDS = %w[
 
 settings do
   provide 'component_traject_config', File.join(__dir__, 'ead2_component_config.rb')
+  provide 'id_normalizer', 'Arclight::NormalizedId'
   provide 'date_normalizer', 'Arclight::NormalizedDate'
   provide 'title_normalizer', 'Arclight::NormalizedTitle'
   provide 'reader_class_name', 'Arclight::Traject::NokogiriNamespacelessReader'
@@ -75,7 +77,13 @@ end
 # NOTE: All fields should be stored in Solr
 # ==================
 
-to_field 'id', extract_xpath('/ead/eadheader/eadid'), strip, gsub('.', '-')
+to_field 'id' do |record, accumulator|
+  id = record.at_xpath('/ead/eadheader/eadid')&.text
+  title = record.at_xpath('/ead/archdesc/did/unittitle')&.text
+  repository = settings['repository']
+  accumulator << settings['id_normalizer'].constantize.new(id, title: title, repository: repository).to_s
+end
+
 to_field 'title_filing_ssi', extract_xpath('/ead/eadheader/filedesc/titlestmt/titleproper[@type="filing"]')
 to_field 'title_ssm', extract_xpath('/ead/archdesc/did/unittitle')
 to_field 'title_tesim', extract_xpath('/ead/archdesc/did/unittitle')

data/lib/arclight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Arclight
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arclight",
-  "version": "1.1.0",
+  "version": "1.1.4",
   "description": "The frontend for arclight",
   "main": "app/assets/javascript/arclight/arclight.js",
   "files": [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arclight
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Darren Hardy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-29 00:00:00.000000000 Z
+date: 2024-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -501,7 +501,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: A Blacklight-based environment to support discovery and delivery for archives