From 8a0817ca5d61f3b9f7297b31cf3c8793d443d058 Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Mon, 19 Jun 2023 13:36:38 -0300 Subject: [PATCH 1/5] Update jwt --- composer.json | 2 +- composer.lock | 59 ++++++++++++++++++++++++++++----------------------- 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/composer.json b/composer.json index d43600432..b37625d43 100755 --- a/composer.json +++ b/composer.json @@ -60,7 +60,7 @@ "islandora-rdm/islandora_fits": "dev-8.x-1.x as 1.x-dev", "islandora/advanced_search": "dev-contrib", "islandora/controlled_access_terms": "^2", - "islandora/islandora": "^2", + "islandora/islandora": "dev-jwt-version-bump", "islandora/openseadragon": "^2", "islandora/views_nested_details": "^1.0", "library/pdf.js": "^2.4", diff --git a/composer.lock b/composer.lock index 97b48d310..d21a98966 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": "8839a33a32ca3e404b39de66f51b6221", + "content-hash": "dd8102babf3f3cf0db4eff415402b2dc", "packages": [ { "name": "academicpuma/citeproc-php", @@ -3665,23 +3665,23 @@ }, { "name": "drupal/jwt", - "version": "1.1.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/jwt.git", - "reference": "8.x-1.1" + "reference": "2.0.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/jwt-8.x-1.1.zip", - "reference": "8.x-1.1", - "shasum": "bc500760cc6d5ee0253a57d0d9a086d45174e883" + "url": "https://ftp.drupal.org/files/projects/jwt-2.0.0.zip", + "reference": "2.0.0", + "shasum": "2cc18d6b678e26838e356e9cf860a5d8dc315139" }, "require": { "drupal/core": "^9.0 || ^10.0", "drupal/key": "^1.3", - "firebase/php-jwt": "^4.0 | ^5.0", - "php": ">=7.0.8" + "firebase/php-jwt": "^5.5 | ^6.0", + "php": ">=7.4" }, "suggest": { "ext-openssl": "Enabling the openssl extension is required to use RSA keys" @@ -3689,8 +3689,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.1", - "datestamp": "1675367553", + "version": "2.0.0", + "datestamp": "1682441648", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5200,25 +5200,31 @@ }, { "name": "firebase/php-jwt", - "version": "v5.5.1", + "version": "v6.7.0", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "83b609028194aa042ea33b5af2d41a7427de80e6" + "reference": "71278f20b0a623389beefe87a641d03948a38870" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/83b609028194aa042ea33b5af2d41a7427de80e6", - "reference": "83b609028194aa042ea33b5af2d41a7427de80e6", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/71278f20b0a623389beefe87a641d03948a38870", + "reference": "71278f20b0a623389beefe87a641d03948a38870", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.4||^8.0" }, "require-dev": { - "phpunit/phpunit": ">=4.8 <=9" + "guzzlehttp/guzzle": "^6.5||^7.4", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.5", + "psr/cache": "^1.0||^2.0", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0" }, "suggest": { + "ext-sodium": "Support EdDSA (Ed25519) signatures", "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present" }, "type": "library", @@ -5251,9 +5257,9 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v5.5.1" + "source": "https://github.com/firebase/php-jwt/tree/v6.7.0" }, - "time": "2021-11-08T20:18:51+00:00" + "time": "2023-06-14T15:29:26+00:00" }, { "name": "grasmash/expander", @@ -5917,16 +5923,16 @@ }, { "name": "islandora/islandora", - "version": "2.7.1", + "version": "dev-jwt-version-bump", "source": { "type": "git", "url": "https://github.com/Islandora/islandora.git", - "reference": "66401baec9a312e3e57c48c4b9b6989f8ed0c83c" + "reference": "07843d9f4c433dc52d8427d9171a7668217917a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Islandora/islandora/zipball/66401baec9a312e3e57c48c4b9b6989f8ed0c83c", - "reference": "66401baec9a312e3e57c48c4b9b6989f8ed0c83c", + "url": "https://api.github.com/repos/Islandora/islandora/zipball/07843d9f4c433dc52d8427d9171a7668217917a0", + "reference": "07843d9f4c433dc52d8427d9171a7668217917a0", "shasum": "" }, "require": { @@ -5937,7 +5943,7 @@ "drupal/file_replace": "^1.1", "drupal/filehash": "^2", "drupal/flysystem": "^2.0@alpha", - "drupal/jwt": "^1.1", + "drupal/jwt": "^1.1 || ^2", "drupal/migrate_plus": "^5.1 || ^6", "drupal/migrate_source_csv": "^3.4", "drupal/prepopulate": "^2.2", @@ -5982,9 +5988,9 @@ ], "support": { "issues": "https://github.com/Islandora/documentation/issues", - "source": "https://github.com/Islandora/islandora/tree/2.7.1" + "source": "https://github.com/Islandora/islandora/tree/jwt-version-bump" }, - "time": "2023-05-04T17:19:38+00:00" + "time": "2023-06-19T16:22:10+00:00" }, { "name": "islandora/jsonld", @@ -11835,7 +11841,8 @@ "drupal/term_merge": 10, "drupal/views_field_view": 10, "islandora-rdm/islandora_fits": 20, - "islandora/advanced_search": 20 + "islandora/advanced_search": 20, + "islandora/islandora": 20 }, "prefer-stable": true, "prefer-lowest": false, From e8f95ec94631d260654d7dc21b35807a24acf287 Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Mon, 19 Jun 2023 13:56:34 -0300 Subject: [PATCH 2/5] Bump JWT. --- composer.json | 2 +- composer.lock | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index b37625d43..94dd06f63 100755 --- a/composer.json +++ b/composer.json @@ -60,7 +60,7 @@ "islandora-rdm/islandora_fits": "dev-8.x-1.x as 1.x-dev", "islandora/advanced_search": "dev-contrib", "islandora/controlled_access_terms": "^2", - "islandora/islandora": "dev-jwt-version-bump", + "islandora/islandora": "^2.8.1", "islandora/openseadragon": "^2", "islandora/views_nested_details": "^1.0", "library/pdf.js": "^2.4", diff --git a/composer.lock b/composer.lock index d21a98966..95b9b4157 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": "dd8102babf3f3cf0db4eff415402b2dc", + "content-hash": "09f56438e64e07c89fa3e961aeed64e3", "packages": [ { "name": "academicpuma/citeproc-php", @@ -5923,16 +5923,16 @@ }, { "name": "islandora/islandora", - "version": "dev-jwt-version-bump", + "version": "2.8.1", "source": { "type": "git", "url": "https://github.com/Islandora/islandora.git", - "reference": "07843d9f4c433dc52d8427d9171a7668217917a0" + "reference": "cc5b5f838ddd2df4a9dee1c75c67245b60e28da9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Islandora/islandora/zipball/07843d9f4c433dc52d8427d9171a7668217917a0", - "reference": "07843d9f4c433dc52d8427d9171a7668217917a0", + "url": "https://api.github.com/repos/Islandora/islandora/zipball/cc5b5f838ddd2df4a9dee1c75c67245b60e28da9", + "reference": "cc5b5f838ddd2df4a9dee1c75c67245b60e28da9", "shasum": "" }, "require": { @@ -5988,9 +5988,9 @@ ], "support": { "issues": "https://github.com/Islandora/documentation/issues", - "source": "https://github.com/Islandora/islandora/tree/jwt-version-bump" + "source": "https://github.com/Islandora/islandora/tree/2.8.1" }, - "time": "2023-06-19T16:22:10+00:00" + "time": "2023-06-19T16:49:41+00:00" }, { "name": "islandora/jsonld", @@ -11841,8 +11841,7 @@ "drupal/term_merge": 10, "drupal/views_field_view": 10, "islandora-rdm/islandora_fits": 20, - "islandora/advanced_search": 20, - "islandora/islandora": 20 + "islandora/advanced_search": 20 }, "prefer-stable": true, "prefer-lowest": false, From b197228c39591e3b374f5c6ad179453015fb24e5 Mon Sep 17 00:00:00 2001 From: Kyle Huynh Date: Wed, 21 Jun 2023 13:58:06 -0400 Subject: [PATCH 3/5] Enable Search hightlight settings for Search API Added Search hightlight field for search views Change Advanced Search module to the beta release --- composer.json | 19 ++++-- composer.lock | 55 ++--------------- .../search_api.server.default_solr_server.yml | 34 ++++++++--- .../sync/views.view.solr_search_content.yml | 60 +++++++++++++++++++ 4 files changed, 106 insertions(+), 62 deletions(-) diff --git a/composer.json b/composer.json index 94dd06f63..59e9cb569 100755 --- a/composer.json +++ b/composer.json @@ -25,10 +25,19 @@ } } }, - { - "type": "vcs", - "url": "https://github.com/digitalutsc/advanced_search.git" - } + { + "type": "package", + "package": { + "name": "islandora/advanced_search", + "version": "2.0.0-beta1", + "type": "drupal-module", + "source": { + "url": "https://github.com/digitalutsc/advanced_search", + "type": "git", + "reference":"2.0.0-beta1" + } + } + } ], "require": { "php": "^7.4 || ^8", @@ -58,7 +67,7 @@ "drupal/views_field_view": "^1.0@beta", "drush/drush": "^10.3", "islandora-rdm/islandora_fits": "dev-8.x-1.x as 1.x-dev", - "islandora/advanced_search": "dev-contrib", + "islandora/advanced_search": "^2.0.0@beta", "islandora/controlled_access_terms": "^2", "islandora/islandora": "^2.8.1", "islandora/openseadragon": "^2", diff --git a/composer.lock b/composer.lock index 95b9b4157..88859f6d9 100644 --- a/composer.lock +++ b/composer.lock @@ -5697,58 +5697,15 @@ }, "time": "2022-09-23T14:27:40+00:00" }, - { + "name": "islandora/advanced_search", - "version": "dev-contrib", + "version": "2.0.0-beta1", "source": { "type": "git", - "url": "https://github.com/digitalutsc/advanced_search.git", - "reference": "de445f96de3514d0797898f9dd364f0dbb93a6bb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/digitalutsc/advanced_search/zipball/de445f96de3514d0797898f9dd364f0dbb93a6bb", - "reference": "de445f96de3514d0797898f9dd364f0dbb93a6bb", - "shasum": "" - }, - "require": { - "drupal/facets": "^2.0", - "drupal/search_api_solr": "^4.2" - }, - "require-dev": { - "drupal/coder": "*", - "phpunit/phpunit": "^8", - "sebastian/phpcpd": "*", - "squizlabs/php_codesniffer": "^3" - }, - "default-branch": true, - "type": "drupal-module", - "scripts": { - "post-install-cmd": [ - "./vendor/bin/phpcs --config-set installed_paths ~/.composer/vendor/drupal/coder/coder_sniffer" - ], - "post-update-cmd": [ - "./vendor/bin/phpcs --config-set installed_paths ~/.composer/vendor/drupal/coder/coder_sniffer" - ], - "check": [ - "./vendor/bin/phpcs --standard=Drupal --ignore=*.md,vendor --extensions=php,module,inc,install,test,profile,theme,css,info .", - "./vendor/bin/phpcpd --names='*.module,*.inc,*.test,*.php' --exclude=vendor ." - ] - }, - "license": [ - "GPL-2.0-only" - ], - "description": "This module creates several blocks to support searching. It also enables the use of Ajax with search blocks, facets, and search results.", - "homepage": "https://github.com/digitalutsc/advanced_search", - "keywords": [ - "Advanced Search", - "Islandora" - ], - "support": { - "issues": "https://github.com/digitalutsc/advanced_search/issues", - "source": "https://github.com/digitalutsc/advanced_search/tree/islandora_lite" + "url": "https://github.com/digitalutsc/advanced_search", + "reference": "2.0.0-beta1" }, - "time": "2023-06-07T18:34:44+00:00" + "type": "drupal-module" }, { "name": "islandora/chullo", @@ -11841,7 +11798,7 @@ "drupal/term_merge": 10, "drupal/views_field_view": 10, "islandora-rdm/islandora_fits": 20, - "islandora/advanced_search": 20 + "islandora/advanced_search": 10 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/config/sync/search_api.server.default_solr_server.yml b/config/sync/search_api.server.default_solr_server.yml index 2140a5fc9..87cf3289d 100644 --- a/config/sync/search_api.server.default_solr_server.yml +++ b/config/sync/search_api.server.default_solr_server.yml @@ -8,15 +8,15 @@ dependencies: - search_api_solr.solr_cache.cache_filter_default_7_0_0 - search_api_solr.solr_cache.cache_persegfilter_default_7_0_0 - search_api_solr.solr_cache.cache_queryresult_default_7_0_0 - - search_api_solr.solr_field_type.text_edge_und_6_0_0 + - search_api_solr.solr_field_type.text_edge_und_7_0_0 - search_api_solr.solr_field_type.text_edgestring_und_6_0_0 - - search_api_solr.solr_field_type.text_en_6_0_0 - - search_api_solr.solr_field_type.text_ngram_und_6_0_0 + - search_api_solr.solr_field_type.text_en_7_0_0 + - search_api_solr.solr_field_type.text_ngram_und_7_0_0 - search_api_solr.solr_field_type.text_ngramstring_und_6_0_0 - search_api_solr.solr_field_type.text_phonetic_en_7_0_0 - search_api_solr.solr_field_type.text_phonetic_und_7_0_0 - search_api_solr.solr_field_type.text_string_und_6_0_0 - - search_api_solr.solr_field_type.text_und_6_0_0 + - search_api_solr.solr_field_type.text_und_7_0_0 - search_api_solr.solr_request_dispatcher.request_dispatcher_httpcachingnever_default_7_0_0 - search_api_solr.solr_request_handler.request_handler_autocomplete_default_7_0_0 - search_api_solr.solr_request_handler.request_handler_extract_default_7_0_0 @@ -34,23 +34,41 @@ name: 'Solr Server' description: 'Default Solr server created by the Solr Search Defaults module' backend: search_api_solr backend_config: - retrieve_data: false - highlight_data: false + retrieve_data: true + highlight_data: true site_hash: true server_prefix: '' domain: generic + environment: default connector: standard connector_config: scheme: http - host: 127.0.0.1 + host: solr port: 8983 + path: / core: ISLANDORA timeout: 5 index_timeout: 10 optimize_timeout: 15 finalize_timeout: 30 + skip_schema_check: false solr_version: '' http_method: AUTO commit_within: 1000 jmx: false - skip_schema_check: false + jts: false + solr_install_dir: '' + optimize: false + fallback_multiple: true + disabled_field_types: { } + disabled_caches: { } + disabled_request_handlers: + - request_handler_elevate_default_7_0_0 + - request_handler_replicationmaster_default_7_0_0 + - request_handler_replicationslave_default_7_0_0 + disabled_request_dispatchers: + - request_dispatcher_httpcaching_default_7_0_0 + rows: 10 + index_single_documents_fallback_count: 10 + index_empty_text_fields: false + suppress_missing_languages: false diff --git a/config/sync/views.view.solr_search_content.yml b/config/sync/views.view.solr_search_content.yml index 922cd9610..38d13e96e 100644 --- a/config/sync/views.view.solr_search_content.yml +++ b/config/sync/views.view.solr_search_content.yml @@ -4,6 +4,7 @@ status: true dependencies: config: - field.storage.node.field_description + - field.storage.node.field_resource_type - search_api.index.default_solr_index module: - search_api @@ -622,6 +623,59 @@ display: use_highlighting: false multi_type: separator multi_separator: ', ' + search_api_excerpt: + id: search_api_excerpt + table: search_api_index_default_solr_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: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + link_to_item: false + use_highlighting: false + multi_type: separator + multi_separator: ', ' pager: type: mini options: @@ -799,7 +853,9 @@ display: - 'user.node_grants:view' tags: - 'config:field.storage.node.field_description' + - 'config:field.storage.node.field_resource_type' - 'config:search_api.index.default_solr_index' + - 'search_api_list:default_solr_index' cacheable: false block_1: id: block_1 @@ -900,7 +956,9 @@ display: - 'user.node_grants:view' tags: - 'config:field.storage.node.field_description' + - 'config:field.storage.node.field_resource_type' - 'config:search_api.index.default_solr_index' + - 'search_api_list:default_solr_index' page_1: id: page_1 display_title: 'Search Page' @@ -997,5 +1055,7 @@ display: - 'user.node_grants:view' tags: - 'config:field.storage.node.field_description' + - 'config:field.storage.node.field_resource_type' - 'config:search_api.index.default_solr_index' + - 'search_api_list:default_solr_index' cacheable: false From c31f3353ae191c01d9fb39e9245914d3cd1e023c Mon Sep 17 00:00:00 2001 From: Kyle Huynh <7862086+kylehuynh205@users.noreply.github.com> Date: Wed, 21 Jun 2023 14:06:19 -0400 Subject: [PATCH 4/5] Update composer.lock --- composer.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index 88859f6d9..16f9980f4 100644 --- a/composer.lock +++ b/composer.lock @@ -5697,7 +5697,7 @@ }, "time": "2022-09-23T14:27:40+00:00" }, - + { "name": "islandora/advanced_search", "version": "2.0.0-beta1", "source": { From 2e69e8883a1cad3443edd5b981a76beea8d4dd87 Mon Sep 17 00:00:00 2001 From: Kyle Huynh Date: Wed, 28 Jun 2023 17:17:15 -0400 Subject: [PATCH 5/5] Update version of Advanced Search include fixes for https://github.com/digitalutsc/advanced_search/issues/33 and https://github.com/Islandora-Devops/islandora-starter-site/pull/96#issuecomment-1609442159 --- composer.json | 4 ++-- composer.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 59e9cb569..e9b1077c0 100755 --- a/composer.json +++ b/composer.json @@ -29,12 +29,12 @@ "type": "package", "package": { "name": "islandora/advanced_search", - "version": "2.0.0-beta1", + "version": "2.0.0-beta3", "type": "drupal-module", "source": { "url": "https://github.com/digitalutsc/advanced_search", "type": "git", - "reference":"2.0.0-beta1" + "reference":"2.0.0-beta3" } } } diff --git a/composer.lock b/composer.lock index 16f9980f4..eac4016ca 100644 --- a/composer.lock +++ b/composer.lock @@ -5699,11 +5699,11 @@ }, { "name": "islandora/advanced_search", - "version": "2.0.0-beta1", + "version": "2.0.0-beta3", "source": { "type": "git", "url": "https://github.com/digitalutsc/advanced_search", - "reference": "2.0.0-beta1" + "reference": "2.0.0-beta3" }, "type": "drupal-module" },