From b1d6613bc41ed65a307d24eb4c59fd8f5895edfe Mon Sep 17 00:00:00 2001 From: CircleCI Date: Wed, 9 Nov 2022 20:37:50 +0000 Subject: [PATCH 01/12] 9.3.33 --- .../humsci_default_content/humsci_default_content.info.yml | 2 +- .../humsci_events_listeners/humsci_events_listeners.info.yml | 2 +- .../humsci/su_humsci_profile/su_humsci_profile.info.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml index ae53fe5b13..2c484e8773 100644 --- a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml +++ b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml @@ -3,7 +3,7 @@ description: 'DO NOT INSTALL. This is for profile installation task only.' core_version_requirement: '^8.8 || ^9' hidden: true type: module -version: 9.3.32 +version: 9.3.33 default_content: shortcut: - 0c69448d-c6fa-4fb8-9b2e-f93f3a955baf diff --git a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml index 5109ed0cc5..57b7f8f90b 100644 --- a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml +++ b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml @@ -14,4 +14,4 @@ dependencies: - 'hook_event_dispatcher:toolbar_event_dispatcher' - 'hook_event_dispatcher:user_event_dispatcher' - 'hook_event_dispatcher:views_event_dispatcher' -version: 9.3.32 +version: 9.3.33 diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml index da4a5b7ddf..329adac678 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml @@ -1,7 +1,7 @@ name: 'Stanford HumSci' type: profile description: 'Installation profile for HumSci Drupal' -version: 9.3.32 +version: 9.3.33 core_version_requirement: '^8.8 || ^9' themes: - material_admin From a8c5ab42740bfcff9a67d0391c9560213af0f89c Mon Sep 17 00:00:00 2001 From: pookmish Date: Thu, 10 Nov 2022 16:03:50 -0800 Subject: [PATCH 02/12] Added and configured page_cache_query_ignore module (#1222) --- composer.json | 1 + composer.lock | 52 ++++++++++++++++++- config/default/core.extension.yml | 1 + .../page_cache_query_ignore.settings.yml | 6 +++ .../src/Overrides/ConfigOverrides.php | 45 ++++++++++++++++ 5 files changed, 103 insertions(+), 2 deletions(-) create mode 100644 config/default/page_cache_query_ignore.settings.yml diff --git a/composer.json b/composer.json index 34f4c89006..fcf1d87df5 100644 --- a/composer.json +++ b/composer.json @@ -209,6 +209,7 @@ "drupal/migrate_source_csv": "^3.4", "drupal/mysql56": "^1.1", "drupal/node_revision_delete": "^1.0@RC", + "drupal/page_cache_query_ignore": "^2.2", "drupal/paragraphs_edit": "^2.0@alpha", "drupal/path_redirect_import": "^2.0", "drupal/pathauto": "^1.8", diff --git a/composer.lock b/composer.lock index 4fd9443e85..011b19f039 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": "1bbd60bbd11288965bbe85c80888eb54", + "content-hash": "ba993e8ad16bf102d3a0ef8b471f26bc", "packages": [ { "name": "acquia/blt", @@ -9235,6 +9235,54 @@ "issues": "https://www.drupal.org/project/issues/oembed_providers" } }, + { + "name": "drupal/page_cache_query_ignore", + "version": "2.2.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/page_cache_query_ignore.git", + "reference": "2.2.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/page_cache_query_ignore-2.2.0.zip", + "reference": "2.2.0", + "shasum": "3d3c6534b4d35ad5bf1a74c475ecfc5fbc05ea0c" + }, + "require": { + "drupal/core": "^8.8 || ^9 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.2.0", + "datestamp": "1666315197", + "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": "nterbogt", + "homepage": "https://www.drupal.org/user/102218" + }, + { + "name": "validoll", + "homepage": "https://www.drupal.org/user/144206" + } + ], + "description": "Alter page cache middleware class to ignore query params.", + "homepage": "https://www.drupal.org/project/page_cache_query_ignore", + "support": { + "source": "https://git.drupalcode.org/project/page_cache_query_ignore" + } + }, { "name": "drupal/paragraphs", "version": "1.15.0", @@ -27593,5 +27641,5 @@ "php": ">=8.0" }, "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } diff --git a/config/default/core.extension.yml b/config/default/core.extension.yml index 49c7f3b1e5..048fe6f536 100644 --- a/config/default/core.extension.yml +++ b/config/default/core.extension.yml @@ -177,6 +177,7 @@ module: oembed_providers: 0 options: 0 page_cache: 0 + page_cache_query_ignore: 0 paragraphs_edit: 0 path: 0 path_alias: 0 diff --git a/config/default/page_cache_query_ignore.settings.yml b/config/default/page_cache_query_ignore.settings.yml new file mode 100644 index 0000000000..e1d8de45a0 --- /dev/null +++ b/config/default/page_cache_query_ignore.settings.yml @@ -0,0 +1,6 @@ +_core: + default_config_hash: UPWJFuty7hCczn4qUNvoIaa01y3kIPas_9tcDzItcoQ +query_parameters: + - search + - page +ignore_action: include diff --git a/docroot/profiles/humsci/su_humsci_profile/src/Overrides/ConfigOverrides.php b/docroot/profiles/humsci/su_humsci_profile/src/Overrides/ConfigOverrides.php index 2186aa4c44..410d9b1952 100644 --- a/docroot/profiles/humsci/su_humsci_profile/src/Overrides/ConfigOverrides.php +++ b/docroot/profiles/humsci/su_humsci_profile/src/Overrides/ConfigOverrides.php @@ -110,6 +110,7 @@ public function loadOverrides($names) { $this->setPublicationOverrides($names, $overrides); $this->setThemeSettingsOverrides($names, $overrides); $this->setSearchApiOverrides($names, $overrides); + $this->setPageCacheQueryIgnore($names, $overrides); if (in_array('google_analytics.settings', $names)) { if ($value = $this->configPages->getValue('hs_site_options', 'field_site_ga_account')) { @@ -369,6 +370,50 @@ protected function setSearchApiOverrides(array $names, array &$overrides) { } } + /** + * Set the config overrides for the page_cache_query_ignore settings. + * + * @param array $names + * Array of config names. + * @param array $overrides + * Keyed array of config overrides. + */ + protected function setPageCacheQueryIgnore(array $names, array &$overrides) { + if (!in_array('page_cache_query_ignore.settings', $names)) { + return; + } + $allowed_parameters = ['search', 'page', 'offset']; + $view_params = $this->getViewQueryParams(); + $overrides['page_cache_query_ignore.settings']['query_parameters'] = [ + ...$allowed_parameters, + ...$view_params, + ]; + } + + /** + * Get all the query parameters for exposed filters in all views. + * + * @return array + * Associative array of query keys. + */ + public function getViewQueryParams(): array { + $queries = []; + /** @var \Drupal\views\Entity\View[] $views */ + $views = $this->entityTypeManager->getStorage('view') + ->loadByProperties(['status' => TRUE]); + foreach ($views as $view) { + foreach ($view->get('display') as $display) { + $filters = $display['display_options']['filters'] ?? []; + foreach ($filters as $filter) { + $queries[] = $filter['expose']['identifier'] ?? NULL; + } + } + } + $queries = array_unique(array_filter($queries)); + asort($queries); + return array_values($queries); + } + /** * {@inheritdoc} */ From b5b072485a59aa98fadf01a25a8f865bc86f99ea Mon Sep 17 00:00:00 2001 From: Joe Gilliland-Lloyd <6943710+joegl@users.noreply.github.com> Date: Tue, 15 Nov 2022 13:55:51 -0600 Subject: [PATCH 03/12] Researchadmin2022 alias fixup (#1225) * Provisioned researchadmin2022_humsci. * Removed researchadmin2022_humsci. * Removed researchadmin2022_humsci drush aliases. Co-authored-by: joegl --- blt/blt.yml | 2 +- docroot/sites/researchadmin2022_humsci/blt.yml | 12 ------------ docroot/sites/researchadmin_humsci2022/blt.yml | 12 ++++++++++++ .../default.local.drush.yml | 0 .../default.services.yml | 0 .../default.settings.php | 0 .../services.yml | 0 .../settings.php | 0 .../settings/default.includes.settings.php | 0 .../settings/default.local.settings.php | 0 ...ci.site.yml => researchadmin_humsci2022.site.yml} | 8 ++++---- 11 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 docroot/sites/researchadmin2022_humsci/blt.yml create mode 100644 docroot/sites/researchadmin_humsci2022/blt.yml rename docroot/sites/{researchadmin2022_humsci => researchadmin_humsci2022}/default.local.drush.yml (100%) rename docroot/sites/{researchadmin2022_humsci => researchadmin_humsci2022}/default.services.yml (100%) rename docroot/sites/{researchadmin2022_humsci => researchadmin_humsci2022}/default.settings.php (100%) rename docroot/sites/{researchadmin2022_humsci => researchadmin_humsci2022}/services.yml (100%) rename docroot/sites/{researchadmin2022_humsci => researchadmin_humsci2022}/settings.php (100%) rename docroot/sites/{researchadmin2022_humsci => researchadmin_humsci2022}/settings/default.includes.settings.php (100%) rename docroot/sites/{researchadmin2022_humsci => researchadmin_humsci2022}/settings/default.local.settings.php (100%) rename drush/sites/{researchadmin2022_humsci.site.yml => researchadmin_humsci2022.site.yml} (69%) diff --git a/blt/blt.yml b/blt/blt.yml index 4969b9492c..afed94075c 100644 --- a/blt/blt.yml +++ b/blt/blt.yml @@ -164,8 +164,8 @@ multisites: - psychology - publicpolicy - religiousstudies - - researchadmin2022_humsci - researchadmin_humsci + - researchadmin_humsci2022 - scl - sgs - shenlab diff --git a/docroot/sites/researchadmin2022_humsci/blt.yml b/docroot/sites/researchadmin2022_humsci/blt.yml deleted file mode 100644 index 772f106a95..0000000000 --- a/docroot/sites/researchadmin2022_humsci/blt.yml +++ /dev/null @@ -1,12 +0,0 @@ -project: - machine_name: researchadmin2022_humsci - human_name: researchadmin2022_humsci - local: - protocol: http - hostname: local.researchadmin2022_humsci.com -drush: - aliases: - local: researchadmin2022_humsci.local - remote: researchadmin2022_humsci.prod -drupal: - db: { } diff --git a/docroot/sites/researchadmin_humsci2022/blt.yml b/docroot/sites/researchadmin_humsci2022/blt.yml new file mode 100644 index 0000000000..3d18e8cc21 --- /dev/null +++ b/docroot/sites/researchadmin_humsci2022/blt.yml @@ -0,0 +1,12 @@ +project: + machine_name: researchadmin_humsci2022 + human_name: researchadmin_humsci2022 + local: + protocol: http + hostname: local.researchadmin_humsci2022.com +drush: + aliases: + local: researchadmin_humsci2022.local + remote: researchadmin_humsci2022.prod +drupal: + db: { } diff --git a/docroot/sites/researchadmin2022_humsci/default.local.drush.yml b/docroot/sites/researchadmin_humsci2022/default.local.drush.yml similarity index 100% rename from docroot/sites/researchadmin2022_humsci/default.local.drush.yml rename to docroot/sites/researchadmin_humsci2022/default.local.drush.yml diff --git a/docroot/sites/researchadmin2022_humsci/default.services.yml b/docroot/sites/researchadmin_humsci2022/default.services.yml similarity index 100% rename from docroot/sites/researchadmin2022_humsci/default.services.yml rename to docroot/sites/researchadmin_humsci2022/default.services.yml diff --git a/docroot/sites/researchadmin2022_humsci/default.settings.php b/docroot/sites/researchadmin_humsci2022/default.settings.php similarity index 100% rename from docroot/sites/researchadmin2022_humsci/default.settings.php rename to docroot/sites/researchadmin_humsci2022/default.settings.php diff --git a/docroot/sites/researchadmin2022_humsci/services.yml b/docroot/sites/researchadmin_humsci2022/services.yml similarity index 100% rename from docroot/sites/researchadmin2022_humsci/services.yml rename to docroot/sites/researchadmin_humsci2022/services.yml diff --git a/docroot/sites/researchadmin2022_humsci/settings.php b/docroot/sites/researchadmin_humsci2022/settings.php similarity index 100% rename from docroot/sites/researchadmin2022_humsci/settings.php rename to docroot/sites/researchadmin_humsci2022/settings.php diff --git a/docroot/sites/researchadmin2022_humsci/settings/default.includes.settings.php b/docroot/sites/researchadmin_humsci2022/settings/default.includes.settings.php similarity index 100% rename from docroot/sites/researchadmin2022_humsci/settings/default.includes.settings.php rename to docroot/sites/researchadmin_humsci2022/settings/default.includes.settings.php diff --git a/docroot/sites/researchadmin2022_humsci/settings/default.local.settings.php b/docroot/sites/researchadmin_humsci2022/settings/default.local.settings.php similarity index 100% rename from docroot/sites/researchadmin2022_humsci/settings/default.local.settings.php rename to docroot/sites/researchadmin_humsci2022/settings/default.local.settings.php diff --git a/drush/sites/researchadmin2022_humsci.site.yml b/drush/sites/researchadmin_humsci2022.site.yml similarity index 69% rename from drush/sites/researchadmin2022_humsci.site.yml rename to drush/sites/researchadmin_humsci2022.site.yml index b0307c4fd6..69bc8f6715 100644 --- a/drush/sites/researchadmin2022_humsci.site.yml +++ b/drush/sites/researchadmin_humsci2022.site.yml @@ -1,18 +1,18 @@ local: - uri: researchadmin2022-humsci + uri: researchadmin-humsci2022 root: '${env.cwd}/docroot' dev: root: /var/www/html/humscigryphon.dev/docroot - uri: researchadmin2022-humsci-dev.stanford.edu + uri: researchadmin-humsci2022-dev.stanford.edu host: staging-25390.prod.hosting.acquia.com user: humscigryphon.dev stage: root: /var/www/html/humscigryphon.test/docroot - uri: researchadmin2022-humsci-stage.stanford.edu + uri: researchadmin-humsci2022-stage.stanford.edu host: staging-25390.prod.hosting.acquia.com user: humscigryphon.test prod: root: /var/www/html/humscigryphon.prod/docroot - uri: researchadmin2022-humsci-prod.stanford.edu + uri: researchadmin-humsci2022-prod.stanford.edu host: web-42199.prod.hosting.acquia.com user: humscigryphon.prod From 682c23e46fc7924615f8069e54cb6056c64cf96d Mon Sep 17 00:00:00 2001 From: CircleCI Date: Wed, 16 Nov 2022 14:08:40 +0000 Subject: [PATCH 04/12] Updated dependencies Nov 16 2022 --- composer.lock | 229 +++++++++++++++++++++++++++----------------------- 1 file changed, 122 insertions(+), 107 deletions(-) diff --git a/composer.lock b/composer.lock index 011b19f039..d42da7f93c 100644 --- a/composer.lock +++ b/composer.lock @@ -770,16 +770,16 @@ }, { "name": "consolidation/annotated-command", - "version": "4.6.0", + "version": "4.6.1", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "ee63c57f929e7131c714783193512ea4f76de74c" + "reference": "76835d35fcb0b879170129e82adfa1536b72921f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/ee63c57f929e7131c714783193512ea4f76de74c", - "reference": "ee63c57f929e7131c714783193512ea4f76de74c", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/76835d35fcb0b879170129e82adfa1536b72921f", + "reference": "76835d35fcb0b879170129e82adfa1536b72921f", "shasum": "" }, "require": { @@ -820,9 +820,9 @@ "description": "Initialize Symfony Console commands from annotated command class methods.", "support": { "issues": "https://github.com/consolidation/annotated-command/issues", - "source": "https://github.com/consolidation/annotated-command/tree/4.6.0" + "source": "https://github.com/consolidation/annotated-command/tree/4.6.1" }, - "time": "2022-10-30T22:08:00+00:00" + "time": "2022-11-09T18:31:17+00:00" }, { "name": "consolidation/comments", @@ -1946,7 +1946,7 @@ "source": { "type": "git", "url": "https://git.drupalcode.org/project/acquia_connector.git", - "reference": "bfcfc64bdb875b3d396c8d988c2147f79a93176d" + "reference": "e8c4878bb924f91591436ef3df22735446b9cf62" }, "require": { "drupal/core": ">=8.9 <11.0.0-stable", @@ -1958,8 +1958,8 @@ "dev-4.x": "4.x-dev" }, "drupal": { - "version": "4.0.0+3-dev", - "datestamp": "1667573324", + "version": "4.0.0+4-dev", + "datestamp": "1668024881", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -2847,17 +2847,17 @@ }, { "name": "drupal/block_class", - "version": "2.0.7", + "version": "2.0.8", "source": { "type": "git", "url": "https://git.drupalcode.org/project/block_class.git", - "reference": "2.0.7" + "reference": "2.0.8" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/block_class-2.0.7.zip", - "reference": "2.0.7", - "shasum": "6d9acaf0f9c5d935c8311e8303f5c7195a3264e1" + "url": "https://ftp.drupal.org/files/projects/block_class-2.0.8.zip", + "reference": "2.0.8", + "shasum": "ddadc2bf2a5b7863717469fbbbd0d7e1289795cd" }, "require": { "drupal/core": "^8 || ^9 || ^10" @@ -2865,8 +2865,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.7", - "datestamp": "1664450554", + "version": "2.0.8", + "datestamp": "1668284029", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4836,17 +4836,17 @@ }, { "name": "drupal/ctools", - "version": "4.0.1", + "version": "4.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/ctools.git", - "reference": "4.0.1" + "reference": "4.0.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/ctools-4.0.1.zip", - "reference": "4.0.1", - "shasum": "ac2373c13efd7d95da7230bd5a6627f16a6a5b6e" + "url": "https://ftp.drupal.org/files/projects/ctools-4.0.2.zip", + "reference": "4.0.2", + "shasum": "c90325ce9a42add5ebce67a5506bbafc34edc242" }, "require": { "drupal/core": "^9.3 || ^10" @@ -4854,15 +4854,15 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.0.1", - "datestamp": "1660252593", + "version": "4.0.2", + "datestamp": "1668486570", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" } }, "branch-alias": { - "dev-4.x": "4.x-dev" + "dev-8.x-3.x": "3.x-dev" } }, "notification-url": "https://packages.drupal.org/8/downloads", @@ -4896,9 +4896,8 @@ "role": "Maintainer" }, { - "name": "Joël (joelpittet)", - "homepage": "https://www.drupal.org/u/joelpittet", - "role": "Maintainer" + "name": "joelpittet", + "homepage": "https://www.drupal.org/user/160302" }, { "name": "merlinofchaos", @@ -4930,7 +4929,7 @@ }, { "name": "drupal/ctools_views", - "version": "4.0.1", + "version": "4.0.2", "require": { "drupal/core": "^9.3 || ^10", "drupal/ctools": "^4" @@ -4938,8 +4937,8 @@ "type": "metapackage", "extra": { "drupal": { - "version": "4.0.1", - "datestamp": "1660252593", + "version": "4.0.2", + "datestamp": "1668486570", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5220,26 +5219,26 @@ }, { "name": "drupal/domain_registration", - "version": "1.6.0", + "version": "1.7.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/domain_registration.git", - "reference": "8.x-1.6" + "reference": "8.x-1.7" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/domain_registration-8.x-1.6.zip", - "reference": "8.x-1.6", - "shasum": "72981d8a02f9a409cc45a4351298f4e6b48d45c1" + "url": "https://ftp.drupal.org/files/projects/domain_registration-8.x-1.7.zip", + "reference": "8.x-1.7", + "shasum": "15622ed65c024944d579c11ed0f1ec4b59a66373" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^9.1 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.6", - "datestamp": "1622023989", + "version": "8.x-1.7", + "datestamp": "1668444925", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7407,26 +7406,26 @@ }, { "name": "drupal/jquery_ui", - "version": "1.4.0", + "version": "1.6.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/jquery_ui.git", - "reference": "8.x-1.4" + "reference": "8.x-1.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/jquery_ui-8.x-1.4.zip", - "reference": "8.x-1.4", - "shasum": "64c19ecc8902e2b4b1ab0cc5f5fe28dbc83bfebe" + "url": "https://ftp.drupal.org/files/projects/jquery_ui-8.x-1.6.zip", + "reference": "8.x-1.6", + "shasum": "0ddccdcf35a066de1843e1d9670677ee1a2faac0" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^9.2 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.4", - "datestamp": "1582149957", + "version": "8.x-1.6", + "datestamp": "1668521197", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7438,10 +7437,6 @@ "GPL-2.0-or-later" ], "authors": [ - { - "name": "RobLoach", - "homepage": "https://www.drupal.org/user/61114" - }, { "name": "bnjmnm", "homepage": "https://www.drupal.org/user/2369194" @@ -7470,6 +7465,18 @@ "name": "mikelutz", "homepage": "https://www.drupal.org/user/2972409" }, + { + "name": "nod_", + "homepage": "https://www.drupal.org/user/598310" + }, + { + "name": "phenaproxima", + "homepage": "https://www.drupal.org/user/205645" + }, + { + "name": "RobLoach", + "homepage": "https://www.drupal.org/user/61114" + }, { "name": "sun", "homepage": "https://www.drupal.org/user/54136" @@ -7478,6 +7485,10 @@ "name": "webchick", "homepage": "https://www.drupal.org/user/24967" }, + { + "name": "Wim Leers", + "homepage": "https://www.drupal.org/user/99777" + }, { "name": "zrpnr", "homepage": "https://www.drupal.org/user/1448368" @@ -9109,17 +9120,17 @@ }, { "name": "drupal/node_revision_delete", - "version": "1.0.0-rc5", + "version": "1.0.0-rc6", "source": { "type": "git", "url": "https://git.drupalcode.org/project/node_revision_delete.git", - "reference": "8.x-1.0-rc5" + "reference": "8.x-1.0-rc6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/node_revision_delete-8.x-1.0-rc5.zip", - "reference": "8.x-1.0-rc5", - "shasum": "71c77c1c8ee48c9797995bf519ec495958413acf" + "url": "https://ftp.drupal.org/files/projects/node_revision_delete-8.x-1.0-rc6.zip", + "reference": "8.x-1.0-rc6", + "shasum": "68db55e328bc247a2a16501dd930538961314107" }, "require": { "drupal/core": "^8.7.7 || ^9.0 || ^10" @@ -9127,8 +9138,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.0-rc5", - "datestamp": "1659589844", + "version": "8.x-1.0-rc6", + "datestamp": "1668447494", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -9136,7 +9147,7 @@ }, "drush": { "services": { - "drush.services.yml": "^9" + "drush.services.yml": "^9.0 || ^10 || ^11" } } }, @@ -10856,26 +10867,26 @@ }, { "name": "drupal/stage_file_proxy", - "version": "1.2.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/stage_file_proxy.git", - "reference": "8.x-1.2" + "reference": "8.x-1.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/stage_file_proxy-8.x-1.2.zip", - "reference": "8.x-1.2", - "shasum": "a0bea520c139a4b0b67738b0c54e7ee21af081da" + "url": "https://ftp.drupal.org/files/projects/stage_file_proxy-8.x-1.4.zip", + "reference": "8.x-1.4", + "shasum": "7cc33b5b32ad0f5c949690f366d338da28f2b567" }, "require": { - "drupal/core": ">=8.7.7" + "drupal/core": "^9 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.2", - "datestamp": "1637007759", + "version": "8.x-1.4", + "datestamp": "1668531156", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -10923,6 +10934,10 @@ { "name": "robwilmshurst", "homepage": "https://www.drupal.org/user/144488" + }, + { + "name": "smustgrave", + "homepage": "https://www.drupal.org/user/3252890" } ], "description": "Provides stage_file_proxy module.", @@ -12064,16 +12079,16 @@ "role": "Maintainer" }, { - "name": "WeebPal", - "homepage": "https://www.drupal.org/user/1861072" + "name": "Dinh Bao Tran", + "homepage": "https://www.drupal.org/user/3635964" }, { - "name": "buivankim2020", - "homepage": "https://www.drupal.org/user/2959439" + "name": "Hai Nguyen", + "homepage": "https://www.drupal.org/user/1229130" }, { - "name": "dinhbao", - "homepage": "https://www.drupal.org/user/3635964" + "name": "WeebPal", + "homepage": "https://www.drupal.org/user/1861072" } ], "description": "This powerful Drupal module helps you create custom menu, video and Drupal Blocks.", @@ -14586,16 +14601,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.1", + "version": "v4.15.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900" + "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", - "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", + "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", "shasum": "" }, "require": { @@ -14636,9 +14651,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2" }, - "time": "2022-09-04T07:30:47+00:00" + "time": "2022-11-12T15:38:23+00:00" }, { "name": "onlyextart/colorbox", @@ -19588,16 +19603,16 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "433d05519ce6990bf3530fba6957499d327395c2" + "reference": "511a08c03c1960e08a883f4cffcacd219b758354" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2", - "reference": "433d05519ce6990bf3530fba6957499d327395c2", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", + "reference": "511a08c03c1960e08a883f4cffcacd219b758354", "shasum": "" }, "require": { @@ -19609,7 +19624,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -19649,7 +19664,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" }, "funding": [ { @@ -19665,7 +19680,7 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-idn", @@ -19923,16 +19938,16 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2" + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", "shasum": "" }, "require": { @@ -19941,7 +19956,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -19979,7 +19994,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0" }, "funding": [ { @@ -19995,20 +20010,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85" + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", "shasum": "" }, "require": { @@ -20017,7 +20032,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -20058,7 +20073,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" }, "funding": [ { @@ -20074,7 +20089,7 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php80", @@ -20161,16 +20176,16 @@ }, { "name": "symfony/polyfill-php81", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1" + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1", - "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", "shasum": "" }, "require": { @@ -20179,7 +20194,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -20220,7 +20235,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" }, "funding": [ { @@ -20236,7 +20251,7 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/process", @@ -27641,5 +27656,5 @@ "php": ">=8.0" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } From 60d9b215dec13f48f07f3962e6886fe0a6f3b46f Mon Sep 17 00:00:00 2001 From: Callin Mullaney Date: Wed, 16 Nov 2022 15:37:36 -0600 Subject: [PATCH 05/12] FourKitchens Release: Sprint 11 (part 2) (#1214) * SHS-91: Codeception: Test video embeds and captions (#1208) * feat (SHS-91): initial code for video embed testing * feat (SHS-91): continue with video embed test code * feat (SHS-91): finish video embed with caption test * chore (SHS-91): Switch group from test group to install * chore (SHS-91): add manual wait for text paragraph Co-authored-by: feynman * SHS-92: Codeception: Spotlight Slider (#1209) * feat (91): Add test for spotlight slider * Removed unnecessary duplicate file. * Specify name attribute as selector * Checking why circleci fails to save spotlight slider * feat (92): Reverting last commit. Fields were * Increase timeout for spotlight to appear. * feat (92): checking if the spotlight is still editable or is completely removed. * feat (92): Ensure correct save button is used. * feat (92): Add simple wait since text is already visible * Fix: Missing Bourbon Library stylesheet error when compiling (#1207) * fix: fix missing bourbon stylesheet from node_modules import * fix: lock update * fix: remove wrong lock file * Shs 119 megamenu color pairing (#1206) * shs-105: color pairing for submenu on new megamenu * feat: update tertiary-darken-20 values for colorfuls cliff/canyon/lake themes Co-authored-by: feynman * SHS-64: Codeception test: Megamenu (#1196) * feat (SHS-64): Add MegaMenu Codeception test and update Lando readme with Codeception testing setup * docs (SHS-64): Add note about M1 ARM-based Mac's * chore (SHS-64): Changing a file to re-run CI automations * Add note about editing additional local.drush.yml * chore (SHS-64): add menu items, and test mobile * refactor (SHS-64): test removal of config pages check * refactor (SHS-64): re-add check for mobile * refactor (SHS-64): add back check for config pages * refactor (SHS-64): check config pages mega menu checkbox in test * chore (SHS-64): minor changes sending back to ci to test * chore (SHS-64): add test in content area for node creation * chore (SHS-64): add scroll to save button * chore (SHS-64) additional changes for ci * chore (SHS-64): delete mobile testing and move into main file for easier debuging * chore (SHS-64): take screenshot on menu settings page to verify heirarchy * chore (SHS-64): wait for show row weights and save screen shot * chore (SHS-64): uncheck megamenu after test * chore (SHS-64): resize window back to desktop after test Co-authored-by: feynman * chore: pulled release and recompiled styles * chore: test faker service on title of spotightSlider * chore: best practices from SWS for tests * feat: Add source button to minimal HTML text format * chore: add in additional best practives from SWS for testing * chore: best practives from SWS for test syntax * chore: Additional best practives from SWS for testing - videoEmbeds * chore: Best practices from SWS for testing - MegaMenu * chore: add screenshot before error for debugging on CI * chore: debugging why megamenu is failing on CI (works locally) * chore: More debugging on CI for tests * chore: add in dynamic title for debuging menu structure * chore: test waiting before selecting as it was there before * chore: debug screenshot as well * chore: debug screenshot for spotlight slider creation * chore: remove screenshots for debugging * chore: fix hopefully last remaining wait for CI on megamenu dekstop testing * chore: Add wait to see if this helps * chore: screenshot to verify menu structure (works locally) * chore: change group name * chore: debug why second page isn't becoming a child of first (works locally...) * chore: change name of group * chore: remove screenshot and see if extra wait helps * chore: bavk to debugging spotlight slider with screenshots and wait * chore: remove screenshots * chore: More best practices from SWS for testing * Revert "Fix: Missing Bourbon Library stylesheet error when compiling (#1207)" This reverts commit 1b8d6fff6240649a194085d4744f906daadbabc8. * revert: shs-119 mega menu coloring * revert: compiled css to release state * chore: Add back in wait during child menu selection * chore: Add screenshot to see if spotlgiht is correct pre-save * chore: switch wait statements and remove screenshot * chore: move after function to top Co-authored-by: Marc Berger <107938318+marcb4k@users.noreply.github.com> Co-authored-by: Hector Lopez Co-authored-by: Ryan Hagerty Co-authored-by: Marc Berger --- config/default/editor.editor.minimal_html.yml | 5 +- config/default/filter.format.minimal_html.yml | 2 +- lando/README.md | 20 ++- .../Install/Content/FlexiblePageCest.php | 83 +++++++++++ .../Install/Content/VideoEmbedCest.php | 78 ++++++++++ tests/codeception/functional/MegaMenuCest.php | 137 ++++++++++++++++++ 6 files changed, 318 insertions(+), 7 deletions(-) create mode 100644 tests/codeception/functional/Install/Content/VideoEmbedCest.php create mode 100644 tests/codeception/functional/MegaMenuCest.php diff --git a/config/default/editor.editor.minimal_html.yml b/config/default/editor.editor.minimal_html.yml index b703368f10..5ed326fd04 100644 --- a/config/default/editor.editor.minimal_html.yml +++ b/config/default/editor.editor.minimal_html.yml @@ -22,6 +22,7 @@ settings: - Format - Styles - HorizontalRule + - Source - name: Links items: @@ -33,11 +34,11 @@ settings: - BulletedList - NumberedList plugins: + stylescombo: + styles: "a.hs-button|Primary Button\r\na.hs-button--big|Big Primary Button\r\na.hs-secondary-button|Secondary Button\r\na.hs-more-link|More Link\r\na.hs-external-link|External Link\r\na.hs-file-link|File Link\r\na.hs-pdf-link|PDF Link\r\na.hs-private-link|Private Link" drupallink: linkit_enabled: true linkit_profile: default - stylescombo: - styles: "a.hs-button|Primary Button\r\na.hs-button--big|Big Primary Button\r\na.hs-secondary-button|Secondary Button\r\na.hs-more-link|More Link\r\na.hs-external-link|External Link\r\na.hs-file-link|File Link\r\na.hs-pdf-link|PDF Link\r\na.hs-private-link|Private Link" blockimagepaste: block_image_paste_enabled: true image_upload: diff --git a/config/default/filter.format.minimal_html.yml b/config/default/filter.format.minimal_html.yml index fa1e76df39..7438ff0d9c 100644 --- a/config/default/filter.format.minimal_html.yml +++ b/config/default/filter.format.minimal_html.yml @@ -19,7 +19,7 @@ filters: status: true weight: -10 settings: - allowed_html: '