Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sprint 68 release to PROD #1002

Merged
merged 18 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
dd68e2d
VOTE-2836 remove unused lang specific block config (#976)
rayestrada Sep 13, 2024
0aca5ab
VOTE-2820/VOTE-2839: Update drupal core and dependencies. (#985)
daniel-crowder Sep 13, 2024
43d5d2e
Bump axe-core from 4.9.1 to 4.10.0 in /testing (#893)
dependabot[bot] Sep 13, 2024
e69b600
Bump braces and @uswds/compile in /web/themes/custom/votegov (#960)
dependabot[bot] Sep 13, 2024
d8594ed
VOTE-1987: Add custom module to block site_builders on production. (#…
daniel-crowder Sep 13, 2024
a32fc85
Vote-2825: Migrate frontend tests to use page objects (#986)
clmedders Sep 13, 2024
f7efe3d
Vote-2821: Cypress Image Update (#990)
clmedders Sep 17, 2024
dfc2fee
VOTE-2822 add checkbox to enable NVRF link (#977)
rayestrada Sep 18, 2024
556569c
VOTE-2844: Change CF CLI from apt repository to binary install (#981)
tt-gsa Sep 18, 2024
4fd3ea8
Vote-2827: Migrate axe test to utlitize page objects (#995)
clmedders Sep 20, 2024
19ab2ad
VOTE-2664: update hard coded strings for Haitian Creole (#994)
mlloydbixal Sep 20, 2024
e4bc879
VOTE-2817 update release documentation
rayestrada Sep 17, 2024
f26b679
VOTE-2689 update docs for launched CMS
rayestrada Sep 18, 2024
4163416
Vote-2823: Temp Voter Card French Translations (#998)
clmedders Sep 23, 2024
7adc0e2
VOTE-2569: Create custom route to generate NVRF page redirects (#993)
daniel-crowder Sep 23, 2024
b05998d
Vote-2840: State online string translation updates (#984)
clmedders Sep 23, 2024
60de065
Merge pull request #983 from usagov/stage
rayestrada Sep 23, 2024
107ad5e
Merge pull request #997 from usagov/dev
rayestrada Sep 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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}"
Expand Down
240 changes: 116 additions & 124 deletions composer.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions config/production/config_split.patch.core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ adding:
s3fs: 0
samlauth: 0
usagov_login: 0
vote_users: 0
externalauth: 10
removing: { }
1 change: 1 addition & 0 deletions config/sync/config_split.config_split.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ theme: { }
complete_list:
- dblog.settings
- field_ui.settings
- stage_file_proxy.settings
- views.view.watchdog
partial_list:
- autologout.settings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: ''
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: { }
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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

This file was deleted.

This file was deleted.

12 changes: 6 additions & 6 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 0 additions & 6 deletions docs/backend.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
16 changes: 10 additions & 6 deletions docs/frontend.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand All @@ -21,9 +21,11 @@ web/
├── dist
├── fonts
├── img
├── json
├── php-includes
├── js
├── sass
└── src/
├── js
└── sass
└── templates
```

Expand All @@ -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.

Loading