Merge pull request #130 from aOelschlager/add-image-discovery

Add image discovery module
Islandora-Devops · Mar 1, 2024 · 40f1b35 · 40f1b35
2 parents d07119a + 9b601e6
commit 40f1b35
Show file tree

Hide file tree

Showing 16 changed files with 80 additions and 148 deletions.
diff --git a/composer.json b/composer.json
@@ -30,6 +30,7 @@
         "php": "^7.4 || ^8",
         "composer/installers": "^1.9",
         "cweagans/composer-patches": "^1.7",
+        "discoverygarden/dgi_image_discovery": "^1",
         "drupal/admin_toolbar": "^3.1",
         "drupal/advanced_search": "^2.0.0@beta",
         "drupal/better_exposed_filters": "^6.0",

diff --git a/composer.lock b/composer.lock
diff --git a/config/sync/core.entity_view_display.node.article.default.yml b/config/sync/core.entity_view_display.node.article.default.yml
@@ -83,5 +83,6 @@ content:
     weight: 100
     region: content
 hidden:
+  did_image: true
   langcode: true
   search_api_excerpt: true
diff --git a/config/sync/core.entity_view_display.node.article.rss.yml b/config/sync/core.entity_view_display.node.article.rss.yml
@@ -44,6 +44,7 @@ content:
 hidden:
   body: true
   comment: true
+  did_image: true
   field_image: true
   field_tags: true
   langcode: true

diff --git a/config/sync/core.entity_view_display.node.article.teaser.yml b/config/sync/core.entity_view_display.node.article.teaser.yml
@@ -73,6 +73,7 @@ content:
     region: content
 hidden:
   comment: true
+  did_image: true
   field_image: true
   field_tags: true
   langcode: true

diff --git a/config/sync/core.entity_view_display.node.islandora_object.default.yml b/config/sync/core.entity_view_display.node.islandora_object.default.yml
@@ -424,6 +424,7 @@ content:
     weight: 9
     region: content
 hidden:
+  did_image: true
   display_media_entity_view_3: true
   display_media_thumbnail: true
   field_model: true

diff --git a/config/sync/core.entity_view_display.node.islandora_object.search_index.yml b/config/sync/core.entity_view_display.node.islandora_object.search_index.yml
@@ -425,6 +425,7 @@ content:
     weight: 8
     region: content
 hidden:
+  did_image: true
   display_media_entity_view_3: true
   display_media_thumbnail: true
   field_model: true

diff --git a/config/sync/core.entity_view_display.node.islandora_object.search_result.yml b/config/sync/core.entity_view_display.node.islandora_object.search_result.yml
@@ -162,6 +162,7 @@ content:
     weight: 11
     region: content
 hidden:
+  did_image: true
   display_media_entity_view_1: true
   display_media_entity_view_2: true
   display_media_entity_view_3: true

diff --git a/config/sync/core.entity_view_display.node.islandora_object.teaser.yml b/config/sync/core.entity_view_display.node.islandora_object.teaser.yml
@@ -116,6 +116,7 @@ content:
     weight: 2
     region: content
 hidden:
+  did_image: true
   display_media_entity_view_1: true
   display_media_entity_view_2: true
   display_media_original_download: true

diff --git a/config/sync/core.entity_view_display.node.page.default.yml b/config/sync/core.entity_view_display.node.page.default.yml
@@ -46,5 +46,6 @@ content:
     weight: 101
     region: content
 hidden:
+  did_image: true
   langcode: true
   search_api_excerpt: true
diff --git a/config/sync/core.entity_view_display.node.page.teaser.yml b/config/sync/core.entity_view_display.node.page.teaser.yml
@@ -48,5 +48,6 @@ content:
     weight: 101
     region: content
 hidden:
+  did_image: true
   langcode: true
   search_api_excerpt: true
diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
@@ -30,6 +30,7 @@ module:
   datetime: 0
   dblog: 0
   devel: 0
+  dgi_image_discovery: 0
   dynamic_page_cache: 0
   editor: 0
   eva: 0

diff --git a/config/sync/views.view.solr_search_content.yml b/config/sync/views.view.solr_search_content.yml
@@ -7,8 +7,9 @@ dependencies:
     - field.storage.node.field_resource_type
     - search_api.index.default_solr_index
   module:
+    - dgi_image_discovery
+    - media
     - search_api
-    - views_field_view
 _core:
   default_config_hash: d-DwLzBXnDh7as84BBK0Pxv16Ypczqg_TF9tjAyNgjU
 id: solr_search_content
@@ -97,16 +98,17 @@ display:
             use_highlighting: true
             multi_type: separator
             multi_separator: ', '
-        nid:
-          id: nid
-          table: search_api_index_default_solr_index
-          field: nid
+        did_image:
+          id: did_image
+          table: search_api_datasource_default_solr_index_entity_node
+          field: did_image
           relationship: none
           group_type: group
           admin_label: ''
-          plugin_id: search_api_field
+          entity_type: node
+          plugin_id: search_api_did_image
           label: ''
-          exclude: true
+          exclude: false
           alter:
             alter_text: false
             text: ''
@@ -146,10 +148,14 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          click_sort_column: value
-          type: number_unformatted
-          settings: {  }
-          group_column: value
+          click_sort_column: target_id
+          type: media_thumbnail
+          settings:
+            image_style: ''
+            image_link: content
+            image_loading:
+              attribute: lazy
+          group_column: target_id
           group_columns: {  }
           group_rows: true
           delta_limit: 0
@@ -158,77 +164,14 @@ display:
           delta_first_last: false
           multi_type: separator
           separator: ', '
-          field_api_classes: false
-          field_rendering: false
-          fallback_handler: search_api_numeric
+          field_api_classes: 0
+          field_rendering: 1
+          fallback_handler: search_api
           fallback_options:
-            set_precision: false
-            precision: 0
-            decimal: .
-            separator: ''
-            format_plural: false
-            format_plural_string: !!binary MQNAY291bnQ=
-            prefix: ''
-            suffix: ''
-            link_to_item: false
-            use_highlighting: false
+            link_to_item: 0
+            use_highlighting: 0
             multi_type: separator
             multi_separator: ', '
-            format_plural_values:
-              - '1'
-              - '@count'
-        view:
-          id: view
-          table: views
-          field: view
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: view
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: align-right
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          view: thumbnail
-          display: block_2
-          arguments: '{{ raw_fields.nid }}'
         field_resource_type:
           id: field_resource_type
           table: search_api_index_default_solr_index

diff --git a/config/sync/views.view.thumbnail.yml b/config/sync/views.view.thumbnail.yml
@@ -1,6 +1,6 @@
 uuid: 3aedd62d-a991-4c64-9eb2-b0f4a8fe0a68
 langcode: en
-status: true
+status: false
 dependencies:
   config:
     - core.entity_view_mode.media.thumbnail

diff --git a/config/sync/views.view.thumbnail_of_first_child.yml b/config/sync/views.view.thumbnail_of_first_child.yml
@@ -1,6 +1,6 @@
 uuid: 7c122085-a727-4e49-b0b9-12d262f8f491
 langcode: en
-status: true
+status: false
 dependencies:
   module:
     - node

diff --git a/config/sync/views.view.top_level_collections.yml b/config/sync/views.view.top_level_collections.yml
@@ -3,10 +3,11 @@ langcode: en
 status: true
 dependencies:
   module:
+    - dgi_image_discovery
+    - media
     - node
     - taxonomy
     - user
-    - views_field_view
 id: top_level_collections
 label: 'Top Level Collections'
 module: views
@@ -23,18 +24,17 @@ display:
     display_options:
       title: 'Top Level Collections'
       fields:
-        nid:
-          id: nid
-          table: node_field_data
-          field: nid
+        did_image:
+          id: did_image
+          table: node
+          field: did_image
           relationship: none
           group_type: group
           admin_label: ''
           entity_type: node
-          entity_field: nid
-          plugin_id: field
+          plugin_id: did_image
           label: ''
-          exclude: true
+          exclude: false
           alter:
             alter_text: false
             text: ''
@@ -74,12 +74,14 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          click_sort_column: value
-          type: number_integer
+          click_sort_column: target_id
+          type: media_thumbnail
           settings:
-            thousand_separator: ''
-            prefix_suffix: false
-          group_column: value
+            image_style: ''
+            image_link: content
+            image_loading:
+              attribute: lazy
+          group_column: target_id
           group_columns: {  }
           group_rows: true
           delta_limit: 0
@@ -88,59 +90,7 @@ display:
           delta_first_last: false
           multi_type: separator
           separator: ', '
-          field_api_classes: false
-        view:
-          id: view
-          table: views
-          field: view
-          relationship: none
-          group_type: group
-          admin_label: 'Thumbnail Image'
-          plugin_id: view
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          view: thumbnail
-          display: block_2
-          arguments: '{{ raw_fields.nid }}'
+          field_api_classes: 0
         title:
           id: title
           table: node_field_data
@@ -503,4 +453,4 @@ display:
         - url.query_args
         - 'user.node_grants:view'
         - user.permissions
-      tags: {  }
+      tags: {  }