Skip to content

Commit

Permalink
Merge branch 'main' into VACMS-15798-next-preview-configs
Browse files Browse the repository at this point in the history
  • Loading branch information
@tjheffner
tjheffner authored Nov 8, 2023
2 parents 5d01d85 + 45bfa61 commit 6bf5949
Show file tree
Hide file tree
Showing 12 changed files with 552 additions and 83 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cypress.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
NODE_TLS_REJECT_UNAUTHORIZED: 0

- name: Cypress run
uses: cypress-io/github-action@59810ebfa5a5ac6fcfdcfdf036d1cd4d083a88f2 # v6.5.0
uses: cypress-io/github-action@ebe8b24c4428922d0f793a5c4c96853a633180e3 # v6.6.0
with:
wait-on: "${{ inputs.preview_url }}"
command: 'npm run test:cypress:parallel'
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
"symfony/phpunit-bridge": "^5.1",
"symfony/process": "^4.0",
"symfony/routing": "^4.0",
"va-gov/content-build": "^0.0.3378",
"va-gov/content-build": "^0.0.3383",
"vlucas/phpdotenv": "^5.3",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
Expand Down
130 changes: 63 additions & 67 deletions composer.lock
View file
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": "6e4c15c31d64e3479e8c7bef49129d53",
"content-hash": "6815954ef46674b341aee89059eb3ba7",
"packages": [
{
"name": "alchemy/zippy",
Expand Down Expand Up @@ -202,16 +202,16 @@
},
{
"name": "caxy/php-htmldiff",
"version": "v0.1.14",
"version": "v0.1.15",
"source": {
"type": "git",
"url": "https://github.com/caxy/php-htmldiff.git",
"reference": "3f8ee7edda3d7c6d2e58a02d70a12d3242c84ea5"
"reference": "6342b02ddb86fd36093ad7e2db2efc21f01ab7cd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/3f8ee7edda3d7c6d2e58a02d70a12d3242c84ea5",
"reference": "3f8ee7edda3d7c6d2e58a02d70a12d3242c84ea5",
"url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/6342b02ddb86fd36093ad7e2db2efc21f01ab7cd",
"reference": "6342b02ddb86fd36093ad7e2db2efc21f01ab7cd",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -257,9 +257,9 @@
],
"support": {
"issues": "https://github.com/caxy/php-htmldiff/issues",
"source": "https://github.com/caxy/php-htmldiff/tree/v0.1.14"
"source": "https://github.com/caxy/php-htmldiff/tree/v0.1.15"
},
"time": "2022-01-19T11:09:59+00:00"
"time": "2023-11-05T23:49:04+00:00"
},
{
"name": "chi-teck/drupal-code-generator",
Expand Down Expand Up @@ -3701,17 +3701,17 @@
},
{
"name": "drupal/content_model_documentation",
"version": "1.0.21",
"version": "1.0.22",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/content_model_documentation.git",
"reference": "1.0.21"
"reference": "1.0.22"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/content_model_documentation-1.0.21.zip",
"reference": "1.0.21",
"shasum": "396e36c2a3d143b364341635848bed34ad656746"
"url": "https://ftp.drupal.org/files/projects/content_model_documentation-1.0.22.zip",
"reference": "1.0.22",
"shasum": "d9205b8f9dcfd3dd55337d0fd49c864140fc2077"
},
"require": {
"drupal/config_views": "~2.1",
Expand All @@ -3724,8 +3724,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
"version": "1.0.21",
"datestamp": "1698390837",
"version": "1.0.22",
"datestamp": "1699252266",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
Expand Down Expand Up @@ -5878,26 +5878,26 @@
},
{
"name": "drupal/epp",
"version": "1.5.0",
"version": "1.6.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/epp.git",
"reference": "8.x-1.5"
"reference": "8.x-1.6"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/epp-8.x-1.5.zip",
"reference": "8.x-1.5",
"shasum": "54260bfa2330d36e0dc2d7c6c4574e4b5f084042"
"url": "https://ftp.drupal.org/files/projects/epp-8.x-1.6.zip",
"reference": "8.x-1.6",
"shasum": "5ccebedc80ee904769e60298e76e71ca81ca0eb6"
},
"require": {
"drupal/core": "^8.7.7 || ^9 || ^10"
},
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-1.5",
"datestamp": "1679356317",
"version": "8.x-1.6",
"datestamp": "1699288592",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
Expand Down Expand Up @@ -8184,26 +8184,26 @@
},
{
"name": "drupal/limited_field_widgets",
"version": "2.1.0-beta1",
"version": "2.1.0-beta2",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/limited_field_widgets.git",
"reference": "2.1.0-beta1"
"reference": "2.1.0-beta2"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/limited_field_widgets-2.1.0-beta1.zip",
"reference": "2.1.0-beta1",
"shasum": "2eac2a75bf5f93924205650d51054541c9e9430e"
"url": "https://ftp.drupal.org/files/projects/limited_field_widgets-2.1.0-beta2.zip",
"reference": "2.1.0-beta2",
"shasum": "3ed1431bb4ed734b1131c2b78f6a948ef2e71349"
},
"require": {
"drupal/core": ">=9.2"
},
"type": "drupal-module",
"extra": {
"drupal": {
"version": "2.1.0-beta1",
"datestamp": "1697010667",
"version": "2.1.0-beta2",
"datestamp": "1699106716",
"security-coverage": {
"status": "not-covered",
"message": "Beta releases are not covered by Drupal security advisories."
Expand Down Expand Up @@ -10004,26 +10004,26 @@
},
{
"name": "drupal/node_revision_delete",
"version": "1.0.0-rc6",
"version": "1.0.0-rc7",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/node_revision_delete.git",
"reference": "8.x-1.0-rc6"
"reference": "8.x-1.0-rc7"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/node_revision_delete-8.x-1.0-rc6.zip",
"reference": "8.x-1.0-rc6",
"shasum": "68db55e328bc247a2a16501dd930538961314107"
"url": "https://ftp.drupal.org/files/projects/node_revision_delete-8.x-1.0-rc7.zip",
"reference": "8.x-1.0-rc7",
"shasum": "e689fd6bc78afe2e26b7871ed4dc56d4dec3abd7"
},
"require": {
"drupal/core": "^8.7.7 || ^9.0 || ^10"
},
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-1.0-rc6",
"datestamp": "1668447494",
"version": "8.x-1.0-rc7",
"datestamp": "1698848506",
"security-coverage": {
"status": "not-covered",
"message": "RC releases are not covered by Drupal security advisories."
Expand Down Expand Up @@ -12764,26 +12764,26 @@
},
{
"name": "drupal/tzfield",
"version": "1.7.0",
"version": "1.8.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/tzfield.git",
"reference": "8.x-1.7"
"reference": "8.x-1.8"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/tzfield-8.x-1.7.zip",
"reference": "8.x-1.7",
"shasum": "12f6a0ee4a73755ce4735d0301a8af2179f1dba5"
"url": "https://ftp.drupal.org/files/projects/tzfield-8.x-1.8.zip",
"reference": "8.x-1.8",
"shasum": "5793920c1d56dde77652f6b4b1e3ba3ae4625f1f"
},
"require": {
"drupal/core": "^8 || ^9 || ^10"
},
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-1.7",
"datestamp": "1673516096",
"version": "8.x-1.8",
"datestamp": "1698896138",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
Expand Down Expand Up @@ -13268,10 +13268,6 @@
"name": "MChittenden",
"homepage": "https://www.drupal.org/user/2288348"
},
{
"name": "ofry",
"homepage": "https://www.drupal.org/user/2740599"
},
{
"name": "shelane",
"homepage": "https://www.drupal.org/user/2674989"
Expand All @@ -13285,21 +13281,21 @@
},
{
"name": "drupal/views_data_export",
"version": "1.3.0",
"version": "1.4.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/views_data_export.git",
"reference": "8.x-1.3"
"reference": "8.x-1.4"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/views_data_export-8.x-1.3.zip",
"reference": "8.x-1.3",
"shasum": "a8a5483e13787f2bb3eb66d9b0f19d96c0d8d7c1"
"url": "https://ftp.drupal.org/files/projects/views_data_export-8.x-1.4.zip",
"reference": "8.x-1.4",
"shasum": "70dede9fdf50601232f068e67309d361341e88c5"
},
"require": {
"drupal/core": "^9 || ^10",
"drupal/csv_serialization": "~1.4 || ~2.0 || ~3"
"drupal/csv_serialization": "~1.4 || ~2.0 || ~3 || ~4"
},
"require-dev": {
"drupal/search_api": "~1.12",
Expand All @@ -13308,8 +13304,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-1.3",
"datestamp": "1679072666",
"version": "8.x-1.4",
"datestamp": "1698948991",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
Expand Down Expand Up @@ -16279,16 +16275,16 @@
},
{
"name": "mglaman/phpstan-drupal",
"version": "1.2.0",
"version": "1.2.1",
"source": {
"type": "git",
"url": "https://github.com/mglaman/phpstan-drupal.git",
"reference": "d721420086f146640acecebb7a678661a66e97d5"
"reference": "920c6b972a832046327f66dc6ff7448e3b5d6e4c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/d721420086f146640acecebb7a678661a66e97d5",
"reference": "d721420086f146640acecebb7a678661a66e97d5",
"url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/920c6b972a832046327f66dc6ff7448e3b5d6e4c",
"reference": "920c6b972a832046327f66dc6ff7448e3b5d6e4c",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -16363,7 +16359,7 @@
"description": "Drupal extension and rules for PHPStan",
"support": {
"issues": "https://github.com/mglaman/phpstan-drupal/issues",
"source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.0"
"source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.1"
},
"funding": [
{
Expand All @@ -16379,7 +16375,7 @@
"type": "tidelift"
}
],
"time": "2023-08-24T20:32:56+00:00"
"time": "2023-11-03T13:17:28+00:00"
},
{
"name": "michelf/php-markdown",
Expand Down Expand Up @@ -26915,16 +26911,16 @@
},
{
"name": "va-gov/content-build",
"version": "v0.0.3378",
"version": "v0.0.3383",
"source": {
"type": "git",
"url": "https://github.com/department-of-veterans-affairs/content-build.git",
"reference": "51b6a6dafdb360cd2c7a02e4a7aa14453d40e9ae"
"reference": "ec4aa8360e1e4fc028a17c29408c6aad1ace4e26"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/51b6a6dafdb360cd2c7a02e4a7aa14453d40e9ae",
"reference": "51b6a6dafdb360cd2c7a02e4a7aa14453d40e9ae",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/ec4aa8360e1e4fc028a17c29408c6aad1ace4e26",
"reference": "ec4aa8360e1e4fc028a17c29408c6aad1ace4e26",
"shasum": ""
},
"type": "node-project",
Expand All @@ -26951,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.3378"
"source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3383"
},
"time": "2023-10-30T17:47:27+00:00"
"time": "2023-11-07T23:50:06+00:00"
},
{
"name": "vlucas/phpdotenv",
Expand Down Expand Up @@ -27809,5 +27805,5 @@
"platform-overrides": {
"php": "8.1"
},
"plugin-api-version": "2.6.0"
"plugin-api-version": "2.3.0"
}
14 changes: 13 additions & 1 deletion config/sync/core.entity_form_display.media.document.default.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ third_party_settings:
group_governance:
children:
- field_owner
- field_media_in_library
label: 'Section settings'
region: content
parent_name: ''
Expand All @@ -41,6 +42,13 @@ content:
settings:
progress_indicator: throbber
third_party_settings: { }
field_media_in_library:
type: boolean_checkbox
weight: 4
region: content
settings:
display_label: true
third_party_settings: { }
field_media_submission_guideline:
type: markup
weight: 0
Expand All @@ -61,9 +69,13 @@ content:
size: 60
placeholder: ''
third_party_settings: { }
translation:
weight: 10
region: content
settings: { }
third_party_settings: { }
hidden:
created: true
field_media_in_library: true
langcode: true
moderation_state: true
path: true
Expand Down
Loading

0 comments on commit 6bf5949

Please sign in to comment.