diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b0f13eac..47c1d55ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,9 +1,9 @@ --- name: CI on: - push: {} - pull_request: + push: branches: [ main ] + pull_request: {} workflow_dispatch: {} jobs: @@ -12,13 +12,14 @@ jobs: strategy: fail-fast: false matrix: - php-versions: [ 8.1, 8.2 ] + php-versions: [ 8.1, 8.2, 8.3 ] name: PHP ${{ matrix.php-versions }} steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 + - name: Setup PHP uses: shivammathur/setup-php@v2 with: @@ -28,17 +29,23 @@ jobs: - name: Get composer cache directory id: composer-cache run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + - name: Cache dependencies uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} restore-keys: ${{ runner.os }}-composer- + - name: Install dependencies run: composer install + - name: Test site installation + shell: bash run: composer exec -- drush site:install --existing-config --db-url=sqlite:test_db + - name: Inspect configuration + shell: bash # Just warnings, for now... continue-on-error: true run: | diff --git a/README.md b/README.md index d98a54130..4e69bb732 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ tools and services that support it, try one of the Islandora deployment tools: ## Manual Installation The config files in the Starter Site assume a full suite of external services. -If you do not need all the external services (such as Fedora or Matomo) then +If you do not need all the external services (such as Fedora) then you can skip them but you will also want to adjust the Drupal configs. Such a partial install is beyond the scope of this document. @@ -69,12 +69,10 @@ If not the default `tcp://127.0.0.1:61613`, this will have to be set (see Usage | `islandora-connector-fits` | CrayFits derivative processor | 7. A [Drupal-compatible web server](https://www.drupal.org/docs/system-requirements/web-server-requirements) -8. A [Matomo installation](https://matomo.org/) - * Further details in the [`matomo` module's](https://www.drupal.org/project/matomo) documentation -9. [FITS Web Service](https://projects.iq.harvard.edu/fits/downloads#fits-servlet) and +8. [FITS Web Service](https://projects.iq.harvard.edu/fits/downloads#fits-servlet) and [CrayFits](https://github.com/roblib/CrayFits) installed * Further details in the [`islandora_fits` module's](https://github.com/roblib/islandora_fits) README/documentation -10. A Solr server installed or available with a core set up +9. A Solr server installed or available with a core set up * Further details on [Drupal's Search API Solr module](https://www.drupal.org/project/search_api_solr) page. * If not available at `127.0.0.1:8983`, or if the core name is not `ISLANDORA` its information will need to be set up (see Usage step 5) @@ -133,7 +131,6 @@ Change the following Drupal configs to your values using any method (GUI, | ActiveMQ (broker) | `islandora.settings broker_url` | `tcp://127.0.0.1:61613` | | Cantaloupe (for OpenSeadragon) | `openseadragon.settings iiif_server` | `http://127.0.0.1:8080/cantaloupe/iiif/2` | | Cantaloupe (for Islandora IIIF) | `islandora_iiif.settings iiif_server` | `http://127.0.0.1:8080/cantaloupe/iiif/2` | -| Matomo URL | `matomo.settings url_http` | `http://localhost:8000/matomo/` | | Solr - URL | `search_api.server.default_solr_server backend_config.connector_config.host` | `127.0.0.1` | | Solr - port | `search_api.server.default_solr_server backend_config.connector_config.port` | `8983` | | Solr - core name | `search_api.server.default_solr_server backend_config.connector_config.core` | `ISLANDORA` | diff --git a/assets/patches/matomo-3363521-7.patch b/assets/patches/matomo-3363521-7.patch deleted file mode 100644 index 53e1ca317..000000000 --- a/assets/patches/matomo-3363521-7.patch +++ /dev/null @@ -1,50 +0,0 @@ -From da80d90705ca385addf6e68d16459d6433a2b8b0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ignacio=20D=C3=ADaz-Roncero?= - <17740-idiaz.roncero@users.noreply.drupalcode.org> -Date: Tue, 30 May 2023 10:49:24 +0000 -Subject: [PATCH] Add check for Role - ---- - matomo.install | 19 +++++++++++-------- - 1 file changed, 11 insertions(+), 8 deletions(-) - -diff --git a/matomo.install b/matomo.install -index 021b86b..a2ef178 100644 ---- a/matomo.install -+++ b/matomo.install -@@ -9,6 +9,7 @@ declare(strict_types = 1); - - use Drupal\Core\Url; - use Drupal\user\Entity\Role; -+use Drupal\user\RoleInterface; - - /** - * Implements hook_install(). -@@ -16,14 +17,16 @@ use Drupal\user\Entity\Role; - function matomo_install(): void { - // Make the default install more user and GDPR friendly. - $role = Role::load('authenticated'); -- $role->grantPermission('opt-in or out of matomo tracking'); -- $success = $role->save(); -- if ($success) { -- $messenger = \Drupal::messenger(); -- $messenger->addMessage(t('Module %module granted %permission permission to authenticated users.', [ -- '%module' => 'Matomo Analytics', -- '%permission' => t('Opt-in or out of tracking'), -- ]), 'status'); -+ if ($role instanceof RoleInterface) { -+ $role->grantPermission('opt-in or out of matomo tracking'); -+ $success = $role->save(); -+ if ($success) { -+ $messenger = \Drupal::messenger(); -+ $messenger->addMessage(t('Module %module granted %permission permission to authenticated users.', [ -+ '%module' => 'Matomo Analytics', -+ '%permission' => t('Opt-in or out of tracking'), -+ ]), 'status'); -+ } - } - - if (\Drupal::moduleHandler()->moduleExists('views')) { --- -GitLab - diff --git a/composer.json b/composer.json index 3647f1633..84055d68a 100755 --- a/composer.json +++ b/composer.json @@ -49,7 +49,6 @@ "drupal/fpa": "^4.0", "drupal/hal": "^1.0||^2.0", "drupal/islandora": "^2.8.1", - "drupal/matomo": "^1.19", "drupal/openseadragon": "^2", "drupal/pathauto": "^1.12", "drupal/pdf": "^1.1", diff --git a/composer.lock b/composer.lock index f614688b7..82e0984f0 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": "6b5070205426703bb4bba0b641b7bab8", + "content-hash": "2eb34ad6f4d8b8c14c85c85b30db684a", "packages": [ { "name": "adci/full-name-parser", @@ -4096,70 +4096,6 @@ "issues": "http://drupal.org/project/key" } }, - { - "name": "drupal/matomo", - "version": "1.23.0", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/matomo.git", - "reference": "8.x-1.23" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/matomo-8.x-1.23.zip", - "reference": "8.x-1.23", - "shasum": "c2dbf12878388c5859e64f1e74a9ca5110d1623f" - }, - "require": { - "drupal/core": "^9.0 || ^10" - }, - "conflict": { - "drupal/csp": "<1.12" - }, - "require-dev": { - "drupal/csp": "~1.12", - "drupal/php": "~1.1", - "drupal/token": "~1.9" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "8.x-1.23", - "datestamp": "1700936102", - "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "C-Logemann", - "homepage": "https://www.drupal.org/user/218368" - }, - { - "name": "Grimreaper", - "homepage": "https://www.drupal.org/user/2388214" - }, - { - "name": "hass", - "homepage": "https://www.drupal.org/user/85918" - }, - { - "name": "shelane", - "homepage": "https://www.drupal.org/user/2674989" - } - ], - "description": "Adds Matomo javascript tracking code to all your site's pages.", - "homepage": "https://www.drupal.org/project/matomo", - "support": { - "source": "https://git.drupalcode.org/project/matomo" - } - }, { "name": "drupal/migrate_plus", "version": "6.0.2", @@ -12331,5 +12267,5 @@ "php": "^7.4 || ^8" }, "platform-dev": [], - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } 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 127a1766b..780e4a5b1 100644 --- a/config/sync/core.entity_form_display.user.user.default.yml +++ b/config/sync/core.entity_form_display.user.user.default.yml @@ -24,11 +24,6 @@ content: language: weight: 0 region: content - matomo: - weight: 3 - region: content - settings: { } - third_party_settings: { } timezone: weight: 6 region: content diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 634835484..f10f17a51 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -74,7 +74,6 @@ module: key: 0 language: 0 link: 0 - matomo: 0 media: 0 media_library: 0 menu_link_content: 0 diff --git a/config/sync/matomo.settings.yml b/config/sync/matomo.settings.yml deleted file mode 100644 index b586dbe5f..000000000 --- a/config/sync/matomo.settings.yml +++ /dev/null @@ -1,40 +0,0 @@ -_core: - default_config_hash: mKwnhF-0ryfftZZP6jyqW8q9MEo9glyRkvRzSddrc0k -site_id: '1' -url_http: 'http://localhost:8000/matomo/' -url_https: 'https://localhost:8000/matomo/' -domain_mode: 0 -visibility: - request_path_mode: 0 - request_path_pages: |- - /admin - /admin/* - /batch - /node/add* - /node/*/* - /user/*/* - user_role_mode: 0 - user_role_roles: { } - user_account_mode: 1 -track: - mailto: true - files: true - files_extensions: '7z|aac|arc|arj|asf|asx|avi|bin|csv|doc(x|m)?|dot(x|m)?|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mp(2|3|4|e?g)|mov(ie)?|msi|msp|pdf|phps|png|ppt(x|m)?|pot(x|m)?|pps(x|m)?|ppam|sld(x|m)?|thmx|qtm?|ra(m|r)?|sea|sit|tar|tgz|torrent|txt|wav|wma|wmv|wpd|xls(x|m|b)?|xlt(x|m)|xlam|xml|z|zip' - colorbox: true - userid: false - messages: { } - site_search: false -privacy: - donottrack: true - disablecookies: false -custom: - variable: { } -codesnippet: - before: '' - after: '' -translation_set: false -disable_tracking: false -cache: false -page_title_hierarchy: false -page_title_hierarchy_exclude_home: true -status_codes_disabled: { } diff --git a/config/sync/search_api_solr.solr_cache.cache_document_default_7_0_0.yml b/config/sync/search_api_solr.solr_cache.cache_document_default_7_0_0.yml index 7979fabd9..1f49f022c 100644 --- a/config/sync/search_api_solr.solr_cache.cache_document_default_7_0_0.yml +++ b/config/sync/search_api_solr.solr_cache.cache_document_default_7_0_0.yml @@ -14,4 +14,4 @@ cache: size: 512 initialSize: 512 autowarmCount: 0 -solr_configs: null +solr_configs: { } diff --git a/config/sync/search_api_solr.solr_cache.cache_document_default_9_0_0.yml b/config/sync/search_api_solr.solr_cache.cache_document_default_9_0_0.yml index c2d76c7b2..1ac6f9aaa 100644 --- a/config/sync/search_api_solr.solr_cache.cache_document_default_9_0_0.yml +++ b/config/sync/search_api_solr.solr_cache.cache_document_default_9_0_0.yml @@ -14,4 +14,4 @@ cache: size: 512 initialSize: 512 autowarmCount: 0 -solr_configs: null +solr_configs: { } diff --git a/config/sync/search_api_solr.solr_cache.cache_persegfilter_default_7_0_0.yml b/config/sync/search_api_solr.solr_cache.cache_persegfilter_default_7_0_0.yml index ac3655d25..029c336a0 100644 --- a/config/sync/search_api_solr.solr_cache.cache_persegfilter_default_7_0_0.yml +++ b/config/sync/search_api_solr.solr_cache.cache_persegfilter_default_7_0_0.yml @@ -15,4 +15,4 @@ cache: initialSize: 0 autowarmCount: 10 regenerator: solr.NoOpRegenerator -solr_configs: null +solr_configs: { } diff --git a/config/sync/search_api_solr.solr_cache.cache_persegfilter_default_9_0_0.yml b/config/sync/search_api_solr.solr_cache.cache_persegfilter_default_9_0_0.yml index a1db45da0..150425543 100644 --- a/config/sync/search_api_solr.solr_cache.cache_persegfilter_default_9_0_0.yml +++ b/config/sync/search_api_solr.solr_cache.cache_persegfilter_default_9_0_0.yml @@ -15,4 +15,4 @@ cache: initialSize: 0 autowarmCount: 10 regenerator: solr.NoOpRegenerator -solr_configs: null +solr_configs: { } diff --git a/config/sync/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml index fa9c4d2d3..997178af4 100644 --- a/config/sync/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml @@ -68,8 +68,8 @@ field_type: class: solr.LowerCaseFilterFactory - class: solr.RemoveDuplicatesTokenFilterFactory -unstemmed_field_type: null -spellcheck_field_type: null -collated_field_type: null +unstemmed_field_type: { } +spellcheck_field_type: { } +collated_field_type: { } solr_configs: { } text_files: { } diff --git a/config/sync/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml index e48724bbc..84c8b11ba 100644 --- a/config/sync/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml @@ -70,8 +70,8 @@ field_type: class: solr.LowerCaseFilterFactory - class: solr.RemoveDuplicatesTokenFilterFactory -unstemmed_field_type: null -spellcheck_field_type: null -collated_field_type: null +unstemmed_field_type: { } +spellcheck_field_type: { } +collated_field_type: { } solr_configs: { } text_files: { } diff --git a/config/sync/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml index 073a2add5..42c59ea4a 100644 --- a/config/sync/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml @@ -38,8 +38,8 @@ field_type: class: solr.LowerCaseFilterFactory - class: solr.RemoveDuplicatesTokenFilterFactory -unstemmed_field_type: null -spellcheck_field_type: null -collated_field_type: null +unstemmed_field_type: { } +spellcheck_field_type: { } +collated_field_type: { } solr_configs: { } text_files: { } diff --git a/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml index b819f8303..6fc897de6 100644 --- a/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml @@ -164,7 +164,7 @@ unstemmed_field_type: class: solr.LowerCaseFilterFactory - class: solr.RemoveDuplicatesTokenFilterFactory -spellcheck_field_type: null +spellcheck_field_type: { } collated_field_type: name: collated_en class: solr.ICUCollationField diff --git a/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml index 2e819d2eb..a54618ea8 100644 --- a/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml @@ -168,7 +168,7 @@ unstemmed_field_type: class: solr.LowerCaseFilterFactory - class: solr.RemoveDuplicatesTokenFilterFactory -spellcheck_field_type: null +spellcheck_field_type: { } collated_field_type: name: collated_en class: solr.ICUCollationField diff --git a/config/sync/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml index ec2e4e1c3..3b58688ae 100644 --- a/config/sync/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml @@ -68,8 +68,8 @@ field_type: class: solr.LowerCaseFilterFactory - class: solr.RemoveDuplicatesTokenFilterFactory -unstemmed_field_type: null -spellcheck_field_type: null -collated_field_type: null +unstemmed_field_type: { } +spellcheck_field_type: { } +collated_field_type: { } solr_configs: { } text_files: { } diff --git a/config/sync/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml index ce2895af1..68f4c1875 100644 --- a/config/sync/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml @@ -70,8 +70,8 @@ field_type: class: solr.LowerCaseFilterFactory - class: solr.RemoveDuplicatesTokenFilterFactory -unstemmed_field_type: null -spellcheck_field_type: null -collated_field_type: null +unstemmed_field_type: { } +spellcheck_field_type: { } +collated_field_type: { } solr_configs: { } text_files: { } diff --git a/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml index 2b5fb2e45..f3f6cab7c 100644 --- a/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml @@ -38,8 +38,8 @@ field_type: class: solr.LowerCaseFilterFactory - class: solr.RemoveDuplicatesTokenFilterFactory -unstemmed_field_type: null -spellcheck_field_type: null -collated_field_type: null +unstemmed_field_type: { } +spellcheck_field_type: { } +collated_field_type: { } solr_configs: { } text_files: { } diff --git a/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml index a63abc509..e870dbbd1 100644 --- a/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml @@ -84,8 +84,8 @@ field_type: concat: true - class: solr.RemoveDuplicatesTokenFilterFactory -unstemmed_field_type: null -spellcheck_field_type: null -collated_field_type: null +unstemmed_field_type: { } +spellcheck_field_type: { } +collated_field_type: { } solr_configs: { } text_files: { } diff --git a/config/sync/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml index 60e0cf73f..2d877bc74 100644 --- a/config/sync/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml @@ -84,8 +84,8 @@ field_type: concat: true - class: solr.RemoveDuplicatesTokenFilterFactory -unstemmed_field_type: null -spellcheck_field_type: null -collated_field_type: null +unstemmed_field_type: { } +spellcheck_field_type: { } +collated_field_type: { } solr_configs: { } text_files: { } diff --git a/config/sync/search_api_solr.solr_field_type.text_string_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_string_und_6_0_0.yml index ef41c9cc7..a9c149db5 100644 --- a/config/sync/search_api_solr.solr_field_type.text_string_und_6_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_string_und_6_0_0.yml @@ -28,8 +28,8 @@ field_type: class: solr.PatternTokenizerFactory pattern: '[\t\r\n]' filters: { } -unstemmed_field_type: null -spellcheck_field_type: null -collated_field_type: null +unstemmed_field_type: { } +spellcheck_field_type: { } +collated_field_type: { } solr_configs: { } text_files: { } diff --git a/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml index 11d30b999..399cf036a 100644 --- a/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml @@ -83,7 +83,7 @@ field_type: class: solr.LowerCaseFilterFactory - class: solr.RemoveDuplicatesTokenFilterFactory -unstemmed_field_type: null +unstemmed_field_type: { } spellcheck_field_type: name: text_spell_und class: solr.TextField diff --git a/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml index 6f41a9a97..0b839fff7 100644 --- a/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml @@ -85,7 +85,7 @@ field_type: class: solr.LowerCaseFilterFactory - class: solr.RemoveDuplicatesTokenFilterFactory -unstemmed_field_type: null +unstemmed_field_type: { } spellcheck_field_type: name: text_spell_und class: solr.TextField diff --git a/config/sync/search_api_solr.solr_request_handler.request_handler_autocomplete_default_7_0_0.yml b/config/sync/search_api_solr.solr_request_handler.request_handler_autocomplete_default_7_0_0.yml index 4f41445ea..1db2ea664 100644 --- a/config/sync/search_api_solr.solr_request_handler.request_handler_autocomplete_default_7_0_0.yml +++ b/config/sync/search_api_solr.solr_request_handler.request_handler_autocomplete_default_7_0_0.yml @@ -51,4 +51,4 @@ request_handler: VALUE: spellcheck - VALUE: suggest -solr_configs: null +solr_configs: { } diff --git a/config/sync/search_api_solr.solr_request_handler.request_handler_extract_default_7_0_0.yml b/config/sync/search_api_solr.solr_request_handler.request_handler_extract_default_7_0_0.yml index 669614d3d..f3e1fb6ab 100644 --- a/config/sync/search_api_solr.solr_request_handler.request_handler_extract_default_7_0_0.yml +++ b/config/sync/search_api_solr.solr_request_handler.request_handler_extract_default_7_0_0.yml @@ -32,4 +32,4 @@ request_handler: - name: fmap.div VALUE: ignored_ -solr_configs: null +solr_configs: { } diff --git a/config/sync/search_api_solr.solr_request_handler.request_handler_mlt_default_7_0_0.yml b/config/sync/search_api_solr.solr_request_handler.request_handler_mlt_default_7_0_0.yml index a6dcd14dc..108f2a04a 100644 --- a/config/sync/search_api_solr.solr_request_handler.request_handler_mlt_default_7_0_0.yml +++ b/config/sync/search_api_solr.solr_request_handler.request_handler_mlt_default_7_0_0.yml @@ -28,4 +28,4 @@ request_handler: - name: timeAllowed VALUE: '${solr.mlt.timeAllowed:2000}' -solr_configs: null +solr_configs: { } diff --git a/config/sync/search_api_solr.solr_request_handler.request_handler_query_default_7_0_0.yml b/config/sync/search_api_solr.solr_request_handler.request_handler_query_default_7_0_0.yml index 6be94301d..4e57b2d7a 100644 --- a/config/sync/search_api_solr.solr_request_handler.request_handler_query_default_7_0_0.yml +++ b/config/sync/search_api_solr.solr_request_handler.request_handler_query_default_7_0_0.yml @@ -28,4 +28,4 @@ request_handler: - name: df VALUE: id -solr_configs: null +solr_configs: { } diff --git a/config/sync/search_api_solr.solr_request_handler.request_handler_replicationmaster_default_7_0_0.yml b/config/sync/search_api_solr.solr_request_handler.request_handler_replicationmaster_default_7_0_0.yml index 08751739d..c642535a5 100644 --- a/config/sync/search_api_solr.solr_request_handler.request_handler_replicationmaster_default_7_0_0.yml +++ b/config/sync/search_api_solr.solr_request_handler.request_handler_replicationmaster_default_7_0_0.yml @@ -28,4 +28,4 @@ request_handler: - name: confFiles VALUE: '${solr.replication.confFiles:schema.xml,schema_extra_types.xml,schema_extra_fields.xml,elevate.xml}' -solr_configs: null +solr_configs: { } diff --git a/config/sync/search_api_solr.solr_request_handler.request_handler_replicationslave_default_7_0_0.yml b/config/sync/search_api_solr.solr_request_handler.request_handler_replicationslave_default_7_0_0.yml index 519578fd0..69a7a901a 100644 --- a/config/sync/search_api_solr.solr_request_handler.request_handler_replicationslave_default_7_0_0.yml +++ b/config/sync/search_api_solr.solr_request_handler.request_handler_replicationslave_default_7_0_0.yml @@ -25,4 +25,4 @@ request_handler: - name: pollInterval VALUE: '${solr.replication.pollInterval:00:00:60}' -solr_configs: null +solr_configs: { } diff --git a/config/sync/search_api_solr.solr_request_handler.request_handler_select_default_7_0_0.yml b/config/sync/search_api_solr.solr_request_handler.request_handler_select_default_7_0_0.yml index 7a19c8b7f..c31df53ec 100644 --- a/config/sync/search_api_solr.solr_request_handler.request_handler_select_default_7_0_0.yml +++ b/config/sync/search_api_solr.solr_request_handler.request_handler_select_default_7_0_0.yml @@ -42,4 +42,4 @@ request_handler: VALUE: spellcheck - VALUE: elevator -solr_configs: null +solr_configs: { } diff --git a/config/sync/search_api_solr.solr_request_handler.request_handler_spell_default_7_0_0.yml b/config/sync/search_api_solr.solr_request_handler.request_handler_spell_default_7_0_0.yml index fe19ea3e4..2e09c8043 100644 --- a/config/sync/search_api_solr.solr_request_handler.request_handler_spell_default_7_0_0.yml +++ b/config/sync/search_api_solr.solr_request_handler.request_handler_spell_default_7_0_0.yml @@ -59,4 +59,4 @@ request_handler: str: - VALUE: spellcheck -solr_configs: null +solr_configs: { } diff --git a/config/sync/search_api_solr.solr_request_handler.request_handler_suggest_default_7_0_0.yml b/config/sync/search_api_solr.solr_request_handler.request_handler_suggest_default_7_0_0.yml index 8e215a19a..8473a2bb9 100644 --- a/config/sync/search_api_solr.solr_request_handler.request_handler_suggest_default_7_0_0.yml +++ b/config/sync/search_api_solr.solr_request_handler.request_handler_suggest_default_7_0_0.yml @@ -32,4 +32,4 @@ request_handler: str: - VALUE: suggest -solr_configs: null +solr_configs: { } diff --git a/config/sync/user.role.authenticated.yml b/config/sync/user.role.authenticated.yml index 640756403..8af9c1eda 100644 --- a/config/sync/user.role.authenticated.yml +++ b/config/sync/user.role.authenticated.yml @@ -9,7 +9,6 @@ dependencies: - comment - contact - filter - - matomo - media - rest - shortcut @@ -25,7 +24,6 @@ permissions: - 'access content' - 'access shortcuts' - 'access site-wide contact form' - - 'opt-in or out of matomo tracking' - 'post comments' - 'restful get oai_pmh' - 'skip comment approval' diff --git a/config/sync/views.settings.yml b/config/sync/views.settings.yml index 34228fd99..c7688f923 100644 --- a/config/sync/views.settings.yml +++ b/config/sync/views.settings.yml @@ -1,7 +1,6 @@ _core: default_config_hash: uZHsLrDp1ThO0RvupHKcPzLOyVvWexm58JTTHNDo7yc -display_extenders: - - matomo +display_extenders: { } sql_signature: false ui: show: diff --git a/config/sync/views.view.content.yml b/config/sync/views.view.content.yml index cbfdacf8b..51bf06d9e 100644 --- a/config/sync/views.view.content.yml +++ b/config/sync/views.view.content.yml @@ -1256,18 +1256,7 @@ display: display_plugin: page position: 1 display_options: - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/node menu: type: 'default tab' diff --git a/config/sync/views.view.display_media.yml b/config/sync/views.view.display_media.yml index a163f4009..b668ba734 100644 --- a/config/sync/views.view.display_media.yml +++ b/config/sync/views.view.display_media.yml @@ -269,18 +269,7 @@ display: filters: false filter_groups: false display_description: 'Best quality representation of the Object appropriate for long-term preservation.' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } entity_type: node bundles: { } show_title: false @@ -376,18 +365,7 @@ display: filters: false filter_groups: false display_description: 'The thumbnail file, formatted small.' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } entity_type: node bundles: { } show_title: false @@ -482,18 +460,7 @@ display: filter_groups: false display_description: 'The original creation format of a file' show_admin_links: false - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } entity_type: node bundles: { } show_title: false @@ -657,18 +624,7 @@ display: filters: false filter_groups: false display_description: 'A low resolution image representation of the Object appropriate for using as an icon.' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } entity_type: node bundles: { } show_title: false diff --git a/config/sync/views.view.frontpage.yml b/config/sync/views.view.frontpage.yml index c74236ef7..4bdcb9f25 100644 --- a/config/sync/views.view.frontpage.yml +++ b/config/sync/views.view.frontpage.yml @@ -300,18 +300,7 @@ display: display_plugin: page position: 1 display_options: - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: node cache_metadata: max-age: -1 diff --git a/config/sync/views.view.iiif_manifest.yml b/config/sync/views.view.iiif_manifest.yml index 5c94d6339..3bcb24ef7 100644 --- a/config/sync/views.view.iiif_manifest.yml +++ b/config/sync/views.view.iiif_manifest.yml @@ -457,18 +457,7 @@ display: defaults: filters: false filter_groups: false - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: node/%node/book-manifest cache_metadata: max-age: -1 @@ -659,18 +648,7 @@ display: alias: '' raw_output: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: node/%node/book-manifest-original cache_metadata: max-age: -1 diff --git a/config/sync/views.view.media.yml b/config/sync/views.view.media.yml index efe0dbb4f..7810db0dd 100644 --- a/config/sync/views.view.media.yml +++ b/config/sync/views.view.media.yml @@ -2029,18 +2029,7 @@ display: use_serializer_encode_only: false defaults: fields: false - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/media/csv auth: - basic_auth @@ -2076,18 +2065,7 @@ display: position: 1 display_options: display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/media menu: type: tab diff --git a/config/sync/views.view.media_display_blocks.yml b/config/sync/views.view.media_display_blocks.yml index 6fafbf96f..4118c1384 100644 --- a/config/sync/views.view.media_display_blocks.yml +++ b/config/sync/views.view.media_display_blocks.yml @@ -262,18 +262,7 @@ display: style: false row: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } block_description: 'Media Display - OpenSeadragon - Service File with fallback to Original' cache_metadata: max-age: -1 @@ -362,18 +351,7 @@ display: filters: false filter_groups: false display_description: 'Used as a fallback' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } block_description: 'Media Display - OpenSeadragon - Original File' cache_metadata: max-age: -1 @@ -414,18 +392,7 @@ display: style: false row: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } block_description: 'Media Display - PDFjs - Service File with fallback to Original' cache_metadata: max-age: -1 @@ -514,18 +481,7 @@ display: filters: false filter_groups: false display_description: 'Used as a fallback' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } block_description: 'Media Display - PDFjs - Original File' cache_metadata: max-age: -1 @@ -542,18 +498,7 @@ display: position: 1 display_options: display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } block_description: 'Media Display - Source - Service file with fallback to Original' cache_metadata: max-age: -1 @@ -632,18 +577,7 @@ display: filters: false filter_groups: false display_description: 'Used as a fallback' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } block_description: 'Media Display - Source - Original File' cache_metadata: max-age: -1 diff --git a/config/sync/views.view.missing_media.yml b/config/sync/views.view.missing_media.yml index 74f0a2ead..4215fb953 100644 --- a/config/sync/views.view.missing_media.yml +++ b/config/sync/views.view.missing_media.yml @@ -1282,18 +1282,7 @@ display: filters: false filter_groups: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/missing-media/csv-ext auth: - basic_auth @@ -1895,18 +1884,7 @@ display: filters: false filter_groups: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/missing-media/csv-fits auth: - basic_auth @@ -2507,18 +2485,7 @@ display: filters: false filter_groups: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/missing-media/csv-intermediate auth: - basic_auth @@ -3119,18 +3086,7 @@ display: filters: false filter_groups: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/missing-media/csv-original auth: - basic_auth @@ -3731,18 +3687,7 @@ display: filters: false filter_groups: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/missing-media/csv-preservation-master auth: - basic_auth @@ -4343,18 +4288,7 @@ display: filters: false filter_groups: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/missing-media/csv-service auth: - basic_auth @@ -4955,18 +4889,7 @@ display: filters: false filter_groups: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/missing-media/csv-thumbnail auth: - basic_auth @@ -5567,18 +5490,7 @@ display: filters: false filter_groups: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/missing-media/csv-transcript auth: - basic_auth @@ -5768,18 +5680,7 @@ display: filters: false filter_groups: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/missing-media/extracted-text menu: type: normal @@ -6405,18 +6306,7 @@ display: filters: false filter_groups: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/missing-media/fits-file menu: type: normal @@ -6989,18 +6879,7 @@ display: filters: false filter_groups: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/missing-media/intermediate-file menu: type: normal @@ -7573,18 +7452,7 @@ display: filters: false filter_groups: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/missing-media/original-file menu: type: normal @@ -8157,18 +8025,7 @@ display: filters: false filter_groups: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/missing-media/preservation-master-file menu: type: normal @@ -8797,18 +8654,7 @@ display: filters: false filter_groups: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/missing-media/service-file menu: type: normal @@ -9438,18 +9284,7 @@ display: filters: false filter_groups: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/missing-media/thumbnail-image menu: type: normal @@ -10022,18 +9857,7 @@ display: filters: false filter_groups: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/missing-media/transcript menu: type: normal @@ -10165,18 +9989,7 @@ display: filters: false filter_groups: false display_description: 'provides a menu link under Content.' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/missing-media/all menu: type: normal diff --git a/config/sync/views.view.newspaper_issues_accordion_view.yml b/config/sync/views.view.newspaper_issues_accordion_view.yml index d3f75ca59..f97855d9f 100644 --- a/config/sync/views.view.newspaper_issues_accordion_view.yml +++ b/config/sync/views.view.newspaper_issues_accordion_view.yml @@ -650,18 +650,7 @@ display: display_plugin: block position: 1 display_options: - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } block_description: 'Newspaper Issues' allow: items_per_page: false diff --git a/config/sync/views.view.oai_pmh.yml b/config/sync/views.view.oai_pmh.yml index 94e366f6e..9f08c2ae6 100644 --- a/config/sync/views.view.oai_pmh.yml +++ b/config/sync/views.view.oai_pmh.yml @@ -310,18 +310,7 @@ display: search_fields: title: title display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } cache_metadata: max-age: -1 contexts: @@ -398,18 +387,7 @@ display: defaults: arguments: false display_description: 'All items with collections grouped into a sets per collection they belong to.' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } cache_metadata: max-age: -1 contexts: @@ -567,18 +545,7 @@ display: filters: false filter_groups: false display_description: 'Set of items that do not belong to any Collection, to be used with Collection Sets.' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } cache_metadata: max-age: -1 contexts: diff --git a/config/sync/views.view.oai_pmh_item_data.yml b/config/sync/views.view.oai_pmh_item_data.yml index 70c1e03d6..6d639823e 100644 --- a/config/sync/views.view.oai_pmh_item_data.yml +++ b/config/sync/views.view.oai_pmh_item_data.yml @@ -1716,18 +1716,7 @@ display: display_plugin: page position: 1 display_options: - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: mods_info/%node% cache_metadata: max-age: -1 diff --git a/config/sync/views.view.oai_pmh_item_links.yml b/config/sync/views.view.oai_pmh_item_links.yml index 6700b1c83..14335ff0a 100644 --- a/config/sync/views.view.oai_pmh_item_links.yml +++ b/config/sync/views.view.oai_pmh_item_links.yml @@ -192,18 +192,7 @@ display: display_plugin: block position: 1 display_options: - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } cache_metadata: max-age: -1 contexts: diff --git a/config/sync/views.view.solr_search_content.yml b/config/sync/views.view.solr_search_content.yml index 007cbd9b3..74cab38e8 100644 --- a/config/sync/views.view.solr_search_content.yml +++ b/config/sync/views.view.solr_search_content.yml @@ -995,18 +995,7 @@ display: title: false arguments: false display_description: 'Searches and lists members of a collection.' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } block_description: 'Solr Search Content: Collection Members' cache_metadata: max-age: -1 @@ -1096,18 +1085,7 @@ display: filter_groups: false display_description: '' exposed_block: true - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: search cache_metadata: max-age: -1 diff --git a/config/sync/views.view.taxonomy_terms.yml b/config/sync/views.view.taxonomy_terms.yml index 956f28285..6a9cee8ca 100644 --- a/config/sync/views.view.taxonomy_terms.yml +++ b/config/sync/views.view.taxonomy_terms.yml @@ -1087,18 +1087,7 @@ display: display_plugin: page position: 1 display_options: - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: admin/content/taxonomy-terms menu: type: tab diff --git a/config/sync/views.view.thumbnail.yml b/config/sync/views.view.thumbnail.yml index 050e39bfa..fdc9f0fb3 100644 --- a/config/sync/views.view.thumbnail.yml +++ b/config/sync/views.view.thumbnail.yml @@ -242,18 +242,7 @@ display: position: 1 display_options: display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } block_description: Thumbnail cache_metadata: max-age: -1 @@ -284,18 +273,7 @@ display: defaults: empty: false display_description: '' - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } block_description: 'Thumbnail with Fallback' cache_metadata: max-age: -1 diff --git a/config/sync/views.view.top_level_collections.yml b/config/sync/views.view.top_level_collections.yml index c47d0a355..332b71ed8 100644 --- a/config/sync/views.view.top_level_collections.yml +++ b/config/sync/views.view.top_level_collections.yml @@ -402,18 +402,7 @@ display: value: "

Top-Level Collections

\r\n

Islandora provides you with tools to flexibly designate content into one or more collections. These collections can also be nested within each other, and items can belong to more than one collection. This view shows every collection that is not a member of another collection, which is why we are calling them \"top-level\" collections

" format: basic_html tokenize: false - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } cache_metadata: max-age: -1 contexts: @@ -432,18 +421,7 @@ display: title: '' defaults: title: false - display_extenders: - matomo: - enabled: false - keyword_gets: '' - keyword_behavior: first - keyword_concat_separator: ' ' - category_behavior: none - category_gets: '' - category_concat_separator: ' ' - category_fallback: '' - category_facets: { } - category_facets_concat_separator: ', ' + display_extenders: { } path: collections cache_metadata: max-age: -1