Skip to content

Commit

Permalink
Merge branch 'main' into VACMS-15911-add-featured-content-vba
Browse files Browse the repository at this point in the history
  • Loading branch information
omahane authored Nov 16, 2023
2 parents 08e8fe1 + 53cdb8f commit 8315212
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 17 deletions.
29 changes: 25 additions & 4 deletions .github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

name: CMS Collaboration Cycle Request
description: Use this template to begin engaging with the CMS Collaboration Cycle.
title: "CMS Collaboration Cycle for [Team Name, Product Name, Feature Name]"
Expand All @@ -11,7 +10,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. Have questions about this form? Reach out to the CMS Team in the cms-support Slack channel.
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? Read our [Kickoff Request documentation](https://github.com/department-of-veterans-affairs/va.gov-team/blob/master/platform/cms/collaboration-cycle/kickoff.md) in Github or reach out to the CMS Team in the cms-support Slack channel.
- type: input
id: product-outline
attributes:
Expand Down Expand Up @@ -64,7 +63,7 @@ body:
- type: dropdown
id: research
attributes:
label: Are you doing user research with CMS editors?
label: Will you be doing user research with CMS editors?
multiple: false
options:
- "Yes"
Expand All @@ -83,6 +82,17 @@ body:
- "Maybe (Leave notes in the Additional Information section of this form)"
validations:
required: true
- type: dropdown
id: DS
attributes:
label: Will your work require introducing a new CMS Design System component or changes to an existing component?
multiple: false
options:
- "Yes"
- "No"
- "Maybe (Leave notes in the Additional Information section of this form)"
validations:
required: true
- type: dropdown
id: modules
attributes:
Expand All @@ -94,10 +104,21 @@ body:
- "Maybe (Leave notes in the Additional Information section of this form)"
validations:
required: true
- type: dropdown
id: fields
attributes:
label: Will your work require introducing new input fields or making changes to existing input fields?
multiple: false
options:
- "Yes"
- "No"
- "Maybe (Leave notes in the Additional Information section of this form)"
validations:
required: true
- type: dropdown
id: analytics
attributes:
label: Do you need to capture any analytics or metrics?
label: Will this work require you to capture any analytics or metrics?
multiple: false
options:
- "Yes"
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
"symfony/phpunit-bridge": "^5.1",
"symfony/process": "^4.0",
"symfony/routing": "^4.0",
"va-gov/content-build": "^0.0.3386",
"va-gov/content-build": "^0.0.3387",
"vlucas/phpdotenv": "^5.3",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
Expand Down
16 changes: 8 additions & 8 deletions composer.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "b75d7fc5fc1fcbb7c55c0ce0ecec6d7f",
"content-hash": "dc1ef17bd85e532906f75d7386c5a291",
"packages": [
{
"name": "alchemy/zippy",
Expand Down Expand Up @@ -26911,16 +26911,16 @@
},
{
"name": "va-gov/content-build",
"version": "v0.0.3386",
"version": "v0.0.3387",
"source": {
"type": "git",
"url": "https://github.com/department-of-veterans-affairs/content-build.git",
"reference": "9008b5b142da3ff733e9c7aae18643621cbd8967"
"reference": "917fa5884dd7db0d7f39ca56b21d758d4b3f417d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/9008b5b142da3ff733e9c7aae18643621cbd8967",
"reference": "9008b5b142da3ff733e9c7aae18643621cbd8967",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/917fa5884dd7db0d7f39ca56b21d758d4b3f417d",
"reference": "917fa5884dd7db0d7f39ca56b21d758d4b3f417d",
"shasum": ""
},
"type": "node-project",
Expand All @@ -26947,9 +26947,9 @@
"description": "Front-end for VA.gov. This repository contains the code that generates the www.va.gov website. It contains a Metalsmith static site builder that uses a Drupal CMS for content. This file is here to publish releases to https://packagist.org/packages/va-gov/content-build, so that the CMS CI system can install it and update it using standard composer processes, and so that we can run tests across both systems. See https://github.com/department-of-veterans-affairs/va.gov-cms for the CMS repo, and stand by for more documentation.",
"support": {
"issues": "https://github.com/department-of-veterans-affairs/content-build/issues",
"source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3386"
"source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3387"
},
"time": "2023-11-14T19:23:29+00:00"
"time": "2023-11-15T16:10:47+00:00"
},
{
"name": "vlucas/phpdotenv",
Expand Down Expand Up @@ -27872,5 +27872,5 @@
"platform-overrides": {
"php": "8.1"
},
"plugin-api-version": "2.3.0"
"plugin-api-version": "2.6.0"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
text:
-
value: "<p>VA Directive 6102 requires that VA content is reviewed yearly to ensure information is still relevant. RCS recommends a minimum quarterly review as a best practice. All content will need to be reviewed, and outdated content will need to be edited to remain compliant with VA Directive 6102.&nbsp;<a href=\"https://prod.cms.va.gov/help/va-directive-6102\">Learn more about VA Directive 6102.</a></p>\r\n\r\n<hr />\r\n<p>To assist with getting your content compliant, we are sending you this monthly reminder to log into Drupal, review and update your website content, and attest that your content is up-to-date.</p>\r\n\r\n<p>Reviewing your website top to bottom at least quarterly will help you to maintain updated and accurate location and service information and keep the website compliant with VA Directive 6102. For more information, you can read this <a href=\"https://prod.cms.va.gov/help/vet-centers/vet-center-content-review\">Knowledge Base article</a>&nbsp;for tips and best practices to manage compliance.</p>\r\n\r\n<p>Need help?</p>\r\n\r\n<ul>\r\n\t<li>If you are a Vet Center Director or Outreach Specialist who needs assistance accessing Drupal CMS, please email the CMS Support Team at&nbsp;<a href=\"mailto:[email protected]\">[email protected]</a>.</li>\r\n\t<li>If you want to refresh your skills, need ideas, or have questions about creating content for your webpages, you can find How to Guides and Training videos in the&nbsp;<a href=\"https://prod.cms.va.gov/help/vet-centers\">Drupal CMS Knowledge Base</a>&nbsp;or drop in during office hours.</li>\r\n\t<li>If you received this email and no longer have a role at a Vet Center, please inform us by emailing the CMS Support Team at&nbsp;<a href=\"mailto:[email protected]\">[email protected]</a>.</li>\r\n</ul>\r\n\r\n<p dir=\"auto\">Please note that before the end of the calendar year a formal suspense will be sent to ensure 100 percent compliance. We encourage you to make use of the resources and tools available before then to ensure your success and the success of information delivery on your page!</p>\r\n"
value: "<p>VA Directive 6102 requires that VA content is reviewed yearly to ensure information is still relevant. RCS recommends a minimum quarterly review as a best practice. All content will need to be reviewed, and outdated content will need to be edited to remain compliant with VA Directive 6102.&nbsp;<a href=\"https://prod.cms.va.gov/help/va-directive-6102\">Learn more about VA Directive 6102.</a></p>\r\n\r\n<hr />\r\n<p>To assist with getting your content compliant, we are sending you this monthly reminder to log into Drupal, review and update your website content, and attest that your content is up-to-date.</p>\r\n\r\n<p>Reviewing your website top to bottom at least quarterly will help you to maintain updated and accurate location and service information and keep the website compliant with VA Directive 6102. For more information, you can read this <a href=\"https://prod.cms.va.gov/help/vet-centers/vet-center-content-review\">Knowledge Base article</a>&nbsp;for tips and best practices to manage compliance.</p>\r\n\r\n<p>Need help?</p>\r\n\r\n<ul>\r\n\t<li>If you are a Vet Center Director or Outreach Specialist who needs assistance accessing Drupal CMS, please email the CMS Support Team at&nbsp;<a href=\"mailto:[email protected]\">[email protected]</a>.</li>\r\n\t<li>If you want to refresh your skills, need ideas, or have questions about creating content for your webpages, you can find How to Guides and Training videos in the&nbsp;<a href=\"https://prod.cms.va.gov/help/vet-centers\">Drupal CMS Knowledge Base</a>&nbsp;or drop in during office hours.</li>\r\n\t<li>If you received this email and no longer have a role at a Vet Center, please inform us by emailing the CMS Support Team at&nbsp;<a href=\"mailto:[email protected]\">[email protected]</a>.</li>\r\n</ul>\r\n\r\n<p dir=\"auto\">Please note that before the end of the calendar year a formal suspense will be sent to ensure 100 percent compliance. We encourage you to make use of the resources and tools available before then to ensure your success and the success of information delivery on your page!</p>\r\n"
format: rich_text
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ label: 'Vet Center Outdated Content'
description: 'Email for Vet Center section members, notifying them of outdated content. '
text:
-
value: "<p>VA Directive 6102 requires that VA content is reviewed yearly to ensure information is still relevant. RCS recommends a minimum quarterly review as a best practice. All content will need to be reviewed, and outdated content will need to be edited to remain compliant with VA Directive 6102.&nbsp;<a href=\"https://prod.cms.va.gov/help/va-directive-6102\">Learn more about VA Directive 6102.</a></p>\r\n\r\n<hr />\r\n<p>To assist with getting your content compliant, we are sending you this monthly reminder to log into Drupal, review and update your website content, and attest that your content is up-to-date.</p>\r\n\r\n<p>Reviewing your website top to bottom at least quarterly will help you to maintain updated and accurate location and service information and keep the website compliant with VA Directive 6102. For more information, you can read this <a href=\"https://prod.cms.va.gov/help/vet-centers/vet-center-content-review\">Knowledge Base article</a>&nbsp;for tips and best practices to manage compliance.</p>\r\n\r\n<p>Need help?</p>\r\n\r\n<ul>\r\n\t<li>If you are a Vet Center Director or Outreach Specialist who needs assistance accessing Drupal CMS, please email the CMS Support Team at&nbsp;<a href=\"mailto:[email protected]\">[email protected]</a>.</li>\r\n\t<li>If you want to refresh your skills, need ideas, or have questions about creating content for your webpages, you can find How to Guides and Training videos in the&nbsp;<a href=\"https://prod.cms.va.gov/help/vet-centers\">Drupal CMS Knowledge Base</a>&nbsp;or drop in during office hours.</li>\r\n\t<li>If you received this email and no longer have a role at a Vet Center, please inform us by emailing the CMS Support Team at&nbsp;<a href=\"mailto:[email protected]\">[email protected]</a>.</li>\r\n</ul>\r\n\r\n<p dir=\"auto\">Please note that before the end of the calendar year a formal suspense will be sent to ensure 100 percent compliance. We encourage you to make use of the resources and tools available before then to ensure your success and the success of information delivery on your page!</p>\r\n"
value: "<p>VA Directive 6102 requires that VA content is reviewed yearly to ensure information is still relevant. RCS recommends a minimum quarterly review as a best practice. All content will need to be reviewed, and outdated content will need to be edited to remain compliant with VA Directive 6102.&nbsp;<a href=\"https://prod.cms.va.gov/help/va-directive-6102\">Learn more about VA Directive 6102.</a></p>\r\n\r\n<hr />\r\n<p>To assist with getting your content compliant, we are sending you this monthly reminder to log into Drupal, review and update your website content, and attest that your content is up-to-date.</p>\r\n\r\n<p>Reviewing your website top to bottom at least quarterly will help you to maintain updated and accurate location and service information and keep the website compliant with VA Directive 6102. For more information, you can read this <a href=\"https://prod.cms.va.gov/help/vet-centers/vet-center-content-review\">Knowledge Base article</a>&nbsp;for tips and best practices to manage compliance.</p>\r\n\r\n<p>Need help?</p>\r\n\r\n<ul>\r\n\t<li>If you are a Vet Center Director or Outreach Specialist who needs assistance accessing Drupal CMS, please email the CMS Support Team at&nbsp;<a href=\"mailto:[email protected]\">[email protected]</a>.</li>\r\n\t<li>If you want to refresh your skills, need ideas, or have questions about creating content for your webpages, you can find How to Guides and Training videos in the&nbsp;<a href=\"https://prod.cms.va.gov/help/vet-centers\">Drupal CMS Knowledge Base</a>&nbsp;or drop in during office hours.</li>\r\n\t<li>If you received this email and no longer have a role at a Vet Center, please inform us by emailing the CMS Support Team at&nbsp;<a href=\"mailto:[email protected]\">[email protected]</a>.</li>\r\n</ul>\r\n\r\n<p dir=\"auto\">Please note that before the end of the calendar year a formal suspense will be sent to ensure 100 percent compliance. We encourage you to make use of the resources and tools available before then to ensure your success and the success of information delivery on your page!</p>\r\n"
format: rich_text
settings:
'token options':
Expand Down
5 changes: 3 additions & 2 deletions hooks/git/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Check a specified branch name against a list of allowed patterns.
function check_branch_name() {
case $1 in
VAGOV-TEAM-[1-9][0-9]* | VACMS-[1-9][0-9]* | dependabot/* | revert-* | "") return 0;;
VAGOV-TEAM-[1-9][0-9]* | VACMS-[1-9][0-9]* | dependabot/* | revert-* | [1-9][0-9]* | "") return 0;;
*) return 1;;
esac
}
Expand All @@ -22,7 +22,8 @@ function branch_name_error() {
cat <<-EOF >&2
Aborting commit. Your branch name must be prefixed with one of the following:
- a VAGOV-TEAM-* or VACMS-* Github issue number format,
e.g. VAGOV-TEAM-123-issue-name or VACMS-123-issue-name.
e.g. VAGOV-TEAM-123-issue-name or VACMS-123-issue-name
- a new GitHub issue number format, e.g. 123-issue-name
- dependabot/* (for work on Dependabot PRs)
- revert-* (for work on GitHub-initiated revert PRs)
Expand Down

0 comments on commit 8315212

Please sign in to comment.