diff --git a/composer.json b/composer.json index f30b46d5d5..27775ec9d3 100644 --- a/composer.json +++ b/composer.json @@ -121,7 +121,7 @@ "behat/gherkin": "^4.6.2", "behat/mink": "~1.8", "behat/mink-goutte-driver": "~1.2", - "behat/mink-selenium2-driver": "~1.4", + "behat/mink-selenium2-driver": "1.4.0", "boedah/robo-drush": "^4.2", "composer/composer": "^1.10.22", "drupal/admin_toolbar": "~2.4", diff --git a/composer.lock b/composer.lock index 88fc084c9f..36b8184296 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d77e7b4bf30df101cf334b12a1b4f987", + "content-hash": "91c10089d16f6fc3230d937ef317d96c", "packages": [ { "name": "SEMICeu/adms-ap_validator", @@ -914,32 +914,32 @@ }, { "name": "consolidation/robo", - "version": "1.4.13", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "fd28dcca1b935950ece26e63541fbdeeb09f7343" + "reference": "12bf6b608057604a283e9e597edfed36ba071631" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/fd28dcca1b935950ece26e63541fbdeeb09f7343", - "reference": "fd28dcca1b935950ece26e63541fbdeeb09f7343", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/12bf6b608057604a283e9e597edfed36ba071631", + "reference": "12bf6b608057604a283e9e597edfed36ba071631", "shasum": "" }, "require": { - "consolidation/annotated-command": "^2.12.1|^4.1", + "consolidation/annotated-command": "^2.12.1 || ^4.1", "consolidation/config": "^1.2.1", - "consolidation/log": "^1.1.1|^2", - "consolidation/output-formatters": "^3.5.1|^4.1", - "consolidation/self-update": "^1.1.5", + "consolidation/log": "^1.1.1 || ^2", + "consolidation/output-formatters": "^3.5.1 || ^4.1", + "consolidation/self-update": "^1.1.5 || ^2", "grasmash/yaml-expander": "^1.4", "league/container": "^2.4.1", "php": ">=5.5.0", - "symfony/console": "^2.8|^3|^4", - "symfony/event-dispatcher": "^2.5|^3|^4", - "symfony/filesystem": "^2.5|^3|^4", - "symfony/finder": "^2.5|^3|^4|^5", - "symfony/process": "^2.5|^3|^4" + "symfony/console": "^2.8 || ^3 || ^4", + "symfony/event-dispatcher": "^2.5 || ^3 || ^4", + "symfony/filesystem": "^2.5 || ^3 || ^4", + "symfony/finder": "^2.5 || ^3 || ^4 || ^5", + "symfony/process": "^2.5 || ^3 || ^4" }, "replace": { "codegyre/robo": "< 1.0" @@ -1025,7 +1025,7 @@ } ], "description": "Modern task runner", - "time": "2020-10-11T04:51:34+00:00" + "time": "2021-10-08T03:51:31+00:00" }, { "name": "consolidation/self-update", @@ -5150,30 +5150,33 @@ }, { "name": "drupal/matomo", - "version": "1.11.0", + "version": "1.12.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/matomo.git", - "reference": "8.x-1.11" + "reference": "8.x-1.12" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/matomo-8.x-1.11.zip", - "reference": "8.x-1.11", - "shasum": "82be96c20ab15df03d199ab98d047cef6e67d40b" + "url": "https://ftp.drupal.org/files/projects/matomo-8.x-1.12.zip", + "reference": "8.x-1.12", + "shasum": "4c96688a1dad0caa9a767ee0986df8b94cc9aba2" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^8.8.0 || ^9.0.0" + }, + "conflict": { + "drupal/csp": "<1.12" }, "require-dev": { - "drupal/php": "*", - "drupal/token": "*" + "drupal/php": "~1.1", + "drupal/token": "~1.9" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.11", - "datestamp": "1601651459", + "version": "8.x-1.12", + "datestamp": "1634559052", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5186,23 +5189,26 @@ ], "authors": [ { - "name": "Carsten Logemann", - "homepage": "https://www.drupal.org/u/C_Logemann" + "name": "C-Logemann", + "homepage": "https://www.drupal.org/user/218368" }, { - "name": "Shelane French", - "homepage": "https://www.drupal.org/u/shelane" + "name": "Grimreaper", + "homepage": "https://www.drupal.org/user/2388214" }, { - "name": "See other contributors", - "homepage": "https://www.drupal.org/node/247808/committers" + "name": "hass", + "homepage": "https://www.drupal.org/user/85918" + }, + { + "name": "shelane", + "homepage": "https://www.drupal.org/user/2674989" } ], - "description": "Adds Matomo javascript tracking code to all your site's pages", + "description": "Adds Matomo javascript tracking code to all your site's pages.", "homepage": "https://www.drupal.org/project/matomo", "support": { - "source": "https://git.drupal.org/project/matomo.git", - "issues": "https://www.drupal.org/project/issues/matomo" + "source": "https://git.drupalcode.org/project/matomo" } }, { @@ -5336,7 +5342,7 @@ "source": { "type": "git", "url": "https://git.drupalcode.org/project/menu_link_destination.git", - "reference": "942c977395b77b079971a78ed03ca4190dbd709a" + "reference": "3a9395429fbf70ea36e225e78851d7ca1af49de2" }, "require": { "drupal/core": "^8.9 || ^9.1" @@ -5348,7 +5354,7 @@ }, "drupal": { "version": "1.x-dev", - "datestamp": "1629878552", + "datestamp": "1629882173", "security-coverage": { "status": "not-covered", "message": "Project has not opted into security advisory coverage!" @@ -5377,7 +5383,7 @@ "source": "https://git.drupalcode.org/project/menu_link_destination", "issues": "https://www.drupal.org/project/issues/menu_link_destination" }, - "time": "2021-08-25T09:02:12+00:00" + "time": "2021-10-12T14:43:09+00:00" }, { "name": "drupal/message", @@ -6910,17 +6916,17 @@ }, { "name": "drupal/simple_sitemap", - "version": "3.10.0", + "version": "3.11.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/simple_sitemap.git", - "reference": "8.x-3.10" + "reference": "8.x-3.11" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/simple_sitemap-8.x-3.10.zip", - "reference": "8.x-3.10", - "shasum": "4836e5d5bae0b4348406c832f81eabfaf16483e3" + "url": "https://ftp.drupal.org/files/projects/simple_sitemap-8.x-3.11.zip", + "reference": "8.x-3.11", + "shasum": "5fdd4ed5af5e37e3c707e401d094a179f52e7711" }, "require": { "drupal/core": "^8 || ^9", @@ -6929,8 +6935,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.10", - "datestamp": "1617840662", + "version": "8.x-3.11", + "datestamp": "1634343986", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6948,9 +6954,9 @@ ], "authors": [ { - "name": "Pawel Ginalski (gbyte.co)", - "homepage": "https://www.drupal.org/u/gbyte.co", - "email": "contact@gbyte.co", + "name": "Pawel Ginalski (gbyte)", + "homepage": "https://www.drupal.org/u/gbyte", + "email": "contact@gbyte.dev", "role": "Maintainer" }, { @@ -11364,16 +11370,16 @@ }, { "name": "psy/psysh", - "version": "v0.10.8", + "version": "v0.10.9", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3" + "reference": "01281336c4ae557fe4a994544f30d3a1bc204375" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e4573f47750dd6c92dca5aee543fa77513cbd8d3", - "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/01281336c4ae557fe4a994544f30d3a1bc204375", + "reference": "01281336c4ae557fe4a994544f30d3a1bc204375", "shasum": "" }, "require": { @@ -11431,7 +11437,7 @@ "interactive", "shell" ], - "time": "2021-04-10T16:23:39+00:00" + "time": "2021-10-10T13:37:39+00:00" }, { "name": "ralouphie/getallheaders", @@ -11632,28 +11638,31 @@ }, { "name": "swaggest/json-schema", - "version": "v0.12.38", + "version": "v0.12.39", "source": { "type": "git", "url": "https://github.com/swaggest/php-json-schema.git", - "reference": "ab7cca149a5822acc5be538dd6c008a348f6cb89" + "reference": "193ba39cce1ffa2d55ddd5445315e945a63298a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swaggest/php-json-schema/zipball/ab7cca149a5822acc5be538dd6c008a348f6cb89", - "reference": "ab7cca149a5822acc5be538dd6c008a348f6cb89", + "url": "https://api.github.com/repos/swaggest/php-json-schema/zipball/193ba39cce1ffa2d55ddd5445315e945a63298a2", + "reference": "193ba39cce1ffa2d55ddd5445315e945a63298a2", "shasum": "" }, "require": { "ext-json": "*", - "ext-mbstring": "*", "php": ">=5.4", "phplang/scope-exit": "^1.0", - "swaggest/json-diff": "^3.8.2" + "swaggest/json-diff": "^3.8.2", + "symfony/polyfill-mbstring": "^1.19" }, "require-dev": { "phpunit/phpunit": "^4.8.23" }, + "suggest": { + "ext-mbstring": "For better performance" + }, "type": "library", "autoload": { "psr-4": { @@ -11671,7 +11680,7 @@ } ], "description": "High definition PHP structures with JSON-schema based validation", - "time": "2021-09-17T13:54:01+00:00" + "time": "2021-10-15T18:12:27+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -14145,16 +14154,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.197.1", + "version": "3.198.6", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "e3353c1d908295b4a804e13da6b2d6bfeec2732b" + "reference": "821b8db50dd39be8ec94f286050a500b5f8a0142" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e3353c1d908295b4a804e13da6b2d6bfeec2732b", - "reference": "e3353c1d908295b4a804e13da6b2d6bfeec2732b", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/821b8db50dd39be8ec94f286050a500b5f8a0142", + "reference": "821b8db50dd39be8ec94f286050a500b5f8a0142", "shasum": "" }, "require": { @@ -14227,7 +14236,7 @@ "s3", "sdk" ], - "time": "2021-10-06T18:26:50+00:00" + "time": "2021-10-15T18:38:53+00:00" }, { "name": "behat/behat", @@ -14371,26 +14380,27 @@ }, { "name": "behat/mink", - "version": "v1.8.1", + "version": "v1.9.0", "source": { "type": "git", "url": "https://github.com/minkphp/Mink.git", - "reference": "07c6a9fe3fa98c2de074b25d9ed26c22904e3887" + "reference": "e35f4695de8800fc776af34ebf665ad58ebdd996" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/Mink/zipball/07c6a9fe3fa98c2de074b25d9ed26c22904e3887", - "reference": "07c6a9fe3fa98c2de074b25d9ed26c22904e3887", + "url": "https://api.github.com/repos/minkphp/Mink/zipball/e35f4695de8800fc776af34ebf665ad58ebdd996", + "reference": "e35f4695de8800fc776af34ebf665ad58ebdd996", "shasum": "" }, "require": { - "php": ">=5.3.1", + "php": ">=5.4", "symfony/css-selector": "^2.7|^3.0|^4.0|^5.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20", - "symfony/debug": "^2.7|^3.0|^4.0", - "symfony/phpunit-bridge": "^3.4.38 || ^5.0.5" + "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5 || ^9.5", + "symfony/debug": "^2.7|^3.0|^4.0|^5.0", + "symfony/phpunit-bridge": "^3.4.38 || ^4.4 || ^5.0.5", + "yoast/phpunit-polyfills": "^1.0" }, "suggest": { "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)", @@ -14402,7 +14412,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.8.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -14422,43 +14432,45 @@ } ], "description": "Browser controller/emulator abstraction for PHP", - "homepage": "http://mink.behat.org/", + "homepage": "https://mink.behat.org/", "keywords": [ "browser", "testing", "web" ], - "time": "2020-03-11T15:45:53+00:00" + "time": "2021-10-11T11:58:47+00:00" }, { "name": "behat/mink-browserkit-driver", - "version": "v1.3.4", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/minkphp/MinkBrowserKitDriver.git", - "reference": "e3b90840022ebcd544c7b394a3c9597ae242cbee" + "reference": "0ed1919eb09968f2e152ed91aee35300e70602a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/e3b90840022ebcd544c7b394a3c9597ae242cbee", - "reference": "e3b90840022ebcd544c7b394a3c9597ae242cbee", + "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/0ed1919eb09968f2e152ed91aee35300e70602a8", + "reference": "0ed1919eb09968f2e152ed91aee35300e70602a8", "shasum": "" }, "require": { "behat/mink": "^1.7.1@dev", - "php": ">=5.3.6", + "php": ">=5.4", "symfony/browser-kit": "~2.3|~3.0|~4.0", "symfony/dom-crawler": "~2.3|~3.0|~4.0" }, "require-dev": { "mink/driver-testsuite": "dev-master", + "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.18 || ^8.5 || ^9.5", "symfony/debug": "^2.7|^3.0|^4.0", - "symfony/http-kernel": "~2.3|~3.0|~4.0" + "symfony/http-kernel": "~2.3|~3.0|~4.0", + "yoast/phpunit-polyfills": "^1.0" }, "type": "mink-driver", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -14478,14 +14490,14 @@ } ], "description": "Symfony2 BrowserKit driver for Mink framework", - "homepage": "http://mink.behat.org/", + "homepage": "https://mink.behat.org/", "keywords": [ "Mink", "Symfony2", "browser", "testing" ], - "time": "2020-03-11T09:49:45+00:00" + "time": "2021-10-12T09:42:37+00:00" }, { "name": "behat/mink-extension", @@ -14548,31 +14560,30 @@ }, { "name": "behat/mink-goutte-driver", - "version": "v1.2.1", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/minkphp/MinkGoutteDriver.git", - "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca" + "reference": "8139f520f417c81bf9d2f9a171fff400f6adc9ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/8b9ad6d2d95bc70b840d15323365f52fcdaea6ca", - "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca", + "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/8139f520f417c81bf9d2f9a171fff400f6adc9ea", + "reference": "8139f520f417c81bf9d2f9a171fff400f6adc9ea", "shasum": "" }, "require": { - "behat/mink": "~1.6@dev", "behat/mink-browserkit-driver": "~1.2@dev", "fabpot/goutte": "~1.0.4|~2.0|~3.1", - "php": ">=5.3.1" + "php": ">=5.4" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7|~3.0" + "mink/driver-testsuite": "dev-master" }, "type": "mink-driver", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -14592,14 +14603,14 @@ } ], "description": "Goutte driver for Mink framework", - "homepage": "http://mink.behat.org/", + "homepage": "https://mink.behat.org/", "keywords": [ "browser", "goutte", "headless", "testing" ], - "time": "2016-03-05T09:04:22+00:00" + "time": "2021-10-12T11:35:46+00:00" }, { "name": "behat/mink-selenium2-driver", @@ -16409,16 +16420,16 @@ }, { "name": "graham-campbell/result-type", - "version": "v1.0.2", + "version": "v1.0.3", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Result-Type.git", - "reference": "84afea85c6841deeea872f36249a206e878a5de0" + "reference": "296c015dc30ec4322168c5ad3ee5cc11dae827ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/84afea85c6841deeea872f36249a206e878a5de0", - "reference": "84afea85c6841deeea872f36249a206e878a5de0", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/296c015dc30ec4322168c5ad3ee5cc11dae827ac", + "reference": "296c015dc30ec4322168c5ad3ee5cc11dae827ac", "shasum": "" }, "require": { @@ -16462,20 +16473,20 @@ "type": "tidelift" } ], - "time": "2021-08-28T21:34:50+00:00" + "time": "2021-10-17T19:48:54+00:00" }, { "name": "instaclick/php-webdriver", - "version": "1.4.9", + "version": "1.4.10", "source": { "type": "git", "url": "https://github.com/instaclick/php-webdriver.git", - "reference": "961b12178cb71f8667afaf2f66ab3e000e060e1c" + "reference": "6bc1f44cf23031e68c326cd61e14ec32486f241b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/961b12178cb71f8667afaf2f66ab3e000e060e1c", - "reference": "961b12178cb71f8667afaf2f66ab3e000e060e1c", + "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/6bc1f44cf23031e68c326cd61e14ec32486f241b", + "reference": "6bc1f44cf23031e68c326cd61e14ec32486f241b", "shasum": "" }, "require": { @@ -16521,7 +16532,7 @@ "webdriver", "webtest" ], - "time": "2021-06-28T22:23:20+00:00" + "time": "2021-10-14T03:25:34+00:00" }, { "name": "jakeasmith/http_build_url", @@ -17348,16 +17359,16 @@ }, { "name": "pdepend/pdepend", - "version": "2.10.0", + "version": "2.10.1", "source": { "type": "git", "url": "https://github.com/pdepend/pdepend.git", - "reference": "1fd30f4352b630ad53fec3fd5e8b8ba760f85596" + "reference": "30452fdabb3dfca89f4bf977abc44adc5391e062" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1fd30f4352b630ad53fec3fd5e8b8ba760f85596", - "reference": "1fd30f4352b630ad53fec3fd5e8b8ba760f85596", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/30452fdabb3dfca89f4bf977abc44adc5391e062", + "reference": "30452fdabb3dfca89f4bf977abc44adc5391e062", "shasum": "" }, "require": { @@ -17397,7 +17408,7 @@ "type": "tidelift" } ], - "time": "2021-07-20T09:56:09+00:00" + "time": "2021-10-11T12:15:18+00:00" }, { "name": "pear/http_request2", @@ -19537,6 +19548,7 @@ "type": "github" } ], + "abandoned": true, "time": "2020-11-30T07:30:19+00:00" }, { @@ -19792,16 +19804,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.6.0", + "version": "3.6.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625" + "reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ffced0d2c8fa8e6cdc4d695a743271fab6c38625", - "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/f268ca40d54617c6e06757f83f699775c9b3ff2e", + "reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e", "shasum": "" }, "require": { @@ -19839,7 +19851,7 @@ "phpcs", "standards" ], - "time": "2021-04-09T00:54:41+00:00" + "time": "2021-10-11T04:00:11+00:00" }, { "name": "symfony/browser-kit", diff --git a/config/sync/block.block.exposed_search.yml b/config/sync/block.block.globalsearch.yml similarity index 50% rename from config/sync/block.block.exposed_search.yml rename to config/sync/block.block.globalsearch.yml index d4cbffdecb..01cc6ef123 100644 --- a/config/sync/block.block.exposed_search.yml +++ b/config/sync/block.block.globalsearch.yml @@ -1,26 +1,24 @@ -uuid: 07af8993-33e3-4053-bbf7-324d21a6f1a2 +uuid: 1ef39009-13ab-424a-a4cf-50cca466b674 langcode: en status: true dependencies: - config: - - views.view.search module: + - joinup_search - system - - views theme: - ventuno -id: exposed_search +id: globalsearch theme: ventuno region: featured -weight: -25 +weight: -26 provider: null -plugin: 'views_exposed_filter_block:search-page_1' +plugin: joinup_search_global_search settings: - id: 'views_exposed_filter_block:search-page_1' - label: '' - provider: views + id: joinup_search_global_search + label: 'Global search' + provider: joinup_search label_display: '0' - views_label: '' + template_suggestion: homepage visibility: request_path: id: request_path diff --git a/config/sync/block.block.views_block__discover_topics_block.yml b/config/sync/block.block.views_block__discover_topics_block.yml index 3b6f496528..a9b849027a 100644 --- a/config/sync/block.block.views_block__discover_topics_block.yml +++ b/config/sync/block.block.views_block__discover_topics_block.yml @@ -12,7 +12,7 @@ dependencies: id: views_block__discover_topics_block theme: ventuno region: featured -weight: -24 +weight: -25 provider: null plugin: 'views_block:discover_topics-block' settings: diff --git a/config/sync/views.view.search.yml b/config/sync/views.view.search.yml index a38941f284..fdb879274d 100644 --- a/config/sync/views.view.search.yml +++ b/config/sync/views.view.search.yml @@ -182,19 +182,17 @@ display: description: '' use_operator: false operator: search_api_fulltext_op - operator_limit_selection: false - operator_list: { } identifier: keys required: false remember: false multiple: false remember_roles: authenticated: authenticated - licence_manager: '0' anonymous: '0' moderator: '0' administrator: '0' - rdf_graph_manager: '0' + operator_limit_selection: false + operator_list: { } is_grouped: false group_info: label: '' diff --git a/web/modules/custom/joinup_core/joinup_core.install b/web/modules/custom/joinup_core/joinup_core.install index 4f923d06da..d3df5382e4 100644 --- a/web/modules/custom/joinup_core/joinup_core.install +++ b/web/modules/custom/joinup_core/joinup_core.install @@ -91,3 +91,24 @@ function joinup_core_requirements($phase): array { return $requirements; } + +/** + * Fix 'password_policy.password_policy.generic_policy' config. + */ +function joinup_core_update_0107500(): void { + $db = \Drupal::database(); + $config = unserialize( + $db->select('config') + ->fields('config', ['data']) + ->condition('collection', '') + ->condition('name', 'password_policy.password_policy.generic_policy') + ->execute() + ->fetchField() + ); + $config['uuid'] = 'ce356128-8068-480c-b400-68e73bdb0d33'; + $db->update('config') + ->fields(['data' => serialize($config)]) + ->condition('collection', '') + ->condition('name', 'password_policy.password_policy.generic_policy') + ->execute(); +} diff --git a/web/themes/ventuno/templates/block/block--exposed-search.html.twig b/web/themes/ventuno/templates/block/block--exposed-search.html.twig deleted file mode 100644 index 0ea72d7ba0..0000000000 --- a/web/themes/ventuno/templates/block/block--exposed-search.html.twig +++ /dev/null @@ -1,21 +0,0 @@ -{# -/** - * @file - * Default theme implementation for the global search bar. - * - * Available variables: - * - filters: the search filters, to be displayed as chips. - * - * @ingroup themeable - */ -#} -{% - set search_url = path('view.search.page_1') -%} -

{{ 'Find the interoperability
resources you need'|trans }}

-{% block content %} -
- {{ content }} -
-{% endblock %} -

{% trans %}Need more search options? Use our advanced search{% endtrans %}

diff --git a/web/themes/ventuno/templates/form/form-element--views-exposed-form-search.html.twig b/web/themes/ventuno/templates/form/form-element--views-exposed-form-search.html.twig deleted file mode 100644 index ae745a547c..0000000000 --- a/web/themes/ventuno/templates/form/form-element--views-exposed-form-search.html.twig +++ /dev/null @@ -1,102 +0,0 @@ -{# -/** - * @file - * Default theme implementation for a form element views exposed form search block. - * - * Available variables: - * - attributes: HTML attributes for the containing element. - * - errors: (optional) Any errors for this form element, may not be set. - * - prefix: (optional) The form element prefix, may not be set. - * - suffix: (optional) The form element suffix, may not be set. - * - required: The required marker, or empty if the associated form element is - * not required. - * - type: The type of the element. - * - name: The name of the element. - * - label: A rendered label element. - * - label_display: Label display setting. It can have these values: - * - before: The label is output before the element. This is the default. - * The label includes the #title and the required marker, if #required. - * - after: The label is output after the element. For example, this is used - * for radio and checkbox #type elements. If the #title is empty but the - * field is #required, the label will contain only the required marker. - * - invisible: Labels are critical for screen readers to enable them to - * properly navigate through forms but can be visually distracting. This - * property hides the label for everyone except screen readers. - * - attribute: Set the title attribute on the element to create a tooltip but - * output no label element. This is supported only for checkboxes and radios - * in \Drupal\Core\Render\Element\CompositeFormElementTrait::preRenderCompositeFormElement(). - * It is used where a visual label is not needed, such as a table of - * checkboxes where the row and column provide the context. The tooltip will - * include the title and required marker. - * - description: (optional) A list of description properties containing: - * - content: A description of the form element, may not be set. - * - attributes: (optional) A list of HTML attributes to apply to the - * description content wrapper. Will only be set when description is set. - * - description_display: Description display setting. It can have these values: - * - before: The description is output before the element. - * - after: The description is output after the element. This is the default - * value. - * - invisible: The description is output after the element, hidden visually - * but available to screen readers. - * - disabled: True if the element is disabled. - * - title_display: Title display setting. - * - * @see template_preprocess_form_element() - * - * @ingroup themeable - */ -#} -{% - set classes = [ - 'input-group', - 'js-form-item', - 'form-item', - 'js-form-type-' ~ type|clean_class, - 'form-item-' ~ name|clean_class, - 'js-form-item-' ~ name|clean_class, - title_display not in ['after', 'before'] ? 'form-no-label', - disabled == 'disabled' ? 'form-disabled', - errors ? 'form-item--error', - col_class ? col_class, - margin_class ? margin_class, -] -%} -{% - set description_classes = [ - 'description', - 'form-text', - 'text-muted', - description_display == 'invisible' ? 'visually-hidden', -] -%} - - {% if label_display in ['before', 'invisible'] %} - {{ label }} - {% endif %} - {% if prefix is not empty %} - {{ prefix }} - {% endif %} - {% if description_display == 'before' and description.content %} - - {{ description.content }} - - {% endif %} - {{ children }} - {% if suffix is not empty %} - {{ suffix }} - {% endif %} - {% if label_display == 'after' %} - {{ label }} - {% endif %} - {% if errors %} -
- {{ errors }} -
- {% endif %} - {% if description_display in ['after', 'invisible'] and description.content %} - - {{ description.content }} - - {% endif %} - - diff --git a/web/themes/ventuno/templates/form/input--search-expose-form.html.twig b/web/themes/ventuno/templates/form/input--search-expose-form.html.twig deleted file mode 100644 index 118558ef27..0000000000 --- a/web/themes/ventuno/templates/form/input--search-expose-form.html.twig +++ /dev/null @@ -1,24 +0,0 @@ -{# -/** - * @file - * Theme override for an 'input' #type form element. - * - * Available variables: - * - attributes: A list of HTML attributes for the input element. - * - children: Optional additional rendered elements. - * - * @see template_preprocess_input() - */ -#} -{% - set classes = [ - 'search-bar__input', - 'form-control', - 'px-4', - 'py-3', - 'shadow', - attributes.hasClass('error') ? 'is-invalid', -] -%} - -{{ children }} diff --git a/web/themes/ventuno/ventuno.theme b/web/themes/ventuno/ventuno.theme index 48668ac35f..2333750f8c 100644 --- a/web/themes/ventuno/ventuno.theme +++ b/web/themes/ventuno/ventuno.theme @@ -7,7 +7,6 @@ declare(strict_types = 1); -use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Menu\MenuLinkTreeElement; use Drupal\Core\Menu\MenuTreeParameters; use Drupal\Core\Url; @@ -257,32 +256,3 @@ function ventuno_smart_trim(string $string, int $length, bool $ellipsis = TRUE): $truncate = new TruncateHTML(); return $truncate->truncateChars($string, $length, $ellipsis ? '…' : ''); } - -/** - * Implements hook_theme_suggestions_HOOK_alter() for form-element.html.twig. - */ -function ventuno_theme_suggestions_form_element_alter(array &$suggestions, array $variables): void { - if (isset($variables['element']['#joinup_parent'])) { - $suggestions[] = 'form_element__' . $variables['element']['#joinup_parent']; - } -} - -/** - * Implements hook_form_alter(). - */ -function ventuno_form_alter(&$form, FormStateInterface $form_state, $form_id): void { - // Check if the form contains exposed filter form element. - if ($form_id == 'views_exposed_form') { - // Here you can define the check for specific view so that - // it doesn't apply to all views. - $view = $form_state->get('view'); - if ($view->id() === 'search') { - $form['keys']['#theme'] = 'input__search_expose_form'; - $form['keys']['#title_display'] = 'invisible'; - $form['keys']['#attributes']['id'] = 'search-bar__input'; - $form['keys']['#attributes']['placeholder'] = t('Start typing to search…'); - $form['keys']['#joinup_parent'] = $form_id . '_' . $view->id(); - $form['sort_by']['#type'] = 'hidden'; - } - } -}