Merge pull request #804 from usagov/dev

Sprint 62 release candidate to STAGE
usagov · Jul 1, 2024 · 607cf6f · 607cf6f
2 parents 2a9ef15 + 1f5ad55
commit 607cf6f
Show file tree

Hide file tree

Showing 47 changed files with 820 additions and 434 deletions.
diff --git a/config/local/config_split.patch.language.entity.am.yml b/config/local/config_split.patch.language.entity.am.yml
diff --git a/config/sync/field.field.media.image.field_media_image.yml b/config/sync/field.field.media.image.field_media_image.yml
@@ -33,7 +33,7 @@ settings:
   max_resolution: ''
   min_resolution: ''
   alt_field: true
-  alt_field_required: true
+  alt_field_required: false
   title_field: false
   title_field_required: false
   default_image:

diff --git a/config/sync/field.storage.paragraph.field_background_color.yml b/config/sync/field.storage.paragraph.field_background_color.yml
@@ -17,6 +17,9 @@ settings:
     -
       value: dark
       label: Dark
+    -
+      value: homepage
+      label: Homepage
   allowed_values_function: ''
 module: options
 locked: false

diff --git a/config/sync/language.entity.am.yml b/config/sync/language.entity.am.yml
@@ -2,7 +2,6 @@ uuid: e2b1707a-dfa8-41af-b86c-c2d0a2116449
 langcode: am
 status: true
 dependencies: {  }
-third_party_settings: {  }
 id: am
 label: Amharic
 direction: ltr

diff --git a/config/sync/language/pt/language.entity.pt.yml b/config/sync/language/pt/language.entity.pt.yml
@@ -0,0 +1 @@
+label: Português
diff --git a/config/sync/metatag.metatag_defaults.global.yml b/config/sync/metatag.metatag_defaults.global.yml
@@ -20,15 +20,15 @@ tags:
   icon_32x32: /themes/custom/votegov/img/favicon/favicon-32x32.ico
   icon_96x96: /themes/custom/votegov/img/favicon/favicon-96x96.ico
   og_description: '[current-page:metatag:description]'
-  og_image: /themes/custom/vote_gov/img/ballot-box-OG.png
+  og_image: /themes/custom/votegov/img/votegov-social.jpg
   og_site_name: '[site:name]'
   og_title: '[current-page:metatag:title]'
   og_type: website
   og_url: '[site:url]'
   shortcut_icon: /themes/custom/votegov/img/favicon/favicon.ico
   title: 'Register to vote | [site:name]'
   twitter_cards_description: '[current-page:metatag:description]'
-  twitter_cards_image: /themes/custom/vote_gov/img/ballot-box-OG.png
+  twitter_cards_image: /themes/custom/votegov/img/votegov-social.jpg
   twitter_cards_site: '@votegov'
   twitter_cards_title: '[current-page:metatag:title]'
   twitter_cards_type: summary_large_image
diff --git a/testing/package-lock.json b/testing/package-lock.json
diff --git a/testing/package.json b/testing/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "devDependencies": {
     "axe-core": "^4.9.1",
-    "cypress": "^13.11.0",
+    "cypress": "^13.12.0",
     "cypress-axe": "^1.5.0",
     "cypress-mochawesome-reporter": "^3.8.2"
   },
@@ -37,6 +37,6 @@
   },
   "homepage": "https://github.com/usagov/vote-gov-drupal#readme",
   "dependencies": {
-    "cypress-real-events": "^1.12.0"
+    "cypress-real-events": "^1.13.0"
   }
 }
diff --git a/web/modules/custom/vote_utility/inc/view_alter.inc b/web/modules/custom/vote_utility/inc/view_alter.inc
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Defines custom view alter hooks.
+ */
+
+use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\EntityInterface;
+
+/**
+ * Implements hook_taxonomy_term_view_alter().
+ */
+function vote_utility_taxonomy_term_view_alter(array &$build, EntityInterface $entity, EntityViewDisplayInterface $display) {
+  if ($entity->bundle() == 'basics_modules' && $display->getMode() == 'default') {
+    // Disable cache for basics_modules using default display mode.
+    $build['#cache']['max-age'] = 0;
+  }
+}
diff --git a/web/modules/custom/vote_utility/vote_utility.module b/web/modules/custom/vote_utility/vote_utility.module
@@ -8,3 +8,4 @@
 require_once dirname(__FILE__) . '/inc/block_content_revisions.inc';
 require_once dirname(__FILE__) . '/inc/token.inc';
 require_once dirname(__FILE__) . '/inc/form_alter.inc';
+require_once dirname(__FILE__) . '/inc/view_alter.inc';