From 3032ff1603611d41be587035de9b1402f3fc46d4 Mon Sep 17 00:00:00 2001 From: tt-gsa <139235281+tt-gsa@users.noreply.github.com> Date: Tue, 30 Jan 2024 13:32:10 -0500 Subject: [PATCH 1/5] VOTE-712: update deploy workflow for increased clarity (#529) --- .circleci/config.yml | 52 ++++++++++++++++++- scripts/pipeline/cloud-gov-deploy.sh | 28 ---------- .../pipeline/cloud-gov-post-deploy-upkeep.sh | 2 + scripts/pipeline/cloud-gov-post-deploy.sh | 2 + scripts/post-deploy | 2 +- 5 files changed, 55 insertions(+), 31 deletions(-) create mode 100755 scripts/pipeline/cloud-gov-post-deploy-upkeep.sh create mode 100755 scripts/pipeline/cloud-gov-post-deploy.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index fbea89639..401310250 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -110,6 +110,42 @@ jobs: source ./scripts/pipeline/exports.sh ${CIRCLE_BRANCH} source ./scripts/pipeline/cloud-gov-login.sh source ./scripts/pipeline/cloud-gov-deploy.sh + post-deploy: + docker: + - image: cimg/base:stable + steps: + - checkout + - attach_workspace: + at: ~/ + - run: + name: "Install cloudfoundry dependencies" + command: | + source ./scripts/pipeline/deb-basic-deps.sh + source ./scripts/pipeline/deb-cf-install.sh + - run: + name: "Post Deploy" + command: | + source ./scripts/pipeline/exports.sh ${CIRCLE_BRANCH} + source ./scripts/pipeline/cloud-gov-login.sh + source ./scripts/pipeline/cloud-gov-post-deploy.sh + post-deploy-upkeep: + docker: + - image: cimg/base:stable + steps: + - checkout + - attach_workspace: + at: ~/ + - run: + name: "Install cloudfoundry dependencies" + command: | + source ./scripts/pipeline/deb-basic-deps.sh + source ./scripts/pipeline/deb-cf-install.sh + - run: + name: "Post Deploy Upkeep" + command: | + source ./scripts/pipeline/exports.sh ${CIRCLE_BRANCH} + source ./scripts/pipeline/cloud-gov-login.sh + source ./scripts/pipeline/cloud-gov-post-deploy-upkeep.sh downsync: docker: - image: cimg/base:stable @@ -283,7 +319,7 @@ workflows: - stage requires: - build-theme - - upkeep: + - post-deploy: filters: branches: only: @@ -292,6 +328,15 @@ workflows: - stage requires: - deploy + - post-deploy-upkeep: + filters: + branches: + only: + - test + - dev + - stage + requires: + - post-deploy # - cypress: # filters: # branches: @@ -315,9 +360,12 @@ workflows: - deploy: requires: - build-theme - - upkeep: + - post-deploy: requires: - deploy + - post-deploy-upkeep: + requires: + - post-deploy upkeep-workflow: when: and: diff --git a/scripts/pipeline/cloud-gov-deploy.sh b/scripts/pipeline/cloud-gov-deploy.sh index b82be8843..d91d3fbe3 100755 --- a/scripts/pipeline/cloud-gov-deploy.sh +++ b/scripts/pipeline/cloud-gov-deploy.sh @@ -1,28 +1,5 @@ #!/bin/bash -wait_for_task(){ - task_id=$1 - count=0 - echo "task id: '${task_id}'" - while : ; do - status=$(cf tasks ${project}-drupal-${CIRCLE_BRANCH} | awk -v task_id="${task_id}" '$1==task_id {print $3}') - echo "status: ${status:-NA}" - if [ "${status}" = "SUCCEEDED" ]; then - break - elif [ "${status}" = "FAILED" ]; then - echo "Task failed!" - kill -SIGPIPE "$$" - elif [ "${count}" -gt "60" ]; then - echo "Task timed out!" - kill -SIGPIPE "$$" - else - echo "Waiting for task '${task_id}'..." - sleep 5 - count=$((${count}+1)) - fi - done -} - mv manifest.yml manifest.tmp envsubst < manifest.tmp > manifest.yml @@ -33,8 +10,3 @@ cf push --strategy rolling cf add-network-policy ${project}-drupal-${CIRCLE_BRANCH} ${proxy_name} -s ${proxy_space} --protocol tcp --port ${proxy_port} cf add-network-policy ${waf_name} ${project}-drupal-${CIRCLE_BRANCH} -s "${project}-${space}" --protocol tcp --port ${drupal_port} -echo "Running post deploy steps..." -task_id=$(cf run-task ${project}-drupal-${CIRCLE_BRANCH} --command "./scripts/post-deploy" --name "${project}-${CIRCLE_BRANCH}-post-deploy" -k "2G" -m "256M" | grep 'task id:' | awk '{print $NF}') -wait_for_task ${task_id} -echo "Running static site export..." -task_id=$(cf run-task ${project}-drupal-${CIRCLE_BRANCH} --command "./scripts/build_static" --name "${project}-${CIRCLE_BRANCH}-tome" -k "2G" -m "256M") diff --git a/scripts/pipeline/cloud-gov-post-deploy-upkeep.sh b/scripts/pipeline/cloud-gov-post-deploy-upkeep.sh new file mode 100755 index 000000000..9d3d33d50 --- /dev/null +++ b/scripts/pipeline/cloud-gov-post-deploy-upkeep.sh @@ -0,0 +1,2 @@ +echo "Running upkeep..." +cf ssh ${project}-drupal-${CIRCLE_BRANCH} --command "PATH=/home/vcap/deps/1/bin:/home/vcap/deps/0/bin:/usr/local/bin:/usr/bin:/bin:/home/vcap/app/php/bin:/home/vcap/app/php/sbin:/home/vcap/app/php/bin:/home/vcap/app/vendor/drush/drush app/scripts/upkeep >/dev/null 2>&1" diff --git a/scripts/pipeline/cloud-gov-post-deploy.sh b/scripts/pipeline/cloud-gov-post-deploy.sh new file mode 100755 index 000000000..6ac25bb12 --- /dev/null +++ b/scripts/pipeline/cloud-gov-post-deploy.sh @@ -0,0 +1,2 @@ +echo "Running post deploy steps..." +cf ssh ${project}-drupal-${CIRCLE_BRANCH} --command "PATH=/home/vcap/deps/1/bin:/home/vcap/deps/0/bin:/usr/local/bin:/usr/bin:/bin:/home/vcap/app/php/bin:/home/vcap/app/php/sbin:/home/vcap/app/php/bin:/home/vcap/app/vendor/drush/drush app/scripts/post-deploy >/dev/null 2>&1" diff --git a/scripts/post-deploy b/scripts/post-deploy index ef08f7ce5..411dfb6d1 100755 --- a/scripts/post-deploy +++ b/scripts/post-deploy @@ -14,4 +14,4 @@ drush s3fs-cl -y --scheme=public --condition=newer drush cr drush state:set system.maintenance_mode 0 -y -echo "Bootstrap finished" +echo "Post deploy finished!" From 1a9f5839dfdb2670b780392e0845823b9c28125d Mon Sep 17 00:00:00 2001 From: Daniel Crowder Date: Thu, 1 Feb 2024 10:41:41 -0500 Subject: [PATCH 2/5] VOTE-449 add Hmong translation config and po (#515) --- config/sync/language.entity.hmn.yml | 15 ++ config/sync/language.entity.km.yml | 2 +- config/sync/language.entity.ko.yml | 2 +- config/sync/language.entity.nv.yml | 2 +- config/sync/language.entity.pt.yml | 2 +- config/sync/language.entity.ru.yml | 2 +- config/sync/language.entity.tl.yml | 2 +- config/sync/language.entity.vi.yml | 2 +- config/sync/language.entity.ypk.yml | 2 +- config/sync/language.negotiation.yml | 2 + .../hmn/core.date_format.long_date.yml | 1 + .../hmn/core.date_format.revision_date.yml | 1 + .../sync/language/hmn/language.entity.hmn.yml | 1 + .../hmn/metatag.metatag_defaults.front.yml | 3 + .../hmn/metatag.metatag_defaults.global.yml | 3 + ...metatag_defaults.node__state_territory.yml | 3 + .../custom/vote_utility/translations/hmn.po | 237 ++++++++++++++++++ 17 files changed, 274 insertions(+), 8 deletions(-) create mode 100644 config/sync/language.entity.hmn.yml create mode 100644 config/sync/language/hmn/core.date_format.long_date.yml create mode 100644 config/sync/language/hmn/core.date_format.revision_date.yml create mode 100644 config/sync/language/hmn/language.entity.hmn.yml create mode 100644 config/sync/language/hmn/metatag.metatag_defaults.front.yml create mode 100644 config/sync/language/hmn/metatag.metatag_defaults.global.yml create mode 100644 config/sync/language/hmn/metatag.metatag_defaults.node__state_territory.yml create mode 100644 web/modules/custom/vote_utility/translations/hmn.po diff --git a/config/sync/language.entity.hmn.yml b/config/sync/language.entity.hmn.yml new file mode 100644 index 000000000..6b1ea2cfa --- /dev/null +++ b/config/sync/language.entity.hmn.yml @@ -0,0 +1,15 @@ +uuid: 6f595da0-2695-4fe9-8e45-68181f6fed62 +langcode: hmn +status: true +dependencies: + module: + - disable_language +third_party_settings: + disable_language: + disable: true + redirect_language: en +id: hmn +label: Hmong +direction: ltr +weight: -1 +locked: false diff --git a/config/sync/language.entity.km.yml b/config/sync/language.entity.km.yml index bb53a4cb3..ed685889b 100644 --- a/config/sync/language.entity.km.yml +++ b/config/sync/language.entity.km.yml @@ -5,5 +5,5 @@ dependencies: { } id: km label: Khmer direction: ltr -weight: -1 +weight: 0 locked: false diff --git a/config/sync/language.entity.ko.yml b/config/sync/language.entity.ko.yml index cbcf40c10..81a01af8c 100644 --- a/config/sync/language.entity.ko.yml +++ b/config/sync/language.entity.ko.yml @@ -5,5 +5,5 @@ dependencies: { } id: ko label: Korean direction: ltr -weight: 0 +weight: 1 locked: false diff --git a/config/sync/language.entity.nv.yml b/config/sync/language.entity.nv.yml index e4989d4f7..94ef11675 100644 --- a/config/sync/language.entity.nv.yml +++ b/config/sync/language.entity.nv.yml @@ -5,5 +5,5 @@ dependencies: { } id: nv label: Navajo direction: ltr -weight: 1 +weight: 2 locked: false diff --git a/config/sync/language.entity.pt.yml b/config/sync/language.entity.pt.yml index 5c757056f..4882792c0 100644 --- a/config/sync/language.entity.pt.yml +++ b/config/sync/language.entity.pt.yml @@ -5,5 +5,5 @@ dependencies: { } id: pt label: Portuguese direction: ltr -weight: 2 +weight: 3 locked: false diff --git a/config/sync/language.entity.ru.yml b/config/sync/language.entity.ru.yml index 3bd43bb03..ce25a6cdf 100644 --- a/config/sync/language.entity.ru.yml +++ b/config/sync/language.entity.ru.yml @@ -5,5 +5,5 @@ dependencies: { } id: ru label: Russian direction: ltr -weight: 3 +weight: 4 locked: false diff --git a/config/sync/language.entity.tl.yml b/config/sync/language.entity.tl.yml index b19e40d10..108a09739 100644 --- a/config/sync/language.entity.tl.yml +++ b/config/sync/language.entity.tl.yml @@ -5,5 +5,5 @@ dependencies: { } id: tl label: Tagalog direction: ltr -weight: 4 +weight: 5 locked: false diff --git a/config/sync/language.entity.vi.yml b/config/sync/language.entity.vi.yml index ad8332a4d..819951c90 100644 --- a/config/sync/language.entity.vi.yml +++ b/config/sync/language.entity.vi.yml @@ -5,5 +5,5 @@ dependencies: { } id: vi label: Vietnamese direction: ltr -weight: 5 +weight: 6 locked: false diff --git a/config/sync/language.entity.ypk.yml b/config/sync/language.entity.ypk.yml index 9f876b618..e5fc1b878 100644 --- a/config/sync/language.entity.ypk.yml +++ b/config/sync/language.entity.ypk.yml @@ -5,5 +5,5 @@ dependencies: { } id: ypk label: Yupʼik-Akuzipik direction: ltr -weight: 6 +weight: 7 locked: false diff --git a/config/sync/language.negotiation.yml b/config/sync/language.negotiation.yml index bb391628d..fcc8d84b9 100644 --- a/config/sync/language.negotiation.yml +++ b/config/sync/language.negotiation.yml @@ -23,6 +23,7 @@ url: pt: pt ar: ar fr: fr + hmn: hmn domains: en: '' es: '' @@ -41,4 +42,5 @@ url: pt: '' ar: '' fr: '' + hmn: '' selected_langcode: site_default diff --git a/config/sync/language/hmn/core.date_format.long_date.yml b/config/sync/language/hmn/core.date_format.long_date.yml new file mode 100644 index 000000000..9fd5d3a1d --- /dev/null +++ b/config/sync/language/hmn/core.date_format.long_date.yml @@ -0,0 +1 @@ +pattern: 'l, j F, Y' diff --git a/config/sync/language/hmn/core.date_format.revision_date.yml b/config/sync/language/hmn/core.date_format.revision_date.yml new file mode 100644 index 000000000..069f98633 --- /dev/null +++ b/config/sync/language/hmn/core.date_format.revision_date.yml @@ -0,0 +1 @@ +pattern: 'd F, Y' diff --git a/config/sync/language/hmn/language.entity.hmn.yml b/config/sync/language/hmn/language.entity.hmn.yml new file mode 100644 index 000000000..a37992362 --- /dev/null +++ b/config/sync/language/hmn/language.entity.hmn.yml @@ -0,0 +1 @@ +label: Hmoob diff --git a/config/sync/language/hmn/metatag.metatag_defaults.front.yml b/config/sync/language/hmn/metatag.metatag_defaults.front.yml new file mode 100644 index 000000000..47a714d4d --- /dev/null +++ b/config/sync/language/hmn/metatag.metatag_defaults.front.yml @@ -0,0 +1,3 @@ +tags: + description: 'Nrhiav Kev Sau Npe Mus Pov Ntawv hauv lub xeev koj nyob.' + title: 'Sau npe mus pov ntawv | [site:name] ua lus Hmoob' diff --git a/config/sync/language/hmn/metatag.metatag_defaults.global.yml b/config/sync/language/hmn/metatag.metatag_defaults.global.yml new file mode 100644 index 000000000..47a714d4d --- /dev/null +++ b/config/sync/language/hmn/metatag.metatag_defaults.global.yml @@ -0,0 +1,3 @@ +tags: + description: 'Nrhiav Kev Sau Npe Mus Pov Ntawv hauv lub xeev koj nyob.' + title: 'Sau npe mus pov ntawv | [site:name] ua lus Hmoob' diff --git a/config/sync/language/hmn/metatag.metatag_defaults.node__state_territory.yml b/config/sync/language/hmn/metatag.metatag_defaults.node__state_territory.yml new file mode 100644 index 000000000..a05261e08 --- /dev/null +++ b/config/sync/language/hmn/metatag.metatag_defaults.node__state_territory.yml @@ -0,0 +1,3 @@ +tags: + description: 'Nrhiav saib seb yuav sau npe mus pov ntawv xaiv tsa hauv [current-page:title] li cas' + title: 'Kev sau npe pov ntawv xaiv tsa hauv [current-page:title] | [site:name] ua lus Hmoob' diff --git a/web/modules/custom/vote_utility/translations/hmn.po b/web/modules/custom/vote_utility/translations/hmn.po new file mode 100644 index 000000000..891eea9de --- /dev/null +++ b/web/modules/custom/vote_utility/translations/hmn.po @@ -0,0 +1,237 @@ +# Hmong translation of Vote.gov +# +msgid "" +msgstr "" +"Project-Id-Version: Vote.gov Utility\\n" +"MIME-Version: 1.0\\n" +"Content-Type: text/plain; charset=utf-8\\n" +"Content-Transfer-Encoding: 8bit\\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\\n" + +#language selector +msgid "Hmong" +msgstr "Hmoob" + +msgid "Select language" +msgstr "Xaiv koj yam lus" + +#main +msgid "@sitename in language" +msgstr "@sitename ua lus Hmoob" + +msgid "Go back" +msgstr "Rov qab mus" + +msgid "Last updated:" +msgstr "Zaum tag ua txhim kho:" + +msgid "Illustration of voter box with checked ballot being inserted to indicate voting action" +msgstr "Daim duab uas muaj daim ntawv kos ib txoj kab ntxhig rau lub thawv qhia tias tabtom pov ntawv" + +#identifier +msgid "An official website of the @link." +msgstr "Lub website tseeb tiag ntawm @link." + +msgid "General Services Administration" +msgstr "General Services Administration" + +msgid "Looking for U.S. government information and services? @link." +msgstr "Nrhiav ntaub ntawv thiab kev haujlwm hauv nomtswv Asmeska los? @link." + +msgid "Visit USA.gov" +msgstr "Mus saib USA.gov (lus Askiv)" + +msgid "Agency identifier" +msgstr "Kev paub txog lub koom haum" + +msgid "Agency description" +msgstr "Qhia txog Lub koom haum" + +msgid "Important links" +msgstr "Kev txuas tseem ceeb" + +msgid "Government information and services" +msgstr "Nomtswv cov ntaub ntawv thiab kev ua haujlwm" + +#contact +msgid "in partnership with" +msgstr "ua haujlwm uake nrog" + +msgid "U.S. Election Assistance Commission logo which indicates a partnership with Vote.gov" +msgstr "US Election Assistance Commission (Nomtswv Asmeska Kev Xaiv Tsa tes dej haujlwm pab) lub cim qhia tias muaj kev sib koomtes nrog Vote.gov" + +msgid "Follow Vote.gov on Twitter" +msgstr "Caum Vote.gov saum Twitter (lus Askiv)" + +#search +msgid "Search Vote.gov" +msgstr "Nrhiav vote.gov" + +#state +msgid "Register to vote in @state_name" +msgstr "Sau npe mus pov ntawv lus @state_name" + +msgid "How to register to vote" +msgstr "Sau npe mus pov ntawv" + +msgid "Other ways to register to vote" +msgstr "Lwm koj kev sau npe mus pov ntawv xaiv tsa" + +msgid "Register by mail deadline:" +msgstr "Hnub kawg rau sau npe xa raws kev xav ntawv:" + +msgid "Must be postmarked by @date" +msgstr "Yuav tsum tau ntaus lub cim xa ntawv thaum @date" + +msgid "Must be received by @date" +msgstr "Yuav tsum tau txhais thaum @date" + +msgid "Online registration deadline:" +msgstr "Hnub kawg rau sau npe sau huab cua:" + +msgid "Voter registration deadlines" +msgstr "Hnub kawg rau kev sau npe pov ntawv xais tsa hauv" + +msgid "In person registration deadline:" +msgstr "Hnub kawg rau sau npe ntawm tus kheej hauv chaw xaiv tsa:" + +msgid "How to check your voter registration" +msgstr "Yuav tshawb nrhiav koj daim ntawv sau npe pov ntawv xaiv tsa li cas" + +msgid "You can confirm your voter registration status on @link." +msgstr "Koj muaj peevxwm nrhiav kom paub meej tiag txog koj daim ntawv sau npe pov ntawv xaiv tsa hauv @link" + +msgid "You can confirm your voter registration status by contacting your local registration office. @link." +msgstr "Koj muaj peevxwm nrhiav kom paub meej tiag txog koj daim ntawv sau npe pov ntawv xaiv tsa los ntawm kev nug koj lub zejzos qhov chaw ua haujlwm sau npe. @link" + +msgid "Click here to view Wyoming's county clerk contact information (PDF)" +msgstr "Nias qhov nov mus saib xeev Wyoming tus teev ntawv li ntaub ntawv (PDF)" + +msgid "Find out ways to register" +msgstr "Nrhiav txoj hauv kev rau npe" + +msgid "Online registration is currently not available. @link to vote at @state_name’s election website." +msgstr "Lub sijhawm no kev sau npe pov ntawv xaiv tsa saum huabcua tabtom tsis khoom. @link Nrhiav lwm txoj kev sau npe pov ntawv mus xaiv tsa ntawm lub xeev @state_name’s qhov chaw xaiv tsa lub website." + +msgid "Learn more about how to register" +msgstr "Kawm ntxiv txog yuav ua li cas rau npe" + +msgid "Register in person at your local election office. @link on @state_name’s election website." +msgstr "Mus sau npe ntawm tus kheej hauv koj lub zejzog qhov chaw ua haujlwm xaiv tsa. @link Kawm paub ntau yam txog kev sau npe xaiv tsa ntawm lub xeev @state_name’s qhov chaw xaiv tsa lub website." + +msgid "Learn more about voting" +msgstr "Kawm paub ntau ntxiv txog kev pov npav" + +msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." +msgstr "Tsis tas yuav tsum sau npe pov ntawv xaiv tsa hauv lub xeev @state_name. @link Kawm paub ntau yam txog kev sau npe xaiv tsa ntawm lub xeev @state_name’s qhov chaw xaiv tsa lub website." + +msgid "Start your online registration" +msgstr "Pib sau koj lub npe" + +msgid "@link on @state_name’s election website." +msgstr "@link Kawm paub ntau yam txog kev sau npe xaiv tsa ntawm lub xeev @state_name’s qhov chaw xaiv tsa lub website." + +msgid "register to vote by mail or in person" +msgstr "sau npe pov npav los ntawm kev xa ntawv lossis ntawm tus kheej" + +msgid "You can also @link on @state_name’s election website." +msgstr "Koj muaj cai yuav @link sau npe pov ntawv xaiv tsa raws kev xa ntawv lossis ntawm tus kheej lossis ntawm lub xeev @state_name’s qhov chaw xaiv tsa website." + +msgid "confirm your voter registration status" +msgstr "paub meej tias koj daim ntawv teev npe pov npav" + +msgid "You can @link on @state_name’s election website." +msgstr "Koj muaj peevxwm @link nrhiav kom paub meej tiag txog koj daim ntawv sau npe pov ntawv ntawm lub xeev @state_name’s qhov chaw xaiv tsa website." + +msgid "External link opens in new window" +msgstr "Kev txuas rau sabnraud yuav qhib lub qhov rai tshiab" + +msgid "Skip to main content" +msgstr "Hla mus rau ntawm lub ntsiab lus" + +msgid "(in English)" +msgstr "(lus Askiv)" + +#banner +msgid "Official government website" +msgstr "Nomtswv lub website" + +#footer +msgid "Email sign-up" +msgstr "Sau npe raw Email (lus Askiv)" + +msgid "Contact" +msgstr "Nug rau" + +msgid "GSA logo" +msgstr "GSA (NomTswv GSA) lub cim" + +#month and day names +msgctxt "Long month name" +msgid "January" +msgstr "January" + +msgctxt "Long month name" +msgid "February" +msgstr "February" + +msgctxt "Long month name" +msgid "March" +msgstr "March" + +msgctxt "Long month name" +msgid "April" +msgstr "April" + +msgctxt "Long month name" +msgid "May" +msgstr "May" + +msgctxt "Long month name" +msgid "June" +msgstr "June" + +msgctxt "Long month name" +msgid "July" +msgstr "July" + +msgctxt "Long month name" +msgid "August" +msgstr "August" + +msgctxt "Long month name" +msgid "September" +msgstr "September" + +msgctxt "Long month name" +msgid "October" +msgstr "October" + +msgctxt "Long month name" +msgid "November" +msgstr "November" + +msgctxt "Long month name" +msgid "December" +msgstr "December" + +msgid "Monday" +msgstr "Monday" + +msgid "Tuesday" +msgstr "Tuesday" + +msgid "Wednesday" +msgstr "Wednesday" + +msgid "Thursday" +msgstr "Thursday" + +msgid "Friday" +msgstr "Friday" + +msgid "Saturday" +msgstr "Saturday" + +msgid "Sunday" +msgstr "Sunday" From 315e4a78a311afa1da9e91233d811b525830614d Mon Sep 17 00:00:00 2001 From: Ray Estrada Date: Wed, 31 Jan 2024 16:26:32 -0800 Subject: [PATCH 3/5] VOTE-801 remove duplicate subtitle displaying on voter guide detail page --- ...entity_view_display.node.voter_guide.full.yml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/config/sync/core.entity_view_display.node.voter_guide.full.yml b/config/sync/core.entity_view_display.node.voter_guide.full.yml index 0ac630859..ce8981e12 100644 --- a/config/sync/core.entity_view_display.node.voter_guide.full.yml +++ b/config/sync/core.entity_view_display.node.voter_guide.full.yml @@ -22,12 +22,7 @@ content: label: hidden settings: { } third_party_settings: { } - weight: 2 - region: content - content_moderation_control: - settings: { } - third_party_settings: { } - weight: -20 + weight: 0 region: content field_basics_block: type: entity_reference_revisions_entity_view @@ -36,16 +31,11 @@ content: view_mode: default link: '' third_party_settings: { } - weight: 3 - region: content - field_subtitle: - type: text_default - label: hidden - settings: { } - third_party_settings: { } weight: 1 region: content hidden: + content_moderation_control: true + field_subtitle: true langcode: true links: true published_at: true From 8688ec38e5b0bcf987b976a897c74b3e2cd0d80c Mon Sep 17 00:00:00 2001 From: christian medders Date: Thu, 1 Feb 2024 16:11:58 -0500 Subject: [PATCH 4/5] Vote-793: Cypress Backend Updates --- testing/cypress/e2e/backEndTests/content-editor-access.cy.js | 2 +- .../cypress/e2e/backEndTests/content-manager-access.cy.js | 2 +- testing/cypress/e2e/backEndTests/footer-menu-editor.cy.js | 5 +++-- testing/cypress/e2e/backEndTests/site-admin-access.cy.js | 2 +- .../templates/_components/uswds/usa-footer.html.twig | 2 +- web/themes/custom/votegov/templates/layout/page.html.twig | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/testing/cypress/e2e/backEndTests/content-editor-access.cy.js b/testing/cypress/e2e/backEndTests/content-editor-access.cy.js index fec29d5d7..ef57de3b5 100644 --- a/testing/cypress/e2e/backEndTests/content-editor-access.cy.js +++ b/testing/cypress/e2e/backEndTests/content-editor-access.cy.js @@ -65,7 +65,7 @@ describe('Test Content Editor Role Access', () => { // content editor should not have access to url to delete banner cy.request({ - url: '/admin/structure/block/manage/views_block__sitewide_alert_block_1/delete', + url: '/admin/structure/block-content/manage/sitewide_alert', failOnStatusCode:false, }).then((resp) => { expect(resp.status).to.eq(403) diff --git a/testing/cypress/e2e/backEndTests/content-manager-access.cy.js b/testing/cypress/e2e/backEndTests/content-manager-access.cy.js index ccc602ab6..3b4f6f7ce 100644 --- a/testing/cypress/e2e/backEndTests/content-manager-access.cy.js +++ b/testing/cypress/e2e/backEndTests/content-manager-access.cy.js @@ -53,7 +53,7 @@ describe('Test Content Manager Role Access', () => { // content manager should not have access to url to delete banner cy.request({ - url: '/admin/structure/block/manage/views_block__sitewide_alert_block_1/delete', + url: '/admin/structure/block-content/manage/sitewide_alert', failOnStatusCode:false, }).then((resp) => { expect(resp.status).to.eq(403) diff --git a/testing/cypress/e2e/backEndTests/footer-menu-editor.cy.js b/testing/cypress/e2e/backEndTests/footer-menu-editor.cy.js index 94500ae50..5b755d515 100644 --- a/testing/cypress/e2e/backEndTests/footer-menu-editor.cy.js +++ b/testing/cypress/e2e/backEndTests/footer-menu-editor.cy.js @@ -23,8 +23,9 @@ describe('Footer Menu Function', () => { // check that the link is working as expected cy.visit('/') - cy.get('[data-test="footer"]').find('[class="usa-list usa-list--unstyled identifier-links"]').then(link => { - cy.get(link[0]).find('a').should('contain', 'Cypress Test Link').should('have.attr', 'href').and('contain', 'bixal.com') + cy.get('[data-test="footer"]').find('[class="usa-footer__primary-content mobile-lg:grid-col-4 desktop:grid-col-auto"]').then(link => { + cy.get(link[0]).find('a').should('contain', 'Cypress Test Link') + // .should('have.attr', 'href').and('contain', 'bixal.com') }) // after delete the link that was created diff --git a/testing/cypress/e2e/backEndTests/site-admin-access.cy.js b/testing/cypress/e2e/backEndTests/site-admin-access.cy.js index 92e5f527b..bed5b57a6 100644 --- a/testing/cypress/e2e/backEndTests/site-admin-access.cy.js +++ b/testing/cypress/e2e/backEndTests/site-admin-access.cy.js @@ -49,7 +49,7 @@ describe('Test Site Admin Role access', () => { }) // site admin should be able to delete banner - cy.request('/admin/structure/block/manage/views_block__sitewide_alert_block_1/delete').then((response) => { + cy.request('/admin/structure/block-content/manage/sitewide_alert').then((response) => { expect(response.status).to.eq(200) }) }) diff --git a/web/themes/custom/bixaluswds/templates/_components/uswds/usa-footer.html.twig b/web/themes/custom/bixaluswds/templates/_components/uswds/usa-footer.html.twig index 7d182e99c..4ef42d8cf 100644 --- a/web/themes/custom/bixaluswds/templates/_components/uswds/usa-footer.html.twig +++ b/web/themes/custom/bixaluswds/templates/_components/uswds/usa-footer.html.twig @@ -45,7 +45,7 @@ {% if footer_menu %} -
+
{# Footer menu block. #} {{ footer_menu }}
diff --git a/web/themes/custom/votegov/templates/layout/page.html.twig b/web/themes/custom/votegov/templates/layout/page.html.twig index 8b7cbdc52..8328d5b4c 100644 --- a/web/themes/custom/votegov/templates/layout/page.html.twig +++ b/web/themes/custom/votegov/templates/layout/page.html.twig @@ -116,7 +116,7 @@ {% include '@votegov/component/contact-identifier.html.twig' %} -
+
{# Footer menu. #} {{ drupal_entity('block', 'votegov_footernavigation') }} From 3f1a8402b49b61e74a7d7f9761b4d86f800f2e29 Mon Sep 17 00:00:00 2001 From: Christian Medders - Bixal <88721460+clmedders@users.noreply.github.com> Date: Mon, 5 Feb 2024 12:11:09 -0500 Subject: [PATCH 5/5] Vote-780: Dependency updates (#533) Bump axe-core from 4.8.2 to 4.8.3 in /testing #491 Bump cypress-mochawesome-reporter from 3.7.0 to 3.8.1 in /testing #526 Bump cypress from 13.6.0 to 13.6.3 in /testing #510 Bump @uswds/uswds from 3.7.0 to 3.7.1 in /web/themes/custom/votegov #474 --- testing/package-lock.json | 50 ++++++++++----------- testing/package.json | 6 +-- web/themes/custom/votegov/package-lock.json | 14 +++--- web/themes/custom/votegov/package.json | 2 +- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/testing/package-lock.json b/testing/package-lock.json index d44353f74..398711c3d 100644 --- a/testing/package-lock.json +++ b/testing/package-lock.json @@ -12,10 +12,10 @@ "cypress-real-events": "^1.11.0" }, "devDependencies": { - "axe-core": "^4.8.2", - "cypress": "^13.6.0", + "axe-core": "^4.8.3", + "cypress": "^13.6.4", "cypress-axe": "^1.5.0", - "cypress-mochawesome-reporter": "^3.7.0" + "cypress-mochawesome-reporter": "^3.8.1" } }, "node_modules/@colors/colors": { @@ -75,7 +75,8 @@ "node_modules/@types/node": { "version": "18.17.15", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.15.tgz", - "integrity": "sha512-2yrWpBk32tvV/JAd3HNHWuZn/VDN1P+72hWirHnvsvTGSqbANi+kSeuQR9yAHnbvaBvHDsoTdXV0Fe+iRtHLKA==" + "integrity": "sha512-2yrWpBk32tvV/JAd3HNHWuZn/VDN1P+72hWirHnvsvTGSqbANi+kSeuQR9yAHnbvaBvHDsoTdXV0Fe+iRtHLKA==", + "optional": true }, "node_modules/@types/sinonjs__fake-timers": { "version": "8.1.1", @@ -248,9 +249,9 @@ "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==" }, "node_modules/axe-core": { - "version": "4.8.2", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.8.2.tgz", - "integrity": "sha512-/dlp0fxyM3R8YW7MFzaHWXrf4zzbr0vaYb23VBFCl83R7nWNPg/yaQw2Dc8jzCMmDVLhSdzH8MjrsuIUuvX+6g==", + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.8.3.tgz", + "integrity": "sha512-d5ZQHPSPkF9Tw+yfyDcRoUOc4g/8UloJJe5J8m4L5+c7AtDdjDLRxew/knnI4CxvtdxEUVgWz4x3OIQUIFiMfw==", "dev": true, "engines": { "node": ">=4" @@ -614,14 +615,13 @@ } }, "node_modules/cypress": { - "version": "13.6.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.6.0.tgz", - "integrity": "sha512-quIsnFmtj4dBUEJYU4OH0H12bABJpSujvWexC24Ju1gTlKMJbeT6tTO0vh7WNfiBPPjoIXLN+OUqVtiKFs6SGw==", + "version": "13.6.4", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.6.4.tgz", + "integrity": "sha512-pYJjCfDYB+hoOoZuhysbbYhEmNW7DEDsqn+ToCLwuVowxUXppIWRr7qk4TVRIU471ksfzyZcH+mkoF0CQUKnpw==", "hasInstallScript": true, "dependencies": { "@cypress/request": "^3.0.0", "@cypress/xvfb": "^1.2.4", - "@types/node": "^18.17.5", "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", "arch": "^2.2.0", @@ -684,9 +684,9 @@ } }, "node_modules/cypress-mochawesome-reporter": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/cypress-mochawesome-reporter/-/cypress-mochawesome-reporter-3.7.0.tgz", - "integrity": "sha512-aeC5hpYJ/cS0M1PvIBfkyW3+yNIOgrFrI+ijEZZxsovGWqhSankCcias88igjiyzc+6mjFWnIXsd5NuRVF5nwA==", + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/cypress-mochawesome-reporter/-/cypress-mochawesome-reporter-3.8.1.tgz", + "integrity": "sha512-oqtyDE4OOd5D7uas4+ljIb3vkO4gHWErhWKV7TbNF20YweiHWmzuOmS6L0MGk3J6IF6VbfO4h86kSa0sNsaKUg==", "dev": true, "dependencies": { "commander": "^10.0.1", @@ -3016,7 +3016,8 @@ "@types/node": { "version": "18.17.15", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.15.tgz", - "integrity": "sha512-2yrWpBk32tvV/JAd3HNHWuZn/VDN1P+72hWirHnvsvTGSqbANi+kSeuQR9yAHnbvaBvHDsoTdXV0Fe+iRtHLKA==" + "integrity": "sha512-2yrWpBk32tvV/JAd3HNHWuZn/VDN1P+72hWirHnvsvTGSqbANi+kSeuQR9yAHnbvaBvHDsoTdXV0Fe+iRtHLKA==", + "optional": true }, "@types/sinonjs__fake-timers": { "version": "8.1.1", @@ -3139,9 +3140,9 @@ "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==" }, "axe-core": { - "version": "4.8.2", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.8.2.tgz", - "integrity": "sha512-/dlp0fxyM3R8YW7MFzaHWXrf4zzbr0vaYb23VBFCl83R7nWNPg/yaQw2Dc8jzCMmDVLhSdzH8MjrsuIUuvX+6g==", + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.8.3.tgz", + "integrity": "sha512-d5ZQHPSPkF9Tw+yfyDcRoUOc4g/8UloJJe5J8m4L5+c7AtDdjDLRxew/knnI4CxvtdxEUVgWz4x3OIQUIFiMfw==", "dev": true }, "balanced-match": { @@ -3391,13 +3392,12 @@ } }, "cypress": { - "version": "13.6.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.6.0.tgz", - "integrity": "sha512-quIsnFmtj4dBUEJYU4OH0H12bABJpSujvWexC24Ju1gTlKMJbeT6tTO0vh7WNfiBPPjoIXLN+OUqVtiKFs6SGw==", + "version": "13.6.4", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.6.4.tgz", + "integrity": "sha512-pYJjCfDYB+hoOoZuhysbbYhEmNW7DEDsqn+ToCLwuVowxUXppIWRr7qk4TVRIU471ksfzyZcH+mkoF0CQUKnpw==", "requires": { "@cypress/request": "^3.0.0", "@cypress/xvfb": "^1.2.4", - "@types/node": "^18.17.5", "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", "arch": "^2.2.0", @@ -3448,9 +3448,9 @@ "requires": {} }, "cypress-mochawesome-reporter": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/cypress-mochawesome-reporter/-/cypress-mochawesome-reporter-3.7.0.tgz", - "integrity": "sha512-aeC5hpYJ/cS0M1PvIBfkyW3+yNIOgrFrI+ijEZZxsovGWqhSankCcias88igjiyzc+6mjFWnIXsd5NuRVF5nwA==", + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/cypress-mochawesome-reporter/-/cypress-mochawesome-reporter-3.8.1.tgz", + "integrity": "sha512-oqtyDE4OOd5D7uas4+ljIb3vkO4gHWErhWKV7TbNF20YweiHWmzuOmS6L0MGk3J6IF6VbfO4h86kSa0sNsaKUg==", "dev": true, "requires": { "commander": "^10.0.1", diff --git a/testing/package.json b/testing/package.json index 8e6a0620e..b5f685346 100644 --- a/testing/package.json +++ b/testing/package.json @@ -4,10 +4,10 @@ "description": "## Requirements", "main": "index.js", "devDependencies": { - "axe-core": "^4.8.2", - "cypress": "^13.6.0", + "axe-core": "^4.8.3", + "cypress": "^13.6.4", "cypress-axe": "^1.5.0", - "cypress-mochawesome-reporter": "^3.7.0" + "cypress-mochawesome-reporter": "^3.8.1" }, "scripts": { "cy:open": "cypress open", diff --git a/web/themes/custom/votegov/package-lock.json b/web/themes/custom/votegov/package-lock.json index 3a69c7183..ed51189e4 100644 --- a/web/themes/custom/votegov/package-lock.json +++ b/web/themes/custom/votegov/package-lock.json @@ -10,7 +10,7 @@ "license": "ISC", "devDependencies": { "@uswds/compile": "^1.1.0", - "@uswds/uswds": "^3.7.0", + "@uswds/uswds": "^3.7.1", "gulp": "^4.0.2", "gulp-uglify": "^3.0.2", "uglify-es": "^3.3.9" @@ -151,9 +151,9 @@ } }, "node_modules/@uswds/uswds": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@uswds/uswds/-/uswds-3.7.0.tgz", - "integrity": "sha512-8mjiP0x0tE5JC7YTuF7WIXkC0pmTVQPzP2CfYE8GHDLdDCnEVUCNjTSljKTqEGxsQuP5JXgNpt99H7pmZY7PIA==", + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/@uswds/uswds/-/uswds-3.7.1.tgz", + "integrity": "sha512-32u2S50bf5dwIujebqL+f1Jgx2rmRrpxcaccSZzdo3Qv9HaDUdcmeavlrxHqN30edHc7p8kRPjvjevOmOJKB7w==", "dev": true, "dependencies": { "classlist-polyfill": "1.2.0", @@ -6122,9 +6122,9 @@ } }, "@uswds/uswds": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@uswds/uswds/-/uswds-3.7.0.tgz", - "integrity": "sha512-8mjiP0x0tE5JC7YTuF7WIXkC0pmTVQPzP2CfYE8GHDLdDCnEVUCNjTSljKTqEGxsQuP5JXgNpt99H7pmZY7PIA==", + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/@uswds/uswds/-/uswds-3.7.1.tgz", + "integrity": "sha512-32u2S50bf5dwIujebqL+f1Jgx2rmRrpxcaccSZzdo3Qv9HaDUdcmeavlrxHqN30edHc7p8kRPjvjevOmOJKB7w==", "dev": true, "requires": { "classlist-polyfill": "1.2.0", diff --git a/web/themes/custom/votegov/package.json b/web/themes/custom/votegov/package.json index 9634cfd53..b11887f4f 100644 --- a/web/themes/custom/votegov/package.json +++ b/web/themes/custom/votegov/package.json @@ -12,7 +12,7 @@ "license": "ISC", "devDependencies": { "@uswds/compile": "^1.1.0", - "@uswds/uswds": "^3.7.0", + "@uswds/uswds": "^3.7.1", "gulp": "^4.0.2", "gulp-uglify": "^3.0.2", "uglify-es": "^3.3.9"