Skip to content

Commit

Permalink
Merge branch 'main' into VACMS-18257-retain_composer_git_directories
Browse files Browse the repository at this point in the history
  • Loading branch information
timcosgrove authored Jun 27, 2024
2 parents 4761f97 + b30614f commit 03a9f1c
Show file tree
Hide file tree
Showing 30 changed files with 373 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/change-management-epic.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Change management
about: Use this template for planning, coordinating and monitoring activities related
to VFS-CMS updates that have a medium to high impact on VA employees.
title: Change management for <insert issue name>
labels: Needs refining
labels: Needs refining, sitewide
assignees: ''

---
Expand Down
6 changes: 2 additions & 4 deletions .github/ISSUE_TEMPLATE/cms-team-member-onboarding.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,8 @@ Github + Zenhub are the tools required for sprint boards, epics, estimates, and
You can view team sprint boards using either the Github view with Zenhub browser extension enabled, or the Zenhub webapp view.
* CMS team: [Github view](https://github.com/department-of-veterans-affairs/va.gov-cms/#workspaces/vagov-cms-team-5c0e7b864b5806bc2bfc2087/board), [Zenhub webapp view](https://app.zenhub.com/workspaces/vagov-cms-team-5c0e7b864b5806bc2bfc2087/board)
)
* Sitewide Facilities and Public Websites teams also run their sprints from the same repository, and any repo / workspace changes should be mindful of not impacting their workspaces / boards:
* Facilities: [Github view](https://github.com/department-of-veterans-affairs/va.gov-cms/#workspaces/sitewide-facilities-639f5253e4b702a32376339e/board), [Zenhub webapp view](https://app.zenhub.com/workspaces/sitewide-facilities-639f5253e4b702a32376339e/board
)
* Public Websites: [Github view](https://github.com/department-of-veterans-affairs/va.gov-cms/#workspaces/public-websites-6171bf4bf43742001af18cc5/board), [Zenhub webapp view](https://app.zenhub.com/workspaces/public-websites-6171bf4bf43742001af18cc5/board)
* Sitewide team also runs their sprints from the same repository, and any repo / workspace changes should be mindful of not impacting their workspace / board:
* VA.gov Sitewide Product team: [Github view](https://github.com/department-of-veterans-affairs/va.gov-cms/issues/new/choose#workspaces/vagov-sitewide-product-team-6645154188a81a1f7a0a9464/board, [Zenhub webapp view](https://app.zenhub.com/workspaces/vagov-sitewide-product-team-6645154188a81a1f7a0a9464/board)

### Process & Principles
- [ ] Read about our teams' [Agile / sprint best practices](https://github.com/department-of-veterans-affairs/va.gov-team/blob/master/platform/cms/onboarding/library/sprint-best-practices.md)
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/octode-project-board-epic.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Sitewide Epic - Web Governance Board
about: Epic template for Sitewide projects that need to be publicized in the Web Governance Board project view, for Public Websites and Facilities teams.
title: ""
labels: Epic
labels: Epic, sitewide
assignees: ''

---
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 @@ -3,7 +3,7 @@ name: "(PW) Campaign Landing Page request"
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
labels: Needs refining, Public Websites, VA.gov frontend, User support, CLP, sitewide
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 @@ -2,7 +2,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
labels: Defect, Find a form, Needs refining, Public Websites, sitewide
assignees: jilladams, FranECross

---
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/pw-injected-header-publish.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: "(PW) Injected Header/Footer - publish to prod"
about: Submit a request to publish the injected header/footer to prod.
title: 'Injected header/footer: Publish to prod: <domain(s)>'
labels: Injected header, Needs refining, Public Websites, VA.gov frontend
labels: Injected header, Needs refining, Public Websites, VA.gov frontend, sitewide
assignees: jilladams

---
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/pw-injected-header.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: "(PW) Injected Header/Footer - prep for testing"
about: Submit a request to add the injected header/footer an existing site.
title: 'Injected header/footer: <domain(s)>'
labels: Injected header, Needs refining, Public Websites, VA.gov frontend
labels: Injected header, Needs refining, Public Websites, VA.gov frontend, sitewide
assignees: jilladams

---
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/pw-issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: "(PW) Issue template"
about: Issue template for Public Websites team
title: ''
labels: Needs refining, Public Websites
labels: Needs refining, Public Websites, sitewide
assignees: ''

---
Expand Down
45 changes: 45 additions & 0 deletions .github/ISSUE_TEMPLATE/sitewide-qa-plan.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
---
name: Sitewide QA Plan
about: QA plan template for test coverage of big-enough features
title: 'QA test plan for: '
labels: sitewide, Facilities, Manual QA, Public Websites
assignees: ''

---

# Testing context

Implementation ticket being tested:
Who wrote the changes:

## Testing environment
- [ ] Local. **WHY**:
- [ ] Review instance on a PR
- [ ] Tugboat. **WHY**:
- [ ] Staging behind a flipper. **WHY**:

## Scope of changes: high level


## Affected components / what changed / what is new and should be tested


## Gotchas / Exceptions


## Acceptance Criteria / Ownership
- [ ] Schedule QA call to discuss implementation / testing needs with code author, PM, a11y, and design as needed
- [ ] Build a test plan from the [Test plan template](https://docs.google.com/spreadsheets/d/10qA57ATiFCi4Tju_TzWPQAkSSCbr7F2oXbXn_lEzuS4/edit#gid=0). Include:
- [ ]
- [ ] Run test cases in the noted Testing environment
- [ ] Note failures in the spreadsheet and point to either a GH ticket or a Mural to demonstrate what you found
- [ ] Accessibility review - Owner:
- [ ] Design review - Owner:
- [ ] Code review - Owner:
- [ ] Production UAT - Owner:


### Ticket hygiene
- [ ] Add product label(s)
- [ ] Add to relevant epic
- [ ] Adjust / Remove team labels as appropriate
6 changes: 5 additions & 1 deletion READMES/migrations-facility.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,11 @@ For these migrations to function, you'll need to obtain a Facility API Key from
$settings['post_api_endpoint_host'] = 'https://sandbox-api.va.gov';
$settings['post_api_apikey'] = 'PASTE_KEY_HERE';

$facility_api_urls = ['https://sandbox-api.va.gov/services/va_facilities/v0/facilities/all'];
$facility_api_urls = [
'https://sandbox-api.va.gov/services/va_facilities/v1/facilities?per_page=1000',
'https://sandbox-api.va.gov/services/va_facilities/v1/facilities?per_page=1000&page=2',
'https://sandbox-api.va.gov/services/va_facilities/v1/facilities?per_page=1000&page=3',
];
$facility_api_key = $settings['post_api_apikey'];
$facility_migrations = [
'va_node_health_care_local_facility',
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
"symfony/phpunit-bridge": "^5.1",
"symfony/process": "^6.3",
"symfony/routing": "^6.3",
"va-gov/content-build": "^0.0.3497",
"va-gov/content-build": "^0.0.3536",
"vlucas/phpdotenv": "^5.3",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
Expand Down
14 changes: 7 additions & 7 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": "0604d3291e5dbfae69f055e29a876e91",
"content-hash": "47cf0b96e9848155990d8b6eb316d442",
"packages": [
{
"name": "asm89/stack-cors",
Expand Down Expand Up @@ -25977,16 +25977,16 @@
},
{
"name": "va-gov/content-build",
"version": "v0.0.3497",
"version": "v0.0.3536",
"source": {
"type": "git",
"url": "https://github.com/department-of-veterans-affairs/content-build.git",
"reference": "dfddf6215dbe20434b29d223b89343a9b5c32441"
"reference": "423a174042b5787c2b4bf3fb2b7d9c5920e0b6d3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/dfddf6215dbe20434b29d223b89343a9b5c32441",
"reference": "dfddf6215dbe20434b29d223b89343a9b5c32441",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/423a174042b5787c2b4bf3fb2b7d9c5920e0b6d3",
"reference": "423a174042b5787c2b4bf3fb2b7d9c5920e0b6d3",
"shasum": ""
},
"type": "node-project",
Expand All @@ -26013,9 +26013,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.3497"
"source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3536"
},
"time": "2024-05-02T18:02:31+00:00"
"time": "2024-06-26T14:28:17+00:00"
},
{
"name": "vlucas/phpdotenv",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ mode: default
content:
field_link:
type: linkit
weight: 2
weight: 3
region: content
settings:
placeholder_url: ''
Expand All @@ -26,7 +26,7 @@ content:
third_party_settings: { }
field_links:
type: linkit
weight: 1
weight: 2
region: content
settings:
placeholder_url: ''
Expand All @@ -42,6 +42,11 @@ content:
size: 60
placeholder: ''
third_party_settings: { }
translation:
weight: 4
region: content
settings: { }
third_party_settings: { }
hidden:
created: true
status: true
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ langcode: en
status: true
dependencies:
config:
- field.field.paragraph.lists_of_links.field_list_of_links_description
- field.field.paragraph.lists_of_links.field_section_header
- field.field.paragraph.lists_of_links.field_va_paragraphs
- paragraphs.paragraphs_type.lists_of_links
Expand All @@ -13,6 +14,14 @@ targetEntityType: paragraph
bundle: lists_of_links
mode: default
content:
field_list_of_links_description:
type: string_textarea
weight: 1
region: content
settings:
rows: 5
placeholder: ''
third_party_settings: { }
field_section_header:
type: string_textfield
weight: 0
Expand All @@ -23,7 +32,7 @@ content:
third_party_settings: { }
field_va_paragraphs:
type: paragraphs
weight: 1
weight: 2
region: content
settings:
title: 'List of links'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ langcode: en
status: true
dependencies:
config:
- field.field.paragraph.lists_of_links.field_list_of_links_description
- field.field.paragraph.lists_of_links.field_section_header
- field.field.paragraph.lists_of_links.field_va_paragraphs
- paragraphs.paragraphs_type.lists_of_links
Expand All @@ -13,6 +14,13 @@ targetEntityType: paragraph
bundle: lists_of_links
mode: default
content:
field_list_of_links_description:
type: basic_string
label: hidden
settings: { }
third_party_settings: { }
weight: 1
region: content
field_section_header:
type: string
label: hidden
Expand All @@ -28,7 +36,7 @@ content:
view_mode: default
link: ''
third_party_settings: { }
weight: 1
weight: 2
region: content
hidden:
search_api_excerpt: true
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ status: true
dependencies:
config:
- core.entity_view_mode.paragraph.user_guides
- field.field.paragraph.lists_of_links.field_list_of_links_description
- field.field.paragraph.lists_of_links.field_section_header
- field.field.paragraph.lists_of_links.field_va_paragraphs
- paragraphs.paragraphs_type.lists_of_links
Expand All @@ -14,6 +15,13 @@ targetEntityType: paragraph
bundle: lists_of_links
mode: user_guides
content:
field_list_of_links_description:
type: basic_string
label: hidden
settings: { }
third_party_settings: { }
weight: 1
region: content
field_section_header:
type: string
label: hidden
Expand All @@ -29,7 +37,7 @@ content:
view_mode: user_guides
link: ''
third_party_settings: { }
weight: 1
weight: 2
region: content
hidden:
search_api_excerpt: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
uuid: 595a8297-6138-4f1f-9946-37b85a342fef
langcode: en
status: true
dependencies:
config:
- field.storage.paragraph.field_list_of_links_description
- paragraphs.paragraphs_type.lists_of_links
module:
- tmgmt_content
third_party_settings:
tmgmt_content:
excluded: false
id: paragraph.lists_of_links.field_list_of_links_description
field_name: field_list_of_links_description
entity_type: paragraph
bundle: lists_of_links
label: 'List of Links Description'
description: 'Optional description field to help describe the list of links.'
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
field_type: string_long
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
uuid: b271d23e-fda1-4a0a-a349-1beb9757c506
langcode: en
status: true
dependencies:
module:
- paragraphs
id: paragraph.field_list_of_links_description
field_name: field_list_of_links_description
entity_type: paragraph
type: string_long
settings:
case_sensitive: false
module: core
locked: false
cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false
custom_storage: false
8 changes: 8 additions & 0 deletions config/sync/system.menu.family-and-caregiver-benefits.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
uuid: cf8c6ec1-427b-499a-9f81-a36bfbed9e87
langcode: en
status: true
dependencies: { }
id: family-and-caregiver-benefits
label: 'Family and caregiver benefits hub'
description: 'For pages in the /family-and-caregiver-benefits benefit hub'
locked: false
2 changes: 1 addition & 1 deletion docroot/design-system/.storybook/cssVariables.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,4 @@
"--focus-outline": "2px dotted transparent",
"--focus-box-shadow": "0 0 0 2px #fff, 0 0 0 5px #26a769"
}
}
}
Loading

0 comments on commit 03a9f1c

Please sign in to comment.