Updates Apr 2024

.gitattributes

@@ -42,6 +42,9 @@
 *.xml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.yml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 
+# PHPStan's baseline uses tabs instead of spaces.
+core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tabwidth=2 diff=php linguist-language=php
+
 # Define binary file attributes.
 # - Do not treat them as text.
 # - Include binary diff in patches instead of "binary files differ."

composer.json

@@ -34,6 +34,7 @@
         "php": "^8",
         "composer/installers": "^1.9",
         "cweagans/composer-patches": "^1.7",
+        "discoverygarden/dgi_image_discovery": "^1",
         "drupal/admin_toolbar": "^3.1",
         "drupal/advanced_search": "^2",
         "drupal/better_exposed_filters": "^6.0",
@@ -47,7 +48,7 @@
         "drupal/field_group": "^3",
         "drupal/field_permissions": "^1",
         "drupal/field_report": "^2.1",
-        "drupal/flysystem": "^2.1.0@RC",
+        "drupal/flysystem": "^2.2@alpha",
         "drupal/hal": "^2.0",
         "drupal/leaflet": "^10.1",
         "drupal/matomo": "^1.19",
@@ -77,8 +78,8 @@
         "islandora/openseadragon": "^2",
         "islandora/views_nested_details": "^1.0",
         "library/pdf.js": "^2.4",
-	"rdrew/olives": "dev-master",
-        "mjordan/islandora_workbench_integration": "dev-main"
+        "mjordan/islandora_workbench_integration": "dev-main",
+        "rdrew/olives": "dev-master"
     },
     "conflict": {
         "drupal/drupal": "*",

config/sync/block.block.olives_advancedsearch_pagesandfigures.yml

@@ -11,7 +11,7 @@ dependencies:
 id: olives_advancedsearch_pagesandfigures
 theme: olives
 region: sidebar
-weight: -9
+weight: -10
 provider: null
 plugin: 'advanced_search_block:solr_search_content__page_2'
 settings:

config/sync/block.block.olives_creatorsandcontributors.yml

@@ -12,7 +12,7 @@ dependencies:
 id: olives_creatorsandcontributors
 theme: olives
 region: sidebar
-weight: -14
+weight: -17
 provider: null
 plugin: 'facet_block:creators_and_contributors'
 settings:

config/sync/block.block.olives_creatorsandcontributorsfull.yml

@@ -13,7 +13,7 @@ dependencies:
 id: olives_creatorsandcontributorsfull
 theme: olives
 region: sidebar
-weight: -5
+weight: -7
 provider: null
 plugin: 'facet_block:creators_and_contributors_full'
 settings:

config/sync/block.block.olives_memberoffull.yml

@@ -13,7 +13,7 @@ dependencies:
 id: olives_memberoffull
 theme: olives
 region: sidebar
-weight: -7
+weight: -8
 provider: null
 plugin: 'facet_block:member_of_full_'
 settings:

config/sync/block.block.olives_placepublished.yml

@@ -0,0 +1,36 @@
+uuid: 3452e853-05f1-4e36-8a71-69306f4f4bc0
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.place_published
+  module:
+    - context
+    - facets
+    - islandora
+  theme:
+    - olives
+id: olives_placepublished
+theme: olives
+region: sidebar
+weight: -15
+provider: null
+plugin: 'facet_block:place_published'
+settings:
+  id: 'facet_block:place_published'
+  label: 'Place Published'
+  label_display: visible
+  provider: facets
+  context_mapping: {  }
+  block_id: olives_placepublished
+visibility:
+  view_inclusion:
+    id: view_inclusion
+    negate: false
+    view_inclusion:
+      view-solr_search_content-page_1: view-solr_search_content-page_1
+  media_source_mimetype:
+    id: media_source_mimetype
+    negate: false
+    context_mapping: {  }
+    mimetype: ''

config/sync/block.block.olives_placepublished_2.yml

@@ -0,0 +1,36 @@
+uuid: d5f0f5aa-38c1-4033-9185-5593ab666da2
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.place_published_pf
+  module:
+    - context
+    - facets
+    - islandora
+  theme:
+    - olives
+id: olives_placepublished_2
+theme: olives
+region: sidebar
+weight: -5
+provider: null
+plugin: 'facet_block:place_published_pf'
+settings:
+  id: 'facet_block:place_published_pf'
+  label: 'Place Published'
+  label_display: visible
+  provider: facets
+  context_mapping: {  }
+  block_id: olives_placepublished_2
+visibility:
+  view_inclusion:
+    id: view_inclusion
+    negate: false
+    view_inclusion:
+      view-solr_search_content-page_2: view-solr_search_content-page_2
+  media_source_mimetype:
+    id: media_source_mimetype
+    negate: false
+    context_mapping: {  }
+    mimetype: ''

config/sync/block.block.olives_subjectgeographic.yml

@@ -13,7 +13,7 @@ dependencies:
 id: olives_subjectgeographic
 theme: olives
 region: sidebar
-weight: -10
+weight: -11
 provider: null
 plugin: 'facet_block:subject_geographic_'
 settings:

config/sync/block.block.olives_subjectgeographicfull.yml

@@ -13,7 +13,7 @@ dependencies:
 id: olives_subjectgeographicfull
 theme: olives
 region: sidebar
-weight: 0
+weight: -1
 provider: null
 plugin: 'facet_block:subject_geographic_full_'
 settings:

config/sync/block.block.olives_subjectnames.yml

@@ -12,7 +12,7 @@ dependencies:
 id: olives_subjectnames
 theme: olives
 region: sidebar
-weight: -12
+weight: -13
 provider: null
 plugin: 'facet_block:subject_name'
 settings:

config/sync/block.block.olives_subjecttemporal.yml

@@ -12,7 +12,7 @@ dependencies:
 id: olives_subjecttemporal
 theme: olives
 region: sidebar
-weight: -11
+weight: -12
 provider: null
 plugin: 'facet_block:temporal_subject'
 settings:

config/sync/block.block.olives_subjecttopic_2.yml

@@ -13,7 +13,7 @@ dependencies:
 id: olives_subjecttopic_2
 theme: olives
 region: sidebar
-weight: -13
+weight: -14
 provider: null
 plugin: 'facet_block:subject_topic'
 settings:

config/sync/block.block.olives_type_2.yml

@@ -13,7 +13,7 @@ dependencies:
 id: olives_type_2
 theme: olives
 region: sidebar
-weight: -8
+weight: -9
 provider: null
 plugin: 'facet_block:type_full'
 settings:

config/sync/block.block.olives_year.yml

@@ -12,7 +12,7 @@ dependencies:
 id: olives_year
 theme: olives
 region: sidebar
-weight: -15
+weight: -16
 provider: null
 plugin: 'facet_block:year'
 settings:

config/sync/citation_select.settings.yml

@@ -11,9 +11,8 @@ csl_map:
     - ISBN
   field_note:
     - note
-  field_linked_agent:
+  field_publisher:
     - publisher
-    - author
   field_place_published:
     - publisher-place
   title:
@@ -24,10 +23,11 @@ csl_map:
     - language
   field_edtf_date_issued:
     - issued
+  field_linked_agent:
+    - author
 typed_relation_map:
   'relators:aut': author
   'relators:ctb': contributor
   'relators:edt': editor
-  'relators:pbl': publisher
   'relators:cre': author
 reference_type_field_map: {  }