Merge pull request #458 from esmero/ISSUE-457

ISSUE-457: Multiple bug fixes and improvements for Content Search API (Plain Text)
esmero · Aug 5, 2024 · edfa658 · edfa658
2 parents 63570d9 + cc9db93
commit edfa658
Show file tree

Hide file tree

Showing 6 changed files with 124 additions and 99 deletions.
diff --git a/src/Controller/IiifContentSearchController.php b/src/Controller/IiifContentSearchController.php
diff --git a/src/Controller/MetadataExposeDisplayController.php b/src/Controller/MetadataExposeDisplayController.php
@@ -150,7 +150,6 @@ public function castViaTwig(
     )) {
       if ($metadatadisplay_entity = $metadataexposeconfig_entity->getMetadataDisplayEntity(
       )) {
-
         try {
           $responsetypefield = $metadatadisplay_entity->get('mimetype');
           $responsetype = $responsetypefield->first()->getValue();

diff --git a/src/Entity/MetadataDisplayEntity.php b/src/Entity/MetadataDisplayEntity.php
@@ -746,7 +746,7 @@ private function generateCacheTagsFromRelated(Node $node) {
               $display_object = $executable->getDisplay($display);
               if ($display_object) {
                 // We won't fetch context here. The Twig template itself escapes the
-                // Original Caching context of a View because its rendered out of scope.
+                // Original Caching context of a View because it is rendered out of scope.
                 $tags = array_merge($display_object->getCacheMetadata()->getCacheTags(), $tags);
               }
               if (is_array($display)) {

diff --git a/src/Plugin/Field/FieldFormatter/StrawberryBaseIIIFManifestFormatter.php b/src/Plugin/Field/FieldFormatter/StrawberryBaseIIIFManifestFormatter.php
@@ -150,8 +150,8 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
             '@optional' => $iiifrequired ? '(required)' : '(optional)',
           ]),
           '#description' => t('When using IIIF manifests as source, alternate JSON Key(s) embargo settings and JSON Key(s) where media needs to exists are not going to be respected automatically. Those need to be logically programmed via Twig at the Metadata Display Entity (template) that generates the manifest. Means no embargo settings (upload keys) for this formatter will be carried/passed to the template.'),
-          '#options' => $all_options_form_source,
-          '#default_value' => $this->getSetting('mediasource'),
+          '#options' => $all_options_form_source ?? [],
+          '#default_value' => $this->getSetting('mediasource') ?? [],
           '#required' => $iiifrequired,
           '#attributes' => [
             'data-formatter-selector' => 'mediasource',

diff --git a/src/Plugin/Field/FieldFormatter/StrawberryMapFormatter.php b/src/Plugin/Field/FieldFormatter/StrawberryMapFormatter.php
@@ -303,7 +303,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
           '#type' => 'checkboxes',
           '#title' => $this->t('Source(s) for your GeoJSON URLs.'),
           '#options' => $all_options_form_source,
-          '#default_value' => $this->getSetting('mediasource'),
+          '#default_value' => $this->getSetting('mediasource') ?? [],
           '#required' => TRUE,
           '#attributes' => [
             'data-formatter-selector' => 'mediasource',
@@ -314,7 +314,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
           '#type' => 'checkboxes',
           '#title' => $this->t('Optional: Source(s) for IIIF Manifest that will provide Georeferenced W3C Annotations for Overlays.'),
           '#options' => $all_options_form_overlaysource,
-          '#default_value' => $this->getSetting('overlaysource'),
+          '#default_value' => $this->getSetting('overlaysource') ?? [],
           '#required' => FALSE,
           '#attributes' => [
             'data-formatter-selector' => 'overlaysource',

diff --git a/src/Plugin/Field/FieldFormatter/StrawberryMiradorFormatter.php b/src/Plugin/Field/FieldFormatter/StrawberryMiradorFormatter.php
@@ -204,8 +204,8 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
         'mediasource' => [
           '#type' => 'checkboxes',
           '#title' => $this->t('Source for your IIIF Manifest URLs.'),
-          '#options' => $all_options_form_source,
-          '#default_value' => $this->getSetting('mediasource'),
+          '#options' => $all_options_form_source ?? [],
+          '#default_value' => $this->getSetting('mediasource') ?? [],
           '#required' => TRUE,
           '#attributes' => [
             'data-formatter-selector' => 'mediasource',
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,7 +150,6 @@ public function castViaTwig( @@
         )) {
           if ($metadatadisplay_entity = $metadataexposeconfig_entity->getMetadataDisplayEntity(
           )) {
             try {
               $responsetypefield = $metadatadisplay_entity->get('mimetype');
               $responsetype = $responsetypefield->first()->getValue();
@@ Expand Down @@