Skip to content

Commit

Permalink
VAGOV-6370: Adding meta fieldsets to node forms. (#887)
Browse files Browse the repository at this point in the history 
* VAGOV-6370: Adding meta fieldsets to node forms.

* VAGOV-6370: Updating content model tests.

Co-authored-by: Steve Wirt <swirtSJW@users.noreply.github.com>
  • Loading branch information
@ethanteague @swirtSJW
ethanteague and swirtSJW authored Feb 5, 2020
1 parent d8e97a4 commit 7dac80a
Show file tree
Hide file tree
Showing 23 changed files with 280 additions and 135 deletions.
46 changes: 29 additions & 17 deletions config/sync/core.entity_form_display.node.event.default.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ third_party_settings:
- moderation_state
- revision_log
parent_name: ''
weight: 17
weight: 15
format_type: details
format_settings:
id: ''
Expand Down Expand Up @@ -130,14 +130,27 @@ third_party_settings:
weight: '0'
label: 'Feature This Content'
region: content
group_meta_tags:
children:
- field_description
parent_name: ''
weight: 5
format_type: fieldset
format_settings:
id: ''
classes: ''
description: ''
required_fields: true
label: 'Meta Tags'
region: content
id: node.event.default
targetEntityType: node
bundle: event
mode: default
content:
created:
type: datetime_timestamp
weight: 14
weight: 11
region: content
settings: { }
third_party_settings: { }
Expand All @@ -150,20 +163,19 @@ content:
type: text_textarea
region: content
field_address:
weight: 40
settings:
default_country: US
weight: 16
settings: { }
third_party_settings: { }
type: address_default
region: content
field_administration:
weight: 16
weight: 21
settings: { }
third_party_settings: { }
type: options_select
region: content
field_body:
weight: 5
weight: 4
settings:
rows: 5
placeholder: ''
Expand Down Expand Up @@ -212,7 +224,7 @@ content:
type: boolean_checkbox
region: content
field_facility_location:
weight: 37
weight: 13
settings: { }
third_party_settings: { }
type: options_select
Expand All @@ -233,27 +245,27 @@ content:
type: link_default
region: content
field_location_humanreadable:
weight: 39
weight: 15
settings:
size: 60
placeholder: ''
third_party_settings: { }
type: string_textfield
region: content
field_location_type:
weight: 36
weight: 12
settings: { }
third_party_settings: { }
type: options_select
region: content
field_media:
type: media_library_widget
weight: 4
weight: 3
settings: { }
region: content
third_party_settings: { }
field_meta_tags:
weight: 12
weight: 14
settings: { }
third_party_settings: { }
type: metatag_firehose
Expand All @@ -271,7 +283,7 @@ content:
type: options_select
region: content
field_url_of_an_online_event:
weight: 38
weight: 14
settings:
placeholder_url: ''
placeholder_title: ''
Expand All @@ -287,13 +299,13 @@ content:
third_party_settings: { }
path:
type: path
weight: 15
weight: 12
region: content
settings: { }
third_party_settings: { }
revision_log:
type: hide_revision_field_log_widget
weight: 15
weight: 16
region: content
settings:
show: true
Expand All @@ -313,15 +325,15 @@ content:
third_party_settings: { }
uid:
type: entity_reference_autocomplete
weight: 13
weight: 10
settings:
match_operator: CONTAINS
size: 60
placeholder: ''
region: content
third_party_settings: { }
url_redirects:
weight: 16
weight: 13
region: content
settings: { }
third_party_settings: { }
Expand Down
26 changes: 19 additions & 7 deletions config/sync/core.entity_form_display.node.event_listing.default.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ third_party_settings:
children:
- field_administration
parent_name: ''
weight: 3
weight: 4
format_type: details_sidebar
format_settings:
id: ''
Expand All @@ -39,7 +39,7 @@ third_party_settings:
- moderation_state
- revision_log
parent_name: ''
weight: 2
weight: 3
format_type: fieldset
format_settings:
id: ''
Expand All @@ -52,8 +52,6 @@ third_party_settings:
group_meta:
children:
- title
- field_meta_title
- field_description
- field_intro_text
parent_name: ''
weight: 1
Expand All @@ -63,7 +61,21 @@ third_party_settings:
required_fields: true
id: ''
classes: ''
label: 'Title, Meta tags, and Intro'
label: 'Title and summary'
region: content
group_meta_tags:
children:
- field_meta_title
- field_description
parent_name: ''
weight: 2
format_type: fieldset
format_settings:
id: ''
classes: ''
description: ''
required_fields: true
label: 'Meta Tags'
region: content
id: node.event_listing.default
targetEntityType: node
Expand Down Expand Up @@ -99,7 +111,7 @@ content:
type: string_textarea
region: content
field_meta_tags:
weight: 5
weight: 6
settings: { }
third_party_settings: { }
type: metatag_firehose
Expand Down Expand Up @@ -132,7 +144,7 @@ content:
third_party_settings: { }
path:
type: path
weight: 4
weight: 5
region: content
settings: { }
third_party_settings: { }
Expand Down
39 changes: 25 additions & 14 deletions config/sync/core.entity_form_display.node.health_care_local_facility.default.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ third_party_settings:
children:
- field_administration
parent_name: ''
weight: 7
weight: 8
format_type: details_sidebar
format_settings:
id: ''
Expand All @@ -63,7 +63,7 @@ third_party_settings:
- moderation_state
- revision_log
parent_name: ''
weight: 8
weight: 9
format_type: fieldset
format_settings:
id: ''
Expand All @@ -76,7 +76,7 @@ third_party_settings:
children:
- field_location_services
parent_name: ''
weight: 5
weight: 6
format_type: details
format_settings:
id: ''
Expand All @@ -90,7 +90,7 @@ third_party_settings:
- field_region_page
- field_main_location
parent_name: ''
weight: 3
weight: 4
format_type: fieldset
format_settings:
id: ''
Expand All @@ -101,9 +101,7 @@ third_party_settings:
region: content
group_title_and_summary:
children:
- field_meta_title
- field_nickname_for_this_facility
- field_description
- field_intro_text
- field_media
parent_name: ''
Expand All @@ -124,7 +122,7 @@ third_party_settings:
- field_flickr
- field_email_subscription
parent_name: ''
weight: 4
weight: 5
format_type: fieldset
format_settings:
id: ''
Expand Down Expand Up @@ -158,7 +156,7 @@ third_party_settings:
- field_operating_status_facility
- field_operating_status_more_info
parent_name: ''
weight: 2
weight: 3
format_type: fieldset
format_settings:
id: ''
Expand All @@ -167,15 +165,28 @@ third_party_settings:
required_fields: true
label: 'Operating status'
region: content
group_meta_tags:
children:
- field_meta_title
- field_description
parent_name: ''
weight: 2
format_type: fieldset
format_settings:
id: ''
classes: ''
description: ''
required_fields: true
label: 'Meta Tags'
region: content
id: node.health_care_local_facility.default
targetEntityType: node
bundle: health_care_local_facility
mode: default
content:
field_address:
weight: 14
settings:
default_country: null
settings: { }
third_party_settings: { }
type: address_default
region: content
Expand All @@ -186,7 +197,7 @@ content:
type: options_select
region: content
field_description:
weight: 4
weight: 3
settings:
size: 120
placeholder: ''
Expand Down Expand Up @@ -299,7 +310,7 @@ content:
type: telephone_default
region: content
field_meta_tags:
weight: 9
weight: 10
settings: { }
third_party_settings: { }
type: metatag_firehose
Expand All @@ -319,7 +330,7 @@ content:
type: string_textfield_with_counter
region: content
field_nickname_for_this_facility:
weight: 3
weight: 4
settings:
size: 120
placeholder: ''
Expand Down Expand Up @@ -369,7 +380,7 @@ content:
third_party_settings: { }
path:
type: path
weight: 6
weight: 7
region: content
settings: { }
third_party_settings: { }
Expand Down
Loading

2 comments on commit 7dac80a

@va-cms-bot
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ Test Failed: va/tests/accessibility 
composer va:test:accessibility
> phantomjs-prebuilt@2.1.16 install /var/www/cms/node_modules/phantomjs-prebuilt
> node install.js

PhantomJS not found on PATH
Downloading https://github.com/Medium/phantomjs/releases/download/v2.1.1/phantomjs-2.1.1-linux-x86_64.tar.bz2
Saving to /tmp/phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
Receiving...

Received 22866K total.
Extracting tar contents (via spawned process)
Removing /var/www/cms/node_modules/phantomjs-prebuilt/lib/phantom
Copying extracted folder /tmp/phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2-extract-1580925730935/phantomjs-2.1.1-linux-x86_64 -> /var/www/cms/node_modules/phantomjs-prebuilt/lib/phantom
Writing location.js file
Done. Phantomjs binary available at /var/www/cms/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs

> core-js@2.6.9 postinstall /var/www/cms/node_modules/core-js
> node scripts/postinstall || echo "ignore"

Thank you for using core-js ( https://github.com/zloirock/core-js ) for polyfilling JavaScript standard library!

The project needs your help! Please consider supporting of core-js on Open Collective or Patreon: 
> https://opencollective.com/core-js 
> https://www.patreon.com/zloirock 

Also, the author of core-js ( https://github.com/zloirock ) is looking for a good job -)

added 134 packages from 190 contributors and audited 183 packages in 7.314s
found 2 low severity vulnerabilities
  run `npm audit fix` to fix them, or `npm audit` for details

> axe_tests@1.0.0 test /var/www/cms
> node ./tests/accessibility/aXeAccessibilityCheck.js

!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-dev-cms-812329399.us-gov-west-1.elb.amazonaws.com 1
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-dev-cms-812329399.us-gov-west-1.elb.amazonaws.com/sections  = 0
[]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-dev-cms-812329399.us-gov-west-1.elb.amazonaws.com/node/add/page  = 1
[ { id: 'duplicate-id',
    impact: 'minor',
    tags: [ 'cat.parsing', 'wcag2a', 'wcag411' ],
    description: 'Ensures every id attribute value is unique',
    help: 'id attribute value must be unique',
    helpUrl:
     'https://dequeuniversity.com/rules/axe/3.3/duplicate-id?application=webdriverjs',
    nodes: [ [Object], [Object] ] } ]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-dev-cms-812329399.us-gov-west-1.elb.amazonaws.com/node/add/landing_page  = 0
[]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-dev-cms-812329399.us-gov-west-1.elb.amazonaws.com/node/add/documentation_page  = 0
[]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-dev-cms-812329399.us-gov-west-1.elb.amazonaws.com/node/add/event  = 0
[]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-dev-cms-812329399.us-gov-west-1.elb.amazonaws.com/node/add/health_care_local_facility  = 1
[ { id: 'label',
    impact: 'critical',
    tags:
     [ 'cat.forms',
       'wcag2a',
       'wcag332',
       'wcag131',
       'section508',
       'section508.22.n' ],
    description: 'Ensures every form element has a label',
    help: 'Form elements must have labels',
    helpUrl:
     'https://dequeuniversity.com/rules/axe/3.3/label?application=webdriverjs',
    nodes:
     [ [Object],
       [Object],
       [Object],
       [Object],
       [Object],
       [Object],
       [Object],
       [Object],
       [Object],
       [Object],
       [Object],
       [Object],
       [Object],
       [Object] ] } ]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-dev-cms-812329399.us-gov-west-1.elb.amazonaws.com/node/add/health_care_region_detail_page  = 1
[ { id: 'duplicate-id',
    impact: 'minor',
    tags: [ 'cat.parsing', 'wcag2a', 'wcag411' ],
    description: 'Ensures every id attribute value is unique',
    help: 'id attribute value must be unique',
    helpUrl:
     'https://dequeuniversity.com/rules/axe/3.3/duplicate-id?application=webdriverjs',
    nodes: [ [Object], [Object] ] } ]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-dev-cms-812329399.us-gov-west-1.elb.amazonaws.com/node/add/health_care_region_page  = 0
[]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-dev-cms-812329399.us-gov-west-1.elb.amazonaws.com/node/add/office  = 0
[]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-dev-cms-812329399.us-gov-west-1.elb.amazonaws.com/node/add/outreach_asset  = 0
[]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-dev-cms-812329399.us-gov-west-1.elb.amazonaws.com/node/add/person_profile  = 1
[ { id: 'duplicate-id-aria',
    impact: 'critical',
    tags: [ 'cat.parsing', 'wcag2a', 'wcag411' ],
    description:
     'Ensures every id attribute value used in ARIA and in labels is unique',
    help: 'IDs used in ARIA and labels must be unique',
    helpUrl:
     'https://dequeuniversity.com/rules/axe/3.3/duplicate-id-aria?application=webdriverjs',
    nodes: [ [Object] ] } ]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-dev-cms-812329399.us-gov-west-1.elb.amazonaws.com/node/add/press_release  = 1
[ { id: 'aria-allowed-attr',
    impact: 'critical',
    tags: [ 'cat.aria', 'wcag2a', 'wcag412' ],
    description: 'Ensures ARIA attributes are allowed for an element\'s role',
    help: 'Elements must only use allowed ARIA attributes',
    helpUrl:
     'https://dequeuniversity.com/rules/axe/3.3/aria-allowed-attr?application=webdriverjs',
    nodes: [ [Object] ] } ]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-dev-cms-812329399.us-gov-west-1.elb.amazonaws.com/node/add/regional_health_care_service_des  = 0
[]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-dev-cms-812329399.us-gov-west-1.elb.amazonaws.com/node/add/news_story  = 0
[]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-dev-cms-812329399.us-gov-west-1.elb.amazonaws.com/node/add/support_service  = 0
[]
!!!  VIOLATION TYPES FOUND: 6 PROCESS EXITED WITH CODE 1  !!!
> npm install --only=production
> npm test
Wed, 05 Feb 2020 18:02:15 GMT axe-webdriverjs deprecated Error must be handled as the first argument of axe.analyze. See: #83 at tests/accessibility/aXeAccessibilityCheck.js:44:14
Wed, 05 Feb 2020 18:02:19 GMT axe-webdriverjs deprecated Error must be handled as the first argument of axe.analyze. See: #83 at tests/accessibility/aXeAccessibilityCheck.js:56:42
Failed to inject axe-core into one of the iframes!
Failed to inject axe-core into one of the iframes!
npm ERR! Test failed.  See above for more details.
Script npm test handling the va:test:accessibility event returned with error code 1
  • On: ip-10-247-96-39
  • In: 01:46

@va-cms-bot
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ Test Failed: va/tests/accessibility 
composer va:test:accessibility
> phantomjs-prebuilt@2.1.16 install /var/www/cms/node_modules/phantomjs-prebuilt
> node install.js

PhantomJS not found on PATH
Downloading https://github.com/Medium/phantomjs/releases/download/v2.1.1/phantomjs-2.1.1-linux-x86_64.tar.bz2
Saving to /tmp/phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
Receiving...

Received 22866K total.
Extracting tar contents (via spawned process)
Removing /var/www/cms/node_modules/phantomjs-prebuilt/lib/phantom
Copying extracted folder /tmp/phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2-extract-1580931627466/phantomjs-2.1.1-linux-x86_64 -> /var/www/cms/node_modules/phantomjs-prebuilt/lib/phantom
Writing location.js file
Done. Phantomjs binary available at /var/www/cms/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs

> core-js@2.6.9 postinstall /var/www/cms/node_modules/core-js
> node scripts/postinstall || echo "ignore"

Thank you for using core-js ( https://github.com/zloirock/core-js ) for polyfilling JavaScript standard library!

The project needs your help! Please consider supporting of core-js on Open Collective or Patreon: 
> https://opencollective.com/core-js 
> https://www.patreon.com/zloirock 

Also, the author of core-js ( https://github.com/zloirock ) is looking for a good job -)

added 134 packages from 190 contributors and audited 183 packages in 7.848s
found 2 low severity vulnerabilities
  run `npm audit fix` to fix them, or `npm audit` for details

> axe_tests@1.0.0 test /var/www/cms
> node ./tests/accessibility/aXeAccessibilityCheck.js

!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-staging-cms-1188006.us-gov-west-1.elb.amazonaws.com 1
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-staging-cms-1188006.us-gov-west-1.elb.amazonaws.com/sections  = 0
[]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-staging-cms-1188006.us-gov-west-1.elb.amazonaws.com/node/add/page  = 1
[ { id: 'duplicate-id',
    impact: 'minor',
    tags: [ 'cat.parsing', 'wcag2a', 'wcag411' ],
    description: 'Ensures every id attribute value is unique',
    help: 'id attribute value must be unique',
    helpUrl:
     'https://dequeuniversity.com/rules/axe/3.3/duplicate-id?application=webdriverjs',
    nodes: [ [Object], [Object] ] } ]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-staging-cms-1188006.us-gov-west-1.elb.amazonaws.com/node/add/landing_page  = 0
[]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-staging-cms-1188006.us-gov-west-1.elb.amazonaws.com/node/add/documentation_page  = 0
[]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-staging-cms-1188006.us-gov-west-1.elb.amazonaws.com/node/add/event  = 0
[]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-staging-cms-1188006.us-gov-west-1.elb.amazonaws.com/node/add/health_care_local_facility  = 1
[ { id: 'label',
    impact: 'critical',
    tags:
     [ 'cat.forms',
       'wcag2a',
       'wcag332',
       'wcag131',
       'section508',
       'section508.22.n' ],
    description: 'Ensures every form element has a label',
    help: 'Form elements must have labels',
    helpUrl:
     'https://dequeuniversity.com/rules/axe/3.3/label?application=webdriverjs',
    nodes:
     [ [Object],
       [Object],
       [Object],
       [Object],
       [Object],
       [Object],
       [Object],
       [Object],
       [Object],
       [Object],
       [Object],
       [Object],
       [Object],
       [Object] ] } ]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-staging-cms-1188006.us-gov-west-1.elb.amazonaws.com/node/add/health_care_region_detail_page  = 1
[ { id: 'duplicate-id',
    impact: 'minor',
    tags: [ 'cat.parsing', 'wcag2a', 'wcag411' ],
    description: 'Ensures every id attribute value is unique',
    help: 'id attribute value must be unique',
    helpUrl:
     'https://dequeuniversity.com/rules/axe/3.3/duplicate-id?application=webdriverjs',
    nodes: [ [Object], [Object] ] } ]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-staging-cms-1188006.us-gov-west-1.elb.amazonaws.com/node/add/health_care_region_page  = 0
[]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-staging-cms-1188006.us-gov-west-1.elb.amazonaws.com/node/add/office  = 0
[]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-staging-cms-1188006.us-gov-west-1.elb.amazonaws.com/node/add/outreach_asset  = 0
[]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-staging-cms-1188006.us-gov-west-1.elb.amazonaws.com/node/add/person_profile  = 1
[ { id: 'duplicate-id-aria',
    impact: 'critical',
    tags: [ 'cat.parsing', 'wcag2a', 'wcag411' ],
    description:
     'Ensures every id attribute value used in ARIA and in labels is unique',
    help: 'IDs used in ARIA and labels must be unique',
    helpUrl:
     'https://dequeuniversity.com/rules/axe/3.3/duplicate-id-aria?application=webdriverjs',
    nodes: [ [Object] ] } ]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-staging-cms-1188006.us-gov-west-1.elb.amazonaws.com/node/add/press_release  = 1
[ { id: 'aria-allowed-attr',
    impact: 'critical',
    tags: [ 'cat.aria', 'wcag2a', 'wcag412' ],
    description: 'Ensures ARIA attributes are allowed for an element\'s role',
    help: 'Elements must only use allowed ARIA attributes',
    helpUrl:
     'https://dequeuniversity.com/rules/axe/3.3/aria-allowed-attr?application=webdriverjs',
    nodes: [ [Object] ] } ]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-staging-cms-1188006.us-gov-west-1.elb.amazonaws.com/node/add/regional_health_care_service_des  = 0
[]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-staging-cms-1188006.us-gov-west-1.elb.amazonaws.com/node/add/news_story  = 0
[]
!!!  NUMBER OF NEW VIOLATIONS on http://internal-dsva-vagov-staging-cms-1188006.us-gov-west-1.elb.amazonaws.com/node/add/support_service  = 0
[]
!!!  VIOLATION TYPES FOUND: 6 PROCESS EXITED WITH CODE 1  !!!
> npm install --only=production
> npm test
Wed, 05 Feb 2020 19:40:32 GMT axe-webdriverjs deprecated Error must be handled as the first argument of axe.analyze. See: #83 at tests/accessibility/aXeAccessibilityCheck.js:44:14
Wed, 05 Feb 2020 19:40:37 GMT axe-webdriverjs deprecated Error must be handled as the first argument of axe.analyze. See: #83 at tests/accessibility/aXeAccessibilityCheck.js:56:42
Failed to inject axe-core into one of the iframes!
Failed to inject axe-core into one of the iframes!
npm ERR! Test failed.  See above for more details.
Script npm test handling the va:test:accessibility event returned with error code 1
  • On: ip-10-247-34-251
  • In: 02:01

Please sign in to comment.