Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into 15785-alt-text-valida…
Browse files Browse the repository at this point in the history
…tion
  • Loading branch information
ndouglas committed Jan 10, 2024
2 parents 0fd3949 + f6c42c5 commit 3a65755
Show file tree
Hide file tree
Showing 278 changed files with 8,690 additions and 2,192 deletions.
4 changes: 0 additions & 4 deletions .github/ISSUE_TEMPLATE/ap-task.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,3 @@ labels: Needs refining, Accelerated Publishing
<!-- any suppporting information, links etc. -->
<!-- solution-specific discussion is great here. -->

```[tasklist]
### Implementation tasks
- [ ] Use this if it helps you or feel free to delete.
```
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ You can view team sprint boards using either the Github view with Zenhub browser

### Context & History
- [ ] How does the team fit into the larger OCTO ecosystem? [View this Mural diagram](https://app.mural.co/t/departmentofveteransaffairs9999/m/departmentofveteransaffairs9999/1686789362540/fb8f73b8d536f088e56bd3e38f0e37141560f62a?sender=u0b235d03cbd64f7f93673243)
- [ ] Why is VA.gov using a Drupal CMS and how is our success measured? Read the [objectives and key results](https://va-gov.atlassian.net/wiki/spaces/VAGOV/pages/96698383/Product+CMS).
- [ ] [Watch the Drupal GovCon presentation about the project](https://www.youtube.com/watch?v=WN4bGjEuQdM).
- [ ] Why are VA Medical Centers changing their websites? Watch the [2-minute YouTube video](https://youtu.be/Xrv5wCv6cKY).
- [ ] Why are Vet Centers important to Veterans? Watch the [2-minute YouTube video](https://www.youtube.com/watch?v=VMzkZNbKk1I).
Expand Down Expand Up @@ -183,7 +182,7 @@ Drupal is the VA's content management system of choice. For anyone on our team,
- [ ] **Drupal production access**: (SOCKS or VA network required) - in DSVA #cms-support channel, use the Slack workflow to file a helpdesk support request. Ask the helpdesk to create a Drupal user for you in [prod.cms.va.gov](prod.cms.va.gov).
* DevOps team members require an administrator account. (SOCKS or VA access with PIV card required)
* Standard practice for other roles is to have minimal access in prod (content editor or even a blocked account) and full admin access in lower environments.
- [ ] [View short presentations on specific topics](https://va-gov.atlassian.net/wiki/spaces/VAGOV/pages/1714094110/CMS+Topic+Dives). Topics include site alerts, release and deploy, Facility API, etc.
- [ ] [View Topic Dives](https://github.com/department-of-veterans-affairs/va.gov-team/tree/master/teams/sitewide/topic-dives) (short presentations on specific topics). Topics include site alerts, release and deploy, Facility API, etc.
- [ ] [Browse the VA Drupal CMS Knowledge Base articles](https://prod.cms.va.gov/help/).
- [ ] What is Drupal? [Link list for Drupal context and community](https://docs.google.com/spreadsheets/d/11ppWiIggKJh-YAWia28utZXW48tJZGCEg-sFJ6eIl9c)
- [ ] If you have a Drupal.org account, add your Agency & VA. Drupal.org > Login > My Account > Edit profile > Work tab > Add your agency, and "Department of Veterans Affairs" & save. This will help our team track Drupal open source contributions.
Expand Down Expand Up @@ -325,7 +324,7 @@ Each repository includes READMEs to help with setup.
- [ ] [Platform Collab Cycle calendar](https://calendar.google.com/calendar/u/0/[email protected]&ctz=America/New_York)

**CMS Collab Cycle**
- [ ] [CMS Collab Cycle documentation](https://va-gov.atlassian.net/wiki/spaces/VAGOV/pages/1791459333/CMS+Collaboration+Flow#like-section)
- [ ] [CMS Collab Cycle documentation](LINK TBD on CMS provision of Plat Confluence access or migration of docs to DEPO website)
- [ ] [CMS Collab Cycle kanban board](https://github.com/department-of-veterans-affairs/va.gov-cms#workspaces/cms-collaboration-cycle-reviews-62f50368ef32b60022d76d64/board?repos=154174777)

**Tracking features**
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/pw-clp-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Helpdesk will use #sitewide-public-websites channel to request approvals
<insert_CLP_node_link>
- [ ] If a new CMS editor user is needed, Helpdesk or any Drupal admin can create them and assign proper permissions according to [CLP CMS account administration policy](https://prod.cms.va.gov/help/cms-account-admin-policies/clp-cms-account-administration-policy).
- [ ] Send the editor a link to the KB article: [self-guided Campaign Landing Page training](https://prod.cms.va.gov/help/campaign-landing-pages/how-to-manage-campaign-landing-pages)
- [ ] Notify #sitewide-public-websites team "New CLP requested and approved" with link to this Github issue for next steps.
- [ ] Create a post in DSVA slack channel #sitewide-public-websites, and @ mention Jill Adams and Fran Cross: "New CLP requested and approved, for your awareness:" with a link to this Github issue for next steps.


#### Public Websites steps
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/research-conversation-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ Use the appropriate template for the group you're conducting research with:
## Suggested workflow/tasks:
- [ ] Brainstorm potential tasks
- [ ] Create initial draft of conversation guide
- [ ] Solicit review/feedback from Sitewide UX Lead
- [ ] Solicit review/feedback from Product Manager (PM) and/or other team members
- [ ] Sitewide UX Lead solicits feedback from VA Product Owner (PO)
- [ ] Solicit review/feedback from Sitewide UX Lead
- [ ] Solicit review/feedback from PO, PM, and/or other team members in a public slack post
- [ ] Sitewide UX Lead provides consolidated feedback including from PO
- [ ] Test prototype(s) with conversation guide and align
- [ ] Post on github in project research folder for final approval before submitting to Research Review cycle

Expand Down
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/research-discovery.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ Research Discovery is a time to establish the fundamental approach for a researc
- [ ] Consider participants - do we have access to the right users?
- [ ] Consider timeline - how long will this take? how much time do we have?

## Acceptance Criteria
## Possible Acceptance Criteria
- [ ] Findings from research review are documented and shared with Sitewide UX Lead, Product Manager, and Product Owner
- [ ] High-level scope of research is drafted and agreed upon
- [ ] Subsequent tickets are created

4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/research-plan.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ Use the appropriate template for the group you're conducting research with:
- [ ] Brainstorm ideas for research
- [ ] Create initial draft of research plan
- [ ] Solicit review/feedback from Sitewide UX Lead
- [ ] Solicit review/feedback from Product Manager (PM) and/or other team members
- [ ] Sitewide UX Lead solicits feedback from VA Product Owner (PO)
- [ ] Solicit review/feedback from PO, PM, and/or other team members in a public slack post
- [ ] Sitewide UX Lead provides consolidated feedback including from PO
- [ ] Identify moderator(s), notetaker(s), and observer(s) if moderated research
- [ ] Identify time slots for research sessions (twice as many slots as # of participants desired) if moderated research
- [ ] Post on github in project research folder for final approval before submitting to Research Review cycle
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/research-synthesis-and-reporting.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Research Synthesis and Reporting
about: Use this template when synthesizing your research and reporting the topline findings.
title: Synthesize [PRODUCT/INITIATIVE] research & create Topline Summary
about: Use this template when synthesizing your research and reporting findings.
title: Synthesize [PRODUCT/INITIATIVE] research & write report
labels: Research, UX
assignees: ''

Expand Down
79 changes: 79 additions & 0 deletions .github/ISSUE_TEMPLATE/taxonomy-update-term.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@

name: "Taxonomy - Update Term"
description: "Use this template when updating an existing terms in the Service or Benefit taxonomy."
title: "[UPDATE] (Term name) in (taxonomy name)"
labels: Content, Content governance

body:

- type: dropdown
id: which-taxonomy
attributes:
label: Which Taxonomy is this term for?
multiple: false
options:
- VA Benefits taxonomy
- VA services taxonomy
- Other
validations:
required: true
- type: input
id: term-link
attributes:
label: Link to existing term
description: e.g. https://prod.cms.va.gov/health-care/medical-records
validations:
required: true
- type: textarea
id: rationale
attributes:
label: Rationale for updating this term
description: Write a short explanation of why this term needs to be updated. Include links to any relevant issues, research findings, etc.
validations:
required: true
- type: dropdown
id: products
attributes:
label: Which products will this term impact?
multiple: true
options:
- VAMCs
- Vet Centers
- VBA Regional Office
- Benefit hubs
- Other
validations:
required: false
- type: dropdown
id: stakeholders
attributes:
label: Have stakeholders from impacted products been consulted?
multiple: false
options:
- 'Yes'
- 'No'
validations:
required: true
- type: dropdown
id: subfields
attributes:
label: Have you drafted content for all the relevant subfields?
multiple: false
options:
- 'Yes'
- 'No'
validations:
required: true
- type: textarea
id: acceptance-critera
attributes:
label: Acceptance Criteria
description: Customize the Acceptance Critera or use the default
value: |
- [ ] Content for subfields is drafted in Drupal by Product team
- [ ] Content is reviewed by relevant taxonomy governance body
- [ ] Content is reviewed by relevant stakeholders
- [ ] (List any necessary review and approval steps here)
- [ ] Term is published
validations:
required: true
2 changes: 1 addition & 1 deletion .github/actions/post-checkout/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ runs:
uses: shivammathur/setup-php@cb8f453143149404c7fd670b5f37c91d395b3054 # v2.25.1
with:
php-version: '8.1'
extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, bcmath, gd, exif, iconv
extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, bcmath, gd, exif, iconv, :php-psr
tools: composer:v2
coverage: xdebug

Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Continuous Integration
on: [pull_request]
on:
pull_request:
paths-ignore:
- '**.md'
permissions:
pull-requests: write
issues: write
Expand Down Expand Up @@ -43,7 +46,7 @@ jobs:
uses: ./.github/actions/post-checkout
- name: ReviewDog
# See also `composer va:test:eslint` in composer.json
uses: reviewdog/action-eslint@10ca150f51dbbb963467c37a03c873ba1fa75f91 # v1.20.0
uses: reviewdog/action-eslint@279acb08336462ec76183a2d9ef1dd43e4c6b391 # v1.21.0
with:
reporter: github-pr-review
eslint_flags: '--max-warnings 0 -c .eslintrc.json --no-eslintrc docroot/modules/custom/**/*.es6.js docroot/themes/custom/**/*.es6.js tests/cypress/**/*.js'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
ref: ${{ inputs.commit_sha }}

- name: Setup the Node environment
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
with:
node-version: '18.13'

Expand Down
105 changes: 105 additions & 0 deletions .github/workflows/set-tests-statuses.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
name: Set Test Statuses
on:
- pull_request_target
permissions:
pull-requests: write
checks: write
contents: write
statuses: write
jobs:
# Tugboat tests are not automatically set pending, even though they are
# required in branch protection rules (see #10553).
#
# Therefore, a PR can inappropriately appear to be ready to merge if,
# for instance, a composer.lock merge conflict prevents the Tugboat
# preview from successfully building.
#
# Additionally, CI tests are only run for code changes but they are
# required checks, even for documentation only changes. In these cases,
# the tests should be skipped since no functional changes have occured.
#
# To address these two issues, this action sets check statuses directly
# to the appropriate states:
# - For docs only changes, all required checks are set to 'success'
# - For code changes, Tugboat tests are set to 'pending' so that we can
# trust our automated code review processes more.
set-test-statuses:
name: Set Tests Statuses
runs-on: ubuntu-latest
steps:
- name: Check for documentation only changes
id: docs-only
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
with:
script: |
const opts = github.rest.pulls.listFiles.endpoint.merge({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.payload.pull_request.number,
})
const files = await github.paginate(
opts,
(response) => response.data.map(
(file) => file.filename
)
)
for (const file of files) {
console.log(`Checking PR file: ${file}`)
if (!file.endsWith('.md')) {
console.log(`Code change found in: ${file}`)
return "false"
}
}
console.log(`No code change found.`)
return "true"
result-encoding: string
- name: Set status for documentation changes.
if: ${{ steps.docs-only.outputs.result == 'true' }}
run: |
test_names=(
va/tests/cypress
va/tests/phpunit
va/tests/content-build-gql
va/tests/status-error
'Composer Validate'
'Check Fields'
ESLint
Stylelint
PHPStan
PHPUnit
PHP_CodeSniffer
'PHP Lint'
)
for test_name in "${test_names[@]}"; do
gh api \
--method POST \
-H "Accept: application/vnd.github+json" \
"/repos/${GITHUB_REPOSITORY}/statuses/${SHA}" \
-f state='success' \
-f context="${test_name}";
done;
env:
SHA: ${{ github.event.pull_request.head.sha }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Set status for code changes.
if: ${{ steps.docs-only.outputs.result == 'false' }}
run: |
test_names=(
va/tests/cypress
va/tests/phpunit
va/tests/content-build-gql
va/tests/status-error
)
for test_name in "${test_names[@]}"; do
gh api \
--method POST \
-H "Accept: application/vnd.github+json" \
"/repos/${GITHUB_REPOSITORY}/statuses/${SHA}" \
-f state='pending' \
-f context="${test_name}";
done;
env:
SHA: ${{ github.event.pull_request.head.sha }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
43 changes: 0 additions & 43 deletions .github/workflows/set-tugboat-tests-pending.yml

This file was deleted.

39 changes: 39 additions & 0 deletions .github/workflows/tugboat-pr-closed.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Delete Tugboat Preview
on:
pull_request:
types:
- closed
paths-ignore:
- '**.md'

jobs:
tugboat_delete_preview:
runs-on: self-hosted
env:
NODE_EXTRA_CA_CERTS: /etc/ssl/certs/ca-certificates.crt
name: Delete Tugboat Preview
steps:
- name: Restore Preview ID
uses: actions/cache/restore@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
with:
path: .tugboat_preview.txt
key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}
- name: Set Preview ID
run: |
if ! [ -f .tugboat_preview.txt ]; then
echo "Preview ID not found, please manually delete Tugboat Preview. Contact platform-cms-qa on Github or CMS QA Engineers in #cms-support on Slack for assistance."
exit 1
fi
PREVIEW_ID=$(cat .tugboat_preview.txt)
echo "Preview ID: ${PREVIEW_ID}"
echo "PREVIEW_ID=$PREVIEW_ID" >> $GITHUB_ENV
- name: Cleanup temporary file
run: rm .tugboat_preview.txt
- name: Delete Tugboat Preview
run: |
curl --fail \
-H "Authorization: Bearer ${{ secrets.TUGBOAT_API_TOKEN }}" \
-H "Content-Type: application/json" \
-X DELETE \
-d '{ "force": "false" }' \
https://api.tugboat.vfs.va.gov/v3/previews/${{ env.PREVIEW_ID }}
Loading

0 comments on commit 3a65755

Please sign in to comment.