diff --git a/composer.json b/composer.json
index bf382fac..ce87ff2b 100644
--- a/composer.json
+++ b/composer.json
@@ -283,7 +283,8 @@
"Fix previews": "https://www.drupal.org/files/issues/2019-05-06/svg_image_field-zero-width-preview-3053018.patch"
},
"drupal/linkit": {
- "Linkit: invalid condition operator": "patches/2769191-invalid-condition-operator-config-entities-8.4.patch"
+ "Linkit: invalid condition operator": "patches/2769191-invalid-condition-operator-config-entities-8.4.patch",
+ "Empty tokens": "patches/linkit_empty_tokens.patch"
},
"drupal/fillpdf": {
"Secure user data after pdf is rendered.": "patches/webform-pdf-protect.patch"
diff --git a/config/config-default/core.entity_view_display.node.basic.search_index.yml b/config/config-default/core.entity_view_display.node.basic.search_index.yml
index 59399c66..40c60247 100644
--- a/config/config-default/core.entity_view_display.node.basic.search_index.yml
+++ b/config/config-default/core.entity_view_display.node.basic.search_index.yml
@@ -58,11 +58,11 @@ content:
more_text: More
more_class: more-link
summary_handler: full
- trim_options:
- text: true
- trim_zero: false
wrap_output: false
more_link: false
+ trim_options:
+ text: false
+ trim_zero: false
third_party_settings: { }
hidden:
body: true
diff --git a/config/config-default/core.entity_view_display.node.srl_howto.search_index.yml b/config/config-default/core.entity_view_display.node.srl_howto.search_index.yml
index 504cd3ad..b2caf782 100644
--- a/config/config-default/core.entity_view_display.node.srl_howto.search_index.yml
+++ b/config/config-default/core.entity_view_display.node.srl_howto.search_index.yml
@@ -55,11 +55,11 @@ content:
more_text: More
more_class: more-link
summary_handler: full
- trim_options:
- text: true
- trim_zero: false
wrap_output: false
more_link: false
+ trim_options:
+ text: false
+ trim_zero: false
third_party_settings: { }
hidden:
content_moderation_control: true
diff --git a/config/config-default/core.entity_view_display.node.srl_howto_instruction.search_index.yml b/config/config-default/core.entity_view_display.node.srl_howto_instruction.search_index.yml
index ab81b652..d67eb8d3 100644
--- a/config/config-default/core.entity_view_display.node.srl_howto_instruction.search_index.yml
+++ b/config/config-default/core.entity_view_display.node.srl_howto_instruction.search_index.yml
@@ -61,11 +61,11 @@ content:
more_text: More
more_class: more-link
summary_handler: full
- trim_options:
- text: true
- trim_zero: false
wrap_output: false
more_link: false
+ trim_options:
+ text: false
+ trim_zero: false
third_party_settings: { }
hidden:
body: true
diff --git a/config/config-default/linkit.linkit_profile.default.yml b/config/config-default/linkit.linkit_profile.default.yml
index 86c282b9..60b713d3 100644
--- a/config/config-default/linkit.linkit_profile.default.yml
+++ b/config/config-default/linkit.linkit_profile.default.yml
@@ -26,7 +26,7 @@ matchers:
id: 'entity:node'
weight: 0
settings:
- result_description: Nodes
+ result_description: '[node:field_case_types:0:entity]'
bundles: { }
group_by_bundle: true
include_unpublished: false
diff --git a/config/config-default/views.view.search_featured_items.yml b/config/config-default/views.view.search_featured_items.yml
index e0221e3e..bbbbc1e1 100644
--- a/config/config-default/views.view.search_featured_items.yml
+++ b/config/config-default/views.view.search_featured_items.yml
@@ -7,6 +7,7 @@ dependencies:
- taxonomy.vocabulary.search_categories
module:
- taxonomy
+ - text
- user
id: search_featured_items
label: 'Search featured items'
@@ -69,7 +70,7 @@ display:
type: default
options:
grouping: { }
- row_class: jcc-tiles__item
+ row_class: ''
default_row_class: false
row:
type: fields
@@ -79,6 +80,70 @@ display:
hide_empty: false
default_field_elements: true
fields:
+ description__value:
+ id: description__value
+ table: taxonomy_term_field_data
+ field: description__value
+ relationship: none
+ group_type: group
+ admin_label: ''
+ 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: div
+ element_class: jcc-text-section__container
+ 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
+ click_sort_column: value
+ type: text_default
+ settings: { }
+ group_column: value
+ group_columns: { }
+ group_rows: true
+ delta_limit: 0
+ delta_offset: 0
+ delta_reversed: false
+ delta_first_last: false
+ multi_type: separator
+ separator: ', '
+ field_api_classes: false
+ entity_type: taxonomy_term
+ entity_field: description
+ plugin_id: field
field_referenced_content:
id: field_referenced_content
table: taxonomy_term__field_referenced_content
@@ -121,25 +186,25 @@ display:
element_label_class: ''
element_label_colon: false
element_wrapper_type: ''
- element_wrapper_class: 'jcc-tile jcc-tile--hover'
+ element_wrapper_class: ''
element_default_classes: false
empty: ''
hide_empty: false
empty_zero: false
hide_alter_empty: true
click_sort_column: target_id
- type: entity_reference_label
+ type: entity_reference_entity_view
settings:
- link: true
+ view_mode: search_index
group_column: target_id
group_columns: { }
- group_rows: false
+ group_rows: true
delta_limit: 3
delta_offset: 0
delta_reversed: false
delta_first_last: false
multi_type: separator
- separator: ', '
+ separator: ''
field_api_classes: false
plugin_id: field
filters:
@@ -214,7 +279,7 @@ display:
display_extenders:
metatag_display_extender: { }
ajax_history: { }
- css_class: 'jcc-tiles-section jcc-tiles-section--has-emphasis jcc-tiles-section--has-three-columns'
+ css_class: ''
cache_metadata:
max-age: -1
contexts:
diff --git a/config/config-default/views.view.solr_search.yml b/config/config-default/views.view.solr_search.yml
index 03fb27aa..cfef4520 100644
--- a/config/config-default/views.view.solr_search.yml
+++ b/config/config-default/views.view.solr_search.yml
@@ -246,20 +246,7 @@ display:
plugin_id: search_api_language
sorts: { }
title: Search
- header:
- area:
- id: area
- table: views
- field: area
- relationship: none
- group_type: group
- admin_label: ''
- empty: false
- tokenize: false
- content:
- value: 'Featured results
'
- format: basic_html
- plugin_id: text
+ header: { }
footer: { }
empty:
area:
diff --git a/patches/linkit_empty_tokens.patch b/patches/linkit_empty_tokens.patch
new file mode 100644
index 00000000..8c340dd2
--- /dev/null
+++ b/patches/linkit_empty_tokens.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Plugin/Linkit/Matcher/EntityMatcher.php b/src/Plugin/Linkit/Matcher/EntityMatcher.php
+index 3383820..1747e5b 100644
+--- a/src/Plugin/Linkit/Matcher/EntityMatcher.php
++++ b/src/Plugin/Linkit/Matcher/EntityMatcher.php
+@@ -305,7 +305,7 @@ class EntityMatcher extends ConfigurableMatcherBase {
+ * The description for this entity.
+ */
+ protected function buildDescription($entity) {
+- $description = \Drupal::token()->replace($this->configuration['result_description'], [$this->target_type => $entity], []);
++ $description = \Drupal::token()->replace($this->configuration['result_description'], [$this->target_type => $entity], ['clear' => TRUE,]);
+ return LinkitXss::descriptionFilter($description);
+ }
+
diff --git a/web/themes/custom/atrium/src/sass/components/views/_views.scss b/web/themes/custom/atrium/src/sass/components/views/_views.scss
index 1ad40c74..47212c66 100644
--- a/web/themes/custom/atrium/src/sass/components/views/_views.scss
+++ b/web/themes/custom/atrium/src/sass/components/views/_views.scss
@@ -9,3 +9,10 @@
padding-top: 20px;
}
}
+
+.view-id-search_featured_items{
+ .views-field-description__value {
+ @include u-padding-top(4);
+ }
+}
+
diff --git a/web/themes/custom/atrium/templates/views/views-view--search-featured-items.html.twig b/web/themes/custom/atrium/templates/views/views-view--search-featured-items.html.twig
index 59a01a59..6dee3e43 100644
--- a/web/themes/custom/atrium/templates/views/views-view--search-featured-items.html.twig
+++ b/web/themes/custom/atrium/templates/views/views-view--search-featured-items.html.twig
@@ -76,7 +76,7 @@
{% block content %}
{% if rows %}
-