Skip to content

Commit

Permalink
Merge branch 'main' into integration-service-location
Browse files Browse the repository at this point in the history
  • Loading branch information
omahane authored Oct 24, 2023
2 parents 3b478d2 + e582059 commit 8d7f49c
Show file tree
Hide file tree
Showing 78 changed files with 1,134 additions and 805 deletions.
25 changes: 19 additions & 6 deletions .github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ body:
- type: markdown
attributes:
value: |
Before engaging with the CMS Collaboration Cycle, please fill out the form below to help the CMS Team determine what level of support and which touchpoints are needed for your work.
Before engaging with the CMS Collaboration Cycle, please fill out the form below to help the CMS Team determine what level of support and which touchpoints are needed for your work. Have questions about this form? Reach out to the CMS Team in the cms-support Slack channel.
- type: input
id: product-outline
attributes:
Expand Down Expand Up @@ -69,6 +69,7 @@ body:
options:
- "Yes"
- "No"
- "Maybe (Leave notes in the Additional Information section of this form)"
validations:
required: true
- type: dropdown
Expand All @@ -79,6 +80,18 @@ body:
options:
- "Yes"
- "No"
- "Maybe (Leave notes in the Additional Information section of this form)"
validations:
required: true
- type: dropdown
id: modules
attributes:
label: Will your work require introducing a new Drupal module or changes to an existing module?
multiple: false
options:
- "Yes"
- "No"
- "Maybe (Leave notes in the Additional Information section of this form)"
validations:
required: true
- type: dropdown
Expand All @@ -89,6 +102,7 @@ body:
options:
- "Yes"
- "No"
- "Maybe (Leave notes in the Additional Information section of this form)"
validations:
required: true
- type: dropdown
Expand All @@ -99,6 +113,7 @@ body:
options:
- "Yes"
- "No"
- "Maybe (Leave notes in the Additional Information section of this form)"
validations:
required: true
- type: textarea
Expand All @@ -107,13 +122,11 @@ body:
label: Additional Information
description: Please include any additional information or context that may be relevant to your request.
- type: checkboxes
id: terms
id: terms-agreement
attributes:
label: Please agree to the terms of this form.
description: I acknowledge that I must submit this form as an Epic and notify the cms-team user group in the cms-support Slack channel with a link to the epic that is created.
label: I acknowledge that I must submit this form as an Epic and notify the cms-team user group in the cms-support Slack channel with a link to the Epic that is created.
options:
- label: I agree.
validations:
required: true
required: true


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 @@ -4,7 +4,7 @@ about: Request a new Campaign Landing Page, owned by Public
Websites team
title: 'Campaign Landing Page request: <content info>'
labels: Needs refining, Public Websites, VA.gov frontend, User support, CLP
assignees: jilladams, wesrowe
assignees: jilladams, FranECross

---

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/pw-dark-launch.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ about: Request to dark launch CMS content that includes React widget, owned by P
Websites team
title: 'CMS/React content dark launch request: <content info>'
labels: Drupal engineering, Needs refining, Public Websites, VA.gov frontend
assignees: jilladams, wesrowe
assignees: jilladams, FranECross

---

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/pw-forms-bad-pdf-link-pw.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: "(PW) Forms/Bad PDF link defect"
about: Forms outages / Bad PDF links, owned by Public Websites team
title: 'Forms defect: <form name>'
labels: Defect, Find a form, Needs refining, Public Websites
assignees: jilladams, wesrowe
assignees: jilladams, FranECross

---

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

name: "Taxonomy - Add Term"
description: "Use this template when adding terms to the Service or Benefit taxonomy."
title: "[ADD] (Term name) to (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-name
attributes:
label: Proposed term name/label
description: e.g. Veterans Pension
validations:
required: true
- type: input
id: machine-name
attributes:
label: Proposed machine name/ API ID
description: va_service_veterans_pension
validations:
required: false
- type: dropdown
id: overlap
attributes:
label: Does this overlap with any existing term in the taxonomy?
multiple: false
options:
- 'Yes'
- 'No'
validations:
required: true
- type: textarea
id: rationale
attributes:
label: Rationale for adding this term
description: Write a short explanation of why this term is needed. 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: |
- [ ] Term is reviewed by relevant taxonomy governance body
- [ ] Term is either approved for addition, or denied with an explanation
- [ ] If approved, a Drupal admin from Product team may add the term to the taxonomy
- [ ] Content for subfields is drafted in Drupal by Product team
- [ ] (List any necessary review and approval steps here)
- [ ] Term is published
validations:
required: true

1 change: 1 addition & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ As user _uid_ with _user_role_
- [ ] Code Quality Tests have passed.
- [ ] Acceptance Criteria in related issue are met.
- [ ] Manual Code Review Approved.
- [ ] If there are field changes, front end output has been thoroughly checked.

### Select Team for PR review

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/actions-metrics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
timeout-minutes: 10
steps:
- name: Send GitHub Actions metrics to DataDog
uses: int128/datadog-actions-metrics@ddee9ed266fc818c601cadbf6a76624c97b61747 # v1.59.0
uses: int128/datadog-actions-metrics@df9152b8d6c105a0a6bebb9f8878235abce2c4e0 # v1.63.0
with:
datadog-api-key: ${{ secrets.DATADOG_API_KEY }}
collect-job-metrics: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/contextual-advice.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
# branch or its commits, regardless of provenance.
#
# Do not execute any code located within the repository!
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Check Corresponding Entity Reference Fields
# See also `composer va:test:check-cer` in composer.json
run: ./tests/scripts/check-cer.sh
Expand All @@ -28,7 +28,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Composer Validate
run: composer validate

Expand All @@ -38,7 +38,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Post-Checkout Actions
uses: ./.github/actions/post-checkout
- name: ReviewDog
Expand All @@ -55,7 +55,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Post-Checkout Actions
uses: ./.github/actions/post-checkout
- name: Run PHP_CodeSniffer and ReviewDog
Expand All @@ -79,7 +79,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Post-Checkout Actions
uses: ./.github/actions/post-checkout
- name: Run PHPLint
Expand All @@ -92,7 +92,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Post-Checkout Actions
uses: ./.github/actions/post-checkout
- name: Run PHPStan and ReviewDog
Expand All @@ -119,7 +119,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Post-Checkout Actions
uses: ./.github/actions/post-checkout
- name: Run PHPUnit (Unit Tests only)
Expand All @@ -136,7 +136,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Stylelint modules
# See also `composer va:test:stylelint-modules` in composer.json
uses: reviewdog/action-stylelint@548276a94275c7865effa8d72fa8b6983d9f47c4 # v1.18.1
Expand Down Expand Up @@ -164,11 +164,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
fetch-depth: 0
- name: Delete any existing comment.
uses: thollander/actions-comment-pull-request@d61db783da9abefc3437960d0cce08552c7c004f # v2.4.2
uses: thollander/actions-comment-pull-request@1d3973dc4b8e1399c0620d3f2b1aa5e795465308 # v2.4.3
continue-on-error: true
with:
comment_tag: check-composer-lock-changes
Expand All @@ -184,7 +184,7 @@ jobs:
echo "LINES_CHANGED=$LINES_CHANGED" >> $GITHUB_ENV
echo "THRESHOLD=$THRESHOLD" >> $GITHUB_ENV
- name: Comment if composer.lock changes exceed threshold.
uses: thollander/actions-comment-pull-request@d61db783da9abefc3437960d0cce08552c7c004f # v2.4.2
uses: thollander/actions-comment-pull-request@1d3973dc4b8e1399c0620d3f2b1aa5e795465308 # v2.4.3
if: env.LINES_CHANGED > env.THRESHOLD
continue-on-error: true
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
# When Sorry-Cypress support is enabled on `main`, this should be
# removed so that the `main` version of the workflow is used
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/default-branch-datadog-metrics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: ./.github/actions/post-checkout
- name: Find occurrences of "Implements hook" in *.module files.
id: hook_implementations
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: ./.github/actions/post-checkout
- name: Run PHPUnit (Unit Tests only)
run: bin/phpunit \
Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: ./.github/actions/post-checkout
- name: Run PHPLOC and parse output for metrics.
id: phploc_code_quality
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

# Checkout repo to make package allow list available
- name: Checkout
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

# Use a YAML formatted config file to list which dependencies can be auto-merged
- name: Read list of Allowed Auto-merge Dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
token: "${{ secrets.GITHUB_TOKEN }}"
- name: Autolabel
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/set-tugboat-tests-pending.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Set status for Tugboat tasks.
run: |
test_names=(
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ The VA.gov CMS Team
1. [BRD Environments](READMES/brd.md)
1. [HTTPS](READMES/https.md)
1. [Environment Variables](READMES/environment-variables.md)
1. [Kubernetes](READMES/kubernetes.md)
1. [Kubernetes](READMES/historical/kubernetes.md)
1. [Alerts](READMES/alerts.md)
1. [GitHub Workflows](READMES/github-workflows.md)
1. [Logging into BRD (e.g. production, staging) instances](READMES/brd-login.md)
Expand Down
2 changes: 1 addition & 1 deletion READMES/content-model-centralized-content.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ The target_type and the target_uuid provide the details about where the content
2. Add a "Centralized Content Descriptor" paragraph that provides the Title and Description for the paragraph that you will be creating next. This will only appear as guidance for the editors on the node you are creating.
3. Add a paragraph of any type that you need to appear where this centralized content is used. Make sure this paragraph is sorted to appear immediately below the Centralized Content Descriptor you created in the previous step.
4. Wait for this content to appear in the sanitized database you pull into your sandbox.
5. On your sandbox, in the entity bundle that will be the destination for the centralized content, add a field of type "Entity Field Fetch field". Prefix the field's machine name with "cc_". In the settings for the set the target entity type as "Node" since the content is coming from a Centralized content node. Set the node id and the machine name of the field and the uuid of the paragraph to be fetched. (with Tome gone, we will need a cleaner way to get the paragraph UUID)
5. On your sandbox, in the entity bundle that will be the destination for the centralized content, add a field of type "Entity Field Fetch field". Prefix the field's machine name with "cc_". In the settings for the set the target entity type as "Node" since the content is coming from a Centralized content node. Set the node id and the machine name of the field and the uuid of the paragraph to be fetched. The [PID can be found here](https://prod.cms.va.gov/admin/content/audit/centralized-content-paragraphs).
6. Add a "Tooltip" field group widget on both the "Manage form display" and "Manage display" tab for the entity. Then move your field_cc_ field(s) into the field group.
![Example Tooltip and entity field fetch arrangement](images/fetch-field.png)
7. Save and export your entity configuration as you would for adding any field.
Expand Down
Loading

0 comments on commit 8d7f49c

Please sign in to comment.