From 3fbac57f3ed40cadb182763bd782d4b92bcd3f4c Mon Sep 17 00:00:00 2001 From: unocha-jenkins Date: Thu, 11 May 2023 07:33:40 +0000 Subject: [PATCH 1/4] chore: Update all outdated drupal/* packages. --- composer.lock | 60 +++++++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/composer.lock b/composer.lock index e58c2439..dbff673d 100644 --- a/composer.lock +++ b/composer.lock @@ -2302,17 +2302,17 @@ }, { "name": "drupal/admin_toolbar", - "version": "3.3.2", + "version": "3.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/admin_toolbar.git", - "reference": "3.3.2" + "reference": "3.4.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.3.2.zip", - "reference": "3.3.2", - "shasum": "edb5d281e4940a655e706cfb9a0b367e8d37cbdb" + "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.4.0.zip", + "reference": "3.4.0", + "shasum": "2dc9bf50350693827b446180c9d61feebacc4b7a" }, "require": { "drupal/core": "^9.2 || ^10" @@ -2323,8 +2323,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "3.3.2", - "datestamp": "1683055364", + "version": "3.4.0", + "datestamp": "1683730547", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3365,17 +3365,17 @@ }, { "name": "drupal/conditional_fields", - "version": "4.0.0-alpha2", + "version": "4.0.0-alpha3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/conditional_fields.git", - "reference": "4.0.0-alpha2" + "reference": "4.0.0-alpha3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/conditional_fields-4.0.0-alpha2.zip", - "reference": "4.0.0-alpha2", - "shasum": "acc5658cb370583449d119a4172b7e0c2d81c86a" + "url": "https://ftp.drupal.org/files/projects/conditional_fields-4.0.0-alpha3.zip", + "reference": "4.0.0-alpha3", + "shasum": "6024d7527bc81e45832e8d1da01792268df94224" }, "require": { "drupal/core": "^8 || ^9 || ^10" @@ -3386,8 +3386,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.0.0-alpha2", - "datestamp": "1677271425", + "version": "4.0.0-alpha3", + "datestamp": "1683751149", "security-coverage": { "status": "not-covered", "message": "Alpha releases are not covered by Drupal security advisories." @@ -3431,6 +3431,14 @@ "name": "peterpoe", "homepage": "https://www.drupal.org/user/55674" }, + { + "name": "saurabh-2k17", + "homepage": "https://www.drupal.org/user/3622252" + }, + { + "name": "szhu", + "homepage": "https://www.drupal.org/user/3525295" + }, { "name": "thalles", "homepage": "https://www.drupal.org/user/3589086" @@ -10799,16 +10807,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.7", + "version": "9.6.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2" + "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c993f0d3b0489ffc42ee2fe0bd645af1538a63b2", - "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e", + "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e", "shasum": "" }, "require": { @@ -10882,7 +10890,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.7" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.8" }, "funding": [ { @@ -10898,7 +10906,7 @@ "type": "tidelift" } ], - "time": "2023-04-14T08:58:40+00:00" + "time": "2023-05-11T05:14:45+00:00" }, { "name": "psr/cache", @@ -11646,16 +11654,16 @@ }, { "name": "sebastian/diff", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", "shasum": "" }, "require": { @@ -11700,7 +11708,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" }, "funding": [ { @@ -11708,7 +11716,7 @@ "type": "github" } ], - "time": "2020-10-26T13:10:38+00:00" + "time": "2023-05-07T05:35:17+00:00" }, { "name": "sebastian/environment", From 00272421be5c9a9ab545b1a8e2586fc2dba7682e Mon Sep 17 00:00:00 2001 From: Mahesh Deore Date: Mon, 15 May 2023 19:30:19 +0530 Subject: [PATCH 2/4] Search API changes --- config/search_api.index.default_index.yml | 16 +- config/views.view.search_api_page.yml | 215 ++++++++++++++++++++++ 2 files changed, 229 insertions(+), 2 deletions(-) diff --git a/config/search_api.index.default_index.yml b/config/search_api.index.default_index.yml index a44d0fae..6014224d 100644 --- a/config/search_api.index.default_index.yml +++ b/config/search_api.index.default_index.yml @@ -4,9 +4,9 @@ status: true dependencies: config: - field.storage.node.body + - field.storage.node.field_duel_reference - field.storage.node.field_cbpf_menu - field.storage.node.field_cerf_menu - - field.storage.node.field_duel_reference - field.storage.node.field_page_type - field.storage.node.field_tags - search_api.server.default_server @@ -184,6 +184,18 @@ processor_settings: weights: preprocess_index: -10 entity_type: { } + highlight: + weights: + postprocess_query: 0 + prefix: '' + suffix: '' + excerpt: true + excerpt_always: false + excerpt_length: 256 + exclude_fields: + - title + highlight: always + highlight_partial: true html_filter: weights: preprocess_index: -3 @@ -214,7 +226,7 @@ processor_settings: pre_index_save: -10 stopwords: weights: - postprocess_query: -10 + preprocess_index: -5 preprocess_query: -10 all_fields: false fields: diff --git a/config/views.view.search_api_page.yml b/config/views.view.search_api_page.yml index a8810d27..fd324b27 100644 --- a/config/views.view.search_api_page.yml +++ b/config/views.view.search_api_page.yml @@ -570,6 +570,7 @@ display: tags: - 'config:field.storage.node.body' - 'config:search_api.index.default_index' + - 'search_api_list:default_index' block_1: id: block_1 display_title: SearchNewBlock @@ -593,12 +594,209 @@ display: tags: - 'config:field.storage.node.body' - 'config:search_api.index.default_index' + - 'search_api_list:default_index' page_1: id: page_1 display_title: Page display_plugin: page position: 1 display_options: + fields: + title: + id: title + table: search_api_datasource_default_index_entity_node + field: title + relationship: none + group_type: group + admin_label: '' + entity_type: node + plugin_id: search_api_field + 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 + click_sort_column: value + type: string + settings: + link_to_entity: true + 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 + field_rendering: true + fallback_handler: search_api + fallback_options: + link_to_item: false + use_highlighting: false + multi_type: separator + multi_separator: ', ' + body: + id: body + table: search_api_datasource_default_index_entity_node + field: body + relationship: none + group_type: group + admin_label: '' + entity_type: node + plugin_id: search_api_field + 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: true + 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 + click_sort_column: value + type: text_trimmed + settings: + trim_length: 200 + 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 + field_rendering: true + fallback_handler: search_api + fallback_options: + link_to_item: false + use_highlighting: false + multi_type: separator + multi_separator: ', ' + search_api_excerpt: + id: search_api_excerpt + table: search_api_index_default_index + field: search_api_excerpt + relationship: none + group_type: group + admin_label: '' + plugin_id: search_api + 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: div + element_wrapper_class: views-field-body + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + link_to_item: false + use_highlighting: true + multi_type: separator + multi_separator: ', ' pager: type: full options: @@ -620,9 +818,25 @@ display: offset: false offset_label: Offset quantity: 9 + sorts: + search_api_relevance: + id: search_api_relevance + table: search_api_index_default_index + field: search_api_relevance + relationship: none + group_type: group + admin_label: '' + plugin_id: search_api + order: DESC + expose: + label: '' + field_identifier: '' + exposed: false defaults: css_class: false pager: false + fields: false + sorts: false css_class: search-panel exposed_block: false display_extenders: { } @@ -638,3 +852,4 @@ display: tags: - 'config:field.storage.node.body' - 'config:search_api.index.default_index' + - 'search_api_list:default_index' From dbaada5f7ac62e217756232df5472613103fa8f6 Mon Sep 17 00:00:00 2001 From: unocha-jenkins Date: Thu, 18 May 2023 07:34:11 +0000 Subject: [PATCH 3/4] chore: Update all outdated drupal/* packages. --- composer.lock | 120 +++++++++++++++++++++++++------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/composer.lock b/composer.lock index dbff673d..c6ab7730 100644 --- a/composer.lock +++ b/composer.lock @@ -4056,17 +4056,17 @@ }, { "name": "drupal/ctools", - "version": "4.0.3", + "version": "4.0.4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/ctools.git", - "reference": "4.0.3" + "reference": "4.0.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/ctools-4.0.3.zip", - "reference": "4.0.3", - "shasum": "4f389b14bd2120069386c2f28f8c4cd49bd2ebfc" + "url": "https://ftp.drupal.org/files/projects/ctools-4.0.4.zip", + "reference": "4.0.4", + "shasum": "4a2474eb2fd525b2add2db0e855c135ba7f0fb70" }, "require": { "drupal/core": "^9.3 || ^10" @@ -4074,8 +4074,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.0.3", - "datestamp": "1668631947", + "version": "4.0.4", + "datestamp": "1684299878", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4873,17 +4873,17 @@ }, { "name": "drupal/hook_event_dispatcher", - "version": "3.3.2", + "version": "3.3.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/hook_event_dispatcher.git", - "reference": "3.3.2" + "reference": "3.3.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/hook_event_dispatcher-3.3.2.zip", - "reference": "3.3.2", - "shasum": "960a2bdd61e90067af24c3bd9bd736d8235e3376" + "url": "https://ftp.drupal.org/files/projects/hook_event_dispatcher-3.3.3.zip", + "reference": "3.3.3", + "shasum": "3d827b03e9a4582d27a4017534e47502d9d9e306" }, "require": { "drupal/core": "^9.3" @@ -4904,8 +4904,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "3.3.2", - "datestamp": "1677506345", + "version": "3.3.3", + "datestamp": "1684392590", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5104,14 +5104,14 @@ "name": "jsacksick", "homepage": "https://www.drupal.org/user/972218" }, - { - "name": "kaythay", - "homepage": "https://www.drupal.org/user/2182186" - }, { "name": "oknate", "homepage": "https://www.drupal.org/user/471638" }, + { + "name": "podarok", + "homepage": "https://www.drupal.org/user/116002" + }, { "name": "ram4nd", "homepage": "https://www.drupal.org/user/601534" @@ -5233,17 +5233,17 @@ }, { "name": "drupal/libraries", - "version": "4.0.2", + "version": "4.0.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/libraries.git", - "reference": "4.0.2" + "reference": "4.0.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/libraries-4.0.2.zip", - "reference": "4.0.2", - "shasum": "53cb7439f5a9e5fd533c0691b10d47c269e7565c" + "url": "https://ftp.drupal.org/files/projects/libraries-4.0.3.zip", + "reference": "4.0.3", + "shasum": "75af50de9a3d1b8dd65039e0b3603aac5e7ebe19" }, "require": { "drupal/core": "^8.8 || ^9 || ^10" @@ -5251,8 +5251,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.0.2", - "datestamp": "1681403003", + "version": "4.0.3", + "datestamp": "1684192643", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5744,26 +5744,26 @@ }, { "name": "drupal/menu_export", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/menu_export.git", - "reference": "8.x-1.3" + "reference": "8.x-1.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/menu_export-8.x-1.3.zip", - "reference": "8.x-1.3", - "shasum": "b02e3266efa07de3bb93db0f1c89fe1bdb921f94" + "url": "https://ftp.drupal.org/files/projects/menu_export-8.x-1.4.zip", + "reference": "8.x-1.4", + "shasum": "9bcefcf4077cfd751b9b28ae6b1a3f2f7febec3e" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^8 || ^9 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.3", - "datestamp": "1610559070", + "version": "8.x-1.4", + "datestamp": "1683815876", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5901,17 +5901,17 @@ }, { "name": "drupal/metatag", - "version": "1.22.0", + "version": "1.23.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/metatag.git", - "reference": "8.x-1.22" + "reference": "8.x-1.23" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.22.zip", - "reference": "8.x-1.22", - "shasum": "045cd6a4aa5048bfd6d47584eae1210eab9ba1fa" + "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.23.zip", + "reference": "8.x-1.23", + "shasum": "d0e53e4f41c759ea8ca4c504fc6fee9a5184a701" }, "require": { "drupal/core": "^9.3 || ^10", @@ -5931,8 +5931,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.22", - "datestamp": "1664472988", + "version": "8.x-1.23", + "datestamp": "1683903480", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -12320,16 +12320,16 @@ }, { "name": "seld/jsonlint", - "version": "1.9.0", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "4211420d25eba80712bff236a98960ef68b866b7" + "reference": "594fd6462aad8ecee0b45ca5045acea4776667f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/4211420d25eba80712bff236a98960ef68b866b7", - "reference": "4211420d25eba80712bff236a98960ef68b866b7", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/594fd6462aad8ecee0b45ca5045acea4776667f1", + "reference": "594fd6462aad8ecee0b45ca5045acea4776667f1", "shasum": "" }, "require": { @@ -12368,7 +12368,7 @@ ], "support": { "issues": "https://github.com/Seldaek/jsonlint/issues", - "source": "https://github.com/Seldaek/jsonlint/tree/1.9.0" + "source": "https://github.com/Seldaek/jsonlint/tree/1.10.0" }, "funding": [ { @@ -12380,7 +12380,7 @@ "type": "tidelift" } ], - "time": "2022-04-01T13:37:23+00:00" + "time": "2023-05-11T13:16:46+00:00" }, { "name": "seld/phar-utils", @@ -12490,16 +12490,16 @@ }, { "name": "slevomat/coding-standard", - "version": "8.11.1", + "version": "8.12.1", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "af87461316b257e46e15bb041dca6fca3796d822" + "reference": "f69e2524e8770efb9b3e5ac4a0ebc0d54eb446d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/af87461316b257e46e15bb041dca6fca3796d822", - "reference": "af87461316b257e46e15bb041dca6fca3796d822", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/f69e2524e8770efb9b3e5ac4a0ebc0d54eb446d7", + "reference": "f69e2524e8770efb9b3e5ac4a0ebc0d54eb446d7", "shasum": "" }, "require": { @@ -12511,11 +12511,11 @@ "require-dev": { "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.10.14", + "phpstan/phpstan": "1.10.15", "phpstan/phpstan-deprecation-rules": "1.1.3", "phpstan/phpstan-phpunit": "1.3.11", "phpstan/phpstan-strict-rules": "1.5.1", - "phpunit/phpunit": "7.5.20|8.5.21|9.6.6|10.1.1" + "phpunit/phpunit": "7.5.20|8.5.21|9.6.8|10.1.3" }, "type": "phpcodesniffer-standard", "extra": { @@ -12539,7 +12539,7 @@ ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.11.1" + "source": "https://github.com/slevomat/coding-standard/tree/8.12.1" }, "funding": [ { @@ -12551,7 +12551,7 @@ "type": "tidelift" } ], - "time": "2023-04-24T08:19:01+00:00" + "time": "2023-05-15T21:42:25+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -16790,16 +16790,16 @@ }, { "name": "doctrine/persistence", - "version": "3.1.4", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/persistence.git", - "reference": "8bf8ab15960787f1a49d405f6eb8c787b4841119" + "reference": "63fee8c33bef740db6730eb2a750cd3da6495603" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/persistence/zipball/8bf8ab15960787f1a49d405f6eb8c787b4841119", - "reference": "8bf8ab15960787f1a49d405f6eb8c787b4841119", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/63fee8c33bef740db6730eb2a750cd3da6495603", + "reference": "63fee8c33bef740db6730eb2a750cd3da6495603", "shasum": "" }, "require": { @@ -16868,7 +16868,7 @@ ], "support": { "issues": "https://github.com/doctrine/persistence/issues", - "source": "https://github.com/doctrine/persistence/tree/3.1.4" + "source": "https://github.com/doctrine/persistence/tree/3.2.0" }, "funding": [ { @@ -16884,7 +16884,7 @@ "type": "tidelift" } ], - "time": "2023-02-03T11:13:07+00:00" + "time": "2023-05-17T18:32:04+00:00" }, { "name": "drupal/console", From 7a5814b5117d2951523d979bff8fc8cde948c7fd Mon Sep 17 00:00:00 2001 From: Mahesh Deore Date: Mon, 22 May 2023 11:38:45 +0530 Subject: [PATCH 4/4] Change Search Page Title --- config/views.view.search_api_page.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/views.view.search_api_page.yml b/config/views.view.search_api_page.yml index fd324b27..9ad9e642 100644 --- a/config/views.view.search_api_page.yml +++ b/config/views.view.search_api_page.yml @@ -601,6 +601,7 @@ display: display_plugin: page position: 1 display_options: + title: 'Search Page' fields: title: id: title @@ -833,6 +834,7 @@ display: field_identifier: '' exposed: false defaults: + title: false css_class: false pager: false fields: false