diff --git a/README.md b/README.md index b00bd60871..6a5597abcc 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Note: this has only been tested on ddev 1.19 and above. ddev aws-setup ``` -3. After that, please download the latest database and put it in the `services/drupal/.ddev/db/` folder. The filename isn't important; you will be prompted to select the DB you wish to import during the next step. +3. After that, please download the latest database (see https://forumone.atlassian.net/wiki/spaces/EPA/pages/1794637894/HOWTO+Import+D8+InnoDB+Cold+Backup) and put the .tar file in the `services/drupal/.ddev/db/` folder. The filename isn't important; you will be prompted to select the DB you wish to import during the next step. 4. Import the database by running: @@ -53,6 +53,9 @@ Note: this has only been tested on ddev 1.19 and above. ``````` 10. Install Drupal from config (or restore a backup). You can install from config by running: + + **Note**: Do not run this command if starting from a new installation. This will wipe the database out, instead skip to #11. + ``` ddev drush si --existing-config ``` diff --git a/services/drupal/.ddev/commands/web/phpcbf b/services/drupal/.ddev/commands/web/phpcbf new file mode 100755 index 0000000000..cfbff70170 --- /dev/null +++ b/services/drupal/.ddev/commands/web/phpcbf @@ -0,0 +1,7 @@ +#!/bin/sh + +## Description: Runs phpcbf +## Usage: phpcbf +## Example: "ddev phpcbf" + +phpcbf "$@" diff --git a/services/drupal/.ddev/commands/web/phpcs b/services/drupal/.ddev/commands/web/phpcs new file mode 100755 index 0000000000..580e6d46fb --- /dev/null +++ b/services/drupal/.ddev/commands/web/phpcs @@ -0,0 +1,7 @@ +#!/bin/sh + +## Description: Runs phpcs +## Usage: phpcs +## Example: "ddev phpcs" + +phpcs "$@" diff --git a/services/drupal/.ddev/commands/web/phpstan b/services/drupal/.ddev/commands/web/phpstan new file mode 100755 index 0000000000..30e094e2f5 --- /dev/null +++ b/services/drupal/.ddev/commands/web/phpstan @@ -0,0 +1,7 @@ +#!/bin/sh + +## Description: Runs PHPStan. +## Usage: phpstan +## Example: "ddev phpstan" + +phpstan "$@" diff --git a/services/drupal/.ddev/docker-compose.localstack.yaml b/services/drupal/.ddev/docker-compose.localstack.yaml index 68f5f3adf2..8a8470e83b 100644 --- a/services/drupal/.ddev/docker-compose.localstack.yaml +++ b/services/drupal/.ddev/docker-compose.localstack.yaml @@ -5,7 +5,7 @@ services: image: localstack/localstack:0.12.10 networks: [default, ddev_default] expose: - - 4566:4566 + - 4566 environment: LOCALSTACK_SERVICES: logs LOCALSTACK_START_WEB: '0' diff --git a/services/drupal/.ddev/docker-compose.mysql.yaml b/services/drupal/.ddev/docker-compose.mysql.yaml index 41af617668..d1a372905f 100644 --- a/services/drupal/.ddev/docker-compose.mysql.yaml +++ b/services/drupal/.ddev/docker-compose.mysql.yaml @@ -12,7 +12,7 @@ services: MYSQL_PASSWORD: web MYSQL_DATABASE: web expose: - - 13306:3306 + - 3306 volumes: - ./db:/var/db - ".:/mnt/ddev_config" diff --git a/services/drupal/.phpcs.xml.dist b/services/drupal/.phpcs.xml.dist new file mode 100644 index 0000000000..c9b567b637 --- /dev/null +++ b/services/drupal/.phpcs.xml.dist @@ -0,0 +1,27 @@ + + + PHP_CodeSniffer standards for Drupal-based projects. + + + + + + + . + + vendor/* + drush/* + tests/* + node_modules/* + web/core/* + web/libraries/* + web/modules/contrib/* + web/profiles/contrib/* + web/themes/contrib/* + web/sites/*/files/* + load.environment.php + .ddev/* + scripts/* + web/private/* + web/sites/default/* + diff --git a/services/drupal/Dockerfile b/services/drupal/Dockerfile index eec2a478b2..ba2b95e49d 100644 --- a/services/drupal/Dockerfile +++ b/services/drupal/Dockerfile @@ -211,6 +211,12 @@ COPY status.conf *.map /etc/nginx/conf.d/ # Copy configuration templates COPY default.conf /etc/nginx/templates/default.conf.template +# Copy nginx startup script +COPY scripts/ecs/nginx-entrypoint.sh /webcms-entrypoint + +ENTRYPOINT [ "/webcms-entrypoint" ] +CMD [ "nginx", "-g", "daemon off;" ] + # Build a drush-specific image: this image includes command-line utilities such as mysql # and ssh that are inappropriate for a server container image. FROM forumone/drupal8-cli:8.0 AS drush diff --git a/services/drupal/composer.json b/services/drupal/composer.json index e021245473..cfe5b92a7d 100644 --- a/services/drupal/composer.json +++ b/services/drupal/composer.json @@ -220,6 +220,7 @@ "drupal/autosave_form": "^1.3", "drupal/block_content_permissions": "^1.8", "drupal/block_list_override": "^1.0", + "drupal/ckeditor": "^1.0", "drupal/ckeditor_abbreviation": "^2.0", "drupal/ckeditor_iframe": "^2.1", "drupal/ckeditor_resize": "^1.3", @@ -231,35 +232,41 @@ "drupal/config_filter": "^1.8", "drupal/config_ignore": "^2.3", "drupal/config_split": "~1.5", - "drupal/content_moderation_notifications": "dev-3.x#7ffa936", + "drupal/content_moderation_notifications": "dev-3.x#9ab3da5", "drupal/content_moderation_revert": "1.x-dev", - "drupal/core-composer-scaffold": "~9.3.0", - "drupal/core-recommended": "~9.3.0", + "drupal/core-composer-scaffold": "~9.4.7", + "drupal/core-recommended": "~9.4.7", "drupal/cshs": "^3.5", "drupal/default_content": "^1.0-alpha9", "drupal/devel": "^4.0", "drupal/diff": "^1.0", "drupal/duration_field": "^2.0", "drupal/editor_advanced_link": "^1.8", + "drupal/editoria11y": "^2.0", "drupal/elasticsearch_connector": "^7.0-alpha3", "drupal/embed": "^1.4", "drupal/entity_browser": "^2.6", "drupal/entity_clone": "^1.0@beta", "drupal/entity_usage": "^2.0-beta3", "drupal/entitygroupfield": "^1.0@alpha", - "drupal/environment_indicator": "^4.0", - "drupal/facets": "^1.4", - "drupal/facets_pretty_paths": "1.x-dev", + "drupal/environment_indicator": "^4.0.10", + "drupal/facets": "^2.0", + "drupal/facets_pretty_paths": "^1.4", "drupal/fast_404": "^2.0@alpha", "drupal/field_group": "^3.0", "drupal/filter_html_plus": "^1.0-alpha2", "drupal/fixed_block_content": "^1.1", + "drupal/flag": "^4.0@beta", "drupal/flood_control": "^2.1", "drupal/focal_point": "^1.5", + "drupal/gin": "^3.0", + "drupal/gin_lb": "^1.0@beta", + "drupal/gin_toolbar": "^1.0@beta", "drupal/group": "^1.2", "drupal/group_content_menu": "^1.0", "drupal/group_outsider_in": "^1.0-beta1", "drupal/groupmedia": "^2.0@alpha", + "drupal/hal": "~1.0.0", "drupal/hierarchical_term_formatter": "^1.2", "drupal/honeypot": "^2.0", "drupal/image_style_quality": "^1.4", @@ -298,9 +305,11 @@ "drupal/redirect": "^1.6", "drupal/redirect_metrics": "^1.0@RC", "drupal/role_expose": "^2.0", + "drupal/role_theme_switcher": "^1.2", "drupal/s3fs": "^3.0@beta", "drupal/samlauth": "^3.0", "drupal/scheduled_publish": "^3.9", + "drupal/schema_metatag": "^2.3", "drupal/search_api": "^1.27", "drupal/seckit": "^2.0", "drupal/shield": "1.x-dev", @@ -341,6 +350,7 @@ "kint-php/kint": "^3.3", "liuggio/statsd-php-client": "^1.0", "nodespark/des-connector": "dev-php-update#d699e59 as 7.x-dev", + "ruflin/elastica": "7.x-dev#72a4598544e3f99b5dd8cacb05d009ee75c2a701 as dev-master", "vlucas/phpdotenv": "^2.4", "webflo/drupal-finder": "^1.0.0", "webmozart/path-util": "^2.3", @@ -348,7 +358,13 @@ "zaporylie/composer-drupal-optimizations": "^1.0" }, "require-dev": { - "drupal/core-dev": "~9.3.0" + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2", + "drupal/core-dev": "~9.4.7", + "mglaman/phpstan-drupal": "^1.1", + "phpstan/extension-installer": "^1.2", + "phpstan/phpstan": "^1.9", + "phpstan/phpstan-deprecation-rules": "^1.1", + "squizlabs/php_codesniffer": "^3.7" }, "conflict": { "drupal/drupal": "*" @@ -370,7 +386,8 @@ "drupal/core-composer-scaffold": true, "zaporylie/composer-drupal-optimizations": true, "dealerdirect/phpcodesniffer-composer-installer": true, - "wikimedia/composer-merge-plugin": true + "wikimedia/composer-merge-plugin": true, + "phpstan/extension-installer": true } }, "autoload": { @@ -380,8 +397,21 @@ "files": ["load.environment.php"] }, "scripts": { + "install-codestandards": [ + "PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin::run" + ], + "php-stan": [ + "./vendor/bin/phpstan" + ], + "phpcs": [ + "./vendor/bin/phpcs" + ], + "phpcbf": [ + "./vendor/bin/phpcbf" + ], "post-install-cmd": [ - "DrupalProject\\composer\\ScriptHandler::createFilesDir" + "DrupalProject\\composer\\ScriptHandler::createFilesDir", + "@install-codestandards" ], "post-update-cmd": [ "DrupalProject\\composer\\ScriptHandler::createFilesDir" diff --git a/services/drupal/composer.lock b/services/drupal/composer.lock index 7fb93f4c75..2c838c9c58 100644 --- a/services/drupal/composer.lock +++ b/services/drupal/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": "4e4c995cd6ecc0531391c784be8203f1", + "content-hash": "a08c3a17baa6063a5a2f05eb29d919f1", "packages": [ { "name": "algolia/places", @@ -710,23 +710,23 @@ }, { "name": "composer/semver", - "version": "3.2.6", + "version": "3.3.2", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "83e511e247de329283478496f7a1e114c9517506" + "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/83e511e247de329283478496f7a1e114c9517506", - "reference": "83e511e247de329283478496f7a1e114c9517506", + "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", + "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.54", + "phpstan/phpstan": "^1.4", "symfony/phpunit-bridge": "^4.2 || ^5" }, "type": "library", @@ -771,7 +771,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.2.6" + "source": "https://github.com/composer/semver/tree/3.3.2" }, "funding": [ { @@ -787,7 +787,7 @@ "type": "tidelift" } ], - "time": "2021-10-25T11:34:17+00:00" + "time": "2022-04-01T19:23:25+00:00" }, { "name": "consolidation/annotated-command", @@ -1504,16 +1504,16 @@ }, { "name": "doctrine/annotations", - "version": "1.13.2", + "version": "1.13.3", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "5b668aef16090008790395c02c893b1ba13f7e08" + "reference": "648b0343343565c4a056bfc8392201385e8d89f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08", - "reference": "5b668aef16090008790395c02c893b1ba13f7e08", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0", + "reference": "648b0343343565c4a056bfc8392201385e8d89f0", "shasum": "" }, "require": { @@ -1525,9 +1525,10 @@ "require-dev": { "doctrine/cache": "^1.11 || ^2.0", "doctrine/coding-standard": "^6.0 || ^8.1", - "phpstan/phpstan": "^0.12.20", + "phpstan/phpstan": "^1.4.10 || ^1.8.0", "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", - "symfony/cache": "^4.4 || ^5.2" + "symfony/cache": "^4.4 || ^5.2", + "vimeo/psalm": "^4.10" }, "type": "library", "autoload": { @@ -1570,9 +1571,9 @@ ], "support": { "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.13.2" + "source": "https://github.com/doctrine/annotations/tree/1.13.3" }, - "time": "2021-08-05T19:00:23+00:00" + "time": "2022-07-02T10:48:51+00:00" }, { "name": "doctrine/cache", @@ -2077,32 +2078,28 @@ }, { "name": "doctrine/lexer", - "version": "1.2.1", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "e864bbf5904cb8f5bb334f99209b48018522f042" + "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042", - "reference": "e864bbf5904cb8f5bb334f99209b48018522f042", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229", + "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpstan/phpstan": "^0.11.8", - "phpunit/phpunit": "^8.2" + "doctrine/coding-standard": "^9.0", + "phpstan/phpstan": "^1.3", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.11" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" @@ -2137,7 +2134,7 @@ ], "support": { "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/1.2.1" + "source": "https://github.com/doctrine/lexer/tree/1.2.3" }, "funding": [ { @@ -2153,7 +2150,7 @@ "type": "tidelift" } ], - "time": "2020-05-25T17:44:05+00:00" + "time": "2022-02-28T11:07:21+00:00" }, { "name": "doctrine/persistence", @@ -2259,16 +2256,16 @@ }, { "name": "doctrine/reflection", - "version": "1.2.2", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/doctrine/reflection.git", - "reference": "fa587178be682efe90d005e3a322590d6ebb59a5" + "reference": "1034e5e71f89978b80f9c1570e7226f6c3b9b6fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/reflection/zipball/fa587178be682efe90d005e3a322590d6ebb59a5", - "reference": "fa587178be682efe90d005e3a322590d6ebb59a5", + "url": "https://api.github.com/repos/doctrine/reflection/zipball/1034e5e71f89978b80f9c1570e7226f6c3b9b6fb", + "reference": "1034e5e71f89978b80f9c1570e7226f6c3b9b6fb", "shasum": "" }, "require": { @@ -2280,18 +2277,13 @@ "doctrine/common": "<2.9" }, "require-dev": { - "doctrine/coding-standard": "^6.0 || ^8.2.0", - "doctrine/common": "^2.10", - "phpstan/phpstan": "^0.11.0 || ^0.12.20", - "phpstan/phpstan-phpunit": "^0.11.0 || ^0.12.16", - "phpunit/phpunit": "^7.5 || ^9.1.5" + "doctrine/coding-standard": "^9", + "doctrine/common": "^3.3", + "phpstan/phpstan": "^1.4.10", + "phpstan/phpstan-phpunit": "^1", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\": "lib/Doctrine/Common" @@ -2335,10 +2327,10 @@ ], "support": { "issues": "https://github.com/doctrine/reflection/issues", - "source": "https://github.com/doctrine/reflection/tree/1.2.2" + "source": "https://github.com/doctrine/reflection/tree/1.2.3" }, "abandoned": "roave/better-reflection", - "time": "2020-10-27T21:46:55+00:00" + "time": "2022-05-31T18:46:25+00:00" }, { "name": "drupal/address", @@ -2649,18 +2641,6 @@ "GPL-2.0-or-later" ], "authors": [ - { - "name": "Pravin Ajaaz", - "homepage": "https://www.drupal.org/user/2910049" - }, - { - "name": "RenatoG", - "homepage": "https://www.drupal.org/user/3326031" - }, - { - "name": "VladimirAus", - "homepage": "https://www.drupal.org/user/673120" - }, { "name": "bforchhammer", "homepage": "https://www.drupal.org/user/216396" @@ -2673,9 +2653,25 @@ "name": "diqidoq", "homepage": "https://www.drupal.org/user/1001934" }, + { + "name": "japerry", + "homepage": "https://www.drupal.org/user/45640" + }, + { + "name": "Pravin Ajaaz", + "homepage": "https://www.drupal.org/user/2910049" + }, { "name": "purushotam.rai", "homepage": "https://www.drupal.org/user/3193859" + }, + { + "name": "RenatoG", + "homepage": "https://www.drupal.org/user/3326031" + }, + { + "name": "VladimirAus", + "homepage": "https://www.drupal.org/user/673120" } ], "description": "Allows hiding of entity label fields and automatic label creation.", @@ -2910,6 +2906,98 @@ "source": "https://git.drupalcode.org/project/block_list_override" } }, + { + "name": "drupal/ckeditor", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/ckeditor.git", + "reference": "1.0.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/ckeditor-1.0.1.zip", + "reference": "1.0.1", + "shasum": "d3dd8bfb2301b749599ba48cf76208becdf0eeb3" + }, + "require": { + "drupal/core": "^9.4 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "1.0.1", + "datestamp": "1662977541", + "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": "dczepierga", + "homepage": "https://www.drupal.org/user/911466" + }, + { + "name": "hass", + "homepage": "https://www.drupal.org/user/85918" + }, + { + "name": "jcisio", + "homepage": "https://www.drupal.org/user/210762" + }, + { + "name": "Jorrit", + "homepage": "https://www.drupal.org/user/161217" + }, + { + "name": "lauriii", + "homepage": "https://www.drupal.org/user/1078742" + }, + { + "name": "Magnus", + "homepage": "https://www.drupal.org/user/73919" + }, + { + "name": "mkesicki", + "homepage": "https://www.drupal.org/user/922884" + }, + { + "name": "nod_", + "homepage": "https://www.drupal.org/user/598310" + }, + { + "name": "p.wiaderny", + "homepage": "https://www.drupal.org/user/2956619" + }, + { + "name": "vokiel", + "homepage": "https://www.drupal.org/user/2793801" + }, + { + "name": "Wim Leers", + "homepage": "https://www.drupal.org/user/99777" + }, + { + "name": "wwalc", + "homepage": "https://www.drupal.org/user/184556" + }, + { + "name": "xjm", + "homepage": "https://www.drupal.org/user/65776" + } + ], + "description": "WYSIWYG editing for rich text fields using CKEditor.", + "homepage": "https://www.drupal.org/project/ckeditor", + "support": { + "source": "https://git.drupalcode.org/project/ckeditor" + } + }, { "name": "drupal/ckeditor_abbreviation", "version": "2.0.1", @@ -3181,8 +3269,8 @@ "version": "8.x-2.2", "datestamp": "1618922683", "security-coverage": { - "status": "not-covered", - "message": "Project has not opted into security advisory coverage!" + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } } }, @@ -3527,7 +3615,7 @@ "source": { "type": "git", "url": "https://git.drupalcode.org/project/content_moderation_notifications.git", - "reference": "7ffa936" + "reference": "9ab3da5" }, "require": { "drupal/core": "^9 || ^10" @@ -3541,8 +3629,8 @@ "dev-3.x": "3.x-dev" }, "drupal": { - "version": "8.x-3.3+7-dev", - "datestamp": "1651518051", + "version": "8.x-3.4+3-dev", + "datestamp": "1667417084", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -3554,13 +3642,13 @@ "GPL-2.0+" ], "authors": [ - { - "name": "Rob Holmes", - "homepage": "https://www.drupal.org/user/1774034" - }, { "name": "jhedstrom", "homepage": "https://www.drupal.org/user/208732" + }, + { + "name": "Rob Holmes", + "homepage": "https://www.drupal.org/user/1774034" } ], "description": "Manage notifications for content moderation transitions.", @@ -3582,24 +3670,24 @@ }, { "name": "drupal/core", - "version": "9.3.21", + "version": "9.4.8", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "b32e65a1ebc76c24f6036924274d21c222e350ef" + "reference": "a627d1b2a00f2cef0572e37b94dea298800541f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/b32e65a1ebc76c24f6036924274d21c222e350ef", - "reference": "b32e65a1ebc76c24f6036924274d21c222e350ef", + "url": "https://api.github.com/repos/drupal/core/zipball/a627d1b2a00f2cef0572e37b94dea298800541f4", + "reference": "a627d1b2a00f2cef0572e37b94dea298800541f4", "shasum": "" }, "require": { - "asm89/stack-cors": "^1.1", - "composer/semver": "^3.0", - "doctrine/annotations": "^1.12", - "doctrine/reflection": "^1.1", - "egulias/email-validator": "^2.1.22|^3.0", + "asm89/stack-cors": "^1.3", + "composer/semver": "^3.3", + "doctrine/annotations": "^1.13", + "doctrine/reflection": "^1.2", + "egulias/email-validator": "^2.1.22|^3.2", "ext-date": "*", "ext-dom": "*", "ext-filter": "*", @@ -3613,60 +3701,38 @@ "ext-spl": "*", "ext-tokenizer": "*", "ext-xml": "*", - "guzzlehttp/guzzle": "^6.5.8", - "laminas/laminas-diactoros": "^2.1", - "laminas/laminas-feed": "^2.12", - "masterminds/html5": "^2.1", + "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5", + "laminas/laminas-diactoros": "^2.11", + "laminas/laminas-feed": "^2.17", + "masterminds/html5": "^2.7", "pear/archive_tar": "^1.4.14", "php": ">=7.3.0", - "psr/log": "^1.0", + "psr/log": "^1.1", "stack/builder": "^1.0", - "symfony-cmf/routing": "^2.1", + "symfony-cmf/routing": "^2.3", "symfony/console": "^4.4", "symfony/dependency-injection": "^4.4", "symfony/event-dispatcher": "^4.4", "symfony/http-foundation": "^4.4.7", "symfony/http-kernel": "^4.4", "symfony/mime": "^5.4", - "symfony/polyfill-iconv": "^1.0", - "symfony/polyfill-php80": "^1.16", + "symfony/polyfill-iconv": "^1.25", + "symfony/polyfill-php80": "^1.25", "symfony/process": "^4.4", - "symfony/psr-http-message-bridge": "^2.0", + "symfony/psr-http-message-bridge": "^2.1", "symfony/routing": "^4.4", "symfony/serializer": "^4.4", "symfony/translation": "^4.4", "symfony/validator": "^4.4", "symfony/yaml": "^4.4.19", - "twig/twig": "^2.12.0", + "twig/twig": "^2.15.3", "typo3/phar-stream-wrapper": "^3.1.3" }, "conflict": { - "drush/drush": "<8.1.10" + "drush/drush": "<8.1.10", + "symfony/http-foundation": "4.4.42" }, "replace": { - "drupal/action": "self.version", - "drupal/aggregator": "self.version", - "drupal/automated_cron": "self.version", - "drupal/ban": "self.version", - "drupal/bartik": "self.version", - "drupal/basic_auth": "self.version", - "drupal/big_pipe": "self.version", - "drupal/block": "self.version", - "drupal/block_content": "self.version", - "drupal/book": "self.version", - "drupal/breakpoint": "self.version", - "drupal/ckeditor": "self.version", - "drupal/ckeditor5": "self.version", - "drupal/claro": "self.version", - "drupal/classy": "self.version", - "drupal/color": "self.version", - "drupal/comment": "self.version", - "drupal/config": "self.version", - "drupal/config_translation": "self.version", - "drupal/contact": "self.version", - "drupal/content_moderation": "self.version", - "drupal/content_translation": "self.version", - "drupal/contextual": "self.version", "drupal/core-annotation": "self.version", "drupal/core-assertion": "self.version", "drupal/core-bridge": "self.version", @@ -3691,72 +3757,7 @@ "drupal/core-transliteration": "self.version", "drupal/core-utility": "self.version", "drupal/core-uuid": "self.version", - "drupal/core-version": "self.version", - "drupal/datetime": "self.version", - "drupal/datetime_range": "self.version", - "drupal/dblog": "self.version", - "drupal/dynamic_page_cache": "self.version", - "drupal/editor": "self.version", - "drupal/entity_reference": "self.version", - "drupal/field": "self.version", - "drupal/field_layout": "self.version", - "drupal/field_ui": "self.version", - "drupal/file": "self.version", - "drupal/filter": "self.version", - "drupal/forum": "self.version", - "drupal/hal": "self.version", - "drupal/help": "self.version", - "drupal/help_topics": "self.version", - "drupal/history": "self.version", - "drupal/image": "self.version", - "drupal/inline_form_errors": "self.version", - "drupal/jsonapi": "self.version", - "drupal/language": "self.version", - "drupal/layout_builder": "self.version", - "drupal/layout_discovery": "self.version", - "drupal/link": "self.version", - "drupal/locale": "self.version", - "drupal/media": "self.version", - "drupal/media_library": "self.version", - "drupal/menu_link_content": "self.version", - "drupal/menu_ui": "self.version", - "drupal/migrate": "self.version", - "drupal/migrate_drupal": "self.version", - "drupal/migrate_drupal_multilingual": "self.version", - "drupal/migrate_drupal_ui": "self.version", - "drupal/minimal": "self.version", - "drupal/node": "self.version", - "drupal/olivero": "self.version", - "drupal/options": "self.version", - "drupal/page_cache": "self.version", - "drupal/path": "self.version", - "drupal/path_alias": "self.version", - "drupal/quickedit": "self.version", - "drupal/rdf": "self.version", - "drupal/responsive_image": "self.version", - "drupal/rest": "self.version", - "drupal/search": "self.version", - "drupal/serialization": "self.version", - "drupal/settings_tray": "self.version", - "drupal/seven": "self.version", - "drupal/shortcut": "self.version", - "drupal/standard": "self.version", - "drupal/stark": "self.version", - "drupal/statistics": "self.version", - "drupal/syslog": "self.version", - "drupal/system": "self.version", - "drupal/taxonomy": "self.version", - "drupal/telephone": "self.version", - "drupal/text": "self.version", - "drupal/toolbar": "self.version", - "drupal/tour": "self.version", - "drupal/tracker": "self.version", - "drupal/update": "self.version", - "drupal/user": "self.version", - "drupal/views": "self.version", - "drupal/views_ui": "self.version", - "drupal/workflows": "self.version", - "drupal/workspaces": "self.version" + "drupal/core-version": "self.version" }, "type": "drupal-core", "extra": { @@ -3814,9 +3815,6 @@ "lib/Drupal/Core/Cache/DatabaseCacheTagsChecksum.php", "lib/Drupal/Core/Database/Connection.php", "lib/Drupal/Core/Database/Database.php", - "lib/Drupal/Core/Database/Driver/mysql/Connection.php", - "lib/Drupal/Core/Database/Driver/pgsql/Connection.php", - "lib/Drupal/Core/Database/Driver/sqlite/Connection.php", "lib/Drupal/Core/Database/Statement.php", "lib/Drupal/Core/Database/StatementInterface.php", "lib/Drupal/Core/DependencyInjection/Container.php", @@ -3833,22 +3831,22 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/9.3.21" + "source": "https://github.com/drupal/core/tree/9.4.8" }, - "time": "2022-08-03T16:34:49+00:00" + "time": "2022-10-06T15:57:08+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "9.3.21", + "version": "9.4.8", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", - "reference": "a9dd9def8891e1c388719474720b57d3fe929a2f" + "reference": "5f37a9e4008b34e3e4f6bb34ce0b3f7e5ec8984f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/a9dd9def8891e1c388719474720b57d3fe929a2f", - "reference": "a9dd9def8891e1c388719474720b57d3fe929a2f", + "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/5f37a9e4008b34e3e4f6bb34ce0b3f7e5ec8984f", + "reference": "5f37a9e4008b34e3e4f6bb34ce0b3f7e5ec8984f", "shasum": "" }, "require": { @@ -3883,81 +3881,81 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.21" + "source": "https://github.com/drupal/core-composer-scaffold/tree/9.4.8" }, - "time": "2022-02-24T17:40:56+00:00" + "time": "2022-06-19T16:14:23+00:00" }, { "name": "drupal/core-recommended", - "version": "9.3.21", + "version": "9.4.8", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "ed55850d6c38bf6dbd82561ff81a12a08974b098" + "reference": "684cc844f7b729286f5d62f1ee4b20ab12586502" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/ed55850d6c38bf6dbd82561ff81a12a08974b098", - "reference": "ed55850d6c38bf6dbd82561ff81a12a08974b098", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/684cc844f7b729286f5d62f1ee4b20ab12586502", + "reference": "684cc844f7b729286f5d62f1ee4b20ab12586502", "shasum": "" }, "require": { - "asm89/stack-cors": "1.3.0", - "composer/semver": "3.2.6", - "doctrine/annotations": "1.13.2", - "doctrine/lexer": "1.2.1", - "doctrine/reflection": "1.2.2", - "drupal/core": "9.3.21", - "egulias/email-validator": "3.1.2", - "guzzlehttp/guzzle": "6.5.8", - "guzzlehttp/promises": "1.5.1", - "guzzlehttp/psr7": "1.9.0", - "laminas/laminas-diactoros": "2.11.1", - "laminas/laminas-escaper": "2.9.0", - "laminas/laminas-feed": "2.15.0", - "laminas/laminas-stdlib": "3.6.1", - "masterminds/html5": "2.7.5", - "pear/archive_tar": "1.4.14", - "pear/console_getopt": "v1.4.3", - "pear/pear-core-minimal": "v1.10.11", - "pear/pear_exception": "v1.0.2", - "psr/cache": "1.0.1", - "psr/container": "1.1.1", - "psr/http-factory": "1.0.1", - "psr/http-message": "1.0.1", - "psr/log": "1.1.4", - "ralouphie/getallheaders": "3.0.3", - "stack/builder": "v1.0.6", - "symfony-cmf/routing": "2.3.4", - "symfony/console": "v4.4.34", - "symfony/debug": "v4.4.31", - "symfony/dependency-injection": "v4.4.34", - "symfony/deprecation-contracts": "v2.5.0", - "symfony/error-handler": "v4.4.34", - "symfony/event-dispatcher": "v4.4.34", - "symfony/event-dispatcher-contracts": "v1.1.11", - "symfony/http-client-contracts": "v2.5.0", - "symfony/http-foundation": "v4.4.34", - "symfony/http-kernel": "v4.4.35", - "symfony/mime": "v5.4.0", - "symfony/polyfill-ctype": "v1.23.0", - "symfony/polyfill-iconv": "v1.23.0", - "symfony/polyfill-intl-idn": "v1.23.0", - "symfony/polyfill-intl-normalizer": "v1.23.0", - "symfony/polyfill-mbstring": "v1.23.1", - "symfony/polyfill-php80": "v1.23.1", - "symfony/process": "v4.4.35", - "symfony/psr-http-message-bridge": "v2.1.2", - "symfony/routing": "v4.4.34", - "symfony/serializer": "v4.4.35", - "symfony/service-contracts": "v2.5.0", - "symfony/translation": "v4.4.34", - "symfony/translation-contracts": "v2.5.0", - "symfony/validator": "v4.4.35", - "symfony/var-dumper": "v5.4.0", - "symfony/yaml": "v4.4.34", - "twig/twig": "v2.14.11", - "typo3/phar-stream-wrapper": "v3.1.7" + "asm89/stack-cors": "~1.3.0", + "composer/semver": "~3.3.2", + "doctrine/annotations": "~1.13.2", + "doctrine/lexer": "~1.2.3", + "doctrine/reflection": "~1.2.3", + "drupal/core": "9.4.8", + "egulias/email-validator": "~3.2", + "guzzlehttp/guzzle": "~6.5.8", + "guzzlehttp/promises": "~1.5.1", + "guzzlehttp/psr7": "~1.9.0", + "laminas/laminas-diactoros": "~2.11.1", + "laminas/laminas-escaper": "~2.9.0", + "laminas/laminas-feed": "~2.17.0", + "laminas/laminas-stdlib": "~3.7.1", + "masterminds/html5": "~2.7.5", + "pear/archive_tar": "~1.4.14", + "pear/console_getopt": "~v1.4.3", + "pear/pear-core-minimal": "~v1.10.11", + "pear/pear_exception": "~v1.0.2", + "psr/cache": "~1.0.1", + "psr/container": "~1.1.1", + "psr/http-factory": "~1.0.1", + "psr/http-message": "~1.0.1", + "psr/log": "~1.1.4", + "ralouphie/getallheaders": "~3.0.3", + "stack/builder": "~v1.0.6", + "symfony-cmf/routing": "~2.3.4", + "symfony/console": "~v4.4.42", + "symfony/debug": "~v4.4.41", + "symfony/dependency-injection": "~v4.4.42", + "symfony/deprecation-contracts": "~v2.5.1", + "symfony/error-handler": "~v4.4.41", + "symfony/event-dispatcher": "~v4.4.42", + "symfony/event-dispatcher-contracts": "~v1.1.12", + "symfony/http-client-contracts": "~v2.5.1", + "symfony/http-foundation": "~v4.4.41", + "symfony/http-kernel": "~v4.4.42", + "symfony/mime": "~v5.4.9", + "symfony/polyfill-ctype": "~v1.25.0", + "symfony/polyfill-iconv": "~v1.25.0", + "symfony/polyfill-intl-idn": "~v1.25.0", + "symfony/polyfill-intl-normalizer": "~v1.25.0", + "symfony/polyfill-mbstring": "~v1.25.0", + "symfony/polyfill-php80": "~v1.25.0", + "symfony/process": "~v4.4.41", + "symfony/psr-http-message-bridge": "~v2.1.2", + "symfony/routing": "~v4.4.41", + "symfony/serializer": "~v4.4.42", + "symfony/service-contracts": "~v2.5.1", + "symfony/translation": "~v4.4.41", + "symfony/translation-contracts": "~v2.5.1", + "symfony/validator": "~v4.4.41", + "symfony/var-dumper": "~v5.4.9", + "symfony/yaml": "~v4.4.37", + "twig/twig": "~v2.15.3", + "typo3/phar-stream-wrapper": "~v3.1.7" }, "conflict": { "webflo/drupal-core-strict": "*" @@ -3967,11 +3965,11 @@ "license": [ "GPL-2.0-or-later" ], - "description": "Locked core dependencies; require this project INSTEAD OF drupal/core.", + "description": "Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.", "support": { - "source": "https://github.com/drupal/core-recommended/tree/9.3.21" + "source": "https://github.com/drupal/core-recommended/tree/9.4.8" }, - "time": "2022-08-03T16:34:49+00:00" + "time": "2022-10-06T15:57:08+00:00" }, { "name": "drupal/crop", @@ -4510,8 +4508,8 @@ "role": "Maintainer" }, { - "name": "dww", - "homepage": "https://www.drupal.org/user/46549" + "name": "Jaypan", + "homepage": "https://www.drupal.org/user/324696" } ], "description": "Creates a duration Field API field, that collects a period of time, whether that be hours, minutes, seconds, days, months, years, or any combination of those.", @@ -4571,6 +4569,72 @@ "source": "https://git.drupalcode.org/project/editor_advanced_link" } }, + { + "name": "drupal/editoria11y", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/editoria11y.git", + "reference": "2.0.3" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/editoria11y-2.0.3.zip", + "reference": "2.0.3", + "shasum": "80eb351fa9a9edeb4aad0993844ec732b223bf13" + }, + "require": { + "drupal/core": "^9 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.0.3", + "datestamp": "1668094235", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + }, + "drush": { + "services": { + "drush.services.yml": "^9 || ^10" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "John Jameson", + "homepage": "https://www.drupal.org/u/itmaybejj", + "role": "Maintainer" + }, + { + "name": "Brian Osborne", + "homepage": "https://www.drupal.org/u/bkosborne", + "role": "Maintainer" + }, + { + "name": "Jason Partyka", + "homepage": "https://www.drupal.org/u/partyka", + "role": "Maintainer" + }, + { + "name": "See other contributors", + "homepage": "https://www.drupal.org/node/3187132/committers", + "role": "contributor" + } + ], + "description": "Editoria11y (\"editorial accessibility\") is a user-friendly accessibility checker.", + "homepage": "http://drupal.org/project/editoria11y", + "support": { + "source": "https://git.drupalcode.org/project/editoria11y", + "issues": "http://drupal.org/project/issues/editoria11y" + } + }, { "name": "drupal/elasticsearch_connector", "version": "7.0.0-alpha3", @@ -5185,27 +5249,26 @@ }, { "name": "drupal/environment_indicator", - "version": "4.0.4", + "version": "4.0.10", "source": { "type": "git", "url": "https://git.drupalcode.org/project/environment_indicator.git", - "reference": "4.0.4" + "reference": "4.0.10" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/environment_indicator-4.0.4.zip", - "reference": "4.0.4", - "shasum": "37cb19ca432c29a2351947fb59fc1271ff98dce3" + "url": "https://ftp.drupal.org/files/projects/environment_indicator-4.0.10.zip", + "reference": "4.0.10", + "shasum": "461c8099e6f9e3ac140534b1608f5e85b83c2025" }, "require": { - "drupal/color": "*", - "drupal/core": "^8.8 || ^9" + "drupal/core": "^9.2 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "4.0.4", - "datestamp": "1644420669", + "version": "4.0.10", + "datestamp": "1664535402", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5286,39 +5349,42 @@ }, { "name": "drupal/facets", - "version": "1.8.0", + "version": "2.0.6", "source": { "type": "git", "url": "https://git.drupalcode.org/project/facets.git", - "reference": "8.x-1.8" + "reference": "2.0.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/facets-8.x-1.8.zip", - "reference": "8.x-1.8", - "shasum": "f621b84b59c5315db14a0529df5dfc74ca5bc9de" + "url": "https://ftp.drupal.org/files/projects/facets-2.0.6.zip", + "reference": "2.0.6", + "shasum": "e984e6ce69026c20d2049d4ec53748e67c5e70de" }, "require": { - "drupal/core": "^8.8 || ^9" + "drupal/core": "^9.3 || ^10.0" }, "conflict": { "drupal/search_api": "<1.14" }, "require-dev": { - "drupal/search_api": "~1.14" + "drupal/jquery_ui_slider": "~2.0", + "drupal/jquery_ui_touch_punch": "~1.1", + "drupal/search_api": "^1.28||1.x-dev" + }, + "suggest": { + "drupal/jquery_ui_slider": "Required for the 'Facets Range Widget' module to work", + "drupal/jquery_ui_touch_punch": "Required for the 'Facets Range Widget' module to work" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.8", - "datestamp": "1620838256", + "version": "2.0.6", + "datestamp": "1671207897", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" } - }, - "branch-alias": { - "dev-8.x-1.x": "1.x-dev" } }, "notification-url": "https://packages.drupal.org/8/downloads", @@ -5357,57 +5423,35 @@ }, { "name": "drupal/facets_pretty_paths", - "version": "dev-1.x", + "version": "1.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/facets_pretty_paths.git", - "reference": "5b7c276dd7f9c1fa9b7bfc07b28cb547176aab70" + "reference": "8.x-1.4" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/facets_pretty_paths-8.x-1.4.zip", + "reference": "8.x-1.4", + "shasum": "a0ae64ef6c22adb75a4ef0e9b2e23ac58caf6dd3" }, "require": { - "drupal/core": "^8 || ^9", + "drupal/core": "^9.1 || ^10", "drupal/facets": "^1 || ^2", "drupal/pathauto": "^1" }, "require-dev": { - "composer/installers": "^1.2", - "cweagans/composer-patches": "^1.4", - "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0", - "drupal-composer/drupal-scaffold": "^2.2", - "drupal/admin_toolbar": "^2", - "drupal/coder": "^8.3", - "drupal/search_api": "^1.5", - "drush/drush": ">=9.7", - "openeuropa/drupal-core-require-dev": "^8.6 || ^9", - "openeuropa/task-runner": "~1.0-beta2" + "drupal/search_api": "^1.5" }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, "drupal": { - "version": "8.x-1.2+0-dev", - "datestamp": "1639410123", + "version": "8.x-1.4", + "datestamp": "1671178925", "security-coverage": { - "status": "not-covered", - "message": "Dev releases are not covered by Drupal security advisories." + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } - }, - "composer-exit-on-patch-failure": true, - "enable-patching": true, - "installer-paths": { - "build/core": [ - "type:drupal-core" - ], - "build/modules/contrib/{$name}": [ - "type:drupal-module" - ], - "build/profiles/contrib/{$name}": [ - "type:drupal-profile" - ], - "build/themes/contrib/{$name}": [ - "type:drupal-theme" - ] } }, "autoload": { @@ -5421,17 +5465,6 @@ } }, "notification-url": "https://packages.drupal.org/8/downloads", - "scripts": { - "drupal-scaffold": [ - "DrupalComposer\\DrupalScaffold\\Plugin::scaffold" - ], - "post-install-cmd": [ - "./vendor/bin/run drupal:site-setup" - ], - "post-update-cmd": [ - "./vendor/bin/run drupal:site-setup" - ] - }, "license": [ "GPL-2.0-or-later" ], @@ -5441,12 +5474,12 @@ "homepage": "https://www.drupal.org/node/2625160/committers" }, { - "name": "Upchuk", - "homepage": "https://www.drupal.org/user/1885838" + "name": "StryKaizer", + "homepage": "https://www.drupal.org/user/462700" }, { - "name": "phenaproxima", - "homepage": "https://www.drupal.org/user/205645" + "name": "Upchuk", + "homepage": "https://www.drupal.org/user/1885838" } ], "description": "Pretty paths for Facets.", @@ -5734,30 +5767,30 @@ } }, { - "name": "drupal/flood_control", - "version": "2.1.1", + "name": "drupal/flag", + "version": "4.0.0-beta3", "source": { "type": "git", - "url": "https://git.drupalcode.org/project/flood_control.git", - "reference": "2.1.1" + "url": "https://git.drupalcode.org/project/flag.git", + "reference": "8.x-4.0-beta3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/flood_control-2.1.1.zip", - "reference": "2.1.1", - "shasum": "b8384e1673b92b0bdd8630624528c32fb7ef5f54" + "url": "https://ftp.drupal.org/files/projects/flag-8.x-4.0-beta3.zip", + "reference": "8.x-4.0-beta3", + "shasum": "856a4871034955406e111aee2227e716cc8064d6" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^8.8 || ^9" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.1", - "datestamp": "1609933716", + "version": "8.x-4.0-beta3", + "datestamp": "1638201553", "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" + "status": "not-covered", + "message": "Beta releases are not covered by Drupal security advisories." } } }, @@ -5767,11 +5800,87 @@ ], "authors": [ { - "name": "batigolix", - "homepage": "https://www.drupal.org/user/22175" + "name": "Berdir", + "homepage": "https://www.drupal.org/user/214652" }, { - "name": "Dave Reid", + "name": "fago", + "homepage": "https://www.drupal.org/user/16747" + }, + { + "name": "fubhy", + "homepage": "https://www.drupal.org/user/761344" + }, + { + "name": "joachim", + "homepage": "https://www.drupal.org/user/107701" + }, + { + "name": "merlinofchaos", + "homepage": "https://www.drupal.org/user/26979" + }, + { + "name": "mooffie", + "homepage": "https://www.drupal.org/user/78454" + }, + { + "name": "quicksketch", + "homepage": "https://www.drupal.org/user/35821" + }, + { + "name": "shabana.navas", + "homepage": "https://www.drupal.org/user/1311398" + }, + { + "name": "socketwench", + "homepage": "https://www.drupal.org/user/65793" + } + ], + "description": "Create customized flags that users can set on entities.", + "homepage": "https://www.drupal.org/project/flag", + "support": { + "source": "https://git.drupalcode.org/project/flag" + } + }, + { + "name": "drupal/flood_control", + "version": "2.1.1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/flood_control.git", + "reference": "2.1.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/flood_control-2.1.1.zip", + "reference": "2.1.1", + "shasum": "b8384e1673b92b0bdd8630624528c32fb7ef5f54" + }, + "require": { + "drupal/core": "^8 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.1.1", + "datestamp": "1609933716", + "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": "batigolix", + "homepage": "https://www.drupal.org/user/22175" + }, + { + "name": "Dave Reid", "homepage": "https://www.drupal.org/user/53892" }, { @@ -5826,6 +5935,10 @@ "name": "Alexander Ross (bleen)", "homepage": "https://www.drupal.org/u/bleen", "role": "Maintainer" + }, + { + "name": "Rajeshreeputra", + "homepage": "https://www.drupal.org/user/3418561" } ], "description": "Focal Point allows content creators to mark the most important part of an image for easier cropping.", @@ -5836,6 +5949,245 @@ "irc": "irc://irc.freenode.org/drupal-contribute" } }, + { + "name": "drupal/gin", + "version": "3.0.0-beta5", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/gin.git", + "reference": "8.x-3.0-beta5" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-beta5.zip", + "reference": "8.x-3.0-beta5", + "shasum": "651b2047990067e26158368e3aab7f27366a81e9" + }, + "require": { + "drupal/core": "^8.9 || ^9 || ^10", + "drupal/gin_toolbar": "^1.0@beta" + }, + "type": "drupal-theme", + "extra": { + "drupal": { + "version": "8.x-3.0-beta5", + "datestamp": "1656071885", + "security-coverage": { + "status": "not-covered", + "message": "Beta releases are not covered by Drupal security advisories." + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "scripts": { + "phpcs": [ + "phpcs -s --runtime-set ignore_warnings_on_exit 1 --runtime-set ignore_errors_on_exit 0 'web/modules/custom'" + ] + }, + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Sascha Eggenberger (saschaeggi)", + "homepage": "https://www.drupal.org/u/saschaeggi", + "role": "Maintainer" + } + ], + "description": "For a better Admin and Content Editor Experience.", + "homepage": "https://www.drupal.org/project/gin", + "support": { + "source": "https://git.drupalcode.org/project/gin", + "issues": "https://www.drupal.org/project/issues/gin" + }, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/saschaeggi" + }, + { + "type": "other", + "url": "https://paypal.me/saschaeggi" + } + ] + }, + { + "name": "drupal/gin_lb", + "version": "1.0.0-beta16", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/gin_lb.git", + "reference": "1.0.0-beta16" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/gin_lb-1.0.0-beta16.zip", + "reference": "1.0.0-beta16", + "shasum": "9893ca3258daff1d426e0e4f8b1bcbd1edbc2dae" + }, + "require": { + "drupal/core": "^9.3", + "drupal/gin_toolbar": "*" + }, + "require-dev": { + "composer/installers": "^1.2", + "cweagans/composer-patches": "~1.4", + "drupal/config_devel": "~1", + "drupal/console": "~1.0", + "drupal/core-composer-scaffold": "^8.0", + "drupal/core-dev": "^8.0", + "drupal/core-recommended": "~9.3.0", + "drupal/field_group": "3.x-dev@dev", + "drupal/gin": "^3.0@alpha", + "drupal/layout_builder_browser": "~1.2", + "drupal/layout_library": "~1.0@beta", + "drush/drush": "~10", + "openeuropa/task-runner": "~1.0-beta3", + "phpro/grumphp": "~1.3.0", + "phpspec/prophecy-phpunit": "^2.0" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "1.0.0-beta16", + "datestamp": "1654538336", + "security-coverage": { + "status": "not-covered", + "message": "Beta releases are not covered by Drupal security advisories." + } + }, + "enable-patching": false, + "composer-exit-on-patch-failure": true, + "drupal-scaffold": { + "locations": { + "web-root": "build/" + } + }, + "installer-paths": { + "build/core": [ + "type:drupal-core" + ], + "build/modules/contrib/{$name}": [ + "type:drupal-module" + ], + "build/profiles/contrib/{$name}": [ + "type:drupal-profile" + ], + "build/themes/contrib/{$name}": [ + "type:drupal-theme" + ], + "build/libraries/{$name}": [ + "type:drupal-library" + ] + } + }, + "autoload": { + "psr-4": { + "Drupal\\gin_lb_settings\\": "./src" + } + }, + "autoload-dev": { + "psr-4": { + "Drupal\\Tests\\gin_lb_settings\\": "./tests/src" + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "scripts": { + "post-install-cmd": [ + "./vendor/bin/run drupal:site-setup" + ], + "post-update-cmd": [ + "./vendor/bin/run drupal:site-setup" + ] + }, + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Christian Wiedemann", + "homepage": "https://www.drupal.org/user/861002", + "email": "christian.wiedemann@key-tec.de" + }, + { + "name": "Duwid", + "homepage": "https://www.drupal.org/user/2693877" + }, + { + "name": "sch4lly", + "homepage": "https://www.drupal.org/user/856550" + } + ], + "description": "Gin Layout Builder", + "homepage": "https://www.drupal.org/project/gin_lb", + "keywords": [ + "drupal", + "ui", + "web" + ], + "support": { + "source": "https://git.drupalcode.org/project/gin_lb" + } + }, + { + "name": "drupal/gin_toolbar", + "version": "1.0.0-beta22", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/gin_toolbar.git", + "reference": "8.x-1.0-beta22" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-beta22.zip", + "reference": "8.x-1.0-beta22", + "shasum": "630b4acb208411b78c61d83c9a27741c546202de" + }, + "require": { + "drupal/core": "^8 || ^9 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.0-beta22", + "datestamp": "1649709351", + "security-coverage": { + "status": "not-covered", + "message": "Beta releases are not covered by Drupal security advisories." + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Sascha Eggenberger (saschaeggi)", + "homepage": "https://www.drupal.org/u/saschaeggi", + "role": "Maintainer" + } + ], + "description": "Gin Toolbar for Frontend use", + "homepage": "https://www.drupal.org/project/gin_toolbar", + "keywords": [ + "Drupal" + ], + "support": { + "source": "http://cgit.drupalcode.org/gin_toolbar", + "issues": "https://www.drupal.org/project/issues/gin_toolbar" + }, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/saschaeggi" + }, + { + "type": "other", + "url": "https://paypal.me/saschaeggi" + } + ] + }, { "name": "drupal/group", "version": "1.3.0", @@ -6041,6 +6393,54 @@ "issues": "https://drupal.org/project/issues/groupmedia" } }, + { + "name": "drupal/hal", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/hal.git", + "reference": "1.0.3" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/hal-1.0.3.zip", + "reference": "1.0.3", + "shasum": "8e81b3b453ff63a281c1c470ff722f4af6206426" + }, + "require": { + "drupal/core": "^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "1.0.3", + "datestamp": "1664412481", + "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": "bbrala", + "homepage": "https://www.drupal.org/user/3366066" + }, + { + "name": "larowlan", + "homepage": "https://www.drupal.org/user/395439" + } + ], + "description": "Hypermedia Application Language (HAL)", + "homepage": "https://www.drupal.org/project/hal", + "support": { + "source": "https://git.drupalcode.org/project/hal" + } + }, { "name": "drupal/hierarchical_term_formatter", "version": "1.2.0", @@ -6923,6 +7323,10 @@ "name": "hipp2bsquare", "homepage": "https://www.drupal.org/user/2473076" }, + { + "name": "joevagyok", + "homepage": "https://www.drupal.org/user/2876343" + }, { "name": "mariuss", "homepage": "https://www.drupal.org/user/28539" @@ -7510,8 +7914,8 @@ "dev-3.x": "3.x-dev" }, "drupal": { - "version": "8.x-3.1+14-dev", - "datestamp": "1586787172", + "version": "8.x-3.2+10-dev", + "datestamp": "1671484745", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -7520,7 +7924,7 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { @@ -7530,6 +7934,10 @@ { "name": "greenSkin", "homepage": "https://www.drupal.org/user/173855" + }, + { + "name": "smustgrave", + "homepage": "https://www.drupal.org/user/3252890" } ], "description": "Filter the modules list.", @@ -7767,7 +8175,7 @@ "datestamp": "1601818840", "security-coverage": { "status": "not-covered", - "message": "Project has not opted into security advisory coverage!" + "message": "Alpha releases are not covered by Drupal security advisories." } } }, @@ -7778,25 +8186,29 @@ "authors": [ { "name": "Nikolay Ignatov", - "homepage": "https://www.drupal.org/user/2301376", + "homepage": "https://www.drupal.org/user/1443204", "email": "nikolai.ignatov@gmail.com", "role": "Creator and Maintainer" }, { "name": "Dobrin Dobrev", - "homepage": "https://www.drupal.org/user/1443204", + "homepage": "https://www.drupal.org/user/2803987", "email": "ddobrev81@gmail.com", "role": "Maintainer" }, { "name": "Milka Petkova", - "homepage": "https://www.drupal.org/user/2803987", + "homepage": "https://www.drupal.org/user/2301376", "email": "milka.petkova.88@gmail.com", "role": "Maintainer" }, { "name": "skek", "homepage": "https://www.drupal.org/user/417078" + }, + { + "name": "smustgrave", + "homepage": "https://www.drupal.org/user/3252890" } ], "description": "Allows for paragraph entities to be embedded as items into the CKE editor.", @@ -8269,6 +8681,70 @@ "issues": "https://www.drupal.org/project/issues/role_expose" } }, + { + "name": "drupal/role_theme_switcher", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/role_theme_switcher.git", + "reference": "8.x-1.2" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/role_theme_switcher-8.x-1.2.zip", + "reference": "8.x-1.2", + "shasum": "360864a3c42b4daef3c261a22a539d7e26630d3d" + }, + "require": { + "drupal/core": "^8 || ^9 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.2", + "datestamp": "1655383703", + "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": "Julien Dubreuil", + "homepage": "https://www.drupal.org/u/juliend", + "email": "dubreuil.julien@gmail.com", + "role": "Maintainer" + }, + { + "name": "Neslee Canil Pinto", + "homepage": "https://www.drupal.org/u/neslee-canil-pinto", + "role": "Maintainer" + }, + { + "name": "Pravin Ajaaz", + "homepage": "https://www.drupal.org/user/2910049" + }, + { + "name": "tiutiun", + "homepage": "https://www.drupal.org/user/158669" + } + ], + "description": "Assign a specific theme for different roles.", + "homepage": "https://www.drupal.org/project/role_theme_switcher", + "keywords": [ + "Drupal", + "Theme" + ], + "support": { + "source": "https://git.drupalcode.org/project/role_theme_switcher", + "issues": "https://www.drupal.org/project/issues/role_theme_switcher" + } + }, { "name": "drupal/s3fs", "version": "3.0.0-beta4", @@ -8409,60 +8885,124 @@ } }, { - "name": "drupal/scheduled_publish", - "version": "3.9.0", + "name": "drupal/scheduled_publish", + "version": "3.9.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/scheduled_publish.git", + "reference": "8.x-3.9" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/scheduled_publish-8.x-3.9.zip", + "reference": "8.x-3.9", + "shasum": "819ccee4f0e3d764826c423024229f79be8c69a5" + }, + "require": { + "drupal/core": "^8.8 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-3.9", + "datestamp": "1600847066", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + }, + "drush": { + "services": { + "drush.services.yml": "^9" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Peter Majmesku", + "homepage": "https://www.drupal.org/user/786132" + }, + { + "name": "SaschaHannes", + "homepage": "https://www.drupal.org/user/3536189" + }, + { + "name": "marcoliver", + "homepage": "https://www.drupal.org/user/1529744" + } + ], + "description": "A simple module for scheduled content moderation", + "homepage": "https://www.drupal.org/project/scheduled_publish", + "support": { + "source": "https://git.drupalcode.org/project/scheduled_publish" + } + }, + { + "name": "drupal/schema_metatag", + "version": "2.3.0", "source": { "type": "git", - "url": "https://git.drupalcode.org/project/scheduled_publish.git", - "reference": "8.x-3.9" + "url": "https://git.drupalcode.org/project/schema_metatag.git", + "reference": "8.x-2.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/scheduled_publish-8.x-3.9.zip", - "reference": "8.x-3.9", - "shasum": "819ccee4f0e3d764826c423024229f79be8c69a5" + "url": "https://ftp.drupal.org/files/projects/schema_metatag-8.x-2.3.zip", + "reference": "8.x-2.3", + "shasum": "ed5f0ec3f3c9befec3f0fc591d3d179e496a9e76" }, "require": { - "drupal/core": "^8.8 || ^9" + "drupal/core": "^8.0 || ^9.0", + "drupal/metatag": "^1.0" + }, + "require-dev": { + "drupal/coder": "^8.3", + "drupal/metatag_views": "*", + "drupal/schema_article": "*", + "drupal/schema_organization": "*", + "phpcompatibility/php-compatibility": "^9.3" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.9", - "datestamp": "1600847066", + "version": "8.x-2.3", + "datestamp": "1646399478", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" } - }, - "drush": { - "services": { - "drush.services.yml": "^9" - } } }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0-or-later" + "GPL-2.0+" ], "authors": [ { - "name": "Peter Majmesku", - "homepage": "https://www.drupal.org/user/786132" + "name": "DamienMcKenna", + "homepage": "https://www.drupal.org/user/108450" }, { - "name": "SaschaHannes", - "homepage": "https://www.drupal.org/user/3536189" + "name": "KarenS", + "homepage": "https://www.drupal.org/user/45874" }, { - "name": "marcoliver", - "homepage": "https://www.drupal.org/user/1529744" + "name": "wells", + "homepage": "https://www.drupal.org/user/2452278" } ], - "description": "A simple module for scheduled content moderation", - "homepage": "https://www.drupal.org/project/scheduled_publish", + "description": "Metatag implementation of Schema.org structured data (JSON-LD)", + "homepage": "https://www.drupal.org/project/schema_metatag", + "keywords": [ + "Drupal" + ], "support": { - "source": "https://git.drupalcode.org/project/scheduled_publish" + "source": "https://git.drupalcode.org/project/schema_metatag", + "issues": "https://www.drupal.org/project/issues/schema_metatag" } }, { @@ -8860,10 +9400,6 @@ "GPL-2.0+" ], "authors": [ - { - "name": "Siteimprove", - "homepage": "https://www.drupal.org/user/3521441" - }, { "name": "bartvig", "homepage": "https://www.drupal.org/user/3107079" @@ -8884,6 +9420,10 @@ "name": "rofejo", "homepage": "https://www.drupal.org/user/3284851" }, + { + "name": "Siteimprove", + "homepage": "https://www.drupal.org/user/3521441" + }, { "name": "tlyngej", "homepage": "https://www.drupal.org/user/413139" @@ -9029,7 +9569,7 @@ "reference": "84dce21833db85ce526e773dcda9471be887ccd7" }, "require": { - "drupal/core": "^8.8 || ^9 || ^10", + "drupal/core": ">=8.9 <11", "phpmailer/phpmailer": "^6.1.7" }, "suggest": { @@ -9042,8 +9582,8 @@ "dev-8.x-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.1+5-dev", - "datestamp": "1663619766", + "version": "8.x-1.2+1-dev", + "datestamp": "1673388156", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -9059,6 +9599,10 @@ "name": "japerry", "homepage": "https://www.drupal.org/user/45640" }, + { + "name": "joseph.olstad", + "homepage": "https://www.drupal.org/user/1321830" + }, { "name": "josesanmartin", "homepage": "https://www.drupal.org/user/72012" @@ -9440,6 +9984,14 @@ "GPL-2.0-or-later" ], "authors": [ + { + "name": "bizar1984", + "homepage": "https://www.drupal.org/user/3719064" + }, + { + "name": "Gerben Spil", + "homepage": "https://www.drupal.org/user/728030" + }, { "name": "Sutharsan", "homepage": "https://www.drupal.org/user/73854" @@ -9949,17 +10501,9 @@ "name": "Graber", "homepage": "https://www.drupal.org/user/1599440" }, - { - "name": "infojunkie", - "homepage": "https://www.drupal.org/user/48424" - }, { "name": "joelpittet", "homepage": "https://www.drupal.org/user/160302" - }, - { - "name": "Jon Pugh", - "homepage": "https://www.drupal.org/user/17028" } ], "description": "Adds an ability to perform bulk operations on selected entities from view results. Provides an API to create such operations.", @@ -10231,12 +10775,12 @@ "drupal/telephone_validation": "~2.0", "drupal/token": "~1.0", "drupal/variationcache": "~1.0", + "drupal/webform-webform_group": "*", "drupal/webform_access": "*", "drupal/webform_attachment": "*", "drupal/webform_clientside_validation": "*", "drupal/webform_devel": "*", "drupal/webform_entity_print": "*", - "drupal/webform_group": "*", "drupal/webform_node": "*", "drupal/webform_options_limit": "*", "drupal/webform_scheduled_email": "*", @@ -10612,16 +11156,16 @@ }, { "name": "egulias/email-validator", - "version": "3.1.2", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "ee0db30118f661fb166bcffbf5d82032df484697" + "reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ee0db30118f661fb166bcffbf5d82032df484697", - "reference": "ee0db30118f661fb166bcffbf5d82032df484697", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/f88dcf4b14af14a98ad96b14b2b317969eab6715", + "reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715", "shasum": "" }, "require": { @@ -10668,7 +11212,7 @@ ], "support": { "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/3.1.2" + "source": "https://github.com/egulias/EmailValidator/tree/3.2.1" }, "funding": [ { @@ -10676,7 +11220,7 @@ "type": "github" } ], - "time": "2021-10-11T09:18:27+00:00" + "time": "2022-06-18T20:57:19+00:00" }, { "name": "elasticsearch/elasticsearch", @@ -11366,16 +11910,16 @@ }, { "name": "guzzlehttp/promises", - "version": "1.5.1", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" + "reference": "b94b2807d85443f9719887892882d0329d1e2598" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", + "reference": "b94b2807d85443f9719887892882d0329d1e2598", "shasum": "" }, "require": { @@ -11430,7 +11974,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.1" + "source": "https://github.com/guzzle/promises/tree/1.5.2" }, "funding": [ { @@ -11446,7 +11990,7 @@ "type": "tidelift" } ], - "time": "2021-10-22T20:56:57+00:00" + "time": "2022-08-28T14:55:35+00:00" }, { "name": "guzzlehttp/psr7", @@ -11839,16 +12383,16 @@ }, { "name": "laminas/laminas-diactoros", - "version": "2.11.1", + "version": "2.11.3", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "25b11d422c2e5dad868f68619888763b30f91e2d" + "reference": "1f97b0c52eafd108e09c76d6b29d83ef4a855f76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/25b11d422c2e5dad868f68619888763b30f91e2d", - "reference": "25b11d422c2e5dad868f68619888763b30f91e2d", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/1f97b0c52eafd108e09c76d6b29d83ef4a855f76", + "reference": "1f97b0c52eafd108e09c76d6b29d83ef4a855f76", "shasum": "" }, "require": { @@ -11934,7 +12478,7 @@ "type": "community_bridge" } ], - "time": "2022-06-28T21:07:29+00:00" + "time": "2022-07-06T09:24:53+00:00" }, { "name": "laminas/laminas-escaper", @@ -12000,16 +12544,16 @@ }, { "name": "laminas/laminas-feed", - "version": "2.15.0", + "version": "2.17.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-feed.git", - "reference": "3ef837a12833c74b438d2c3780023c4244e0abae" + "reference": "1ccb024ea615606ed1d676ba0fa3f22a398f3ac0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/3ef837a12833c74b438d2c3780023c4244e0abae", - "reference": "3ef837a12833c74b438d2c3780023c4244e0abae", + "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/1ccb024ea615606ed1d676ba0fa3f22a398f3ac0", + "reference": "1ccb024ea615606ed1d676ba0fa3f22a398f3ac0", "shasum": "" }, "require": { @@ -12073,20 +12617,20 @@ "type": "community_bridge" } ], - "time": "2021-09-20T18:11:11+00:00" + "time": "2022-03-24T10:26:04+00:00" }, { "name": "laminas/laminas-stdlib", - "version": "3.6.1", + "version": "3.7.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-stdlib.git", - "reference": "db581851a092246ad99e12d4fddf105184924c71" + "reference": "bcd869e2fe88d567800057c1434f2380354fe325" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/db581851a092246ad99e12d4fddf105184924c71", - "reference": "db581851a092246ad99e12d4fddf105184924c71", + "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/bcd869e2fe88d567800057c1434f2380354fe325", + "reference": "bcd869e2fe88d567800057c1434f2380354fe325", "shasum": "" }, "require": { @@ -12097,8 +12641,8 @@ }, "require-dev": { "laminas/laminas-coding-standard": "~2.3.0", - "phpbench/phpbench": "^0.17.1", - "phpunit/phpunit": "~9.3.7", + "phpbench/phpbench": "^1.0", + "phpunit/phpunit": "^9.3.7", "psalm/plugin-phpunit": "^0.16.0", "vimeo/psalm": "^4.7" }, @@ -12132,7 +12676,7 @@ "type": "community_bridge" } ], - "time": "2021-11-10T11:33:52+00:00" + "time": "2022-01-21T15:50:46+00:00" }, { "name": "league/container", @@ -12403,16 +12947,16 @@ }, { "name": "masterminds/html5", - "version": "2.7.5", + "version": "2.7.6", "source": { "type": "git", "url": "https://github.com/Masterminds/html5-php.git", - "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab" + "reference": "897eb517a343a2281f11bc5556d6548db7d93947" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f640ac1bdddff06ea333a920c95bbad8872429ab", - "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947", + "reference": "897eb517a343a2281f11bc5556d6548db7d93947", "shasum": "" }, "require": { @@ -12466,9 +13010,9 @@ ], "support": { "issues": "https://github.com/Masterminds/html5-php/issues", - "source": "https://github.com/Masterminds/html5-php/tree/2.7.5" + "source": "https://github.com/Masterminds/html5-php/tree/2.7.6" }, - "time": "2021-07-01T14:25:37+00:00" + "time": "2022-08-18T16:18:26+00:00" }, { "name": "mkalkbrenner/php-htmldiff-advanced", @@ -13237,20 +13781,20 @@ }, { "name": "psr/container", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", "shasum": "" }, "require": { - "php": ">=7.2.0" + "php": ">=7.4.0" }, "type": "library", "autoload": { @@ -13279,9 +13823,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.1" + "source": "https://github.com/php-fig/container/tree/1.1.2" }, - "time": "2021-03-05T17:36:06+00:00" + "time": "2021-11-05T16:50:12+00:00" }, { "name": "psr/http-factory", @@ -13680,7 +14224,7 @@ }, { "name": "ruflin/elastica", - "version": "dev-master", + "version": "7.x-dev", "source": { "type": "git", "url": "https://github.com/ruflin/Elastica.git", @@ -13714,7 +14258,6 @@ "guzzlehttp/guzzle": "Allow using guzzle as transport", "monolog/monolog": "Logging request" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -13744,9 +14287,9 @@ ], "support": { "issues": "https://github.com/ruflin/Elastica/issues", - "source": "https://github.com/ruflin/Elastica/tree/master" + "source": "https://github.com/ruflin/Elastica/tree/7.x" }, - "time": "2022-03-29T15:37:28+00:00" + "time": "2022-12-05T09:45:12+00:00" }, { "name": "signature_pad/signature_pad", @@ -13949,16 +14492,16 @@ }, { "name": "symfony/console", - "version": "v4.4.34", + "version": "v4.4.47", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "329b3a75cc6b16d435ba1b1a41df54a53382a3f0" + "reference": "4f40012db8d55c956406890b5720f686fee7f7b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/329b3a75cc6b16d435ba1b1a41df54a53382a3f0", - "reference": "329b3a75cc6b16d435ba1b1a41df54a53382a3f0", + "url": "https://api.github.com/repos/symfony/console/zipball/4f40012db8d55c956406890b5720f686fee7f7b7", + "reference": "4f40012db8d55c956406890b5720f686fee7f7b7", "shasum": "" }, "require": { @@ -14019,7 +14562,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.34" + "source": "https://github.com/symfony/console/tree/v4.4.47" }, "funding": [ { @@ -14035,20 +14578,20 @@ "type": "tidelift" } ], - "time": "2021-11-04T12:23:33+00:00" + "time": "2022-10-04T05:58:30+00:00" }, { "name": "symfony/debug", - "version": "v4.4.31", + "version": "v4.4.44", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "43ede438d4cb52cd589ae5dc070e9323866ba8e0" + "reference": "1a692492190773c5310bc7877cb590c04c2f05be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/43ede438d4cb52cd589ae5dc070e9323866ba8e0", - "reference": "43ede438d4cb52cd589ae5dc070e9323866ba8e0", + "url": "https://api.github.com/repos/symfony/debug/zipball/1a692492190773c5310bc7877cb590c04c2f05be", + "reference": "1a692492190773c5310bc7877cb590c04c2f05be", "shasum": "" }, "require": { @@ -14087,7 +14630,7 @@ "description": "Provides tools to ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/debug/tree/v4.4.31" + "source": "https://github.com/symfony/debug/tree/v4.4.44" }, "funding": [ { @@ -14104,20 +14647,20 @@ } ], "abandoned": "symfony/error-handler", - "time": "2021-09-24T13:30:14+00:00" + "time": "2022-07-28T16:29:46+00:00" }, { "name": "symfony/dependency-injection", - "version": "v4.4.34", + "version": "v4.4.44", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "117d7f132ed7efbd535ec947709d49bec1b9d24b" + "reference": "25502a57182ba1e15da0afd64c975cae4d0a1471" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/117d7f132ed7efbd535ec947709d49bec1b9d24b", - "reference": "117d7f132ed7efbd535ec947709d49bec1b9d24b", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/25502a57182ba1e15da0afd64c975cae4d0a1471", + "reference": "25502a57182ba1e15da0afd64c975cae4d0a1471", "shasum": "" }, "require": { @@ -14130,7 +14673,7 @@ "symfony/config": "<4.3|>=5.0", "symfony/finder": "<3.4", "symfony/proxy-manager-bridge": "<3.4", - "symfony/yaml": "<3.4" + "symfony/yaml": "<4.4.26" }, "provide": { "psr/container-implementation": "1.0", @@ -14139,7 +14682,7 @@ "require-dev": { "symfony/config": "^4.3", "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/yaml": "^4.4|^5.0" + "symfony/yaml": "^4.4.26|^5.0" }, "suggest": { "symfony/config": "", @@ -14174,7 +14717,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v4.4.34" + "source": "https://github.com/symfony/dependency-injection/tree/v4.4.44" }, "funding": [ { @@ -14190,20 +14733,20 @@ "type": "tidelift" } ], - "time": "2021-11-15T14:42:25+00:00" + "time": "2022-07-20T09:59:04+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.0", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8" + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8", - "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", "shasum": "" }, "require": { @@ -14241,7 +14784,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" }, "funding": [ { @@ -14257,20 +14800,20 @@ "type": "tidelift" } ], - "time": "2021-07-12T14:48:14+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/error-handler", - "version": "v4.4.34", + "version": "v4.4.44", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "17785c374645def1e884d8ec49976c156c61db4d" + "reference": "be731658121ef2d8be88f3a1ec938148a9237291" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/17785c374645def1e884d8ec49976c156c61db4d", - "reference": "17785c374645def1e884d8ec49976c156c61db4d", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/be731658121ef2d8be88f3a1ec938148a9237291", + "reference": "be731658121ef2d8be88f3a1ec938148a9237291", "shasum": "" }, "require": { @@ -14309,7 +14852,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v4.4.34" + "source": "https://github.com/symfony/error-handler/tree/v4.4.44" }, "funding": [ { @@ -14325,20 +14868,20 @@ "type": "tidelift" } ], - "time": "2021-11-12T14:57:39+00:00" + "time": "2022-07-28T16:29:46+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.4.34", + "version": "v4.4.44", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "1a024b45369c9d55d76b6b8a241bd20c9ea1cbd8" + "reference": "1e866e9e5c1b22168e0ce5f0b467f19bba61266a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1a024b45369c9d55d76b6b8a241bd20c9ea1cbd8", - "reference": "1a024b45369c9d55d76b6b8a241bd20c9ea1cbd8", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1e866e9e5c1b22168e0ce5f0b467f19bba61266a", + "reference": "1e866e9e5c1b22168e0ce5f0b467f19bba61266a", "shasum": "" }, "require": { @@ -14393,7 +14936,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.34" + "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.44" }, "funding": [ { @@ -14409,20 +14952,20 @@ "type": "tidelift" } ], - "time": "2021-11-15T14:42:25+00:00" + "time": "2022-07-20T09:59:04+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v1.1.11", + "version": "v1.1.13", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "01e9a4efac0ee33a05dfdf93b346f62e7d0e998c" + "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/01e9a4efac0ee33a05dfdf93b346f62e7d0e998c", - "reference": "01e9a4efac0ee33a05dfdf93b346f62e7d0e998c", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/1d5cd762abaa6b2a4169d3e77610193a7157129e", + "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e", "shasum": "" }, "require": { @@ -14472,7 +15015,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.11" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.13" }, "funding": [ { @@ -14488,7 +15031,7 @@ "type": "tidelift" } ], - "time": "2021-03-23T15:25:38+00:00" + "time": "2022-01-02T09:41:36+00:00" }, { "name": "symfony/filesystem", @@ -14617,16 +15160,16 @@ }, { "name": "symfony/http-client-contracts", - "version": "v2.5.0", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "ec82e57b5b714dbb69300d348bd840b345e24166" + "reference": "ba6a9f0e8f3edd190520ee3b9a958596b6ca2e70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ec82e57b5b714dbb69300d348bd840b345e24166", - "reference": "ec82e57b5b714dbb69300d348bd840b345e24166", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ba6a9f0e8f3edd190520ee3b9a958596b6ca2e70", + "reference": "ba6a9f0e8f3edd190520ee3b9a958596b6ca2e70", "shasum": "" }, "require": { @@ -14675,7 +15218,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/http-client-contracts/tree/v2.5.2" }, "funding": [ { @@ -14691,20 +15234,20 @@ "type": "tidelift" } ], - "time": "2021-11-03T09:24:47+00:00" + "time": "2022-04-12T15:48:08+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.4.34", + "version": "v4.4.47", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "f4cbbb6fc428588ce8373802461e7fe84e6809ab" + "reference": "7eea76ae186c68466e7676e62812ce2769f96811" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f4cbbb6fc428588ce8373802461e7fe84e6809ab", - "reference": "f4cbbb6fc428588ce8373802461e7fe84e6809ab", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7eea76ae186c68466e7676e62812ce2769f96811", + "reference": "7eea76ae186c68466e7676e62812ce2769f96811", "shasum": "" }, "require": { @@ -14743,7 +15286,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v4.4.34" + "source": "https://github.com/symfony/http-foundation/tree/v4.4.47" }, "funding": [ { @@ -14759,20 +15302,20 @@ "type": "tidelift" } ], - "time": "2021-11-04T12:23:33+00:00" + "time": "2022-10-01T21:39:02+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.35", + "version": "v4.4.47", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "fb793f1381c34b79a43596a532a6a49bd729c9db" + "reference": "91cf5dbc9ea4d902470e596246a736179acfb79d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/fb793f1381c34b79a43596a532a6a49bd729c9db", - "reference": "fb793f1381c34b79a43596a532a6a49bd729c9db", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/91cf5dbc9ea4d902470e596246a736179acfb79d", + "reference": "91cf5dbc9ea4d902470e596246a736179acfb79d", "shasum": "" }, "require": { @@ -14847,7 +15390,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v4.4.35" + "source": "https://github.com/symfony/http-kernel/tree/v4.4.47" }, "funding": [ { @@ -14863,20 +15406,20 @@ "type": "tidelift" } ], - "time": "2021-11-24T08:40:10+00:00" + "time": "2022-10-12T07:05:45+00:00" }, { "name": "symfony/mime", - "version": "v5.4.0", + "version": "v5.4.13", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "d4365000217b67c01acff407573906ff91bcfb34" + "reference": "bb2ccf759e2b967dcd11bdee5bdf30dddd2290bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/d4365000217b67c01acff407573906ff91bcfb34", - "reference": "d4365000217b67c01acff407573906ff91bcfb34", + "url": "https://api.github.com/repos/symfony/mime/zipball/bb2ccf759e2b967dcd11bdee5bdf30dddd2290bd", + "reference": "bb2ccf759e2b967dcd11bdee5bdf30dddd2290bd", "shasum": "" }, "require": { @@ -14930,7 +15473,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.0" + "source": "https://github.com/symfony/mime/tree/v5.4.13" }, "funding": [ { @@ -14946,25 +15489,28 @@ "type": "tidelift" } ], - "time": "2021-11-23T10:19:22+00:00" + "time": "2022-09-01T18:18:29+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.23.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" + "reference": "30885182c981ab175d4d034db0f6f469898070ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", + "reference": "30885182c981ab175d4d034db0f6f469898070ab", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-ctype": "*" + }, "suggest": { "ext-ctype": "For best performance" }, @@ -15009,7 +15555,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0" }, "funding": [ { @@ -15025,25 +15571,28 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-10-20T20:35:02+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.23.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933" + "reference": "f1aed619e28cb077fc83fac8c4c0383578356e40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933", - "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/f1aed619e28cb077fc83fac8c4c0383578356e40", + "reference": "f1aed619e28cb077fc83fac8c4c0383578356e40", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-iconv": "*" + }, "suggest": { "ext-iconv": "For best performance" }, @@ -15089,7 +15638,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.25.0" }, "funding": [ { @@ -15105,20 +15654,20 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:27:20+00:00" + "time": "2022-01-04T09:04:05+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.23.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65" + "reference": "749045c69efb97c70d25d7463abba812e91f3a44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65", - "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44", + "reference": "749045c69efb97c70d25d7463abba812e91f3a44", "shasum": "" }, "require": { @@ -15176,7 +15725,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.25.0" }, "funding": [ { @@ -15192,11 +15741,11 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:27:20+00:00" + "time": "2021-09-14T14:02:44+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.23.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -15260,7 +15809,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0" }, "funding": [ { @@ -15280,21 +15829,24 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.23.1", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6" + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-mbstring": "*" + }, "suggest": { "ext-mbstring": "For best performance" }, @@ -15340,7 +15892,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0" }, "funding": [ { @@ -15356,7 +15908,7 @@ "type": "tidelift" } ], - "time": "2021-05-27T12:26:48+00:00" + "time": "2021-11-30T18:21:41+00:00" }, { "name": "symfony/polyfill-php72", @@ -15515,16 +16067,16 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.23.1", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be" + "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c", + "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c", "shasum": "" }, "require": { @@ -15578,7 +16130,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0" }, "funding": [ { @@ -15594,20 +16146,20 @@ "type": "tidelift" } ], - "time": "2021-07-28T13:41:28+00:00" + "time": "2022-03-04T08:16:47+00:00" }, { "name": "symfony/process", - "version": "v4.4.35", + "version": "v4.4.44", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "c2098705326addae6e6742151dfade47ac71da1b" + "reference": "5cee9cdc4f7805e2699d9fd66991a0e6df8252a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/c2098705326addae6e6742151dfade47ac71da1b", - "reference": "c2098705326addae6e6742151dfade47ac71da1b", + "url": "https://api.github.com/repos/symfony/process/zipball/5cee9cdc4f7805e2699d9fd66991a0e6df8252a2", + "reference": "5cee9cdc4f7805e2699d9fd66991a0e6df8252a2", "shasum": "" }, "require": { @@ -15640,7 +16192,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v4.4.35" + "source": "https://github.com/symfony/process/tree/v4.4.44" }, "funding": [ { @@ -15656,20 +16208,20 @@ "type": "tidelift" } ], - "time": "2021-11-22T22:36:24+00:00" + "time": "2022-06-27T13:16:42+00:00" }, { "name": "symfony/psr-http-message-bridge", - "version": "v2.1.2", + "version": "v2.1.3", "source": { "type": "git", "url": "https://github.com/symfony/psr-http-message-bridge.git", - "reference": "22b37c8a3f6b5d94e9cdbd88e1270d96e2f97b34" + "reference": "d444f85dddf65c7e57c58d8e5b3a4dbb593b1840" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/22b37c8a3f6b5d94e9cdbd88e1270d96e2f97b34", - "reference": "22b37c8a3f6b5d94e9cdbd88e1270d96e2f97b34", + "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/d444f85dddf65c7e57c58d8e5b3a4dbb593b1840", + "reference": "d444f85dddf65c7e57c58d8e5b3a4dbb593b1840", "shasum": "" }, "require": { @@ -15728,7 +16280,7 @@ ], "support": { "issues": "https://github.com/symfony/psr-http-message-bridge/issues", - "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.1.2" + "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.1.3" }, "funding": [ { @@ -15744,20 +16296,20 @@ "type": "tidelift" } ], - "time": "2021-11-05T13:13:39+00:00" + "time": "2022-09-05T10:34:54+00:00" }, { "name": "symfony/routing", - "version": "v4.4.34", + "version": "v4.4.44", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "fc9dda0c8496f8ef0a89805c2eabfc43b8cef366" + "reference": "f7751fd8b60a07f3f349947a309b5bdfce22d6ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/fc9dda0c8496f8ef0a89805c2eabfc43b8cef366", - "reference": "fc9dda0c8496f8ef0a89805c2eabfc43b8cef366", + "url": "https://api.github.com/repos/symfony/routing/zipball/f7751fd8b60a07f3f349947a309b5bdfce22d6ae", + "reference": "f7751fd8b60a07f3f349947a309b5bdfce22d6ae", "shasum": "" }, "require": { @@ -15817,7 +16369,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v4.4.34" + "source": "https://github.com/symfony/routing/tree/v4.4.44" }, "funding": [ { @@ -15833,20 +16385,20 @@ "type": "tidelift" } ], - "time": "2021-11-04T12:23:33+00:00" + "time": "2022-07-20T09:59:04+00:00" }, { "name": "symfony/serializer", - "version": "v4.4.35", + "version": "v4.4.47", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "1b2ae02cb1b923987947e013688c51954a80b751" + "reference": "6e01d63c55657930a6de03d6e36aae50af98888d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/1b2ae02cb1b923987947e013688c51954a80b751", - "reference": "1b2ae02cb1b923987947e013688c51954a80b751", + "url": "https://api.github.com/repos/symfony/serializer/zipball/6e01d63c55657930a6de03d6e36aae50af98888d", + "reference": "6e01d63c55657930a6de03d6e36aae50af98888d", "shasum": "" }, "require": { @@ -15871,7 +16423,7 @@ "symfony/error-handler": "^4.4|^5.0", "symfony/http-foundation": "^3.4|^4.0|^5.0", "symfony/mime": "^4.4|^5.0", - "symfony/property-access": "^3.4.41|^4.4.9|^5.0.9", + "symfony/property-access": "^4.4.36|^5.3.13", "symfony/property-info": "^3.4.13|~4.0|^5.0", "symfony/validator": "^3.4|^4.0|^5.0", "symfony/yaml": "^3.4|^4.0|^5.0" @@ -15911,7 +16463,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v4.4.35" + "source": "https://github.com/symfony/serializer/tree/v4.4.47" }, "funding": [ { @@ -15927,26 +16479,26 @@ "type": "tidelift" } ], - "time": "2021-11-24T08:12:42+00:00" + "time": "2022-09-19T08:38:33+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.5.0", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc" + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", - "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", "shasum": "" }, "require": { "php": ">=7.2.5", "psr/container": "^1.1", - "symfony/deprecation-contracts": "^2.1" + "symfony/deprecation-contracts": "^2.1|^3" }, "conflict": { "ext-psr": "<1.1|>=2" @@ -15994,7 +16546,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" }, "funding": [ { @@ -16010,20 +16562,20 @@ "type": "tidelift" } ], - "time": "2021-11-04T16:48:04+00:00" + "time": "2022-05-30T19:17:29+00:00" }, { "name": "symfony/translation", - "version": "v4.4.34", + "version": "v4.4.47", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "26d330720627b234803595ecfc0191eeabc65190" + "reference": "45036b1d53accc48fe9bab71ccd86d57eba0dd94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/26d330720627b234803595ecfc0191eeabc65190", - "reference": "26d330720627b234803595ecfc0191eeabc65190", + "url": "https://api.github.com/repos/symfony/translation/zipball/45036b1d53accc48fe9bab71ccd86d57eba0dd94", + "reference": "45036b1d53accc48fe9bab71ccd86d57eba0dd94", "shasum": "" }, "require": { @@ -16083,7 +16635,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v4.4.34" + "source": "https://github.com/symfony/translation/tree/v4.4.47" }, "funding": [ { @@ -16099,20 +16651,20 @@ "type": "tidelift" } ], - "time": "2021-11-04T12:23:33+00:00" + "time": "2022-10-03T15:15:11+00:00" }, { "name": "symfony/translation-contracts", - "version": "v2.5.0", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "d28150f0f44ce854e942b671fc2620a98aae1b1e" + "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/d28150f0f44ce854e942b671fc2620a98aae1b1e", - "reference": "d28150f0f44ce854e942b671fc2620a98aae1b1e", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe", + "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe", "shasum": "" }, "require": { @@ -16161,7 +16713,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/translation-contracts/tree/v2.5.2" }, "funding": [ { @@ -16177,20 +16729,20 @@ "type": "tidelift" } ], - "time": "2021-08-17T14:20:01+00:00" + "time": "2022-06-27T16:58:25+00:00" }, { "name": "symfony/validator", - "version": "v4.4.35", + "version": "v4.4.47", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "629f420d8350634fd8ed686d4472c1f10044b265" + "reference": "37456082bb034cb5f2d8602471a0de6c448535b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/629f420d8350634fd8ed686d4472c1f10044b265", - "reference": "629f420d8350634fd8ed686d4472c1f10044b265", + "url": "https://api.github.com/repos/symfony/validator/zipball/37456082bb034cb5f2d8602471a0de6c448535b8", + "reference": "37456082bb034cb5f2d8602471a0de6c448535b8", "shasum": "" }, "require": { @@ -16201,7 +16753,7 @@ "symfony/translation-contracts": "^1.1|^2" }, "conflict": { - "doctrine/lexer": "<1.0.2", + "doctrine/lexer": "<1.1", "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", "symfony/dependency-injection": "<3.4", "symfony/http-kernel": "<4.4", @@ -16267,7 +16819,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v4.4.35" + "source": "https://github.com/symfony/validator/tree/v4.4.47" }, "funding": [ { @@ -16283,20 +16835,20 @@ "type": "tidelift" } ], - "time": "2021-11-22T21:43:32+00:00" + "time": "2022-10-01T17:13:09+00:00" }, { "name": "symfony/var-dumper", - "version": "v5.4.0", + "version": "v5.4.14", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "89ab66eaef230c9cd1992de2e9a1b26652b127b9" + "reference": "6894d06145fefebd9a4c7272baa026a1c394a430" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/89ab66eaef230c9cd1992de2e9a1b26652b127b9", - "reference": "89ab66eaef230c9cd1992de2e9a1b26652b127b9", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6894d06145fefebd9a4c7272baa026a1c394a430", + "reference": "6894d06145fefebd9a4c7272baa026a1c394a430", "shasum": "" }, "require": { @@ -16356,7 +16908,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.0" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.14" }, "funding": [ { @@ -16372,20 +16924,20 @@ "type": "tidelift" } ], - "time": "2021-11-29T15:30:56+00:00" + "time": "2022-10-07T08:01:20+00:00" }, { "name": "symfony/yaml", - "version": "v4.4.34", + "version": "v4.4.45", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "2c309e258adeb9970229042be39b360d34986fad" + "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/2c309e258adeb9970229042be39b360d34986fad", - "reference": "2c309e258adeb9970229042be39b360d34986fad", + "url": "https://api.github.com/repos/symfony/yaml/zipball/aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d", + "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d", "shasum": "" }, "require": { @@ -16427,7 +16979,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v4.4.34" + "source": "https://github.com/symfony/yaml/tree/v4.4.45" }, "funding": [ { @@ -16443,7 +16995,7 @@ "type": "tidelift" } ], - "time": "2021-11-18T18:49:23+00:00" + "time": "2022-08-02T15:47:23+00:00" }, { "name": "tabby/tabby", @@ -16483,16 +17035,16 @@ }, { "name": "twig/twig", - "version": "v2.14.11", + "version": "v2.15.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "66baa66f29ee30e487e05f1679903e36eb01d727" + "reference": "ab402673db8746cb3a4c46f3869d6253699f614a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/66baa66f29ee30e487e05f1679903e36eb01d727", - "reference": "66baa66f29ee30e487e05f1679903e36eb01d727", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/ab402673db8746cb3a4c46f3869d6253699f614a", + "reference": "ab402673db8746cb3a4c46f3869d6253699f614a", "shasum": "" }, "require": { @@ -16508,7 +17060,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.14-dev" + "dev-master": "2.15-dev" } }, "autoload": { @@ -16547,7 +17099,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.14.11" + "source": "https://github.com/twigphp/Twig/tree/v2.15.3" }, "funding": [ { @@ -16559,7 +17111,7 @@ "type": "tidelift" } ], - "time": "2022-02-04T06:57:25+00:00" + "time": "2022-09-28T08:40:08+00:00" }, { "name": "typo3/phar-stream-wrapper", @@ -17157,16 +17709,16 @@ }, { "name": "composer/composer", - "version": "2.2.17", + "version": "2.2.18", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "a8ab5070fb99396e4710baee286478ad697724c2" + "reference": "84175907664ca8b73f73f4883e67e886dfefb9f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/a8ab5070fb99396e4710baee286478ad697724c2", - "reference": "a8ab5070fb99396e4710baee286478ad697724c2", + "url": "https://api.github.com/repos/composer/composer/zipball/84175907664ca8b73f73f4883e67e886dfefb9f5", + "reference": "84175907664ca8b73f73f4883e67e886dfefb9f5", "shasum": "" }, "require": { @@ -17236,7 +17788,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.2.17" + "source": "https://github.com/composer/composer/tree/2.2.18" }, "funding": [ { @@ -17252,7 +17804,7 @@ "type": "tidelift" } ], - "time": "2022-07-13T13:27:38+00:00" + "time": "2022-08-20T09:33:38+00:00" }, { "name": "composer/metadata-minifier", @@ -17687,23 +18239,23 @@ }, { "name": "drupal/coder", - "version": "8.3.15", + "version": "8.3.16", "source": { "type": "git", "url": "https://git.drupalcode.org/project/coder.git", - "reference": "0cfad3a21f1168bdc3030ae73351c31f88abba74" + "reference": "d6f6112e5e84ff4f6baaada223c93dadbd6d3887" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1", "ext-mbstring": "*", "php": ">=7.1", - "sirbrillig/phpcs-variable-analysis": "^2.10", - "slevomat/coding-standard": "^7.0", - "squizlabs/php_codesniffer": "^3.6.0", - "symfony/yaml": ">=2.0.5" + "sirbrillig/phpcs-variable-analysis": "^2.11.7", + "slevomat/coding-standard": "^7.0 || ^8.0", + "squizlabs/php_codesniffer": "^3.7.1", + "symfony/yaml": ">=3.4.0" }, "require-dev": { - "phpstan/phpstan": "^1.4.9", + "phpstan/phpstan": "^1.7.12", "phpunit/phpunit": "^7.0 || ^8.0" }, "type": "phpcodesniffer-standard", @@ -17728,26 +18280,26 @@ "issues": "https://www.drupal.org/project/issues/coder", "source": "https://www.drupal.org/project/coder" }, - "time": "2022-04-02T17:56:30+00:00" + "time": "2022-08-20T17:31:46+00:00" }, { "name": "drupal/core-dev", - "version": "9.3.21", + "version": "9.4.8", "source": { "type": "git", "url": "https://github.com/drupal/core-dev.git", - "reference": "d093ec9dd1106069fd01535235dd5797662a61cb" + "reference": "72ddd684df05fc22e97d42ddba5fb6c5ee9f9b29" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-dev/zipball/d093ec9dd1106069fd01535235dd5797662a61cb", - "reference": "d093ec9dd1106069fd01535235dd5797662a61cb", + "url": "https://api.github.com/repos/drupal/core-dev/zipball/72ddd684df05fc22e97d42ddba5fb6c5ee9f9b29", + "reference": "72ddd684df05fc22e97d42ddba5fb6c5ee9f9b29", "shasum": "" }, "require": { "behat/mink": "^1.8", "behat/mink-selenium2-driver": "^1.4", - "composer/composer": "^2.0.2", + "composer/composer": "^2.2.12", "drupal/coder": "^8.3.10", "easyrdf/easyrdf": "^0.9 || ^1.0", "friends-of-behat/mink-browserkit-driver": "^1.4", @@ -17776,9 +18328,9 @@ ], "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.", "support": { - "source": "https://github.com/drupal/core-dev/tree/9.3.21" + "source": "https://github.com/drupal/core-dev/tree/9.4.8" }, - "time": "2021-11-30T05:41:29+00:00" + "time": "2022-04-14T00:37:13+00:00" }, { "name": "easyrdf/easyrdf", @@ -17919,16 +18471,16 @@ }, { "name": "instaclick/php-webdriver", - "version": "1.4.14", + "version": "1.4.15", "source": { "type": "git", "url": "https://github.com/instaclick/php-webdriver.git", - "reference": "200b8df772b74d604bebf25ef42ad6f8ee6380a9" + "reference": "ed8f7741a0952db42686aae0780a0935138a7cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/200b8df772b74d604bebf25ef42ad6f8ee6380a9", - "reference": "200b8df772b74d604bebf25ef42ad6f8ee6380a9", + "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/ed8f7741a0952db42686aae0780a0935138a7cf8", + "reference": "ed8f7741a0952db42686aae0780a0935138a7cf8", "shasum": "" }, "require": { @@ -17976,9 +18528,9 @@ ], "support": { "issues": "https://github.com/instaclick/php-webdriver/issues", - "source": "https://github.com/instaclick/php-webdriver/tree/1.4.14" + "source": "https://github.com/instaclick/php-webdriver/tree/1.4.15" }, - "time": "2022-04-19T02:06:59+00:00" + "time": "2022-08-09T14:26:29+00:00" }, { "name": "justinrainbow/json-schema", @@ -18050,6 +18602,110 @@ }, "time": "2022-04-13T08:02:27+00:00" }, + { + "name": "mglaman/phpstan-drupal", + "version": "1.1.26", + "source": { + "type": "git", + "url": "https://github.com/mglaman/phpstan-drupal.git", + "reference": "5e8b527e4d9b9f23f37eac727b31aeff278bbe43" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/5e8b527e4d9b9f23f37eac727b31aeff278bbe43", + "reference": "5e8b527e4d9b9f23f37eac727b31aeff278bbe43", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0", + "phpstan/phpstan": "^1.9.0", + "symfony/finder": "~3.4.5 ||^4.2 || ^5.0 || ^6.0", + "symfony/yaml": "~3.4.5 || ^4.2|| ^5.0 || ^6.0", + "webflo/drupal-finder": "^1.2" + }, + "require-dev": { + "behat/mink": "^1.8", + "composer/installers": "^1.9", + "drupal/core-recommended": "^8.8@alpha || ^9.0", + "drush/drush": "^9.6 || ^10.0", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan-deprecation-rules": "^1.0", + "phpstan/phpstan-strict-rules": "^1.0", + "phpunit/phpunit": "^6.5 || ^7.5 || ^8.0 || ^9", + "slevomat/coding-standard": "^7.1", + "squizlabs/php_codesniffer": "^3.3", + "symfony/phpunit-bridge": "^3.4.3 || ^4.4 || ^5.4 || ^6.0" + }, + "suggest": { + "jangregor/phpstan-prophecy": "Provides a prophecy/prophecy extension for phpstan/phpstan.", + "phpstan/phpstan-deprecation-rules": "For catching deprecations, especially in Drupal core.", + "phpstan/phpstan-phpunit": "PHPUnit extensions and rules for PHPStan." + }, + "type": "phpstan-extension", + "extra": { + "branch-alias": { + "dev-main": "1.0-dev" + }, + "installer-paths": { + "tests/fixtures/drupal/core": [ + "type:drupal-core" + ], + "tests/fixtures/drupal/libraries/{$name}": [ + "type:drupal-library" + ], + "tests/fixtures/drupal/modules/contrib/{$name}": [ + "type:drupal-module" + ], + "tests/fixtures/drupal/profiles/contrib/{$name}": [ + "type:drupal-profile" + ], + "tests/fixtures/drupal/themes/contrib/{$name}": [ + "type:drupal-theme" + ] + }, + "phpstan": { + "includes": [ + "extension.neon", + "rules.neon" + ] + } + }, + "autoload": { + "psr-4": { + "mglaman\\PHPStanDrupal\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matt Glaman", + "email": "nmd.matt@gmail.com" + } + ], + "description": "Drupal extension and rules for PHPStan", + "support": { + "issues": "https://github.com/mglaman/phpstan-drupal/issues", + "source": "https://github.com/mglaman/phpstan-drupal/tree/1.1.26" + }, + "funding": [ + { + "url": "https://github.com/mglaman", + "type": "github" + }, + { + "url": "https://opencollective.com/phpstan-drupal", + "type": "open_collective" + }, + { + "url": "https://tidelift.com/funding/github/packagist/mglaman/phpstan-drupal", + "type": "tidelift" + } + ], + "time": "2022-12-22T14:42:15+00:00" + }, { "name": "mikey179/vfsstream", "version": "v1.6.11", @@ -18503,18 +19159,62 @@ }, "time": "2021-12-08T12:19:24+00:00" }, + { + "name": "phpstan/extension-installer", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/phpstan/extension-installer.git", + "reference": "f06dbb052ddc394e7896fcd1cfcd533f9f6ace40" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/f06dbb052ddc394e7896fcd1cfcd533f9f6ace40", + "reference": "f06dbb052ddc394e7896fcd1cfcd533f9f6ace40", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^2.0", + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "^1.8.0" + }, + "require-dev": { + "composer/composer": "^2.0", + "php-parallel-lint/php-parallel-lint": "^1.2.0", + "phpstan/phpstan-strict-rules": "^0.11 || ^0.12 || ^1.0" + }, + "type": "composer-plugin", + "extra": { + "class": "PHPStan\\ExtensionInstaller\\Plugin" + }, + "autoload": { + "psr-4": { + "PHPStan\\ExtensionInstaller\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Composer plugin for automatic installation of PHPStan extensions", + "support": { + "issues": "https://github.com/phpstan/extension-installer/issues", + "source": "https://github.com/phpstan/extension-installer/tree/1.2.0" + }, + "time": "2022-10-17T12:59:16+00:00" + }, { "name": "phpstan/phpdoc-parser", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "367a8d9d5f7da2a0136422d27ce8840583926955" + "reference": "8dd908dd6156e974b9a0f8bb4cd5ad0707830f04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/367a8d9d5f7da2a0136422d27ce8840583926955", - "reference": "367a8d9d5f7da2a0136422d27ce8840583926955", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/8dd908dd6156e974b9a0f8bb4cd5ad0707830f04", + "reference": "8dd908dd6156e974b9a0f8bb4cd5ad0707830f04", "shasum": "" }, "require": { @@ -18544,9 +19244,116 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.7.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.8.0" + }, + "time": "2022-09-04T18:59:06+00:00" + }, + { + "name": "phpstan/phpstan", + "version": "1.9.4", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan.git", + "reference": "d03bccee595e2146b7c9d174486b84f4dc61b0f2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d03bccee595e2146b7c9d174486b84f4dc61b0f2", + "reference": "d03bccee595e2146b7c9d174486b84f4dc61b0f2", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0" + }, + "conflict": { + "phpstan/phpstan-shim": "*" + }, + "bin": [ + "phpstan", + "phpstan.phar" + ], + "type": "library", + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan - PHP Static Analysis Tool", + "keywords": [ + "dev", + "static analysis" + ], + "support": { + "issues": "https://github.com/phpstan/phpstan/issues", + "source": "https://github.com/phpstan/phpstan/tree/1.9.4" + }, + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://github.com/phpstan", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", + "type": "tidelift" + } + ], + "time": "2022-12-17T13:33:52+00:00" + }, + { + "name": "phpstan/phpstan-deprecation-rules", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan-deprecation-rules.git", + "reference": "2c6792eda026d9c474c14aa018aed312686714db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/2c6792eda026d9c474c14aa018aed312686714db", + "reference": "2c6792eda026d9c474c14aa018aed312686714db", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "^1.9.3" + }, + "require-dev": { + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpstan/phpstan-php-parser": "^1.1", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^9.5" + }, + "type": "phpstan-extension", + "extra": { + "phpstan": { + "includes": [ + "rules.neon" + ] + } + }, + "autoload": { + "psr-4": { + "PHPStan\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan rules for detecting usage of deprecated classes, methods, properties, constants and traits.", + "support": { + "issues": "https://github.com/phpstan/phpstan-deprecation-rules/issues", + "source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/1.1.1" }, - "time": "2022-08-09T12:23:23+00:00" + "time": "2022-12-13T14:26:20+00:00" }, { "name": "phpunit/php-code-coverage", @@ -19998,16 +20805,16 @@ }, { "name": "seld/phar-utils", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/Seldaek/phar-utils.git", - "reference": "9f3452c93ff423469c0d56450431562ca423dcee" + "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/9f3452c93ff423469c0d56450431562ca423dcee", - "reference": "9f3452c93ff423469c0d56450431562ca423dcee", + "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/ea2f4014f163c1be4c601b9b7bd6af81ba8d701c", + "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c", "shasum": "" }, "require": { @@ -20040,22 +20847,22 @@ ], "support": { "issues": "https://github.com/Seldaek/phar-utils/issues", - "source": "https://github.com/Seldaek/phar-utils/tree/1.2.0" + "source": "https://github.com/Seldaek/phar-utils/tree/1.2.1" }, - "time": "2021-12-10T11:20:11+00:00" + "time": "2022-08-31T10:31:18+00:00" }, { "name": "sirbrillig/phpcs-variable-analysis", - "version": "v2.11.6", + "version": "v2.11.9", "source": { "type": "git", "url": "https://github.com/sirbrillig/phpcs-variable-analysis.git", - "reference": "e0c3d7b7572e351914e1c82abc902e129fe4e587" + "reference": "62730888d225d55a613854b6a76fb1f9f57d1618" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/e0c3d7b7572e351914e1c82abc902e129fe4e587", - "reference": "e0c3d7b7572e351914e1c82abc902e129fe4e587", + "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/62730888d225d55a613854b6a76fb1f9f57d1618", + "reference": "62730888d225d55a613854b6a76fb1f9f57d1618", "shasum": "" }, "require": { @@ -20091,46 +20898,50 @@ } ], "description": "A PHPCS sniff to detect problems with variables.", + "keywords": [ + "phpcs", + "static analysis" + ], "support": { "issues": "https://github.com/sirbrillig/phpcs-variable-analysis/issues", "source": "https://github.com/sirbrillig/phpcs-variable-analysis", "wiki": "https://github.com/sirbrillig/phpcs-variable-analysis/wiki" }, - "time": "2022-08-15T15:38:22+00:00" + "time": "2022-10-05T23:31:46+00:00" }, { "name": "slevomat/coding-standard", - "version": "7.2.1", + "version": "8.5.2", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "aff06ae7a84e4534bf6f821dc982a93a5d477c90" + "reference": "f32937dc41b587f3500efed1dbca2f82aa519373" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/aff06ae7a84e4534bf6f821dc982a93a5d477c90", - "reference": "aff06ae7a84e4534bf6f821dc982a93a5d477c90", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/f32937dc41b587f3500efed1dbca2f82aa519373", + "reference": "f32937dc41b587f3500efed1dbca2f82aa519373", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7", "php": "^7.2 || ^8.0", - "phpstan/phpdoc-parser": "^1.5.1", - "squizlabs/php_codesniffer": "^3.6.2" + "phpstan/phpdoc-parser": ">=1.7.0 <1.9.0", + "squizlabs/php_codesniffer": "^3.7.1" }, "require-dev": { - "phing/phing": "2.17.3", + "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.4.10|1.7.1", + "phpstan/phpstan": "1.4.10|1.8.6", "phpstan/phpstan-deprecation-rules": "1.0.0", "phpstan/phpstan-phpunit": "1.0.0|1.1.1", - "phpstan/phpstan-strict-rules": "1.2.3", - "phpunit/phpunit": "7.5.20|8.5.21|9.5.20" + "phpstan/phpstan-strict-rules": "1.4.4", + "phpunit/phpunit": "7.5.20|8.5.21|9.5.25" }, "type": "phpcodesniffer-standard", "extra": { "branch-alias": { - "dev-master": "7.x-dev" + "dev-master": "8.x-dev" } }, "autoload": { @@ -20145,7 +20956,7 @@ "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/7.2.1" + "source": "https://github.com/slevomat/coding-standard/tree/8.5.2" }, "funding": [ { @@ -20157,7 +20968,7 @@ "type": "tidelift" } ], - "time": "2022-05-25T10:58:12+00:00" + "time": "2022-09-27T16:45:37+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -20429,16 +21240,16 @@ }, { "name": "symfony/lock", - "version": "v4.4.40", + "version": "v4.4.46", "source": { "type": "git", "url": "https://github.com/symfony/lock.git", - "reference": "ec23fb51d9b531f7fcd2279afe5b474e624c2445" + "reference": "8b060dd4e10f05219698ceb3a4ad735b19c1be4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/lock/zipball/ec23fb51d9b531f7fcd2279afe5b474e624c2445", - "reference": "ec23fb51d9b531f7fcd2279afe5b474e624c2445", + "url": "https://api.github.com/repos/symfony/lock/zipball/8b060dd4e10f05219698ceb3a4ad735b19c1be4f", + "reference": "8b060dd4e10f05219698ceb3a4ad735b19c1be4f", "shasum": "" }, "require": { @@ -20447,10 +21258,10 @@ "symfony/polyfill-php80": "^1.16" }, "conflict": { - "doctrine/dbal": "<2.6" + "doctrine/dbal": "<2.7" }, "require-dev": { - "doctrine/dbal": "^2.6|^3.0", + "doctrine/dbal": "^2.7|^3.0", "predis/predis": "~1.0" }, "type": "library", @@ -20487,7 +21298,7 @@ "semaphore" ], "support": { - "source": "https://github.com/symfony/lock/tree/v4.4.40" + "source": "https://github.com/symfony/lock/tree/v4.4.46" }, "funding": [ { @@ -20503,20 +21314,20 @@ "type": "tidelift" } ], - "time": "2022-03-22T11:09:53+00:00" + "time": "2022-09-19T08:41:12+00:00" }, { "name": "symfony/phpunit-bridge", - "version": "v5.4.11", + "version": "v5.4.14", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "31b1549f54b1a1890e725a0c1c8c2de6ef2205b3" + "reference": "684084f74504c234462fafe6f5eea003a73e7e75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/31b1549f54b1a1890e725a0c1c8c2de6ef2205b3", - "reference": "31b1549f54b1a1890e725a0c1c8c2de6ef2205b3", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/684084f74504c234462fafe6f5eea003a73e7e75", + "reference": "684084f74504c234462fafe6f5eea003a73e7e75", "shasum": "" }, "require": { @@ -20570,7 +21381,7 @@ "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.11" + "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.14" }, "funding": [ { @@ -20586,7 +21397,7 @@ "type": "tidelift" } ], - "time": "2022-07-28T13:33:28+00:00" + "time": "2022-10-07T08:01:20+00:00" }, { "name": "theseer/tokenizer", @@ -20645,6 +21456,12 @@ "version": "dev-php-update", "alias": "7.x-dev", "alias_normalized": "7.9999999.9999999.9999999-dev" + }, + { + "package": "ruflin/elastica", + "version": "7.9999999.9999999.9999999-dev", + "alias": "dev-master", + "alias_normalized": "dev-master" } ], "minimum-stability": "dev", @@ -20654,8 +21471,10 @@ "drupal/content_moderation_revert": 20, "drupal/entity_clone": 10, "drupal/entitygroupfield": 15, - "drupal/facets_pretty_paths": 20, "drupal/fast_404": 15, + "drupal/flag": 10, + "drupal/gin_lb": 10, + "drupal/gin_toolbar": 10, "drupal/groupmedia": 15, "drupal/inline_entity_form": 5, "drupal/linkit_telephone": 20, @@ -20678,7 +21497,8 @@ "drupal_git/custom_add_another": 20, "drupal_git/date_range_formatter": 20, "drupal_git/viewsreference_filter": 20, - "nodespark/des-connector": 20 + "nodespark/des-connector": 20, + "ruflin/elastica": 20 }, "prefer-stable": true, "prefer-lowest": false, @@ -20692,5 +21512,5 @@ "ext-pdo": "1.0.0", "php": "8.0" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } diff --git a/services/drupal/composer.patches.json b/services/drupal/composer.patches.json index 95606858ea..f15ee16853 100644 --- a/services/drupal/composer.patches.json +++ b/services/drupal/composer.patches.json @@ -25,7 +25,7 @@ "Add Views autocomplete filter for all entity reference fields": "https://www.drupal.org/files/issues/2021-12-02/2429699-453-9.3.x.patch", "Provides a link to the latest revision": "https://www.drupal.org/files/issues/2021-11-03/2906455-33.patch", "Avoid exception that blocks page rendering when image file is missing from disk": "https://www.drupal.org/files/issues/2827921-remove-missing-responsive-image-width-exception.patch", - "Allow referencing unpublished nodes if user has access to them": "https://www.drupal.org/files/issues/2021-06-09/2845144_52.patch", + "Allow referencing unpublished nodes if user has access to them": "https://www.drupal.org/files/issues/2022-06-17/2845144-67.patch", "Action on embedded form improperly set https://www.drupal.org/project/drupal/issues/2840283": "https://www.drupal.org/files/issues/2021-08-10/linked-display-2840283-48.patch", "Allow layout builder blocks to be optional depending on whether the required context exists": "https://www.drupal.org/files/issues/2021-08-13/3056907-context-15.patch", "Patch Layout Builder to get it to avoid creating webform submission field blocks": "patches/layout-builder-webform-performance-enhancements.patch", @@ -44,7 +44,8 @@ "JQuery UI order incorrect": "https://www.drupal.org/files/issues/2021-07-19/3222107-jquery_ui_weight_fix-11.diff", "Avoid OOM errors on update hooks using weakreference cache implementation": "https://www.drupal.org/files/issues/2021-10-05/3190992-39.patch", "Add support for svgs in image fields": "https://www.drupal.org/files/issues/2022-06-23/drupal-responsive_image_svg_support-2957924-11.patch", - "Reset media library pagination when interacting with exposed filters": "https://www.drupal.org/files/issues/2022-09-08/drupal-media_library_reset_pagination-3308719-3.patch" + "Reset media library pagination when interacting with exposed filters": "https://www.drupal.org/files/issues/2022-09-08/drupal-media_library_reset_pagination-3308719-3.patch", + "Drupal.ajax guarentee that commands finish to add JS before calling that JS": "https://www.drupal.org/files/issues/2022-08-03/core-ajaxload-1988968-338.patch" }, "drupal/group": { "Get a token of a node's parent group to create a pathauto pattern": "https://www.drupal.org/files/issues/2020-02-21/group-gnode_tokens-2774827-62.patch", @@ -77,8 +78,9 @@ "Do not reimport existing entities": "https://www.drupal.org/files/issues/2020-11-06/default_content-existing-entities-2698425-1-x.patch" }, "drupal/content_moderation_notifications": { - "Group Entity Support": "https://www.drupal.org/files/issues/2020-02-17/content_moderation_notifications-3015275-35.patch", - "Add option to email Revision Author": "patches/content-moderation-notifications-3133940-2-rolled-to-apply-with-3015275.patch" + "Group Entity Support, issue 3015276-42": "https://www.drupal.org/files/issues/2022-05-11/content_moderation_notifications-group_support-3015275-42.patch", + "Add option to email Revision Author": "patches/content_moderation_notifications-3133940-23-rolled-to-apply-with-3015276-42.patch", + "Flag module support": "patches/content_moderation_notifications-3316633-9-rolled-to-apply-with-3133940-23-and-3015276-42.patch" }, "drupal/paragraphs": { "Fix integrity constraint violation when embedding paragraphs on blocks in layout builder": "https://www.drupal.org/files/issues/2019-07-10/paragraphs-set_langcode_widgets-2901390-29.patch", @@ -101,11 +103,19 @@ "Remove extraneous 'q' argument from url": "https://www.drupal.org/files/issues/2020-06-09/facets_pretty_paths--remove-extraneous-arg--3150353--2.patch", "Validate IDs extracted from URL to avoid errors": "https://www.drupal.org/files/issues/2021-07-23/facets_pretty_paths-validate_id-3225124-4.patch" }, + "drupal/facets": { + "Ensure the summary reset link works with pretty paths": "https://www.drupal.org/files/issues/2023-01-10/facets-reset-link-broken-with-pretty-paths-3332463-2.patch" + }, + "drupal/flag": { + "Addresses 'Cannot load the flag entity with NULL ID' error": "https://www.drupal.org/files/issues/2021-01-28/3163338-7.patch", + "Addresses 'Call to a member function actionAccess() on null' error": "https://www.drupal.org/files/issues/2022-10-23/flag-vbo-2893259-40.patch" + }, "drupal/elasticsearch_connector": { "Parse data facets from epoch milliseconds format to seconds": "https://www.drupal.org/files/issues/2020-11-27/3096887-elasticsearch_connector_-7.x-parse_date_facets-7.patch", "Facet OR: global aggregation does not take views filter into account": "https://www.drupal.org/files/issues/2021-02-02/elasticsearch_connector-facet_OR_global_aggregation_does_not_take_views_filter_into_account-3014805-24.patch", "Accurately count total number of results": "https://www.drupal.org/files/issues/2021-11-18/3250145-1-track-total-hits.patch", - "Implement luceneFlattenKeys": "https://www.drupal.org/files/issues/2021-09-28/elasticsearch_connector-flattenkeys-2952301-15.patch" + "Implement luceneFlattenKeys": "https://www.drupal.org/files/issues/2021-09-28/elasticsearch_connector-flattenkeys-2952301-15.patch", + "Better logging of indexing failures": "https://www.drupal.org/files/issues/2020-10-13/elasticsearch_connector-7.x-error_codes-3176523-2.patch" }, "drupal/redis": { "Enable cluster mode support": "https://www.drupal.org/files/issues/2020-02-06/2900947-17.patch" @@ -211,12 +221,13 @@ "Limit available groups in widget to ones user has permission to.": "https://www.drupal.org/files/issues/2020-08-07/entitygroupfield-Autocomplete_permissions-3163814-4.patch" }, "drupal/environment_indicator": { - "Allow specifying links to specific paths on the other environments": "https://www.drupal.org/files/issues/2022-06-23/environment_indicator-configure_switcher_path-3274102-5.patch" + "Allow specifying links to specific paths on the other environments": "https://www.drupal.org/files/issues/2022-10-07/environment_indicator-configure_switcher_path-3274102-6.patch" }, "drupal/addtocal":{ "patch for smart date": "https://www.drupal.org/files/issues/2022-02-10/3224310-4-smartdate-integration.patch", "patch for newline handling": "https://www.drupal.org/files/issues/2022-09-26/addtocal-fix-newlines-3311870-2.patch", - "patch for escaping commas in location field": "patches/addtocal-escape_location_commas-3319571-3-rolled-to-apply-on-3311870-2.patch" + "patch for escaping commas in location field": "patches/addtocal-escape_location_commas-3319571-3-rolled-to-apply-on-3311870-2.patch", + "patch for addressing newlines in description field": "patches/addtocal-address-newlines-in-description-rolled-to-apply-on-3319571-3-and-3311870-2.patch" }, "drupal/show_email": { "Fix config schema": "https://www.drupal.org/files/issues/2020-10-15/show_email-config_schema_issues-3177062-2.patch" @@ -228,7 +239,7 @@ "Fix some parsing issues": "patches/markdownify-PR-32-2_3_1.patch" }, "drupal/fast_404": { - "Fix errors when including fast404 from settings.php": "https://www.drupal.org/files/issues/2019-02-24/2961512-13.patch", + "Fix errors when including fast404 from settings.php": "https://www.drupal.org/files/issues/2022-10-05/fast_404-db_preboot_errors_d9.4-2961512-23.patch", "Fix path matching when paths contain special characters": "https://www.drupal.org/files/issues/2020-06-01/fast_404-encoding-3144403-4.patch", "Honor redirects": "https://www.drupal.org/files/issues/2022-05-12/fast_404-honor_redirects-2838359-47.patch" }, diff --git a/services/drupal/config/sync/autologout.role.menu_admin.yml b/services/drupal/config/sync/autologout.role.menu_admin.yml new file mode 100644 index 0000000000..bd22cf4d17 --- /dev/null +++ b/services/drupal/config/sync/autologout.role.menu_admin.yml @@ -0,0 +1,3 @@ +enabled: false +timeout: null +url: '' diff --git a/services/drupal/config/sync/autologout.role.paragraphs_library_contributor.yml b/services/drupal/config/sync/autologout.role.paragraphs_library_contributor.yml new file mode 100644 index 0000000000..bd22cf4d17 --- /dev/null +++ b/services/drupal/config/sync/autologout.role.paragraphs_library_contributor.yml @@ -0,0 +1,3 @@ +enabled: false +timeout: null +url: '' diff --git a/services/drupal/config/sync/autologout.settings.yml b/services/drupal/config/sync/autologout.settings.yml index 4681837ee4..35e15dfbe8 100644 --- a/services/drupal/config/sync/autologout.settings.yml +++ b/services/drupal/config/sync/autologout.settings.yml @@ -1,6 +1,6 @@ _core: default_config_hash: j-ZIPT_JseG1aLxuAdzS-NomYUmBK3OUOjP53Pg8uA8 -timeout: 1800 +timeout: 28000 max_timeout: 172800 padding: 300 no_individual_logout_threshold: true diff --git a/services/drupal/config/sync/block.block.epa_claro_breadcrumbs.yml b/services/drupal/config/sync/block.block.epa_claro_breadcrumbs.yml new file mode 100644 index 0000000000..6fa5f13112 --- /dev/null +++ b/services/drupal/config/sync/block.block.epa_claro_breadcrumbs.yml @@ -0,0 +1,20 @@ +uuid: 4cc40de3-9386-4061-b2c8-9097e9556af3 +langcode: en +status: true +dependencies: + module: + - system + theme: + - epa_claro +id: epa_claro_breadcrumbs +theme: epa_claro +region: breadcrumb +weight: 0 +provider: null +plugin: system_breadcrumb_block +settings: + id: system_breadcrumb_block + label: Breadcrumbs + label_display: '0' + provider: system +visibility: { } diff --git a/services/drupal/config/sync/block.block.epa_claro_breadcrumbs.yml.xxx b/services/drupal/config/sync/block.block.epa_claro_breadcrumbs.yml.xxx new file mode 100644 index 0000000000..38c32050d3 --- /dev/null +++ b/services/drupal/config/sync/block.block.epa_claro_breadcrumbs.yml.xxx @@ -0,0 +1,22 @@ +uuid: p088270f-6a3e-4738-84d2-250afb93909c +langcode: en +status: true +dependencies: + module: + - system + theme: + - epa_claro +_core: + default_config_hash: p6mUaCq5YPapRUABXRHfNTT6fxWIj5lgf0Mg4HaRJ_I +id: epa_claro_breadcrumbs +theme: epa_claro +region: breadcrumb +weight: 0 +provider: null +plugin: system_breadcrumb_block +settings: + id: system_breadcrumb_block + label: Breadcrumbs + label_display: '0' + provider: system +visibility: { } diff --git a/services/drupal/config/sync/block.block.epa_claro_content.yml b/services/drupal/config/sync/block.block.epa_claro_content.yml new file mode 100644 index 0000000000..5bdcbcc8da --- /dev/null +++ b/services/drupal/config/sync/block.block.epa_claro_content.yml @@ -0,0 +1,20 @@ +uuid: e63e0959-b875-4cc7-b323-d884c363437a +langcode: en +status: true +dependencies: + module: + - system + theme: + - epa_claro +id: epa_claro_content +theme: epa_claro +region: content +weight: -2 +provider: null +plugin: system_main_block +settings: + id: system_main_block + label: 'Main page content' + label_display: '0' + provider: system +visibility: { } diff --git a/services/drupal/config/sync/block.block.epa_claro_content.yml.xxx b/services/drupal/config/sync/block.block.epa_claro_content.yml.xxx new file mode 100644 index 0000000000..4b37e80429 --- /dev/null +++ b/services/drupal/config/sync/block.block.epa_claro_content.yml.xxx @@ -0,0 +1,22 @@ +uuid: p57e5948-0d7f-4e24-a8e4-227f9ed47e22 +langcode: en +status: true +dependencies: + module: + - system + theme: + - epa_claro +_core: + default_config_hash: pTwkfDaGeBUk6aerktJBDXso4fCsqLTQOuWKXE1xMPU +id: epa_claro_content +theme: epa_claro +region: content +weight: 0 +provider: null +plugin: system_main_block +settings: + id: system_main_block + label: 'Main page content' + label_display: '0' + provider: system +visibility: { } diff --git a/services/drupal/config/sync/block.block.epa_claro_local_actions.yml b/services/drupal/config/sync/block.block.epa_claro_local_actions.yml new file mode 100644 index 0000000000..5a2da32348 --- /dev/null +++ b/services/drupal/config/sync/block.block.epa_claro_local_actions.yml @@ -0,0 +1,18 @@ +uuid: c7bb0e5d-9ffb-47a3-895a-7e6360d797fa +langcode: en +status: true +dependencies: + theme: + - epa_claro +id: epa_claro_local_actions +theme: epa_claro +region: content +weight: -3 +provider: null +plugin: local_actions_block +settings: + id: local_actions_block + label: 'Primary admin actions' + label_display: '0' + provider: core +visibility: { } diff --git a/services/drupal/config/sync/block.block.epa_claro_local_actions.yml.xxx b/services/drupal/config/sync/block.block.epa_claro_local_actions.yml.xxx new file mode 100644 index 0000000000..6390f1283e --- /dev/null +++ b/services/drupal/config/sync/block.block.epa_claro_local_actions.yml.xxx @@ -0,0 +1,20 @@ +uuid: pa3a8ca9-2612-438f-ad70-8c1665cec213 +langcode: en +status: true +dependencies: + theme: + - epa_claro +_core: + default_config_hash: psZQ9lL2jTdH5am4LJiZ29RaivhzOf6vCpoRy6FZwIE +id: epa_claro_local_actions +theme: epa_claro +region: content +weight: -10 +provider: null +plugin: local_actions_block +settings: + id: local_actions_block + label: 'Primary admin actions' + label_display: '0' + provider: core +visibility: { } diff --git a/services/drupal/config/sync/block.block.epa_claro_messages.yml b/services/drupal/config/sync/block.block.epa_claro_messages.yml new file mode 100644 index 0000000000..cc2d177c2c --- /dev/null +++ b/services/drupal/config/sync/block.block.epa_claro_messages.yml @@ -0,0 +1,20 @@ +uuid: c62cc703-5ad9-433b-b72e-de395c2a7707 +langcode: en +status: true +dependencies: + module: + - system + theme: + - epa_claro +id: epa_claro_messages +theme: epa_claro +region: highlighted +weight: 0 +provider: null +plugin: system_messages_block +settings: + id: system_messages_block + label: 'Status messages' + label_display: '0' + provider: system +visibility: { } diff --git a/services/drupal/config/sync/block.block.epa_claro_messages.yml.xxx b/services/drupal/config/sync/block.block.epa_claro_messages.yml.xxx new file mode 100644 index 0000000000..6a6db082c0 --- /dev/null +++ b/services/drupal/config/sync/block.block.epa_claro_messages.yml.xxx @@ -0,0 +1,22 @@ +uuid: pf2bebe6-00cf-4313-8651-6fa142777be4 +langcode: en +status: true +dependencies: + module: + - system + theme: + - epa_claro +_core: + default_config_hash: pIy-YIc9d9s1isAtTIKWDBKd6kd2r6LxoYz_-hkLJco +id: epa_claro_messages +theme: epa_claro +region: highlighted +weight: 0 +provider: null +plugin: system_messages_block +settings: + id: system_messages_block + label: 'Status messages' + label_display: '0' + provider: system +visibility: { } diff --git a/services/drupal/config/sync/block.block.epa_claro_page_title.yml b/services/drupal/config/sync/block.block.epa_claro_page_title.yml new file mode 100644 index 0000000000..525b5443c9 --- /dev/null +++ b/services/drupal/config/sync/block.block.epa_claro_page_title.yml @@ -0,0 +1,18 @@ +uuid: f0d06dad-fe3c-408a-8d9b-f43d95fc000f +langcode: en +status: true +dependencies: + theme: + - epa_claro +id: epa_claro_page_title +theme: epa_claro +region: header +weight: 0 +provider: null +plugin: page_title_block +settings: + id: page_title_block + label: 'Page title' + label_display: '0' + provider: core +visibility: { } diff --git a/services/drupal/config/sync/block.block.epa_claro_page_title.yml.xxx b/services/drupal/config/sync/block.block.epa_claro_page_title.yml.xxx new file mode 100644 index 0000000000..78b4eb79a5 --- /dev/null +++ b/services/drupal/config/sync/block.block.epa_claro_page_title.yml.xxx @@ -0,0 +1,20 @@ +uuid: pae756e0-b3d6-4f6f-aed3-568eb7845d42 +langcode: en +status: true +dependencies: + theme: + - epa_claro +_core: + default_config_hash: pfXKmThltk6eewwrjAEaxVPxzPEVHV1UfNjjOUQ5A7g +id: epa_claro_page_title +theme: epa_claro +region: header +weight: -2 +provider: null +plugin: page_title_block +settings: + id: page_title_block + label: 'Page title' + label_display: '0' + provider: core +visibility: { } diff --git a/services/drupal/config/sync/block.block.epa_claro_primary_local_tasks.yml b/services/drupal/config/sync/block.block.epa_claro_primary_local_tasks.yml new file mode 100644 index 0000000000..ce12a7c60b --- /dev/null +++ b/services/drupal/config/sync/block.block.epa_claro_primary_local_tasks.yml @@ -0,0 +1,20 @@ +uuid: 5d4ccd32-161d-4550-8863-82f443ee3779 +langcode: en +status: true +dependencies: + theme: + - epa_claro +id: epa_claro_primary_local_tasks +theme: epa_claro +region: header +weight: 0 +provider: null +plugin: local_tasks_block +settings: + id: local_tasks_block + label: 'Primary tabs' + label_display: '0' + provider: core + primary: true + secondary: false +visibility: { } diff --git a/services/drupal/config/sync/block.block.epa_claro_primary_local_tasks.yml.xxx b/services/drupal/config/sync/block.block.epa_claro_primary_local_tasks.yml.xxx new file mode 100644 index 0000000000..e88b62245f --- /dev/null +++ b/services/drupal/config/sync/block.block.epa_claro_primary_local_tasks.yml.xxx @@ -0,0 +1,22 @@ +uuid: p5d16ab3-2a4d-4829-a9bc-112da989a3a2 +langcode: en +status: true +dependencies: + theme: + - epa_claro +_core: + default_config_hash: pcvXIzw8NabmQCWMPqBz0mvIQZzXUZB3OeOTa5eqbCo +id: epa_claro_primary_local_tasks +theme: epa_claro +region: header +weight: -1 +provider: null +plugin: local_tasks_block +settings: + id: local_tasks_block + label: 'Primary tabs' + label_display: '0' + provider: core + primary: true + secondary: false +visibility: { } diff --git a/services/drupal/config/sync/block.block.epa_claro_secondary_local_tasks.yml b/services/drupal/config/sync/block.block.epa_claro_secondary_local_tasks.yml new file mode 100644 index 0000000000..4f1c14a603 --- /dev/null +++ b/services/drupal/config/sync/block.block.epa_claro_secondary_local_tasks.yml @@ -0,0 +1,20 @@ +uuid: 6b91908e-ecb4-4e93-ba1a-b971520054d1 +langcode: en +status: true +dependencies: + theme: + - epa_claro +id: epa_claro_secondary_local_tasks +theme: epa_claro +region: pre_content +weight: 0 +provider: null +plugin: local_tasks_block +settings: + id: local_tasks_block + label: 'Secondary tabs' + label_display: '0' + provider: core + primary: false + secondary: true +visibility: { } diff --git a/services/drupal/config/sync/block.block.epa_claro_secondary_local_tasks.yml.xxx b/services/drupal/config/sync/block.block.epa_claro_secondary_local_tasks.yml.xxx new file mode 100644 index 0000000000..7768a43bfc --- /dev/null +++ b/services/drupal/config/sync/block.block.epa_claro_secondary_local_tasks.yml.xxx @@ -0,0 +1,22 @@ +uuid: pb370fb4-54e1-4803-8a4a-ec0f905c69d9 +langcode: en +status: true +dependencies: + theme: + - epa_claro +_core: + default_config_hash: p_hUB_AW2IvKbVo3lVG-B2KfTsX6xJ-CxfOcRYUnL3E +id: epa_claro_secondary_local_tasks +theme: epa_claro +region: pre_content +weight: 0 +provider: null +plugin: local_tasks_block +settings: + id: local_tasks_block + label: 'Secondary tabs' + label_display: '0' + provider: core + primary: false + secondary: true +visibility: { } diff --git a/services/drupal/config/sync/block.block.gin_breadcrumbs.yml b/services/drupal/config/sync/block.block.gin_breadcrumbs.yml new file mode 100644 index 0000000000..5492f1b411 --- /dev/null +++ b/services/drupal/config/sync/block.block.gin_breadcrumbs.yml @@ -0,0 +1,22 @@ +uuid: 71eca986-288c-4391-8ecb-4422827e2c5c +langcode: en +status: true +dependencies: + module: + - system + theme: + - gin +_core: + default_config_hash: y9X3xgCsO59pQyzNLzY1D3SDJJxCHILLWkpPnmuTJ2E +id: gin_breadcrumbs +theme: gin +region: breadcrumb +weight: 0 +provider: null +plugin: system_breadcrumb_block +settings: + id: system_breadcrumb_block + label: Breadcrumbs + label_display: '0' + provider: system +visibility: { } diff --git a/services/drupal/config/sync/block.block.gin_content.yml b/services/drupal/config/sync/block.block.gin_content.yml new file mode 100644 index 0000000000..4cc9c5005c --- /dev/null +++ b/services/drupal/config/sync/block.block.gin_content.yml @@ -0,0 +1,22 @@ +uuid: 1859948b-da76-42f1-b04c-ec91bb663e1c +langcode: en +status: true +dependencies: + module: + - system + theme: + - gin +_core: + default_config_hash: hBHXB7hC05XU7pDYzETt-GUcpFlogK1gkjyAsg0Ym58 +id: gin_content +theme: gin +region: content +weight: 0 +provider: null +plugin: system_main_block +settings: + id: system_main_block + label: 'Main page content' + label_display: '0' + provider: system +visibility: { } diff --git a/services/drupal/config/sync/block.block.gin_local_actions.yml b/services/drupal/config/sync/block.block.gin_local_actions.yml new file mode 100644 index 0000000000..465a72f73b --- /dev/null +++ b/services/drupal/config/sync/block.block.gin_local_actions.yml @@ -0,0 +1,20 @@ +uuid: 094499ec-ac51-4409-b012-ac4fea3debeb +langcode: en +status: true +dependencies: + theme: + - gin +_core: + default_config_hash: OQ9aJ-4qVwK1x00o9EOYK4eFDjQr_HLpbPiJaPSVZiQ +id: gin_local_actions +theme: gin +region: content +weight: -10 +provider: null +plugin: local_actions_block +settings: + id: local_actions_block + label: 'Primary admin actions' + label_display: '0' + provider: core +visibility: { } diff --git a/services/drupal/config/sync/block.block.gin_messages.yml b/services/drupal/config/sync/block.block.gin_messages.yml new file mode 100644 index 0000000000..9c04a76326 --- /dev/null +++ b/services/drupal/config/sync/block.block.gin_messages.yml @@ -0,0 +1,22 @@ +uuid: 4b0fa86f-bc27-45b2-8d87-3d55b32e2899 +langcode: en +status: true +dependencies: + module: + - system + theme: + - gin +_core: + default_config_hash: WvPhI8OwllG0gE69-F8qL3ai3nd5SbYD6JpmEuZcyok +id: gin_messages +theme: gin +region: highlighted +weight: 0 +provider: null +plugin: system_messages_block +settings: + id: system_messages_block + label: 'Status messages' + label_display: '0' + provider: system +visibility: { } diff --git a/services/drupal/config/sync/block.block.gin_page_title.yml b/services/drupal/config/sync/block.block.gin_page_title.yml new file mode 100644 index 0000000000..5c135f2f01 --- /dev/null +++ b/services/drupal/config/sync/block.block.gin_page_title.yml @@ -0,0 +1,20 @@ +uuid: af6ef0ee-81a3-4c3e-8fb9-caecbcb236e8 +langcode: en +status: true +dependencies: + theme: + - gin +_core: + default_config_hash: HLQY2xgby8K3vN_98hiOSasOhm9pdCsH234-s0duJ8Q +id: gin_page_title +theme: gin +region: header +weight: -30 +provider: null +plugin: page_title_block +settings: + id: page_title_block + label: 'Page title' + label_display: '0' + provider: core +visibility: { } diff --git a/services/drupal/config/sync/block.block.gin_primary_local_tasks.yml b/services/drupal/config/sync/block.block.gin_primary_local_tasks.yml new file mode 100644 index 0000000000..fc35cae4ed --- /dev/null +++ b/services/drupal/config/sync/block.block.gin_primary_local_tasks.yml @@ -0,0 +1,22 @@ +uuid: 65b262f0-92b6-4637-97e5-b6fe8238b9e0 +langcode: en +status: true +dependencies: + theme: + - gin +_core: + default_config_hash: Hh01DLj9k7UnNdPpOQXHZHW7GHf2OPNDQyCJF7_R9ac +id: gin_primary_local_tasks +theme: gin +region: header +weight: 0 +provider: null +plugin: local_tasks_block +settings: + id: local_tasks_block + label: 'Primary tabs' + label_display: '0' + provider: core + primary: true + secondary: false +visibility: { } diff --git a/services/drupal/config/sync/block.block.gin_secondary_local_tasks.yml b/services/drupal/config/sync/block.block.gin_secondary_local_tasks.yml new file mode 100644 index 0000000000..6ac45ccc71 --- /dev/null +++ b/services/drupal/config/sync/block.block.gin_secondary_local_tasks.yml @@ -0,0 +1,22 @@ +uuid: 361cb93c-3a4b-47a0-b6cd-cbb3b4ad2356 +langcode: en +status: true +dependencies: + theme: + - gin +_core: + default_config_hash: BCWhood0xXFQYqxFgL1spXdb9KeIuXH1YvTdjIEedDg +id: gin_secondary_local_tasks +theme: gin +region: pre_content +weight: 0 +provider: null +plugin: local_tasks_block +settings: + id: local_tasks_block + label: 'Secondary tabs' + label_display: '0' + provider: core + primary: false + secondary: true +visibility: { } diff --git a/services/drupal/config/sync/block.block.views_block__internal_alerts_block_1_4.yml b/services/drupal/config/sync/block.block.views_block__internal_alerts_block_1_4.yml new file mode 100644 index 0000000000..9a24d4afda --- /dev/null +++ b/services/drupal/config/sync/block.block.views_block__internal_alerts_block_1_4.yml @@ -0,0 +1,24 @@ +uuid: caf977a0-1d86-4fdf-987f-3b39c73eafe3 +langcode: en +status: true +dependencies: + config: + - views.view.internal_alerts + module: + - views + theme: + - epa_claro +id: views_block__internal_alerts_block_1_4 +theme: epa_claro +region: header +weight: 0 +provider: null +plugin: 'views_block:internal_alerts-block_1' +settings: + id: 'views_block:internal_alerts-block_1' + label: '' + label_display: visible + provider: views + views_label: '' + items_per_page: none +visibility: { } diff --git a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_about_to_expire.yml b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_about_to_expire.yml index 5bece782fc..f5325741b9 100644 --- a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_about_to_expire.yml +++ b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_about_to_expire.yml @@ -12,20 +12,16 @@ group_use: true group_type: web_area workflow: epa_default group_roles: - web_area-administrator: web_area-administrator web_area-editor: web_area-editor - web_area-30cda0a61: '0' - web_area-355bc4eba: '0' - web_area-396316984: '0' - web_area-a1df8f829: '0' - web_area-a416e6833: '0' + web_area-watcher: web_area-watcher + web_area-administrator: '0' web_area-approver: '0' - web_area-f31530d38: '0' web_area-member: '0' - web_area-outsider: '0' transitions: send_to_editor_s_for_review: send_to_editor_s_for_review roles: { } +flags: + notification_opt_in: notification_opt_in author: true revision_author: true site_mail: false diff --git a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_has_been_approved.yml b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_has_been_approved.yml index 0c11e63c72..f7f861e337 100644 --- a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_has_been_approved.yml +++ b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_has_been_approved.yml @@ -12,22 +12,18 @@ group_use: true group_type: web_area workflow: epa_default group_roles: - web_area-administrator: web_area-administrator - web_area-editor: web_area-editor - web_area-30cda0a61: '0' - web_area-355bc4eba: '0' - web_area-396316984: '0' - web_area-a1df8f829: '0' - web_area-a416e6833: '0' - web_area-approver: '0' - web_area-f31530d38: '0' + web_area-approver: web_area-approver + web_area-watcher: web_area-watcher + web_area-administrator: '0' + web_area-editor: '0' web_area-member: '0' - web_area-outsider: '0' transitions: approve_leave_unpublished: approve_leave_unpublished roles: { } +flags: + notification_opt_in: notification_opt_in author: false -revision_author: false +revision_author: true site_mail: false emails: '' subject: 'EPA Content Has Been Approved: [node:group:title] > [node:title]' diff --git a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_has_been_published.yml b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_has_been_published.yml new file mode 100644 index 0000000000..990a396aed --- /dev/null +++ b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_has_been_published.yml @@ -0,0 +1,33 @@ +uuid: 88e81360-dffc-43ff-a592-708ee8cbffd4 +langcode: en +status: true +dependencies: + module: + - epa_workflow +third_party_settings: + epa_workflow: + workflow_process: any +id: epa_content_has_been_published +group_use: true +group_type: web_area +workflow: epa_default +group_roles: + web_area-watcher: web_area-watcher + web_area-administrator: '0' + web_area-approver: '0' + web_area-editor: '0' + web_area-member: '0' +transitions: + publish: publish +roles: { } +flags: + notification_opt_in: notification_opt_in +author: false +revision_author: false +site_mail: false +emails: '' +subject: 'New Content Has Been Published: [node:group:title] > [node:title]' +body: + value: "

Hi, you have received this email because you are watching for new pages in the [node:group:title] web area in EPA's Web Content Management System.

\r\n

The following EPA page has been published in the [node:group:title] web area:

\r\n\r\n

 

\r\n\r\n

[node:title]

\r\n\r\n

 

\r\n\r\n

Log in with your LAN ID and password to review this web page:

\r\n

[node:url]

" + format: unprocessed +label: 'EPA Content Has Been Published' diff --git a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_has_been_unpublished.yml b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_has_been_unpublished.yml index 405c59d18f..f994231e19 100644 --- a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_has_been_unpublished.yml +++ b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_has_been_unpublished.yml @@ -8,26 +8,20 @@ third_party_settings: epa_workflow: workflow_process: sunset id: epa_content_has_been_unpublished -group_use: false +group_use: true group_type: web_area workflow: epa_default group_roles: - web_area-30cda0a61: '0' - web_area-355bc4eba: '0' - web_area-396316984: '0' - web_area-8e516a8d3: '0' - web_area-a1df8f829: '0' - web_area-a416e6833: '0' - web_area-aaaa66848: '0' + web_area-watcher: web_area-watcher web_area-administrator: '0' web_area-approver: '0' web_area-editor: '0' - web_area-f31530d38: '0' web_area-member: '0' - web_area-outsider: '0' transitions: unpublish: unpublish roles: { } +flags: + notification_opt_in: notification_opt_in author: true revision_author: true site_mail: false diff --git a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_has_expired.yml b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_has_expired.yml index af0b5d3d2d..ae84e5ecea 100644 --- a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_has_expired.yml +++ b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_has_expired.yml @@ -13,19 +13,15 @@ group_type: web_area workflow: epa_default group_roles: web_area-administrator: web_area-administrator - web_area-editor: web_area-editor - web_area-30cda0a61: '0' - web_area-355bc4eba: '0' - web_area-396316984: '0' - web_area-a1df8f829: '0' - web_area-a416e6833: '0' + web_area-watcher: web_area-watcher web_area-approver: '0' - web_area-f31530d38: '0' + web_area-editor: '0' web_area-member: '0' - web_area-outsider: '0' transitions: unpublish: unpublish roles: { } +flags: + notification_opt_in: notification_opt_in author: true revision_author: true site_mail: false diff --git a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_needs_approval.yml b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_needs_approval.yml index 2c9bbef003..b4ff25d666 100644 --- a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_needs_approval.yml +++ b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_needs_approval.yml @@ -13,19 +13,15 @@ group_type: web_area workflow: epa_default group_roles: web_area-approver: web_area-approver - web_area-30cda0a61: '0' - web_area-355bc4eba: '0' - web_area-396316984: '0' - web_area-a1df8f829: '0' - web_area-a416e6833: '0' + web_area-watcher: web_area-watcher web_area-administrator: '0' web_area-editor: '0' - web_area-f31530d38: '0' web_area-member: '0' - web_area-outsider: '0' transitions: send_for_review: send_for_review roles: { } +flags: + notification_opt_in: notification_opt_in author: false revision_author: false site_mail: false diff --git a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_needs_review.yml b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_needs_review.yml index e74d2ab1e4..0318c8e92d 100644 --- a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_needs_review.yml +++ b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_needs_review.yml @@ -12,20 +12,16 @@ group_use: true group_type: web_area workflow: epa_default group_roles: - web_area-administrator: web_area-administrator - web_area-30cda0a61: '0' - web_area-355bc4eba: '0' - web_area-396316984: '0' - web_area-a1df8f829: '0' - web_area-a416e6833: '0' + web_area-watcher: web_area-watcher + web_area-administrator: '0' web_area-approver: '0' web_area-editor: '0' - web_area-f31530d38: '0' web_area-member: '0' - web_area-outsider: '0' transitions: send_to_author_for_review: send_to_author_for_review roles: { } +flags: + notification_opt_in: notification_opt_in author: true revision_author: true site_mail: false diff --git a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_needs_review_manual.yml b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_needs_review_manual.yml index 29f51b0180..4b84b111ea 100644 --- a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_needs_review_manual.yml +++ b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_needs_review_manual.yml @@ -8,24 +8,20 @@ third_party_settings: epa_workflow: workflow_process: manual id: epa_content_needs_review_manual -group_use: false +group_use: true group_type: web_area workflow: epa_default group_roles: - web_area-30cda0a61: '0' - web_area-355bc4eba: '0' - web_area-396316984: '0' - web_area-a1df8f829: '0' - web_area-a416e6833: '0' + web_area-watcher: web_area-watcher web_area-administrator: '0' web_area-approver: '0' web_area-editor: '0' - web_area-f31530d38: '0' web_area-member: '0' - web_area-outsider: '0' transitions: send_to_author_for_review: send_to_author_for_review roles: { } +flags: + notification_opt_in: notification_opt_in author: true revision_author: true site_mail: false diff --git a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_will_expire.yml b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_will_expire.yml index 063b8c002a..9ea5e962c9 100644 --- a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_will_expire.yml +++ b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_will_expire.yml @@ -13,19 +13,15 @@ group_type: web_area workflow: epa_default group_roles: web_area-administrator: web_area-administrator - web_area-editor: web_area-editor - web_area-30cda0a61: '0' - web_area-355bc4eba: '0' - web_area-396316984: '0' - web_area-a1df8f829: '0' - web_area-a416e6833: '0' + web_area-watcher: web_area-watcher web_area-approver: '0' - web_area-f31530d38: '0' + web_area-editor: '0' web_area-member: '0' - web_area-outsider: '0' transitions: prepare_for_expiration: prepare_for_expiration roles: { } +flags: + notification_opt_in: notification_opt_in author: true revision_author: true site_mail: false diff --git a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_draft_approval_denied.yml b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_draft_approval_denied.yml index 4a6121ba18..0eadd6854b 100644 --- a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_draft_approval_denied.yml +++ b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_draft_approval_denied.yml @@ -8,24 +8,20 @@ third_party_settings: epa_workflow: workflow_process: any id: epa_draft_approval_denied -group_use: false +group_use: true group_type: web_area workflow: epa_default group_roles: - web_area-30cda0a61: '0' - web_area-355bc4eba: '0' - web_area-396316984: '0' - web_area-a1df8f829: '0' - web_area-a416e6833: '0' + web_area-watcher: web_area-watcher web_area-administrator: '0' web_area-approver: '0' web_area-editor: '0' - web_area-f31530d38: '0' web_area-member: '0' - web_area-outsider: '0' transitions: return_to_author: return_to_author roles: { } +flags: + notification_opt_in: notification_opt_in author: true revision_author: true site_mail: false diff --git a/services/drupal/config/sync/core.entity_form_display.media.banner_image.default.yml b/services/drupal/config/sync/core.entity_form_display.media.banner_image.default.yml new file mode 100644 index 0000000000..b1fce0da9f --- /dev/null +++ b/services/drupal/config/sync/core.entity_form_display.media.banner_image.default.yml @@ -0,0 +1,80 @@ +uuid: fb36d2d1-59dd-48b8-97ef-2191dca71196 +langcode: en +status: true +dependencies: + config: + - field.field.media.banner_image.field_banner_image_restricted + - field.field.media.banner_image.field_media_image + - image.style.thumbnail + - media.type.banner_image + module: + - focal_point + - path +id: media.banner_image.default +targetEntityType: media +bundle: banner_image +mode: default +content: + created: + type: datetime_timestamp + weight: 4 + region: content + settings: { } + third_party_settings: { } + field_banner_image_restricted: + type: options_select + weight: 6 + region: content + settings: { } + third_party_settings: { } + field_media_image: + type: image_focal_point + weight: 1 + region: content + settings: + progress_indicator: throbber + preview_image_style: thumbnail + preview_link: true + offsets: '50,50' + third_party_settings: { } + langcode: + type: language_select + weight: 2 + region: content + settings: + include_locked: true + third_party_settings: { } + name: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + path: + type: path + weight: 5 + region: content + settings: { } + third_party_settings: { } + status: + type: boolean_checkbox + weight: 7 + region: content + settings: + display_label: true + third_party_settings: { } + uid: + type: entity_reference_autocomplete + weight: 3 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + entitygroupfield: true + replace_file: true diff --git a/services/drupal/config/sync/core.entity_form_display.media.banner_image.media_library.yml b/services/drupal/config/sync/core.entity_form_display.media.banner_image.media_library.yml new file mode 100644 index 0000000000..ebd2b2b561 --- /dev/null +++ b/services/drupal/config/sync/core.entity_form_display.media.banner_image.media_library.yml @@ -0,0 +1,42 @@ +uuid: 9814a11a-94fa-49aa-92b2-732e4087cbed +langcode: en +status: true +dependencies: + config: + - core.entity_form_mode.media.media_library + - field.field.media.banner_image.field_banner_image_restricted + - field.field.media.banner_image.field_media_image + - image.style.thumbnail + - media.type.banner_image + module: + - focal_point +id: media.banner_image.media_library +targetEntityType: media +bundle: banner_image +mode: media_library +content: + field_banner_image_restricted: + type: options_select + weight: 1 + region: content + settings: { } + third_party_settings: { } + field_media_image: + type: image_focal_point + weight: 0 + region: content + settings: + progress_indicator: throbber + preview_image_style: thumbnail + preview_link: true + offsets: '50,50' + third_party_settings: { } +hidden: + created: true + entitygroupfield: true + langcode: true + name: true + path: true + replace_file: true + status: true + uid: true diff --git a/services/drupal/config/sync/core.entity_form_display.node.event.default.yml b/services/drupal/config/sync/core.entity_form_display.node.event.default.yml index 7c11bfe784..1749705978 100644 --- a/services/drupal/config/sync/core.entity_form_display.node.event.default.yml +++ b/services/drupal/config/sync/core.entity_form_display.node.event.default.yml @@ -24,6 +24,7 @@ dependencies: - field.field.node.event.field_links - field.field.node.event.field_location - field.field.node.event.field_machine_name + - field.field.node.event.field_meta_tags - field.field.node.event.field_page_head - field.field.node.event.field_paragraphs - field.field.node.event.field_publish_date @@ -40,6 +41,7 @@ dependencies: - entitygroupfield - field_group - link + - metatag - paragraphs - shs - smart_date @@ -293,6 +295,13 @@ content: size: 60 placeholder: '' third_party_settings: { } + field_meta_tags: + type: metatag_firehose + weight: 50 + region: content + settings: + sidebar: true + third_party_settings: { } field_page_head: type: string_textarea weight: 49 diff --git a/services/drupal/config/sync/core.entity_form_display.node.faq.default.yml b/services/drupal/config/sync/core.entity_form_display.node.faq.default.yml index c5bc7b5996..a9ad3bf53b 100644 --- a/services/drupal/config/sync/core.entity_form_display.node.faq.default.yml +++ b/services/drupal/config/sync/core.entity_form_display.node.faq.default.yml @@ -16,6 +16,7 @@ dependencies: - field.field.node.faq.field_language - field.field.node.faq.field_last_published - field.field.node.faq.field_machine_name + - field.field.node.faq.field_meta_tags - field.field.node.faq.field_page_head - field.field.node.faq.field_publish_date - field.field.node.faq.field_question @@ -31,6 +32,7 @@ dependencies: - datetime - entitygroupfield - field_group + - metatag - shs - text third_party_settings: @@ -219,6 +221,13 @@ content: size: 60 placeholder: '' third_party_settings: { } + field_meta_tags: + type: metatag_firehose + weight: 50 + region: content + settings: + sidebar: true + third_party_settings: { } field_page_head: type: string_textarea weight: 49 diff --git a/services/drupal/config/sync/core.entity_form_display.node.news_release.default.yml b/services/drupal/config/sync/core.entity_form_display.node.news_release.default.yml index daa37f30ae..e41bab1272 100644 --- a/services/drupal/config/sync/core.entity_form_display.node.news_release.default.yml +++ b/services/drupal/config/sync/core.entity_form_display.node.news_release.default.yml @@ -14,6 +14,7 @@ dependencies: - field.field.node.news_release.field_language - field.field.node.news_release.field_last_published - field.field.node.news_release.field_machine_name + - field.field.node.news_release.field_meta_tags - field.field.node.news_release.field_paragraphs - field.field.node.news_release.field_press_office - field.field.node.news_release.field_press_officers @@ -33,6 +34,7 @@ dependencies: - datetime - entitygroupfield - field_group + - metatag - paragraphs - shs third_party_settings: @@ -175,6 +177,13 @@ content: size: 60 placeholder: '' third_party_settings: { } + field_meta_tags: + type: metatag_firehose + weight: 49 + region: content + settings: + sidebar: true + third_party_settings: { } field_paragraphs: type: paragraphs weight: 6 diff --git a/services/drupal/config/sync/core.entity_form_display.node.page.default.yml b/services/drupal/config/sync/core.entity_form_display.node.page.default.yml index b3065e2f3b..027961706f 100644 --- a/services/drupal/config/sync/core.entity_form_display.node.page.default.yml +++ b/services/drupal/config/sync/core.entity_form_display.node.page.default.yml @@ -14,6 +14,7 @@ dependencies: - field.field.node.page.field_language - field.field.node.page.field_last_published - field.field.node.page.field_machine_name + - field.field.node.page.field_meta_tags - field.field.node.page.field_page_head - field.field.node.page.field_paragraphs - field.field.node.page.field_paragraphs_1 @@ -31,6 +32,7 @@ dependencies: - datetime - entitygroupfield - field_group + - metatag - paragraphs - shs third_party_settings: @@ -199,6 +201,13 @@ content: size: 60 placeholder: '' third_party_settings: { } + field_meta_tags: + type: metatag_firehose + weight: 50 + region: content + settings: + sidebar: true + third_party_settings: { } field_page_head: type: string_textarea weight: 49 diff --git a/services/drupal/config/sync/core.entity_form_display.node.perspective.default.yml b/services/drupal/config/sync/core.entity_form_display.node.perspective.default.yml index f6f7cbe94c..8f60162fb0 100644 --- a/services/drupal/config/sync/core.entity_form_display.node.perspective.default.yml +++ b/services/drupal/config/sync/core.entity_form_display.node.perspective.default.yml @@ -14,6 +14,7 @@ dependencies: - field.field.node.perspective.field_last_published - field.field.node.perspective.field_machine_name - field.field.node.perspective.field_media_image + - field.field.node.perspective.field_meta_tags - field.field.node.perspective.field_page_head - field.field.node.perspective.field_paragraphs - field.field.node.perspective.field_publish_date @@ -32,6 +33,7 @@ dependencies: - entitygroupfield - field_group - media_library + - metatag - paragraphs - shs third_party_settings: @@ -222,6 +224,13 @@ content: settings: media_types: { } third_party_settings: { } + field_meta_tags: + type: metatag_firehose + weight: 27 + region: content + settings: + sidebar: true + third_party_settings: { } field_page_head: type: string_textarea weight: 26 diff --git a/services/drupal/config/sync/core.entity_form_display.node.public_notice.default.yml b/services/drupal/config/sync/core.entity_form_display.node.public_notice.default.yml index a69ea90fc3..3faf4363c7 100644 --- a/services/drupal/config/sync/core.entity_form_display.node.public_notice.default.yml +++ b/services/drupal/config/sync/core.entity_form_display.node.public_notice.default.yml @@ -23,6 +23,7 @@ dependencies: - field.field.node.public_notice.field_last_published - field.field.node.public_notice.field_locations_of_prop_actions - field.field.node.public_notice.field_machine_name + - field.field.node.public_notice.field_meta_tags - field.field.node.public_notice.field_notice_sort_date - field.field.node.public_notice.field_page_head - field.field.node.public_notice.field_permit_number @@ -43,6 +44,7 @@ dependencies: - entitygroupfield - field_group - media_library + - metatag - paragraphs - shs - text @@ -318,6 +320,13 @@ content: size: 60 placeholder: '' third_party_settings: { } + field_meta_tags: + type: metatag_firehose + weight: 50 + region: content + settings: + sidebar: true + third_party_settings: { } field_page_head: type: string_textarea weight: 49 diff --git a/services/drupal/config/sync/core.entity_form_display.node.regulation.default.yml b/services/drupal/config/sync/core.entity_form_display.node.regulation.default.yml index cb4b61f30b..e41f15a149 100644 --- a/services/drupal/config/sync/core.entity_form_display.node.regulation.default.yml +++ b/services/drupal/config/sync/core.entity_form_display.node.regulation.default.yml @@ -21,6 +21,7 @@ dependencies: - field.field.node.regulation.field_last_published - field.field.node.regulation.field_legal_authorities - field.field.node.regulation.field_machine_name + - field.field.node.regulation.field_meta_tags - field.field.node.regulation.field_page_head - field.field.node.regulation.field_publish_date - field.field.node.regulation.field_review_deadline @@ -37,6 +38,7 @@ dependencies: - datetime_range - entitygroupfield - field_group + - metatag - paragraphs - shs - text @@ -300,6 +302,13 @@ content: size: 60 placeholder: '' third_party_settings: { } + field_meta_tags: + type: metatag_firehose + weight: 50 + region: content + settings: + sidebar: true + third_party_settings: { } field_page_head: type: string_textarea weight: 49 diff --git a/services/drupal/config/sync/core.entity_form_display.node.web_area.default.yml b/services/drupal/config/sync/core.entity_form_display.node.web_area.default.yml index e493dbdb12..612a858f2c 100644 --- a/services/drupal/config/sync/core.entity_form_display.node.web_area.default.yml +++ b/services/drupal/config/sync/core.entity_form_display.node.web_area.default.yml @@ -13,6 +13,7 @@ dependencies: - field.field.node.web_area.field_keywords - field.field.node.web_area.field_language - field.field.node.web_area.field_last_published + - field.field.node.web_area.field_meta_tags - field.field.node.web_area.field_page_head - field.field.node.web_area.field_paragraphs - field.field.node.web_area.field_publish_date @@ -28,6 +29,7 @@ dependencies: - datetime - entitygroupfield - field_group + - metatag - paragraphs - shs third_party_settings: @@ -189,6 +191,13 @@ content: region: content settings: { } third_party_settings: { } + field_meta_tags: + type: metatag_firehose + weight: 50 + region: content + settings: + sidebar: true + third_party_settings: { } field_page_head: type: string_textarea weight: 49 diff --git a/services/drupal/config/sync/core.entity_form_display.node.webform.default.yml b/services/drupal/config/sync/core.entity_form_display.node.webform.default.yml index dc79f3a689..50b69524eb 100644 --- a/services/drupal/config/sync/core.entity_form_display.node.webform.default.yml +++ b/services/drupal/config/sync/core.entity_form_display.node.webform.default.yml @@ -11,6 +11,7 @@ dependencies: - field.field.node.webform.field_language - field.field.node.webform.field_last_published - field.field.node.webform.field_machine_name + - field.field.node.webform.field_meta_tags - field.field.node.webform.field_page_head - field.field.node.webform.field_paragraphs - field.field.node.webform.field_publish_date @@ -26,6 +27,7 @@ dependencies: - datetime - entitygroupfield - field_group + - metatag - paragraphs - shs - webform @@ -166,6 +168,13 @@ content: size: 60 placeholder: '' third_party_settings: { } + field_meta_tags: + type: metatag_firehose + weight: 50 + region: content + settings: + sidebar: true + third_party_settings: { } field_page_head: type: string_textarea weight: 49 diff --git a/services/drupal/config/sync/core.entity_form_display.paragraph.banner_slide.default.yml b/services/drupal/config/sync/core.entity_form_display.paragraph.banner_slide.default.yml index 922a98a5b7..f0949676dd 100644 --- a/services/drupal/config/sync/core.entity_form_display.paragraph.banner_slide.default.yml +++ b/services/drupal/config/sync/core.entity_form_display.paragraph.banner_slide.default.yml @@ -3,28 +3,25 @@ langcode: en status: true dependencies: config: + - field.field.paragraph.banner_slide.field_banner_image - field.field.paragraph.banner_slide.field_image - field.field.paragraph.banner_slide.field_text - field.field.paragraph.banner_slide.field_title - - image.style.thumbnail - paragraphs.paragraphs_type.banner_slide module: - - focal_point + - media_library - text id: paragraph.banner_slide.default targetEntityType: paragraph bundle: banner_slide mode: default content: - field_image: - type: image_focal_point + field_banner_image: + type: media_library_widget weight: 2 region: content settings: - progress_indicator: throbber - preview_image_style: thumbnail - preview_link: true - offsets: '50,50' + media_types: { } third_party_settings: { } field_text: type: text_textarea @@ -44,4 +41,5 @@ content: third_party_settings: { } hidden: created: true + field_image: true status: true diff --git a/services/drupal/config/sync/core.entity_view_display.media.audio.media_library.yml b/services/drupal/config/sync/core.entity_view_display.media.audio.media_library.yml index fe89c26f65..4d4b8297c3 100644 --- a/services/drupal/config/sync/core.entity_view_display.media.audio.media_library.yml +++ b/services/drupal/config/sync/core.entity_view_display.media.audio.media_library.yml @@ -13,7 +13,7 @@ dependencies: - image.style.medium - media.type.audio module: - - image + - svg_image id: media.audio.media_library targetEntityType: media bundle: audio @@ -25,6 +25,12 @@ content: settings: image_link: '' image_style: medium + image_loading: + attribute: lazy + svg_attributes: + width: '' + height: '' + svg_render_as_image: true third_party_settings: { } weight: 0 region: content diff --git a/services/drupal/config/sync/core.entity_view_display.media.banner_image.default.yml b/services/drupal/config/sync/core.entity_view_display.media.banner_image.default.yml new file mode 100644 index 0000000000..5265e271ed --- /dev/null +++ b/services/drupal/config/sync/core.entity_view_display.media.banner_image.default.yml @@ -0,0 +1,51 @@ +uuid: 4515ed10-0a3b-4a44-8e46-ffd04c4836ca +langcode: en +status: true +dependencies: + config: + - field.field.media.banner_image.field_banner_image_restricted + - field.field.media.banner_image.field_media_image + - image.style.thumbnail + - media.type.banner_image + module: + - media_inline_embed + - options + - svg_image +third_party_settings: + media_inline_embed: + embed_inline: false +id: media.banner_image.default +targetEntityType: media +bundle: banner_image +mode: default +content: + field_banner_image_restricted: + type: list_default + label: above + settings: { } + third_party_settings: { } + weight: 1 + region: content + field_media_image: + type: image + label: visually_hidden + settings: + image_link: '' + image_style: thumbnail + svg_attributes: + width: null + height: null + svg_render_as_image: true + image_loading: + attribute: lazy + third_party_settings: { } + weight: 0 + region: content +hidden: + created: true + entitygroupfield: true + langcode: true + name: true + search_api_excerpt: true + thumbnail: true + uid: true diff --git a/services/drupal/config/sync/core.entity_view_display.media.banner_image.link_with_metadata.yml b/services/drupal/config/sync/core.entity_view_display.media.banner_image.link_with_metadata.yml new file mode 100644 index 0000000000..3ad914e7ce --- /dev/null +++ b/services/drupal/config/sync/core.entity_view_display.media.banner_image.link_with_metadata.yml @@ -0,0 +1,41 @@ +uuid: 4155eaee-e9c4-4a15-966f-18bffc2402ae +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.media.link_with_metadata + - field.field.media.banner_image.field_banner_image_restricted + - field.field.media.banner_image.field_media_image + - media.type.banner_image + module: + - epa_wysiwyg + - layout_builder + - media_inline_embed +third_party_settings: + media_inline_embed: + embed_inline: false + layout_builder: + enabled: false + allow_custom: false +id: media.banner_image.link_with_metadata +targetEntityType: media +bundle: banner_image +mode: link_with_metadata +content: + field_media_image: + type: epa_media_file_link_formatter + label: hidden + settings: + show_extension: true + third_party_settings: { } + weight: 0 + region: content +hidden: + created: true + entitygroupfield: true + field_banner_image_restricted: true + langcode: true + name: true + search_api_excerpt: true + thumbnail: true + uid: true diff --git a/services/drupal/config/sync/core.entity_view_display.media.banner_image.media_library.yml b/services/drupal/config/sync/core.entity_view_display.media.banner_image.media_library.yml new file mode 100644 index 0000000000..26ea6be2e7 --- /dev/null +++ b/services/drupal/config/sync/core.entity_view_display.media.banner_image.media_library.yml @@ -0,0 +1,41 @@ +uuid: cc542adc-4c27-446c-903a-7f6f3cf67938 +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.media.media_library + - field.field.media.banner_image.field_banner_image_restricted + - field.field.media.banner_image.field_media_image + - image.style.medium + - media.type.banner_image + module: + - svg_image +id: media.banner_image.media_library +targetEntityType: media +bundle: banner_image +mode: media_library +content: + thumbnail: + type: image + label: hidden + settings: + image_link: '' + image_style: medium + svg_attributes: + width: null + height: null + svg_render_as_image: true + image_loading: + attribute: lazy + third_party_settings: { } + weight: 0 + region: content +hidden: + created: true + entitygroupfield: true + field_banner_image_restricted: true + field_media_image: true + langcode: true + name: true + search_api_excerpt: true + uid: true diff --git a/services/drupal/config/sync/core.entity_view_display.media.document.media_library.yml b/services/drupal/config/sync/core.entity_view_display.media.document.media_library.yml index ce2af4d20b..048ba4dcc6 100644 --- a/services/drupal/config/sync/core.entity_view_display.media.document.media_library.yml +++ b/services/drupal/config/sync/core.entity_view_display.media.document.media_library.yml @@ -13,7 +13,7 @@ dependencies: - image.style.medium - media.type.document module: - - image + - svg_image id: media.document.media_library targetEntityType: media bundle: document @@ -25,6 +25,12 @@ content: settings: image_link: '' image_style: medium + image_loading: + attribute: lazy + svg_attributes: + width: '' + height: '' + svg_render_as_image: true third_party_settings: { } weight: 0 region: content diff --git a/services/drupal/config/sync/core.entity_view_display.media.image.default.yml b/services/drupal/config/sync/core.entity_view_display.media.image.default.yml index f47a30369f..673d17999a 100644 --- a/services/drupal/config/sync/core.entity_view_display.media.image.default.yml +++ b/services/drupal/config/sync/core.entity_view_display.media.image.default.yml @@ -11,9 +11,9 @@ dependencies: - image.style.media_library - media.type.image module: - - image - media_inline_embed - options + - svg_image - text third_party_settings: media_inline_embed: @@ -43,6 +43,12 @@ content: settings: image_link: '' image_style: media_library + image_loading: + attribute: lazy + svg_attributes: + width: '' + height: '' + svg_render_as_image: true third_party_settings: { } weight: 1 region: content diff --git a/services/drupal/config/sync/core.entity_view_display.media.image.media_library.yml b/services/drupal/config/sync/core.entity_view_display.media.image.media_library.yml index af4f396e72..4dc7ac4124 100644 --- a/services/drupal/config/sync/core.entity_view_display.media.image.media_library.yml +++ b/services/drupal/config/sync/core.entity_view_display.media.image.media_library.yml @@ -12,7 +12,7 @@ dependencies: - image.style.medium - media.type.image module: - - image + - svg_image _core: default_config_hash: PaGXvzRcL9eII--JV4eCVfObjrNo0l-u1dB_WJtB9ig id: media.image.media_library @@ -26,6 +26,12 @@ content: settings: image_link: '' image_style: medium + image_loading: + attribute: lazy + svg_attributes: + width: '' + height: '' + svg_render_as_image: true third_party_settings: { } weight: 0 region: content diff --git a/services/drupal/config/sync/core.entity_view_display.media.image.original.yml b/services/drupal/config/sync/core.entity_view_display.media.image.original.yml index 2adff3fa9c..a692719ea5 100644 --- a/services/drupal/config/sync/core.entity_view_display.media.image.original.yml +++ b/services/drupal/config/sync/core.entity_view_display.media.image.original.yml @@ -11,9 +11,9 @@ dependencies: - field.field.media.image.field_media_tags - media.type.image module: - - image - layout_builder - media_inline_embed + - svg_image third_party_settings: media_inline_embed: embed_inline: false @@ -31,6 +31,12 @@ content: settings: image_link: '' image_style: '' + image_loading: + attribute: lazy + svg_attributes: + width: '' + height: '' + svg_render_as_image: true third_party_settings: { } weight: 0 region: content diff --git a/services/drupal/config/sync/core.entity_view_display.media.other.media_library.yml b/services/drupal/config/sync/core.entity_view_display.media.other.media_library.yml index 827ef81fa7..c466d44abf 100644 --- a/services/drupal/config/sync/core.entity_view_display.media.other.media_library.yml +++ b/services/drupal/config/sync/core.entity_view_display.media.other.media_library.yml @@ -10,7 +10,7 @@ dependencies: - image.style.medium - media.type.other module: - - image + - svg_image id: media.other.media_library targetEntityType: media bundle: other @@ -22,6 +22,12 @@ content: settings: image_link: '' image_style: medium + image_loading: + attribute: lazy + svg_attributes: + width: '' + height: '' + svg_render_as_image: true third_party_settings: { } weight: 0 region: content diff --git a/services/drupal/config/sync/core.entity_view_display.media.remote_video.media_library.yml b/services/drupal/config/sync/core.entity_view_display.media.remote_video.media_library.yml index 81383c4f59..93765cc356 100644 --- a/services/drupal/config/sync/core.entity_view_display.media.remote_video.media_library.yml +++ b/services/drupal/config/sync/core.entity_view_display.media.remote_video.media_library.yml @@ -12,8 +12,8 @@ dependencies: - image.style.medium - media.type.remote_video module: - - image - media_inline_embed + - svg_image third_party_settings: media_inline_embed: embed_inline: false @@ -30,6 +30,12 @@ content: settings: image_link: '' image_style: medium + image_loading: + attribute: lazy + svg_attributes: + width: '' + height: '' + svg_render_as_image: true third_party_settings: { } weight: 0 region: content diff --git a/services/drupal/config/sync/core.entity_view_display.media.remote_video.thumbnail.yml b/services/drupal/config/sync/core.entity_view_display.media.remote_video.thumbnail.yml index 945602c722..a3b86e6076 100644 --- a/services/drupal/config/sync/core.entity_view_display.media.remote_video.thumbnail.yml +++ b/services/drupal/config/sync/core.entity_view_display.media.remote_video.thumbnail.yml @@ -12,10 +12,10 @@ dependencies: - image.style.thumbnail - media.type.remote_video module: - - image - layout_builder - linked_field - media_inline_embed + - svg_image third_party_settings: layout_builder: enabled: false @@ -33,6 +33,12 @@ content: settings: image_link: '' image_style: thumbnail + image_loading: + attribute: lazy + svg_attributes: + width: '' + height: '' + svg_render_as_image: true third_party_settings: linked_field: linked: '1' diff --git a/services/drupal/config/sync/core.entity_view_display.node.event.default.yml b/services/drupal/config/sync/core.entity_view_display.node.event.default.yml index 379743854c..93267212dd 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.event.default.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.event.default.yml @@ -24,6 +24,7 @@ dependencies: - field.field.node.event.field_links - field.field.node.event.field_location - field.field.node.event.field_machine_name + - field.field.node.event.field_meta_tags - field.field.node.event.field_page_head - field.field.node.event.field_paragraphs - field.field.node.event.field_publish_date @@ -38,6 +39,7 @@ dependencies: - entity_reference_revisions - epa_core - link + - metatag - user id: node.event.default targetEntityType: node @@ -121,6 +123,13 @@ content: third_party_settings: { } weight: 1 region: content + field_meta_tags: + type: metatag_empty_formatter + label: above + settings: { } + third_party_settings: { } + weight: 8 + region: content field_paragraphs: type: entity_reference_revisions_entity_view label: above diff --git a/services/drupal/config/sync/core.entity_view_display.node.event.link.yml b/services/drupal/config/sync/core.entity_view_display.node.event.link.yml index 826de3adbe..fb8d05a209 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.event.link.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.event.link.yml @@ -25,6 +25,7 @@ dependencies: - field.field.node.event.field_links - field.field.node.event.field_location - field.field.node.event.field_machine_name + - field.field.node.event.field_meta_tags - field.field.node.event.field_page_head - field.field.node.event.field_paragraphs - field.field.node.event.field_publish_date @@ -69,6 +70,7 @@ hidden: field_links: true field_location: true field_machine_name: true + field_meta_tags: true field_page_head: true field_paragraphs: true field_publish_date: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.event.search_index.yml b/services/drupal/config/sync/core.entity_view_display.node.event.search_index.yml index 3a0ace7112..7647190dac 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.event.search_index.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.event.search_index.yml @@ -25,6 +25,7 @@ dependencies: - field.field.node.event.field_links - field.field.node.event.field_location - field.field.node.event.field_machine_name + - field.field.node.event.field_meta_tags - field.field.node.event.field_page_head - field.field.node.event.field_paragraphs - field.field.node.event.field_publish_date @@ -100,6 +101,7 @@ hidden: field_last_published: true field_links: true field_machine_name: true + field_meta_tags: true field_page_head: true field_publish_date: true field_review_deadline: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.event.teaser.yml b/services/drupal/config/sync/core.entity_view_display.node.event.teaser.yml index 6cdfd82ee7..267aadbb10 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.event.teaser.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.event.teaser.yml @@ -25,6 +25,7 @@ dependencies: - field.field.node.event.field_links - field.field.node.event.field_location - field.field.node.event.field_machine_name + - field.field.node.event.field_meta_tags - field.field.node.event.field_page_head - field.field.node.event.field_paragraphs - field.field.node.event.field_publish_date @@ -86,6 +87,7 @@ hidden: field_links: true field_location: true field_machine_name: true + field_meta_tags: true field_page_head: true field_paragraphs: true field_publish_date: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.faq.default.yml b/services/drupal/config/sync/core.entity_view_display.node.faq.default.yml index 99a8fd91f0..59bb88f1e9 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.faq.default.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.faq.default.yml @@ -16,6 +16,7 @@ dependencies: - field.field.node.faq.field_language - field.field.node.faq.field_last_published - field.field.node.faq.field_machine_name + - field.field.node.faq.field_meta_tags - field.field.node.faq.field_page_head - field.field.node.faq.field_publish_date - field.field.node.faq.field_question @@ -26,6 +27,7 @@ dependencies: - field.field.node.faq.field_type - node.type.faq module: + - metatag - text - user id: node.faq.default @@ -45,6 +47,13 @@ content: third_party_settings: { } weight: 0 region: content + field_meta_tags: + type: metatag_empty_formatter + label: above + settings: { } + third_party_settings: { } + weight: 3 + region: content field_question: type: basic_string label: hidden diff --git a/services/drupal/config/sync/core.entity_view_display.node.faq.full.yml b/services/drupal/config/sync/core.entity_view_display.node.faq.full.yml index 77e6d3a175..db4c7860a4 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.faq.full.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.faq.full.yml @@ -17,6 +17,7 @@ dependencies: - field.field.node.faq.field_language - field.field.node.faq.field_last_published - field.field.node.faq.field_machine_name + - field.field.node.faq.field_meta_tags - field.field.node.faq.field_page_head - field.field.node.faq.field_publish_date - field.field.node.faq.field_question @@ -81,6 +82,7 @@ hidden: field_language: true field_last_published: true field_machine_name: true + field_meta_tags: true field_page_head: true field_publish_date: true field_review_deadline: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.faq.link.yml b/services/drupal/config/sync/core.entity_view_display.node.faq.link.yml index 7efa6e55a3..53e3f82f35 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.faq.link.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.faq.link.yml @@ -17,6 +17,7 @@ dependencies: - field.field.node.faq.field_language - field.field.node.faq.field_last_published - field.field.node.faq.field_machine_name + - field.field.node.faq.field_meta_tags - field.field.node.faq.field_page_head - field.field.node.faq.field_publish_date - field.field.node.faq.field_question @@ -66,6 +67,7 @@ hidden: field_language: true field_last_published: true field_machine_name: true + field_meta_tags: true field_page_head: true field_publish_date: true field_related_questions: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.faq.search_index.yml b/services/drupal/config/sync/core.entity_view_display.node.faq.search_index.yml index b0e85c7e4e..6e597ade74 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.faq.search_index.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.faq.search_index.yml @@ -17,6 +17,7 @@ dependencies: - field.field.node.faq.field_language - field.field.node.faq.field_last_published - field.field.node.faq.field_machine_name + - field.field.node.faq.field_meta_tags - field.field.node.faq.field_page_head - field.field.node.faq.field_publish_date - field.field.node.faq.field_question @@ -73,6 +74,7 @@ hidden: field_language: true field_last_published: true field_machine_name: true + field_meta_tags: true field_page_head: true field_publish_date: true field_related_questions: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.faq.teaser.yml b/services/drupal/config/sync/core.entity_view_display.node.faq.teaser.yml index 143f4266ef..468316a587 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.faq.teaser.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.faq.teaser.yml @@ -17,6 +17,7 @@ dependencies: - field.field.node.faq.field_language - field.field.node.faq.field_last_published - field.field.node.faq.field_machine_name + - field.field.node.faq.field_meta_tags - field.field.node.faq.field_page_head - field.field.node.faq.field_publish_date - field.field.node.faq.field_question @@ -84,6 +85,7 @@ hidden: field_keywords: true field_language: true field_machine_name: true + field_meta_tags: true field_page_head: true field_publish_date: true field_related_questions: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.faq.token.yml b/services/drupal/config/sync/core.entity_view_display.node.faq.token.yml index 002a25b948..a3913032e1 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.faq.token.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.faq.token.yml @@ -17,6 +17,7 @@ dependencies: - field.field.node.faq.field_language - field.field.node.faq.field_last_published - field.field.node.faq.field_machine_name + - field.field.node.faq.field_meta_tags - field.field.node.faq.field_page_head - field.field.node.faq.field_publish_date - field.field.node.faq.field_question @@ -220,6 +221,7 @@ content: hidden: content_moderation_control: true entitygroupfield: true + field_meta_tags: true field_scheduled_transition: true field_search_text: true search_api_excerpt: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.news_release.default.yml b/services/drupal/config/sync/core.entity_view_display.node.news_release.default.yml index 2712e81cb0..e00afa63c5 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.news_release.default.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.news_release.default.yml @@ -14,6 +14,7 @@ dependencies: - field.field.node.news_release.field_language - field.field.node.news_release.field_last_published - field.field.node.news_release.field_machine_name + - field.field.node.news_release.field_meta_tags - field.field.node.news_release.field_paragraphs - field.field.node.news_release.field_press_office - field.field.node.news_release.field_press_officers @@ -30,6 +31,7 @@ dependencies: - datetime - entity_reference_revisions - epa_core + - metatag - user id: node.news_release.default targetEntityType: node @@ -41,6 +43,13 @@ content: third_party_settings: { } weight: 100 region: content + field_meta_tags: + type: metatag_empty_formatter + label: above + settings: { } + third_party_settings: { } + weight: 101 + region: content field_paragraphs: type: entity_reference_revisions_entity_view label: hidden diff --git a/services/drupal/config/sync/core.entity_view_display.node.news_release.full.yml b/services/drupal/config/sync/core.entity_view_display.node.news_release.full.yml index 442806d688..5b2329fab8 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.news_release.full.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.news_release.full.yml @@ -15,6 +15,7 @@ dependencies: - field.field.node.news_release.field_language - field.field.node.news_release.field_last_published - field.field.node.news_release.field_machine_name + - field.field.node.news_release.field_meta_tags - field.field.node.news_release.field_paragraphs - field.field.node.news_release.field_press_office - field.field.node.news_release.field_press_officers @@ -104,6 +105,7 @@ hidden: field_language: true field_last_published: true field_machine_name: true + field_meta_tags: true field_publish_date: true field_review_deadline: true field_scheduled_transition: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.news_release.link.yml b/services/drupal/config/sync/core.entity_view_display.node.news_release.link.yml index ee9d8ab845..1f14adfbf2 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.news_release.link.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.news_release.link.yml @@ -15,6 +15,7 @@ dependencies: - field.field.node.news_release.field_language - field.field.node.news_release.field_last_published - field.field.node.news_release.field_machine_name + - field.field.node.news_release.field_meta_tags - field.field.node.news_release.field_paragraphs - field.field.node.news_release.field_press_office - field.field.node.news_release.field_press_officers @@ -58,6 +59,7 @@ hidden: field_language: true field_last_published: true field_machine_name: true + field_meta_tags: true field_paragraphs: true field_press_office: true field_press_officers: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.news_release.search_index.yml b/services/drupal/config/sync/core.entity_view_display.node.news_release.search_index.yml index 8f29f353b8..60fc131ad0 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.news_release.search_index.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.news_release.search_index.yml @@ -15,6 +15,7 @@ dependencies: - field.field.node.news_release.field_language - field.field.node.news_release.field_last_published - field.field.node.news_release.field_machine_name + - field.field.node.news_release.field_meta_tags - field.field.node.news_release.field_paragraphs - field.field.node.news_release.field_press_office - field.field.node.news_release.field_press_officers @@ -68,6 +69,7 @@ hidden: field_language: true field_last_published: true field_machine_name: true + field_meta_tags: true field_press_office: true field_press_officers: true field_publish_date: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.news_release.teaser.yml b/services/drupal/config/sync/core.entity_view_display.node.news_release.teaser.yml index 8ae12a872f..b6b50f8417 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.news_release.teaser.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.news_release.teaser.yml @@ -15,6 +15,7 @@ dependencies: - field.field.node.news_release.field_language - field.field.node.news_release.field_last_published - field.field.node.news_release.field_machine_name + - field.field.node.news_release.field_meta_tags - field.field.node.news_release.field_paragraphs - field.field.node.news_release.field_press_office - field.field.node.news_release.field_press_officers @@ -72,6 +73,7 @@ hidden: field_language: true field_last_published: true field_machine_name: true + field_meta_tags: true field_paragraphs: true field_press_office: true field_press_officers: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.news_release.token.yml b/services/drupal/config/sync/core.entity_view_display.node.news_release.token.yml index 832fdc9c6b..7e4c245f22 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.news_release.token.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.news_release.token.yml @@ -15,6 +15,7 @@ dependencies: - field.field.node.news_release.field_language - field.field.node.news_release.field_last_published - field.field.node.news_release.field_machine_name + - field.field.node.news_release.field_meta_tags - field.field.node.news_release.field_paragraphs - field.field.node.news_release.field_press_office - field.field.node.news_release.field_press_officers @@ -240,6 +241,7 @@ content: hidden: content_moderation_control: true entitygroupfield: true + field_meta_tags: true field_scheduled_transition: true field_search_text: true links: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.page.default.yml b/services/drupal/config/sync/core.entity_view_display.node.page.default.yml index d74ba7b223..1dfc423771 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.page.default.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.page.default.yml @@ -14,6 +14,7 @@ dependencies: - field.field.node.page.field_language - field.field.node.page.field_last_published - field.field.node.page.field_machine_name + - field.field.node.page.field_meta_tags - field.field.node.page.field_page_head - field.field.node.page.field_paragraphs - field.field.node.page.field_paragraphs_1 @@ -31,6 +32,7 @@ dependencies: - epa_layouts - layout_builder - layout_builder_restrictions + - metatag - options - scheduled_publish - user @@ -109,6 +111,21 @@ third_party_settings: token: '' weight: 0 additional: { } + f102bc4c-49c8-4113-baed-7848d38da425: + uuid: f102bc4c-49c8-4113-baed-7848d38da425 + region: main + configuration: + id: 'field_block:node:page:field_meta_tags' + label_display: '0' + context_mapping: + entity: layout_builder.entity + formatter: + type: metatag_empty_formatter + label: above + settings: { } + third_party_settings: { } + weight: 1 + additional: { } third_party_settings: { } layout_builder_restrictions: allowed_block_categories: @@ -132,7 +149,12 @@ third_party_settings: - Webform - core entity_view_mode_restriction: - allowed_layouts: { } + allowed_layouts: + - epa_one_column + - epa_one_column_sidebar + - epa_two_column + - epa_three_column + - epa_four_column blacklisted_blocks: { } whitelisted_blocks: 'Chaos Tools': { } @@ -257,6 +279,13 @@ content: third_party_settings: { } weight: 127 region: content + field_meta_tags: + type: metatag_empty_formatter + label: above + settings: { } + third_party_settings: { } + weight: 140 + region: main field_page_head: type: basic_string label: above diff --git a/services/drupal/config/sync/core.entity_view_display.node.page.link.yml b/services/drupal/config/sync/core.entity_view_display.node.page.link.yml index 25017b0d21..b79e9627a6 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.page.link.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.page.link.yml @@ -15,6 +15,7 @@ dependencies: - field.field.node.page.field_language - field.field.node.page.field_last_published - field.field.node.page.field_machine_name + - field.field.node.page.field_meta_tags - field.field.node.page.field_page_head - field.field.node.page.field_paragraphs - field.field.node.page.field_paragraphs_1 @@ -97,6 +98,7 @@ hidden: field_language: true field_last_published: true field_machine_name: true + field_meta_tags: true field_page_head: true field_paragraphs: true field_paragraphs_1: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.page.search_index.yml b/services/drupal/config/sync/core.entity_view_display.node.page.search_index.yml index e1083454b8..3d89538ac7 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.page.search_index.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.page.search_index.yml @@ -15,6 +15,7 @@ dependencies: - field.field.node.page.field_language - field.field.node.page.field_last_published - field.field.node.page.field_machine_name + - field.field.node.page.field_meta_tags - field.field.node.page.field_page_head - field.field.node.page.field_paragraphs - field.field.node.page.field_paragraphs_1 @@ -116,6 +117,7 @@ hidden: field_language: true field_last_published: true field_machine_name: true + field_meta_tags: true field_page_head: true field_publish_date: true field_review_deadline: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.page.teaser.yml b/services/drupal/config/sync/core.entity_view_display.node.page.teaser.yml index bd079bd29b..e712c305e4 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.page.teaser.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.page.teaser.yml @@ -15,6 +15,7 @@ dependencies: - field.field.node.page.field_language - field.field.node.page.field_last_published - field.field.node.page.field_machine_name + - field.field.node.page.field_meta_tags - field.field.node.page.field_page_head - field.field.node.page.field_paragraphs - field.field.node.page.field_paragraphs_1 @@ -53,6 +54,7 @@ hidden: field_language: true field_last_published: true field_machine_name: true + field_meta_tags: true field_page_head: true field_paragraphs: true field_paragraphs_1: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.page.token.yml b/services/drupal/config/sync/core.entity_view_display.node.page.token.yml index 8f0088ad5d..0f41a05516 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.page.token.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.page.token.yml @@ -15,6 +15,7 @@ dependencies: - field.field.node.page.field_language - field.field.node.page.field_last_published - field.field.node.page.field_machine_name + - field.field.node.page.field_meta_tags - field.field.node.page.field_page_head - field.field.node.page.field_paragraphs - field.field.node.page.field_paragraphs_1 @@ -223,6 +224,7 @@ content: region: content hidden: content_moderation_control: true + field_meta_tags: true field_search_text: true langcode: true layout_builder__layout: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.perspective.default.yml b/services/drupal/config/sync/core.entity_view_display.node.perspective.default.yml index 0056b3b685..2065419a0b 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.perspective.default.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.perspective.default.yml @@ -14,6 +14,7 @@ dependencies: - field.field.node.perspective.field_last_published - field.field.node.perspective.field_machine_name - field.field.node.perspective.field_media_image + - field.field.node.perspective.field_meta_tags - field.field.node.perspective.field_page_head - field.field.node.perspective.field_paragraphs - field.field.node.perspective.field_publish_date @@ -32,6 +33,7 @@ dependencies: - layout_builder - layout_builder_restrictions - layout_discovery + - metatag - options - user third_party_settings: @@ -170,6 +172,21 @@ third_party_settings: context_mapping: { } weight: 9 additional: { } + 86b89760-2e82-43b8-ac1e-4b6ad7e6489f: + uuid: 86b89760-2e82-43b8-ac1e-4b6ad7e6489f + region: content + configuration: + id: 'field_block:node:perspective:field_meta_tags' + label_display: '0' + context_mapping: + entity: layout_builder.entity + formatter: + type: metatag_empty_formatter + label: above + settings: { } + third_party_settings: { } + weight: 10 + additional: { } third_party_settings: { } layout_builder_restrictions: allowed_block_categories: { } @@ -271,6 +288,13 @@ content: third_party_settings: { } weight: 13 region: content + field_meta_tags: + type: metatag_empty_formatter + label: above + settings: { } + third_party_settings: { } + weight: 22 + region: content field_page_head: type: basic_string label: above diff --git a/services/drupal/config/sync/core.entity_view_display.node.perspective.link.yml b/services/drupal/config/sync/core.entity_view_display.node.perspective.link.yml index cdd7e88444..1a717dabf8 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.perspective.link.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.perspective.link.yml @@ -15,6 +15,7 @@ dependencies: - field.field.node.perspective.field_last_published - field.field.node.perspective.field_machine_name - field.field.node.perspective.field_media_image + - field.field.node.perspective.field_meta_tags - field.field.node.perspective.field_page_head - field.field.node.perspective.field_paragraphs - field.field.node.perspective.field_publish_date @@ -51,6 +52,7 @@ hidden: field_last_published: true field_machine_name: true field_media_image: true + field_meta_tags: true field_page_head: true field_paragraphs: true field_publish_date: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.perspective.search_index.yml b/services/drupal/config/sync/core.entity_view_display.node.perspective.search_index.yml index 98e49551fb..ab314fa7f2 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.perspective.search_index.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.perspective.search_index.yml @@ -15,6 +15,7 @@ dependencies: - field.field.node.perspective.field_last_published - field.field.node.perspective.field_machine_name - field.field.node.perspective.field_media_image + - field.field.node.perspective.field_meta_tags - field.field.node.perspective.field_page_head - field.field.node.perspective.field_paragraphs - field.field.node.perspective.field_publish_date @@ -61,6 +62,7 @@ hidden: field_last_published: true field_machine_name: true field_media_image: true + field_meta_tags: true field_page_head: true field_publish_date: true field_publisher: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.perspective.teaser.yml b/services/drupal/config/sync/core.entity_view_display.node.perspective.teaser.yml index 1866d02ad4..bd0b857448 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.perspective.teaser.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.perspective.teaser.yml @@ -15,6 +15,7 @@ dependencies: - field.field.node.perspective.field_last_published - field.field.node.perspective.field_machine_name - field.field.node.perspective.field_media_image + - field.field.node.perspective.field_meta_tags - field.field.node.perspective.field_page_head - field.field.node.perspective.field_paragraphs - field.field.node.perspective.field_publish_date @@ -78,6 +79,7 @@ hidden: field_language: true field_last_published: true field_machine_name: true + field_meta_tags: true field_page_head: true field_paragraphs: true field_publish_date: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.perspective.token.yml b/services/drupal/config/sync/core.entity_view_display.node.perspective.token.yml index be88b20f40..57b58332a9 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.perspective.token.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.perspective.token.yml @@ -15,6 +15,7 @@ dependencies: - field.field.node.perspective.field_last_published - field.field.node.perspective.field_machine_name - field.field.node.perspective.field_media_image + - field.field.node.perspective.field_meta_tags - field.field.node.perspective.field_page_head - field.field.node.perspective.field_paragraphs - field.field.node.perspective.field_publish_date @@ -208,6 +209,7 @@ content: hidden: content_moderation_control: true field_author_names: true + field_meta_tags: true field_search_text: true links: true search_api_excerpt: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.public_notice.default.yml b/services/drupal/config/sync/core.entity_view_display.node.public_notice.default.yml index 9617fe8af7..bb37cfcb10 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.public_notice.default.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.public_notice.default.yml @@ -23,6 +23,7 @@ dependencies: - field.field.node.public_notice.field_last_published - field.field.node.public_notice.field_locations_of_prop_actions - field.field.node.public_notice.field_machine_name + - field.field.node.public_notice.field_meta_tags - field.field.node.public_notice.field_notice_sort_date - field.field.node.public_notice.field_page_head - field.field.node.public_notice.field_permit_number @@ -39,6 +40,7 @@ dependencies: module: - datetime - entity_reference_revisions + - metatag - text - user id: node.public_notice.default @@ -101,6 +103,13 @@ content: third_party_settings: { } weight: 100 region: content + field_meta_tags: + type: metatag_empty_formatter + label: above + settings: { } + third_party_settings: { } + weight: 101 + region: content field_permit_number: type: string label: inline diff --git a/services/drupal/config/sync/core.entity_view_display.node.public_notice.full.yml b/services/drupal/config/sync/core.entity_view_display.node.public_notice.full.yml index 65103a6d18..afb84e7bee 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.public_notice.full.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.public_notice.full.yml @@ -24,6 +24,7 @@ dependencies: - field.field.node.public_notice.field_last_published - field.field.node.public_notice.field_locations_of_prop_actions - field.field.node.public_notice.field_machine_name + - field.field.node.public_notice.field_meta_tags - field.field.node.public_notice.field_notice_sort_date - field.field.node.public_notice.field_page_head - field.field.node.public_notice.field_permit_number @@ -174,6 +175,7 @@ hidden: field_last_published: true field_locations_of_prop_actions: true field_machine_name: true + field_meta_tags: true field_page_head: true field_programs_or_statutes: true field_publish_date: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.public_notice.link.yml b/services/drupal/config/sync/core.entity_view_display.node.public_notice.link.yml index 81ab1434c3..347d701f42 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.public_notice.link.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.public_notice.link.yml @@ -24,6 +24,7 @@ dependencies: - field.field.node.public_notice.field_last_published - field.field.node.public_notice.field_locations_of_prop_actions - field.field.node.public_notice.field_machine_name + - field.field.node.public_notice.field_meta_tags - field.field.node.public_notice.field_notice_sort_date - field.field.node.public_notice.field_page_head - field.field.node.public_notice.field_permit_number @@ -77,6 +78,7 @@ hidden: field_last_published: true field_locations_of_prop_actions: true field_machine_name: true + field_meta_tags: true field_notice_sort_date: true field_page_head: true field_permit_number: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.public_notice.search_index.yml b/services/drupal/config/sync/core.entity_view_display.node.public_notice.search_index.yml index 00c9230495..cc506a8aa4 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.public_notice.search_index.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.public_notice.search_index.yml @@ -24,6 +24,7 @@ dependencies: - field.field.node.public_notice.field_last_published - field.field.node.public_notice.field_locations_of_prop_actions - field.field.node.public_notice.field_machine_name + - field.field.node.public_notice.field_meta_tags - field.field.node.public_notice.field_notice_sort_date - field.field.node.public_notice.field_page_head - field.field.node.public_notice.field_permit_number @@ -132,6 +133,7 @@ hidden: field_last_published: true field_locations_of_prop_actions: true field_machine_name: true + field_meta_tags: true field_notice_sort_date: true field_page_head: true field_programs_or_statutes: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.public_notice.teaser.yml b/services/drupal/config/sync/core.entity_view_display.node.public_notice.teaser.yml index 6baec7ecd8..350a4876ff 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.public_notice.teaser.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.public_notice.teaser.yml @@ -24,6 +24,7 @@ dependencies: - field.field.node.public_notice.field_last_published - field.field.node.public_notice.field_locations_of_prop_actions - field.field.node.public_notice.field_machine_name + - field.field.node.public_notice.field_meta_tags - field.field.node.public_notice.field_notice_sort_date - field.field.node.public_notice.field_page_head - field.field.node.public_notice.field_permit_number @@ -89,6 +90,7 @@ hidden: field_last_published: true field_locations_of_prop_actions: true field_machine_name: true + field_meta_tags: true field_notice_sort_date: true field_page_head: true field_permit_number: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.public_notice.token.yml b/services/drupal/config/sync/core.entity_view_display.node.public_notice.token.yml index 95dc528010..f324805941 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.public_notice.token.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.public_notice.token.yml @@ -24,6 +24,7 @@ dependencies: - field.field.node.public_notice.field_last_published - field.field.node.public_notice.field_locations_of_prop_actions - field.field.node.public_notice.field_machine_name + - field.field.node.public_notice.field_meta_tags - field.field.node.public_notice.field_notice_sort_date - field.field.node.public_notice.field_page_head - field.field.node.public_notice.field_permit_number @@ -331,6 +332,7 @@ content: hidden: content_moderation_control: true entitygroupfield: true + field_meta_tags: true field_scheduled_transition: true field_search_text: true links: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.regulation.default.yml b/services/drupal/config/sync/core.entity_view_display.node.regulation.default.yml index d38e0772ad..569e330bf6 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.regulation.default.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.regulation.default.yml @@ -21,6 +21,7 @@ dependencies: - field.field.node.regulation.field_last_published - field.field.node.regulation.field_legal_authorities - field.field.node.regulation.field_machine_name + - field.field.node.regulation.field_meta_tags - field.field.node.regulation.field_page_head - field.field.node.regulation.field_publish_date - field.field.node.regulation.field_review_deadline @@ -33,6 +34,7 @@ dependencies: module: - datetime_range - entity_reference_revisions + - metatag - text - user id: node.regulation.default @@ -105,6 +107,13 @@ content: third_party_settings: { } weight: 100 region: content + field_meta_tags: + type: metatag_empty_formatter + label: above + settings: { } + third_party_settings: { } + weight: 101 + region: content field_rule_history: type: text_default label: above diff --git a/services/drupal/config/sync/core.entity_view_display.node.regulation.full.yml b/services/drupal/config/sync/core.entity_view_display.node.regulation.full.yml index 03d644ba2f..989c1e9e7e 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.regulation.full.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.regulation.full.yml @@ -22,6 +22,7 @@ dependencies: - field.field.node.regulation.field_last_published - field.field.node.regulation.field_legal_authorities - field.field.node.regulation.field_machine_name + - field.field.node.regulation.field_meta_tags - field.field.node.regulation.field_page_head - field.field.node.regulation.field_publish_date - field.field.node.regulation.field_review_deadline @@ -139,6 +140,7 @@ hidden: field_language: true field_last_published: true field_machine_name: true + field_meta_tags: true field_page_head: true field_publish_date: true field_review_deadline: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.regulation.link.yml b/services/drupal/config/sync/core.entity_view_display.node.regulation.link.yml index eed04ab9f2..29506a3496 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.regulation.link.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.regulation.link.yml @@ -22,6 +22,7 @@ dependencies: - field.field.node.regulation.field_last_published - field.field.node.regulation.field_legal_authorities - field.field.node.regulation.field_machine_name + - field.field.node.regulation.field_meta_tags - field.field.node.regulation.field_page_head - field.field.node.regulation.field_publish_date - field.field.node.regulation.field_review_deadline @@ -69,6 +70,7 @@ hidden: field_last_published: true field_legal_authorities: true field_machine_name: true + field_meta_tags: true field_page_head: true field_publish_date: true field_review_deadline: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.regulation.search_index.yml b/services/drupal/config/sync/core.entity_view_display.node.regulation.search_index.yml index c1fddfa112..23dcbb8e41 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.regulation.search_index.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.regulation.search_index.yml @@ -22,6 +22,7 @@ dependencies: - field.field.node.regulation.field_last_published - field.field.node.regulation.field_legal_authorities - field.field.node.regulation.field_machine_name + - field.field.node.regulation.field_meta_tags - field.field.node.regulation.field_page_head - field.field.node.regulation.field_publish_date - field.field.node.regulation.field_review_deadline @@ -129,6 +130,7 @@ hidden: field_language: true field_last_published: true field_machine_name: true + field_meta_tags: true field_page_head: true field_publish_date: true field_review_deadline: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.regulation.teaser.yml b/services/drupal/config/sync/core.entity_view_display.node.regulation.teaser.yml index a6d55f1fda..92ca549ee9 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.regulation.teaser.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.regulation.teaser.yml @@ -22,6 +22,7 @@ dependencies: - field.field.node.regulation.field_last_published - field.field.node.regulation.field_legal_authorities - field.field.node.regulation.field_machine_name + - field.field.node.regulation.field_meta_tags - field.field.node.regulation.field_page_head - field.field.node.regulation.field_publish_date - field.field.node.regulation.field_review_deadline @@ -65,6 +66,7 @@ hidden: field_last_published: true field_legal_authorities: true field_machine_name: true + field_meta_tags: true field_page_head: true field_publish_date: true field_review_deadline: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.web_area.default.yml b/services/drupal/config/sync/core.entity_view_display.node.web_area.default.yml index c3eebac3db..7788e219a7 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.web_area.default.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.web_area.default.yml @@ -13,6 +13,7 @@ dependencies: - field.field.node.web_area.field_keywords - field.field.node.web_area.field_language - field.field.node.web_area.field_last_published + - field.field.node.web_area.field_meta_tags - field.field.node.web_area.field_page_head - field.field.node.web_area.field_paragraphs - field.field.node.web_area.field_publish_date @@ -28,6 +29,7 @@ dependencies: - epa_layouts - layout_builder - layout_builder_restrictions + - metatag - options - scheduled_publish - text @@ -75,6 +77,21 @@ third_party_settings: token: '' weight: 0 additional: { } + 4908b795-23aa-4ee8-8a52-dce89dfcd636: + uuid: 4908b795-23aa-4ee8-8a52-dce89dfcd636 + region: main + configuration: + id: 'field_block:node:web_area:field_meta_tags' + label_display: '0' + context_mapping: + entity: layout_builder.entity + formatter: + type: metatag_empty_formatter + label: above + settings: { } + third_party_settings: { } + weight: 1 + additional: { } third_party_settings: { } layout_builder_restrictions: allowed_block_categories: @@ -98,7 +115,12 @@ third_party_settings: - Webform - core entity_view_mode_restriction: - allowed_layouts: { } + allowed_layouts: + - epa_one_column + - epa_one_column_sidebar + - epa_two_column + - epa_three_column + - epa_four_column blacklisted_blocks: { } whitelisted_blocks: 'Chaos Tools': { } @@ -198,6 +220,13 @@ content: third_party_settings: { } weight: 134 region: main + field_meta_tags: + type: metatag_empty_formatter + label: above + settings: { } + third_party_settings: { } + weight: 136 + region: main field_page_head: type: basic_string label: above diff --git a/services/drupal/config/sync/core.entity_view_display.node.web_area.full.yml b/services/drupal/config/sync/core.entity_view_display.node.web_area.full.yml index 449474fcac..b35e1e2f18 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.web_area.full.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.web_area.full.yml @@ -14,6 +14,7 @@ dependencies: - field.field.node.web_area.field_keywords - field.field.node.web_area.field_language - field.field.node.web_area.field_last_published + - field.field.node.web_area.field_meta_tags - field.field.node.web_area.field_page_head - field.field.node.web_area.field_paragraphs - field.field.node.web_area.field_publish_date @@ -210,6 +211,7 @@ hidden: field_aside_block: true field_banner: true field_last_published: true + field_meta_tags: true field_search_text: true langcode: true layout_builder__layout: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.web_area.link.yml b/services/drupal/config/sync/core.entity_view_display.node.web_area.link.yml index 6e92992234..168b0e008e 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.web_area.link.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.web_area.link.yml @@ -14,6 +14,7 @@ dependencies: - field.field.node.web_area.field_keywords - field.field.node.web_area.field_language - field.field.node.web_area.field_last_published + - field.field.node.web_area.field_meta_tags - field.field.node.web_area.field_page_head - field.field.node.web_area.field_paragraphs - field.field.node.web_area.field_publish_date @@ -87,6 +88,7 @@ hidden: field_keywords: true field_language: true field_last_published: true + field_meta_tags: true field_page_head: true field_paragraphs: true field_publish_date: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.web_area.search_index.yml b/services/drupal/config/sync/core.entity_view_display.node.web_area.search_index.yml index 6646e3bb04..5bf1227e9b 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.web_area.search_index.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.web_area.search_index.yml @@ -14,6 +14,7 @@ dependencies: - field.field.node.web_area.field_keywords - field.field.node.web_area.field_language - field.field.node.web_area.field_last_published + - field.field.node.web_area.field_meta_tags - field.field.node.web_area.field_page_head - field.field.node.web_area.field_paragraphs - field.field.node.web_area.field_publish_date @@ -105,6 +106,7 @@ hidden: field_keywords: true field_language: true field_last_published: true + field_meta_tags: true field_page_head: true field_publish_date: true field_review_deadline: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.web_area.teaser.yml b/services/drupal/config/sync/core.entity_view_display.node.web_area.teaser.yml index bf6e3c7b34..a847b30074 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.web_area.teaser.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.web_area.teaser.yml @@ -14,6 +14,7 @@ dependencies: - field.field.node.web_area.field_keywords - field.field.node.web_area.field_language - field.field.node.web_area.field_last_published + - field.field.node.web_area.field_meta_tags - field.field.node.web_area.field_page_head - field.field.node.web_area.field_paragraphs - field.field.node.web_area.field_publish_date @@ -50,6 +51,7 @@ hidden: field_keywords: true field_language: true field_last_published: true + field_meta_tags: true field_page_head: true field_paragraphs: true field_publish_date: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.web_area.token.yml b/services/drupal/config/sync/core.entity_view_display.node.web_area.token.yml index e771bad929..224283452b 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.web_area.token.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.web_area.token.yml @@ -14,6 +14,7 @@ dependencies: - field.field.node.web_area.field_keywords - field.field.node.web_area.field_language - field.field.node.web_area.field_last_published + - field.field.node.web_area.field_meta_tags - field.field.node.web_area.field_page_head - field.field.node.web_area.field_paragraphs - field.field.node.web_area.field_publish_date @@ -198,6 +199,7 @@ content: hidden: content_moderation_control: true entitygroupfield: true + field_meta_tags: true field_search_text: true layout_builder__layout: true search_api_excerpt: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.webform.default.yml b/services/drupal/config/sync/core.entity_view_display.node.webform.default.yml index 69f91d5bba..9cbef335f2 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.webform.default.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.webform.default.yml @@ -11,6 +11,7 @@ dependencies: - field.field.node.webform.field_language - field.field.node.webform.field_last_published - field.field.node.webform.field_machine_name + - field.field.node.webform.field_meta_tags - field.field.node.webform.field_page_head - field.field.node.webform.field_paragraphs - field.field.node.webform.field_publish_date @@ -22,6 +23,7 @@ dependencies: - node.type.webform module: - entity_reference_revisions + - metatag - user - webform id: node.webform.default @@ -29,6 +31,13 @@ targetEntityType: node bundle: webform mode: default content: + field_meta_tags: + type: metatag_empty_formatter + label: above + settings: { } + third_party_settings: { } + weight: 2 + region: content field_paragraphs: type: entity_reference_revisions_entity_view label: hidden diff --git a/services/drupal/config/sync/core.entity_view_display.node.webform.full.yml b/services/drupal/config/sync/core.entity_view_display.node.webform.full.yml index 1a7cab101f..d9347617c6 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.webform.full.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.webform.full.yml @@ -12,6 +12,7 @@ dependencies: - field.field.node.webform.field_language - field.field.node.webform.field_last_published - field.field.node.webform.field_machine_name + - field.field.node.webform.field_meta_tags - field.field.node.webform.field_page_head - field.field.node.webform.field_paragraphs - field.field.node.webform.field_publish_date @@ -63,6 +64,7 @@ hidden: field_language: true field_last_published: true field_machine_name: true + field_meta_tags: true field_page_head: true field_publish_date: true field_review_deadline: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.webform.link.yml b/services/drupal/config/sync/core.entity_view_display.node.webform.link.yml index 865d1134c1..5d0dd416e1 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.webform.link.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.webform.link.yml @@ -12,6 +12,7 @@ dependencies: - field.field.node.webform.field_language - field.field.node.webform.field_last_published - field.field.node.webform.field_machine_name + - field.field.node.webform.field_meta_tags - field.field.node.webform.field_page_head - field.field.node.webform.field_paragraphs - field.field.node.webform.field_publish_date @@ -44,6 +45,7 @@ hidden: field_language: true field_last_published: true field_machine_name: true + field_meta_tags: true field_page_head: true field_paragraphs: true field_publish_date: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.webform.search_index.yml b/services/drupal/config/sync/core.entity_view_display.node.webform.search_index.yml index 73ce9f3904..1955e27438 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.webform.search_index.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.webform.search_index.yml @@ -12,6 +12,7 @@ dependencies: - field.field.node.webform.field_language - field.field.node.webform.field_last_published - field.field.node.webform.field_machine_name + - field.field.node.webform.field_meta_tags - field.field.node.webform.field_page_head - field.field.node.webform.field_paragraphs - field.field.node.webform.field_publish_date @@ -63,6 +64,7 @@ hidden: field_language: true field_last_published: true field_machine_name: true + field_meta_tags: true field_page_head: true field_publish_date: true field_review_deadline: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.webform.teaser.yml b/services/drupal/config/sync/core.entity_view_display.node.webform.teaser.yml index 2e0e93550b..562b494676 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.webform.teaser.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.webform.teaser.yml @@ -12,6 +12,7 @@ dependencies: - field.field.node.webform.field_language - field.field.node.webform.field_last_published - field.field.node.webform.field_machine_name + - field.field.node.webform.field_meta_tags - field.field.node.webform.field_page_head - field.field.node.webform.field_paragraphs - field.field.node.webform.field_publish_date @@ -45,6 +46,7 @@ hidden: field_language: true field_last_published: true field_machine_name: true + field_meta_tags: true field_page_head: true field_paragraphs: true field_publish_date: true diff --git a/services/drupal/config/sync/core.entity_view_display.node.webform.token.yml b/services/drupal/config/sync/core.entity_view_display.node.webform.token.yml index f3286dfbe8..fc721accca 100644 --- a/services/drupal/config/sync/core.entity_view_display.node.webform.token.yml +++ b/services/drupal/config/sync/core.entity_view_display.node.webform.token.yml @@ -12,6 +12,7 @@ dependencies: - field.field.node.webform.field_language - field.field.node.webform.field_last_published - field.field.node.webform.field_machine_name + - field.field.node.webform.field_meta_tags - field.field.node.webform.field_page_head - field.field.node.webform.field_paragraphs - field.field.node.webform.field_publish_date @@ -183,6 +184,7 @@ content: region: content hidden: content_moderation_control: true + field_meta_tags: true field_search_text: true links: true search_api_excerpt: true diff --git a/services/drupal/config/sync/core.entity_view_display.paragraph.banner_slide.default.yml b/services/drupal/config/sync/core.entity_view_display.paragraph.banner_slide.default.yml index a0f3eda0da..9907d6cafa 100644 --- a/services/drupal/config/sync/core.entity_view_display.paragraph.banner_slide.default.yml +++ b/services/drupal/config/sync/core.entity_view_display.paragraph.banner_slide.default.yml @@ -3,19 +3,30 @@ langcode: en status: true dependencies: config: + - field.field.paragraph.banner_slide.field_banner_image - field.field.paragraph.banner_slide.field_image - field.field.paragraph.banner_slide.field_text - field.field.paragraph.banner_slide.field_title - image.style.hero - paragraphs.paragraphs_type.banner_slide module: - - image + - epa_media + - svg_image - text id: paragraph.banner_slide.default targetEntityType: paragraph bundle: banner_slide mode: default content: + field_banner_image: + type: epa_media_thumbnail_url + label: hidden + settings: + image_style: hero + image_link: '' + third_party_settings: { } + weight: 3 + region: content field_image: type: image_url label: hidden diff --git a/services/drupal/config/sync/core.entity_view_display.paragraph.box.default.yml b/services/drupal/config/sync/core.entity_view_display.paragraph.box.default.yml index 1ff069dd2c..2c872ecf71 100644 --- a/services/drupal/config/sync/core.entity_view_display.paragraph.box.default.yml +++ b/services/drupal/config/sync/core.entity_view_display.paragraph.box.default.yml @@ -55,11 +55,11 @@ content: type: link_separate label: hidden settings: - trim_length: 80 + trim_length: null url_only: false url_plain: false - rel: '' - target: '' + rel: '0' + target: '0' third_party_settings: { } weight: 6 region: content diff --git a/services/drupal/config/sync/core.entity_view_display.taxonomy_term.author.default.yml b/services/drupal/config/sync/core.entity_view_display.taxonomy_term.author.default.yml index 7f9c413861..28664bd2b3 100644 --- a/services/drupal/config/sync/core.entity_view_display.taxonomy_term.author.default.yml +++ b/services/drupal/config/sync/core.entity_view_display.taxonomy_term.author.default.yml @@ -4,22 +4,31 @@ status: true dependencies: config: - field.field.taxonomy_term.author.field_image + - image.style.medium_portait - taxonomy.vocabulary.author module: - - text + - image id: taxonomy_term.author.default targetEntityType: taxonomy_term bundle: author mode: default content: - description: - type: text_default + field_image: + type: image label: hidden - settings: { } + settings: + image_link: '' + image_style: medium_portait + svg_attributes: + width: null + height: null + svg_render_as_image: true + image_loading: + attribute: lazy third_party_settings: { } weight: 0 region: content hidden: - field_image: true + description: true langcode: true search_api_excerpt: true diff --git a/services/drupal/config/sync/core.extension.yml b/services/drupal/config/sync/core.extension.yml index 48d93a1489..622602e50c 100644 --- a/services/drupal/config/sync/core.extension.yml +++ b/services/drupal/config/sync/core.extension.yml @@ -51,6 +51,7 @@ module: dynamic_page_cache: 0 editor: 0 editor_advanced_link: 0 + editoria11y: 0 elasticsearch_connector: 0 embed: 0 entity: 0 @@ -65,6 +66,7 @@ module: epa_clone: 0 epa_cloudfront: 0 epa_cloudwatch: 0 + epa_elasticsearch: 0 epa_es_auth: 0 epa_forms: 0 epa_layouts: 0 @@ -93,6 +95,7 @@ module: filter: 0 filter_html_plus: 0 fixed_block_content: 0 + flag: 0 flood_control: 0 focal_point: 0 gcontent_moderation: 0 @@ -143,6 +146,7 @@ module: migrate_tools: 0 migrate_upgrade: 0 module_filter: 0 + mysql: 0 native_lazy_loading: 0 node: 0 options: 0 @@ -166,9 +170,14 @@ module: rh_node: 0 rh_taxonomy: 0 role_expose: 0 + role_theme_switcher: 0 s3fs: 0 samlauth: 0 scheduled_publish: 0 + schema_article: 0 + schema_event: 0 + schema_metatag: 0 + schema_special_announcement: 0 search_api: 0 seckit: 0 serialization: 0 @@ -226,4 +235,6 @@ theme: epa_theme: 0 claro: 0 epa_seven: 0 + gin: 0 + epa_claro: 0 profile: minimal diff --git a/services/drupal/config/sync/editor.editor.filtered_html.yml b/services/drupal/config/sync/editor.editor.filtered_html.yml index 111372b3a3..8ddb7c2152 100644 --- a/services/drupal/config/sync/editor.editor.filtered_html.yml +++ b/services/drupal/config/sync/editor.editor.filtered_html.yml @@ -63,18 +63,14 @@ settings: - Source - Resize plugins: + stylescombo: + styles: "blockquote.pull-quote|Pull Quote\r\nblockquote.pull-quote.u-align-left|Left Pull Quote\r\nblockquote.pull-quote.u-align-right|Right Pull Quote\r\ntable.usa-table.usa-table--striped|Striped Table\r\ntable.usa-table.usa-table--unstyled|Unstyled Table\r\ntable.usa-table.usa-table--borderless|Borderless Table\r\ntable.usa-table.usa-table--stacked|Stacked Table\r\ntable.usa-table.usa-table--stacked-header|Stacked Header Table\r\nul.list.list--clean|Clean List\r\nul.list.list--pipeline|Pipeline List\r\nul.list.list--roomy|Roomy List\r\nol.list.list--roomy|Roomy Ordered List\r\nh2.highlight|H2 Highlight\r\nh3.highlight|H3 Highlight\r\nh4.highlight|H4 Highlight\r\nh5.highlight|H5 Highlight\r\nh6.highlight|H6 Highlight\r\ncode|Code\r\nmark|Mark\r\nsmall|Small\r\nspan.warning|Warning" drupallink: linkit_enabled: true linkit_profile: default - language: - language_list: un - stylescombo: - styles: "blockquote.pull-quote|Pull Quote\r\nblockquote.pull-quote.u-align-left|Left Pull Quote\r\nblockquote.pull-quote.u-align-right|Right Pull Quote\r\ntable.usa-table.usa-table--striped|Striped Table\r\ntable.usa-table.usa-table--unstyled|Unstyled Table\r\ntable.usa-table.usa-table--borderless|Borderless Table\r\ntable.usa-table.usa-table--stacked|Stacked Table\r\ntable.usa-table.usa-table--stacked-header|Stacked Header Table\r\nul.list.list--clean|Clean List\r\nul.list.list--pipeline|Pipeline List\r\nul.list.list--roomy|Roomy List\r\nol.list.list--roomy|Roomy Ordered List\r\nh2.highlight|H2 Highlight\r\nh3.highlight|H3 Highlight\r\nh4.highlight|H4 Highlight\r\nh5.highlight|H5 Highlight\r\nh6.highlight|H6 Highlight\r\ncode|Code\r\nmark|Mark\r\nsmall|Small\r\nspan.warning|Warning" specialchars: characters: "ƒ\r\nΑ\r\nΒ\r\nΓ\r\nΔ\r\nΕ\r\nΖ\r\nΗ\r\nΘ\r\nΙ\r\nΚ\r\nΛ\r\nΜ\r\nΝ\r\nΞ\r\nΟ\r\nΠ\r\nΡ\r\nΣ\r\nΤ\r\nΥ\r\nΦ\r\nΧ\r\nΨ\r\nΩ\r\nα\r\nβ\r\nγ\r\nδ\r\nε\r\nζ\r\nη\r\nθ\r\nι\r\nκ\r\nλ\r\nμ\r\nν\r\nξ\r\nο\r\nπ\r\nρ\r\nσ\r\nτ\r\nυ\r\nφ\r\nχ\r\nψ\r\nω" replace: 1 - tokenbrowser: - token_types: { } image_upload: status: false scheme: public diff --git a/services/drupal/config/sync/editor.editor.restricted_html.yml b/services/drupal/config/sync/editor.editor.restricted_html.yml index 2b12e3b378..34ffee13d5 100644 --- a/services/drupal/config/sync/editor.editor.restricted_html.yml +++ b/services/drupal/config/sync/editor.editor.restricted_html.yml @@ -39,15 +39,6 @@ settings: drupallink: linkit_enabled: true linkit_profile: default - language: - language_list: un - stylescombo: - styles: '' - specialchars: - characters: '' - replace: 0 - tokenbrowser: - token_types: { } image_upload: status: false scheme: public diff --git a/services/drupal/config/sync/editor.editor.restricted_html_no_links.yml b/services/drupal/config/sync/editor.editor.restricted_html_no_links.yml index 3be866da10..6e40078b69 100644 --- a/services/drupal/config/sync/editor.editor.restricted_html_no_links.yml +++ b/services/drupal/config/sync/editor.editor.restricted_html_no_links.yml @@ -30,19 +30,7 @@ settings: - epaNewButton - Source - Maximize - plugins: - drupallink: - linkit_enabled: false - linkit_profile: '' - stylescombo: - styles: '' - language: - language_list: un - specialchars: - characters: '' - replace: 0 - tokenbrowser: - token_types: { } + plugins: { } image_upload: status: false scheme: public diff --git a/services/drupal/config/sync/editoria11y.settings.yml b/services/drupal/config/sync/editoria11y.settings.yml new file mode 100644 index 0000000000..7d2ceeacf1 --- /dev/null +++ b/services/drupal/config/sync/editoria11y.settings.yml @@ -0,0 +1,15 @@ +_core: + default_config_hash: kIV1woSIwQ7BBcHoAOpa8a26XrvI2jcZbfTjDbLysno +content_root: .article +assertiveness: smart +no_load: '' +ignore_all_if_absent: '' +ignore_elements: '.js-toggle-admin-content *' +embedded_content_warning: '' +download_links: '' +ignore_link_strings: '' +hidden_handlers: '' +ed11y_theme: lightTheme +shadow_components: '' +disable_sync: false +preserve_params: 'search,keys,page,language,language_content_entity' diff --git a/services/drupal/config/sync/environment_indicator.switcher.dev_f1.yml b/services/drupal/config/sync/environment_indicator.switcher.dev_f1.yml index c54c90cd28..c9e4152095 100644 --- a/services/drupal/config/sync/environment_indicator.switcher.dev_f1.yml +++ b/services/drupal/config/sync/environment_indicator.switcher.dev_f1.yml @@ -5,6 +5,8 @@ dependencies: { } machine: dev_f1 description: null name: Dev +weight: null url: 'https://dev.epa.byf1.io' +path: null fg_color: '#000000' bg_color: '#ffffff' diff --git a/services/drupal/config/sync/environment_indicator.switcher.espanol_stage_f1.yml b/services/drupal/config/sync/environment_indicator.switcher.espanol_stage_f1.yml index 5fbc4c85b2..1bf12373ac 100644 --- a/services/drupal/config/sync/environment_indicator.switcher.espanol_stage_f1.yml +++ b/services/drupal/config/sync/environment_indicator.switcher.espanol_stage_f1.yml @@ -5,6 +5,8 @@ dependencies: { } machine: espanol_stage_f1 description: null name: 'Espanol stage' +weight: null url: 'https://espanol.epa.byf1.io' +path: null fg_color: '#000000' bg_color: '#ffffff' diff --git a/services/drupal/config/sync/environment_indicator.switcher.main_es_f1a.yml b/services/drupal/config/sync/environment_indicator.switcher.main_es_f1a.yml index c5b6148ba1..526a936d9a 100644 --- a/services/drupal/config/sync/environment_indicator.switcher.main_es_f1a.yml +++ b/services/drupal/config/sync/environment_indicator.switcher.main_es_f1a.yml @@ -5,6 +5,8 @@ dependencies: { } machine: main_es_f1a description: null name: 'Main - Espanol' +weight: null url: 'https://main-es.epa.byf1.dev' +path: null fg_color: '#000000' bg_color: '#ffffff' diff --git a/services/drupal/config/sync/environment_indicator.switcher.main_f1a.yml b/services/drupal/config/sync/environment_indicator.switcher.main_f1a.yml index 2a4a293418..b2b92a0207 100644 --- a/services/drupal/config/sync/environment_indicator.switcher.main_f1a.yml +++ b/services/drupal/config/sync/environment_indicator.switcher.main_f1a.yml @@ -5,6 +5,8 @@ dependencies: { } machine: main_f1a description: null name: Main +weight: null url: 'https://main.epa.byf1.dev' +path: null fg_color: '#000000' bg_color: '#ffffff' diff --git a/services/drupal/config/sync/environment_indicator.switcher.qa_f1.yml b/services/drupal/config/sync/environment_indicator.switcher.qa_f1.yml index 455906eb51..f7ae4715e8 100644 --- a/services/drupal/config/sync/environment_indicator.switcher.qa_f1.yml +++ b/services/drupal/config/sync/environment_indicator.switcher.qa_f1.yml @@ -5,6 +5,8 @@ dependencies: { } machine: qa_f1 description: null name: QA +weight: null url: 'https://qa.epa.byf1.io' +path: null fg_color: '#000000' bg_color: '#ffffff' diff --git a/services/drupal/config/sync/environment_indicator.switcher.release_es_f1a.yml b/services/drupal/config/sync/environment_indicator.switcher.release_es_f1a.yml index b1123d6d08..3a3776059a 100644 --- a/services/drupal/config/sync/environment_indicator.switcher.release_es_f1a.yml +++ b/services/drupal/config/sync/environment_indicator.switcher.release_es_f1a.yml @@ -5,6 +5,8 @@ dependencies: { } machine: release_es_f1a description: null name: 'Release - Espanol' +weight: null url: 'https://release-es.epa.byf1.dev' +path: null fg_color: '#000000' bg_color: '#ffffff' diff --git a/services/drupal/config/sync/environment_indicator.switcher.release_f1a.yml b/services/drupal/config/sync/environment_indicator.switcher.release_f1a.yml index 6a8e2c59c6..58fdb9cb0f 100644 --- a/services/drupal/config/sync/environment_indicator.switcher.release_f1a.yml +++ b/services/drupal/config/sync/environment_indicator.switcher.release_f1a.yml @@ -5,6 +5,8 @@ dependencies: { } machine: release_f1a description: null name: Release +weight: null url: 'https://release.epa.byf1.dev' +path: null fg_color: '#000000' bg_color: '#ffffff' diff --git a/services/drupal/config/sync/environment_indicator.switcher.stage_f1.yml b/services/drupal/config/sync/environment_indicator.switcher.stage_f1.yml index 82f7f99fd7..6912d44248 100644 --- a/services/drupal/config/sync/environment_indicator.switcher.stage_f1.yml +++ b/services/drupal/config/sync/environment_indicator.switcher.stage_f1.yml @@ -5,6 +5,8 @@ dependencies: { } machine: stage_f1 description: null name: Stage +weight: null url: 'https://stage.epa.byf1.io' +path: null fg_color: '#000000' bg_color: '#ffffff' diff --git a/services/drupal/config/sync/facets.facet.faqs_topic.yml b/services/drupal/config/sync/facets.facet.faqs_topic.yml index 37a2eae523..28eaf0a3e8 100644 --- a/services/drupal/config/sync/facets.facet.faqs_topic.yml +++ b/services/drupal/config/sync/facets.facet.faqs_topic.yml @@ -15,6 +15,8 @@ id: faqs_topic name: Topic weight: 0 min_count: 1 +missing: false +missing_label: others url_alias: topics facet_source_id: 'search_api:views_page__search_faqs__page_1' field_identifier: field_faq_taxonomy_topics @@ -23,6 +25,9 @@ hard_limit: 0 exclude: false use_hierarchy: true keep_hierarchy_parents_active: false +hierarchy: + type: taxonomy + config: { } expand_hierarchy: false enable_parent_when_child_gets_disabled: true widget: @@ -65,3 +70,8 @@ processor_configs: pre_query: 50 build: 15 settings: { } + hierarchy_processor: + id: hierarchy_processor + weights: + build: 100 + settings: { } diff --git a/services/drupal/config/sync/facets.facet.faqs_webarea.yml b/services/drupal/config/sync/facets.facet.faqs_webarea.yml index 2b771525e6..37619ef23d 100644 --- a/services/drupal/config/sync/facets.facet.faqs_webarea.yml +++ b/services/drupal/config/sync/facets.facet.faqs_webarea.yml @@ -15,6 +15,8 @@ id: faqs_webarea name: 'Web Area' weight: 0 min_count: 1 +missing: false +missing_label: others url_alias: webarea facet_source_id: 'search_api:views_page__search_faqs__page_1' field_identifier: field_hublinks @@ -23,6 +25,9 @@ hard_limit: 0 exclude: false use_hierarchy: false keep_hierarchy_parents_active: false +hierarchy: + type: taxonomy + config: { } expand_hierarchy: false enable_parent_when_child_gets_disabled: true widget: diff --git a/services/drupal/config/sync/facets.facet.news_releases_geographic_locations.yml b/services/drupal/config/sync/facets.facet.news_releases_geographic_locations.yml index 69316b3b71..b0c780c2b8 100644 --- a/services/drupal/config/sync/facets.facet.news_releases_geographic_locations.yml +++ b/services/drupal/config/sync/facets.facet.news_releases_geographic_locations.yml @@ -15,6 +15,8 @@ id: news_releases_geographic_locations name: State/Territory weight: 0 min_count: 1 +missing: false +missing_label: others url_alias: geographic_locations facet_source_id: 'search_api:views_page__search_news_releases__page_1' field_identifier: field_geographic_locations @@ -23,6 +25,9 @@ hard_limit: 0 exclude: false use_hierarchy: false keep_hierarchy_parents_active: false +hierarchy: + type: taxonomy + config: { } expand_hierarchy: false enable_parent_when_child_gets_disabled: true widget: diff --git a/services/drupal/config/sync/facets.facet.news_releases_language.yml b/services/drupal/config/sync/facets.facet.news_releases_language.yml index 9d00b905a1..82881fd657 100644 --- a/services/drupal/config/sync/facets.facet.news_releases_language.yml +++ b/services/drupal/config/sync/facets.facet.news_releases_language.yml @@ -15,6 +15,8 @@ id: news_releases_language name: Language weight: 0 min_count: 1 +missing: false +missing_label: others url_alias: news_releases_language facet_source_id: 'search_api:views_page__search_news_releases__page_1' field_identifier: field_language @@ -23,6 +25,9 @@ hard_limit: 0 exclude: false use_hierarchy: false keep_hierarchy_parents_active: false +hierarchy: + type: taxonomy + config: { } expand_hierarchy: false enable_parent_when_child_gets_disabled: true widget: diff --git a/services/drupal/config/sync/facets.facet.news_releases_press_office.yml b/services/drupal/config/sync/facets.facet.news_releases_press_office.yml index 1b3fa98b92..0240047977 100644 --- a/services/drupal/config/sync/facets.facet.news_releases_press_office.yml +++ b/services/drupal/config/sync/facets.facet.news_releases_press_office.yml @@ -15,6 +15,8 @@ id: news_releases_press_office name: 'Press Office' weight: 0 min_count: 1 +missing: false +missing_label: others url_alias: press_office facet_source_id: 'search_api:views_page__search_news_releases__page_1' field_identifier: field_press_office @@ -23,6 +25,9 @@ hard_limit: 0 exclude: false use_hierarchy: true keep_hierarchy_parents_active: false +hierarchy: + type: taxonomy + config: { } expand_hierarchy: false enable_parent_when_child_gets_disabled: true widget: @@ -71,3 +76,8 @@ processor_configs: pre_query: 50 build: 15 settings: { } + hierarchy_processor: + id: hierarchy_processor + weights: + build: 100 + settings: { } diff --git a/services/drupal/config/sync/facets.facet.news_releases_subjects.yml b/services/drupal/config/sync/facets.facet.news_releases_subjects.yml index e9fb42a9b3..864fab2570 100644 --- a/services/drupal/config/sync/facets.facet.news_releases_subjects.yml +++ b/services/drupal/config/sync/facets.facet.news_releases_subjects.yml @@ -15,6 +15,8 @@ id: news_releases_subjects name: Subject weight: 0 min_count: 1 +missing: false +missing_label: others url_alias: subject facet_source_id: 'search_api:views_page__search_news_releases__page_1' field_identifier: field_subjects @@ -23,6 +25,9 @@ hard_limit: 0 exclude: false use_hierarchy: true keep_hierarchy_parents_active: false +hierarchy: + type: taxonomy + config: { } expand_hierarchy: false enable_parent_when_child_gets_disabled: true widget: @@ -65,3 +70,8 @@ processor_configs: pre_query: 50 build: 15 settings: { } + hierarchy_processor: + id: hierarchy_processor + weights: + build: 100 + settings: { } diff --git a/services/drupal/config/sync/facets.facet.news_releases_year.yml b/services/drupal/config/sync/facets.facet.news_releases_year.yml index f94ceed04d..689d031bd4 100644 --- a/services/drupal/config/sync/facets.facet.news_releases_year.yml +++ b/services/drupal/config/sync/facets.facet.news_releases_year.yml @@ -15,14 +15,19 @@ id: news_releases_year name: 'Release Year' weight: 0 min_count: 1 +missing: false +missing_label: others url_alias: year facet_source_id: 'search_api:views_page__search_news_releases__page_1' field_identifier: field_release query_operator: or hard_limit: 0 exclude: false -use_hierarchy: false +use_hierarchy: true keep_hierarchy_parents_active: false +hierarchy: + type: date_items + config: { } expand_hierarchy: false enable_parent_when_child_gets_disabled: true widget: @@ -51,11 +56,17 @@ processor_configs: date_item: processor_id: date_item weights: - build: 35 + build: -1 settings: date_display: actual_date - granularity: 6 + granularity: 5 date_format: '' + hierarchy: true + hierarchy_processor: + processor_id: hierarchy_processor + weights: + build: -2 + settings: { } raw_value_widget_order: processor_id: raw_value_widget_order weights: @@ -66,5 +77,5 @@ processor_configs: processor_id: url_processor_handler weights: pre_query: 50 - build: 15 + build: -5 settings: { } diff --git a/services/drupal/config/sync/facets.facet.perspectives_author.yml b/services/drupal/config/sync/facets.facet.perspectives_author.yml index 95bc54d244..7711b851e9 100644 --- a/services/drupal/config/sync/facets.facet.perspectives_author.yml +++ b/services/drupal/config/sync/facets.facet.perspectives_author.yml @@ -15,6 +15,8 @@ id: perspectives_author name: Author weight: 0 min_count: 1 +missing: false +missing_label: others url_alias: perspectives_author facet_source_id: 'search_api:views_page__search_perspectives__page_1' field_identifier: field_author @@ -23,6 +25,9 @@ hard_limit: 0 exclude: false use_hierarchy: false keep_hierarchy_parents_active: false +hierarchy: + type: taxonomy + config: { } expand_hierarchy: false enable_parent_when_child_gets_disabled: true widget: diff --git a/services/drupal/config/sync/facets.facet.perspectives_publisher.yml b/services/drupal/config/sync/facets.facet.perspectives_publisher.yml index 6dcd61e0fb..4e3e38b0a6 100644 --- a/services/drupal/config/sync/facets.facet.perspectives_publisher.yml +++ b/services/drupal/config/sync/facets.facet.perspectives_publisher.yml @@ -15,6 +15,8 @@ id: perspectives_publisher name: Publisher weight: 0 min_count: 1 +missing: false +missing_label: others url_alias: perspectives_publisher facet_source_id: 'search_api:views_page__search_perspectives__page_1' field_identifier: field_publisher @@ -23,6 +25,9 @@ hard_limit: 0 exclude: false use_hierarchy: true keep_hierarchy_parents_active: false +hierarchy: + type: taxonomy + config: { } expand_hierarchy: false enable_parent_when_child_gets_disabled: true widget: @@ -65,3 +70,8 @@ processor_configs: pre_query: 50 build: 15 settings: { } + hierarchy_processor: + id: hierarchy_processor + weights: + build: 100 + settings: { } diff --git a/services/drupal/config/sync/facets.facet.perspectives_subjects.yml b/services/drupal/config/sync/facets.facet.perspectives_subjects.yml index bd7cb630de..d7da48d888 100644 --- a/services/drupal/config/sync/facets.facet.perspectives_subjects.yml +++ b/services/drupal/config/sync/facets.facet.perspectives_subjects.yml @@ -15,6 +15,8 @@ id: perspectives_subjects name: Subject weight: 0 min_count: 1 +missing: false +missing_label: others url_alias: perspectives_subjects facet_source_id: 'search_api:views_page__search_perspectives__page_1' field_identifier: field_subjects @@ -23,6 +25,9 @@ hard_limit: 0 exclude: false use_hierarchy: true keep_hierarchy_parents_active: false +hierarchy: + type: taxonomy + config: { } expand_hierarchy: false enable_parent_when_child_gets_disabled: true widget: @@ -65,3 +70,8 @@ processor_configs: pre_query: 50 build: 15 settings: { } + hierarchy_processor: + id: hierarchy_processor + weights: + build: 100 + settings: { } diff --git a/services/drupal/config/sync/facets.facet.perspectives_year.yml b/services/drupal/config/sync/facets.facet.perspectives_year.yml index 303395cfc9..b47355ae09 100644 --- a/services/drupal/config/sync/facets.facet.perspectives_year.yml +++ b/services/drupal/config/sync/facets.facet.perspectives_year.yml @@ -15,6 +15,8 @@ id: perspectives_year name: Year weight: 0 min_count: 1 +missing: false +missing_label: others url_alias: perspectives_year facet_source_id: 'search_api:views_page__search_perspectives__page_1' field_identifier: field_release @@ -23,6 +25,9 @@ hard_limit: 0 exclude: false use_hierarchy: false keep_hierarchy_parents_active: false +hierarchy: + type: taxonomy + config: { } expand_hierarchy: false enable_parent_when_child_gets_disabled: true widget: diff --git a/services/drupal/config/sync/facets.facet.public_notices_comments_due_date.yml b/services/drupal/config/sync/facets.facet.public_notices_comments_due_date.yml index 0d4b029097..71c417b9cf 100644 --- a/services/drupal/config/sync/facets.facet.public_notices_comments_due_date.yml +++ b/services/drupal/config/sync/facets.facet.public_notices_comments_due_date.yml @@ -15,6 +15,8 @@ id: public_notices_comments_due_date name: 'Comments Due Date' weight: 0 min_count: 1 +missing: false +missing_label: others url_alias: field_computed_comments_due_date facet_source_id: 'search_api:views_page__search_public_notices__page_1' field_identifier: field_comments_due_date @@ -23,6 +25,9 @@ hard_limit: 0 exclude: false use_hierarchy: false keep_hierarchy_parents_active: false +hierarchy: + type: taxonomy + config: { } expand_hierarchy: false enable_parent_when_child_gets_disabled: true widget: diff --git a/services/drupal/config/sync/facets.facet.public_notices_location_of_prop_action.yml b/services/drupal/config/sync/facets.facet.public_notices_location_of_prop_action.yml index 7f66773613..a654b703a9 100644 --- a/services/drupal/config/sync/facets.facet.public_notices_location_of_prop_action.yml +++ b/services/drupal/config/sync/facets.facet.public_notices_location_of_prop_action.yml @@ -15,6 +15,8 @@ id: public_notices_location_of_prop_action name: 'Location of Proposed Action' weight: 0 min_count: 1 +missing: false +missing_label: others url_alias: location facet_source_id: 'search_api:views_page__search_public_notices__page_1' field_identifier: aggregated_field @@ -23,6 +25,9 @@ hard_limit: 0 exclude: false use_hierarchy: false keep_hierarchy_parents_active: false +hierarchy: + type: taxonomy + config: { } expand_hierarchy: false enable_parent_when_child_gets_disabled: true widget: diff --git a/services/drupal/config/sync/facets.facet.public_notices_program_or_statute.yml b/services/drupal/config/sync/facets.facet.public_notices_program_or_statute.yml index dc4d05fdbe..4b44ef8f53 100644 --- a/services/drupal/config/sync/facets.facet.public_notices_program_or_statute.yml +++ b/services/drupal/config/sync/facets.facet.public_notices_program_or_statute.yml @@ -15,6 +15,8 @@ id: public_notices_program_or_statute name: 'Program or Statute' weight: 0 min_count: 1 +missing: false +missing_label: others url_alias: program_or_statute facet_source_id: 'search_api:views_page__search_public_notices__page_1' field_identifier: field_programs_or_statutes @@ -23,6 +25,9 @@ hard_limit: 0 exclude: false use_hierarchy: false keep_hierarchy_parents_active: false +hierarchy: + type: taxonomy + config: { } expand_hierarchy: false enable_parent_when_child_gets_disabled: true widget: diff --git a/services/drupal/config/sync/facets.facet.public_notices_proposed_actions.yml b/services/drupal/config/sync/facets.facet.public_notices_proposed_actions.yml index 915959d249..e9ca4610b3 100644 --- a/services/drupal/config/sync/facets.facet.public_notices_proposed_actions.yml +++ b/services/drupal/config/sync/facets.facet.public_notices_proposed_actions.yml @@ -15,6 +15,8 @@ id: public_notices_proposed_actions name: 'Proposed Action' weight: 0 min_count: 1 +missing: false +missing_label: others url_alias: proposed_action facet_source_id: 'search_api:views_page__search_public_notices__page_1' field_identifier: field_type_of_proposed_action @@ -23,6 +25,9 @@ hard_limit: 0 exclude: false use_hierarchy: false keep_hierarchy_parents_active: false +hierarchy: + type: taxonomy + config: { } expand_hierarchy: false enable_parent_when_child_gets_disabled: true widget: diff --git a/services/drupal/config/sync/facets_summary.facets_summary.faqs_current_search_results.yml b/services/drupal/config/sync/facets_summary.facets_summary.faqs_current_search_results.yml index 640f51fde4..011303cff4 100644 --- a/services/drupal/config/sync/facets_summary.facets_summary.faqs_current_search_results.yml +++ b/services/drupal/config/sync/facets_summary.facets_summary.faqs_current_search_results.yml @@ -9,19 +9,6 @@ dependencies: - search_api id: faqs_current_search_results name: 'Current search results' -facet_source_id: 'search_api:views_page__search_faqs__page_1' -processor_configs: - hide_when_not_rendered: - processor_id: hide_when_not_rendered - weights: - build: '45' - settings: { } - reset_facets: - processor_id: reset_facets - weights: - build: '30' - settings: - link_text: '' facets: faqs_topic: checked: true @@ -35,3 +22,17 @@ facets: separator: ', ' show_count: false weight: 0 +facet_source_id: 'search_api:views_page__search_faqs__page_1' +processor_configs: + hide_when_not_rendered: + processor_id: hide_when_not_rendered + weights: + build: '45' + settings: { } + reset_facets: + processor_id: reset_facets + weights: + build: '30' + settings: + link_text: '' + position: before diff --git a/services/drupal/config/sync/facets_summary.facets_summary.news_releases_current_search_results.yml b/services/drupal/config/sync/facets_summary.facets_summary.news_releases_current_search_results.yml index b8c4e1168c..4d5aa520b4 100644 --- a/services/drupal/config/sync/facets_summary.facets_summary.news_releases_current_search_results.yml +++ b/services/drupal/config/sync/facets_summary.facets_summary.news_releases_current_search_results.yml @@ -9,19 +9,6 @@ dependencies: - search_api id: news_releases_current_search_results name: 'Current search results' -facet_source_id: 'search_api:views_page__search_news_releases__page_1' -processor_configs: - hide_when_not_rendered: - processor_id: hide_when_not_rendered - weights: - build: '-6' - settings: { } - reset_facets: - processor_id: reset_facets - weights: - build: '30' - settings: - link_text: '' facets: news_releases_geographic_locations: checked: true @@ -53,3 +40,17 @@ facets: separator: ', ' show_count: false weight: 0 +facet_source_id: 'search_api:views_page__search_news_releases__page_1' +processor_configs: + hide_when_not_rendered: + processor_id: hide_when_not_rendered + weights: + build: '-6' + settings: { } + reset_facets: + processor_id: reset_facets + weights: + build: '30' + settings: + link_text: '' + position: before diff --git a/services/drupal/config/sync/facets_summary.facets_summary.perspectives_current_search_results.yml b/services/drupal/config/sync/facets_summary.facets_summary.perspectives_current_search_results.yml index 1fd0f81f51..0ec43ed8b1 100644 --- a/services/drupal/config/sync/facets_summary.facets_summary.perspectives_current_search_results.yml +++ b/services/drupal/config/sync/facets_summary.facets_summary.perspectives_current_search_results.yml @@ -9,19 +9,6 @@ dependencies: - search_api id: perspectives_current_search_results name: 'Current search results' -facet_source_id: 'search_api:views_page__search_perspectives__page_1' -processor_configs: - hide_when_not_rendered: - processor_id: hide_when_not_rendered - weights: - build: '45' - settings: { } - reset_facets: - processor_id: reset_facets - weights: - build: '30' - settings: - link_text: '' facets: perspectives_author: checked: true @@ -47,3 +34,17 @@ facets: separator: ', ' show_count: false weight: 0 +facet_source_id: 'search_api:views_page__search_perspectives__page_1' +processor_configs: + hide_when_not_rendered: + processor_id: hide_when_not_rendered + weights: + build: '45' + settings: { } + reset_facets: + processor_id: reset_facets + weights: + build: '30' + settings: + link_text: '' + position: before diff --git a/services/drupal/config/sync/facets_summary.facets_summary.public_notices_current_search_results.yml b/services/drupal/config/sync/facets_summary.facets_summary.public_notices_current_search_results.yml index 851187e915..01703aa1a3 100644 --- a/services/drupal/config/sync/facets_summary.facets_summary.public_notices_current_search_results.yml +++ b/services/drupal/config/sync/facets_summary.facets_summary.public_notices_current_search_results.yml @@ -9,19 +9,6 @@ dependencies: - search_api id: public_notices_current_search_results name: 'Current search results' -facet_source_id: 'search_api:views_page__search_public_notices__page_1' -processor_configs: - hide_when_not_rendered: - processor_id: hide_when_not_rendered - weights: - build: '45' - settings: { } - reset_facets: - processor_id: reset_facets - weights: - build: '30' - settings: - link_text: '' facets: public_notices_comments_due_date: checked: true @@ -47,3 +34,17 @@ facets: separator: ', ' show_count: false weight: 0 +facet_source_id: 'search_api:views_page__search_public_notices__page_1' +processor_configs: + hide_when_not_rendered: + processor_id: hide_when_not_rendered + weights: + build: '45' + settings: { } + reset_facets: + processor_id: reset_facets + weights: + build: '30' + settings: + link_text: '' + position: before diff --git a/services/drupal/config/sync/field.field.group.web_area.field_navigation_style.yml b/services/drupal/config/sync/field.field.group.web_area.field_navigation_style.yml index 431f36eae9..44a991b901 100644 --- a/services/drupal/config/sync/field.field.group.web_area.field_navigation_style.yml +++ b/services/drupal/config/sync/field.field.group.web_area.field_navigation_style.yml @@ -22,7 +22,7 @@ required: true translatable: false default_value: - - value: hublinks + value: sidebar_navigation default_value_callback: '' settings: { } field_type: list_string diff --git a/services/drupal/config/sync/field.field.media.banner_image.field_banner_image_restricted.yml b/services/drupal/config/sync/field.field.media.banner_image.field_banner_image_restricted.yml new file mode 100644 index 0000000000..e5151b4572 --- /dev/null +++ b/services/drupal/config/sync/field.field.media.banner_image.field_banner_image_restricted.yml @@ -0,0 +1,26 @@ +uuid: a153e0b0-ed90-4a92-9e03-f0cc35412a42 +langcode: en +status: true +dependencies: + config: + - field.storage.media.field_banner_image_restricted + - media.type.banner_image + module: + - custom_add_another + - options +third_party_settings: + custom_add_another: + custom_add_another: '' + custom_remove: '' +id: media.banner_image.field_banner_image_restricted +field_name: field_banner_image_restricted +entity_type: media +bundle: banner_image +label: 'Usage restrictions' +description: 'If you are using images licensed from a stock photo library the license for the image often prohibits reuse of the image. Use this setting to indicate this image is subject to restrictions.' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/services/drupal/config/sync/field.field.media.banner_image.field_media_image.yml b/services/drupal/config/sync/field.field.media.banner_image.field_media_image.yml new file mode 100644 index 0000000000..d66aef4f6e --- /dev/null +++ b/services/drupal/config/sync/field.field.media.banner_image.field_media_image.yml @@ -0,0 +1,43 @@ +uuid: 2cb4f9dd-bea2-4bdc-af37-82440afe4154 +langcode: en +status: true +dependencies: + config: + - field.storage.media.field_media_image + - media.type.banner_image + module: + - custom_add_another + - image +third_party_settings: + custom_add_another: + custom_add_another: '' + custom_remove: '' +id: media.banner_image.field_media_image +field_name: field_media_image +entity_type: media +bundle: banner_image +label: Image +description: '' +required: true +translatable: true +default_value: { } +default_value_callback: '' +settings: + handler: 'default:file' + handler_settings: { } + file_directory: '[date:custom:Y]-[date:custom:m]' + file_extensions: 'png gif jpg jpeg' + max_filesize: '' + max_resolution: '' + min_resolution: '' + alt_field: true + alt_field_required: true + title_field: false + title_field_required: false + default_image: + uuid: null + alt: '' + title: '' + width: null + height: null +field_type: image diff --git a/services/drupal/config/sync/field.field.node.event.field_meta_tags.yml b/services/drupal/config/sync/field.field.node.event.field_meta_tags.yml new file mode 100644 index 0000000000..05e0bf5fc6 --- /dev/null +++ b/services/drupal/config/sync/field.field.node.event.field_meta_tags.yml @@ -0,0 +1,26 @@ +uuid: 04d5c97d-a17c-4ec6-89b7-b5ef76912ca0 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_meta_tags + - node.type.event + module: + - custom_add_another + - metatag +third_party_settings: + custom_add_another: + custom_add_another: '' + custom_remove: '' +id: node.event.field_meta_tags +field_name: field_meta_tags +entity_type: node +bundle: event +label: 'Meta Tags' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: metatag diff --git a/services/drupal/config/sync/field.field.node.faq.field_meta_tags.yml b/services/drupal/config/sync/field.field.node.faq.field_meta_tags.yml new file mode 100644 index 0000000000..182c1ef86f --- /dev/null +++ b/services/drupal/config/sync/field.field.node.faq.field_meta_tags.yml @@ -0,0 +1,26 @@ +uuid: 3c9560d5-80e9-4b0c-a06d-6ff61dc8698d +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_meta_tags + - node.type.faq + module: + - custom_add_another + - metatag +third_party_settings: + custom_add_another: + custom_add_another: '' + custom_remove: '' +id: node.faq.field_meta_tags +field_name: field_meta_tags +entity_type: node +bundle: faq +label: 'Meta Tags' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: metatag diff --git a/services/drupal/config/sync/field.field.node.news_release.field_meta_tags.yml b/services/drupal/config/sync/field.field.node.news_release.field_meta_tags.yml new file mode 100644 index 0000000000..ac9dbbe5d3 --- /dev/null +++ b/services/drupal/config/sync/field.field.node.news_release.field_meta_tags.yml @@ -0,0 +1,26 @@ +uuid: 48985aaf-aab5-4ebb-94b9-5e359c6c0290 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_meta_tags + - node.type.news_release + module: + - custom_add_another + - metatag +third_party_settings: + custom_add_another: + custom_add_another: '' + custom_remove: '' +id: node.news_release.field_meta_tags +field_name: field_meta_tags +entity_type: node +bundle: news_release +label: 'Meta Tags' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: metatag diff --git a/services/drupal/config/sync/field.field.node.page.field_meta_tags.yml b/services/drupal/config/sync/field.field.node.page.field_meta_tags.yml new file mode 100644 index 0000000000..340038bf95 --- /dev/null +++ b/services/drupal/config/sync/field.field.node.page.field_meta_tags.yml @@ -0,0 +1,26 @@ +uuid: 745caccb-4700-4633-bd72-1d19124bac00 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_meta_tags + - node.type.page + module: + - custom_add_another + - metatag +third_party_settings: + custom_add_another: + custom_add_another: '' + custom_remove: '' +id: node.page.field_meta_tags +field_name: field_meta_tags +entity_type: node +bundle: page +label: 'Meta Tags' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: metatag diff --git a/services/drupal/config/sync/field.field.node.perspective.field_meta_tags.yml b/services/drupal/config/sync/field.field.node.perspective.field_meta_tags.yml new file mode 100644 index 0000000000..0f370d86f5 --- /dev/null +++ b/services/drupal/config/sync/field.field.node.perspective.field_meta_tags.yml @@ -0,0 +1,26 @@ +uuid: 186df79c-677d-4524-b79f-cdd2efda30ce +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_meta_tags + - node.type.perspective + module: + - custom_add_another + - metatag +third_party_settings: + custom_add_another: + custom_add_another: '' + custom_remove: '' +id: node.perspective.field_meta_tags +field_name: field_meta_tags +entity_type: node +bundle: perspective +label: 'Meta Tags' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: metatag diff --git a/services/drupal/config/sync/field.field.node.public_notice.field_meta_tags.yml b/services/drupal/config/sync/field.field.node.public_notice.field_meta_tags.yml new file mode 100644 index 0000000000..00eec3a107 --- /dev/null +++ b/services/drupal/config/sync/field.field.node.public_notice.field_meta_tags.yml @@ -0,0 +1,28 @@ +uuid: a0e9b7ef-9756-4c73-9f60-afbce15877ae +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_meta_tags + - node.type.public_notice + module: + - custom_add_another + - metatag +third_party_settings: + custom_add_another: + custom_add_another: '' + custom_remove: '' +id: node.public_notice.field_meta_tags +field_name: field_meta_tags +entity_type: node +bundle: public_notice +label: 'Meta Tags' +description: '' +required: false +translatable: true +default_value: + - + value: 'a:1:{s:44:"schema_special_announcement_spatial_coverage";s:52:"a:2:{s:5:"@type";s:7:"Country";s:4:"name";s:2:"US";}";}' +default_value_callback: '' +settings: { } +field_type: metatag diff --git a/services/drupal/config/sync/field.field.node.regulation.field_meta_tags.yml b/services/drupal/config/sync/field.field.node.regulation.field_meta_tags.yml new file mode 100644 index 0000000000..be88e281c3 --- /dev/null +++ b/services/drupal/config/sync/field.field.node.regulation.field_meta_tags.yml @@ -0,0 +1,26 @@ +uuid: 0eadc6cd-b606-45a9-bf4b-07b59aab1048 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_meta_tags + - node.type.regulation + module: + - custom_add_another + - metatag +third_party_settings: + custom_add_another: + custom_add_another: '' + custom_remove: '' +id: node.regulation.field_meta_tags +field_name: field_meta_tags +entity_type: node +bundle: regulation +label: 'Meta Tags' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: metatag diff --git a/services/drupal/config/sync/field.field.node.web_area.field_meta_tags.yml b/services/drupal/config/sync/field.field.node.web_area.field_meta_tags.yml new file mode 100644 index 0000000000..6b2b9e8981 --- /dev/null +++ b/services/drupal/config/sync/field.field.node.web_area.field_meta_tags.yml @@ -0,0 +1,26 @@ +uuid: 63cda349-4891-4215-ad98-9697043be655 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_meta_tags + - node.type.web_area + module: + - custom_add_another + - metatag +third_party_settings: + custom_add_another: + custom_add_another: '' + custom_remove: '' +id: node.web_area.field_meta_tags +field_name: field_meta_tags +entity_type: node +bundle: web_area +label: 'Meta Tags' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: metatag diff --git a/services/drupal/config/sync/field.field.node.webform.field_meta_tags.yml b/services/drupal/config/sync/field.field.node.webform.field_meta_tags.yml new file mode 100644 index 0000000000..320bd833dd --- /dev/null +++ b/services/drupal/config/sync/field.field.node.webform.field_meta_tags.yml @@ -0,0 +1,26 @@ +uuid: 73a47746-fb3f-4dda-a1a1-1d5cc49dea8d +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_meta_tags + - node.type.webform + module: + - custom_add_another + - metatag +third_party_settings: + custom_add_another: + custom_add_another: '' + custom_remove: '' +id: node.webform.field_meta_tags +field_name: field_meta_tags +entity_type: node +bundle: webform +label: 'Meta Tags' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: metatag diff --git a/services/drupal/config/sync/field.field.paragraph.banner_slide.field_banner_image.yml b/services/drupal/config/sync/field.field.paragraph.banner_slide.field_banner_image.yml new file mode 100644 index 0000000000..58005b824a --- /dev/null +++ b/services/drupal/config/sync/field.field.paragraph.banner_slide.field_banner_image.yml @@ -0,0 +1,35 @@ +uuid: 7f728643-5b0f-4e27-a215-951606045e2a +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_banner_image + - media.type.banner_image + - paragraphs.paragraphs_type.banner_slide + module: + - custom_add_another +third_party_settings: + custom_add_another: + custom_add_another: '' + custom_remove: '' +id: paragraph.banner_slide.field_banner_image +field_name: field_banner_image +entity_type: paragraph +bundle: banner_slide +label: 'Banner Image' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:media' + handler_settings: + target_bundles: + banner_image: banner_image + sort: + field: _none + direction: ASC + auto_create: false + auto_create_bundle: '' +field_type: entity_reference diff --git a/services/drupal/config/sync/field.field.paragraph.banner_slide.field_image.yml b/services/drupal/config/sync/field.field.paragraph.banner_slide.field_image.yml index 918fb90a79..dc16ed4eb8 100644 --- a/services/drupal/config/sync/field.field.paragraph.banner_slide.field_image.yml +++ b/services/drupal/config/sync/field.field.paragraph.banner_slide.field_image.yml @@ -18,7 +18,7 @@ entity_type: paragraph bundle: banner_slide label: Image description: '' -required: true +required: false translatable: false default_value: { } default_value_callback: '' diff --git a/services/drupal/config/sync/field.storage.media.field_banner_image_restricted.yml b/services/drupal/config/sync/field.storage.media.field_banner_image_restricted.yml new file mode 100644 index 0000000000..29b1c8fbb5 --- /dev/null +++ b/services/drupal/config/sync/field.storage.media.field_banner_image_restricted.yml @@ -0,0 +1,24 @@ +uuid: 0e2dc2ee-606f-4dbd-9d35-56bff70e5714 +langcode: en +status: true +dependencies: + module: + - media + - options +id: media.field_banner_image_restricted +field_name: field_banner_image_restricted +entity_type: media +type: list_string +settings: + allowed_values: + - + value: restricted + label: Restricted + allowed_values_function: '' +module: options +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/services/drupal/config/sync/field.storage.node.field_meta_tags.yml b/services/drupal/config/sync/field.storage.node.field_meta_tags.yml new file mode 100644 index 0000000000..c13252e1af --- /dev/null +++ b/services/drupal/config/sync/field.storage.node.field_meta_tags.yml @@ -0,0 +1,19 @@ +uuid: ffd943dd-5e60-46c7-b62f-3bd5d7e4522d +langcode: en +status: true +dependencies: + module: + - metatag + - node +id: node.field_meta_tags +field_name: field_meta_tags +entity_type: node +type: metatag +settings: { } +module: metatag +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/services/drupal/config/sync/field.storage.node.field_press_office.yml b/services/drupal/config/sync/field.storage.node.field_press_office.yml index b438a226a1..5a869e275d 100644 --- a/services/drupal/config/sync/field.storage.node.field_press_office.yml +++ b/services/drupal/config/sync/field.storage.node.field_press_office.yml @@ -13,7 +13,7 @@ settings: target_type: taxonomy_term module: core locked: false -cardinality: -1 +cardinality: 1 translatable: true indexes: { } persist_with_no_fields: false diff --git a/services/drupal/config/sync/field.storage.paragraph.field_banner_image.yml b/services/drupal/config/sync/field.storage.paragraph.field_banner_image.yml new file mode 100644 index 0000000000..5962e7f799 --- /dev/null +++ b/services/drupal/config/sync/field.storage.paragraph.field_banner_image.yml @@ -0,0 +1,20 @@ +uuid: f1c7752d-e645-4724-a8c1-ba3ba13fd05b +langcode: en +status: true +dependencies: + module: + - media + - paragraphs +id: paragraph.field_banner_image +field_name: field_banner_image +entity_type: paragraph +type: entity_reference +settings: + target_type: media +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/services/drupal/config/sync/field.storage.paragraph.field_style.yml b/services/drupal/config/sync/field.storage.paragraph.field_style.yml index ab81b9ca44..782e4398e1 100644 --- a/services/drupal/config/sync/field.storage.paragraph.field_style.yml +++ b/services/drupal/config/sync/field.storage.paragraph.field_style.yml @@ -37,7 +37,7 @@ settings: label: 'RSS Feed Box' - value: blog - label: 'Blog Box' + label: 'Perspectives Box' allowed_values_function: '' module: options locked: false diff --git a/services/drupal/config/sync/flag.flag.notification_opt_in.yml b/services/drupal/config/sync/flag.flag.notification_opt_in.yml new file mode 100644 index 0000000000..6474f7bb1f --- /dev/null +++ b/services/drupal/config/sync/flag.flag.notification_opt_in.yml @@ -0,0 +1,29 @@ +uuid: 8f50bfc5-04fe-4137-83f6-726cf9c51f44 +langcode: en +status: true +dependencies: + module: + - node +id: notification_opt_in +label: 'Notification Opt-in' +bundles: { } +entity_type: node +global: false +flag_short: 'Watch this node' +flag_long: '' +flag_message: 'You are now watching this node.' +unflag_short: 'Un-watch this node' +unflag_long: '' +unflag_message: 'You are no longer watching this node.' +unflag_denied_text: '' +weight: 0 +flag_type: 'entity:node' +link_type: ajax_link +flagTypeConfig: + show_in_links: { } + show_as_field: false + show_on_form: false + show_contextual_link: false + extra_permissions: + owner: '0' +linkTypeConfig: { } diff --git a/services/drupal/config/sync/gin.settings.yml b/services/drupal/config/sync/gin.settings.yml new file mode 100644 index 0000000000..37ebacd8dd --- /dev/null +++ b/services/drupal/config/sync/gin.settings.yml @@ -0,0 +1,16 @@ +_core: + default_config_hash: UvSCt3S_NldJPFzvhSNOy9vWoPPFhmsmTC12vtVss9s +preset_accent_color: blue +preset_focus_color: gin +enable_darkmode: '0' +classic_toolbar: vertical +secondary_toolbar_frontend: true +logo: + use_default: true +high_contrast_mode: false +layout_density: default +show_description_toggle: false +show_user_theme_settings: false +third_party_settings: + shortcut: + module_link: true diff --git a/services/drupal/config/sync/group.content_type.group_content_type_1ea3403e68c48.yml b/services/drupal/config/sync/group.content_type.group_content_type_1ea3403e68c48.yml new file mode 100644 index 0000000000..c0f76fc72a --- /dev/null +++ b/services/drupal/config/sync/group.content_type.group_content_type_1ea3403e68c48.yml @@ -0,0 +1,19 @@ +uuid: e5f0bc3a-921f-4bd2-98c5-63c68870893c +langcode: en +status: true +dependencies: + config: + - group.type.web_area + - media.type.banner_image + module: + - groupmedia + - media +id: group_content_type_1ea3403e68c48 +label: 'Web Area: Group media (Banner Image)' +description: 'Adds Banner Image content to groups both publicly and privately.' +group_type: web_area +content_plugin: 'group_media:banner_image' +plugin_config: + group_cardinality: 1 + entity_cardinality: 1 + use_creation_wizard: false diff --git a/services/drupal/config/sync/group.role.web_area-30cda0a61.yml b/services/drupal/config/sync/group.role.web_area-30cda0a61.yml index 3d44cea173..148be3bf80 100644 --- a/services/drupal/config/sync/group.role.web_area-30cda0a61.yml +++ b/services/drupal/config/sync/group.role.web_area-30cda0a61.yml @@ -20,6 +20,7 @@ permissions: - 'access group_menu overview' - 'access group_node overview' - 'create group_media:audio entity' + - 'create group_media:banner_image entity' - 'create group_media:document entity' - 'create group_media:image entity' - 'create group_media:other entity' @@ -33,6 +34,7 @@ permissions: - 'create group_node:regulation entity' - 'create group_node:webform entity' - 'delete any group_media:audio entity' + - 'delete any group_media:banner_image entity' - 'delete any group_media:document entity' - 'delete any group_media:image entity' - 'delete any group_media:other entity' @@ -54,6 +56,7 @@ permissions: - 'delete any group_node:webform content' - 'delete any group_node:webform entity' - 'delete own group_media:audio entity' + - 'delete own group_media:banner_image entity' - 'delete own group_media:document entity' - 'delete own group_media:image entity' - 'delete own group_media:other entity' @@ -76,6 +79,7 @@ permissions: - 'delete own group_node:webform entity' - 'manage group_content_menu' - 'update any group_media:audio entity' + - 'update any group_media:banner_image entity' - 'update any group_media:document entity' - 'update any group_media:image entity' - 'update any group_media:other entity' @@ -99,6 +103,7 @@ permissions: - 'update any group_node:webform entity' - 'update group_menu:menu entity' - 'update own group_media:audio entity' + - 'update own group_media:banner_image entity' - 'update own group_media:document entity' - 'update own group_media:image entity' - 'update own group_media:other entity' @@ -122,6 +127,7 @@ permissions: - 'update own group_node:webform entity' - 'view group' - 'view group_media:audio entity' + - 'view group_media:banner_image entity' - 'view group_media:document entity' - 'view group_media:image entity' - 'view group_media:other entity' @@ -137,6 +143,7 @@ permissions: - 'view group_node:web_area entity' - 'view group_node:webform entity' - 'view unpublished group_media:audio entity' + - 'view unpublished group_media:banner_image entity' - 'view unpublished group_media:document entity' - 'view unpublished group_media:image entity' - 'view unpublished group_media:other entity' diff --git a/services/drupal/config/sync/group.role.web_area-a1df8f829.yml b/services/drupal/config/sync/group.role.web_area-a1df8f829.yml index 4c7a2560a6..bb8b51e2b1 100644 --- a/services/drupal/config/sync/group.role.web_area-a1df8f829.yml +++ b/services/drupal/config/sync/group.role.web_area-a1df8f829.yml @@ -21,6 +21,7 @@ permissions: - 'access group_node overview' - 'administer members' - 'create group_media:audio entity' + - 'create group_media:banner_image entity' - 'create group_media:document entity' - 'create group_media:image entity' - 'create group_media:other entity' @@ -35,6 +36,7 @@ permissions: - 'create group_node:webform entity' - 'delete any group_media:audio content' - 'delete any group_media:audio entity' + - 'delete any group_media:banner_image entity' - 'delete any group_media:document entity' - 'delete any group_media:image entity' - 'delete any group_media:other entity' @@ -58,6 +60,7 @@ permissions: - 'delete group' - 'delete own group_media:audio content' - 'delete own group_media:audio entity' + - 'delete own group_media:banner_image entity' - 'delete own group_media:document entity' - 'delete own group_media:image entity' - 'delete own group_media:other entity' @@ -83,6 +86,7 @@ permissions: - 'manage group_content_menu' - 'update any group_media:audio content' - 'update any group_media:audio entity' + - 'update any group_media:banner_image entity' - 'update any group_media:document entity' - 'update any group_media:image entity' - 'update any group_media:other entity' @@ -107,6 +111,7 @@ permissions: - 'update group_menu:menu entity' - 'update own group_media:audio content' - 'update own group_media:audio entity' + - 'update own group_media:banner_image entity' - 'update own group_media:document entity' - 'update own group_media:image entity' - 'update own group_media:other entity' @@ -132,6 +137,7 @@ permissions: - 'view group webform submissions' - 'view group_media:audio content' - 'view group_media:audio entity' + - 'view group_media:banner_image entity' - 'view group_media:document content' - 'view group_media:document entity' - 'view group_media:image content' @@ -160,6 +166,7 @@ permissions: - 'view group_node:webform content' - 'view group_node:webform entity' - 'view unpublished group_media:audio entity' + - 'view unpublished group_media:banner_image entity' - 'view unpublished group_media:document entity' - 'view unpublished group_media:image entity' - 'view unpublished group_media:other entity' diff --git a/services/drupal/config/sync/group.role.web_area-a416e6833.yml b/services/drupal/config/sync/group.role.web_area-a416e6833.yml index 96de7bf326..57776a0f4b 100644 --- a/services/drupal/config/sync/group.role.web_area-a416e6833.yml +++ b/services/drupal/config/sync/group.role.web_area-a416e6833.yml @@ -23,6 +23,7 @@ permissions: - 'administer group' - 'administer members' - 'create group_media:audio entity' + - 'create group_media:banner_image entity' - 'create group_media:document entity' - 'create group_media:image entity' - 'create group_media:other entity' @@ -38,6 +39,7 @@ permissions: - 'create group_node:webform entity' - 'delete any group_media:audio content' - 'delete any group_media:audio entity' + - 'delete any group_media:banner_image entity' - 'delete any group_media:document entity' - 'delete any group_media:image entity' - 'delete any group_media:other entity' @@ -63,6 +65,7 @@ permissions: - 'delete group' - 'delete own group_media:audio content' - 'delete own group_media:audio entity' + - 'delete own group_media:banner_image entity' - 'delete own group_media:document entity' - 'delete own group_media:image entity' - 'delete own group_media:other entity' @@ -91,6 +94,7 @@ permissions: - 'manage group_content_menu menu items' - 'update any group_media:audio content' - 'update any group_media:audio entity' + - 'update any group_media:banner_image entity' - 'update any group_media:document entity' - 'update any group_media:image entity' - 'update any group_media:other entity' @@ -116,6 +120,7 @@ permissions: - 'update group_menu:menu entity' - 'update own group_media:audio content' - 'update own group_media:audio entity' + - 'update own group_media:banner_image entity' - 'update own group_media:document entity' - 'update own group_media:image entity' - 'update own group_media:other entity' @@ -142,6 +147,7 @@ permissions: - 'view group webform submissions' - 'view group_media:audio content' - 'view group_media:audio entity' + - 'view group_media:banner_image entity' - 'view group_media:document content' - 'view group_media:document entity' - 'view group_media:image content' @@ -171,6 +177,7 @@ permissions: - 'view group_node:webform content' - 'view group_node:webform entity' - 'view unpublished group_media:audio entity' + - 'view unpublished group_media:banner_image entity' - 'view unpublished group_media:document entity' - 'view unpublished group_media:image entity' - 'view unpublished group_media:other entity' diff --git a/services/drupal/config/sync/group.role.web_area-administrator.yml b/services/drupal/config/sync/group.role.web_area-administrator.yml index 325ad167f0..32f4daafcf 100644 --- a/services/drupal/config/sync/group.role.web_area-administrator.yml +++ b/services/drupal/config/sync/group.role.web_area-administrator.yml @@ -18,6 +18,7 @@ permissions: - 'access group_node overview' - 'administer members' - 'create group_media:audio entity' + - 'create group_media:banner_image entity' - 'create group_media:document entity' - 'create group_media:image entity' - 'create group_media:other entity' @@ -31,6 +32,7 @@ permissions: - 'create group_node:regulation entity' - 'create group_node:webform entity' - 'delete any group_media:audio entity' + - 'delete any group_media:banner_image entity' - 'delete any group_media:document entity' - 'delete any group_media:image entity' - 'delete any group_media:other entity' @@ -52,6 +54,7 @@ permissions: - 'delete any group_node:webform content' - 'delete any group_node:webform entity' - 'delete own group_media:audio entity' + - 'delete own group_media:banner_image entity' - 'delete own group_media:document entity' - 'delete own group_media:image entity' - 'delete own group_media:other entity' @@ -75,6 +78,7 @@ permissions: - 'manage group_content_menu' - 'manage group_content_menu menu items' - 'update any group_media:audio entity' + - 'update any group_media:banner_image entity' - 'update any group_media:document entity' - 'update any group_media:image entity' - 'update any group_media:other entity' @@ -98,6 +102,7 @@ permissions: - 'update any group_node:webform entity' - 'update group_menu:menu entity' - 'update own group_media:audio entity' + - 'update own group_media:banner_image entity' - 'update own group_media:document entity' - 'update own group_media:image entity' - 'update own group_media:other entity' @@ -133,6 +138,7 @@ permissions: - 'view group' - 'view group webform submissions' - 'view group_media:audio entity' + - 'view group_media:banner_image entity' - 'view group_media:document entity' - 'view group_media:image entity' - 'view group_media:other entity' @@ -158,6 +164,7 @@ permissions: - 'view latest version for group_node:web_area' - 'view latest version for group_node:webform' - 'view unpublished group_media:audio entity' + - 'view unpublished group_media:banner_image entity' - 'view unpublished group_media:document entity' - 'view unpublished group_media:image entity' - 'view unpublished group_media:other entity' diff --git a/services/drupal/config/sync/group.role.web_area-anonymous.yml b/services/drupal/config/sync/group.role.web_area-anonymous.yml index 13ec708636..cc185ff32d 100644 --- a/services/drupal/config/sync/group.role.web_area-anonymous.yml +++ b/services/drupal/config/sync/group.role.web_area-anonymous.yml @@ -14,6 +14,7 @@ permissions_ui: true permissions: - 'view group' - 'view group_media:audio entity' + - 'view group_media:banner_image entity' - 'view group_media:document entity' - 'view group_media:image entity' - 'view group_media:other entity' diff --git a/services/drupal/config/sync/group.role.web_area-approver.yml b/services/drupal/config/sync/group.role.web_area-approver.yml index 1253aa9e41..f6de7d8f9f 100644 --- a/services/drupal/config/sync/group.role.web_area-approver.yml +++ b/services/drupal/config/sync/group.role.web_area-approver.yml @@ -15,6 +15,7 @@ permissions: - 'access group_media overview' - 'access group_node overview' - 'delete any group_media:audio entity' + - 'delete any group_media:banner_image entity' - 'delete any group_media:document entity' - 'delete any group_media:image entity' - 'delete any group_media:other entity' @@ -28,6 +29,7 @@ permissions: - 'delete any group_node:regulation content' - 'delete any group_node:webform content' - 'delete own group_media:audio entity' + - 'delete own group_media:banner_image entity' - 'delete own group_media:document entity' - 'delete own group_media:image entity' - 'delete own group_media:other entity' @@ -41,6 +43,7 @@ permissions: - 'delete own group_node:regulation content' - 'delete own group_node:webform content' - 'update any group_media:audio entity' + - 'update any group_media:banner_image entity' - 'update any group_media:document entity' - 'update any group_media:image entity' - 'update any group_media:other entity' @@ -54,6 +57,7 @@ permissions: - 'update any group_node:regulation content' - 'update any group_node:webform content' - 'update own group_media:audio entity' + - 'update own group_media:banner_image entity' - 'update own group_media:document entity' - 'update own group_media:image entity' - 'update own group_media:other entity' @@ -76,6 +80,7 @@ permissions: - 'view group' - 'view group webform submissions' - 'view group_media:audio entity' + - 'view group_media:banner_image entity' - 'view group_media:document entity' - 'view group_media:image entity' - 'view group_media:other entity' @@ -100,6 +105,7 @@ permissions: - 'view latest version for group_node:web_area' - 'view latest version for group_node:webform' - 'view unpublished group_media:audio entity' + - 'view unpublished group_media:banner_image entity' - 'view unpublished group_media:document entity' - 'view unpublished group_media:image entity' - 'view unpublished group_media:other entity' diff --git a/services/drupal/config/sync/group.role.web_area-editor.yml b/services/drupal/config/sync/group.role.web_area-editor.yml index f7e01d9d10..28312a03ad 100644 --- a/services/drupal/config/sync/group.role.web_area-editor.yml +++ b/services/drupal/config/sync/group.role.web_area-editor.yml @@ -24,6 +24,7 @@ permissions: - 'create group_node:regulation entity' - 'create group_node:webform entity' - 'delete any group_media:audio entity' + - 'delete any group_media:banner_image entity' - 'delete any group_media:document entity' - 'delete any group_media:image entity' - 'delete any group_media:other entity' @@ -37,6 +38,7 @@ permissions: - 'delete any group_node:regulation content' - 'delete any group_node:webform content' - 'delete own group_media:audio entity' + - 'delete own group_media:banner_image entity' - 'delete own group_media:document entity' - 'delete own group_media:image entity' - 'delete own group_media:other entity' @@ -53,6 +55,7 @@ permissions: - 'manage group_content_menu' - 'manage group_content_menu menu items' - 'update any group_media:audio entity' + - 'update any group_media:banner_image entity' - 'update any group_media:document entity' - 'update any group_media:image entity' - 'update any group_media:other entity' @@ -76,6 +79,7 @@ permissions: - 'update any group_node:webform entity' - 'update group_menu:menu entity' - 'update own group_media:audio entity' + - 'update own group_media:banner_image entity' - 'update own group_media:document entity' - 'update own group_media:image entity' - 'update own group_media:other entity' @@ -110,6 +114,7 @@ permissions: - 'view group' - 'view group webform submissions' - 'view group_media:audio entity' + - 'view group_media:banner_image entity' - 'view group_media:document entity' - 'view group_media:image entity' - 'view group_media:other entity' @@ -134,6 +139,7 @@ permissions: - 'view latest version for group_node:web_area' - 'view latest version for group_node:webform' - 'view unpublished group_media:audio entity' + - 'view unpublished group_media:banner_image entity' - 'view unpublished group_media:document entity' - 'view unpublished group_media:image entity' - 'view unpublished group_media:other entity' diff --git a/services/drupal/config/sync/group.role.web_area-fc54bfd29.yml b/services/drupal/config/sync/group.role.web_area-fc54bfd29.yml new file mode 100644 index 0000000000..00ca14ad92 --- /dev/null +++ b/services/drupal/config/sync/group.role.web_area-fc54bfd29.yml @@ -0,0 +1,17 @@ +uuid: a23cabc5-9309-44ee-a6a3-ec6c64512286 +langcode: en +status: true +dependencies: + config: + - group.type.web_area + enforced: + config: + - user.role.beta_tester +id: web_area-fc54bfd29 +label: 'Beta Tester' +weight: 0 +internal: true +audience: outsider +group_type: web_area +permissions_ui: false +permissions: { } diff --git a/services/drupal/config/sync/group.role.web_area-member.yml b/services/drupal/config/sync/group.role.web_area-member.yml index f42b784236..2839a6868b 100644 --- a/services/drupal/config/sync/group.role.web_area-member.yml +++ b/services/drupal/config/sync/group.role.web_area-member.yml @@ -15,6 +15,7 @@ permissions: - 'access group_media overview' - 'access group_node overview' - 'create group_media:audio entity' + - 'create group_media:banner_image entity' - 'create group_media:document entity' - 'create group_media:image entity' - 'create group_media:other entity' @@ -27,11 +28,13 @@ permissions: - 'create group_node:public_notice entity' - 'create group_node:regulation entity' - 'delete any group_media:audio entity' + - 'delete any group_media:banner_image entity' - 'delete any group_media:document entity' - 'delete any group_media:image entity' - 'delete any group_media:other entity' - 'delete any group_media:remote_video entity' - 'delete own group_media:audio entity' + - 'delete own group_media:banner_image entity' - 'delete own group_media:document entity' - 'delete own group_media:image entity' - 'delete own group_media:other entity' @@ -53,6 +56,7 @@ permissions: - 'revert group_node:web_area revision' - 'revert group_node:webform revision' - 'update any group_media:audio entity' + - 'update any group_media:banner_image entity' - 'update any group_media:document entity' - 'update any group_media:image entity' - 'update any group_media:other entity' @@ -65,6 +69,7 @@ permissions: - 'update any group_node:public_notice entity' - 'update any group_node:regulation entity' - 'update own group_media:audio entity' + - 'update own group_media:banner_image entity' - 'update own group_media:document entity' - 'update own group_media:image entity' - 'update own group_media:other entity' @@ -92,6 +97,7 @@ permissions: - 'view group' - 'view group webform submissions' - 'view group_media:audio entity' + - 'view group_media:banner_image entity' - 'view group_media:document entity' - 'view group_media:image entity' - 'view group_media:other entity' @@ -125,6 +131,7 @@ permissions: - 'view latest version for group_node:web_area' - 'view latest version for group_node:webform' - 'view unpublished group_media:audio entity' + - 'view unpublished group_media:banner_image entity' - 'view unpublished group_media:document entity' - 'view unpublished group_media:image entity' - 'view unpublished group_media:other entity' diff --git a/services/drupal/config/sync/group.role.web_area-outsider.yml b/services/drupal/config/sync/group.role.web_area-outsider.yml index 32c9eecd4b..424bb6b025 100644 --- a/services/drupal/config/sync/group.role.web_area-outsider.yml +++ b/services/drupal/config/sync/group.role.web_area-outsider.yml @@ -32,6 +32,7 @@ permissions: - 'view all group_node:webform revisions' - 'view group' - 'view group_media:audio entity' + - 'view group_media:banner_image entity' - 'view group_media:document entity' - 'view group_media:image entity' - 'view group_media:other entity' diff --git a/services/drupal/config/sync/group.role.web_area-watcher.yml b/services/drupal/config/sync/group.role.web_area-watcher.yml new file mode 100644 index 0000000000..affa8f73db --- /dev/null +++ b/services/drupal/config/sync/group.role.web_area-watcher.yml @@ -0,0 +1,14 @@ +uuid: 2f964cb4-c49d-4ca4-8805-98b199438397 +langcode: en +status: true +dependencies: + config: + - group.type.web_area +id: web_area-watcher +label: Watcher +weight: 0 +internal: false +audience: member +group_type: web_area +permissions_ui: true +permissions: { } diff --git a/services/drupal/config/sync/language.content_settings.media.banner_image.yml b/services/drupal/config/sync/language.content_settings.media.banner_image.yml new file mode 100644 index 0000000000..5d8c065763 --- /dev/null +++ b/services/drupal/config/sync/language.content_settings.media.banner_image.yml @@ -0,0 +1,11 @@ +uuid: 48ed15ff-43dd-448f-ba02-5d484c6f6353 +langcode: en +status: true +dependencies: + config: + - media.type.banner_image +id: media.banner_image +target_entity_type_id: media +target_bundle: banner_image +default_langcode: site_default +language_alterable: false diff --git a/services/drupal/config/sync/language/es/block.block.gin_breadcrumbs.yml b/services/drupal/config/sync/language/es/block.block.gin_breadcrumbs.yml new file mode 100644 index 0000000000..6e0e4c18ee --- /dev/null +++ b/services/drupal/config/sync/language/es/block.block.gin_breadcrumbs.yml @@ -0,0 +1,2 @@ +settings: + label: 'Enlaces de ayuda a la navegación' diff --git a/services/drupal/config/sync/language/es/block.block.gin_content.yml b/services/drupal/config/sync/language/es/block.block.gin_content.yml new file mode 100644 index 0000000000..36e9235de4 --- /dev/null +++ b/services/drupal/config/sync/language/es/block.block.gin_content.yml @@ -0,0 +1,2 @@ +settings: + label: 'Contenido principal de la página' diff --git a/services/drupal/config/sync/language/es/block.block.gin_local_actions.yml b/services/drupal/config/sync/language/es/block.block.gin_local_actions.yml new file mode 100644 index 0000000000..459ce626ee --- /dev/null +++ b/services/drupal/config/sync/language/es/block.block.gin_local_actions.yml @@ -0,0 +1,2 @@ +settings: + label: 'Acciones principales de la administración' diff --git a/services/drupal/config/sync/language/es/block.block.gin_messages.yml b/services/drupal/config/sync/language/es/block.block.gin_messages.yml new file mode 100644 index 0000000000..45667cbd82 --- /dev/null +++ b/services/drupal/config/sync/language/es/block.block.gin_messages.yml @@ -0,0 +1,2 @@ +settings: + label: 'Mensajes de estado' diff --git a/services/drupal/config/sync/language/es/block.block.gin_page_title.yml b/services/drupal/config/sync/language/es/block.block.gin_page_title.yml new file mode 100644 index 0000000000..a0c2f3d106 --- /dev/null +++ b/services/drupal/config/sync/language/es/block.block.gin_page_title.yml @@ -0,0 +1,2 @@ +settings: + label: 'Título de la página' diff --git a/services/drupal/config/sync/language/es/block.block.gin_primary_local_tasks.yml b/services/drupal/config/sync/language/es/block.block.gin_primary_local_tasks.yml new file mode 100644 index 0000000000..8183284027 --- /dev/null +++ b/services/drupal/config/sync/language/es/block.block.gin_primary_local_tasks.yml @@ -0,0 +1,2 @@ +settings: + label: 'Solapas principales' diff --git a/services/drupal/config/sync/language/es/block.block.gin_secondary_local_tasks.yml b/services/drupal/config/sync/language/es/block.block.gin_secondary_local_tasks.yml new file mode 100644 index 0000000000..7674ece784 --- /dev/null +++ b/services/drupal/config/sync/language/es/block.block.gin_secondary_local_tasks.yml @@ -0,0 +1,2 @@ +settings: + label: 'Solapas secundarias' diff --git a/services/drupal/config/sync/media.type.banner_image.yml b/services/drupal/config/sync/media.type.banner_image.yml new file mode 100644 index 0000000000..a18ed00d6f --- /dev/null +++ b/services/drupal/config/sync/media.type.banner_image.yml @@ -0,0 +1,14 @@ +uuid: 20cadc07-237e-4e60-99b5-597d20dfe762 +langcode: en +status: true +dependencies: { } +id: banner_image +label: 'Banner Image' +description: 'Banner image to be used with Hero Banners' +source: image +queue_thumbnail_downloads: false +new_revision: false +source_configuration: + source_field: field_media_image +field_map: + name: name diff --git a/services/drupal/config/sync/metatag.metatag_defaults.node.yml b/services/drupal/config/sync/metatag.metatag_defaults.node.yml index 9c919a0a65..617e96383f 100644 --- a/services/drupal/config/sync/metatag.metatag_defaults.node.yml +++ b/services/drupal/config/sync/metatag.metatag_defaults.node.yml @@ -7,37 +7,37 @@ _core: id: node label: Content tags: + epa_description: '[node:field_description:value]' + epa_created: '[node:created:custom:Y-m-d]' epa_channel: '[node:field_channel]' + epa_regulation: '[node:field_env_laws_regs_and_treaties]' + epa_type: '[node:field_type]' epa_contenttype: '[node:content-type]' - epa_coverage: '[node:field_geographic_locations]' - epa_created: '[node:created:custom:Y-m-d]' + epa_title: '[node:title]' + epa_webarea: '[node:group:field_homepage:entity:title]' epa_creator: '[node:group:field_publisher:entity:name]' - epa_description: '[node:field_description:value]' epa_language: '[node:field_language:value]' epa_modified: '[node:field_last_published:date:custom:Y-m-d]' - epa_regulation: '[node:field_env_laws_regs_and_treaties]' - epa_reviewed: '[node:field_review_deadline:date:custom:Y-m-d]' - epa_title: '[node:title]' - epa_type: '[node:field_type]' - epa_webarea: '[node:group:field_homepage:entity:title]' epa_navigation_style: '[node:group:field_navigation_style:value]' - description: '[node:field_description:value]' - keywords: '[node:field_keywords]' + epa_coverage: '[node:field_geographic_locations]' + epa_reviewed: '[node:field_review_deadline:date:custom:Y-m-d]' title: '[node:title] | [site:name]' - article_modified_time: '[node:field_last_published:date:custom:Y-m-d]' - article_published_time: '[node:created:custom:c]' - og_country_name: 'United States of America' - og_description: '[node:field_description:value]' - og_image: '[node:group:field_share_image:entity:field_media_image:entity:url]' - og_image_alt: '[node:group:field_share_image:entity:field_media_image:alt]' + keywords: '[node:field_keywords]' + description: '[node:field_description:value]' og_site_name: '[site:name]' - og_title: '[node:title] | [site:name]' - og_type: '[node:content-type]' og_updated_time: '[node:field_last_published:date:custom:Y-m-d]' og_url: '[current-page:url:absolute]' + article_published_time: '[node:created:custom:c]' + og_image: '[node:group:field_share_image:entity:field_media_image:entity:url]' + og_type: '[node:content-type]' + og_country_name: 'United States of America' + og_title: '[node:title] | [site:name]' + og_image_alt: '[node:group:field_share_image:entity:field_media_image:alt]' + article_modified_time: '[node:field_last_published:date:custom:Y-m-d]' + og_description: '[node:field_description:value]' twitter_cards_description: '[node:field_description:value]' twitter_cards_image: '[node:group:field_share_image:entity:field_media_image:entity:url]' - twitter_cards_image_alt: '[node:group:field_share_image:entity:field_media_image:alt]' - twitter_cards_page_url: '[current-page:url:absolute]' twitter_cards_title: '[node:title] | [site:name]' + twitter_cards_image_alt: '[node:group:field_share_image:entity:field_media_image:alt]' twitter_cards_type: summary_large_image + twitter_cards_page_url: '[current-page:url:absolute]' diff --git a/services/drupal/config/sync/metatag.metatag_defaults.node__public_notice.yml b/services/drupal/config/sync/metatag.metatag_defaults.node__public_notice.yml index 17bdc278c6..00887706fd 100644 --- a/services/drupal/config/sync/metatag.metatag_defaults.node__public_notice.yml +++ b/services/drupal/config/sync/metatag.metatag_defaults.node__public_notice.yml @@ -6,3 +6,10 @@ id: node__public_notice label: 'Content: Public Notice' tags: title: 'Public Notice: [node:title] | [site:name]' + schema_special_announcement_category: 'https://www.wikidata.org/wiki/Q81068910' + schema_special_announcement_type: SpecialAnnouncement + schema_special_announcement_spatial_coverage: 'a:2:{s:5:"@type";s:7:"Country";s:4:"name";s:2:"US";}' + schema_special_announcement_date_posted: '[node:created:html_datetime].' + schema_special_announcement_text: '[node:field_description:value]' + schema_special_announcement_expires: '[node:field_review_deadline:date:html_datetime]' + schema_special_announcement_name: '[node:title] | [site:name]' diff --git a/services/drupal/config/sync/metatag.settings.yml b/services/drupal/config/sync/metatag.settings.yml new file mode 100644 index 0000000000..58bd7ac6a5 --- /dev/null +++ b/services/drupal/config/sync/metatag.settings.yml @@ -0,0 +1,38 @@ +entity_type_groups: + node: + event: + open_graph: open_graph + twitter_cards: twitter_cards + schema_special_announcement: schema_special_announcement + faq: + open_graph: open_graph + twitter_cards: twitter_cards + schema_special_announcement: schema_special_announcement + news_release: + open_graph: open_graph + twitter_cards: twitter_cards + schema_special_announcement: schema_special_announcement + page: + open_graph: open_graph + twitter_cards: twitter_cards + schema_special_announcement: schema_special_announcement + perspective: + open_graph: open_graph + twitter_cards: twitter_cards + schema_special_announcement: schema_special_announcement + public_notice: + open_graph: open_graph + twitter_cards: twitter_cards + schema_special_announcement: schema_special_announcement + regulation: + open_graph: open_graph + twitter_cards: twitter_cards + schema_special_announcement: schema_special_announcement + webform: + open_graph: open_graph + twitter_cards: twitter_cards + schema_special_announcement: schema_special_announcement + web_area: + open_graph: open_graph + twitter_cards: twitter_cards + schema_special_announcement: schema_special_announcement diff --git a/services/drupal/config/sync/rabbit_hole.behavior_settings.media_type_banner_image.yml b/services/drupal/config/sync/rabbit_hole.behavior_settings.media_type_banner_image.yml new file mode 100644 index 0000000000..efa191b48f --- /dev/null +++ b/services/drupal/config/sync/rabbit_hole.behavior_settings.media_type_banner_image.yml @@ -0,0 +1,14 @@ +uuid: 2c0a965f-b5ce-43f9-8a23-ed8e95ec7f6e +langcode: en +status: true +dependencies: + config: + - media.type.banner_image +id: media_type_banner_image +entity_type_id: media_type +entity_id: banner_image +action: display_page +allow_override: 1 +redirect: '' +redirect_code: 301 +redirect_fallback_action: access_denied diff --git a/services/drupal/config/sync/rabbit_hole.behavior_settings.taxonomy_vocabulary_author.yml b/services/drupal/config/sync/rabbit_hole.behavior_settings.taxonomy_vocabulary_author.yml index 7ff20e4519..aa06ef8aef 100644 --- a/services/drupal/config/sync/rabbit_hole.behavior_settings.taxonomy_vocabulary_author.yml +++ b/services/drupal/config/sync/rabbit_hole.behavior_settings.taxonomy_vocabulary_author.yml @@ -7,7 +7,7 @@ dependencies: id: taxonomy_vocabulary_author entity_type_id: taxonomy_vocabulary entity_id: author -action: display_page +action: page_not_found allow_override: 1 redirect: '' redirect_code: 301 diff --git a/services/drupal/config/sync/role_theme_switcher.settings.yml b/services/drupal/config/sync/role_theme_switcher.settings.yml new file mode 100644 index 0000000000..e549dfd092 --- /dev/null +++ b/services/drupal/config/sync/role_theme_switcher.settings.yml @@ -0,0 +1,45 @@ +roles: + anonymous: + theme: '' + weight: '-49' + admin_theme: '' + authenticated: + theme: '' + weight: '-48' + admin_theme: '' + paragraphs_library_contributor: + theme: '' + weight: '-47' + admin_theme: '' + layout_editor: + theme: '' + weight: '-46' + admin_theme: '' + alerts_manager: + theme: '' + weight: '-45' + admin_theme: '' + block_manager: + theme: '' + weight: '-44' + admin_theme: '' + system_editor: + theme: '' + weight: '-43' + admin_theme: '' + system_webmaster: + theme: '' + weight: '-42' + admin_theme: '' + menu_admin: + theme: '' + weight: '-41' + admin_theme: '' + administrator: + theme: '' + weight: '-40' + admin_theme: '' + beta_tester: + theme: '' + weight: '-50' + admin_theme: epa_claro diff --git a/services/drupal/config/sync/search_api.index.frequent_questions.yml b/services/drupal/config/sync/search_api.index.frequent_questions.yml index e64b40cbe7..649432a298 100644 --- a/services/drupal/config/sync/search_api.index.frequent_questions.yml +++ b/services/drupal/config/sync/search_api.index.frequent_questions.yml @@ -97,6 +97,7 @@ processor_settings: add_url: { } aggregated_field: { } entity_status: { } + entity_type: { } hierarchy: weights: preprocess_index: -50 @@ -124,12 +125,11 @@ processor_settings: weights: preprocess_index: -20 preprocess_query: -20 - all_fields: true + all_fields: false fields: - body - field_description - field_question - - type language_with_fallback: { } rendered_item: { } stemmer: diff --git a/services/drupal/config/sync/search_api.index.media.yml b/services/drupal/config/sync/search_api.index.media.yml index bf9d0f8acd..3acae91ddb 100644 --- a/services/drupal/config/sync/search_api.index.media.yml +++ b/services/drupal/config/sync/search_api.index.media.yml @@ -10,11 +10,12 @@ dependencies: - field.storage.media.field_media_image - field.storage.media.field_publication_number - field.storage.media.field_media_tags + - field.storage.media.field_banner_image_restricted - search_api.server.localhost module: - - file - media - user + - file - entitygroupfield - group - search_api @@ -67,6 +68,14 @@ field_settings: dependencies: module: - media + field_banner_image_restricted: + label: 'Usage restrictions' + datasource_id: 'entity:media' + property_path: field_banner_image_restricted + type: string + dependencies: + config: + - field.storage.media.field_banner_image_restricted field_description: label: Description datasource_id: 'entity:media' @@ -178,11 +187,12 @@ datasource_settings: processor_settings: add_url: { } aggregated_field: { } + entity_type: { } ignorecase: weights: preprocess_index: -20 preprocess_query: -20 - all_fields: false + all_fields: true fields: - aggregated_filenames - author_name @@ -201,9 +211,14 @@ processor_settings: weights: preprocess_index: 0 preprocess_query: 0 - all_fields: false + all_fields: true fields: + - aggregated_filenames - field_description + - filename + - filename_1 + - filename_2 + - filename_3 - name exceptions: mexican: mexic @@ -212,9 +227,14 @@ processor_settings: weights: preprocess_index: -5 preprocess_query: -2 - all_fields: false + all_fields: true fields: + - aggregated_filenames - field_description + - filename + - filename_1 + - filename_2 + - filename_3 - name stopwords: - a @@ -256,24 +276,34 @@ processor_settings: weights: preprocess_index: -6 preprocess_query: -6 - all_fields: false + all_fields: true fields: + - aggregated_filenames - field_description + - filename + - filename_1 + - filename_2 + - filename_3 - name - spaces: '' - ignored: ._- + spaces: ._- + ignored: '' overlap_cjk: 1 - minimum_word_size: '3' + minimum_word_size: '2' transliteration: weights: preprocess_index: -20 preprocess_query: -20 - all_fields: false + all_fields: true fields: + - aggregated_filenames - author_name - bundle - field_description - field_publication_number + - filename + - filename_1 + - filename_2 + - filename_3 - name - web_area_name tracker_settings: diff --git a/services/drupal/config/sync/search_api.index.news_releases.yml b/services/drupal/config/sync/search_api.index.news_releases.yml index 8934da2fce..6805d8bb2a 100644 --- a/services/drupal/config/sync/search_api.index.news_releases.yml +++ b/services/drupal/config/sync/search_api.index.news_releases.yml @@ -93,7 +93,7 @@ field_settings: type: text configuration: roles: - anonymous: anonymous + - anonymous view_mode: 'entity:node': news_release: search_index @@ -135,6 +135,7 @@ processor_settings: add_url: { } aggregated_field: { } entity_status: { } + entity_type: { } hierarchy: weights: preprocess_index: -45 @@ -146,11 +147,14 @@ processor_settings: weights: preprocess_index: -49 preprocess_query: -47 - all_fields: false + all_fields: true fields: - field_description + - field_language + - field_secondary_headline - rendered_item - title + - type title: false alt: true tags: @@ -163,14 +167,12 @@ processor_settings: weights: preprocess_index: -20 preprocess_query: -20 - all_fields: true + all_fields: false fields: - field_description - - field_language - field_secondary_headline - rendered_item - title - - type language_with_fallback: { } rendered_item: { } stemmer: diff --git a/services/drupal/config/sync/search_api.index.perspectives.yml b/services/drupal/config/sync/search_api.index.perspectives.yml index 9ed81c080b..18a9702f1d 100644 --- a/services/drupal/config/sync/search_api.index.perspectives.yml +++ b/services/drupal/config/sync/search_api.index.perspectives.yml @@ -88,7 +88,7 @@ field_settings: type: text configuration: roles: - anonymous: anonymous + - anonymous view_mode: 'entity:node': perspective: search_index @@ -130,6 +130,7 @@ processor_settings: add_url: { } aggregated_field: { } entity_status: { } + entity_type: { } hierarchy: weights: preprocess_index: -47 @@ -141,9 +142,13 @@ processor_settings: weights: preprocess_index: -50 preprocess_query: -47 - all_fields: false + all_fields: true fields: + - field_description + - field_language + - rendered_item - title + - type title: false alt: true tags: @@ -156,13 +161,11 @@ processor_settings: weights: preprocess_index: -20 preprocess_query: -20 - all_fields: true + all_fields: false fields: - field_description - - field_language - rendered_item - title - - type language_with_fallback: { } rendered_item: { } stemmer: diff --git a/services/drupal/config/sync/search_api.index.public_notices.yml b/services/drupal/config/sync/search_api.index.public_notices.yml index 93df2e3111..3a1a20d209 100644 --- a/services/drupal/config/sync/search_api.index.public_notices.yml +++ b/services/drupal/config/sync/search_api.index.public_notices.yml @@ -191,13 +191,22 @@ processor_settings: add_url: { } aggregated_field: { } entity_status: { } + entity_type: { } html_filter: weights: preprocess_index: -49 preprocess_query: -47 - all_fields: false + all_fields: true fields: + - aggregated_field + - body + - field_description + - field_location_proposed_other + - field_location_proposed_other_fulltext + - name + - name_fulltext - title + - type title: false alt: true tags: @@ -210,7 +219,7 @@ processor_settings: weights: preprocess_index: -20 preprocess_query: -20 - all_fields: true + all_fields: false fields: - aggregated_field - body @@ -220,7 +229,6 @@ processor_settings: - name - name_fulltext - title - - type language_with_fallback: { } rendered_item: { } stemmer: diff --git a/services/drupal/config/sync/system.action.flag_action.notification_opt_in_flag.yml b/services/drupal/config/sync/system.action.flag_action.notification_opt_in_flag.yml new file mode 100644 index 0000000000..b0ebaecb97 --- /dev/null +++ b/services/drupal/config/sync/system.action.flag_action.notification_opt_in_flag.yml @@ -0,0 +1,15 @@ +uuid: 05ca08ce-46cc-4511-ac7b-442b53113ecc +langcode: en +status: true +dependencies: + config: + - flag.flag.notification_opt_in + module: + - flag +id: flag_action.notification_opt_in_flag +label: 'Watch node' +type: node +plugin: 'flag_action:notification_opt_in_flag' +configuration: + flag_id: notification_opt_in + flag_action: flag diff --git a/services/drupal/config/sync/system.action.flag_action.notification_opt_in_unflag.yml b/services/drupal/config/sync/system.action.flag_action.notification_opt_in_unflag.yml new file mode 100644 index 0000000000..bc6be7c3db --- /dev/null +++ b/services/drupal/config/sync/system.action.flag_action.notification_opt_in_unflag.yml @@ -0,0 +1,15 @@ +uuid: 8e2fd227-84ef-4a3d-96d3-a4c950125bc2 +langcode: en +status: true +dependencies: + config: + - flag.flag.notification_opt_in + module: + - flag +id: flag_action.notification_opt_in_unflag +label: 'Un-watch node' +type: node +plugin: 'flag_action:notification_opt_in_unflag' +configuration: + flag_id: notification_opt_in + flag_action: unflag diff --git a/services/drupal/config/sync/system.action.flag_delete_flagging.yml b/services/drupal/config/sync/system.action.flag_delete_flagging.yml new file mode 100644 index 0000000000..19ccc01499 --- /dev/null +++ b/services/drupal/config/sync/system.action.flag_delete_flagging.yml @@ -0,0 +1,13 @@ +uuid: dd741f76-0e24-4d29-a385-45f44f5eaf9b +langcode: en +status: true +dependencies: + module: + - flag +_core: + default_config_hash: Z9dGFmjyQgZjDwdsI-Mmgd2tZkUsjYi7cOSUPqjXPtw +id: flag_delete_flagging +label: 'Delete flagging' +type: flagging +plugin: flag_delete_flagging +configuration: { } diff --git a/services/drupal/config/sync/system.action.user_add_role_action.beta_tester.yml b/services/drupal/config/sync/system.action.user_add_role_action.beta_tester.yml new file mode 100644 index 0000000000..f1c17c074f --- /dev/null +++ b/services/drupal/config/sync/system.action.user_add_role_action.beta_tester.yml @@ -0,0 +1,14 @@ +uuid: ec4efd9d-e046-4eb4-bf4e-d4235f36f4ee +langcode: en +status: true +dependencies: + config: + - user.role.beta_tester + module: + - user +id: user_add_role_action.beta_tester +label: 'Add the Beta Tester role to the selected user(s)' +type: user +plugin: user_add_role_action +configuration: + rid: beta_tester diff --git a/services/drupal/config/sync/system.action.user_remove_role_action.beta_tester.yml b/services/drupal/config/sync/system.action.user_remove_role_action.beta_tester.yml new file mode 100644 index 0000000000..e0b3c7d4ae --- /dev/null +++ b/services/drupal/config/sync/system.action.user_remove_role_action.beta_tester.yml @@ -0,0 +1,14 @@ +uuid: 309e78f3-569b-4229-ab67-44f56d60ec05 +langcode: en +status: true +dependencies: + config: + - user.role.beta_tester + module: + - user +id: user_remove_role_action.beta_tester +label: 'Remove the Beta Tester role from the selected user(s)' +type: user +plugin: user_remove_role_action +configuration: + rid: beta_tester diff --git a/services/drupal/config/sync/system.mail.yml b/services/drupal/config/sync/system.mail.yml index ca57f8ee65..68e9719d92 100644 --- a/services/drupal/config/sync/system.mail.yml +++ b/services/drupal/config/sync/system.mail.yml @@ -2,3 +2,4 @@ _core: default_config_hash: rYgt7uhPafP2ngaN_ZUPFuyI4KdE0zU868zLNSlzKoE interface: default: SMTPMailSystem + webform: webform_php_mail diff --git a/services/drupal/config/sync/user.mail.yml b/services/drupal/config/sync/user.mail.yml index 224d083122..47af706fe1 100644 --- a/services/drupal/config/sync/user.mail.yml +++ b/services/drupal/config/sync/user.mail.yml @@ -20,8 +20,8 @@ register_pending_approval_admin: subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)' body: "[user:display-name] has applied for an account.\r\n\r\n[user:edit-url]" status_activated: - subject: 'Account details for [user:display-name] at [site:name] (approved)' - body: "[user:display-name],\r\n\r\nYour account at [site:name] has been activated.\r\n\r\nYou may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:account-name]\r\npassword: Your password\r\n\r\n-- [site:name] team" + subject: 'Account for [user:display-name] at [site:name] has been un-blocked' + body: "[user:display-name],\r\n\r\nYour account at [site:name] has been activated. You may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[site:login-url]\r\n\r\n-- [site:name] team" status_blocked: subject: 'Account details for [user:display-name] at [site:name] (blocked)' body: "[user:display-name],\r\n\r\nYour account on [site:name] has been blocked.\r\n\r\n-- [site:name] team" diff --git a/services/drupal/config/sync/user.role.authenticated.yml b/services/drupal/config/sync/user.role.authenticated.yml index 301ce5d867..773d2a965c 100644 --- a/services/drupal/config/sync/user.role.authenticated.yml +++ b/services/drupal/config/sync/user.role.authenticated.yml @@ -30,6 +30,7 @@ dependencies: - epa_media - epa_web_areas - filter + - flag - group - media - node @@ -110,6 +111,8 @@ permissions: - 'execute node_promote_action node' - 'execute node_unpromote_action node' - 'execute node_unpublish_by_keyword_action node' + - 'execute notification_opt_in_flag node' + - 'execute notification_opt_in_unflag node' - 'execute user_add_role_action user' - 'execute user_block_user_action user' - 'execute user_remove_role_action user' @@ -124,12 +127,14 @@ permissions: - 'execute webform_submission_make_unlock_action webform_submission' - 'execute webform_submission_make_unsticky_action webform_submission' - 'execute webform_unarchive_action webform' + - 'flag notification_opt_in' - 'rabbit hole bypass group' - 'rabbit hole bypass media' - 'reassign group content' - 'revert all revisions' - 'revert epa_default revisions to draft' - 'take_ownership_on_clone node entity' + - 'unflag notification_opt_in' - 'use admin toolbar search' - 'use blizz_bulk_creator ajax autocomplete' - 'use siteimprove' diff --git a/services/drupal/config/sync/user.role.beta_tester.yml b/services/drupal/config/sync/user.role.beta_tester.yml new file mode 100644 index 0000000000..f61dcef63a --- /dev/null +++ b/services/drupal/config/sync/user.role.beta_tester.yml @@ -0,0 +1,9 @@ +uuid: bb04e05b-a23b-4909-b304-19f136098885 +langcode: en +status: true +dependencies: { } +id: beta_tester +label: 'Beta Tester' +weight: 0 +is_admin: null +permissions: { } diff --git a/services/drupal/config/sync/user.role.system_webmaster.yml b/services/drupal/config/sync/user.role.system_webmaster.yml index 8c0ca2da9e..3275e7d8a3 100644 --- a/services/drupal/config/sync/user.role.system_webmaster.yml +++ b/services/drupal/config/sync/user.role.system_webmaster.yml @@ -20,6 +20,7 @@ dependencies: - block - block_content_permissions - content_moderation + - editoria11y - entity_usage - epa_core - epa_media @@ -88,6 +89,8 @@ permissions: - 'edit paragraph library item' - 'execute node_assign_owner_action node' - 'export news releases' + - 'mark as hidden in editoria11y' + - 'mark as ok in editoria11y' - 'permit news releases' - 'permit perspectives' - 'reassign group content' @@ -113,6 +116,7 @@ permissions: - 'use text format full_html' - 'view all media revisions' - 'view any unpublished content' + - 'view editoria11y checker' - 'view latest version' - 'view paragraphs library listing' - 'view the administration theme' diff --git a/services/drupal/config/sync/views.settings.yml b/services/drupal/config/sync/views.settings.yml index a6f2156207..4ab1a1b9da 100644 --- a/services/drupal/config/sync/views.settings.yml +++ b/services/drupal/config/sync/views.settings.yml @@ -2,7 +2,7 @@ _core: default_config_hash: RaRd9EIcwA4u3qCSRLL8EnCicbda1kV__ASmVbyehvQ display_extenders: views_ajax_get: views_ajax_get -skip_cache: false +skip_cache: true sql_signature: false ui: show: diff --git a/services/drupal/config/sync/views.view.files.yml b/services/drupal/config/sync/views.view.files.yml index f0b71d441b..820d37f13a 100644 --- a/services/drupal/config/sync/views.view.files.yml +++ b/services/drupal/config/sync/views.view.files.yml @@ -3,8 +3,10 @@ langcode: en status: true dependencies: module: + - epa_s3fs - file - user + - views_autocomplete_filters _core: default_config_hash: rRWxAX-IQkJ5viACQRovRkC784EyCl9493GU_G23n2Q id: files @@ -621,6 +623,11 @@ display: default_group: All default_group_multiple: { } group_items: { } + filter_groups: + operator: AND + groups: + 1: AND + 2: OR style: type: table options: @@ -725,7 +732,7 @@ display: footer: { } display_extenders: { } cache_metadata: - max-age: 0 + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' @@ -739,9 +746,208 @@ display: display_plugin: page position: 1 display_options: + filters: + filename: + id: filename + table: file_managed + field: filename + relationship: none + group_type: group + admin_label: '' + entity_type: file + entity_field: filename + plugin_id: string + operator: word + value: '' + group: 1 + exposed: true + expose: + operator_id: filemime_op + label: Filename + description: '' + use_operator: false + operator: filename_op + operator_limit_selection: false + operator_list: { } + identifier: filename + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + filemime: + id: filemime + table: file_managed + field: filemime + relationship: none + group_type: group + admin_label: '' + entity_type: file + entity_field: filemime + plugin_id: string + operator: word + value: '' + group: 1 + exposed: true + expose: + operator_id: filemime_op + label: 'MIME type' + description: '' + use_operator: false + operator: filemime_op + operator_limit_selection: false + operator_list: { } + identifier: filemime + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + status: + id: status + table: file_managed + field: status + relationship: none + group_type: group + admin_label: '' + entity_type: file + entity_field: status + plugin_id: file_status + operator: in + value: { } + group: 1 + exposed: true + expose: + operator_id: status_op + label: Status + description: '' + use_operator: false + operator: status_op + operator_limit_selection: false + operator_list: { } + identifier: status + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + uri_collated: + id: uri_collated + table: s3fs_file + field: uri_collated + relationship: s3fs_file + group_type: group + admin_label: '' + plugin_id: views_autocomplete_filters_string + operator: 'not empty' + value: '' + group: 1 + exposed: true + expose: + operator_id: uri_collated_op + label: 'S3 Status' + description: '' + use_operator: true + operator: uri_collated_op + operator_limit_selection: true + operator_list: + empty: empty + 'not empty': 'not empty' + identifier: uri_collated + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + paragraphs_library_contributor: '0' + layout_editor: '0' + alerts_manager: '0' + block_manager: '0' + system_editor: '0' + system_webmaster: '0' + menu_admin: '0' + administrator: '0' + placeholder: '' + autocomplete_filter: 0 + autocomplete_min_chars: '0' + autocomplete_items: '10' + autocomplete_field: '' + autocomplete_raw_suggestion: 1 + autocomplete_raw_dropdown: 1 + autocomplete_dependent: 0 + is_grouped: true + group_info: + label: 'S3 Status' + description: '' + identifier: uri_collated + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: + 1: + title: Missing + operator: empty + value: '' + 2: + title: Present + operator: 'not empty' + value: '' + filter_groups: + operator: AND + groups: + 1: AND defaults: pager: true relationships: false + filters: false + filter_groups: false relationships: fid: id: fid @@ -751,6 +957,16 @@ display: group_type: group admin_label: 'File usage' required: false + s3fs_file: + id: s3fs_file + table: file_managed + field: s3fs_file + relationship: none + group_type: group + admin_label: 'S3FS Files' + entity_type: file + plugin_id: standard + required: false display_description: '' display_extenders: { } path: admin/content/files @@ -762,7 +978,7 @@ display: menu_name: admin context: '' cache_metadata: - max-age: 0 + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' @@ -1120,7 +1336,7 @@ display: display_extenders: { } path: admin/content/files/usage/% cache_metadata: - max-age: 0 + max-age: -1 contexts: - 'languages:language_interface' - url diff --git a/services/drupal/config/sync/views.view.group_media_search_api.yml b/services/drupal/config/sync/views.view.group_media_search_api.yml index 2dc0ad8dfb..608625232a 100644 --- a/services/drupal/config/sync/views.view.group_media_search_api.yml +++ b/services/drupal/config/sync/views.view.group_media_search_api.yml @@ -3,16 +3,19 @@ langcode: en status: true dependencies: config: + - field.storage.media.field_banner_image_restricted - image.style.thumbnail - search_api.index.media - taxonomy.vocabulary.media_tags module: - csv_serialization + - file - group - - image + - options - rest - search_api - serialization + - svg_image - views_autocomplete_filters - views_data_export id: group_media_search_api @@ -153,6 +156,7 @@ display: view_modes: 'entity:media': audio: link_with_metadata + banner_image: link_with_metadata document: link_with_metadata image: link_with_metadata other: link_with_metadata @@ -210,6 +214,75 @@ display: use_highlighting: false multi_type: separator multi_separator: ', ' + field_banner_image_restricted: + id: field_banner_image_restricted + table: search_api_index_media + field: field_banner_image_restricted + relationship: none + group_type: group + admin_label: '' + 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: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_rendering: true + fallback_handler: search_api + fallback_options: + link_to_item: false + use_highlighting: false + multi_type: separator + multi_separator: ', ' bundle: id: bundle table: search_api_index_media @@ -865,6 +938,69 @@ display: default_group_multiple: { } group_items: { } reduce_duplicates: false + field_banner_image_restricted: + id: field_banner_image_restricted + table: search_api_index_media + field: field_banner_image_restricted + relationship: none + group_type: group + admin_label: '' + plugin_id: search_api_options + operator: or + value: { } + group: 1 + exposed: true + expose: + operator_id: field_banner_image_restricted_op + label: 'Usage restrictions' + description: 'Show only restricted media.' + use_operator: false + operator: field_banner_image_restricted_op + operator_limit_selection: false + operator_list: { } + identifier: field_banner_image_restricted + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + paragraphs_library_contributor: '0' + layout_editor: '0' + alerts_manager: '0' + block_manager: '0' + system_editor: '0' + system_webmaster: '0' + menu_admin: '0' + administrator: '0' + reduce: false + is_grouped: true + group_info: + label: 'Usage restrictions' + description: 'Restricted or unrestricted.' + identifier: field_banner_image_restricted + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: + 1: + title: Unrestricted + operator: not + value: + restricted: restricted + 2: + title: Restricted + operator: or + value: + restricted: restricted + 3: + title: '' + operator: or + value: { } + reduce_duplicates: false style: type: table options: @@ -872,9 +1008,11 @@ display: row_class: '' default_row_class: true columns: + thumbnail: thumbnail name: name search_api_rendered_item: name aggregated_filenames: aggregated_filenames + field_banner_image_restricted: name bundle: bundle uid_1: uid_1 changed: changed @@ -882,6 +1020,11 @@ display: search_api_operations: search_api_operations default: created info: + thumbnail: + align: '' + separator: '' + empty_column: false + responsive: '' name: sortable: true default_sort_order: asc @@ -901,6 +1044,13 @@ display: separator: '' empty_column: false responsive: '' + field_banner_image_restricted: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' bundle: sortable: true default_sort_order: asc @@ -965,6 +1115,7 @@ display: - user - user.group_permissions tags: + - 'config:field.storage.media.field_banner_image_restricted' - 'config:search_api.index.media' data_export_1: id: data_export_1 @@ -986,9 +1137,9 @@ display: alter: alter_text: false text: '' - make_link: false + make_link: true path: '' - absolute: false + absolute: true external: false replace_spaces: false path_case: none @@ -1023,9 +1174,9 @@ display: empty_zero: false hide_alter_empty: true click_sort_column: value - type: string + type: file_link settings: - link_to_entity: false + link_to_entity: 0 group_column: value group_columns: { } group_rows: true @@ -1475,6 +1626,59 @@ display: format_plural_values: - '1' - '@count' + search_api_url: + id: search_api_url + table: search_api_index_media + field: search_api_url + relationship: none + group_type: group + admin_label: '' + plugin_id: search_api + label: 'Media URL' + exclude: false + alter: + alter_text: true + text: 'https://www.epa.gov{{ search_api_url }}' + 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: true + 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: ', ' style: type: data_export options: @@ -1494,13 +1698,16 @@ display: options: field_options: name: + alias: '' + raw_output: true + aggregated_filenames: alias: '' raw_output: false bundle: alias: '' raw_output: false uid_1: - alias: uid + alias: Author raw_output: false changed: alias: '' @@ -1508,7 +1715,7 @@ display: created: alias: '' raw_output: false - search_api_operations: + mid: alias: '' raw_output: false defaults: @@ -1516,7 +1723,7 @@ display: display_extenders: views_ajax_get: ajax_get: false - path: group/%group/media/export + path: group/%group/media/export/test displays: page_1: page_1 default: '0' @@ -1741,6 +1948,7 @@ display: view_modes: 'entity:media': audio: link_with_metadata + banner_image: link_with_metadata document: link_with_metadata image: link_with_metadata other: link_with_metadata @@ -1798,6 +2006,75 @@ display: use_highlighting: false multi_type: separator multi_separator: ', ' + field_banner_image_restricted: + id: field_banner_image_restricted + table: search_api_index_media + field: field_banner_image_restricted + relationship: none + group_type: group + admin_label: '' + 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: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_rendering: true + fallback_handler: search_api + fallback_options: + link_to_item: false + use_highlighting: false + multi_type: separator + multi_separator: ', ' bundle: id: bundle table: search_api_index_media @@ -2170,4 +2447,5 @@ display: - user - user.group_permissions tags: + - 'config:field.storage.media.field_banner_image_restricted' - 'config:search_api.index.media' diff --git a/services/drupal/config/sync/views.view.group_moderated_content.yml b/services/drupal/config/sync/views.view.group_moderated_content.yml index e720553790..a30add6ad8 100644 --- a/services/drupal/config/sync/views.view.group_moderated_content.yml +++ b/services/drupal/config/sync/views.view.group_moderated_content.yml @@ -1230,6 +1230,8 @@ display: - create_new_draft - create_new_draft_approved - create_new_draft_needs_review + - flag_action.notification_opt_in_flag + - flag_action.notification_opt_in_unflag - node_delete_action - set_to_published - set_to_published_needs_review @@ -2835,6 +2837,341 @@ display: text: 'View Latest Revision' output_url_as_text: true absolute: true + filters: + title: + id: title + table: node_field_revision + field: title + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: title + plugin_id: string + operator: contains + value: '' + group: 1 + exposed: true + expose: + operator_id: title_op + label: Title + description: '' + use_operator: false + operator: title_op + operator_limit_selection: false + operator_list: { } + identifier: title + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + field_search_text_value: + id: field_search_text_value + table: node_revision__field_search_text + field: field_search_text_value + relationship: none + group_type: group + admin_label: '' + plugin_id: views_autocomplete_filters_string + operator: contains + value: '' + group: 1 + exposed: true + expose: + operator_id: field_search_text_value_op + label: 'Contains text' + description: '' + use_operator: false + operator: field_search_text_value_op + operator_limit_selection: false + operator_list: { } + identifier: field_search_text_value + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + paragraphs_library_contributor: '0' + layout_editor: '0' + alerts_manager: '0' + block_manager: '0' + system_editor: '0' + system_webmaster: '0' + menu_admin: '0' + administrator: '0' + placeholder: '' + autocomplete_filter: 0 + autocomplete_min_chars: '0' + autocomplete_items: '10' + autocomplete_field: '' + autocomplete_raw_suggestion: 1 + autocomplete_raw_dropdown: 1 + autocomplete_dependent: 0 + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + type_1: + id: type_1 + table: node_field_revision + field: type + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: type + plugin_id: bundle + operator: in + value: { } + group: 1 + exposed: true + expose: + operator_id: type_1_op + label: 'Content type' + description: '' + use_operator: false + operator: type_1_op + operator_limit_selection: false + operator_list: { } + identifier: type_1 + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + layout_editor: '0' + alerts_manager: '0' + block_manager: '0' + system_editor: '0' + system_webmaster: '0' + administrator: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + uid: + id: uid + table: users_field_data + field: uid + relationship: uid + group_type: group + admin_label: '' + entity_type: user + entity_field: uid + plugin_id: user_name + operator: in + value: { } + group: 1 + exposed: true + expose: + operator_id: uid_op + label: uid + description: ' ' + use_operator: false + operator: uid_op + operator_limit_selection: false + operator_list: { } + identifier: Author + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + paragraphs_library_contributor: '0' + layout_editor: '0' + alerts_manager: '0' + block_manager: '0' + system_editor: '0' + system_webmaster: '0' + menu_admin: '0' + administrator: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + moderation_state: + id: moderation_state + table: node_field_revision + field: moderation_state + relationship: none + group_type: group + admin_label: '' + entity_type: node + plugin_id: moderation_state_filter + operator: in + value: { } + group: 1 + exposed: true + expose: + operator_id: moderation_state_op + label: 'Latest revision moderation state' + description: '' + use_operator: false + operator: moderation_state_op + operator_limit_selection: false + operator_list: { } + identifier: moderation_state + required: false + remember: false + multiple: true + remember_roles: + authenticated: authenticated + anonymous: '0' + layout_editor: '0' + alerts_manager: '0' + block_manager: '0' + system_editor: '0' + system_webmaster: '0' + menu_admin: '0' + administrator: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + moderation_state_1: + id: moderation_state_1 + table: node_field_data + field: moderation_state + relationship: nid + group_type: group + admin_label: '' + entity_type: node + plugin_id: moderation_state_filter + operator: in + value: { } + group: 1 + exposed: true + expose: + operator_id: moderation_state_1_op + label: 'Current revision moderation state' + description: '' + use_operator: false + operator: moderation_state_1_op + operator_limit_selection: false + operator_list: { } + identifier: moderation_state_1 + required: false + remember: false + multiple: true + remember_roles: + authenticated: authenticated + anonymous: '0' + layout_editor: '0' + alerts_manager: '0' + block_manager: '0' + system_editor: '0' + system_webmaster: '0' + menu_admin: '0' + administrator: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + latest_revision: + id: latest_revision + table: node_revision + field: latest_revision + relationship: none + group_type: group + admin_label: '' + entity_type: node + plugin_id: latest_revision + operator: '=' + value: '' + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + filter_groups: + operator: AND + groups: + 1: AND style: type: data_export options: @@ -2876,6 +3213,8 @@ display: raw_output: false defaults: fields: false + filters: false + filter_groups: false display_description: '' display_extenders: views_ajax_get: diff --git a/services/drupal/config/sync/views.view.media.yml b/services/drupal/config/sync/views.view.media.yml index c0b5b8bc99..40788daedd 100644 --- a/services/drupal/config/sync/views.view.media.yml +++ b/services/drupal/config/sync/views.view.media.yml @@ -142,6 +142,8 @@ display: settings: image_link: '' image_style: thumbnail + image_loading: + attribute: lazy group_column: entity_id group_columns: { } group_rows: true diff --git a/services/drupal/config/sync/views.view.media_library.yml b/services/drupal/config/sync/views.view.media_library.yml index b2f1d98246..c8b4dbb64e 100644 --- a/services/drupal/config/sync/views.view.media_library.yml +++ b/services/drupal/config/sync/views.view.media_library.yml @@ -3,13 +3,16 @@ langcode: en status: true dependencies: config: + - field.storage.media.field_banner_image_restricted - image.style.media_library - search_api.index.media - taxonomy.vocabulary.media_tags module: - epa_media - - image + - epa_web_areas + - options - search_api + - svg_image - user - views_autocomplete_filters id: media_library @@ -39,7 +42,7 @@ display: exclude: false alter: alter_text: false - text: '' + text: '{{ search_api_rendered_item }}
{{ field_banner_image_restricted_1 }} ' make_link: false path: '' absolute: false @@ -79,10 +82,81 @@ display: view_modes: 'entity:media': audio: media_library + banner_image: media_library document: media_library image: media_library other: media_library remote_video: media_library + field_banner_image_restricted: + id: field_banner_image_restricted + table: search_api_datasource_media_entity_media + field: field_banner_image_restricted + relationship: none + group_type: group + admin_label: '' + entity_type: media + 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: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_rendering: true + fallback_handler: search_api + fallback_options: + link_to_item: false + use_highlighting: false + multi_type: separator + multi_separator: ', ' search_api_media_library_select_form: id: search_api_media_library_select_form table: search_api_index_media @@ -418,6 +492,7 @@ display: remember_roles: authenticated: authenticated anonymous: '0' + paragraphs_library_contributor: '0' layout_editor: '0' alerts_manager: '0' block_manager: '0' @@ -438,6 +513,128 @@ display: default_group: All default_group_multiple: { } group_items: { } + gid: + id: gid + table: search_api_index_media + field: gid + relationship: none + group_type: group + admin_label: '' + plugin_id: search_api_entity_reference + operator: or + value: { } + group: 1 + exposed: true + expose: + operator_id: gid_op + label: 'Web Area' + description: 'Limit to content in your web areas.' + use_operator: false + operator: gid_op + operator_limit_selection: false + operator_list: { } + identifier: gid + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + paragraphs_library_contributor: '0' + layout_editor: '0' + alerts_manager: '0' + block_manager: '0' + system_editor: '0' + system_webmaster: '0' + menu_admin: '0' + administrator: '0' + reduce: 0 + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + reduce_duplicates: 0 + handler: 'default:group' + handler_settings: + target_bundles: + web_area: web_area + sort: + field: _none + direction: ASC + auto_create: false + auto_create_bundle: '' + widget: autocomplete + field_banner_image_restricted: + id: field_banner_image_restricted + table: search_api_index_media + field: field_banner_image_restricted + relationship: none + group_type: group + admin_label: '' + plugin_id: search_api_options + operator: or + value: { } + group: 1 + exposed: true + expose: + operator_id: field_banner_image_restricted_op + label: 'Usage restrictions' + description: 'Show only restricted media.' + use_operator: false + operator: field_banner_image_restricted_op + operator_limit_selection: false + operator_list: { } + identifier: field_banner_image_restricted + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + paragraphs_library_contributor: '0' + layout_editor: '0' + alerts_manager: '0' + block_manager: '0' + system_editor: '0' + system_webmaster: '0' + menu_admin: '0' + administrator: '0' + reduce: false + is_grouped: true + group_info: + label: 'Usage restrictions' + description: 'Restricted or unrestricted.' + identifier: field_banner_image_restricted + optional: true + widget: select + multiple: false + remember: false + default_group: '1' + default_group_multiple: { } + group_items: + 1: + title: Unrestricted + operator: not + value: + restricted: restricted + 2: + title: Restricted + operator: or + value: + restricted: restricted + 3: + title: '' + operator: or + value: { } + reduce_duplicates: false filter_groups: operator: AND groups: @@ -475,6 +672,7 @@ display: - url.query_args - user tags: + - 'config:field.storage.media.field_banner_image_restricted' - 'config:search_api.index.media' widget: id: widget @@ -556,6 +754,7 @@ display: - user - user.permissions tags: + - 'config:field.storage.media.field_banner_image_restricted' - 'config:search_api.index.media' widget_table: id: widget_table @@ -809,10 +1008,81 @@ display: view_modes: 'entity:media': audio: link_with_metadata + banner_image: link_with_metadata document: link_with_metadata image: link_with_metadata other: link_with_metadata remote_video: link_with_metadata + field_banner_image_restricted: + id: field_banner_image_restricted + table: search_api_datasource_media_entity_media + field: field_banner_image_restricted + relationship: none + group_type: group + admin_label: '' + entity_type: media + 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: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_rendering: true + fallback_handler: search_api + fallback_options: + link_to_item: false + use_highlighting: false + multi_type: separator + multi_separator: ', ' aggregated_filenames: id: aggregated_filenames table: search_api_index_media @@ -1075,6 +1345,7 @@ display: thumbnail: thumbnail name_1: name_1 search_api_rendered_item: name_1 + field_banner_image_restricted: name_1 aggregated_filenames: aggregated_filenames uid_1: uid_1 changed_1: changed_1 @@ -1102,6 +1373,11 @@ display: separator: '' empty_column: false responsive: '' + field_banner_image_restricted: + align: '' + separator: '' + empty_column: false + responsive: '' aggregated_filenames: sortable: true default_sort_order: asc @@ -1178,4 +1454,5 @@ display: - user - user.permissions tags: + - 'config:field.storage.media.field_banner_image_restricted' - 'config:search_api.index.media' diff --git a/services/drupal/config/sync/views.view.media_search_api.yml b/services/drupal/config/sync/views.view.media_search_api.yml index 68811e3a69..f8107d5ea4 100644 --- a/services/drupal/config/sync/views.view.media_search_api.yml +++ b/services/drupal/config/sync/views.view.media_search_api.yml @@ -3,14 +3,22 @@ langcode: en status: true dependencies: config: + - field.storage.media.field_banner_image_restricted - image.style.thumbnail - search_api.index.media - taxonomy.vocabulary.media_tags + - user.role.authenticated module: + - csv_serialization - epa_web_areas + - options + - rest - search_api + - serialization - svg_image + - user - views_autocomplete_filters + - views_data_export id: media_search_api label: 'Media (search api)' module: views @@ -778,8 +786,10 @@ display: sort_asc_label: Asc sort_desc_label: Desc access: - type: none - options: { } + type: role + options: + role: + authenticated: authenticated cache: type: none options: { } @@ -1117,6 +1127,69 @@ display: default_group: All default_group_multiple: { } group_items: { } + field_banner_image_restricted: + id: field_banner_image_restricted + table: search_api_index_media + field: field_banner_image_restricted + relationship: none + group_type: group + admin_label: '' + plugin_id: search_api_options + operator: or + value: { } + group: 1 + exposed: true + expose: + operator_id: field_banner_image_restricted_op + label: 'Usage restrictions' + description: 'Show only restricted media.' + use_operator: false + operator: field_banner_image_restricted_op + operator_limit_selection: false + operator_list: { } + identifier: field_banner_image_restricted + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + paragraphs_library_contributor: '0' + layout_editor: '0' + alerts_manager: '0' + block_manager: '0' + system_editor: '0' + system_webmaster: '0' + menu_admin: '0' + administrator: '0' + reduce: false + is_grouped: true + group_info: + label: 'Usage restrictions' + description: 'Restricted or unrestricted.' + identifier: field_banner_image_restricted + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: + 1: + title: Unrestricted + operator: not + value: + restricted: restricted + 2: + title: Restricted + operator: or + value: + restricted: restricted + 3: + title: '' + operator: or + value: { } + reduce_duplicates: false filter_groups: operator: AND groups: @@ -1133,6 +1206,7 @@ display: name_1: name_1 web_area_name: web_area_name search_api_rendered_item: name_1 + field_banner_image_restricted: name_1 aggregated_filenames: aggregated_filenames bundle: bundle author_name: author_name @@ -1170,6 +1244,13 @@ display: separator: '' empty_column: false responsive: '' + field_banner_image_restricted: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' aggregated_filenames: sortable: true default_sort_order: asc @@ -1238,24 +1319,95 @@ display: - url - url.query_args - user + - user.roles tags: - 'config:search_api.index.media' - media_page_list: - id: media_page_list - display_title: Page - display_plugin: page - position: 1 + data_export_1: + id: data_export_1 + display_title: 'CSV export' + display_plugin: data_export + position: 2 display_options: fields: - search_api_bulk_form: - id: search_api_bulk_form + name_1: + id: name_1 table: search_api_index_media - field: search_api_bulk_form + field: name relationship: none group_type: group admin_label: '' - plugin_id: search_api_bulk_form - label: '' + plugin_id: search_api_field + label: Name + exclude: false + alter: + alter_text: true + 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: true + 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: false + 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: ', ' + aggregated_filenames: + id: aggregated_filenames + table: search_api_index_media + field: aggregated_filenames + relationship: none + group_type: group + admin_label: '' + plugin_id: search_api + label: Filename exclude: false alter: alter_text: false @@ -1288,7 +1440,7 @@ display: element_class: '' element_label_type: '' element_label_class: '' - element_label_colon: false + element_label_colon: true element_wrapper_type: '' element_wrapper_class: '' element_default_classes: true @@ -1296,22 +1448,19 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - action_title: Action - include_exclude: include - selected_actions: - - media_delete_action - link_to_item: 0 - use_highlighting: 0 - thumbnail: - id: thumbnail - table: search_api_datasource_media_entity_media - field: thumbnail + link_to_item: false + use_highlighting: false + multi_type: separator + multi_separator: ', ' + bundle: + id: bundle + table: search_api_index_media + field: bundle relationship: none group_type: group admin_label: '' - entity_type: media plugin_id: search_api_field - label: Thumbnail + label: 'Media type' exclude: false alter: alter_text: false @@ -1353,11 +1502,10 @@ display: empty_zero: false hide_alter_empty: true click_sort_column: target_id - type: image + type: entity_reference_label settings: - image_link: file - image_style: thumbnail - group_column: '' + link: false + group_column: target_id group_columns: { } group_rows: true delta_limit: 0 @@ -1368,25 +1516,28 @@ display: separator: ', ' field_api_classes: false field_rendering: true - fallback_handler: search_api + fallback_handler: search_api_entity fallback_options: link_to_item: false use_highlighting: false multi_type: separator multi_separator: ', ' - name_1: - id: name_1 + display_methods: + media_type: + display_method: label + author_name: + id: author_name table: search_api_index_media - field: name + field: author_name relationship: none group_type: group admin_label: '' plugin_id: search_api_field - label: Name + label: Author exclude: false alter: - alter_text: true - text: '' + alter_text: false + text: '' make_link: false path: '' absolute: false @@ -1415,7 +1566,7 @@ display: element_class: '' element_label_type: '' element_label_class: '' - element_label_colon: true + element_label_colon: false element_wrapper_type: '' element_wrapper_class: '' element_default_classes: true @@ -1437,22 +1588,22 @@ display: multi_type: separator separator: ', ' field_api_classes: false - field_rendering: false + field_rendering: true fallback_handler: search_api fallback_options: link_to_item: false use_highlighting: false multi_type: separator multi_separator: ', ' - web_area_name: - id: web_area_name + changed: + id: changed table: search_api_index_media - field: web_area_name + field: changed relationship: none group_type: group admin_label: '' plugin_id: search_api_field - label: 'Web Area' + label: Updated exclude: false alter: alter_text: false @@ -1494,9 +1645,11 @@ display: empty_zero: false hide_alter_empty: true click_sort_column: value - type: string + type: timestamp settings: - link_to_entity: true + date_format: medium + custom_date_format: '' + timezone: '' group_column: value group_columns: { } group_rows: true @@ -1508,21 +1661,24 @@ display: separator: ', ' field_api_classes: false field_rendering: true - fallback_handler: search_api + fallback_handler: search_api_date fallback_options: + date_format: fallback + custom_date_format: '' + timezone: '' link_to_item: false use_highlighting: false multi_type: separator multi_separator: ', ' - search_api_rendered_item: - id: search_api_rendered_item + created_1: + id: created_1 table: search_api_index_media - field: search_api_rendered_item + field: created relationship: none group_type: group admin_label: '' - plugin_id: search_api_rendered_item - label: Label + plugin_id: search_api_field + label: Created exclude: false alter: alter_text: false @@ -1555,7 +1711,7 @@ display: element_class: '' element_label_type: '' element_label_class: '' - element_label_colon: false + element_label_colon: true element_wrapper_type: '' element_wrapper_class: '' element_default_classes: true @@ -1563,13 +1719,715 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - view_modes: - 'entity:media': - audio: link_with_metadata - document: link_with_metadata - image: link_with_metadata - other: link_with_metadata - remote_video: link_with_metadata + click_sort_column: value + type: timestamp + settings: + date_format: medium + custom_date_format: '' + timezone: '' + 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_date + fallback_options: + date_format: fallback + custom_date_format: '' + timezone: '' + link_to_item: false + use_highlighting: false + multi_type: separator + multi_separator: ', ' + mid: + id: mid + table: search_api_datasource_media_entity_media + field: mid + relationship: none + group_type: group + admin_label: '' + entity_type: media + plugin_id: search_api_field + label: 'Media ID' + 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: true + 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: number_integer + settings: + thousand_separator: '' + prefix_suffix: 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_numeric + fallback_options: + set_precision: false + precision: 0 + decimal: . + separator: ',' + format_plural: false + format_plural_string: !!binary MQNAY291bnQ= + prefix: '' + suffix: '' + link_to_item: false + use_highlighting: false + multi_type: separator + multi_separator: ', ' + format_plural_values: + - '1' + - '@count' + web_area_name: + id: web_area_name + table: search_api_index_media + field: web_area_name + relationship: none + group_type: group + admin_label: '' + plugin_id: search_api_field + label: 'Web Area' + 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: true + 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: ', ' + search_api_url: + id: search_api_url + table: search_api_index_media + field: search_api_url + relationship: none + group_type: group + admin_label: '' + plugin_id: search_api + label: 'Media URL' + exclude: false + alter: + alter_text: true + text: 'https://www.epa.gov{{ search_api_url }}' + make_link: false + path: '' + absolute: true + 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: true + 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: some + options: + offset: 0 + items_per_page: 10000 + style: + type: data_export + options: + formats: + csv: csv + csv_settings: + delimiter: ',' + enclosure: '"' + escape_char: \ + strip_tags: true + trim: true + encoding: utf8 + utf8_bom: '0' + use_serializer_encode_only: false + row: + type: data_field + options: + field_options: + name_1: + alias: '' + raw_output: true + aggregated_filenames: + alias: '' + raw_output: false + bundle: + alias: '' + raw_output: false + author_name: + alias: '' + raw_output: false + changed: + alias: '' + raw_output: false + created_1: + alias: '' + raw_output: false + mid: + alias: '' + raw_output: false + web_area_name: + alias: '' + raw_output: false + defaults: + fields: false + display_description: '' + display_extenders: + views_ajax_get: + ajax_get: false + path: media/export + displays: + media_page_list: media_page_list + default: '0' + filename: media-export.csv + automatic_download: true + export_method: batch + export_batch_size: 1000 + export_limit: 10000 + store_in_public_file_directory: false + custom_redirect_path: false + redirect_to_display: media_page_list + include_query_params: true + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - request_format + - url + - user + - user.roles + tags: + - 'config:search_api.index.media' + media_page_list: + id: media_page_list + display_title: Page + display_plugin: page + position: 1 + display_options: + fields: + search_api_bulk_form: + id: search_api_bulk_form + table: search_api_index_media + field: search_api_bulk_form + relationship: none + group_type: group + admin_label: '' + plugin_id: search_api_bulk_form + 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 + action_title: Action + include_exclude: include + selected_actions: + - media_delete_action + link_to_item: 0 + use_highlighting: 0 + thumbnail: + id: thumbnail + table: search_api_datasource_media_entity_media + field: thumbnail + relationship: none + group_type: group + admin_label: '' + entity_type: media + plugin_id: search_api_field + label: Thumbnail + 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: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: image + settings: + image_link: file + image_style: thumbnail + group_column: '' + 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: ', ' + name_1: + id: name_1 + table: search_api_index_media + field: name + relationship: none + group_type: group + admin_label: '' + plugin_id: search_api_field + label: Name + exclude: false + alter: + alter_text: true + 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: true + 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: false + 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: false + fallback_handler: search_api + fallback_options: + link_to_item: false + use_highlighting: false + multi_type: separator + multi_separator: ', ' + web_area_name: + id: web_area_name + table: search_api_index_media + field: web_area_name + relationship: none + group_type: group + admin_label: '' + plugin_id: search_api_field + label: 'Web Area' + 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: true + 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: ', ' + search_api_rendered_item: + id: search_api_rendered_item + table: search_api_index_media + field: search_api_rendered_item + relationship: none + group_type: group + admin_label: '' + plugin_id: search_api_rendered_item + label: Label + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + 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 + view_modes: + 'entity:media': + audio: link_with_metadata + banner_image: link_with_metadata + document: link_with_metadata + image: link_with_metadata + other: link_with_metadata + remote_video: link_with_metadata + field_banner_image_restricted: + id: field_banner_image_restricted + table: search_api_index_media + field: field_banner_image_restricted + relationship: none + group_type: group + admin_label: '' + 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: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_rendering: true + fallback_handler: search_api + fallback_options: + link_to_item: false + use_highlighting: false + multi_type: separator + multi_separator: ', ' aggregated_filenames: id: aggregated_filenames table: search_api_index_media @@ -1980,5 +2838,7 @@ display: - url - url.query_args - user + - user.roles tags: + - 'config:field.storage.media.field_banner_image_restricted' - 'config:search_api.index.media' diff --git a/services/drupal/config/sync/views.view.moderated_content.yml b/services/drupal/config/sync/views.view.moderated_content.yml index 03cfde0753..3d35830e70 100644 --- a/services/drupal/config/sync/views.view.moderated_content.yml +++ b/services/drupal/config/sync/views.view.moderated_content.yml @@ -97,10 +97,18 @@ display: preconfiguration: add_confirmation: false 1: + action_id: 'flag_action:notification_opt_in_flag' + preconfiguration: + add_confirmation: false + 2: + action_id: 'flag_action:notification_opt_in_unflag' + preconfiguration: + add_confirmation: false + 3: action_id: node_assign_owner_action preconfiguration: add_confirmation: false - 7: + 9: action_id: views_bulk_operations_delete_entity preconfiguration: label_override: 'Delete selected nodes' diff --git a/services/drupal/config/sync/views.view.search_faqs.yml b/services/drupal/config/sync/views.view.search_faqs.yml index f705cbef1e..bc948c0046 100644 --- a/services/drupal/config/sync/views.view.search_faqs.yml +++ b/services/drupal/config/sync/views.view.search_faqs.yml @@ -253,9 +253,9 @@ display: query: type: search_api_query options: - skip_access: 0 - bypass_access: 0 - preserve_facet_query_args: 1 + bypass_access: false + skip_access: false + preserve_facet_query_args: true relationships: { } header: result: @@ -688,7 +688,7 @@ display: page_1: page_1 default: '0' cache_metadata: - max-age: -1 + max-age: 0 contexts: - 'languages:language_content' - 'languages:language_interface' @@ -696,6 +696,8 @@ display: - 'user.node_grants:view' - user.permissions tags: + - 'config:facets.facet.faqs_topic' + - 'config:facets.facet.faqs_webarea' - 'config:field.storage.node.body' - 'config:field.storage.node.field_hublinks' - 'config:field.storage.node.field_last_published' @@ -727,7 +729,7 @@ display: ajax_get: false path: faqs/search cache_metadata: - max-age: -1 + max-age: 0 contexts: - 'languages:language_interface' - url @@ -735,4 +737,6 @@ display: - 'user.node_grants:view' - user.permissions tags: + - 'config:facets.facet.faqs_topic' + - 'config:facets.facet.faqs_webarea' - 'config:search_api.index.frequent_questions' diff --git a/services/drupal/config/sync/views.view.search_news_releases.yml b/services/drupal/config/sync/views.view.search_news_releases.yml index dbca3a0036..e57fa18054 100644 --- a/services/drupal/config/sync/views.view.search_news_releases.yml +++ b/services/drupal/config/sync/views.view.search_news_releases.yml @@ -733,7 +733,7 @@ display: page_1: page_1 default: '0' cache_metadata: - max-age: -1 + max-age: 0 contexts: - 'languages:language_content' - 'languages:language_interface' @@ -741,10 +741,16 @@ display: - 'user.node_grants:view' - user.permissions tags: + - 'config:facets.facet.news_releases_geographic_locations' + - 'config:facets.facet.news_releases_language' + - 'config:facets.facet.news_releases_press_office' + - 'config:facets.facet.news_releases_subjects' + - 'config:facets.facet.news_releases_year' - 'config:field.storage.node.field_paragraphs' - 'config:field.storage.node.field_press_office' - 'config:field.storage.node.field_release' - 'config:search_api.index.news_releases' + - taxonomy_term_list page_1: id: page_1 display_title: Page @@ -771,7 +777,7 @@ display: ajax_get: false path: newsreleases/search cache_metadata: - max-age: -1 + max-age: 0 contexts: - 'languages:language_interface' - url @@ -779,4 +785,10 @@ display: - 'user.node_grants:view' - user.permissions tags: + - 'config:facets.facet.news_releases_geographic_locations' + - 'config:facets.facet.news_releases_language' + - 'config:facets.facet.news_releases_press_office' + - 'config:facets.facet.news_releases_subjects' + - 'config:facets.facet.news_releases_year' - 'config:search_api.index.news_releases' + - taxonomy_term_list diff --git a/services/drupal/config/sync/views.view.search_perspectives.yml b/services/drupal/config/sync/views.view.search_perspectives.yml index a5a374a73e..0360df96c8 100644 --- a/services/drupal/config/sync/views.view.search_perspectives.yml +++ b/services/drupal/config/sync/views.view.search_perspectives.yml @@ -703,7 +703,7 @@ display: page_1: page_1 default: '0' cache_metadata: - max-age: -1 + max-age: 0 contexts: - 'languages:language_content' - 'languages:language_interface' @@ -711,6 +711,10 @@ display: - 'user.node_grants:view' - user.permissions tags: + - 'config:facets.facet.perspectives_author' + - 'config:facets.facet.perspectives_publisher' + - 'config:facets.facet.perspectives_subjects' + - 'config:facets.facet.perspectives_year' - 'config:field.storage.node.field_description' - 'config:field.storage.node.field_publish_date' - 'config:field.storage.paragraph.field_author' @@ -792,7 +796,7 @@ display: ajax_get: false path: perspectives/search cache_metadata: - max-age: -1 + max-age: 0 contexts: - 'languages:language_content' - 'languages:language_interface' @@ -801,6 +805,10 @@ display: - 'user.node_grants:view' - user.permissions tags: + - 'config:facets.facet.perspectives_author' + - 'config:facets.facet.perspectives_publisher' + - 'config:facets.facet.perspectives_subjects' + - 'config:facets.facet.perspectives_year' - 'config:field.storage.node.field_description' - 'config:field.storage.node.field_publish_date' - 'config:field.storage.paragraph.field_author' diff --git a/services/drupal/config/sync/views.view.search_public_notices.yml b/services/drupal/config/sync/views.view.search_public_notices.yml index 4a298a73e0..d83549e3ea 100644 --- a/services/drupal/config/sync/views.view.search_public_notices.yml +++ b/services/drupal/config/sync/views.view.search_public_notices.yml @@ -746,7 +746,7 @@ display: page_1: page_1 default: '0' cache_metadata: - max-age: -1 + max-age: 0 contexts: - 'languages:language_content' - 'languages:language_interface' @@ -754,6 +754,10 @@ display: - 'user.node_grants:view' - user.permissions tags: + - 'config:facets.facet.public_notices_comments_due_date' + - 'config:facets.facet.public_notices_location_of_prop_action' + - 'config:facets.facet.public_notices_program_or_statute' + - 'config:facets.facet.public_notices_proposed_actions' - 'config:field.storage.node.body' - 'config:field.storage.node.field_publication_date' - 'config:search_api.index.public_notices' @@ -785,7 +789,7 @@ display: ajax_get: false path: publicnotices/notices-search cache_metadata: - max-age: -1 + max-age: 0 contexts: - 'languages:language_interface' - url @@ -793,4 +797,8 @@ display: - 'user.node_grants:view' - user.permissions tags: + - 'config:facets.facet.public_notices_comments_due_date' + - 'config:facets.facet.public_notices_location_of_prop_action' + - 'config:facets.facet.public_notices_program_or_statute' + - 'config:facets.facet.public_notices_proposed_actions' - 'config:search_api.index.public_notices' diff --git a/services/drupal/config/sync/webform.settings.yml b/services/drupal/config/sync/webform.settings.yml index 2d7470b313..6ae3681204 100644 --- a/services/drupal/config/sync/webform.settings.yml +++ b/services/drupal/config/sync/webform.settings.yml @@ -123,15 +123,37 @@ element: default_algolia_places_app_id: '' default_algolia_places_api_key: '' excluded_elements: + address: address + color: color + entity_autocomplete: entity_autocomplete + machine_name: machine_name managed_file: managed_file password: password password_confirm: password_confirm + search: search + table: table + tableselect: tableselect + text_format: text_format + value: value + vertical_tabs: vertical_tabs + view: view webform_audio_file: webform_audio_file + webform_computed_twig: webform_computed_twig webform_document_file: webform_document_file + webform_entity_checkboxes: webform_entity_checkboxes + webform_entity_radios: webform_entity_radios + webform_entity_select: webform_entity_select webform_image_file: webform_image_file + webform_location_places: webform_location_places + webform_mapping: webform_mapping + webform_more: webform_more + webform_signature: webform_signature + webform_table: webform_table + webform_table_row: webform_table_row + webform_table_sort: webform_table_sort + webform_tableselect_sort: webform_tableselect_sort + webform_variant: webform_variant webform_video_file: webform_video_file - default_icheck: '' - default_google_maps_api_key: '' html_editor: disabled: false element_format: '' diff --git a/services/drupal/default.conf b/services/drupal/default.conf index 11635042fa..01fb782455 100644 --- a/services/drupal/default.conf +++ b/services/drupal/default.conf @@ -29,6 +29,11 @@ server { rewrite ^(.*)$ $new_uri_302 redirect; } + # Enable or disable basic authentication based on the entrypoint script. Note + # that when off, it doesn't matter if the htpasswd file doesn't exist or not. + auth_basic ${WEBCMS_BASIC_AUTH}; + auth_basic_user_file /etc/nginx/htpasswd; + root /var/www/html/web; index index.php index.html; diff --git a/services/drupal/patches/addtocal-address-newlines-in-description-rolled-to-apply-on-3319571-3-and-3311870-2.patch b/services/drupal/patches/addtocal-address-newlines-in-description-rolled-to-apply-on-3319571-3-and-3311870-2.patch new file mode 100644 index 0000000000..128c647b43 --- /dev/null +++ b/services/drupal/patches/addtocal-address-newlines-in-description-rolled-to-apply-on-3319571-3-and-3311870-2.patch @@ -0,0 +1,13 @@ +diff --git a/src/Plugin/AddToCal/Type/Generic.php b/src/Plugin/AddToCal/Type/Generic.php +index aacd882..9fd4e1c 100644 +--- a/src/Plugin/AddToCal/Type/Generic.php ++++ b/src/Plugin/AddToCal/Type/Generic.php +@@ -108,7 +108,7 @@ class Generic extends AddToCalTypeBase { + $uri = $this->fileSystem->tempnam('temporary://', 'ics_'); + + $title = Html::escape($info['title']); +- $description = str_replace(PHP_EOL, '\n', $info['description']); ++ $description = str_replace(PHP_EOL, '\n', str_replace("\r\n", '\n', $info['description'])); + + // Apple Calendar wants commas escaped in the location field. + $location = str_replace(',','\,',$info['location']); diff --git a/services/drupal/patches/content-moderation-notifications-3133940-2-rolled-to-apply-with-3015275.patch b/services/drupal/patches/content_moderation_notifications-3133940-23-rolled-to-apply-with-3015276-42.patch similarity index 66% rename from services/drupal/patches/content-moderation-notifications-3133940-2-rolled-to-apply-with-3015275.patch rename to services/drupal/patches/content_moderation_notifications-3133940-23-rolled-to-apply-with-3015276-42.patch index f0c23f285f..8c500f8e45 100644 --- a/services/drupal/patches/content-moderation-notifications-3133940-2-rolled-to-apply-with-3015275.patch +++ b/services/drupal/patches/content_moderation_notifications-3133940-23-rolled-to-apply-with-3015276-42.patch @@ -1,18 +1,5 @@ -diff --git a/README.txt b/README.txt -index a53d3ba..ee81612 100644 ---- a/README.txt -+++ b/README.txt -@@ -12,7 +12,7 @@ INTRODUCTION - ------------ - - The Content Moderation Notifications module allows notifications to be sent to --all users of a particular role, or to the content's author when a piece of -+all users of a particular role, or to the content's authors when a piece of - content is transitioned from one state to another via core's Content Moderation - module. - diff --git a/config/schema/content_moderation_notifications.schema.yml b/config/schema/content_moderation_notifications.schema.yml -index 6e1961f..b65c31c 100644 +index 93d8b4f..db19abe 100644 --- a/config/schema/content_moderation_notifications.schema.yml +++ b/config/schema/content_moderation_notifications.schema.yml @@ -35,7 +35,10 @@ content_moderation_notifications.content_moderation_notification.*: @@ -28,47 +15,47 @@ index 6e1961f..b65c31c 100644 type: boolean label: Disable site mail diff --git a/src/ContentModerationNotificationInterface.php b/src/ContentModerationNotificationInterface.php -index 9593fdd..97886be 100644 +index 9593fdd..49e13f5 100644 --- a/src/ContentModerationNotificationInterface.php +++ b/src/ContentModerationNotificationInterface.php -@@ -25,6 +25,14 @@ interface ContentModerationNotificationInterface extends ConfigEntityInterface { +@@ -24,6 +24,13 @@ interface ContentModerationNotificationInterface extends ConfigEntityInterface { + * Returns TRUE if the notification should be sent to the entity author. */ public function sendToAuthor(); - -+ /** -+ * Send the notification to the revision author. -+ * -+ * @return bool -+ * Returns TRUE if the notification should be sent to the revision author. -+ */ ++ /** ++ * Send the notification to the revision author. ++ * ++ * @return bool ++ * Returns TRUE if the notification should be sent to the revision author. ++ */ + public function sendToRevisionAuthor(); -+ + /** * Send the notification to the site mail address. - * diff --git a/src/Controller/ContentModerationNotificationsListBuilder.php b/src/Controller/ContentModerationNotificationsListBuilder.php -index 2e1c653..0ee26ea 100644 +index 2e1c653..4d378d4 100644 --- a/src/Controller/ContentModerationNotificationsListBuilder.php +++ b/src/Controller/ContentModerationNotificationsListBuilder.php -@@ -43,6 +43,7 @@ class ContentModerationNotificationsListBuilder extends ConfigEntityListBuilder +@@ -42,7 +42,8 @@ class ContentModerationNotificationsListBuilder extends ConfigEntityListBuilder + $header['status'] = $this->t('Status'); $header['transition'] = $this->t('Transitions'); $header['roles'] = $this->t('Email Roles'); - $header['author'] = $this->t('Email Author'); +- $header['author'] = $this->t('Email Author'); ++ $header['author'] = $this->t('Original Author'); + $header['revision_author'] = $this->t('Revision Author'); $header['emails'] = $this->t('Adhoc Emails'); return $header + parent::buildHeader(); } -@@ -94,6 +95,8 @@ class ContentModerationNotificationsListBuilder extends ConfigEntityListBuilder +@@ -94,6 +95,7 @@ class ContentModerationNotificationsListBuilder extends ConfigEntityListBuilder $row['roles'] = implode(', ', $roles); $row['author'] = $entity->author ? $this->t('Yes') : $this->t('No'); + $row['revision_author'] = $entity->revision_author ? $this->t('Yes') : $this->t('No'); -+ $row['emails'] = $entity->emails; return $row + parent::buildRow($entity); } diff --git a/src/Entity/ContentModerationNotification.php b/src/Entity/ContentModerationNotification.php -index ac67ab2..fd73fb3 100644 +index ac67ab2..776dd0d 100644 --- a/src/Entity/ContentModerationNotification.php +++ b/src/Entity/ContentModerationNotification.php @@ -54,6 +54,7 @@ use Drupal\Core\Entity\EntityStorageInterface; @@ -79,27 +66,27 @@ index ac67ab2..fd73fb3 100644 * "site_mail", * "emails", * "subject", -@@ -64,12 +65,19 @@ use Drupal\Core\Entity\EntityStorageInterface; - */ +@@ -65,12 +66,19 @@ use Drupal\Core\Entity\EntityStorageInterface; class ContentModerationNotification extends ConfigEntityBase implements ContentModerationNotificationInterface { -+ /** -+ * Send notification to the original author. -+ * -+ * @var bool -+ */ -+ public $author = FALSE; -+ /** - * Send notification to the revision author. +- * Send notification to the revision author. ++ * Send notification to the original author. * * @var bool */ -- public $author = FALSE; -+ public $revision_author = FALSE; + public $author = FALSE; ++ /** ++ * Send notification to the revision author. ++ * ++ * @var bool ++ */ ++ public $revision_author = FALSE; ++ /** * Disable notification to the site mail address. + * @@ -230,6 +238,13 @@ class ContentModerationNotification extends ConfigEntityBase implements ContentM return $this->get('author'); } @@ -115,10 +102,10 @@ index ac67ab2..fd73fb3 100644 * {@inheritdoc} */ diff --git a/src/Form/ContentModerationNotificationsFormBase.php b/src/Form/ContentModerationNotificationsFormBase.php -index 1b296a3..a12e1a7 100644 +index 432d89c..c55f2fe 100644 --- a/src/Form/ContentModerationNotificationsFormBase.php +++ b/src/Form/ContentModerationNotificationsFormBase.php -@@ -270,11 +270,19 @@ class ContentModerationNotificationsFormBase extends EntityForm { +@@ -271,13 +271,22 @@ class ContentModerationNotificationsFormBase extends EntityForm { ]; } @@ -129,43 +116,57 @@ index 1b296a3..a12e1a7 100644 - '#title' => $this->t('Email the author?'), + '#title' => $this->t('Email the original content author?'), '#default_value' => $content_moderation_notification->sendToAuthor(), -+ '#description' => $this->t('Send notifications to the original author of the content.'), -+ ]; + '#description' => $this->t('Send notifications to the current author of the content.'), + ]; + + // Send email to the revision author? + $form['revision_author'] = [ + '#type' => 'checkbox', + '#title' => $this->t('Email the revision author?'), + '#default_value' => $content_moderation_notification->sendToRevisionAuthor(), - '#description' => $this->t('Send notifications to the current author of the content.'), - ]; ++ '#description' => $this->t('Send notifications to the current author of the content.'), ++ ]; ++ $form['site_mail'] = [ + '#type' => 'checkbox', + '#title' => $this->t('Disable the site email address'), diff --git a/src/Notification.php b/src/Notification.php -index 2c7d7fe..5be8af5 100644 +index eed4470..47be0e6 100644 --- a/src/Notification.php +++ b/src/Notification.php -@@ -134,8 +134,18 @@ class Notification implements NotificationInterface { - $data['to'] = []; +@@ -159,6 +159,22 @@ class Notification implements NotificationInterface { + } + } - // Authors. -+ $author = ''; - if ($notification->author and ($entity instanceof EntityOwnerInterface)) { -- $data['to'][] = $entity->getOwner()->getEmail(); -+ $author = $entity->getOwner()->getEmail(); -+ $data['to'][] = $author; -+ } -+ -+ $revision_author = ''; + if ($notification->revision_author and ($entity instanceof EntityOwnerInterface)) { -+ $revision_author = $entity->getRevisionUser()->getEmail(); -+ if ($author != $revision_author) { -+ $data['to'][] = $revision_author; ++ if (!$entity->getOwner()->isAnonymous()) { ++ $revisionListIds = $this->entityTypeManager->getStorage($entity->getEntityTypeId())->revisionIds($entity); ++ // Sort $revisionListIds current revision to oldest. ++ $revisionListIds = array_reverse($revisionListIds); ++ if (isset($revisionListIds[1])) { ++ // Load the previous revision. ++ $revision = $this->entityTypeManager->getStorage('node')->loadRevision($revisionListIds[1]); ++ } ++ else { ++ $revision = $this->entityTypeManager->getStorage('node')->loadRevision($revisionListIds[0]); ++ } ++ $data['to'][] = $revision->getRevisionUser()->getEmail(); + } - } ++ } ++ + // Get Roles. + foreach ($notification->getRoleIds() as $role) { + /** @var \Drupal\Core\Entity\EntityStorageInterface $user_storage */ +@@ -231,7 +247,6 @@ class Notification implements NotificationInterface { - // Roles. + // Force to BCC. + $data['params']['headers']['Bcc'] = implode(',', $data['to']); +- + $recipient = ''; + if (!$notification->disableSiteMail()) { + $recipient = \Drupal::config('system.site')->get('mail'); diff --git a/tests/src/Unit/Entity/ContentModerationNotificationTest.php b/tests/src/Unit/Entity/ContentModerationNotificationTest.php -index f7fc3f4..64d5d96 100644 +index 378a40f..a13f92e 100644 --- a/tests/src/Unit/Entity/ContentModerationNotificationTest.php +++ b/tests/src/Unit/Entity/ContentModerationNotificationTest.php @@ -49,6 +49,7 @@ class ContentModerationNotificationTest extends UnitTestCase { diff --git a/services/drupal/patches/content_moderation_notifications-3316633-9-rolled-to-apply-with-3133940-23-and-3015276-42.patch b/services/drupal/patches/content_moderation_notifications-3316633-9-rolled-to-apply-with-3133940-23-and-3015276-42.patch new file mode 100644 index 0000000000..80cff65fb4 --- /dev/null +++ b/services/drupal/patches/content_moderation_notifications-3316633-9-rolled-to-apply-with-3133940-23-and-3015276-42.patch @@ -0,0 +1,202 @@ +diff --git a/config/schema/content_moderation_notifications.schema.yml b/config/schema/content_moderation_notifications.schema.yml +index db19abe..de077b7 100644 +--- a/config/schema/content_moderation_notifications.schema.yml ++++ b/config/schema/content_moderation_notifications.schema.yml +@@ -33,6 +33,11 @@ content_moderation_notifications.content_moderation_notification.*: + sequence: + type: string + label: 'Roles' ++ flags: ++ type: sequence ++ sequence: ++ type: string ++ label: 'Flags' + author: + type: boolean + label: 'Original Author' +diff --git a/content_moderation_notifications.services.yml b/content_moderation_notifications.services.yml +index 9c61ce5..c9289be 100644 +--- a/content_moderation_notifications.services.yml ++++ b/content_moderation_notifications.services.yml +@@ -4,4 +4,4 @@ services: + arguments: ['@entity_type.manager', '@content_moderation.moderation_information'] + content_moderation_notifications.notification: + class: Drupal\content_moderation_notifications\Notification +- arguments: ['@current_user', '@entity_type.manager', '@plugin.manager.mail', '@module_handler', '@content_moderation_notifications.notification_information', '@?token.entity_mapper', '@?group.group_route_context'] ++ arguments: ['@current_user', '@entity_type.manager', '@plugin.manager.mail', '@module_handler', '@content_moderation_notifications.notification_information', '@?token.entity_mapper', '@?group.group_route_context', '@?flag.flag'] +diff --git a/src/ContentModerationNotificationInterface.php b/src/ContentModerationNotificationInterface.php +index 49e13f5..5c33196 100644 +--- a/src/ContentModerationNotificationInterface.php ++++ b/src/ContentModerationNotificationInterface.php +@@ -88,6 +88,13 @@ interface ContentModerationNotificationInterface extends ConfigEntityInterface { + */ + public function getGroupRoles(); + ++ /** ++ * Get the flag types for which to send this notification. ++ * ++ * @return string[] ++ */ ++ public function getFlags(); ++ + /** + * Gets the notification subject. + * +diff --git a/src/Entity/ContentModerationNotification.php b/src/Entity/ContentModerationNotification.php +index 776dd0d..79f6406 100644 +--- a/src/Entity/ContentModerationNotification.php ++++ b/src/Entity/ContentModerationNotification.php +@@ -53,6 +53,7 @@ use Drupal\Core\Entity\EntityStorageInterface; + * "group_type", + * "group_use", + * "group_roles", ++ * "flags", + * "author", + * "revision_author", + * "site_mail", +@@ -145,6 +146,13 @@ class ContentModerationNotification extends ConfigEntityBase implements ContentM + */ + public $group_roles = []; + ++ /** ++ * The flag types for this notification. ++ * ++ * @var string[] ++ */ ++ public $flags = []; ++ + /** + * The associated workflow for these notifications. + * +@@ -203,6 +211,13 @@ class ContentModerationNotification extends ConfigEntityBase implements ContentM + return $this->get('group_roles'); + } + ++ /** ++ * {@inheritDoc} ++ */ ++ public function getFlags() { ++ return $this->get('flags'); ++ } ++ + /** + * {@inheritdoc} + */ +diff --git a/src/Form/ContentModerationNotificationsFormBase.php b/src/Form/ContentModerationNotificationsFormBase.php +index c55f2fe..4c660eb 100644 +--- a/src/Form/ContentModerationNotificationsFormBase.php ++++ b/src/Form/ContentModerationNotificationsFormBase.php +@@ -272,6 +272,33 @@ class ContentModerationNotificationsFormBase extends EntityForm { + } + + // Send email to the original author? ++ // Flag module notification modifications. ++ if ($this->moduleHandler->moduleExists('flag')) { ++ $form['flag_wrapper'] = [ ++ '#type' => 'container', ++ '#prefix' => '
', ++ '#suffix' => '
', ++ ]; ++ ++ /** @var \Drupal\flag\Entity\Flag[] $flags */ ++ $flags = $this->entityTypeManager ++ ->getStorage('flag') ++ ->loadMultiple(); ++ $flag_options = []; ++ foreach ($flags as $flag) { ++ $flag_options[$flag->id()] = $flag->label(); ++ } ++ ++ $form['flag_wrapper']['flags'] = [ ++ '#type' => 'checkboxes', ++ '#title' => $this->t('Flag types'), ++ '#options' => $flag_options, ++ '#default_value' => isset($content_moderation_notification->flags) ? $content_moderation_notification->flags : [], ++ '#description' => $this->t('Send notifications to all users who have flagged with these flags.'), ++ ]; ++ } ++ ++ // Send email to author? + $form['author'] = [ + '#type' => 'checkbox', + '#title' => $this->t('Email the original content author?'), +diff --git a/src/Notification.php b/src/Notification.php +index 47be0e6..cf83a52 100644 +--- a/src/Notification.php ++++ b/src/Notification.php +@@ -9,6 +9,7 @@ use Drupal\Core\Mail\MailManagerInterface; + use Drupal\Core\Plugin\Context\ContextProviderInterface; + use Drupal\Core\Session\AccountInterface; + use Drupal\group\Entity\Group; ++use Drupal\flag\FlagService; + use Drupal\token\TokenEntityMapperInterface; + use Drupal\user\EntityOwnerInterface; + use Drupal\user\RoleInterface; +@@ -65,6 +66,13 @@ class Notification implements NotificationInterface { + */ + protected $contextProvider; + ++ /** ++ * The Flag service. ++ * ++ * @var \Drupal\flag\FlagService ++ */ ++ protected $flagService; ++ + /** + * Creates a new ModerationInformation instance. + * +@@ -80,8 +88,10 @@ class Notification implements NotificationInterface { + * The notification information service. + * @param \Drupal\token\TokenEntityMapperInterface $token_entity_mappper + * The token entity mapper service. ++ * @param \Drupal\flag\FlagService $flag_service ++ * The Flag service. + */ +- public function __construct(AccountInterface $current_user, EntityTypeManagerInterface $entity_type_manager, MailManagerInterface $mail_manager, ModuleHandlerInterface $module_handler, NotificationInformationInterface $notification_information, TokenEntityMapperInterface $token_entity_mappper = NULL, ContextProviderInterface $context_provider = NULL) { ++ public function __construct(AccountInterface $current_user, EntityTypeManagerInterface $entity_type_manager, MailManagerInterface $mail_manager, ModuleHandlerInterface $module_handler, NotificationInformationInterface $notification_information, TokenEntityMapperInterface $token_entity_mappper = NULL, ContextProviderInterface $context_provider = NULL, FlagService $flag_service = NULL) { + $this->currentUser = $current_user; + $this->entityTypeManager = $entity_type_manager; + $this->mailManager = $mail_manager; +@@ -89,6 +99,7 @@ class Notification implements NotificationInterface { + $this->notificationInformation = $notification_information; + $this->tokenEntityMapper = $token_entity_mappper; + $this->contextProvider = $context_provider; ++ $this->flagService = $flag_service; + } + + /** +@@ -221,6 +232,25 @@ class Notification implements NotificationInterface { + } + } + ++ // Specific part to use flag module functionality ++ if ($this->moduleHandler->moduleExists('flag') ++ && !empty($notification->getFlags())) { ++ // To get all users who have flagged the entity we need to get the flag. ++ $flag_ids = $notification->getFlags(); ++ /** @var \Drupal\flag\Entity\Flag[] $flags */ ++ $flags = $this->entityTypeManager ++ ->getStorage('flag') ++ ->loadMultiple($flag_ids); ++ foreach ($flags as $flag) { ++ /** @var \Drupal\user\Entity\User[] $users */ ++ $users = $this->flagService->getFlaggingUsers($entity, $flag); ++ ++ foreach ($users as $user) { ++ $data['to'][] = $user->getEmail(); ++ } ++ } ++ } ++ + // Adhoc emails. + $adhoc_emails = $notification->getEmails(); + $template = [ +@@ -247,6 +277,7 @@ class Notification implements NotificationInterface { + + // Force to BCC. + $data['params']['headers']['Bcc'] = implode(',', $data['to']); ++ + $recipient = ''; + if (!$notification->disableSiteMail()) { + $recipient = \Drupal::config('system.site')->get('mail'); diff --git a/services/drupal/phpstan.neon.dist b/services/drupal/phpstan.neon.dist new file mode 100644 index 0000000000..ac363a4c8d --- /dev/null +++ b/services/drupal/phpstan.neon.dist @@ -0,0 +1,20 @@ +parameters: + # https://phpstan.org/config-reference#rule-level + level: 5 + + # https://phpstan.org/config-reference#phpversion + phpVersion: 80000 + + # https://phpstan.org/config-reference#inferprivatepropertytypefromconstructor + inferPrivatePropertyTypeFromConstructor: true + + # https://phpstan.org/user-guide/ignoring-errors#reporting-unused-ignores + reportUnmatchedIgnoredErrors: false + + paths: + - web/modules/custom + - web/themes/epa_theme + - web/themes/epa_seven + excludePaths: + - web/themes/epa_theme/gesso_helper + - web/themes/epa_theme/node_modules diff --git a/services/drupal/scripts/ecs/nginx-entrypoint.sh b/services/drupal/scripts/ecs/nginx-entrypoint.sh old mode 100644 new mode 100755 index 7b52643a22..a22aa0351f --- a/services/drupal/scripts/ecs/nginx-entrypoint.sh +++ b/services/drupal/scripts/ecs/nginx-entrypoint.sh @@ -2,10 +2,23 @@ set -e -# Replace runtime parameters (see cluster.tf) -sed -i \ - -e "s/WEBCMS_S3_DOMAIN/$WEBCMS_S3_DOMAIN/" \ - -e "s/WEBCMS_DOMAIN/$WEBCMS_DOMAIN/" \ - /etc/nginx/conf.d/default.conf +if test -n "$WEBCMS_BASIC_AUTH" && test "$WEBCMS_BASIC_AUTH" != '.'; then + # If basic auth credentials were provided, create an htpasswd file from the + # credentials and replace the auth with an on toggle for nginx. + echo "$WEBCMS_BASIC_AUTH" >/etc/nginx/htpasswd -exec nginx -g 'daemon off;' + # This should be a realm name but the response 'on' is sufficient for our + # purposes. + export WEBCMS_BASIC_AUTH=on +else + # If credentials weren't provided, explicitly set + export WEBCMS_BASIC_AUTH=off +fi + +# Record status in the logs +echo "Basic auth status: $WEBCMS_BASIC_AUTH" + +# Pass execution off to the default entrypoint (among other things, this does +# environment substitution which will consume the WEBCMS_BASIC_AUTH variable and +# others). +exec /docker-entrypoint.sh "$@" diff --git a/services/drupal/web/modules/custom/epa_core/epa_core.deploy.php b/services/drupal/web/modules/custom/epa_core/epa_core.deploy.php index 9cd4739a63..5b8f8be80a 100644 --- a/services/drupal/web/modules/custom/epa_core/epa_core.deploy.php +++ b/services/drupal/web/modules/custom/epa_core/epa_core.deploy.php @@ -1,5 +1,7 @@ reindex(); } } + +/** + * Updating the field definition config for node__field_press_office cardinality + * to be 1. + */ +function epa_core_deploy_0003_update_node_field_press_office_cardinality() { + $manager = \Drupal::entityDefinitionUpdateManager(); + $storage_definition = $manager->getFieldStorageDefinition('field_press_office', 'node'); + $storage_definition->setCardinality(1); + $manager->updateFieldStorageDefinition($storage_definition); +} + +/** + * Moves images on banner slides to banner image field + * and creates banner image entity where necessary. + */ +function epa_core_deploy_0003_update_banner_slide_images(&$sandbox) { + $prefixes = ['paragraph_revision', 'paragraph']; + + $replacements = [ + ':group_type' => 'web_area-group_node-%', + ':value' => 'banner_slide' + ]; + + if (!isset($sandbox['total'])) { + $sandbox['total'] = 0; + $sandbox['current'] = 0; + $sandbox['images_created'] = 0; + // Query all images that are being used with banner slides. + foreach ($prefixes as $prefix) { + $result = \Drupal::database()->query( + 'SELECT DISTINCT fi.field_image_target_id +FROM {'. $prefix .'__field_image} AS fi +LEFT JOIN {file_managed} AS fm + ON fm.fid = fi.field_image_target_id +LEFT JOIN {'. $prefix .'__field_banner_image} AS pfb + ON fi.revision_id = pfb.revision_id +LEFT JOIN {paragraph_revision__field_banner_slides} AS fbs + ON fi.revision_id = fbs.field_banner_slides_target_revision_id +LEFT JOIN {node_revision__field_banner} AS nfb + ON nfb.field_banner_target_revision_id = fbs.revision_id +LEFT JOIN {group_content_field_data} gfd + ON gfd.entity_id = nfb.entity_id + AND gfd.type LIKE :group_type +WHERE pfb.revision_id IS NULL + AND fi.bundle = :value + AND gid IS NOT NULL;', $replacements)->fetchCol(); + + $sandbox['total'] += count($result); + + } + + \Drupal::logger('epa_core')->notice($sandbox['total'] . ' image files associated with banner slides.'); + } + + foreach ($prefixes as $prefix) { + + $files = \Drupal::database()->query( + 'SELECT DISTINCT fi.field_image_target_id, + fi.field_image_alt, + fm.filename, + fm.langcode, + fi.entity_id, + fi.revision_id, + gfd.gid +FROM {'. $prefix .'__field_image} AS fi +LEFT JOIN {file_managed} AS fm + ON fm.fid = fi.field_image_target_id +LEFT JOIN {'. $prefix .'__field_banner_image} AS pfb + ON fi.revision_id = pfb.revision_id +LEFT JOIN {paragraph_revision__field_banner_slides} AS fbs + ON fi.revision_id = fbs.field_banner_slides_target_revision_id +LEFT JOIN {node_revision__field_banner} AS nfb + ON nfb.field_banner_target_revision_id = fbs.revision_id +LEFT JOIN {group_content_field_data} gfd + ON gfd.entity_id = nfb.entity_id + AND gfd.type LIKE :group_type +WHERE pfb.revision_id IS NULL + AND fi.bundle = :value + AND gid IS NOT NULL + LIMIT 500;', $replacements) + ->fetchAll(); + + foreach ($files as $file) { + $banner_media = \Drupal::database()->query( + 'SELECT entity_id + FROM media__field_media_image + WHERE field_media_image_target_id = ' . $file->field_image_target_id . ' + AND bundle = :value;', [':value' => 'banner_image']) + ->fetchCol(); + + if (empty($banner_media)) { + $image_media = Media::create([ + 'bundle' => 'banner_image', + 'uid' => \Drupal::currentUser()->id(), + 'langcode' => \Drupal::languageManager()->getDefaultLanguage()->getId(), + 'field_media_image' => [ + 'target_id' => $file->field_image_target_id, + 'alt' => $file->field_image_alt, + 'title' => $file->filename, + ], + ]); + $image_media->save(); + $langcode = $image_media->language()->getId(); + $banner_image_target_id = $image_media->id(); + if (!empty($file->gid)) { + $group = Group::load($file->gid); + $group->addContent($image_media, 'group_media:' . $image_media->bundle()); + } + $sandbox['images_created']++; + } else { + $banner_image_target_id = $banner_media[0]; + $langcode = $file->langcode; + if (empty($langcode)) { + $langcode = \Drupal::languageManager()->getDefaultLanguage()->getId(); + } + } + $connection = \Drupal::service('database'); + $result = $connection->insert($prefix . '__field_banner_image') + ->fields([ + 'bundle' => 'banner_slide', + 'deleted' => 0, + 'entity_id' => $file->entity_id, + 'revision_id' => $file->revision_id, + 'langcode' => $langcode, + 'delta' => 0, + 'field_banner_image_target_id' => $banner_image_target_id + ]) + ->execute(); + $sandbox['current']++; + } + } + + if ($sandbox['current'] >= $sandbox['total']) { + $sandbox['#finished'] = 1; + \Drupal::logger('epa_core')->notice('Banner slide image update complete'); + } else { + $sandbox['#finished'] = ($sandbox['current'] / $sandbox['total']); + } + + \Drupal::logger('epa_core')->notice($sandbox['current'] . ' images processed / ' . $sandbox['images_created'] . ' banner images created.'); + +} + diff --git a/services/drupal/web/modules/custom/epa_core/epa_core.install b/services/drupal/web/modules/custom/epa_core/epa_core.install index 9ef57522b8..36f198d41e 100644 --- a/services/drupal/web/modules/custom/epa_core/epa_core.install +++ b/services/drupal/web/modules/custom/epa_core/epa_core.install @@ -93,3 +93,35 @@ function _epa_core_create_news_release_type_term() { $term->field_term_days_til_review = 730; $term->save(); } + +/** + * As part of https://forumone.atlassian.net/browse/EPAD8-1962 to set cardinality + * of the Press Office field to 1 we will remove records where delta is greater + * than the minimum delta value. + */ +function epa_core_update_9004() { + $database = \Drupal::database(); + foreach (['node__field_press_office', 'node_revision__field_press_office'] as $table) { + if ($database->schema()->tableExists($table)) { + // UPDATE node__field_press_office as node + // LEFT JOIN (SELECT revision_id, MIN(delta) as delta + // FROM node__field_press_office GROUP BY revision_id) AS min_delta ON node.revision_id = min_delta.revision_id AND min_delta.delta = node.delta + // SET node.delta = 0 + // WHERE min_delta.delta > 0; + $database->query("UPDATE {$table} AS node LEFT JOIN (SELECT revision_id, MIN(delta) AS delta FROM {$table} GROUP BY revision_id) AS min_delta ON node.revision_id = min_delta.revision_id AND min_delta.delta = node.delta SET node.delta = 0 WHERE min_delta.delta > 0"); + + // Now delete all rows that are greater than that minimum delta. + // DELETE FROM {$table} WHERE delta > 0; + $database->delete($table) + ->condition('delta', 0, '>') + ->execute(); + } + } +} + +/** + * No longer needed, but was implemented in earlier development so we need the + * update hook to still exist. + */ +function epa_core_update_9005() { +} diff --git a/services/drupal/web/modules/custom/epa_core/epa_core.module b/services/drupal/web/modules/custom/epa_core/epa_core.module index 2739361708..6854c0642e 100644 --- a/services/drupal/web/modules/custom/epa_core/epa_core.module +++ b/services/drupal/web/modules/custom/epa_core/epa_core.module @@ -20,6 +20,7 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Field\FieldFilteredMarkup; use Drupal\Core\Render\BubbleableMetadata; use Drupal\Core\StringTranslation\TranslatableMarkup; +use Drupal\media\Entity\Media; use Drupal\node\NodeInterface; use Drupal\Core\Cache\CacheableMetadata; use Drupal\Core\Cache\RefinableCacheableDependencyInterface; @@ -101,6 +102,9 @@ function epa_core_form_node_form_alter(&$form, FormStateInterface $form_state, $ $form['revision_information']['submit_copy'] = $submit_copy; } + // Change the "Revision log message" label to say "Revision notes". + $form['revision_log']['widget'][0]['value']['#title'] = t("Revision notes"); + switch ($form_id) { case 'node_news_release_form': case 'node_news_release_edit_form': @@ -738,7 +742,6 @@ function epa_core_form_views_exposed_form_alter(&$form, &$form_state, $form_id) } } - /** * Implements hook_entity_base_field_info_alter(). */ diff --git a/services/drupal/web/modules/custom/epa_core/src/Entity/EntityAutocompleteMatcher.php b/services/drupal/web/modules/custom/epa_core/src/Entity/EntityAutocompleteMatcher.php index 0458a676b4..cc8ca16356 100644 --- a/services/drupal/web/modules/custom/epa_core/src/Entity/EntityAutocompleteMatcher.php +++ b/services/drupal/web/modules/custom/epa_core/src/Entity/EntityAutocompleteMatcher.php @@ -36,7 +36,7 @@ public function getMatches($target_type, $selection_handler, $selection_settings $key = preg_replace('/\s\s+/', ' ', str_replace("\n", '', trim(Html::decodeEntities(strip_tags($key))))); // Names containing commas or quotes must be wrapped in quotes. $key = Tags::encode($key); - $matches[] = ['value' => $key, 'label' => $label]; + $matches[] = ['value' => $key, 'label' => '(' . $entity_id . ') ' . $label]; } } } diff --git a/services/drupal/web/modules/custom/epa_elasticsearch/epa_elasticsearch.info.yml b/services/drupal/web/modules/custom/epa_elasticsearch/epa_elasticsearch.info.yml new file mode 100644 index 0000000000..5e81a17228 --- /dev/null +++ b/services/drupal/web/modules/custom/epa_elasticsearch/epa_elasticsearch.info.yml @@ -0,0 +1,7 @@ +name: EPA Elasticsearch +description: Provides EPA-specific customizations for the Elasticsearch functionality +type: module +core_version_requirement: ^8 || ^9 +package: EPA +dependencies: + - elasticsearch_connector:elasticsearch_connector diff --git a/services/drupal/web/modules/custom/epa_elasticsearch/epa_elasticsearch.services.yml b/services/drupal/web/modules/custom/epa_elasticsearch/epa_elasticsearch.services.yml new file mode 100644 index 0000000000..f24b70a4b6 --- /dev/null +++ b/services/drupal/web/modules/custom/epa_elasticsearch/epa_elasticsearch.services.yml @@ -0,0 +1,5 @@ +services: + epa_elasticsearch.subscriber: + class: Drupal\epa_elasticsearch\EventSubscriber\EpaElasticsearchEventSubscriber + tags: + - { name: event_subscriber } diff --git a/services/drupal/web/modules/custom/epa_elasticsearch/src/EventSubscriber/EpaElasticsearchEventSubscriber.php b/services/drupal/web/modules/custom/epa_elasticsearch/src/EventSubscriber/EpaElasticsearchEventSubscriber.php new file mode 100644 index 0000000000..f051fc5786 --- /dev/null +++ b/services/drupal/web/modules/custom/epa_elasticsearch/src/EventSubscriber/EpaElasticsearchEventSubscriber.php @@ -0,0 +1,62 @@ +getElasticSearchParams(); + + // For searches against the news release index weight recent results more + // heavily. + if (!empty($params['index']) && substr($params['index'], -13) == 'news_releases' && !empty($params['body']['query'])) { + $now = new DrupalDateTime('now'); + $queryString = $params['body']['query']; + + // Add relevancy criteria according to the item's date. + $params['body']['query'] = [ + 'function_score' => [ + 'score_mode' => 'sum', + 'boost_mode' => 'multiply', + 'functions' => [ + [ + 'weight' => 1, + ], + [ + 'weight' => 10, // Boost documents released within the last 6 + // months from between 1.1 and 11. Beyond 6 months documents will + // get boosted approximately the same amount, between 1 and 1.1. + // This boost will get multiplied by their query score to get + // the relevance score. + 'gauss' => [ + 'field_release' => [ + 'origin' => $now->format('Y-m-d'), + 'scale' => '183d', // 6 months + 'decay' => 0.1, + ], + ], + ], + ], + 'query' => $queryString, + ], + ]; + $event->setElasticSearchParams($params); + } + } +} diff --git a/services/drupal/web/modules/custom/epa_media/src/Plugin/Field/FieldFormatter/EpaMediaThumbnailUrlFormatter.php b/services/drupal/web/modules/custom/epa_media/src/Plugin/Field/FieldFormatter/EpaMediaThumbnailUrlFormatter.php new file mode 100644 index 0000000000..e236092f56 --- /dev/null +++ b/services/drupal/web/modules/custom/epa_media/src/Plugin/Field/FieldFormatter/EpaMediaThumbnailUrlFormatter.php @@ -0,0 +1,108 @@ +imageStyleStorage = $image_style_storage; + } + + + + /** + * {@inheritdoc} + */ + public function settingsForm(array $form, FormStateInterface $form_state) { + $element = parent::settingsForm($form, $form_state); + + unset($element['image_link']); + + return $element; + } + + /** + * {@inheritdoc} + */ + public function viewElements(FieldItemListInterface $items, $langcode) { + $elements = []; + $media_items = $this->getEntitiesToView($items, $langcode); + + // Early opt-out if the field is empty. + if (empty($media_items)) { + return $elements; + } + + /** @var \Drupal\image\ImageStyleInterface $image_style */ + $image_style = $this->imageStyleStorage->load($this->getSetting('image_style')); + /** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */ + $file_url_generator = \Drupal::service('file_url_generator'); + /** @var \Drupal\media\MediaInterface[] $media_items */ + foreach ($media_items as $delta => $media) { + $image_uri = $media->get('thumbnail')->entity->getFileUri(); + $url = $image_style ? $file_url_generator->transformRelative($image_style->buildUrl($image_uri)) : $file_url_generator->generateString($image_uri); + + // Add cacheability metadata from the image and image style. + $cacheability = CacheableMetadata::createFromObject($media); + if ($image_style) { + $cacheability->addCacheableDependency(CacheableMetadata::createFromObject($image_style)); + } + + $elements[$delta] = ['#markup' => $url]; + $cacheability->applyTo($elements[$delta]); + } + return $elements; + } +} diff --git a/services/drupal/web/modules/custom/epa_metatag/epa_metatag.module b/services/drupal/web/modules/custom/epa_metatag/epa_metatag.module index 5b54f9e4ec..662d5879ae 100644 --- a/services/drupal/web/modules/custom/epa_metatag/epa_metatag.module +++ b/services/drupal/web/modules/custom/epa_metatag/epa_metatag.module @@ -5,6 +5,11 @@ * Contains epa_metatag.module. */ +use Drupal\Core\Field\FieldDefinitionInterface; +use Drupal\Core\Field\FieldItemListInterface; +use Drupal\Core\Session\AccountInterface; +use Drupal\Core\Access\AccessResult; + /** * Implements hook_page_attachments_alter() * @param array $attachments @@ -17,3 +22,21 @@ function epa_metatag_page_attachments_alter(array &$attachments) { } } } + +/** + * Implements hook_entity_field_access(). + */ +function epa_metatag_entity_field_access($operation, FieldDefinitionInterface $field_definition, AccountInterface $account, FieldItemListInterface $items = NULL) { + $context = ($operation == 'view') ? 'display' : 'edit'; + if (!$field_definition->isDisplayConfigurable($context) || empty($items)) { + return AccessResult::neutral(); + } + if ($field_definition->getName() == 'field_meta_tags') { + $allowed_roles = ['administrator', 'system_webmaster', 'system_editor']; + $matches = array_intersect($account->getRoles(), $allowed_roles); + if(empty($matches)) { + return AccessResult::forbidden(); + } + } + return AccessResult::neutral(); +} diff --git a/services/drupal/web/modules/custom/epa_node_export/src/Controller/NodeExportController.php b/services/drupal/web/modules/custom/epa_node_export/src/Controller/NodeExportController.php index 1f62086a99..41275160ca 100644 --- a/services/drupal/web/modules/custom/epa_node_export/src/Controller/NodeExportController.php +++ b/services/drupal/web/modules/custom/epa_node_export/src/Controller/NodeExportController.php @@ -206,7 +206,7 @@ public function createExportFile(NodeInterface $node) { exec("cd " . dirname($export_dir) . " && wget --execute robots=off --restrict-file-names=windows --no-host-directories --timestamping --convert-links --adjust-extension --directory-prefix=" - . basename($export_dir) . " --content-on-error --no-verbose --recursive --level=1 --page-requisites -I /core,/libraries,/modules,/s3fs-css,/s3fs-js,/sites,/system,/themes,/sites,/misc -X /themes/epa_theme/pattern-lab " + . basename($export_dir) . " --content-on-error --no-verbose --recursive --level=1 --page-requisites -I /core,/libraries,/modules,/s3fs-css,/s3fs-js,/sites,/system,/themes,/sites,/misc -X /themes/epa_theme/pattern-lab,/themes/epa_theme/fonts " . $url . ' 2>&1', $wget_output, $wget_status); // Log the output of wget if we hit an error (non-zero status code). diff --git a/services/drupal/web/modules/custom/epa_s3fs/epa_s3fs.install b/services/drupal/web/modules/custom/epa_s3fs/epa_s3fs.install index 7def2c9278..3a5b3fe185 100644 --- a/services/drupal/web/modules/custom/epa_s3fs/epa_s3fs.install +++ b/services/drupal/web/modules/custom/epa_s3fs/epa_s3fs.install @@ -1,4 +1,30 @@ query('ALTER TABLE {' . $table . '} ADD COLUMN uri_collated varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin GENERATED ALWAYS AS (uri)'); + \Drupal::database() + ->query('CREATE INDEX epa_s3fs__uri_collated ON {'. $table .'}(uri_collated)'); +} + +/** + * Add a generated column to the S3FS table for better join performance. + */ +function epa_s3fs_update_9000() { + epa_s3fs_fix_table_indexes(); } diff --git a/services/drupal/web/modules/custom/epa_s3fs/epa_s3fs.module b/services/drupal/web/modules/custom/epa_s3fs/epa_s3fs.module index 41045d39d7..5a16f692d4 100644 --- a/services/drupal/web/modules/custom/epa_s3fs/epa_s3fs.module +++ b/services/drupal/web/modules/custom/epa_s3fs/epa_s3fs.module @@ -8,3 +8,56 @@ * This file is no longer required in Drupal 8. * @see https://www.drupal.org/node/2217931 */ + + +/** + * Implements hook_views_data(). + */ +function epa_s3fs_views_data() { + $data = []; + + // S3FS table. + $data['s3fs_file'] = []; + $data['s3fs_file']['table']['group'] = t('Files'); + $data['s3fs_file']['table']['base'] =[ + 'field' => 'uri', + 'title' => t('S3 File System (s3fs)'), + 'help' => t('S3 File System records exposed to Views.'), + ]; + + // URI collated field. + $data['s3fs_file']['uri_collated'] = [ + 'title' => t('S3FS URI'), + 'help' => t('The S3 URI of the file.'), + 'field' => [ + 'id' => 'standard', + ], + 'sort' => [ + 'id' => 'standard', + ], + 'filter' => [ + 'id' => 'string', + ], + ]; + + return $data; +} + + +/** + * Implements hook_views_data_alter(). + */ +function epa_s3fs_views_data_alter(&$data) { + $data['file_managed']['s3fs_file'] = [ + 'title' => t('S3FS File'), + 'help' => t('Details about the file stored in S3FS'), + + 'relationship' => [ + 'base' => 's3fs_file', + 'base field' => 'uri_collated', + 'field' => 'uri', + 'id' => 'standard', + 'label' => t('S3FS Files'), + ], + ]; +} diff --git a/services/drupal/web/modules/custom/epa_s3fs/epa_s3fs.services.yml b/services/drupal/web/modules/custom/epa_s3fs/epa_s3fs.services.yml new file mode 100644 index 0000000000..4cb0a1030d --- /dev/null +++ b/services/drupal/web/modules/custom/epa_s3fs/epa_s3fs.services.yml @@ -0,0 +1,4 @@ +services: + s3fs: + class: Drupal\epa_s3fs\EpaS3fsService + arguments: ['@database', '@config.factory', '@datetime.time', '@module_handler'] diff --git a/services/drupal/web/modules/custom/epa_s3fs/src/EpaS3fsService.php b/services/drupal/web/modules/custom/epa_s3fs/src/EpaS3fsService.php new file mode 100644 index 0000000000..b4b161a579 --- /dev/null +++ b/services/drupal/web/modules/custom/epa_s3fs/src/EpaS3fsService.php @@ -0,0 +1,21 @@ + * { white-space: normal; } + +#edit-node-revisions-table tr.revision-latest:not(.revision-current) td { + background-color: #faf3d1; +} diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module index b2865b81ca..71a8821e31 100644 --- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module +++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module @@ -7,6 +7,7 @@ use Drupal\content_moderation\Entity\ContentModerationStateInterface; use Drupal\content_moderation\Form\EntityModerationForm; +use Drupal\content_moderation\ModerationInformationInterface; use Drupal\content_moderation_notifications\ContentModerationNotificationInterface; use Drupal\Core\Entity\Display\EntityViewDisplayInterface; use Drupal\Core\Entity\EntityInterface; @@ -14,10 +15,12 @@ use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Entity\RevisionLogInterface; use Drupal\Core\Field\BaseFieldDefinition; use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Site\Settings; use Drupal\node\NodeInterface; use Drupal\Core\Link; use Drupal\Core\Url; use Drupal\paragraphs\Entity\Paragraph; +use Drupal\user\Entity\User; /** * Implements hook_entity_base_field_info(). @@ -173,6 +176,16 @@ function epa_workflow_content_moderation_notification_mail_data_alter(EntityInte } } } + + // The notifications make all users BCC by default so there's no good way to + // validate that the correct users are being sent the notification. This + // settings variable being set will allow us to see the list of users in the + // message body now. + if (Settings::get('epa_content_moderation_email_debug', NULL)) { + $user_list = implode(', ', $data['to']); + $data['params']['message'] .= $user_list; + } + } /** @@ -232,95 +245,8 @@ function epa_workflow_form_alter(array &$form, FormStateInterface $form_state, $ $form['new_state']['#required'] = TRUE; - // Only show an "Edit" link to the user if we're on the latest revision of the node. - $storage = $form_state->getStorage(); - if (isset($storage['entity']) && $storage['entity'] instanceof NodeInterface) { - $node = $storage['entity']; - if ($node->isLatestRevision()) { - $link_options = [ - 'attributes' => [ - 'class' => [ - 'button' - ], - ], - ]; - - $edit_link = Link::fromTextAndUrl( - t('Edit'), - Url::fromRoute( - 'entity.node.edit_form', - ['node' => $node->id()], - $link_options - ) - ); - - $form['node_edit_link'] = $edit_link->toRenderable(); - } - } - - // Want to display the `field_review_deadline` date - // on the moderation block only on published content - // and the `field_review_deadline` has a value - if ( - isset($node) - && !$node->field_review_deadline->isEmpty() - && $node->isPublished() - ) - { - - $review_deadline = $node->field_review_deadline->view([ - 'label' => 'hidden', - 'type' => 'datetime_default', - 'settings' => [ - 'format_type' => 'medium_no_time', - ], - ]); - $renderer = \Drupal::service('renderer'); - $review_deadline = $renderer->render($review_deadline); - - $form['review_deadline'] = [ - '#type' => 'item', - '#title' => t("Review deadline"), - '#markup' => $review_deadline - ]; - - } - - // Display the Revision Author Information - if ( - isset($node) - && $node->getRevisionUser() - ) - { - - $revision_author = $node->getRevisionUser()->get('name')->value; - $author_uid = $node->getRevisionUserId(); - - $form['revision_author'] = [ - '#type' => 'item', - '#title' => t("Revision saved by"), - '#markup' => '' . $revision_author . '' - ]; - - } - - // Display the Node ID - if ( - isset($node) - && $node->id() - ) - { - - $nid = $node->id(); - - $form['nid'] = [ - '#type' => 'item', - '#title' => t("Node ID"), - '#markup' => $nid - ]; - - } - + // Change "Revision Log" label to "Revision notes". + $form['revision_log']['#title'] = t('Revision notes'); } if ((in_array($form_id,['content_moderation_entity_moderation_form']) && isset($form['submit'])) || isset($form['node_bulk_form'])) { @@ -427,8 +353,140 @@ function epa_workflow_entity_view(array &$build, EntityInterface $entity, Entity if (!$entity->isLatestRevision() && !$entity->isDefaultRevision()) { return; } - $build['epa_content_moderation_control'] = \Drupal::formBuilder()->getForm(EntityModerationForm::class, $entity); + + build_content_moderation_info_box($entity, $build); + } +} + +/** + * Helper function to build 'info box' for displaying content moderation info. + * + * @param \Drupal\Core\Entity\EntityInterface $entity + * The entity (Node) to build the info box for. + * @param array $build + * The current build render array. + * + * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException + * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException + */ +function build_content_moderation_info_box(EntityInterface $entity, array &$build): void { + /** @var \Drupal\Core\Render\Renderer $renderer */ + $renderer = \Drupal::service('renderer'); + + $node_edit_link = NULL; + if ($entity->isLatestRevision() && $entity->access('update')) { + $link_options = [ + 'attributes' => [ + 'class' => [ + 'button' + ], + ], + ]; + + $edit_link = Link::fromTextAndUrl( + t('Edit'), + Url::fromRoute( + 'entity.node.edit_form', + ['node' => $entity->id()], + $link_options + ) + ); + + $node_edit_link = $edit_link->toRenderable(); + } + + $nid = [ + '#type' => 'item', + '#title' => t("Node ID"), + '#markup' => $entity->id(), + ]; + + // Build display for the author who made the revision. + $revision_author = NULL; + if ($entity->getRevisionUser()) { + $revision_author = $entity->getRevisionUser()->get('name')->value; + $author_uid = $entity->getRevisionUserId(); + $revision_author_link = Link::createFromRoute( + $revision_author, + 'entity.user.canonical', + ['user' => $author_uid] + )->toRenderable(); + + $revision_author = [ + '#type' => 'item', + '#title' => t("Revision saved by"), + '#markup' => $revision_author_link, + ]; + } + + // Want to display the `field_review_deadline` date + // on the moderation block only on published content + // and the `field_review_deadline` has a value + $review_deadline = NULL; + if (!$entity->field_review_deadline->isEmpty() && $entity->isPublished()) { + + $review_deadline_render = $entity->field_review_deadline->view([ + 'label' => 'hidden', + 'type' => 'datetime_default', + 'settings' => [ + 'format_type' => 'medium_no_time', + ], + ]); + + $review_deadline_rendered = $renderer->render($review_deadline_render); + + $review_deadline = [ + '#type' => 'item', + '#title' => t("Review deadline"), + '#markup' => $review_deadline_rendered + ]; + + } + + // The current moderation state. + $current = NULL; + if (!$entity->get('moderation_state')->isEmpty()) { + $current_state = $entity->get('moderation_state')->value; + /** @var \Drupal\workflows\WorkflowInterface $workflow */ + $workflow = \Drupal::service('content_moderation.moderation_information') + ->getWorkflowForEntity($entity); + + $current = [ + '#type' => 'item', + '#title' => t('Moderation state'), + '#markup' => $workflow->getTypePlugin() + ->getState($current_state) + ->label(), + ]; } + + // Flag link item for notification opt-in + /** @var \Drupal\flag\Entity\Flag $flag */ + $flag = \Drupal::entityTypeManager() + ->getStorage('flag') + ->load('notification_opt_in'); + + // Normally we'd want to use the link_builder service provided by flag, but + // we really only want the link and not the extra div that comes with the + // flag template out of the box. + $flag_link_plugin = $flag->getLinkTypePlugin(); + $flag_link = $flag_link_plugin->getAsFlagLink($flag, $entity); + + $flag_link_item = [ + '#markup' => $renderer->render($flag_link) + ]; + + $build['epa_content_moderation_info_box'] = [ + '#theme' => 'epa_content_info_box', + '#node_edit_link' => $node_edit_link, + '#nid' => $nid, + '#revision_author' => $revision_author, + '#review_deadline' => $review_deadline, + '#current' => $current, + '#flag_link' => $flag_link_item, + '#content_moderation_form' => \Drupal::formBuilder() + ->getForm(EntityModerationForm::class, $entity), + ]; } /** @@ -559,7 +617,11 @@ function epa_workflow_node_update(NodeInterface $node) { $storage = \Drupal::entityTypeManager()->getStorage('node'); $last_revision = $storage->loadRevision($node->leapfrog); $last_revision->setNewRevision(); - $last_revision->isDefaultRevision(FALSE); + // If our default revision is not published then this leapfrogged revision + // should also take over the default revision spot. This follows the model + // of what core does. If the default revision IS published then our leapfrog + // revision is only the latest revision and does not take over the default. + $last_revision->isDefaultRevision(!$node->isPublished()); $last_revision->setRevisionCreationTime(\Drupal::time()->getRequestTime()); $last_revision->setChangedTime(\Drupal::time()->getRequestTime()); $last_revision->setRevisionLogMessage(t('Restoring the latest revision (based on revision %vid) after a transition occurred to the current revision.',['%vid' => $node->leapfrog])); @@ -774,3 +836,22 @@ function epa_workflow_form_revision_overview_form_alter(&$form, FormStateInterfa function epa_workflow_form_node_revision_revert_confirm_alter(&$form, FormStateInterface $form_state, $form_id) { $form['actions']['submit']['#value'] = 'Copy and Set as Latest Revision'; } + +/** + * Implements hook_theme(). + */ +function epa_workflow_theme($existing, $type, $theme, $path) { + return [ + 'epa_content_info_box' => [ + 'variables' => [ + 'node_edit_link' => NULL, + 'nid' => NULL, + 'revision_author' => NULL, + 'review_deadline' => NULL, + 'current' => NULL, + 'flag_link' => NULL, + 'content_moderation_form' => NULL, + ], + ], + ]; +} diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.services.yml b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.services.yml index 148fa9de1e..95e7cb0281 100644 --- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.services.yml +++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.services.yml @@ -4,7 +4,7 @@ services: decorates: content_moderation_notifications.notification decoration_priority: 5 public: false - arguments: ['@epa_workflow.content_moderation_notifications.notification.inner', '@current_user', '@entity_type.manager', '@plugin.manager.mail', '@module_handler', '@content_moderation_notifications.notification_information', '@?token.entity_mapper'] + arguments: ['@epa_workflow.content_moderation_notifications.notification.inner', '@current_user', '@entity_type.manager', '@plugin.manager.mail', '@module_handler', '@content_moderation_notifications.notification_information', '@?token.entity_mapper', '@?group.group_route_context', '@?flag'] epa_workflow.content_moderation_notifications.notification_information: class: Drupal\epa_workflow\EPANotificationInformation decorates: content_moderation_notifications.notification_information diff --git a/services/drupal/web/modules/custom/epa_workflow/src/EPANotification.php b/services/drupal/web/modules/custom/epa_workflow/src/EPANotification.php index dbca74157f..e61e0eaa31 100644 --- a/services/drupal/web/modules/custom/epa_workflow/src/EPANotification.php +++ b/services/drupal/web/modules/custom/epa_workflow/src/EPANotification.php @@ -10,7 +10,9 @@ use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Mail\MailManagerInterface; +use Drupal\Core\Plugin\Context\ContextProviderInterface; use Drupal\Core\Session\AccountInterface; +use Drupal\flag\FlagService; use Drupal\token\TokenEntityMapperInterface; /** @@ -42,10 +44,14 @@ class EPANotification extends Notification { * The notification information service. * @param \Drupal\token\TokenEntityMapperInterface $token_entity_mappper * The token entity mapper service. + * @param \Drupal\Core\Plugin\Context\ContextProviderInterface $context_provider + * The context provider for group. + * @param \Drupal\flag\FlagService|null $flag_service + * The flag service. */ - public function __construct(NotificationInterface $notification, AccountInterface $current_user, EntityTypeManagerInterface $entity_type_manager, MailManagerInterface $mail_manager, ModuleHandlerInterface $module_handler, NotificationInformationInterface $notification_information, TokenEntityMapperInterface $token_entity_mappper = NULL) { + public function __construct(NotificationInterface $notification, AccountInterface $current_user, EntityTypeManagerInterface $entity_type_manager, MailManagerInterface $mail_manager, ModuleHandlerInterface $module_handler, NotificationInformationInterface $notification_information, TokenEntityMapperInterface $token_entity_mappper = NULL, ContextProviderInterface $context_provider, FlagService $flag_service = NULL) { $this->notificationService = $notification; - parent::__construct($current_user, $entity_type_manager, $mail_manager, $module_handler, $notification_information, $token_entity_mappper); + parent::__construct($current_user, $entity_type_manager, $mail_manager, $module_handler, $notification_information, $token_entity_mappper, $context_provider, $flag_service); } /** diff --git a/services/drupal/web/modules/custom/epa_workflow/templates/epa-content-info-box.html.twig b/services/drupal/web/modules/custom/epa_workflow/templates/epa-content-info-box.html.twig new file mode 100644 index 0000000000..bf91d218f8 --- /dev/null +++ b/services/drupal/web/modules/custom/epa_workflow/templates/epa-content-info-box.html.twig @@ -0,0 +1,27 @@ +{% if node_edit_link %} + {{ node_edit_link }} +{% endif %} + +{% if flag_link %} + {{ flag_link }} +{% endif %} + +{% if nid %} + {{ nid }} +{% endif %} + +{% if revision_author %} + {{ revision_author }} +{% endif %} + +{% if review_deadline %} + {{ review_deadline }} +{% endif %} + +{% if current %} + {{ current }} +{% endif %} + +{% if content_moderation_form %} + {{ content_moderation_form }} +{% endif %} diff --git a/services/drupal/web/modules/custom/epa_wysiwyg/epa_wysiwyg.module b/services/drupal/web/modules/custom/epa_wysiwyg/epa_wysiwyg.module index 8998e3dc11..9fc71d010f 100644 --- a/services/drupal/web/modules/custom/epa_wysiwyg/epa_wysiwyg.module +++ b/services/drupal/web/modules/custom/epa_wysiwyg/epa_wysiwyg.module @@ -124,7 +124,7 @@ function epa_wysiwyg_form_editor_link_dialog_alter(&$form, FormStateInterface $f // profile is selected. $form['attributes']['href_default'] = array_merge($form['attributes']['href'], [ '#type' => 'linkit', - '#description' => t('Start typing to find content.'), + '#description' => t('Type the page title, paste in a complete external URL, or add an email address or phone number.'), '#autocomplete_route_name' => 'linkit.autocomplete', '#autocomplete_route_parameters' => [ 'linkit_profile_id' => 'default', @@ -145,7 +145,7 @@ function epa_wysiwyg_form_editor_link_dialog_alter(&$form, FormStateInterface $f // and is disabled and hidden unless the web_area_content profile is selected. $form['attributes']['href_web_area_content'] = array_merge($form['attributes']['href'], [ '#type' => 'linkit', - '#description' => t('Start typing to find content.'), + '#description' => t('Type the page title, paste in a complete external URL, or add an email address or phone number.'), '#autocomplete_route_name' => 'linkit.autocomplete', '#autocomplete_route_parameters' => [ 'linkit_profile_id' => 'web_area_content', diff --git a/services/drupal/web/sites/all/libraries/leaflet/images/layers-2x.png b/services/drupal/web/sites/all/libraries/leaflet/images/layers-2x.png index a2cf7f9efe..200c333dca 100644 Binary files a/services/drupal/web/sites/all/libraries/leaflet/images/layers-2x.png and b/services/drupal/web/sites/all/libraries/leaflet/images/layers-2x.png differ diff --git a/services/drupal/web/sites/all/libraries/leaflet/images/layers.png b/services/drupal/web/sites/all/libraries/leaflet/images/layers.png index bca0a0e429..1a72e5784b 100644 Binary files a/services/drupal/web/sites/all/libraries/leaflet/images/layers.png and b/services/drupal/web/sites/all/libraries/leaflet/images/layers.png differ diff --git a/services/drupal/web/sites/all/libraries/leaflet/images/marker-icon-2x.png b/services/drupal/web/sites/all/libraries/leaflet/images/marker-icon-2x.png index 0015b6495f..88f9e50188 100644 Binary files a/services/drupal/web/sites/all/libraries/leaflet/images/marker-icon-2x.png and b/services/drupal/web/sites/all/libraries/leaflet/images/marker-icon-2x.png differ diff --git a/services/drupal/web/sites/all/libraries/leaflet/images/marker-icon.png b/services/drupal/web/sites/all/libraries/leaflet/images/marker-icon.png index e2e9f757f5..950edf2467 100644 Binary files a/services/drupal/web/sites/all/libraries/leaflet/images/marker-icon.png and b/services/drupal/web/sites/all/libraries/leaflet/images/marker-icon.png differ diff --git a/services/drupal/web/sites/all/libraries/leaflet/images/marker-shadow.png b/services/drupal/web/sites/all/libraries/leaflet/images/marker-shadow.png index d1e773c715..9fd2979532 100644 Binary files a/services/drupal/web/sites/all/libraries/leaflet/images/marker-shadow.png and b/services/drupal/web/sites/all/libraries/leaflet/images/marker-shadow.png differ diff --git a/services/drupal/web/sites/all/libraries/leaflet/leaflet-1.9.3.css b/services/drupal/web/sites/all/libraries/leaflet/leaflet-1.9.3.css new file mode 100644 index 0000000000..6f9e087d89 --- /dev/null +++ b/services/drupal/web/sites/all/libraries/leaflet/leaflet-1.9.3.css @@ -0,0 +1,595 @@ +/* required styles */ + +.leaflet-pane, +.leaflet-tile, +.leaflet-marker-icon, +.leaflet-marker-shadow, +.leaflet-tile-container, +.leaflet-pane > svg, +.leaflet-pane > canvas, +.leaflet-zoom-box, +.leaflet-image-layer, +.leaflet-layer { + position: absolute; + left: 0; + top: 0; + } +.leaflet-container { + overflow: hidden; + } +.leaflet-tile, +.leaflet-marker-icon, +.leaflet-marker-shadow { + user-select: none; + -webkit-user-drag: none; + } +/* Safari renders non-retina tile on retina better with this, but Chrome is worse */ +.leaflet-safari .leaflet-tile { + image-rendering: -webkit-optimize-contrast; + } +/* hack that prevents hw layers "stretching" when loading new tiles */ +.leaflet-safari .leaflet-tile-container { + width: 1600px; + height: 1600px; + -webkit-transform-origin: 0 0; + } +.leaflet-marker-icon, +.leaflet-marker-shadow { + display: block; + } +/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */ +/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */ +.leaflet-container .leaflet-overlay-pane svg { + max-width: none !important; + max-height: none !important; + } +.leaflet-container .leaflet-marker-pane img, +.leaflet-container .leaflet-shadow-pane img, +.leaflet-container .leaflet-tile-pane img, +.leaflet-container img.leaflet-image-layer, +.leaflet-container .leaflet-tile { + max-width: none !important; + max-height: none !important; + width: auto; + padding: 0; + } + +.leaflet-container.leaflet-touch-zoom { + touch-action: pan-x pan-y; + } +.leaflet-container.leaflet-touch-drag { + /* Fallback for FF which doesn't support pinch-zoom */ + touch-action: none; + touch-action: pinch-zoom; +} +.leaflet-container.leaflet-touch-drag.leaflet-touch-zoom { + touch-action: none; +} +.leaflet-container { + -webkit-tap-highlight-color: transparent; +} +.leaflet-container a { + -webkit-tap-highlight-color: rgba(51, 181, 229, 0.4); +} +.leaflet-tile { + visibility: hidden; + } +.leaflet-tile-loaded { + visibility: inherit; + } +.leaflet-zoom-box { + width: 0; + height: 0; + box-sizing: border-box; + z-index: 800; + } + +.leaflet-pane { z-index: 400; } + +.leaflet-tile-pane { z-index: 200; } +.leaflet-overlay-pane { z-index: 400; } +.leaflet-shadow-pane { z-index: 500; } +.leaflet-marker-pane { z-index: 600; } +.leaflet-tooltip-pane { z-index: 650; } +.leaflet-popup-pane { z-index: 700; } + +.leaflet-map-pane canvas { z-index: 100; } +.leaflet-map-pane svg { z-index: 200; } + + +/* control positioning */ + +.leaflet-control { + position: relative; + z-index: 800; + pointer-events: auto; + } +.leaflet-top, +.leaflet-bottom { + position: absolute; + z-index: 1000; + pointer-events: none; + } +.leaflet-top { + top: 0; + } +.leaflet-right { + right: 0; + } +.leaflet-bottom { + bottom: 0; + } +.leaflet-left { + left: 0; + } +.leaflet-control { + float: left; + clear: both; + } +.leaflet-right .leaflet-control { + float: right; + } +.leaflet-top .leaflet-control { + margin-top: 10px; + } +.leaflet-bottom .leaflet-control { + margin-bottom: 10px; + } +.leaflet-left .leaflet-control { + margin-left: 10px; + } +.leaflet-right .leaflet-control { + margin-right: 10px; + } + + +/* zoom and fade animations */ + +.leaflet-fade-anim .leaflet-popup { + opacity: 0; + transition: opacity 0.2s linear; + } +.leaflet-fade-anim .leaflet-map-pane .leaflet-popup { + opacity: 1; + } +.leaflet-zoom-animated { + transform-origin: 0 0; + } +svg.leaflet-zoom-animated { + will-change: transform; +} + +.leaflet-zoom-anim .leaflet-zoom-animated { + transition: transform 0.25s cubic-bezier(0,0,0.25,1); + } +.leaflet-zoom-anim .leaflet-tile, +.leaflet-pan-anim .leaflet-tile { + transition: none; + } + +.leaflet-zoom-anim .leaflet-zoom-hide { + visibility: hidden; + } + + +/* cursors */ + +.leaflet-interactive { + cursor: pointer; + } +.leaflet-grab { + cursor: grab; + } +.leaflet-crosshair, +.leaflet-crosshair .leaflet-interactive { + cursor: crosshair; + } +.leaflet-popup-pane, +.leaflet-control { + cursor: auto; + } +.leaflet-dragging .leaflet-grab, +.leaflet-dragging .leaflet-grab .leaflet-interactive, +.leaflet-dragging .leaflet-marker-draggable { + cursor: grabbing; + } + +/* marker & overlays interactivity */ +.leaflet-marker-icon, +.leaflet-marker-shadow, +.leaflet-image-layer, +.leaflet-pane > svg path, +.leaflet-tile-container { + pointer-events: none; + } + +.leaflet-marker-icon.leaflet-interactive, +.leaflet-image-layer.leaflet-interactive, +.leaflet-pane > svg path.leaflet-interactive, +svg.leaflet-image-layer.leaflet-interactive path { + pointer-events: auto; + } + +/* visual tweaks */ + +.leaflet-container { + background: #ddd; + outline-offset: 1px; + } +.leaflet-container a { + color: #0078A8; + } +.leaflet-zoom-box { + border: 2px dotted #38f; + background: rgba(255,255,255,0.5); + } + + +/* general typography */ +.leaflet-container { + font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; + font-size: 12px; + font-size: 0.75rem; + line-height: 1.5; + } + + +/* general toolbar styles */ + +.leaflet-bar { + box-shadow: 0 1px 5px rgba(0,0,0,0.65); + border-radius: 4px; + } +.leaflet-bar a { + background-color: #fff; + border-bottom: 1px solid #ccc; + width: 26px; + height: 26px; + line-height: 26px; + display: block; + text-align: center; + text-decoration: none; + color: black; + } +.leaflet-bar a, +.leaflet-control-layers-toggle { + background-position: 50% 50%; + background-repeat: no-repeat; + display: block; + } +.leaflet-bar a:hover, +.leaflet-bar a:focus { + background-color: #f4f4f4; + } +.leaflet-bar a:first-child { + border-top-left-radius: 4px; + border-top-right-radius: 4px; + } +.leaflet-bar a:last-child { + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; + border-bottom: none; + } +.leaflet-bar a.leaflet-disabled { + cursor: default; + background-color: #f4f4f4; + color: #bbb; + } + +.leaflet-touch .leaflet-bar a { + width: 30px; + height: 30px; + line-height: 30px; + } +.leaflet-touch .leaflet-bar a:first-child { + border-top-left-radius: 2px; + border-top-right-radius: 2px; + } +.leaflet-touch .leaflet-bar a:last-child { + border-bottom-left-radius: 2px; + border-bottom-right-radius: 2px; + } + +/* zoom control */ + +.leaflet-control-zoom-in, +.leaflet-control-zoom-out { + font: bold 18px 'Lucida Console', Monaco, monospace; + text-indent: 1px; + } + +.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out { + font-size: 22px; + } + + +/* layers control */ + +.leaflet-control-layers { + box-shadow: 0 1px 5px rgba(0,0,0,0.4); + background: #fff; + border-radius: 5px; + } +.leaflet-control-layers-toggle { + background-image: url(images/layers.png); + width: 36px; + height: 36px; + } +.leaflet-retina .leaflet-control-layers-toggle { + background-image: url(images/layers-2x.png); + background-size: 26px 26px; + } +.leaflet-touch .leaflet-control-layers-toggle { + width: 44px; + height: 44px; + } +.leaflet-control-layers .leaflet-control-layers-list, +.leaflet-control-layers-expanded .leaflet-control-layers-toggle { + display: none; + } +.leaflet-control-layers-expanded .leaflet-control-layers-list { + display: block; + position: relative; + } +.leaflet-control-layers-list { + border: 0; + margin: 0; + padding: 0; + } +.leaflet-control-layers-expanded { + padding: 6px 10px 6px 6px; + color: #333; + background: #fff; + } +.leaflet-control-layers-scrollbar { + overflow-y: scroll; + overflow-x: hidden; + padding-right: 5px; + } +.leaflet-control-layers-selector { + margin-top: 2px; + position: relative; + top: 1px; + } +.leaflet-control-layers label { + display: block; + font-size: 13px; + font-size: 1.08333em; + } +.leaflet-control-layers-separator { + height: 0; + border-top: 1px solid #ddd; + margin: 5px -10px 5px -6px; + } + +/* Default icon URLs */ +.leaflet-default-icon-path { /* used only in path-guessing heuristic, see L.Icon.Default */ + background-image: url(images/marker-icon.png); + } + + +/* attribution and scale controls */ + +.leaflet-container .leaflet-control-attribution { + background: #fff; + background: rgba(255, 255, 255, 0.8); + margin: 0; + } +.leaflet-control-attribution, +.leaflet-control-scale-line { + padding: 0 5px; + color: #333; + line-height: 1.4; + } +.leaflet-control-attribution a { + text-decoration: none; + } +.leaflet-control-attribution a:hover, +.leaflet-control-attribution a:focus { + text-decoration: underline; + } +.leaflet-attribution-flag { + display: inline !important; + vertical-align: baseline !important; + width: 1em; + height: 0.6669em; + } +.leaflet-left .leaflet-control-scale { + margin-left: 5px; + } +.leaflet-bottom .leaflet-control-scale { + margin-bottom: 5px; + } +.leaflet-control-scale-line { + border: 2px solid #777; + border-top: none; + line-height: 1.1; + padding: 2px 5px 1px; + white-space: nowrap; + box-sizing: border-box; + background: rgba(255, 255, 255, 0.8); + text-shadow: 1px 1px #fff; + } +.leaflet-control-scale-line:not(:first-child) { + border-top: 2px solid #777; + border-bottom: none; + margin-top: -2px; + } +.leaflet-control-scale-line:not(:first-child):not(:last-child) { + border-bottom: 2px solid #777; + } + +.leaflet-touch .leaflet-control-attribution, +.leaflet-touch .leaflet-control-layers, +.leaflet-touch .leaflet-bar { + box-shadow: none; + } +.leaflet-touch .leaflet-control-layers, +.leaflet-touch .leaflet-bar { + border: 2px solid rgba(0,0,0,0.2); + background-clip: padding-box; + } + + +/* popup */ + +.leaflet-popup { + position: absolute; + text-align: center; + margin-bottom: 20px; + } +.leaflet-popup-content-wrapper { + padding: 1px; + text-align: left; + border-radius: 12px; + } +.leaflet-popup-content { + margin: 13px 24px 13px 20px; + line-height: 1.3; + font-size: 13px; + font-size: 1.08333em; + min-height: 1px; + } +.leaflet-popup-content p { + margin: 17px 0; + margin: 1.3em 0; + } +.leaflet-popup-tip-container { + width: 40px; + height: 20px; + position: absolute; + left: 50%; + margin-top: -1px; + margin-left: -20px; + overflow: hidden; + pointer-events: none; + } +.leaflet-popup-tip { + width: 17px; + height: 17px; + padding: 1px; + + margin: -10px auto 0; + pointer-events: auto; + + transform: rotate(45deg); + } +.leaflet-popup-content-wrapper, +.leaflet-popup-tip { + background: white; + color: #333; + box-shadow: 0 3px 14px rgba(0,0,0,0.4); + } +.leaflet-container a.leaflet-popup-close-button { + position: absolute; + top: 0; + right: 0; + border: none; + text-align: center; + width: 24px; + height: 24px; + font: 16px/24px Tahoma, Verdana, sans-serif; + color: #757575; + text-decoration: none; + background: transparent; + } +.leaflet-container a.leaflet-popup-close-button:hover, +.leaflet-container a.leaflet-popup-close-button:focus { + color: #585858; + } +.leaflet-popup-scrolled { + overflow: auto; + } + +/* div icon */ + +.leaflet-div-icon { + background: #fff; + border: 1px solid #666; + } + + +/* Tooltip */ +/* Base styles for the element that has a tooltip */ +.leaflet-tooltip { + position: absolute; + padding: 6px; + background-color: #fff; + border: 1px solid #fff; + border-radius: 3px; + color: #222; + white-space: nowrap; + user-select: none; + pointer-events: none; + box-shadow: 0 1px 3px rgba(0,0,0,0.4); + } +.leaflet-tooltip.leaflet-interactive { + cursor: pointer; + pointer-events: auto; + } +.leaflet-tooltip-top:before, +.leaflet-tooltip-bottom:before, +.leaflet-tooltip-left:before, +.leaflet-tooltip-right:before { + position: absolute; + pointer-events: none; + border: 6px solid transparent; + background: transparent; + content: ""; + } + +/* Directions */ + +.leaflet-tooltip-bottom { + margin-top: 6px; +} +.leaflet-tooltip-top { + margin-top: -6px; +} +.leaflet-tooltip-bottom:before, +.leaflet-tooltip-top:before { + left: 50%; + margin-left: -6px; + } +.leaflet-tooltip-top:before { + bottom: 0; + margin-bottom: -12px; + border-top-color: #fff; + } +.leaflet-tooltip-bottom:before { + top: 0; + margin-top: -12px; + margin-left: -6px; + border-bottom-color: #fff; + } +.leaflet-tooltip-left { + margin-left: -6px; +} +.leaflet-tooltip-right { + margin-left: 6px; +} +.leaflet-tooltip-left:before, +.leaflet-tooltip-right:before { + top: 50%; + margin-top: -6px; + } +.leaflet-tooltip-left:before { + right: 0; + margin-right: -12px; + border-left-color: #fff; + } +.leaflet-tooltip-right:before { + left: 0; + margin-left: -12px; + border-right-color: #fff; + } + +/* Printing */ + +@media print { + /* Prevent printers from removing background-images of controls. */ + .leaflet-control { + -webkit-print-color-adjust: exact; + print-color-adjust: exact; + } +} diff --git a/services/drupal/web/sites/all/libraries/leaflet/leaflet-1.9.3.js b/services/drupal/web/sites/all/libraries/leaflet/leaflet-1.9.3.js new file mode 100644 index 0000000000..047bfe7ebf --- /dev/null +++ b/services/drupal/web/sites/all/libraries/leaflet/leaflet-1.9.3.js @@ -0,0 +1,6 @@ +/* @preserve + * Leaflet 1.9.3, a JS library for interactive maps. https://leafletjs.com + * (c) 2010-2022 Vladimir Agafonkin, (c) 2010-2011 CloudMade + */ +!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).leaflet={})}(this,function(t){"use strict";function l(t){for(var e,i,n=1,o=arguments.length;n=this.min.x&&i.x<=this.max.x&&e.y>=this.min.y&&i.y<=this.max.y},intersects:function(t){t=_(t);var e=this.min,i=this.max,n=t.min,t=t.max,o=t.x>=e.x&&n.x<=i.x,t=t.y>=e.y&&n.y<=i.y;return o&&t},overlaps:function(t){t=_(t);var e=this.min,i=this.max,n=t.min,t=t.max,o=t.x>e.x&&n.xe.y&&n.y=n.lat&&i.lat<=o.lat&&e.lng>=n.lng&&i.lng<=o.lng},intersects:function(t){t=g(t);var e=this._southWest,i=this._northEast,n=t.getSouthWest(),t=t.getNorthEast(),o=t.lat>=e.lat&&n.lat<=i.lat,t=t.lng>=e.lng&&n.lng<=i.lng;return o&&t},overlaps:function(t){t=g(t);var e=this._southWest,i=this._northEast,n=t.getSouthWest(),t=t.getNorthEast(),o=t.lat>e.lat&&n.late.lng&&n.lng","http://www.w3.org/2000/svg"===(Ft.firstChild&&Ft.firstChild.namespaceURI));function y(t){return 0<=navigator.userAgent.toLowerCase().indexOf(t)}var b={ie:pt,ielt9:mt,edge:n,webkit:ft,android:gt,android23:vt,androidStock:yt,opera:xt,chrome:wt,gecko:bt,safari:Pt,phantom:Lt,opera12:o,win:Tt,ie3d:Mt,webkit3d:zt,gecko3d:_t,any3d:Ct,mobile:Zt,mobileWebkit:St,mobileWebkit3d:Et,msPointer:kt,pointer:Ot,touch:Bt,touchNative:At,mobileOpera:It,mobileGecko:Rt,retina:Nt,passiveEvents:Dt,canvas:jt,svg:Ht,vml:!Ht&&function(){try{var t=document.createElement("div"),e=(t.innerHTML='',t.firstChild);return e.style.behavior="url(#default#VML)",e&&"object"==typeof e.adj}catch(t){return!1}}(),inlineSvg:Ft,mac:0===navigator.platform.indexOf("Mac"),linux:0===navigator.platform.indexOf("Linux")},Wt=b.msPointer?"MSPointerDown":"pointerdown",Ut=b.msPointer?"MSPointerMove":"pointermove",Vt=b.msPointer?"MSPointerUp":"pointerup",qt=b.msPointer?"MSPointerCancel":"pointercancel",Gt={touchstart:Wt,touchmove:Ut,touchend:Vt,touchcancel:qt},Kt={touchstart:function(t,e){e.MSPOINTER_TYPE_TOUCH&&e.pointerType===e.MSPOINTER_TYPE_TOUCH&&O(e);ee(t,e)},touchmove:ee,touchend:ee,touchcancel:ee},Yt={},Xt=!1;function Jt(t,e,i){return"touchstart"!==e||Xt||(document.addEventListener(Wt,$t,!0),document.addEventListener(Ut,Qt,!0),document.addEventListener(Vt,te,!0),document.addEventListener(qt,te,!0),Xt=!0),Kt[e]?(i=Kt[e].bind(this,i),t.addEventListener(Gt[e],i,!1),i):(console.warn("wrong event specified:",e),u)}function $t(t){Yt[t.pointerId]=t}function Qt(t){Yt[t.pointerId]&&(Yt[t.pointerId]=t)}function te(t){delete Yt[t.pointerId]}function ee(t,e){if(e.pointerType!==(e.MSPOINTER_TYPE_MOUSE||"mouse")){for(var i in e.touches=[],Yt)e.touches.push(Yt[i]);e.changedTouches=[e],t(e)}}var ie=200;function ne(t,i){t.addEventListener("dblclick",i);var n,o=0;function e(t){var e;1!==t.detail?n=t.detail:"mouse"===t.pointerType||t.sourceCapabilities&&!t.sourceCapabilities.firesTouchEvents||((e=Ne(t)).some(function(t){return t instanceof HTMLLabelElement&&t.attributes.for})&&!e.some(function(t){return t instanceof HTMLInputElement||t instanceof HTMLSelectElement})||((e=Date.now())-o<=ie?2===++n&&i(function(t){var e,i,n={};for(i in t)e=t[i],n[i]=e&&e.bind?e.bind(t):e;return(t=n).type="dblclick",n.detail=2,n.isTrusted=!1,n._simulated=!0,n}(t)):n=1,o=e))}return t.addEventListener("click",e),{dblclick:i,simDblclick:e}}var oe,se,re,ae,he,le,ue=we(["transform","webkitTransform","OTransform","MozTransform","msTransform"]),ce=we(["webkitTransition","transition","OTransition","MozTransition","msTransition"]),de="webkitTransition"===ce||"OTransition"===ce?ce+"End":"transitionend";function _e(t){return"string"==typeof t?document.getElementById(t):t}function pe(t,e){var i=t.style[e]||t.currentStyle&&t.currentStyle[e];return"auto"===(i=i&&"auto"!==i||!document.defaultView?i:(t=document.defaultView.getComputedStyle(t,null))?t[e]:null)?null:i}function P(t,e,i){t=document.createElement(t);return t.className=e||"",i&&i.appendChild(t),t}function T(t){var e=t.parentNode;e&&e.removeChild(t)}function me(t){for(;t.firstChild;)t.removeChild(t.firstChild)}function fe(t){var e=t.parentNode;e&&e.lastChild!==t&&e.appendChild(t)}function ge(t){var e=t.parentNode;e&&e.firstChild!==t&&e.insertBefore(t,e.firstChild)}function ve(t,e){return void 0!==t.classList?t.classList.contains(e):0<(t=xe(t)).length&&new RegExp("(^|\\s)"+e+"(\\s|$)").test(t)}function M(t,e){var i;if(void 0!==t.classList)for(var n=W(e),o=0,s=n.length;othis.options.maxZoom)?this.setZoom(t):this},panInsideBounds:function(t,e){this._enforcingBounds=!0;var i=this.getCenter(),t=this._limitCenter(i,this._zoom,g(t));return i.equals(t)||this.panTo(t,e),this._enforcingBounds=!1,this},panInside:function(t,e){var i=m((e=e||{}).paddingTopLeft||e.padding||[0,0]),n=m(e.paddingBottomRight||e.padding||[0,0]),o=this.project(this.getCenter()),t=this.project(t),s=this.getPixelBounds(),i=_([s.min.add(i),s.max.subtract(n)]),s=i.getSize();return i.contains(t)||(this._enforcingBounds=!0,n=t.subtract(i.getCenter()),i=i.extend(t).getSize().subtract(s),o.x+=n.x<0?-i.x:i.x,o.y+=n.y<0?-i.y:i.y,this.panTo(this.unproject(o),e),this._enforcingBounds=!1),this},invalidateSize:function(t){if(!this._loaded)return this;t=l({animate:!1,pan:!0},!0===t?{animate:!0}:t);var e=this.getSize(),i=(this._sizeChanged=!0,this._lastCenter=null,this.getSize()),n=e.divideBy(2).round(),o=i.divideBy(2).round(),n=n.subtract(o);return n.x||n.y?(t.animate&&t.pan?this.panBy(n):(t.pan&&this._rawPanBy(n),this.fire("move"),t.debounceMoveend?(clearTimeout(this._sizeTimer),this._sizeTimer=setTimeout(a(this.fire,this,"moveend"),200)):this.fire("moveend")),this.fire("resize",{oldSize:e,newSize:i})):this},stop:function(){return this.setZoom(this._limitZoom(this._zoom)),this.options.zoomSnap||this.fire("viewreset"),this._stop()},locate:function(t){var e,i;return t=this._locateOptions=l({timeout:1e4,watch:!1},t),"geolocation"in navigator?(e=a(this._handleGeolocationResponse,this),i=a(this._handleGeolocationError,this),t.watch?this._locationWatchId=navigator.geolocation.watchPosition(e,i,t):navigator.geolocation.getCurrentPosition(e,i,t)):this._handleGeolocationError({code:0,message:"Geolocation not supported."}),this},stopLocate:function(){return navigator.geolocation&&navigator.geolocation.clearWatch&&navigator.geolocation.clearWatch(this._locationWatchId),this._locateOptions&&(this._locateOptions.setView=!1),this},_handleGeolocationError:function(t){var e;this._container._leaflet_id&&(e=t.code,t=t.message||(1===e?"permission denied":2===e?"position unavailable":"timeout"),this._locateOptions.setView&&!this._loaded&&this.fitWorld(),this.fire("locationerror",{code:e,message:"Geolocation error: "+t+"."}))},_handleGeolocationResponse:function(t){if(this._container._leaflet_id){var e,i,n=new v(t.coords.latitude,t.coords.longitude),o=n.toBounds(2*t.coords.accuracy),s=this._locateOptions,r=(s.setView&&(e=this.getBoundsZoom(o),this.setView(n,s.maxZoom?Math.min(e,s.maxZoom):e)),{latlng:n,bounds:o,timestamp:t.timestamp});for(i in t.coords)"number"==typeof t.coords[i]&&(r[i]=t.coords[i]);this.fire("locationfound",r)}},addHandler:function(t,e){return e&&(e=this[t]=new e(this),this._handlers.push(e),this.options[t]&&e.enable()),this},remove:function(){if(this._initEvents(!0),this.options.maxBounds&&this.off("moveend",this._panInsideMaxBounds),this._containerId!==this._container._leaflet_id)throw new Error("Map container is being reused by another instance");try{delete this._container._leaflet_id,delete this._containerId}catch(t){this._container._leaflet_id=void 0,this._containerId=void 0}for(var t in void 0!==this._locationWatchId&&this.stopLocate(),this._stop(),T(this._mapPane),this._clearControlPos&&this._clearControlPos(),this._resizeRequest&&(r(this._resizeRequest),this._resizeRequest=null),this._clearHandlers(),this._loaded&&this.fire("unload"),this._layers)this._layers[t].remove();for(t in this._panes)T(this._panes[t]);return this._layers=[],this._panes=[],delete this._mapPane,delete this._renderer,this},createPane:function(t,e){e=P("div","leaflet-pane"+(t?" leaflet-"+t.replace("Pane","")+"-pane":""),e||this._mapPane);return t&&(this._panes[t]=e),e},getCenter:function(){return this._checkIfLoaded(),this._lastCenter&&!this._moved()?this._lastCenter.clone():this.layerPointToLatLng(this._getCenterLayerPoint())},getZoom:function(){return this._zoom},getBounds:function(){var t=this.getPixelBounds();return new s(this.unproject(t.getBottomLeft()),this.unproject(t.getTopRight()))},getMinZoom:function(){return void 0===this.options.minZoom?this._layersMinZoom||0:this.options.minZoom},getMaxZoom:function(){return void 0===this.options.maxZoom?void 0===this._layersMaxZoom?1/0:this._layersMaxZoom:this.options.maxZoom},getBoundsZoom:function(t,e,i){t=g(t),i=m(i||[0,0]);var n=this.getZoom()||0,o=this.getMinZoom(),s=this.getMaxZoom(),r=t.getNorthWest(),t=t.getSouthEast(),i=this.getSize().subtract(i),t=_(this.project(t,n),this.project(r,n)).getSize(),r=b.any3d?this.options.zoomSnap:1,a=i.x/t.x,i=i.y/t.y,t=e?Math.max(a,i):Math.min(a,i),n=this.getScaleZoom(t,n);return r&&(n=Math.round(n/(r/100))*(r/100),n=e?Math.ceil(n/r)*r:Math.floor(n/r)*r),Math.max(o,Math.min(s,n))},getSize:function(){return this._size&&!this._sizeChanged||(this._size=new p(this._container.clientWidth||0,this._container.clientHeight||0),this._sizeChanged=!1),this._size.clone()},getPixelBounds:function(t,e){t=this._getTopLeftPoint(t,e);return new f(t,t.add(this.getSize()))},getPixelOrigin:function(){return this._checkIfLoaded(),this._pixelOrigin},getPixelWorldBounds:function(t){return this.options.crs.getProjectedBounds(void 0===t?this.getZoom():t)},getPane:function(t){return"string"==typeof t?this._panes[t]:t},getPanes:function(){return this._panes},getContainer:function(){return this._container},getZoomScale:function(t,e){var i=this.options.crs;return e=void 0===e?this._zoom:e,i.scale(t)/i.scale(e)},getScaleZoom:function(t,e){var i=this.options.crs,t=(e=void 0===e?this._zoom:e,i.zoom(t*i.scale(e)));return isNaN(t)?1/0:t},project:function(t,e){return e=void 0===e?this._zoom:e,this.options.crs.latLngToPoint(w(t),e)},unproject:function(t,e){return e=void 0===e?this._zoom:e,this.options.crs.pointToLatLng(m(t),e)},layerPointToLatLng:function(t){t=m(t).add(this.getPixelOrigin());return this.unproject(t)},latLngToLayerPoint:function(t){return this.project(w(t))._round()._subtract(this.getPixelOrigin())},wrapLatLng:function(t){return this.options.crs.wrapLatLng(w(t))},wrapLatLngBounds:function(t){return this.options.crs.wrapLatLngBounds(g(t))},distance:function(t,e){return this.options.crs.distance(w(t),w(e))},containerPointToLayerPoint:function(t){return m(t).subtract(this._getMapPanePos())},layerPointToContainerPoint:function(t){return m(t).add(this._getMapPanePos())},containerPointToLatLng:function(t){t=this.containerPointToLayerPoint(m(t));return this.layerPointToLatLng(t)},latLngToContainerPoint:function(t){return this.layerPointToContainerPoint(this.latLngToLayerPoint(w(t)))},mouseEventToContainerPoint:function(t){return De(t,this._container)},mouseEventToLayerPoint:function(t){return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(t))},mouseEventToLatLng:function(t){return this.layerPointToLatLng(this.mouseEventToLayerPoint(t))},_initContainer:function(t){t=this._container=_e(t);if(!t)throw new Error("Map container not found.");if(t._leaflet_id)throw new Error("Map container is already initialized.");S(t,"scroll",this._onScroll,this),this._containerId=h(t)},_initLayout:function(){var t=this._container,e=(this._fadeAnimated=this.options.fadeAnimation&&b.any3d,M(t,"leaflet-container"+(b.touch?" leaflet-touch":"")+(b.retina?" leaflet-retina":"")+(b.ielt9?" leaflet-oldie":"")+(b.safari?" leaflet-safari":"")+(this._fadeAnimated?" leaflet-fade-anim":"")),pe(t,"position"));"absolute"!==e&&"relative"!==e&&"fixed"!==e&&"sticky"!==e&&(t.style.position="relative"),this._initPanes(),this._initControlPos&&this._initControlPos()},_initPanes:function(){var t=this._panes={};this._paneRenderers={},this._mapPane=this.createPane("mapPane",this._container),Z(this._mapPane,new p(0,0)),this.createPane("tilePane"),this.createPane("overlayPane"),this.createPane("shadowPane"),this.createPane("markerPane"),this.createPane("tooltipPane"),this.createPane("popupPane"),this.options.markerZoomAnimation||(M(t.markerPane,"leaflet-zoom-hide"),M(t.shadowPane,"leaflet-zoom-hide"))},_resetView:function(t,e,i){Z(this._mapPane,new p(0,0));var n=!this._loaded,o=(this._loaded=!0,e=this._limitZoom(e),this.fire("viewprereset"),this._zoom!==e);this._moveStart(o,i)._move(t,e)._moveEnd(o),this.fire("viewreset"),n&&this.fire("load")},_moveStart:function(t,e){return t&&this.fire("zoomstart"),e||this.fire("movestart"),this},_move:function(t,e,i,n){void 0===e&&(e=this._zoom);var o=this._zoom!==e;return this._zoom=e,this._lastCenter=t,this._pixelOrigin=this._getNewPixelOrigin(t),n?i&&i.pinch&&this.fire("zoom",i):((o||i&&i.pinch)&&this.fire("zoom",i),this.fire("move",i)),this},_moveEnd:function(t){return t&&this.fire("zoomend"),this.fire("moveend")},_stop:function(){return r(this._flyToFrame),this._panAnim&&this._panAnim.stop(),this},_rawPanBy:function(t){Z(this._mapPane,this._getMapPanePos().subtract(t))},_getZoomSpan:function(){return this.getMaxZoom()-this.getMinZoom()},_panInsideMaxBounds:function(){this._enforcingBounds||this.panInsideBounds(this.options.maxBounds)},_checkIfLoaded:function(){if(!this._loaded)throw new Error("Set map center and zoom first.")},_initEvents:function(t){this._targets={};var e=t?k:S;e((this._targets[h(this._container)]=this)._container,"click dblclick mousedown mouseup mouseover mouseout mousemove contextmenu keypress keydown keyup",this._handleDOMEvent,this),this.options.trackResize&&e(window,"resize",this._onResize,this),b.any3d&&this.options.transform3DLimit&&(t?this.off:this.on).call(this,"moveend",this._onMoveEnd)},_onResize:function(){r(this._resizeRequest),this._resizeRequest=x(function(){this.invalidateSize({debounceMoveend:!0})},this)},_onScroll:function(){this._container.scrollTop=0,this._container.scrollLeft=0},_onMoveEnd:function(){var t=this._getMapPanePos();Math.max(Math.abs(t.x),Math.abs(t.y))>=this.options.transform3DLimit&&this._resetView(this.getCenter(),this.getZoom())},_findEventTargets:function(t,e){for(var i,n=[],o="mouseout"===e||"mouseover"===e,s=t.target||t.srcElement,r=!1;s;){if((i=this._targets[h(s)])&&("click"===e||"preclick"===e)&&this._draggableMoved(i)){r=!0;break}if(i&&i.listens(e,!0)){if(o&&!Fe(s,t))break;if(n.push(i),o)break}if(s===this._container)break;s=s.parentNode}return n=n.length||r||o||!this.listens(e,!0)?n:[this]},_isClickDisabled:function(t){for(;t&&t!==this._container;){if(t._leaflet_disable_click)return!0;t=t.parentNode}},_handleDOMEvent:function(t){var e,i=t.target||t.srcElement;!this._loaded||i._leaflet_disable_events||"click"===t.type&&this._isClickDisabled(i)||("mousedown"===(e=t.type)&&Me(i),this._fireDOMEvent(t,e))},_mouseEvents:["click","dblclick","mouseover","mouseout","contextmenu"],_fireDOMEvent:function(t,e,i){"click"===t.type&&((a=l({},t)).type="preclick",this._fireDOMEvent(a,a.type,i));var n=this._findEventTargets(t,e);if(i){for(var o=[],s=0;sthis.options.zoomAnimationThreshold)return!1;var n=this.getZoomScale(e),n=this._getCenterOffset(t)._divideBy(1-1/n);if(!0!==i.animate&&!this.getSize().contains(n))return!1;x(function(){this._moveStart(!0,!1)._animateZoom(t,e,!0)},this)}return!0},_animateZoom:function(t,e,i,n){this._mapPane&&(i&&(this._animatingZoom=!0,this._animateToCenter=t,this._animateToZoom=e,M(this._mapPane,"leaflet-zoom-anim")),this.fire("zoomanim",{center:t,zoom:e,noUpdate:n}),this._tempFireZoomEvent||(this._tempFireZoomEvent=this._zoom!==this._animateToZoom),this._move(this._animateToCenter,this._animateToZoom,void 0,!0),setTimeout(a(this._onZoomTransitionEnd,this),250))},_onZoomTransitionEnd:function(){this._animatingZoom&&(this._mapPane&&z(this._mapPane,"leaflet-zoom-anim"),this._animatingZoom=!1,this._move(this._animateToCenter,this._animateToZoom,void 0,!0),this._tempFireZoomEvent&&this.fire("zoom"),delete this._tempFireZoomEvent,this.fire("move"),this._moveEnd(!0))}});function Ue(t){return new B(t)}var Ve,B=et.extend({options:{position:"topright"},initialize:function(t){c(this,t)},getPosition:function(){return this.options.position},setPosition:function(t){var e=this._map;return e&&e.removeControl(this),this.options.position=t,e&&e.addControl(this),this},getContainer:function(){return this._container},addTo:function(t){this.remove(),this._map=t;var e=this._container=this.onAdd(t),i=this.getPosition(),t=t._controlCorners[i];return M(e,"leaflet-control"),-1!==i.indexOf("bottom")?t.insertBefore(e,t.firstChild):t.appendChild(e),this._map.on("unload",this.remove,this),this},remove:function(){return this._map&&(T(this._container),this.onRemove&&this.onRemove(this._map),this._map.off("unload",this.remove,this),this._map=null),this},_refocusOnMap:function(t){this._map&&t&&0",e=document.createElement("div");return e.innerHTML=t,e.firstChild},_addItem:function(t){var e,i=document.createElement("label"),n=this._map.hasLayer(t.layer),n=(t.overlay?((e=document.createElement("input")).type="checkbox",e.className="leaflet-control-layers-selector",e.defaultChecked=n):e=this._createRadioElement("leaflet-base-layers_"+h(this),n),this._layerControlInputs.push(e),e.layerId=h(t.layer),S(e,"click",this._onInputClick,this),document.createElement("span")),o=(n.innerHTML=" "+t.name,document.createElement("span"));return i.appendChild(o),o.appendChild(e),o.appendChild(n),(t.overlay?this._overlaysList:this._baseLayersList).appendChild(i),this._checkDisabledLayers(),i},_onInputClick:function(){var t,e,i=this._layerControlInputs,n=[],o=[];this._handlingClick=!0;for(var s=i.length-1;0<=s;s--)t=i[s],e=this._getLayer(t.layerId).layer,t.checked?n.push(e):t.checked||o.push(e);for(s=0;se.options.maxZoom},_expandIfNotCollapsed:function(){return this._map&&!this.options.collapsed&&this.expand(),this},_expandSafely:function(){var t=this._section;S(t,"click",O),this.expand(),setTimeout(function(){k(t,"click",O)})}})),Ge=B.extend({options:{position:"topleft",zoomInText:'',zoomInTitle:"Zoom in",zoomOutText:'',zoomOutTitle:"Zoom out"},onAdd:function(t){var e="leaflet-control-zoom",i=P("div",e+" leaflet-bar"),n=this.options;return this._zoomInButton=this._createButton(n.zoomInText,n.zoomInTitle,e+"-in",i,this._zoomIn),this._zoomOutButton=this._createButton(n.zoomOutText,n.zoomOutTitle,e+"-out",i,this._zoomOut),this._updateDisabled(),t.on("zoomend zoomlevelschange",this._updateDisabled,this),i},onRemove:function(t){t.off("zoomend zoomlevelschange",this._updateDisabled,this)},disable:function(){return this._disabled=!0,this._updateDisabled(),this},enable:function(){return this._disabled=!1,this._updateDisabled(),this},_zoomIn:function(t){!this._disabled&&this._map._zoomthis._map.getMinZoom()&&this._map.zoomOut(this._map.options.zoomDelta*(t.shiftKey?3:1))},_createButton:function(t,e,i,n,o){i=P("a",i,n);return i.innerHTML=t,i.href="#",i.title=e,i.setAttribute("role","button"),i.setAttribute("aria-label",e),Ie(i),S(i,"click",Re),S(i,"click",o,this),S(i,"click",this._refocusOnMap,this),i},_updateDisabled:function(){var t=this._map,e="leaflet-disabled";z(this._zoomInButton,e),z(this._zoomOutButton,e),this._zoomInButton.setAttribute("aria-disabled","false"),this._zoomOutButton.setAttribute("aria-disabled","false"),!this._disabled&&t._zoom!==t.getMinZoom()||(M(this._zoomOutButton,e),this._zoomOutButton.setAttribute("aria-disabled","true")),!this._disabled&&t._zoom!==t.getMaxZoom()||(M(this._zoomInButton,e),this._zoomInButton.setAttribute("aria-disabled","true"))}}),Ke=(A.mergeOptions({zoomControl:!0}),A.addInitHook(function(){this.options.zoomControl&&(this.zoomControl=new Ge,this.addControl(this.zoomControl))}),B.extend({options:{position:"bottomleft",maxWidth:100,metric:!0,imperial:!0},onAdd:function(t){var e="leaflet-control-scale",i=P("div",e),n=this.options;return this._addScales(n,e+"-line",i),t.on(n.updateWhenIdle?"moveend":"move",this._update,this),t.whenReady(this._update,this),i},onRemove:function(t){t.off(this.options.updateWhenIdle?"moveend":"move",this._update,this)},_addScales:function(t,e,i){t.metric&&(this._mScale=P("div",e,i)),t.imperial&&(this._iScale=P("div",e,i))},_update:function(){var t=this._map,e=t.getSize().y/2,t=t.distance(t.containerPointToLatLng([0,e]),t.containerPointToLatLng([this.options.maxWidth,e]));this._updateScales(t)},_updateScales:function(t){this.options.metric&&t&&this._updateMetric(t),this.options.imperial&&t&&this._updateImperial(t)},_updateMetric:function(t){var e=this._getRoundNum(t);this._updateScale(this._mScale,e<1e3?e+" m":e/1e3+" km",e/t)},_updateImperial:function(t){var e,i,t=3.2808399*t;5280'+(b.inlineSvg?' ':"")+"Leaflet"},initialize:function(t){c(this,t),this._attributions={}},onAdd:function(t){for(var e in(t.attributionControl=this)._container=P("div","leaflet-control-attribution"),Ie(this._container),t._layers)t._layers[e].getAttribution&&this.addAttribution(t._layers[e].getAttribution());return this._update(),t.on("layeradd",this._addAttribution,this),this._container},onRemove:function(t){t.off("layeradd",this._addAttribution,this)},_addAttribution:function(t){t.layer.getAttribution&&(this.addAttribution(t.layer.getAttribution()),t.layer.once("remove",function(){this.removeAttribution(t.layer.getAttribution())},this))},setPrefix:function(t){return this.options.prefix=t,this._update(),this},addAttribution:function(t){return t&&(this._attributions[t]||(this._attributions[t]=0),this._attributions[t]++,this._update()),this},removeAttribution:function(t){return t&&this._attributions[t]&&(this._attributions[t]--,this._update()),this},_update:function(){if(this._map){var t,e=[];for(t in this._attributions)this._attributions[t]&&e.push(t);var i=[];this.options.prefix&&i.push(this.options.prefix),e.length&&i.push(e.join(", ")),this._container.innerHTML=i.join(' ')}}}),n=(A.mergeOptions({attributionControl:!0}),A.addInitHook(function(){this.options.attributionControl&&(new Ye).addTo(this)}),B.Layers=qe,B.Zoom=Ge,B.Scale=Ke,B.Attribution=Ye,Ue.layers=function(t,e,i){return new qe(t,e,i)},Ue.zoom=function(t){return new Ge(t)},Ue.scale=function(t){return new Ke(t)},Ue.attribution=function(t){return new Ye(t)},et.extend({initialize:function(t){this._map=t},enable:function(){return this._enabled||(this._enabled=!0,this.addHooks()),this},disable:function(){return this._enabled&&(this._enabled=!1,this.removeHooks()),this},enabled:function(){return!!this._enabled}})),ft=(n.addTo=function(t,e){return t.addHandler(e,this),this},{Events:e}),Xe=b.touch?"touchstart mousedown":"mousedown",Je=it.extend({options:{clickTolerance:3},initialize:function(t,e,i,n){c(this,n),this._element=t,this._dragStartTarget=e||t,this._preventOutline=i},enable:function(){this._enabled||(S(this._dragStartTarget,Xe,this._onDown,this),this._enabled=!0)},disable:function(){this._enabled&&(Je._dragging===this&&this.finishDrag(!0),k(this._dragStartTarget,Xe,this._onDown,this),this._enabled=!1,this._moved=!1)},_onDown:function(t){var e,i;this._enabled&&(this._moved=!1,ve(this._element,"leaflet-zoom-anim")||(t.touches&&1!==t.touches.length?Je._dragging===this&&this.finishDrag():Je._dragging||t.shiftKey||1!==t.which&&1!==t.button&&!t.touches||((Je._dragging=this)._preventOutline&&Me(this._element),Le(),re(),this._moving||(this.fire("down"),i=t.touches?t.touches[0]:t,e=Ce(this._element),this._startPoint=new p(i.clientX,i.clientY),this._startPos=Pe(this._element),this._parentScale=Ze(e),i="mousedown"===t.type,S(document,i?"mousemove":"touchmove",this._onMove,this),S(document,i?"mouseup":"touchend touchcancel",this._onUp,this)))))},_onMove:function(t){var e;this._enabled&&(t.touches&&1e&&(i.push(t[n]),o=n);oe.max.x&&(i|=2),t.ye.max.y&&(i|=8),i}function ni(t,e,i,n){var o=e.x,e=e.y,s=i.x-o,r=i.y-e,a=s*s+r*r;return 0this._layersMaxZoom&&this.setZoom(this._layersMaxZoom),void 0===this.options.minZoom&&this._layersMinZoom&&this.getZoom()t.y!=n.y>t.y&&t.x<(n.x-i.x)*(t.y-i.y)/(n.y-i.y)+i.x&&(l=!l);return l||vi.prototype._containsPoint.call(this,t,!0)}});var xi=ui.extend({initialize:function(t,e){c(this,e),this._layers={},t&&this.addData(t)},addData:function(t){var e,i,n,o=d(t)?t:t.features;if(o){for(e=0,i=o.length;es.x&&(r=i.x+a-s.x+o.x),i.x-r-n.x<(a=0)&&(r=i.x-n.x),i.y+e+o.y>s.y&&(a=i.y+e-s.y+o.y),i.y-a-n.y<0&&(a=i.y-n.y),(r||a)&&(this.options.keepInView&&(this._autopanning=!0),t.fire("autopanstart").panBy([r,a]))))},_getAnchor:function(){return m(this._source&&this._source._getPopupAnchor?this._source._getPopupAnchor():[0,0])}})),Bi=(A.mergeOptions({closePopupOnClick:!0}),A.include({openPopup:function(t,e,i){return this._initOverlay(Ai,t,e,i).openOn(this),this},closePopup:function(t){return(t=arguments.length?t:this._popup)&&t.close(),this}}),o.include({bindPopup:function(t,e){return this._popup=this._initOverlay(Ai,this._popup,t,e),this._popupHandlersAdded||(this.on({click:this._openPopup,keypress:this._onKeyPress,remove:this.closePopup,move:this._movePopup}),this._popupHandlersAdded=!0),this},unbindPopup:function(){return this._popup&&(this.off({click:this._openPopup,keypress:this._onKeyPress,remove:this.closePopup,move:this._movePopup}),this._popupHandlersAdded=!1,this._popup=null),this},openPopup:function(t){return this._popup&&(this instanceof ui||(this._popup._source=this),this._popup._prepareOpen(t||this._latlng)&&this._popup.openOn(this._map)),this},closePopup:function(){return this._popup&&this._popup.close(),this},togglePopup:function(){return this._popup&&this._popup.toggle(this),this},isPopupOpen:function(){return!!this._popup&&this._popup.isOpen()},setPopupContent:function(t){return this._popup&&this._popup.setContent(t),this},getPopup:function(){return this._popup},_openPopup:function(t){var e;this._popup&&this._map&&(Re(t),e=t.layer||t.target,this._popup._source!==e||e instanceof mi?(this._popup._source=e,this.openPopup(t.latlng)):this._map.hasLayer(this._popup)?this.closePopup():this.openPopup(t.latlng))},_movePopup:function(t){this._popup.setLatLng(t.latlng)},_onKeyPress:function(t){13===t.originalEvent.keyCode&&this._openPopup(t)}}),Oi.extend({options:{pane:"tooltipPane",offset:[0,0],direction:"auto",permanent:!1,sticky:!1,opacity:.9},onAdd:function(t){Oi.prototype.onAdd.call(this,t),this.setOpacity(this.options.opacity),t.fire("tooltipopen",{tooltip:this}),this._source&&(this.addEventParent(this._source),this._source.fire("tooltipopen",{tooltip:this},!0))},onRemove:function(t){Oi.prototype.onRemove.call(this,t),t.fire("tooltipclose",{tooltip:this}),this._source&&(this.removeEventParent(this._source),this._source.fire("tooltipclose",{tooltip:this},!0))},getEvents:function(){var t=Oi.prototype.getEvents.call(this);return this.options.permanent||(t.preclick=this.close),t},_initLayout:function(){var t="leaflet-tooltip "+(this.options.className||"")+" leaflet-zoom-"+(this._zoomAnimated?"animated":"hide");this._contentNode=this._container=P("div",t),this._container.setAttribute("role","tooltip"),this._container.setAttribute("id","leaflet-tooltip-"+h(this))},_updateLayout:function(){},_adjustPan:function(){},_setPosition:function(t){var e,i=this._map,n=this._container,o=i.latLngToContainerPoint(i.getCenter()),i=i.layerPointToContainerPoint(t),s=this.options.direction,r=n.offsetWidth,a=n.offsetHeight,h=m(this.options.offset),l=this._getAnchor(),i="top"===s?(e=r/2,a):"bottom"===s?(e=r/2,0):(e="center"===s?r/2:"right"===s?0:"left"===s?r:i.xthis.options.maxZoom||nthis.options.maxZoom||void 0!==this.options.minZoom&&oi.max.x)||!e.wrapLat&&(t.yi.max.y))return!1}return!this.options.bounds||(e=this._tileCoordsToBounds(t),g(this.options.bounds).overlaps(e))},_keyToBounds:function(t){return this._tileCoordsToBounds(this._keyToTileCoords(t))},_tileCoordsToNwSe:function(t){var e=this._map,i=this.getTileSize(),n=t.scaleBy(i),i=n.add(i);return[e.unproject(n,t.z),e.unproject(i,t.z)]},_tileCoordsToBounds:function(t){t=this._tileCoordsToNwSe(t),t=new s(t[0],t[1]);return t=this.options.noWrap?t:this._map.wrapLatLngBounds(t)},_tileCoordsToKey:function(t){return t.x+":"+t.y+":"+t.z},_keyToTileCoords:function(t){var t=t.split(":"),e=new p(+t[0],+t[1]);return e.z=+t[2],e},_removeTile:function(t){var e=this._tiles[t];e&&(T(e.el),delete this._tiles[t],this.fire("tileunload",{tile:e.el,coords:this._keyToTileCoords(t)}))},_initTile:function(t){M(t,"leaflet-tile");var e=this.getTileSize();t.style.width=e.x+"px",t.style.height=e.y+"px",t.onselectstart=u,t.onmousemove=u,b.ielt9&&this.options.opacity<1&&C(t,this.options.opacity)},_addTile:function(t,e){var i=this._getTilePos(t),n=this._tileCoordsToKey(t),o=this.createTile(this._wrapCoords(t),a(this._tileReady,this,t));this._initTile(o),this.createTile.length<2&&x(a(this._tileReady,this,t,null,o)),Z(o,i),this._tiles[n]={el:o,coords:t,current:!0},e.appendChild(o),this.fire("tileloadstart",{tile:o,coords:t})},_tileReady:function(t,e,i){e&&this.fire("tileerror",{error:e,tile:i,coords:t});var n=this._tileCoordsToKey(t);(i=this._tiles[n])&&(i.loaded=+new Date,this._map._fadeAnimated?(C(i.el,0),r(this._fadeFrame),this._fadeFrame=x(this._updateOpacity,this)):(i.active=!0,this._pruneTiles()),e||(M(i.el,"leaflet-tile-loaded"),this.fire("tileload",{tile:i.el,coords:t})),this._noTilesToLoad()&&(this._loading=!1,this.fire("load"),b.ielt9||!this._map._fadeAnimated?x(this._pruneTiles,this):setTimeout(a(this._pruneTiles,this),250)))},_getTilePos:function(t){return t.scaleBy(this.getTileSize()).subtract(this._level.origin)},_wrapCoords:function(t){var e=new p(this._wrapX?H(t.x,this._wrapX):t.x,this._wrapY?H(t.y,this._wrapY):t.y);return e.z=t.z,e},_pxBoundsToTileRange:function(t){var e=this.getTileSize();return new f(t.min.unscaleBy(e).floor(),t.max.unscaleBy(e).ceil().subtract([1,1]))},_noTilesToLoad:function(){for(var t in this._tiles)if(!this._tiles[t].loaded)return!1;return!0}});var Ni=Ri.extend({options:{minZoom:0,maxZoom:18,subdomains:"abc",errorTileUrl:"",zoomOffset:0,tms:!1,zoomReverse:!1,detectRetina:!1,crossOrigin:!1,referrerPolicy:!1},initialize:function(t,e){this._url=t,(e=c(this,e)).detectRetina&&b.retina&&0')}}catch(t){}return function(t){return document.createElement("<"+t+' xmlns="urn:schemas-microsoft.com:vml" class="lvml">')}}(),zt={_initContainer:function(){this._container=P("div","leaflet-vml-container")},_update:function(){this._map._animatingZoom||(Hi.prototype._update.call(this),this.fire("update"))},_initPath:function(t){var e=t._container=Ui("shape");M(e,"leaflet-vml-shape "+(this.options.className||"")),e.coordsize="1 1",t._path=Ui("path"),e.appendChild(t._path),this._updateStyle(t),this._layers[h(t)]=t},_addPath:function(t){var e=t._container;this._container.appendChild(e),t.options.interactive&&t.addInteractiveTarget(e)},_removePath:function(t){var e=t._container;T(e),t.removeInteractiveTarget(e),delete this._layers[h(t)]},_updateStyle:function(t){var e=t._stroke,i=t._fill,n=t.options,o=t._container;o.stroked=!!n.stroke,o.filled=!!n.fill,n.stroke?(e=e||(t._stroke=Ui("stroke")),o.appendChild(e),e.weight=n.weight+"px",e.color=n.color,e.opacity=n.opacity,n.dashArray?e.dashStyle=d(n.dashArray)?n.dashArray.join(" "):n.dashArray.replace(/( *, *)/g," "):e.dashStyle="",e.endcap=n.lineCap.replace("butt","flat"),e.joinstyle=n.lineJoin):e&&(o.removeChild(e),t._stroke=null),n.fill?(i=i||(t._fill=Ui("fill")),o.appendChild(i),i.color=n.fillColor||n.color,i.opacity=n.fillOpacity):i&&(o.removeChild(i),t._fill=null)},_updateCircle:function(t){var e=t._point.round(),i=Math.round(t._radius),n=Math.round(t._radiusY||i);this._setPath(t,t._empty()?"M0 0":"AL "+e.x+","+e.y+" "+i+","+n+" 0,23592600")},_setPath:function(t,e){t._path.v=e},_bringToFront:function(t){fe(t._container)},_bringToBack:function(t){ge(t._container)}},Vi=b.vml?Ui:ct,qi=Hi.extend({_initContainer:function(){this._container=Vi("svg"),this._container.setAttribute("pointer-events","none"),this._rootGroup=Vi("g"),this._container.appendChild(this._rootGroup)},_destroyContainer:function(){T(this._container),k(this._container),delete this._container,delete this._rootGroup,delete this._svgSize},_update:function(){var t,e,i;this._map._animatingZoom&&this._bounds||(Hi.prototype._update.call(this),e=(t=this._bounds).getSize(),i=this._container,this._svgSize&&this._svgSize.equals(e)||(this._svgSize=e,i.setAttribute("width",e.x),i.setAttribute("height",e.y)),Z(i,t.min),i.setAttribute("viewBox",[t.min.x,t.min.y,e.x,e.y].join(" ")),this.fire("update"))},_initPath:function(t){var e=t._path=Vi("path");t.options.className&&M(e,t.options.className),t.options.interactive&&M(e,"leaflet-interactive"),this._updateStyle(t),this._layers[h(t)]=t},_addPath:function(t){this._rootGroup||this._initContainer(),this._rootGroup.appendChild(t._path),t.addInteractiveTarget(t._path)},_removePath:function(t){T(t._path),t.removeInteractiveTarget(t._path),delete this._layers[h(t)]},_updatePath:function(t){t._project(),t._update()},_updateStyle:function(t){var e=t._path,t=t.options;e&&(t.stroke?(e.setAttribute("stroke",t.color),e.setAttribute("stroke-opacity",t.opacity),e.setAttribute("stroke-width",t.weight),e.setAttribute("stroke-linecap",t.lineCap),e.setAttribute("stroke-linejoin",t.lineJoin),t.dashArray?e.setAttribute("stroke-dasharray",t.dashArray):e.removeAttribute("stroke-dasharray"),t.dashOffset?e.setAttribute("stroke-dashoffset",t.dashOffset):e.removeAttribute("stroke-dashoffset")):e.setAttribute("stroke","none"),t.fill?(e.setAttribute("fill",t.fillColor||t.color),e.setAttribute("fill-opacity",t.fillOpacity),e.setAttribute("fill-rule",t.fillRule||"evenodd")):e.setAttribute("fill","none"))},_updatePoly:function(t,e){this._setPath(t,dt(t._parts,e))},_updateCircle:function(t){var e=t._point,i=Math.max(Math.round(t._radius),1),n="a"+i+","+(Math.max(Math.round(t._radiusY),1)||i)+" 0 1,0 ",e=t._empty()?"M0 0":"M"+(e.x-i)+","+e.y+n+2*i+",0 "+n+2*-i+",0 ";this._setPath(t,e)},_setPath:function(t,e){t._path.setAttribute("d",e)},_bringToFront:function(t){fe(t._path)},_bringToBack:function(t){ge(t._path)}});function Gi(t){return b.svg||b.vml?new qi(t):null}b.vml&&qi.include(zt),A.include({getRenderer:function(t){t=(t=t.options.renderer||this._getPaneRenderer(t.options.pane)||this.options.renderer||this._renderer)||(this._renderer=this._createRenderer());return this.hasLayer(t)||this.addLayer(t),t},_getPaneRenderer:function(t){var e;return"overlayPane"!==t&&void 0!==t&&(void 0===(e=this._paneRenderers[t])&&(e=this._createRenderer({pane:t}),this._paneRenderers[t]=e),e)},_createRenderer:function(t){return this.options.preferCanvas&&Wi(t)||Gi(t)}});var Ki=yi.extend({initialize:function(t,e){yi.prototype.initialize.call(this,this._boundsToLatLngs(t),e)},setBounds:function(t){return this.setLatLngs(this._boundsToLatLngs(t))},_boundsToLatLngs:function(t){return[(t=g(t)).getSouthWest(),t.getNorthWest(),t.getNorthEast(),t.getSouthEast()]}});qi.create=Vi,qi.pointsToPath=dt,xi.geometryToLayer=wi,xi.coordsToLatLng=Pi,xi.coordsToLatLngs=Li,xi.latLngToCoords=Ti,xi.latLngsToCoords=Mi,xi.getFeature=zi,xi.asFeature=Ci,A.mergeOptions({boxZoom:!0});var _t=n.extend({initialize:function(t){this._map=t,this._container=t._container,this._pane=t._panes.overlayPane,this._resetStateTimeout=0,t.on("unload",this._destroy,this)},addHooks:function(){S(this._container,"mousedown",this._onMouseDown,this)},removeHooks:function(){k(this._container,"mousedown",this._onMouseDown,this)},moved:function(){return this._moved},_destroy:function(){T(this._pane),delete this._pane},_resetState:function(){this._resetStateTimeout=0,this._moved=!1},_clearDeferredResetState:function(){0!==this._resetStateTimeout&&(clearTimeout(this._resetStateTimeout),this._resetStateTimeout=0)},_onMouseDown:function(t){if(!t.shiftKey||1!==t.which&&1!==t.button)return!1;this._clearDeferredResetState(),this._resetState(),re(),Le(),this._startPoint=this._map.mouseEventToContainerPoint(t),S(document,{contextmenu:Re,mousemove:this._onMouseMove,mouseup:this._onMouseUp,keydown:this._onKeyDown},this)},_onMouseMove:function(t){this._moved||(this._moved=!0,this._box=P("div","leaflet-zoom-box",this._container),M(this._container,"leaflet-crosshair"),this._map.fire("boxzoomstart")),this._point=this._map.mouseEventToContainerPoint(t);var t=new f(this._point,this._startPoint),e=t.getSize();Z(this._box,t.min),this._box.style.width=e.x+"px",this._box.style.height=e.y+"px"},_finish:function(){this._moved&&(T(this._box),z(this._container,"leaflet-crosshair")),ae(),Te(),k(document,{contextmenu:Re,mousemove:this._onMouseMove,mouseup:this._onMouseUp,keydown:this._onKeyDown},this)},_onMouseUp:function(t){1!==t.which&&1!==t.button||(this._finish(),this._moved&&(this._clearDeferredResetState(),this._resetStateTimeout=setTimeout(a(this._resetState,this),0),t=new s(this._map.containerPointToLatLng(this._startPoint),this._map.containerPointToLatLng(this._point)),this._map.fitBounds(t).fire("boxzoomend",{boxZoomBounds:t})))},_onKeyDown:function(t){27===t.keyCode&&(this._finish(),this._clearDeferredResetState(),this._resetState())}}),Ct=(A.addInitHook("addHandler","boxZoom",_t),A.mergeOptions({doubleClickZoom:!0}),n.extend({addHooks:function(){this._map.on("dblclick",this._onDoubleClick,this)},removeHooks:function(){this._map.off("dblclick",this._onDoubleClick,this)},_onDoubleClick:function(t){var e=this._map,i=e.getZoom(),n=e.options.zoomDelta,i=t.originalEvent.shiftKey?i-n:i+n;"center"===e.options.doubleClickZoom?e.setZoom(i):e.setZoomAround(t.containerPoint,i)}})),Zt=(A.addInitHook("addHandler","doubleClickZoom",Ct),A.mergeOptions({dragging:!0,inertia:!0,inertiaDeceleration:3400,inertiaMaxSpeed:1/0,easeLinearity:.2,worldCopyJump:!1,maxBoundsViscosity:0}),n.extend({addHooks:function(){var t;this._draggable||(t=this._map,this._draggable=new Je(t._mapPane,t._container),this._draggable.on({dragstart:this._onDragStart,drag:this._onDrag,dragend:this._onDragEnd},this),this._draggable.on("predrag",this._onPreDragLimit,this),t.options.worldCopyJump&&(this._draggable.on("predrag",this._onPreDragWrap,this),t.on("zoomend",this._onZoomEnd,this),t.whenReady(this._onZoomEnd,this))),M(this._map._container,"leaflet-grab leaflet-touch-drag"),this._draggable.enable(),this._positions=[],this._times=[]},removeHooks:function(){z(this._map._container,"leaflet-grab"),z(this._map._container,"leaflet-touch-drag"),this._draggable.disable()},moved:function(){return this._draggable&&this._draggable._moved},moving:function(){return this._draggable&&this._draggable._moving},_onDragStart:function(){var t,e=this._map;e._stop(),this._map.options.maxBounds&&this._map.options.maxBoundsViscosity?(t=g(this._map.options.maxBounds),this._offsetLimit=_(this._map.latLngToContainerPoint(t.getNorthWest()).multiplyBy(-1),this._map.latLngToContainerPoint(t.getSouthEast()).multiplyBy(-1).add(this._map.getSize())),this._viscosity=Math.min(1,Math.max(0,this._map.options.maxBoundsViscosity))):this._offsetLimit=null,e.fire("movestart").fire("dragstart"),e.options.inertia&&(this._positions=[],this._times=[])},_onDrag:function(t){var e,i;this._map.options.inertia&&(e=this._lastTime=+new Date,i=this._lastPos=this._draggable._absPos||this._draggable._newPos,this._positions.push(i),this._times.push(e),this._prunePositions(e)),this._map.fire("move",t).fire("drag",t)},_prunePositions:function(t){for(;1e.max.x&&(t.x=this._viscousLimit(t.x,e.max.x)),t.y>e.max.y&&(t.y=this._viscousLimit(t.y,e.max.y)),this._draggable._newPos=this._draggable._startPos.add(t))},_onPreDragWrap:function(){var t=this._worldWidth,e=Math.round(t/2),i=this._initialWorldOffset,n=this._draggable._newPos.x,o=(n-e+i)%t+e-i,n=(n+e+i)%t-e-i,t=Math.abs(o+i)e.getMaxZoom()&&1"}return s};VMM.createMediaElement=function(e,t,n){var r="",i=!1;r+="
";if(e!=null&&e!=""){valid=!0;r+="";n!=null&&n!=""&&(r+=VMM.createElement("div",n,"credit"));t!=null&&t!=""&&(r+=VMM.createElement("div",t,"caption"))}r+="
";return r};VMM.hideUrlBar=function(){var e=window,t=e.document;if(!location.hash||!e.addEventListener){window.scrollTo(0,1);var n=1,r=setInterval(function(){if(t.body){clearInterval(r);n="scrollTop"in t.body?t.body.scrollTop:1;e.scrollTo(0,n===1?0:1)}},15);e.addEventListener("load",function(){setTimeout(function(){e.scrollTo(0,n===1?0:1)},0)},!1)}}}Array.prototype.remove=function(e,t){var n=this.slice((t||e)+1||this.length);this.length=e<0?this.length+e:e;return this.push.apply(this,n)};Date.prototype.getWeek=function(){var e=new Date(this.getFullYear(),0,1);return Math.ceil(((this-e)/864e5+e.getDay()+1)/7)};Date.prototype.getDayOfYear=function(){var e=new Date(this.getFullYear(),0,1);return Math.ceil((this-e)/864e5)};var is={Null:function(e){return e===null},Undefined:function(e){return e===undefined},nt:function(e){return e===null||e===undefined},Function:function(e){return typeof e=="function"?e.constructor.toString().match(/Function/)!==null:!1},String:function(e){return typeof e=="string"?!0:typeof e=="object"?e.constructor.toString().match(/string/i)!==null:!1},Array:function(e){return typeof e=="object"?e.constructor.toString().match(/array/i)!==null||e.length!==undefined:!1},Boolean:function(e){return typeof e=="boolean"?!0:typeof e=="object"?e.constructor.toString().match(/boolean/i)!==null:!1},Date:function(e){return typeof e=="date"?!0:typeof e=="object"?e.constructor.toString().match(/date/i)!==null:!1},HTML:function(e){return typeof e=="object"?e.constructor.toString().match(/html/i)!==null:!1},Number:function(e){return typeof e=="number"?!0:typeof e=="object"?e.constructor.toString().match(/Number/)!==null:!1},Object:function(e){return typeof e=="object"?e.constructor.toString().match(/object/i)!==null:!1},RegExp:function(e){return typeof e=="function"?e.constructor.toString().match(/regexp/i)!==null:!1}},type={of:function(e){for(var t in is)if(is[t](e))return t.toLowerCase()}};if(typeof VMM!="undefined"){VMM.smoothScrollTo=function(e,t,n){if(typeof jQuery!="undefined"){var r="easein",i=1e3;t!=null&&(t<1?i=1:i=Math.round(t));n!=null&&n!=""&&(r=n);jQuery(window).scrollTop()!=VMM.Lib.offset(e).top&&VMM.Lib.animate("html,body",i,r,{scrollTop:VMM.Lib.offset(e).top})}};VMM.attachElement=function(e,t){typeof jQuery!="undefined"&&jQuery(e).html(t)};VMM.appendElement=function(e,t){typeof jQuery!="undefined"&&jQuery(e).append(t)};VMM.getHTML=function(e){var t;if(typeof jQuery!="undefined"){t=jQuery(e).html();return t}};VMM.getElement=function(e,t){var n;if(typeof jQuery!="undefined"){t?n=jQuery(e).parent().get(0):n=jQuery(e).get(0);return n}};VMM.bindEvent=function(e,t,n,r){var i,s="click",o={};n!=null&&n!=""&&(s=n);o!=null&&o!=""&&(o=r);typeof jQuery!="undefined"&&jQuery(e).bind(s,o,t)};VMM.unbindEvent=function(e,t,n){var r,i="click",s={};n!=null&&n!=""&&(i=n);typeof jQuery!="undefined"&&jQuery(e).unbind(i,t)};VMM.fireEvent=function(e,t,n){var r,i="click",s=[];t!=null&&t!=""&&(i=t);n!=null&&n!=""&&(s=n);typeof jQuery!="undefined"&&jQuery(e).trigger(i,s)};VMM.getJSON=function(e,t,n){if(typeof jQuery!="undefined"){jQuery.ajaxSetup({timeout:3e3});if(VMM.Browser.browser=="Explorer"&&parseInt(VMM.Browser.version,10)>=7&&window.XDomainRequest){trace("IE JSON");var r=e;if(r.match("^http://"))return jQuery.getJSON(r,t,n);if(r.match("^https://")){r=r.replace("https://","http://");return jQuery.getJSON(r,t,n)}return jQuery.getJSON(e,t,n)}return jQuery.getJSON(e,t,n)}};VMM.parseJSON=function(e){if(typeof jQuery!="undefined")return jQuery.parseJSON(e)};VMM.appendAndGetElement=function(e,t,n,r){var i,s="
",o="",u="",a="";t!=null&&t!=""&&(s=t);n!=null&&n!=""&&(o=n);r!=null&&r!=""&&(u=r);if(typeof jQuery!="undefined"){i=jQuery(t);i.addClass(o);i.html(u);jQuery(e).append(i)}return i};VMM.Lib={init:function(){return this},hide:function(e,t){t!=null&&t!=""?typeof jQuery!="undefined"&&jQuery(e).hide(t):typeof jQuery!="undefined"&&jQuery(e).hide()},remove:function(e){typeof jQuery!="undefined"&&jQuery(e).remove()},detach:function(e){typeof jQuery!="undefined"&&jQuery(e).detach()},append:function(e,t){typeof jQuery!="undefined"&&jQuery(e).append(t)},prepend:function(e,t){typeof jQuery!="undefined"&&jQuery(e).prepend(t)},show:function(e,t){t!=null&&t!=""?typeof jQuery!="undefined"&&jQuery(e).show(t):typeof jQuery!="undefined"&&jQuery(e).show()},load:function(e,t,n){var r={elem:e};r!=null&&r!=""&&(r=n);typeof jQuery!="undefined"&&jQuery(e).load(r,t)},addClass:function(e,t){typeof jQuery!="undefined"&&jQuery(e).addClass(t)},removeClass:function(e,t){typeof jQuery!="undefined"&&jQuery(e).removeClass(t)},attr:function(e,t,n){if(n!=null&&n!="")typeof jQuery!="undefined"&&jQuery(e).attr(t,n);else if(typeof jQuery!="undefined")return jQuery(e).attr(t)},prop:function(e,t,n){typeof jQuery=="undefined"||!/[1-9]\.[3-9].[1-9]/.test(jQuery.fn.jquery)?VMM.Lib.attribute(e,t,n):jQuery(e).prop(t,n)},attribute:function(e,t,n){if(n!=null&&n!="")typeof jQuery!="undefined"&&jQuery(e).attr(t,n);else if(typeof jQuery!="undefined")return jQuery(e).attr(t)},visible:function(e,t){if(t!=null)typeof jQuery!="undefined"&&(t?jQuery(e).show(0):jQuery(e).hide(0));else if(typeof jQuery!="undefined")return jQuery(e).is(":visible")?!0:!1},css:function(e,t,n){if(n!=null&&n!="")typeof jQuery!="undefined"&&jQuery(e).css(t,n);else if(typeof jQuery!="undefined")return jQuery(e).css(t)},cssmultiple:function(e,t){if(typeof jQuery!="undefined")return jQuery(e).css(t)},offset:function(e){var t;typeof jQuery!="undefined"&&(t=jQuery(e).offset());return t},position:function(e){var t;typeof jQuery!="undefined"&&(t=jQuery(e).position());return t},width:function(e,t){if(t!=null&&t!="")typeof jQuery!="undefined"&&jQuery(e).width(t);else if(typeof jQuery!="undefined")return jQuery(e).width()},height:function(e,t){if(t!=null&&t!="")typeof jQuery!="undefined"&&jQuery(e).height(t);else if(typeof jQuery!="undefined")return jQuery(e).height()},toggleClass:function(e,t){typeof jQuery!="undefined"&&jQuery(e).toggleClass(t)},each:function(e,t){typeof jQuery!="undefined"&&jQuery(e).each(t)},html:function(e,t){var n;if(typeof jQuery!="undefined"){n=jQuery(e).html();return n}if(t!=null&&t!="")typeof jQuery!="undefined"&&jQuery(e).html(t);else{var n;if(typeof jQuery!="undefined"){n=jQuery(e).html();return n}}},find:function(e,t){if(typeof jQuery!="undefined")return jQuery(e).find(t)},stop:function(e){typeof jQuery!="undefined"&&jQuery(e).stop()},delay_animate:function(e,t,n,r,i,s){if(VMM.Browser.device=="mobile"||VMM.Browser.device=="tablet"){var o=Math.round(n/1500*10)/10,u=o+"s";VMM.Lib.css(t,"-webkit-transition","all "+u+" ease");VMM.Lib.css(t,"-moz-transition","all "+u+" ease");VMM.Lib.css(t,"-o-transition","all "+u+" ease");VMM.Lib.css(t,"-ms-transition","all "+u+" ease");VMM.Lib.css(t,"transition","all "+u+" ease");VMM.Lib.cssmultiple(t,_att)}else typeof jQuery!="undefined"&&jQuery(t).delay(e).animate(i,{duration:n,easing:r})},animate:function(e,t,n,r,i,s){var o="easein",u=!1,a=1e3,f={};t!=null&&(t<1?a=1:a=Math.round(t));n!=null&&n!=""&&(o=n);i!=null&&i!=""&&(u=i);r!=null?f=r:f={opacity:0};if(VMM.Browser.device=="mobile"||VMM.Browser.device=="tablet"){var l=Math.round(a/1500*10)/10,c=l+"s";o=" cubic-bezier(0.33, 0.66, 0.66, 1)";for(x in f)if(Object.prototype.hasOwnProperty.call(f,x)){trace(x+" to "+f[x]);VMM.Lib.css(e,"-webkit-transition",x+" "+c+o);VMM.Lib.css(e,"-moz-transition",x+" "+c+o);VMM.Lib.css(e,"-o-transition",x+" "+c+o);VMM.Lib.css(e,"-ms-transition",x+" "+c+o);VMM.Lib.css(e,"transition",x+" "+c+o)}VMM.Lib.cssmultiple(e,f)}else typeof jQuery!="undefined"&&(s!=null&&s!=""?jQuery(e).animate(f,{queue:u,duration:a,easing:o,complete:s}):jQuery(e).animate(f,{queue:u,duration:a,easing:o}))}}}if(typeof jQuery!="undefined"){(function(e){window.XDomainRequest&&e.ajaxTransport(function(t){if(t.crossDomain&&t.async){if(t.timeout){t.xdrTimeout=t.timeout;delete t.timeout}var n;return{send:function(r,i){function o(t,r,s,o){n.onload=n.onerror=n.ontimeout=e.noop;n=undefined;i(t,r,s,o)}n=new XDomainRequest;n.open(t.type,t.url);n.onload=function(){o(200,"OK",{text:n.responseText},"Content-Type: "+n.contentType)};n.onerror=function(){o(404,"Not Found")};if(t.xdrTimeout){n.ontimeout=function(){o(0,"timeout")};n.timeout=t.xdrTimeout}n.send(t.hasContent&&t.data||null)},abort:function(){if(n){n.onerror=e.noop();n.abort()}}}}})})(jQuery);jQuery.easing.jswing=jQuery.easing.swing;jQuery.extend(jQuery.easing,{def:"easeOutQuad",swing:function(e,t,n,r,i){return jQuery.easing[jQuery.easing.def](e,t,n,r,i)},easeInExpo:function(e,t,n,r,i){return t==0?n:r*Math.pow(2,10*(t/i-1))+n},easeOutExpo:function(e,t,n,r,i){return t==i?n+r:r*(-Math.pow(2,-10*t/i)+1)+n},easeInOutExpo:function(e,t,n,r,i){return t==0?n:t==i?n+r:(t/=i/2)<1?r/2*Math.pow(2,10*(t-1))+n:r/2*(-Math.pow(2,-10*--t)+2)+n},easeInQuad:function(e,t,n,r,i){return r*(t/=i)*t+n},easeOutQuad:function(e,t,n,r,i){return-r*(t/=i)*(t-2)+n},easeInOutQuad:function(e,t,n,r,i){return(t/=i/2)<1?r/2*t*t+n:-r/2*(--t*(t-2)-1)+n}})}if(typeof VMM!="undefined"&&typeof VMM.Browser=="undefined"){VMM.Browser={init:function(){this.browser=this.searchString(this.dataBrowser)||"An unknown browser";this.version=this.searchVersion(navigator.userAgent)||this.searchVersion(navigator.appVersion)||"an unknown version";this.OS=this.searchString(this.dataOS)||"an unknown OS";this.device=this.searchDevice(navigator.userAgent);this.orientation=this.searchOrientation(window.orientation)},searchOrientation:function(e){var t="";e==0||e==180?t="portrait":e==90||e==-90?t="landscape":t="normal";return t},searchDevice:function(e){var t="";e.match(/Android/i)||e.match(/iPhone|iPod/i)?t="mobile":e.match(/iPad/i)?t="tablet":e.match(/BlackBerry/i)||e.match(/IEMobile/i)?t="other mobile":t="desktop";return t},searchString:function(e){for(var t=0;t'mmmm d',' yyyy''",full_long:"mmm d',' yyyy 'at' hh:MM TT",full_long_small_date:"hh:MM TT'
mmm d',' yyyy''"},month:["January","February","March","April","May","June","July","August","September","October","November","December"],month_abbr:["Jan.","Feb.","March","April","May","June","July","Aug.","Sept.","Oct.","Nov.","Dec."],day:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],day_abbr:["Sun.","Mon.","Tues.","Wed.","Thurs.","Fri.","Sat."],hour:[1,2,3,4,5,6,7,8,9,10,11,12,1,2,3,4,5,6,7,8,9,10,11,12],hour_suffix:["am"],bc_format:{year:"yyyy",month_short:"mmm",month:"mmmm yyyy",full_short:"mmm d",full:"mmmm d',' yyyy",time_no_seconds_short:"h:MM TT",time_no_seconds_small_date:"dddd', 'h:MM TT'
'mmmm d',' yyyy''",full_long:"dddd',' mmm d',' yyyy 'at' hh:MM TT",full_long_small_date:"hh:MM TT'
'dddd',' mmm d',' yyyy''"},setLanguage:function(e){trace("SET DATE LANGUAGE");VMM.Date.dateformats=e.dateformats;VMM.Date.month=e.date.month;VMM.Date.month_abbr=e.date.month_abbr;VMM.Date.day=e.date.day;VMM.Date.day_abbr=e.date.day_abbr;dateFormat.i18n.dayNames=e.date.day_abbr.concat(e.date.day);dateFormat.i18n.monthNames=e.date.month_abbr.concat(e.date.month)},parse:function(e){"use strict";var t,n,r,i;if(type.of(e)=="date")t=e;else{t=new Date(0,0,1,0,0,0,0);if(e.match(/,/gi)){n=e.split(",");for(var s=0;s1&&t.setMonth(n[1]-1);n[2]>1&&t.setDate(n[2]);n[3]>1&&t.setHours(n[3]);n[4]>1&&t.setMinutes(n[4]);n[5]>1&&t.setSeconds(n[5]);n[6]>1&&t.setMilliseconds(n[6])}else if(e.match("/")){if(e.match(" ")){i=e.split(" ");if(e.match(":")){r=i[1].split(":");r[0]>=1&&t.setHours(r[0]);r[1]>=1&&t.setMinutes(r[1]);r[2]>=1&&t.setSeconds(r[2]);r[3]>=1&&t.setMilliseconds(r[3])}n=i[0].split("/")}else n=e.split("/");n[2]&&t.setFullYear(n[2]);n[0]>1&&t.setMonth(n[0]-1);n[1]>1&&t.setDate(n[1])}else if(e.match("now")){var o=new Date;t.setFullYear(o.getFullYear());t.setMonth(o.getMonth());t.setDate(o.getDate());e.match("hours")&&t.setHours(o.getHours());if(e.match("minutes")){t.setHours(o.getHours());t.setMinutes(o.getMinutes())}if(e.match("seconds")){t.setHours(o.getHours());t.setMinutes(o.getMinutes());t.setSeconds(o.getSeconds())}if(e.match("milliseconds")){t.setHours(o.getHours());t.setMinutes(o.getMinutes());t.setSeconds(o.getSeconds());t.setMilliseconds(o.getMilliseconds())}}else if(e.length<=5){t.setFullYear(parseInt(e,10));t.setMonth(0);t.setDate(1);t.setHours(0);t.setMinutes(0);t.setSeconds(0);t.setMilliseconds(0)}else if(e.match("T"))if(navigator.userAgent.match(/MSIE\s(?!9.0)/)){i=e.split("T");if(e.match(":")){r=_time_parse[1].split(":");r[0]>=1&&t.setHours(r[0]);r[1]>=1&&t.setMinutes(r[1]);r[2]>=1&&t.setSeconds(r[2]);r[3]>=1&&t.setMilliseconds(r[3])}_d_array=i[0].split("-");n[0]&&t.setFullYear(n[0]);n[1]>1&&t.setMonth(n[1]-1);n[2]>1&&t.setDate(n[2])}else t=new Date(Date.parse(e));else t=new Date(parseInt(e.slice(0,4),10),parseInt(e.slice(4,6),10)-1,parseInt(e.slice(6,8),10),parseInt(e.slice(8,10),10),parseInt(e.slice(10,12),10))}return t},prettyDate:function(e,t,n){var r,i,s,o,u=!1,a,f,l;n!=null&&(u=!0);if(type.of(e)=="date"){e.getMonth()===0&&e.getDate()==1&&e.getHours()===0&&e.getMinutes()===0?s=VMM.Date.dateformats.year:e.getDate()<=1&&e.getHours()===0&&e.getMinutes()===0?t?s=VMM.Date.dateformats.month_short:s=VMM.Date.dateformats.month:e.getHours()===0&&e.getMinutes()===0?t?s=VMM.Date.dateformats.full_short:s=VMM.Date.dateformats.full:e.getMinutes()===0?t?s=VMM.Date.dateformats.time_no_seconds_short:s=VMM.Date.dateformats.time_no_seconds_small_date:t?s=VMM.Date.dateformats.time_no_seconds_short:s=VMM.Date.dateformats.full_long;r=dateFormat(e,s,!1);o=r.split(" ");for(var c=0;c99?Math.round(m/10):m),t:p<12?"a":"p",tt:p<12?"am":"pm",T:p<12?"A":"P",TT:p<12?"AM":"PM",Z:o?"UTC":(String(i).match(t)||[""]).pop().replace(n,""),o:(g>0?"-":"+")+r(Math.floor(Math.abs(g)/60)*100+Math.abs(g)%60,4),S:["th","st","nd","rd"][f%10>3?0:(f%100-f%10!=10)*f%10]};return s.replace(e,function(e){return e in y?y[e]:e.slice(1,e.length-1)})}}();dateFormat.masks={"default":"ddd mmm dd yyyy HH:MM:ss",shortDate:"m/d/yy",mediumDate:"mmm d, yyyy",longDate:"mmmm d, yyyy",fullDate:"dddd, mmmm d, yyyy",shortTime:"h:MM TT",mediumTime:"h:MM:ss TT",longTime:"h:MM:ss TT Z",isoDate:"yyyy-mm-dd",isoTime:"HH:MM:ss",isoDateTime:"yyyy-mm-dd'T'HH:MM:ss",isoUtcDateTime:"UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"};dateFormat.i18n={dayNames:["Sun","Mon","Tue","Wed","Thu","Fri","Sat","Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],monthNames:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec","January","February","March","April","May","June","July","August","September","October","November","December"]};Date.prototype.format=function(e,t){return dateFormat(this,e,t)}}typeof VMM!="undefined"&&typeof VMM.Util=="undefined"&&(VMM.Util={init:function(){return this},correctProtocol:function(e){var t=window.parent.location.protocol.toString(),n="",r=e.split("://",2);t.match("http")?n=t:n="https";return n+"://"+r[1]},mergeConfig:function(e,t){var n;for(n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e},getObjectAttributeByIndex:function(e,t){if(typeof e!="undefined"){var n=0;for(var r in e){if(t===n)return e[r];n++}return""}return""},ordinal:function(e){return["th","st","nd","rd"][!(e%10>3||Math.floor(e%100/10)==1)*(e%10)]},randomBetween:function(e,t){return Math.floor(Math.random()*(t-e+1)+e)},average:function(e){var t={mean:0,variance:0,deviation:0},n=e.length;for(var r,i=0,s=n;s--;i+=e[s]);for(r=t.mean=i/n,s=n,i=0;s--;i+=Math.pow(e[s]-r,2));return t.deviation=Math.sqrt(t.variance=i/n),t},customSort:function(e,t){var n=e,r=t;return n==r?0:n>r?1:-1},deDupeArray:function(e){var t,n=e.length,r=[],i={};for(t=0;tt){i.height=t;i.width=Math.round(t/r*n);i.width>e&&trace("FIT: DIDN'T FIT!!! ")}return i},r16_9:function(e,t){if(e!==null&&e!=="")return Math.round(t/16*9);if(t!==null&&t!=="")return Math.round(e/9*16)},r4_3:function(e,t){if(e!==null&&e!=="")return Math.round(t/4*3);if(t!==null&&t!=="")return Math.round(e/3*4)}},doubledigit:function(e){return(e<10?"0":"")+e},truncateWords:function(e,t,n){t||(t=30);n||(n=t);var r=/^[^A-Za-z0-9\'\-]+/gi,i=e.replace(r,""),s=i.split(" "),o=[];t=Math.min(s.length,t);n=Math.min(s.length,n);for(var u=0;u$&").replace(i,"$1$2").replace(s,"$1")},linkify_with_twitter:function(e,t,n){function u(e){var t=/(\b(https?|ftp|file):\/\/([-A-Z0-9+&@#%?=~_|!:,.;]*)([-A-Z0-9+&@#%?\/=~_|!:,.;]*)[-A-Z0-9+&@#\/%=~_|])/ig;return e.replace(t,"$3")}var r=/\b(?:https?|ftp):\/\/[a-z0-9-+&@#\/%?=~_|!:,.;]*[a-z0-9-+&@#\/%=~_|]/gim,i=/(\()((?:ht|f)tps?:\/\/[a-z0-9\-._~!$&'()*+,;=:\/?#[\]@%]+)(\))|(\[)((?:ht|f)tps?:\/\/[a-z0-9\-._~!$&'()*+,;=:\/?#[\]@%]+)(\])|(\{)((?:ht|f)tps?:\/\/[a-z0-9\-._~!$&'()*+,;=:\/?#[\]@%]+)(\})|(<|&(?:lt|#60|#x3c);)((?:ht|f)tps?:\/\/[a-z0-9\-._~!$&'()*+,;=:\/?#[\]@%]+)(>|&(?:gt|#62|#x3e);)|((?:^|[^=\s'"\]])\s*['"]?|[^=\s]\s+)(\b(?:ht|f)tps?:\/\/[a-z0-9\-._~!$'()*+,;=:\/?#[\]@%]+(?:(?!&(?:gt|#0*62|#x0*3e);|&(?:amp|apos|quot|#0*3[49]|#x0*2[27]);[.!&',:?;]?(?:[^a-z0-9\-._~!$&'()*+,;=:\/?#[\]@%]|$))&[a-z0-9\-._~!$'()*+,;=:\/?#[\]@%]*)*[a-z0-9\-_~$()*+=\/#[\]@%])/img,s='$1$4$7$10$13$2$5$8$11$14$3$6$9$12',o=/(^|[^\/])(www\.[\S]+(\b|$))/gim,a=/(([a-zA-Z0-9_\-\.]+)@[a-zA-Z_]+?(?:\.[a-zA-Z]{2,6}))+/gim,f=/\B@([\w-]+)/gm,l=/(#([\w]+))/g;return e.replace(i,s).replace(o,"$1$2").replace(a,"$1").replace(f,"@$1").replace(l,"$1")},linkify_wikipedia:function(e){var t=/]*>(.*?)<\/i>/gim;return e.replace(t,"$&").replace(/]*>/gim,"").replace(/<\/i>/gim,"").replace(/]*>/gim,"").replace(/<\/b>/gim,"")},unlinkify:function(e){if(!e)return e;e=e.replace(/]*>/i,"");e=e.replace(/<\/a>/i,"");return e},untagify:function(e){if(!e)return e;e=e.replace(/<\s*\w.*?>/g,"");return e},nl2br:function(e){return e.replace(/(\r\n|[\r\n]|\\n|\\r)/g,"
")},unique_ID:function(e){var t=function(e){return Math.floor(Math.random()*e)},n=function(){var e="abcdefghijklmnopqurstuvwxyzABCDEFGHIJKLMNOPQURSTUVWXYZ";return e.substr(t(62),1)},r=function(e){var t="";for(var r=0;r1?"."+x[1]:"";var t=/(\d+)(\d{3})/;while(t.test(x1))x1=x1.replace(t,"$1,$2");return x1+x2},toTitleCase:function(e){if(VMM.Browser.browser=="Explorer"&&parseInt(VMM.Browser.version,10)>=7)return e.replace("_","%20");var t={__smallWords:["a","an","and","as","at","but","by","en","for","if","in","of","on","or","the","to","v[.]?","via","vs[.]?"],init:function(){this.__smallRE=this.__smallWords.join("|");this.__lowerCaseWordsRE=new RegExp("\\b("+this.__smallRE+")\\b","gi");this.__firstWordRE=new RegExp("^([^a-zA-Z0-9 \\r\\n\\t]*)("+this.__smallRE+")\\b","gi");this.__lastWordRE=new RegExp("\\b("+this.__smallRE+")([^a-zA-Z0-9 \\r\\n\\t]*)$","gi")},toTitleCase:function(e){var t="",n=e.split(/([:.;?!][ ]|(?:[ ]|^)["“])/);for(var r=0;r=0)if(o[t].href===e.urls[0]){a("css");break}i+=1;e&&(i<200?setTimeout(h,50):a("css"))}}var t,n,r={},i=0,s={css:[],js:[]},o=e.styleSheets;return{css:function(e,t,n,r){l("css",e,t,n,r)},js:function(e,t,n,r){l("js",e,t,n,r)}}}(this.document);LoadLib=function(e){function n(e){var n=0,r=!1;for(n=0;n'mmmm d',' yyyy''",full_long:"mmm d',' yyyy 'at' h:MM TT",full_long_small_date:"h:MM TT'
mmm d',' yyyy''"},messages:{loading_timeline:"Loading Timeline... ",return_to_title:"Return to Title",expand_timeline:"Expand Timeline",contract_timeline:"Contract Timeline",wikipedia:"From Wikipedia, the free encyclopedia",loading_content:"Loading Content",loading:"Loading"}});typeof VMM!="undefined"&&typeof VMM.ExternalAPI=="undefined"&&(VMM.ExternalAPI={keys:{google:"",flickr:"",twitter:""},keys_master:{vp:"Pellentesque nibh felis, eleifend id, commodo in, interdum vitae, leo",flickr:"RAIvxHY4hE/Elm5cieh4X5ptMyDpj7MYIxziGxi0WGCcy1s+yr7rKQ==",google:"jwNGnYw4hE9lmAez4ll0QD+jo6SKBJFknkopLS4FrSAuGfIwyj57AusuR0s8dAo=",twitter:""},init:function(){return this},setKeys:function(e){VMM.ExternalAPI.keys=e},pushQues:function(){VMM.master_config.googlemaps.active&&VMM.ExternalAPI.googlemaps.pushQue();VMM.master_config.youtube.active&&VMM.ExternalAPI.youtube.pushQue();VMM.master_config.soundcloud.active&&VMM.ExternalAPI.soundcloud.pushQue();VMM.master_config.googledocs.active&&VMM.ExternalAPI.googledocs.pushQue();VMM.master_config -.googleplus.active&&VMM.ExternalAPI.googleplus.pushQue();VMM.master_config.wikipedia.active&&VMM.ExternalAPI.wikipedia.pushQue();VMM.master_config.vimeo.active&&VMM.ExternalAPI.vimeo.pushQue();VMM.master_config.twitter.active&&VMM.ExternalAPI.twitter.pushQue();VMM.master_config.flickr.active&&VMM.ExternalAPI.flickr.pushQue();VMM.master_config.webthumb.active&&VMM.ExternalAPI.webthumb.pushQue()},twitter:{tweetArray:[],get:function(e){var t={mid:e.id,id:e.uid};VMM.master_config.twitter.que.push(t);VMM.master_config.twitter.active=!0},create:function(e,t){var n=e.mid.toString(),r={twitterid:e.mid},i="http://api.twitter.com/1/statuses/show.json?id="+e.mid+"&include_entities=true&callback=?",s=setTimeout(VMM.ExternalAPI.twitter.errorTimeOut,VMM.master_config.timers.api,e),o=setTimeout(t,VMM.master_config.timers.api,e);VMM.getJSON(i,function(t){var n=t.id_str,r="

",i=VMM.Util.linkify_with_twitter(t.text,"_blank");r+=i;r+="

";typeof t.entities.media!="undefined"&&t.entities.media[0].type=="photo";r+="
";r+="";r+="";r+=""+t.user.name+"";r+="@"+t.user.screen_name+"";r+="";r+="
";VMM.attachElement("#"+e.id.toString(),r);VMM.attachElement("#text_thumb_"+e.id.toString(),t.text);VMM.attachElement("#marker_content_"+e.id.toString(),t.text)}).error(function(t,n,r){trace("TWITTER error");trace("TWITTER ERROR: "+n+" "+t.responseText);VMM.attachElement("#"+e.id,VMM.MediaElement.loadingmessage("ERROR LOADING TWEET "+e.mid))}).success(function(e){clearTimeout(s);clearTimeout(o);t()})},errorTimeOut:function(e){trace("TWITTER JSON ERROR TIMEOUT "+e.mid);VMM.attachElement("#"+e.id.toString(),VMM.MediaElement.loadingmessage("Still waiting on Twitter: "+e.mid));VMM.getJSON("http://api.twitter.com/1/account/rate_limit_status.json",function(t){trace("REMAINING TWITTER API CALLS "+t.remaining_hits);trace("TWITTER RATE LIMIT WILL RESET AT "+t.reset_time);var n="";if(t.remaining_hits==0){n="

You've reached the maximum number of tweets you can load in an hour.

";n+="

You can view tweets again starting at:
"+t.reset_time+"

"}else n="

Still waiting on Twitter. "+e.mid+"

";VMM.attachElement("#"+e.id.toString(),VMM.MediaElement.loadingmessage(n))})},pushQue:function(){if(VMM.master_config.twitter.que.length>0){VMM.ExternalAPI.twitter.create(VMM.master_config.twitter.que[0],VMM.ExternalAPI.twitter.pushQue);VMM.master_config.twitter.que.remove(0)}},getHTML:function(e){var t="http://api.twitter.com/1/statuses/oembed.json?id="+e+"&callback=?";VMM.getJSON(t,VMM.ExternalAPI.twitter.onJSONLoaded)},onJSONLoaded:function(e){trace("TWITTER JSON LOADED");var t=e.id;VMM.attachElement("#"+t,VMM.Util.linkify_with_twitter(e.html))},parseTwitterDate:function(e){var t=new Date(Date.parse(e));return t},prettyParseTwitterDate:function(e){var t=new Date(Date.parse(e));return VMM.Date.prettyDate(t,!0)},getTweets:function(e){var t=[],n=e.length;for(var r=0;r
";r.content=i;r.raw=e;t.push(r);if(t.length==n){var o={tweetdata:t};VMM.fireEvent(global,"TWEETSLOADED",o)}}).success(function(){trace("second success")}).error(function(){trace("error")}).complete(function(){trace("complete")})}},getTweetSearch:function(e,t){var n=40;t!=null&&t!=""&&(n=t);var r="http://search.twitter.com/search.json?q="+e+"&rpp="+n+"&include_entities=true&result_type=mixed",i=[];VMM.getJSON(r,function(e){for(var t=0;t