arclight 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcb3f419a2de7718525b07816f81a8f6d957cf6e4cd999bd3cd037d8c83252e1
-  data.tar.gz: 8458d1d2031ffe66f4f6a562b808990c23a04f7d0863fa30d616fbf85e403a34
+  metadata.gz: 8fa0be8b6a63486a158607273080d3bc226029d05c8d8b76b73f72a60dc6afa3
+  data.tar.gz: 155b435d83af03435aff13db82a1509148da62a84fa960135d1c73b5dfa335ae
 SHA512:
-  metadata.gz: 2304bd8ff0448478ceb17d021322993f8b69ab2d77a8f6148c17e223939fbc056ceca5999dd37b2af3a0f5b1a7cd658329141a48f461dd04761cd5f7ef721280
-  data.tar.gz: 81f134a1d90866588ce97f0dc60ee1bebdf213fe5a467ec9ae032fdd2301ef236eefab02ad553040f270b483f788049c90eace3e320a6b1a0b8bcf071a5a0781
+  metadata.gz: 22eeea5a79c6fc8a777a42eff6f9c0ebd2be7bead5a4a3e92277be5a88936b5628b89042999c7b21c3963824767dadc0448f9912ebf9d76fbd9b630e98dfa7e6
+  data.tar.gz: d5b7a8fa47adfa754db93b8fe0012b7bf51c38f6c10a801b762610b4ca0621fae43a9f80cef4bb71264a90ecebb2bfe002f6b99b02ab36698e86fda7e10e6842

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

@@ -1,4 +1,5 @@
 .navbar-search {
+  z-index: 10;
   .search-query-form {
     max-width: 100% !important;   // work around blacklight styles
     display: flex;

data/app/components/arclight/group_component.rb

@@ -17,7 +17,7 @@ module Arclight
     end
 
     def search_within_collection_url
-      search_catalog_path(helpers.search_without_group.merge(f: { collection: [document.collection_name] }))
+      search_catalog_path(helpers.search_without_group.deep_merge(f: { collection: [document.collection_name] }))
     end
   end
 end

data/app/models/arclight/parent.rb

@@ -7,6 +7,9 @@ module Arclight
   class Parent
     attr_reader :id, :label, :eadid, :level
 
+    alias global_id id
+    Arclight.deprecation.deprecate_methods(self, global_id: 'Call `id` instead')
+
     def initialize(id:, label:, eadid:, level:)
       @id = id
       @label = label

data/app/models/arclight/parents.rb

@@ -5,10 +5,11 @@ module Arclight
   # Object for parsing and formalizing Solr_Ead "Parents"
   # https://github.com/awead/solr_ead/blob/8cf7ffaa66e0e4c9c0b12f5646d6c2e20984cd99/lib/solr_ead/behaviors.rb#L54-L57
   class Parents
-    attr_reader :ids, :labels, :levels
+    attr_reader :ids, :legacy_ids, :labels, :levels
 
-    def initialize(ids:, labels:, eadid:, levels:)
+    def initialize(ids:, legacy_ids:, labels:, eadid:, levels:)
       @ids = ids
+      @legacy_ids = legacy_ids
       @labels = labels
       @eadid = eadid
       @levels = levels
@@ -21,17 +22,18 @@ module Arclight
     ##
     # @return [Array[Arclight::Parent]]
     def as_parents
-      ids.map.with_index { |id, idx| Arclight::Parent.new(id: id, label: labels[idx], eadid: eadid, level: levels[idx]) }
+      (ids.presence || legacy_ids).map.with_index { |id, idx| Arclight::Parent.new(id: id, label: labels[idx], eadid: eadid, level: levels[idx]) }
     end
 
     ##
     # @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}" }
       labels = document.parent_labels
       eadid = document.eadid
       levels = document.parent_levels
-      new(ids: ids, labels: labels, eadid: eadid, levels: levels)
+      new(ids: ids, legacy_ids: legacy_ids, labels: labels, eadid: eadid, levels: levels)
     end
   end
 end

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

@@ -8,6 +8,8 @@ module Arclight
 
     included do
       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')
       attribute :parent_labels, :array, 'parent_unittitles_ssm'
       attribute :parent_levels, :array, 'parent_levels_ssm'
       attribute :unitid, :string, 'unitid_ssm'

data/lib/arclight/traject/ead2_component_config.rb

@@ -304,6 +304,7 @@ SEARCHABLE_NOTES_FIELDS.map do |selector|
 end
 DID_SEARCHABLE_NOTES_FIELDS.map do |selector|
   to_field "#{selector}_html_tesm", extract_xpath("./did/#{selector}", to_text: false)
+  to_field "#{selector}_tesim", extract_xpath("./did/#{selector}")
 end
 
 # =============================

data/lib/arclight/traject/ead2_config.rb

@@ -240,6 +240,7 @@ end
 
 DID_SEARCHABLE_NOTES_FIELDS.map do |selector|
   to_field "#{selector}_html_tesm", extract_xpath("/ead/archdesc/did/#{selector}", to_text: false)
+  to_field "#{selector}_tesim", extract_xpath("/ead/archdesc/did/#{selector}")
 end
 
 NAME_ELEMENTS.map do |selector|

data/lib/arclight/version.rb

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

data/lib/generators/arclight/templates/config/locales/arclight.en.yml

@@ -33,7 +33,6 @@ en:
         fileplan: File plan
         odd: Other descriptive data
         note: Note
-        did_note: Note
 
         access_subjects: Subjects
         names_coll: Names

data/solr/conf/schema.xml

@@ -348,8 +348,7 @@
    <copyField source="access_subjects_ssim" dest="text" />
    <copyField source="containers_ssim" dest="text" />
 
-   <!-- grab the searchable notes -->
-   <copyField source="abstract_tesim" dest="text" />
+   <!-- grab the searchable notes (SEARCHABLE_NOTES_FIELDS) -->
    <copyField source="accessrestrict_tesim" dest="text" />
    <copyField source="accruals_tesim" dest="text" />
    <copyField source="acqinfo_tesim" dest="text" />
@@ -359,23 +358,24 @@
    <copyField source="bibliography_tesim" dest="text" />
    <copyField source="bioghist_tesim" dest="text" />
    <copyField source="custodhist_tesim" dest="text" />
-   <copyField source="did_note_tesim" dest="text" />
    <copyField source="fileplan_tesim" dest="text" />
    <copyField source="indexes_tesim" dest="text" />
    <copyField source="language_ssim" dest="text" />
-   <copyField source="materialspec_tesim" dest="text" />
-   <copyField source="note_tesim" dest="text" />
    <copyField source="odd_tesim" dest="text" />
    <copyField source="originalsloc_tesim" dest="text" />
    <copyField source="parent_unittitles_tesim" dest="text" />
    <copyField source="physdesc_tesim" dest="text" />
-   <copyField source="physloc_tesim" dest="text" />
    <copyField source="phystech_tesim" dest="text" />
    <copyField source="processinfo_tesim" dest="text" />
    <copyField source="relatedmaterial_tesim" dest="text" />
    <copyField source="scopecontent_tesim" dest="text" />
    <copyField source="separatedmaterial_tesim" dest="text" />
    <copyField source="userestrict_tesim" dest="text" />
+   <!-- did searchable notes (DID_SEARCHABLE_NOTES_FIELDS) -->
+   <copyField source="abstract_tesim" dest="text" />
+   <copyField source="materialspec_tesim" dest="text" />
+   <copyField source="physloc_tesim" dest="text" />
+   <copyField source="note_tesim" dest="text" />
    <!-- grab structured data that's important -->
    <copyField source="unitid_ssm" dest="text" />
    <copyField source="unitid_ssm" dest="unitid_identifier_match" />

data/solr/conf/solrconfig.xml

@@ -142,12 +142,14 @@
          ead_ssi
          ref_ssm
          unitid_ssm
+         unitid_identifier_match
        </str>
        <str name="pf_identifier">
          id^2
          ead_ssi^2
          ref_ssm^2
          unitid_ssm^2
+         unitid_identifier_match^2
        </str>
        <str name="qf_name">
          name_teim

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arclight
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Darren Hardy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-13 00:00:00.000000000 Z
+date: 2024-03-29 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.5.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A Blacklight-based environment to support discovery and delivery for archives