From 9dc0e43171faa406d9acdfad820d2e1bec0ca504 Mon Sep 17 00:00:00 2001 From: martinyde Date: Wed, 8 Sep 2021 10:51:58 +0200 Subject: [PATCH 1/4] LOOP-1091: Added patch for autocomplete deluxe module --- composer.json | 3 + ...tocomplete_deluxe_fix_limitation_bug.patch | 80 +++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 patches/autocomplete_deluxe_fix_limitation_bug.patch diff --git a/composer.json b/composer.json index 0400ea16a..7c64f7713 100644 --- a/composer.json +++ b/composer.json @@ -186,6 +186,9 @@ }, "drupal/openid_connect": { "Revoking group access does not reflect on applied roles (https://www.drupal.org/project/openid_connect/issues/3224128)": "https://git.drupalcode.org/project/openid_connect/-/merge_requests/31.diff" + }, + "drupal/autocomplete_deluxe": { + "Fix bug in limitation": "patches/autocomplete_deluxe_fix_limitation_bug.patch" } } }, diff --git a/patches/autocomplete_deluxe_fix_limitation_bug.patch b/patches/autocomplete_deluxe_fix_limitation_bug.patch new file mode 100644 index 000000000..e6c17da91 --- /dev/null +++ b/patches/autocomplete_deluxe_fix_limitation_bug.patch @@ -0,0 +1,80 @@ +diff --git a/assets/js/autocomplete_deluxe.js b/assets/js/autocomplete_deluxe.js +index 893fbd9..05c8ca6 100755 +--- a/assets/js/autocomplete_deluxe.js ++++ b/assets/js/autocomplete_deluxe.js +@@ -135,7 +135,7 @@ + this.uri = settings.uri; + this.multiple = settings.multiple; + this.required = settings.required; +- this.limit = settings.limit; ++ this.match_limit = settings.match_limit; + this.synonyms = typeof settings.use_synonyms == 'undefined' ? false : settings.use_synonyms; + this.not_found_message = typeof settings.use_synonyms == 'undefined' ? Drupal.t("The entity '@term' will be added.") : settings.not_found_message; + this.not_found_message_allow = typeof settings.not_found_message_allow == 'undefined' ? false : settings.not_found_message_allow; +diff --git a/src/Element/AutocompleteDeluxeElement.php b/src/Element/AutocompleteDeluxeElement.php +index 7232a16..2912091 100644 +--- a/src/Element/AutocompleteDeluxeElement.php ++++ b/src/Element/AutocompleteDeluxeElement.php +@@ -96,7 +96,7 @@ + 'input_id' => $html_id, + 'multiple' => $element['#multiple'], + 'required' => $element['#required'], +- 'limit' => isset($element['#limit']) ? $element['#limit'] : 10, ++ 'match_limit' => isset($element['#match_limit']) ? $element['#match_limit'] : 10, + 'min_length' => isset($element['#min_length']) ? $element['#min_length'] : 0, + 'use_synonyms' => isset($element['#use_synonyms']) ? $element['#use_synonyms'] : 0, + 'delimiter' => isset($element['#delimiter']) ? $element['#delimiter'] : '', +diff --git a/src/Plugin/Field/FieldWidget/AutocompleteDeluxeWidget.php b/src/Plugin/Field/FieldWidget/AutocompleteDeluxeWidget.php +index 8685a2c..de310d6 100644 +--- a/src/Plugin/Field/FieldWidget/AutocompleteDeluxeWidget.php ++++ b/src/Plugin/Field/FieldWidget/AutocompleteDeluxeWidget.php +@@ -108,7 +108,7 @@ + 'autocomplete_route_name' => 'autocomplete_deluxe.autocomplete', + 'size' => 60, + 'selection_handler' => 'default', +- 'limit' => 10, ++ 'match_limit' => 10, + 'min_length' => 0, + 'delimiter' => '', + 'not_found_message_allow' => FALSE, +@@ -122,11 +122,11 @@ + * {@inheritdoc} + */ + public function settingsForm(array $form, FormStateInterface $form_state) { +- $element['limit'] = [ ++ $element['match_limit'] = [ + '#type' => 'textfield', + '#title' => $this->t('Limit of the output.'), + '#description' => $this->t('If set to zero no limit will be used'), +- '#default_value' => $this->getSetting('limit'), ++ '#default_value' => $this->getSetting('match_limit'), + '#element_validate' => [[get_class($this), 'validateInteger']], + ]; + $element['min_length'] = [ +@@ -177,7 +177,7 @@ + public function settingsSummary() { + $summary = []; + +- $summary[] = $this->t('Limit: @limit', ['@limit' => $this->getSetting('limit')]); ++ $summary[] = $this->t('Limit: @match_limit', ['@match_limit' => $this->getSetting('match_limit')]); + $summary[] = $this->t('Min length: @min_length', ['@min_length' => $this->getSetting('min_length')]); + $summary[] = $this->t('Delimiter: @delimiter', ['@delimiter' => $this->getSetting('delimiter')]); + $summary[] = $this->t('Allow Not Found message: @not_found_message_allow', ['@not_found_message_allow' => $this->getSetting('not_found_message_allow') ? 'Yes' : 'No']); +@@ -203,7 +203,7 @@ + + $allow_message = $settings['not_found_message_allow'] ?? FALSE; + $not_found_message = $settings['not_found_message'] ?? ""; +- ++ $selection_settings['match_limit'] = isset($settings['match_limit']) ? $settings['match_limit'] : 10; + + $element += [ + '#type' => 'autocomplete_deluxe', +@@ -212,7 +212,7 @@ + '#selection_handler' => $this->getFieldSetting('handler'), + '#selection_settings' => $selection_settings, + '#size' => 60, +- '#limit' => $settings['limit'] ?? 10, ++ '#match_limit' => $settings['match_limit'] ?? 10, + '#min_length' => $settings['min_length'] ?? 0, + '#delimiter' => $settings['delimiter'] ?? '', + '#not_found_message_allow' => $allow_message, From 351c9feace25c4ac3cc6f5f82ab5f3afcdec27ef Mon Sep 17 00:00:00 2001 From: martinyde Date: Wed, 8 Sep 2021 11:23:34 +0200 Subject: [PATCH 2/4] LOOP-1091: Changed limitation in fields --- ...e.os2loop_documents_collection.default.yml | 31 ++++++++++--------- ...ode.os2loop_documents_document.default.yml | 19 ++++++------ ..._display.node.os2loop_external.default.yml | 31 ++++++++++--------- ...form_display.node.os2loop_post.default.yml | 31 ++++++++++--------- ..._display.node.os2loop_question.default.yml | 30 +++++++++--------- 5 files changed, 73 insertions(+), 69 deletions(-) diff --git a/config/sync/core.entity_form_display.node.os2loop_documents_collection.default.yml b/config/sync/core.entity_form_display.node.os2loop_documents_collection.default.yml index 50fa86bbe..324050547 100644 --- a/config/sync/core.entity_form_display.node.os2loop_documents_collection.default.yml +++ b/config/sync/core.entity_form_display.node.os2loop_documents_collection.default.yml @@ -18,6 +18,7 @@ dependencies: - autocomplete_deluxe - datetime - field_group + - path - text third_party_settings: field_group: @@ -90,17 +91,17 @@ content: os2loop_shared_profession: weight: 8 settings: - match_operator: CONTAINS - autocomplete_route_name: autocomplete_deluxe.autocomplete - size: 60 - selection_handler: default - limit: 10 + match_limit: '0' min_length: 0 delimiter: '' - not_found_message_allow: false not_found_message: 'The term ''@term'' will be added' - new_terms: false no_empty_message: 'No terms could be found. Please type in order to add a new term.' + not_found_message_allow: false + new_terms: false + match_operator: CONTAINS + autocomplete_route_name: autocomplete_deluxe.autocomplete + size: 60 + selection_handler: default third_party_settings: { } type: autocomplete_deluxe region: content @@ -113,24 +114,23 @@ content: os2loop_shared_subject: weight: 6 settings: - match_operator: CONTAINS - autocomplete_route_name: autocomplete_deluxe.autocomplete - size: 60 - selection_handler: default - limit: 10 + match_limit: '0' min_length: 0 delimiter: '' - not_found_message_allow: false not_found_message: 'The term ''@term'' will be added' - new_terms: false no_empty_message: 'No terms could be found. Please type in order to add a new term.' + not_found_message_allow: false + new_terms: false + match_operator: CONTAINS + autocomplete_route_name: autocomplete_deluxe.autocomplete + size: 60 + selection_handler: default third_party_settings: { } type: autocomplete_deluxe region: content os2loop_shared_tags: weight: 7 settings: - limit: 10 min_length: 0 delimiter: '' not_found_message: 'The term ''@term'' will be added' @@ -141,6 +141,7 @@ content: autocomplete_route_name: autocomplete_deluxe.autocomplete size: 60 selection_handler: default + match_limit: 10 third_party_settings: { } type: autocomplete_deluxe region: content diff --git a/config/sync/core.entity_form_display.node.os2loop_documents_document.default.yml b/config/sync/core.entity_form_display.node.os2loop_documents_document.default.yml index 28805a282..0d7750677 100644 --- a/config/sync/core.entity_form_display.node.os2loop_documents_document.default.yml +++ b/config/sync/core.entity_form_display.node.os2loop_documents_document.default.yml @@ -16,6 +16,7 @@ dependencies: - autocomplete_deluxe - datetime - paragraphs + - path - text id: node.os2loop_documents_document.default targetEntityType: node @@ -67,17 +68,17 @@ content: os2loop_shared_profession: weight: 8 settings: - match_operator: CONTAINS - autocomplete_route_name: autocomplete_deluxe.autocomplete - size: 60 - selection_handler: default - limit: 10 + match_limit: '0' min_length: 0 delimiter: '' - not_found_message_allow: false not_found_message: 'The term ''@term'' will be added' - new_terms: false no_empty_message: 'No terms could be found. Please type in order to add a new term.' + not_found_message_allow: false + new_terms: false + match_operator: CONTAINS + autocomplete_route_name: autocomplete_deluxe.autocomplete + size: 60 + selection_handler: default third_party_settings: { } type: autocomplete_deluxe region: content @@ -90,7 +91,7 @@ content: os2loop_shared_subject: weight: 9 settings: - limit: 10 + match_limit: '0' min_length: 0 delimiter: '' not_found_message: 'The term ''@term'' will be added' @@ -107,7 +108,6 @@ content: os2loop_shared_tags: weight: 10 settings: - limit: 10 min_length: 0 delimiter: '' not_found_message: 'The term ''@term'' will be added' @@ -118,6 +118,7 @@ content: autocomplete_route_name: autocomplete_deluxe.autocomplete size: 60 selection_handler: default + match_limit: 10 third_party_settings: { } type: autocomplete_deluxe region: content diff --git a/config/sync/core.entity_form_display.node.os2loop_external.default.yml b/config/sync/core.entity_form_display.node.os2loop_external.default.yml index e44c6cef4..2e8b8168f 100644 --- a/config/sync/core.entity_form_display.node.os2loop_external.default.yml +++ b/config/sync/core.entity_form_display.node.os2loop_external.default.yml @@ -14,6 +14,7 @@ dependencies: - autocomplete_deluxe - datetime - link + - path - text id: node.os2loop_external.default targetEntityType: node @@ -45,17 +46,17 @@ content: os2loop_shared_profession: weight: 10 settings: - match_operator: CONTAINS - autocomplete_route_name: autocomplete_deluxe.autocomplete - size: 60 - selection_handler: default - limit: 10 + match_limit: '0' min_length: 0 delimiter: '' - not_found_message_allow: false not_found_message: 'The term ''@term'' will be added' - new_terms: false no_empty_message: 'No terms could be found. Please type in order to add a new term.' + not_found_message_allow: false + new_terms: false + match_operator: CONTAINS + autocomplete_route_name: autocomplete_deluxe.autocomplete + size: 60 + selection_handler: default third_party_settings: { } type: autocomplete_deluxe region: content @@ -68,24 +69,23 @@ content: os2loop_shared_subject: weight: 8 settings: - match_operator: CONTAINS - autocomplete_route_name: autocomplete_deluxe.autocomplete - size: 60 - selection_handler: default - limit: 10 + match_limit: '0' min_length: 0 delimiter: '' - not_found_message_allow: false not_found_message: 'The term ''@term'' will be added' - new_terms: false no_empty_message: 'No terms could be found. Please type in order to add a new term.' + not_found_message_allow: false + new_terms: false + match_operator: CONTAINS + autocomplete_route_name: autocomplete_deluxe.autocomplete + size: 60 + selection_handler: default third_party_settings: { } type: autocomplete_deluxe region: content os2loop_shared_tags: weight: 9 settings: - limit: 10 min_length: 0 delimiter: '' not_found_message: 'The term ''@term'' will be added' @@ -96,6 +96,7 @@ content: autocomplete_route_name: autocomplete_deluxe.autocomplete size: 60 selection_handler: default + match_limit: 10 third_party_settings: { } type: autocomplete_deluxe region: content diff --git a/config/sync/core.entity_form_display.node.os2loop_post.default.yml b/config/sync/core.entity_form_display.node.os2loop_post.default.yml index 9ed780baa..e70b5083f 100644 --- a/config/sync/core.entity_form_display.node.os2loop_post.default.yml +++ b/config/sync/core.entity_form_display.node.os2loop_post.default.yml @@ -16,6 +16,7 @@ dependencies: - comment - datetime - media_library + - path - text id: node.os2loop_post.default targetEntityType: node @@ -52,17 +53,17 @@ content: os2loop_shared_profession: weight: 9 settings: - match_operator: CONTAINS - autocomplete_route_name: autocomplete_deluxe.autocomplete - size: 60 - selection_handler: default - limit: 10 + match_limit: '0' min_length: 0 delimiter: '' - not_found_message_allow: false not_found_message: 'The term ''@term'' will be added' - new_terms: false no_empty_message: 'No terms could be found. Please type in order to add a new term.' + not_found_message_allow: false + new_terms: false + match_operator: CONTAINS + autocomplete_route_name: autocomplete_deluxe.autocomplete + size: 60 + selection_handler: default third_party_settings: { } type: autocomplete_deluxe region: content @@ -75,24 +76,23 @@ content: os2loop_shared_subject: weight: 7 settings: - match_operator: CONTAINS - autocomplete_route_name: autocomplete_deluxe.autocomplete - size: 60 - selection_handler: default - limit: 10 + match_limit: '0' min_length: 0 delimiter: '' - not_found_message_allow: false not_found_message: 'The term ''@term'' will be added' - new_terms: false no_empty_message: 'No terms could be found. Please type in order to add a new term.' + not_found_message_allow: false + new_terms: false + match_operator: CONTAINS + autocomplete_route_name: autocomplete_deluxe.autocomplete + size: 60 + selection_handler: default third_party_settings: { } type: autocomplete_deluxe region: content os2loop_shared_tags: weight: 8 settings: - limit: 10 min_length: 0 delimiter: '' not_found_message: 'The term ''@term'' will be added' @@ -103,6 +103,7 @@ content: autocomplete_route_name: autocomplete_deluxe.autocomplete size: 60 selection_handler: default + match_limit: 10 third_party_settings: { } type: autocomplete_deluxe region: content diff --git a/config/sync/core.entity_form_display.node.os2loop_question.default.yml b/config/sync/core.entity_form_display.node.os2loop_question.default.yml index 8d2f171da..ff970bc0d 100644 --- a/config/sync/core.entity_form_display.node.os2loop_question.default.yml +++ b/config/sync/core.entity_form_display.node.os2loop_question.default.yml @@ -50,41 +50,40 @@ content: region: content os2loop_shared_profession: settings: - match_operator: CONTAINS - autocomplete_route_name: autocomplete_deluxe.autocomplete - size: 60 - selection_handler: default - limit: 10 + match_limit: '0' min_length: 0 delimiter: '' - not_found_message_allow: false not_found_message: 'The term ''@term'' will be added' - new_terms: false no_empty_message: 'No terms could be found. Please type in order to add a new term.' + not_found_message_allow: false + new_terms: false + match_operator: CONTAINS + autocomplete_route_name: autocomplete_deluxe.autocomplete + size: 60 + selection_handler: default third_party_settings: { } type: autocomplete_deluxe region: content weight: 9 os2loop_shared_subject: settings: - match_operator: CONTAINS - autocomplete_route_name: autocomplete_deluxe.autocomplete - size: 60 - selection_handler: default - limit: 10 + match_limit: '0' min_length: 0 delimiter: '' - not_found_message_allow: false not_found_message: 'The term ''@term'' will be added' - new_terms: false no_empty_message: 'No terms could be found. Please type in order to add a new term.' + not_found_message_allow: false + new_terms: false + match_operator: CONTAINS + autocomplete_route_name: autocomplete_deluxe.autocomplete + size: 60 + selection_handler: default third_party_settings: { } type: autocomplete_deluxe region: content weight: 7 os2loop_shared_tags: settings: - limit: 10 min_length: 0 delimiter: '' not_found_message: 'The term ''@term'' will be added' @@ -95,6 +94,7 @@ content: autocomplete_route_name: autocomplete_deluxe.autocomplete size: 60 selection_handler: default + match_limit: 10 third_party_settings: { } type: autocomplete_deluxe region: content From b0a49d47872fd874159e7c5a7abb376e8489edc9 Mon Sep 17 00:00:00 2001 From: martinyde Date: Wed, 8 Sep 2021 11:25:15 +0200 Subject: [PATCH 3/4] LOOP-1091: Changed limitation in user fields --- ....entity_form_display.user.user.default.yml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/config/sync/core.entity_form_display.user.user.default.yml b/config/sync/core.entity_form_display.user.user.default.yml index af42217f6..508f927f4 100644 --- a/config/sync/core.entity_form_display.user.user.default.yml +++ b/config/sync/core.entity_form_display.user.user.default.yml @@ -165,17 +165,17 @@ content: weight: 0 region: content settings: - match_operator: CONTAINS - size: 60 - autocomplete_route_name: autocomplete_deluxe.autocomplete - selection_handler: default - limit: 10 + match_limit: '0' min_length: 0 delimiter: '' - not_found_message_allow: false not_found_message: 'The term ''@term'' will be added' - new_terms: false no_empty_message: 'No terms could be found. Please type in order to add a new term.' + not_found_message_allow: false + new_terms: false + match_operator: CONTAINS + autocomplete_route_name: autocomplete_deluxe.autocomplete + size: 60 + selection_handler: default third_party_settings: { } os2loop_user_biography: type: string_textarea @@ -267,17 +267,17 @@ content: weight: 9 region: content settings: - match_operator: CONTAINS - size: 60 - autocomplete_route_name: autocomplete_deluxe.autocomplete - selection_handler: default - limit: 10 + match_limit: '0' min_length: 0 delimiter: '' - not_found_message_allow: false not_found_message: 'The term ''@term'' will be added' - new_terms: false no_empty_message: 'No terms could be found. Please type in order to add a new term.' + not_found_message_allow: false + new_terms: false + match_operator: CONTAINS + autocomplete_route_name: autocomplete_deluxe.autocomplete + size: 60 + selection_handler: default third_party_settings: { } hidden: langcode: true From d5480210796aa7cbbfa5f4c6df6f90d034a1a277 Mon Sep 17 00:00:00 2001 From: martinyde Date: Wed, 8 Sep 2021 11:34:26 +0200 Subject: [PATCH 4/4] LOOP-1091: Updated composer files --- composer.json | 2 +- composer.lock | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 7c64f7713..db77e449e 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,7 @@ "composer/installers": "^1.9", "cweagans/composer-patches": "^1.7", "drupal/adminimal_theme": "^1.6", - "drupal/autocomplete_deluxe": "^2.0@RC", + "drupal/autocomplete_deluxe": "2.0.0", "drupal/better_formats": "1.x-dev", "drupal/block_field": "^1.0@RC", "drupal/config_ignore": "^2.3", diff --git a/composer.lock b/composer.lock index 6deddac2d..1e25c1c33 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8389a8ae3f00d8dc6658e8b538c3b288", + "content-hash": "5e003ea36979d6761d7e02f2092e2b47", "packages": [ { "name": "alchemy/zippy", @@ -13057,7 +13057,7 @@ }, { "name": "os2loop/os2loop_fixtures", - "version": "dev-develop", + "version": "dev-feature/LOOP-1091-autocomplete-limitation", "dist": { "type": "path", "url": "web/profiles/custom/os2loop/modules/os2loop_fixtures", @@ -15525,7 +15525,6 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "drupal/autocomplete_deluxe": 5, "drupal/better_formats": 20, "drupal/block_field": 5, "drupal/entity_usage": 10, @@ -15541,5 +15540,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.1.0" }