Merge pull request #1191 from usagov/stage

Sprint 75 & 76 Release candidate to Prod
usagov · Jan 15, 2025 · f709df5 · f709df5
2 parents fd15ba7 + b06ac90
commit f709df5
Show file tree

Hide file tree

Showing 69 changed files with 2,667 additions and 791 deletions.
diff --git a/composer.json b/composer.json
@@ -36,21 +36,21 @@
         "drupal/allowed_formats": "^3.0@alpha",
         "drupal/autologout": "^2.0",
         "drupal/block_content_template": "^1.7",
-        "drupal/ckeditor5_embedded_content": "^1.0",
+        "drupal/ckeditor5_embedded_content": "^2.0",
         "drupal/config_ignore": "^3.0@beta",
         "drupal/config_split": "^2.0@RC",
-        "drupal/core-composer-scaffold": "^10.3.1",
-        "drupal/core-project-message": "^10.3.1",
-        "drupal/core-recommended": "^10.3.1",
+        "drupal/core-composer-scaffold": "^10.4.0",
+        "drupal/core-project-message": "^10.4.0",
+        "drupal/core-recommended": "^10.4.0",
         "drupal/devel": "^5.1",
         "drupal/disable_language": "^1.0@beta",
-        "drupal/double_field": "^4.2",
+        "drupal/double_field": "^5.0",
         "drupal/easy_breadcrumb": "^2.0",
         "drupal/editor_advanced_link": "^2.2",
         "drupal/editoria11y": "^2.1",
+        "drupal/embedded_content": "^2.0",
         "drupal/entity_reference_revisions": "^1.10",
         "drupal/field_group": "^4.0@alpha",
-        "drupal/file_delete": "^2.0",
         "drupal/focal_point": "^2.1",
         "drupal/language_switcher_extended": "^1.1",
         "drupal/link_attributes": "^2.1",
@@ -81,7 +81,7 @@
         "drush/drush": "^12.4"
     },
     "require-dev": {
-        "drupal/core-dev": "^10.3.1"
+        "drupal/core-dev": "^10.4.0"
     },
     "conflict": {
         "drupal/drupal": "*"
@@ -105,7 +105,10 @@
         "enable-patching": true,
         "patches": {
             "drupal/double_field": {
-                "Support input filters on text formats (original issue: https://www.drupal.org/node/2091587)": "patches/double_field/2091587-text_long-60_2.patch"
+                "Support input filters on text formats (original issue: https://www.drupal.org/node/2091587)": "patches/double_field/2091587-text_long-60_3.patch"
+            },
+            "drupal/embedded_content": {
+                "appendXML() does not allow &nbsp; or double commas in comments (original issue: https://www.drupal.org/node/3496686)": "patches/embedded_content/3496686-appendxml-does-not.patch"
             }
         },
         "drupal-scaffold": {

diff --git a/composer.lock b/composer.lock
diff --git a/config/local/config_split.patch.user.role.site_builder.yml b/config/local/config_split.patch.user.role.site_builder.yml
diff --git a/config/non_production/config_split.patch.core.extension.yml b/config/non_production/config_split.patch.core.extension.yml
@@ -5,6 +5,7 @@ adding:
     field_ui: 0
     s3fs: 0
     samlauth: 0
+    stage_file_proxy: 0
     usagov_login: 0
     views_ui: 0
     externalauth: 10

diff --git a/config/non_production/stage_file_proxy.settings.yml b/config/non_production/stage_file_proxy.settings.yml
@@ -0,0 +1,9 @@
+_core:
+  default_config_hash: LqXuXXQCTd1NWw7dGLef0PCi3_aEEWQuogAblo4hHaE
+hotlink: false
+origin: 'https://vote.gov'
+origin_dir: s3/files
+proxy_headers: ''
+use_imagecache_root: true
+verify: true
+excluded_extensions: ''
diff --git a/config/sync/block_content.type.nvrf_display_content.yml b/config/sync/block_content.type.nvrf_display_content.yml
@@ -0,0 +1,8 @@
+uuid: ffd2a539-e65d-4dca-aa4e-1a97e3afd274
+langcode: en
+status: true
+dependencies: {  }
+id: nvrf_display_content
+label: 'NVRF display content'
+revision: false
+description: null
diff --git a/config/sync/core.entity_form_display.block_content.nvrf_display_content.default.yml b/config/sync/core.entity_form_display.block_content.nvrf_display_content.default.yml
@@ -0,0 +1,93 @@
+uuid: e4fdb2a2-9e80-4f80-903a-664fb311078e
+langcode: en
+status: true
+dependencies:
+  config:
+    - block_content.type.nvrf_display_content
+    - field.field.block_content.nvrf_display_content.field_confirm_group
+    - field.field.block_content.nvrf_display_content.field_download_button_label
+    - field.field.block_content.nvrf_display_content.field_edit_button_label
+    - field.field.block_content.nvrf_display_content.field_mail_deadline_label
+    - field.field.block_content.nvrf_display_content.field_not_required_label
+    - field.field.block_content.nvrf_display_content.field_nvrf_step
+    - field.field.block_content.nvrf_display_content.field_print_button_label
+  module:
+    - vote_fields
+id: block_content.nvrf_display_content.default
+targetEntityType: block_content
+bundle: nvrf_display_content
+mode: default
+content:
+  field_confirm_group:
+    type: confirm_group
+    weight: 4
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_download_button_label:
+    type: string_textfield
+    weight: 8
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  field_edit_button_label:
+    type: string_textfield
+    weight: 5
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  field_mail_deadline_label:
+    type: string_textfield
+    weight: 9
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  field_not_required_label:
+    type: string_textfield
+    weight: 6
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  field_nvrf_step:
+    type: nvrf_step
+    weight: 3
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_print_button_label:
+    type: string_textfield
+    weight: 7
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  info:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  langcode:
+    type: language_select
+    weight: 1
+    region: content
+    settings:
+      include_locked: true
+    third_party_settings: {  }
+  translation:
+    weight: 2
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+hidden: {  }
diff --git a/config/sync/core.entity_form_display.taxonomy_term.nvrf_field.default.yml b/config/sync/core.entity_form_display.taxonomy_term.nvrf_field.default.yml
@@ -49,8 +49,9 @@ third_party_settings:
         classes: ''
         show_empty_fields: false
         id: ''
+        label_as_html: false
         formatter: closed
-        description: ''
+        description: 'The following fields are used when displaying a field.'
         required_fields: true
     group_section_data:
       children:
@@ -65,8 +66,9 @@ third_party_settings:
         classes: ''
         show_empty_fields: false
         id: ''
+        label_as_html: false
         formatter: closed
-        description: ''
+        description: 'The following fields are used when displaying a section.'
         required_fields: true
 id: taxonomy_term.nvrf_field.default
 targetEntityType: taxonomy_term

diff --git a/config/sync/core.entity_view_display.block_content.nvrf_display_content.default.yml b/config/sync/core.entity_view_display.block_content.nvrf_display_content.default.yml
@@ -0,0 +1,78 @@
+uuid: a5c42abd-b298-4e65-b67b-f737f9fd03b9
+langcode: en
+status: true
+dependencies:
+  config:
+    - block_content.type.nvrf_display_content
+    - field.field.block_content.nvrf_display_content.field_confirm_group
+    - field.field.block_content.nvrf_display_content.field_download_button_label
+    - field.field.block_content.nvrf_display_content.field_edit_button_label
+    - field.field.block_content.nvrf_display_content.field_mail_deadline_label
+    - field.field.block_content.nvrf_display_content.field_not_required_label
+    - field.field.block_content.nvrf_display_content.field_nvrf_step
+    - field.field.block_content.nvrf_display_content.field_print_button_label
+  module:
+    - vote_fields
+id: block_content.nvrf_display_content.default
+targetEntityType: block_content
+bundle: nvrf_display_content
+mode: default
+content:
+  field_confirm_group:
+    type: confirm_group_default
+    label: above
+    settings:
+      foo: bar
+    third_party_settings: {  }
+    weight: 6
+    region: content
+  field_download_button_label:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  field_edit_button_label:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 0
+    region: content
+  field_mail_deadline_label:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 4
+    region: content
+  field_not_required_label:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  field_nvrf_step:
+    type: nvrf_step_default
+    label: above
+    settings:
+      foo: bar
+    third_party_settings: {  }
+    weight: 7
+    region: content
+  field_print_button_label:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 1
+    region: content
+hidden:
+  langcode: true
diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
@@ -9,7 +9,6 @@ module:
   block_content_template: 0
   breakpoint: 0
   ckeditor5: 0
-  ckeditor5_embedded_content: 0
   config: 0
   config_ignore: 0
   config_split: 0
@@ -27,11 +26,11 @@ module:
   editor: 0
   editoria11y: 0
   editor_advanced_link: 0
+  embedded_content: 0
   entity_reference_revisions: 0
   field: 0
   field_group: 0
   file: 0
-  file_delete: 0
   filter: 0
   focal_point: 0
   image: 0

diff --git a/config/sync/editor.editor.basic_html.yml b/config/sync/editor.editor.basic_html.yml
@@ -25,7 +25,7 @@ settings:
       - horizontalLine
       - link
       - drupalMedia
-      - embeddedContent
+      - embeddedContent__default
       - '|'
       - sourceEditing
   plugins:

diff --git a/config/sync/embedded_content.button.default.yml b/config/sync/embedded_content.button.default.yml
@@ -0,0 +1,16 @@
+uuid: a4a6394b-894f-41eb-b772-d95f30a0f9f7
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: 85TaSgJg6GmdfwCgIrSjQybqf3le4qpjywtDBKRbV_M
+id: default
+label: Default
+settings:
+  label_singular: 'embedded content'
+  icon: |
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.1.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M500.3 7.251C507.7 13.33 512 22.41 512 31.1V175.1C512 202.5 483.3 223.1 447.1 223.1C412.7 223.1 383.1 202.5 383.1 175.1C383.1 149.5 412.7 127.1 447.1 127.1V71.03L351.1 90.23V207.1C351.1 234.5 323.3 255.1 287.1 255.1C252.7 255.1 223.1 234.5 223.1 207.1C223.1 181.5 252.7 159.1 287.1 159.1V63.1C287.1 48.74 298.8 35.61 313.7 32.62L473.7 .6198C483.1-1.261 492.9 1.173 500.3 7.251H500.3zM74.66 303.1L86.5 286.2C92.43 277.3 102.4 271.1 113.1 271.1H174.9C185.6 271.1 195.6 277.3 201.5 286.2L213.3 303.1H239.1C266.5 303.1 287.1 325.5 287.1 351.1V463.1C287.1 490.5 266.5 511.1 239.1 511.1H47.1C21.49 511.1-.0019 490.5-.0019 463.1V351.1C-.0019 325.5 21.49 303.1 47.1 303.1H74.66zM143.1 359.1C117.5 359.1 95.1 381.5 95.1 407.1C95.1 434.5 117.5 455.1 143.1 455.1C170.5 455.1 191.1 434.5 191.1 407.1C191.1 381.5 170.5 359.1 143.1 359.1zM440.3 367.1H496C502.7 367.1 508.6 372.1 510.1 378.4C513.3 384.6 511.6 391.7 506.5 396L378.5 508C372.9 512.1 364.6 513.3 358.6 508.9C352.6 504.6 350.3 496.6 353.3 489.7L391.7 399.1H336C329.3 399.1 323.4 395.9 321 389.6C318.7 383.4 320.4 376.3 325.5 371.1L453.5 259.1C459.1 255 467.4 254.7 473.4 259.1C479.4 263.4 481.6 271.4 478.7 278.3L440.3 367.1zM116.7 219.1L19.85 119.2C-8.112 90.26-6.614 42.31 24.85 15.34C51.82-8.137 93.26-3.642 118.2 21.83L128.2 32.32L137.7 21.83C162.7-3.642 203.6-8.137 231.6 15.34C262.6 42.31 264.1 90.26 236.1 119.2L139.7 219.1C133.2 225.6 122.7 225.6 116.7 219.1H116.7z"/></svg>
+  condition: ''
+  dialog_settings:
+    width: 800px
+    height: auto
diff --git a/config/sync/field.field.block_content.nvrf_display_content.field_confirm_group.yml b/config/sync/field.field.block_content.nvrf_display_content.field_confirm_group.yml
@@ -0,0 +1,21 @@
+uuid: 6fbb0480-cbd1-42b3-abc6-1bf999366513
+langcode: en
+status: true
+dependencies:
+  config:
+    - block_content.type.nvrf_display_content
+    - field.storage.block_content.field_confirm_group
+  module:
+    - vote_fields
+id: block_content.nvrf_display_content.field_confirm_group
+field_name: field_confirm_group
+entity_type: block_content
+bundle: nvrf_display_content
+label: 'Confirm Group'
+description: ''
+required: true
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: confirm_group
diff --git a/config/sync/field.field.block_content.nvrf_display_content.field_download_button_label.yml b/config/sync/field.field.block_content.nvrf_display_content.field_download_button_label.yml
@@ -0,0 +1,19 @@
+uuid: 7f1a8046-37dc-455d-9ddd-3bc96e64ebd8
+langcode: en
+status: true
+dependencies:
+  config:
+    - block_content.type.nvrf_display_content
+    - field.storage.block_content.field_download_button_label
+id: block_content.nvrf_display_content.field_download_button_label
+field_name: field_download_button_label
+entity_type: block_content
+bundle: nvrf_display_content
+label: 'Download button label'
+description: ''
+required: true
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string