Merge pull request #1002 from usagov/stage

Sprint 68 release to PROD
usagov · Sep 25, 2024 · 582f177 · 582f177
2 parents 6534c42 + 107ad5e
commit 582f177
Show file tree

Hide file tree

Showing 67 changed files with 3,378 additions and 8,656 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -45,7 +45,7 @@ jobs:
             - project/web/themes/custom/votegov/dist
   cypress:
     docker:
-      - image: cypress-13.13.0-node-20.15.1-chrome-126.0.6478.114-1-ff-128.0-edge-126.0.2592.61-1
+      - image: cypress/included:cypress-13.14.2-node-20.17.0-chrome-128.0.6613.119-1-ff-130.0-edge-128.0.2739.63-1
     environment:
       cypress_pipeline: 1
       cypress_cloudgov_application_name: "${project}-drupal-${CIRCLE_BRANCH}"
@@ -246,7 +246,7 @@ jobs:
             snyk test --org=${SNYK_ORG} --severity-threshold=$THRESHOLD
   link-validation:
     docker:
-      - image: cypress-13.13.0-node-20.15.1-chrome-126.0.6478.114-1-ff-128.0-edge-126.0.2592.61-1
+      - image: cypress/included:cypress-13.14.2-node-20.17.0-chrome-128.0.6613.119-1-ff-130.0-edge-128.0.2739.63-1
     environment:
       cypress_pipeline: 1
       cypress_cloudgov_application_name: "${project}-drupal-${CIRCLE_BRANCH}"

diff --git a/composer.lock b/composer.lock
diff --git a/config/production/config_split.patch.core.extension.yml b/config/production/config_split.patch.core.extension.yml
@@ -6,5 +6,6 @@ adding:
     s3fs: 0
     samlauth: 0
     usagov_login: 0
+    vote_users: 0
     externalauth: 10
 removing: {  }
diff --git a/config/sync/config_split.config_split.local.yml b/config/sync/config_split.config_split.local.yml
@@ -19,6 +19,7 @@ theme: {  }
 complete_list:
   - dblog.settings
   - field_ui.settings
+  - stage_file_proxy.settings
   - views.view.watchdog
 partial_list:
   - autologout.settings

diff --git a/config/sync/core.entity_form_display.block_content.registration_form_selector.default.yml b/config/sync/core.entity_form_display.block_content.registration_form_selector.default.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.block_content.registration_form_selector.field_description
     - field.field.block_content.registration_form_selector.field_digital_form_link_label
     - field.field.block_content.registration_form_selector.field_digital_form_paragraph
+    - field.field.block_content.registration_form_selector.field_enable_digital_form_link
     - field.field.block_content.registration_form_selector.field_heading
     - field.field.block_content.registration_form_selector.field_registration_form_link
     - field.field.block_content.registration_form_selector.field_submit_button_label
@@ -21,6 +22,7 @@ third_party_settings:
       children:
         - field_digital_form_paragraph
         - field_digital_form_link_label
+        - field_enable_digital_form_link
       label: 'Digital form'
       region: content
       parent_name: ''
@@ -90,6 +92,13 @@ content:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
+  field_enable_digital_form_link:
+    type: boolean_checkbox
+    weight: 11
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
   field_heading:
     type: string_textfield
     weight: 1

diff --git a/config/sync/core.entity_view_display.block_content.registration_form_selector.default.yml b/config/sync/core.entity_view_display.block_content.registration_form_selector.default.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.block_content.registration_form_selector.field_description
     - field.field.block_content.registration_form_selector.field_digital_form_link_label
     - field.field.block_content.registration_form_selector.field_digital_form_paragraph
+    - field.field.block_content.registration_form_selector.field_enable_digital_form_link
     - field.field.block_content.registration_form_selector.field_heading
     - field.field.block_content.registration_form_selector.field_registration_form_link
     - field.field.block_content.registration_form_selector.field_submit_button_label
@@ -50,6 +51,16 @@ content:
     third_party_settings: {  }
     weight: 8
     region: content
+  field_enable_digital_form_link:
+    type: boolean
+    label: hidden
+    settings:
+      format: boolean
+      format_custom_false: ''
+      format_custom_true: ''
+    third_party_settings: {  }
+    weight: 10
+    region: content
   field_heading:
     type: string
     label: hidden

diff --git a/...nc/field.field.block_content.registration_form_selector.field_digital_form_link_label.yml b/...nc/field.field.block_content.registration_form_selector.field_digital_form_link_label.yml
@@ -10,7 +10,7 @@ field_name: field_digital_form_link_label
 entity_type: block_content
 bundle: registration_form_selector
 label: 'Digital form link label'
-description: 'Entering a value in this field triggers the digital form page to be generated on the public site.'
+description: ''
 required: false
 translatable: true
 default_value: {  }

diff --git a/...c/field.field.block_content.registration_form_selector.field_enable_digital_form_link.yml b/...c/field.field.block_content.registration_form_selector.field_enable_digital_form_link.yml
@@ -0,0 +1,21 @@
+uuid: de568db6-d383-421a-801a-886cc5ba331a
+langcode: es
+status: true
+dependencies:
+  config:
+    - block_content.type.registration_form_selector
+    - field.storage.block_content.field_enable_digital_form_link
+id: block_content.registration_form_selector.field_enable_digital_form_link
+field_name: field_enable_digital_form_link
+entity_type: block_content
+bundle: registration_form_selector
+label: 'Enable digital form link'
+description: 'Selecting this option launches the digital form to the public.'
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings:
+  on_label: 'On'
+  off_label: 'Off'
+field_type: boolean
diff --git a/config/sync/field.storage.block_content.field_enable_digital_form_link.yml b/config/sync/field.storage.block_content.field_enable_digital_form_link.yml
@@ -0,0 +1,18 @@
+uuid: 4ffc187c-ed58-45f2-bb27-f679508d87b7
+langcode: es
+status: true
+dependencies:
+  module:
+    - block_content
+id: block_content.field_enable_digital_form_link
+field_name: field_enable_digital_form_link
+entity_type: block_content
+type: boolean
+settings: {  }
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/sync/language/es/block.block.claro_primary_local_tasks.yml b/config/sync/language/es/block.block.claro_primary_local_tasks.yml
diff --git a/config/sync/language/es/block.block.claro_secondary_local_tasks.yml b/config/sync/language/es/block.block.claro_secondary_local_tasks.yml
diff --git a/docs/README.md b/docs/README.md
@@ -3,12 +3,12 @@
 ## Environments and git branches
 List of development environments and their equivalent git branches.
 
-| **Public (static)** | **CMS**            | **Cloud.gov environments** | **Git branch** | **Use case**                                             |
-|---------------------|--------------------|----------------------------|----------------|----------------------------------------------------------|
-| ssg-dev.vote.gov    | cms-dev.vote.gov   | vote-drupal-dev            | dev            | App work that is ready for testing in cloud.gov          |
-| ssg-test.vote.gov   | cms-test.vote.gov  | vote-drupal-test           | test           | Pipeline development work ready for testing in cloud.gov |
-| staging.vote.gov    | cms-stage.vote.gov | vote-drupal-stage          | stage          | All work that is ready for release/UAT testing           |
-| vote.gov            | cms.vote.gov       | vote-drupal-prod           | prod           | All work that is approved and released                   |
+| **Static**        | **CMS**            | **Cloud.gov environments** | **Git branch** | **Use case**                                             |
+|-------------------|--------------------|----------------------------|----------------|----------------------------------------------------------|
+| ssg-dev.vote.gov  | cms-dev.vote.gov   | vote-drupal-dev            | dev            | App work that is ready for testing in cloud.gov          |
+| ssg-test.vote.gov | cms-test.vote.gov  | vote-drupal-test           | test           | Pipeline development work ready for testing in cloud.gov |
+| staging.vote.gov  | cms-stage.vote.gov | vote-drupal-stage          | stage          | All work that is ready for release/UAT testing           |
+| vote.gov          | cms.vote.gov       | vote-drupal-prod           | prod           | All work that is approved and released                   |
 
 ## Table of Contents
 - [Git standards](standards.md)

diff --git a/docs/backend.md b/docs/backend.md
@@ -73,18 +73,12 @@ A CKEditor5 Embedded Content plugin that provides a means for embedding a Touchp
 #### USAgov login
 Adds the ability to disable the default Drupal login form and replace with a button to log in via SSO.
 
-#### Vote migrate
-Migration scripts to run to import translations from GitHub pages.cloud.gov site.
-
 #### Vote utility
 Provides custom token for use in pathauto settings. Adds the ability to limit the storage of block content revisions. Stores the source po files for importing string translations in the system.
 
 ## Module Patches
 Review the details in composer.json file under `extra.patches` additionally look at the `/patches/` directory at the root. These patches need to be re-evaluated when the original module gets updated to determine if the work has been included in the latest release or if the patch needs to be rerolled.
 
-## Migration
-Instructions for updating and running migration scripts.
-
 ## Database - Mysql
 The site utilizes Mysql for its database.
 

diff --git a/docs/frontend.md b/docs/frontend.md
@@ -5,8 +5,8 @@ This site is built using Drupal and Tome with a USWDS theme.
 These commands should be run inside web/themes/custom/votegov
 | **Command**      | **Use case**                                                                      |
 |------------------|-----------------------------------------------------------------------------------|
-| `npm run build`  | Aggregates, compiles and minifies frontend assets into the dist directory                                                            |
-| `npm run dev`    | Starts browsersync, watches for scss/js/twig file changes and compiles frontend assets into the dist directory                                                                   |
+| `npm run build`  | Aggregates, compiles and minifies frontend assets into the dist directory for deployment                                                            |
+| `npm run dev`    | Starts watching for changes to scss/js/twig files and compiles frontend assets into the dist directory                                                                   |
 
 ## Theme file structure
 ```
@@ -21,9 +21,11 @@ web/
             ├── dist
             ├── fonts
             ├── img
+            ├── json
             ├── php-includes
-            ├── js
-            ├── sass
+            └── src/
+                ├── js
+                └── sass
             └── templates
 ```
 
@@ -33,11 +35,13 @@ web/
 
 **img** - All favicons and logos that compile into dist
 
+**json** - Number translation mapping json for frontend utility replacement
+
 **php-includes** - Preprocess and theme functions organized by use type
 
-**js** - Javascript files that compile into dist
+**src/js** - Javascript files that compile into dist
 
-**sass** - SCSS files that compile into dist
+**src/sass** - SCSS files that compile into dist
 
 **templates** - Vote.gov theme templates and template overrides. Templates inside the /templates/partial directory are being included or extended by other templates.