From 637a17b3c4d5ac148f8387c30ac2727667020456 Mon Sep 17 00:00:00 2001 From: aOelschlager <oelschlagerannie@gmail.com> Date: Fri, 2 Feb 2024 09:22:15 -0600 Subject: [PATCH 1/6] added dgi_image_discovery to composer requirements --- composer.json | 1 + composer.lock | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/composer.json b/composer.json index 37243c10e..ac2bf27a4 100755 --- 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": "*", "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 index e896a838b..baac97714 100644 --- a/composer.lock +++ b/composer.lock @@ -1333,6 +1333,34 @@ }, "time": "2022-10-27T11:44:00+00:00" }, + { + "name": "discoverygarden/dgi_image_discovery", + "version": "v1.0.5", + "source": { + "type": "git", + "url": "https://github.com/discoverygarden/dgi_image_discovery.git", + "reference": "145bb803cc9566876d6a5590d02d23a0cb174916" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/discoverygarden/dgi_image_discovery/zipball/145bb803cc9566876d6a5590d02d23a0cb174916", + "reference": "145bb803cc9566876d6a5590d02d23a0cb174916", + "shasum": "" + }, + "require": { + "drupal/search_api": "^1.19" + }, + "type": "drupal-module", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-3.0-only" + ], + "support": { + "issues": "https://github.com/discoverygarden/dgi_image_discovery/issues", + "source": "https://github.com/discoverygarden/dgi_image_discovery/tree/v1.0.5" + }, + "time": "2023-09-22T18:14:28+00:00" + }, { "name": "doctrine/annotations", "version": "1.14.3", From 3d425e44cbc72d64b22017a81034bdbde6bedf69 Mon Sep 17 00:00:00 2001 From: aOelschlager <oelschlagerannie@gmail.com> Date: Wed, 21 Feb 2024 08:13:46 -0600 Subject: [PATCH 2/6] add to core extension --- config/sync/core.extension.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 5838c7211..f9f584997 100644 --- 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 From 207ba2e7d4e071ca94acc0d80dcab701597291f4 Mon Sep 17 00:00:00 2001 From: aOelschlager <oelschlagerannie@gmail.com> Date: Wed, 21 Feb 2024 09:49:49 -0600 Subject: [PATCH 3/6] changing thumbnail for views --- ...tity_view_display.node.article.default.yml | 1 + ...e.entity_view_display.node.article.rss.yml | 1 + ...ntity_view_display.node.article.teaser.yml | 1 + ..._display.node.islandora_object.default.yml | 1 + ...lay.node.islandora_object.search_index.yml | 1 + ...ay.node.islandora_object.search_result.yml | 1 + ...w_display.node.islandora_object.teaser.yml | 1 + ....entity_view_display.node.page.default.yml | 1 + ...e.entity_view_display.node.page.teaser.yml | 1 + .../sync/views.view.solr_search_content.yml | 102 ++++-------------- .../sync/views.view.top_level_collections.yml | 86 ++++----------- 11 files changed, 51 insertions(+), 146 deletions(-) diff --git a/config/sync/core.entity_view_display.node.article.default.yml b/config/sync/core.entity_view_display.node.article.default.yml index 2785475ba..47662d04d 100644 --- 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 index 86b5775a2..c74ceaa15 100644 --- 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 index 201743ad0..475455f84 100644 --- 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 index 9f9d5f90b..74e0ec5f8 100644 --- 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 index 6ac6379ee..8794728a2 100644 --- 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 index 765f40563..6581de897 100644 --- 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 index 73e545ec4..578b8799c 100644 --- 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 index 478cdbe8a..0808fe05d 100644 --- 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 index faf05fb51..f36bca87a 100644 --- 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/views.view.solr_search_content.yml b/config/sync/views.view.solr_search_content.yml index b62395ba8..efef8eef9 100644 --- a/config/sync/views.view.solr_search_content.yml +++ b/config/sync/views.view.solr_search_content.yml @@ -5,10 +5,12 @@ dependencies: config: - field.storage.node.field_description - field.storage.node.field_resource_type + - image.style.medium - 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 +99,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 +149,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: medium + image_link: content + image_loading: + attribute: lazy + group_column: target_id group_columns: { } group_rows: true delta_limit: 0 @@ -158,77 +165,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.top_level_collections.yml b/config/sync/views.view.top_level_collections.yml index 45e6e4253..efe381650 100644 --- a/config/sync/views.view.top_level_collections.yml +++ b/config/sync/views.view.top_level_collections.yml @@ -2,11 +2,14 @@ uuid: 39576d48-0ed7-477f-be71-ad084084c19b langcode: en status: true dependencies: + config: + - image.style.medium module: + - dgi_image_discovery + - media - node - taxonomy - user - - views_field_view id: top_level_collections label: 'Top Level Collections' module: views @@ -23,18 +26,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 +76,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: medium + image_link: content + image_loading: + attribute: lazy + group_column: target_id group_columns: { } group_rows: true delta_limit: 0 @@ -88,59 +92,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 +455,4 @@ display: - url.query_args - 'user.node_grants:view' - user.permissions - tags: { } + tags: { } \ No newline at end of file From dd8f8d702e9f5bf09530cb13439199d346536223 Mon Sep 17 00:00:00 2001 From: aOelschlager <oelschlagerannie@gmail.com> Date: Wed, 21 Feb 2024 10:02:22 -0600 Subject: [PATCH 4/6] disable the thumbnail views --- config/sync/views.view.thumbnail.yml | 2 +- config/sync/views.view.thumbnail_of_first_child.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/sync/views.view.thumbnail.yml b/config/sync/views.view.thumbnail.yml index f8c276458..050e39bfa 100644 --- 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 index 78355d1eb..3c3082b14 100644 --- 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 From 2171a224be16607cd8b05c5e0ae666fef39559c4 Mon Sep 17 00:00:00 2001 From: aOelschlager <oelschlagerannie@gmail.com> Date: Wed, 21 Feb 2024 11:36:43 -0600 Subject: [PATCH 5/6] remove image style --- config/sync/views.view.solr_search_content.yml | 3 +-- config/sync/views.view.top_level_collections.yml | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/config/sync/views.view.solr_search_content.yml b/config/sync/views.view.solr_search_content.yml index efef8eef9..0c95d0f96 100644 --- a/config/sync/views.view.solr_search_content.yml +++ b/config/sync/views.view.solr_search_content.yml @@ -5,7 +5,6 @@ dependencies: config: - field.storage.node.field_description - field.storage.node.field_resource_type - - image.style.medium - search_api.index.default_solr_index module: - dgi_image_discovery @@ -152,7 +151,7 @@ display: click_sort_column: target_id type: media_thumbnail settings: - image_style: medium + image_style: '' image_link: content image_loading: attribute: lazy diff --git a/config/sync/views.view.top_level_collections.yml b/config/sync/views.view.top_level_collections.yml index efe381650..8538bfb1c 100644 --- a/config/sync/views.view.top_level_collections.yml +++ b/config/sync/views.view.top_level_collections.yml @@ -2,8 +2,6 @@ uuid: 39576d48-0ed7-477f-be71-ad084084c19b langcode: en status: true dependencies: - config: - - image.style.medium module: - dgi_image_discovery - media @@ -79,7 +77,7 @@ display: click_sort_column: target_id type: media_thumbnail settings: - image_style: medium + image_style: '' image_link: content image_loading: attribute: lazy From 9b601e6be2305d9c550195bf0ed57685b3a5c7ac Mon Sep 17 00:00:00 2001 From: Rosie Le Faive <lefaive@gmail.com> Date: Tue, 27 Feb 2024 14:48:02 -0400 Subject: [PATCH 6/6] Update composer.json Co-authored-by: Adam <607975+adam-vessey@users.noreply.github.com> --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f11757739..61693c864 100755 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "php": "^7.4 || ^8", "composer/installers": "^1.9", "cweagans/composer-patches": "^1.7", - "discoverygarden/dgi_image_discovery": "*", + "discoverygarden/dgi_image_discovery": "^1", "drupal/admin_toolbar": "^3.1", "drupal/advanced_search": "^2.0.0@beta", "drupal/better_exposed_filters": "^6.0",