From de561ee2bdd9924fe56623dc213cca2515912e11 Mon Sep 17 00:00:00 2001 From: Ethan Teague Date: Wed, 12 Aug 2020 10:11:17 -0400 Subject: [PATCH] VACMS-2618: Update event node type fields with prod config. (#2635) * VACMS-2618: Update event node type fields with prod config. * VACMS-2618: Update content model fields test. * VACMS-2618: Removing whitespace from field to match spec. --- ....event.field_additional_information_abo.yml | 8 +++++++- .../field.field.node.event.field_address.yml | 18 +++++++++--------- ...d.field.node.event.field_administration.yml | 2 +- .../sync/field.field.node.event.field_date.yml | 2 +- ...ield.field.node.event.field_description.yml | 4 ++-- ...field.field.node.event.field_event_cost.yml | 2 +- .../field.field.node.event.field_event_cta.yml | 4 ++-- ...ield.node.event.field_facility_location.yml | 4 ++-- .../sync/field.field.node.event.field_link.yml | 2 +- .../field.field.node.event.field_listing.yml | 4 ++-- ...node.event.field_location_humanreadable.yml | 4 ++-- .../field.field.node.event.field_media.yml | 4 ++-- ...node.event.field_url_of_an_online_event.yml | 4 ++-- .../content_model_content_type_fields.feature | 16 ++++++++-------- 14 files changed, 42 insertions(+), 36 deletions(-) diff --git a/config/sync/field.field.node.event.field_additional_information_abo.yml b/config/sync/field.field.node.event.field_additional_information_abo.yml index 1398bffc22..0ed5e54cc9 100644 --- a/config/sync/field.field.node.event.field_additional_information_abo.yml +++ b/config/sync/field.field.node.event.field_additional_information_abo.yml @@ -6,12 +6,18 @@ dependencies: - field.storage.node.field_additional_information_abo - node.type.event module: + - allowed_formats - text +third_party_settings: + allowed_formats: + rich_text: '0' + rich_text_limited: '0' + plain_text: '0' id: node.event.field_additional_information_abo field_name: field_additional_information_abo entity_type: node bundle: event -label: 'Additional information about registration' +label: 'Additional registration information' description: '' required: false translatable: false diff --git a/config/sync/field.field.node.event.field_address.yml b/config/sync/field.field.node.event.field_address.yml index c2cfe854c0..bb401e6ec9 100644 --- a/config/sync/field.field.node.event.field_address.yml +++ b/config/sync/field.field.node.event.field_address.yml @@ -12,24 +12,24 @@ field_name: field_address entity_type: node bundle: event label: Address -description: 'If there is no physical address for this event, change the country to "- None -"' +description: 'Add the street address for the event. For online events, change the country to "- None -."' required: false translatable: false default_value: - + langcode: '' country_code: US - langcode: null administrative_area: '' locality: '' - dependent_locality: '' - postal_code: '' - sorting_code: '' + dependent_locality: null + postal_code: null + sorting_code: null address_line1: '' address_line2: '' - organization: '' - given_name: '' - additional_name: '' - family_name: '' + organization: null + given_name: null + additional_name: null + family_name: null default_value_callback: '' settings: available_countries: diff --git a/config/sync/field.field.node.event.field_administration.yml b/config/sync/field.field.node.event.field_administration.yml index 1734810e03..3c6d083d0e 100644 --- a/config/sync/field.field.node.event.field_administration.yml +++ b/config/sync/field.field.node.event.field_administration.yml @@ -11,7 +11,7 @@ field_name: field_administration entity_type: node bundle: event label: Owner -description: 'Department or program at VA that is managing this event.' +description: 'Select the VA section that will manage this event content.' required: true translatable: true default_value: { } diff --git a/config/sync/field.field.node.event.field_date.yml b/config/sync/field.field.node.event.field_date.yml index 0e51cfabc1..d7b4cd081c 100644 --- a/config/sync/field.field.node.event.field_date.yml +++ b/config/sync/field.field.node.event.field_date.yml @@ -12,7 +12,7 @@ field_name: field_date entity_type: node bundle: event label: 'Date and time' -description: '' +description: 'Set a start and end date. Times will be set to Eastern time zone.' required: false translatable: false default_value: { } diff --git a/config/sync/field.field.node.event.field_description.yml b/config/sync/field.field.node.event.field_description.yml index d8746c97a5..f84c9782c0 100644 --- a/config/sync/field.field.node.event.field_description.yml +++ b/config/sync/field.field.node.event.field_description.yml @@ -9,8 +9,8 @@ id: node.event.field_description field_name: field_description entity_type: node bundle: event -label: 'Meta description' -description: 'Add a description to be used in calendar teasers, search results, and social media shares. (See further guidelines)' +label: 'Teaser description' +description: 'Add a shorter event description to be used in calendars, search results, and social media shares. (See further guidelines)' required: false translatable: true default_value: { } diff --git a/config/sync/field.field.node.event.field_event_cost.yml b/config/sync/field.field.node.event.field_event_cost.yml index dff1193792..5490680bb8 100644 --- a/config/sync/field.field.node.event.field_event_cost.yml +++ b/config/sync/field.field.node.event.field_event_cost.yml @@ -10,7 +10,7 @@ field_name: field_event_cost entity_type: node bundle: event label: Cost -description: 'Maximum 60 characters' +description: 'If the event is free, you can leave this blank or add a message to indicate that there is no cost.' required: false translatable: false default_value: { } diff --git a/config/sync/field.field.node.event.field_event_cta.yml b/config/sync/field.field.node.event.field_event_cta.yml index 2cd957a6ad..4031cca127 100644 --- a/config/sync/field.field.node.event.field_event_cta.yml +++ b/config/sync/field.field.node.event.field_event_cta.yml @@ -11,8 +11,8 @@ id: node.event.field_event_cta field_name: field_event_cta entity_type: node bundle: event -label: 'URL Link Label' -description: '' +label: Label +description: 'Select a label that prompts people to take further action via the link.' required: false translatable: false default_value: { } diff --git a/config/sync/field.field.node.event.field_facility_location.yml b/config/sync/field.field.node.event.field_facility_location.yml index fe9a367e76..1122aa85ab 100644 --- a/config/sync/field.field.node.event.field_facility_location.yml +++ b/config/sync/field.field.node.event.field_facility_location.yml @@ -11,7 +11,7 @@ field_name: field_facility_location entity_type: node bundle: event label: 'Facility location' -description: 'If your event takes place in a VA facility, select it here. ' +description: 'If the event takes place at a VA facility, select it here. You''ll still need to add the address below.' required: false translatable: false default_value: { } @@ -24,6 +24,6 @@ settings: sort: field: title direction: ASC - auto_create: false + auto_create: 0 auto_create_bundle: health_care_local_facility field_type: entity_reference diff --git a/config/sync/field.field.node.event.field_link.yml b/config/sync/field.field.node.event.field_link.yml index a1ccbce188..43aaf8fbb8 100644 --- a/config/sync/field.field.node.event.field_link.yml +++ b/config/sync/field.field.node.event.field_link.yml @@ -11,7 +11,7 @@ id: node.event.field_link field_name: field_link entity_type: node bundle: event -label: 'URL of an external page or registration link for this event' +label: URL description: '' required: false translatable: true diff --git a/config/sync/field.field.node.event.field_listing.yml b/config/sync/field.field.node.event.field_listing.yml index 5cf17ed0e7..5b74b7b9df 100644 --- a/config/sync/field.field.node.event.field_listing.yml +++ b/config/sync/field.field.node.event.field_listing.yml @@ -9,8 +9,8 @@ id: node.event.field_listing field_name: field_listing entity_type: node bundle: event -label: 'Event listing' -description: 'This field controls where on the VA website this event will be displayed.' +label: 'Where should the event be listed?' +description: 'Select a VA.gov event list. E.g. If you want the event to appear on a VAMC events page, select your VAMC system.' required: true translatable: false default_value: { } diff --git a/config/sync/field.field.node.event.field_location_humanreadable.yml b/config/sync/field.field.node.event.field_location_humanreadable.yml index a003c9d4fa..137439791e 100644 --- a/config/sync/field.field.node.event.field_location_humanreadable.yml +++ b/config/sync/field.field.node.event.field_location_humanreadable.yml @@ -9,8 +9,8 @@ id: node.event.field_location_humanreadable field_name: field_location_humanreadable entity_type: node bundle: event -label: 'A human-readable label for the event location.' -description: 'Addresses are great for mapping, but real names are usually easier for people to understand. Like “Larkspur Community Center” or “Kittery Public Library, 3rd Floor Meeting Room”.' +label: 'Building, floor, or room' +description: 'Add further detail that may help people find the event. For example, "Larkspur Community Center Reading Room."' required: false translatable: false default_value: { } diff --git a/config/sync/field.field.node.event.field_media.yml b/config/sync/field.field.node.event.field_media.yml index c372129041..9cf6a89e32 100644 --- a/config/sync/field.field.node.event.field_media.yml +++ b/config/sync/field.field.node.event.field_media.yml @@ -10,8 +10,8 @@ id: node.event.field_media field_name: field_media entity_type: node bundle: event -label: Image -description: 'Make sure to crop your image with the 7:2 aspect ratio. ' +label: 'Event image' +description: 'The system will crop your image to the standard 7:2 aspect ratio if it isn''t already.' required: false translatable: true default_value: { } diff --git a/config/sync/field.field.node.event.field_url_of_an_online_event.yml b/config/sync/field.field.node.event.field_url_of_an_online_event.yml index e66239cbbc..185b41a4f2 100644 --- a/config/sync/field.field.node.event.field_url_of_an_online_event.yml +++ b/config/sync/field.field.node.event.field_url_of_an_online_event.yml @@ -11,8 +11,8 @@ id: node.event.field_url_of_an_online_event field_name: field_url_of_an_online_event entity_type: node bundle: event -label: 'URL of an online event' -description: '' +label: 'Online event link' +description: 'Add the URL people should use to attend your online event.' required: false translatable: false default_value: { } diff --git a/tests/behat/drupal-spec-tool/content_model_content_type_fields.feature b/tests/behat/drupal-spec-tool/content_model_content_type_fields.feature index 8922e142d4..4624f3cf8d 100644 --- a/tests/behat/drupal-spec-tool/content_model_content_type_fields.feature +++ b/tests/behat/drupal-spec-tool/content_model_content_type_fields.feature @@ -61,25 +61,25 @@ Feature: Content model: Content Type fields | Content type | CMS help page | Generate a table of contents from major headings | field_table_of_contents_boolean | Boolean | | 1 | -- Disabled -- | Translatable | | Content type | CMS help page | Main content | field_content_block | Entity reference revisions | | Unlimited | Paragraphs Browser EXPERIMENTAL | Translatable | | Content type | CMS help page | Owner | field_administration | Entity reference | Required | 1 | Select list | Translatable | -| Content type | Event | A human-readable label for the event location. | field_location_humanreadable | Text (plain) | | 1 | Textfield | | -| Content type | Event | Additional information about registration | field_additional_information_abo | Text (formatted, long) | | 1 | Text area (multiple rows) | | +| Content type | Event | Building, floor, or room | field_location_humanreadable | Text (plain) | | 1 | Textfield | | +| Content type | Event | Additional registration information | field_additional_information_abo | Text (formatted, long) | | 1 | Text area (multiple rows) | | | Content type | Event | Address | field_address | Address | | 1 | Address | | | Content type | Event | Cost | field_event_cost | Text (plain) | | 1 | Textfield with counter | | | Content type | Event | Date and time | field_date | Date range | | 1 | Date and time range | | -| Content type | Event | Event listing | field_listing | Entity reference | Required | 1 | Select list | | +| Content type | Event | Where should the event be listed? | field_listing | Entity reference | Required | 1 | Select list | | | Content type | Event | Facility location | field_facility_location | Entity reference | | 1 | Select list | | | Content type | Event | Featured | field_featured | Boolean | | 1 | Single on/off checkbox | Translatable | | Content type | Event | Full event description | field_body | Text (formatted, long) | | 1 | Text area (multiple rows) | | -| Content type | Event | Image | field_media | Entity reference | | 1 | Media library | Translatable | +| Content type | Event | Event image | field_media | Entity reference | | 1 | Media library | Translatable | | Content type | Event | Location type | field_location_type | List (text) | | 1 | Select list | | -| Content type | Event | Meta description | field_description | Text (plain) | | 1 | Textfield | Translatable | +| Content type | Event | Teaser description | field_description | Text (plain) | | 1 | Textfield | Translatable | | Content type | Event | Meta tags | field_meta_tags | Meta tags | | 1 | Advanced meta tags form | Translatable | | Content type | Event | Order | field_order | List (integer) | | 1 | Select list | | | Content type | Event | Owner | field_administration | Entity reference | Required | 1 | Select list | Translatable | | Content type | Event | Registration required | field_event_registrationrequired | Boolean | | 1 | Single on/off checkbox | | -| Content type | Event | URL Link Label | field_event_cta | List (text) | | 1 | Select list | | -| Content type | Event | URL of an external page or registration link for this event | field_link | Link | | 1 | Link | Translatable | -| Content type | Event | URL of an online event | field_url_of_an_online_event | Link | | 1 | Link | | +| Content type | Event | Label | field_event_cta | List (text) | | 1 | Select list | | +| Content type | Event | URL | field_link | Link | | 1 | Link | Translatable | +| Content type | Event | Online event link | field_url_of_an_online_event | Link | | 1 | Link | | | Content type | Events list | Meta description | field_description | Text (plain) | Required | 1 | Textfield with counter | Translatable | | Content type | Events list | Meta tags | field_meta_tags | Meta tags | | 1 | Advanced meta tags form | Translatable | | Content type | Events list | Meta title tag | field_meta_title | Text (plain) | Required | 1 | Textfield with counter | Translatable |