diff --git a/.gitignore b/.gitignore index c872fba6bd8..39f475fda72 100644 --- a/.gitignore +++ b/.gitignore @@ -102,6 +102,9 @@ datadog-setup.php # web # @TODO: Installer paths is not working. Leaving symlink for now. +# Ignore Next (next-build) +next + # Temporary .deb packages *.deb diff --git a/.next/403-error-document.j2.html b/.next/403-error-document.j2.html new file mode 100644 index 00000000000..f84d3348042 --- /dev/null +++ b/.next/403-error-document.j2.html @@ -0,0 +1,51 @@ + + + + + Next-build Preview not built yet + + + + + + + + +

Next-build not ready yet

+
+

The next-build server is not built & running yet.

+

Check the status of the composer va:next:start command in the logs to learn more.

+
+ + + + diff --git a/.next/503-error-document.j2.html b/.next/503-error-document.j2.html new file mode 100644 index 00000000000..8631aa2f721 --- /dev/null +++ b/.next/503-error-document.j2.html @@ -0,0 +1,51 @@ + + + + + Next-build Preview Server 503 Error + + + + + + + + +

Next-build server 503 response

+
+

There was a 503 error returned from the next-build server when it asked for this route.

+

Check the status of the composer va:next:start command in the logs to learn more.

+
+ + + + diff --git a/.next/README.md b/.next/README.md new file mode 100644 index 00000000000..5e3ac6dae92 --- /dev/null +++ b/.next/README.md @@ -0,0 +1 @@ +See /.tugboat/vhost-next.conf. diff --git a/.next/artur-pokusin-unsplash.jpg b/.next/artur-pokusin-unsplash.jpg new file mode 100644 index 00000000000..af38e8abffa Binary files /dev/null and b/.next/artur-pokusin-unsplash.jpg differ diff --git a/.tugboat/config.yml b/.tugboat/config.yml index 86dda9eb1af..c4a7c97f687 100644 --- a/.tugboat/config.yml +++ b/.tugboat/config.yml @@ -8,6 +8,7 @@ services: - cms - web - storybook + - next # Set this as the default service. This does a few things # 1. Clones the git repository into the service container @@ -49,7 +50,7 @@ services: # Install opcache, and Apache modules - docker-php-ext-install opcache - - a2enmod headers rewrite vhost_alias + - a2enmod headers rewrite vhost_alias proxy proxy_http # Install datadog agent for application tracing and profiling. - DD_API_KEY=" " DD_INSTALL_ONLY=true DD_SITE="ddog-gov.com" bash -c "$(curl -L https://s3.amazonaws.com/dd-agent/scripts/install_script_agent7.sh)" @@ -62,6 +63,9 @@ services: # Setup storybook-*. vhost to serve static website. - cp "${TUGBOAT_ROOT}"/.tugboat/vhost-storybook.conf /etc/apache2/sites-enabled/ + # Setup next-*. vhost to serve static website. + - cp "${TUGBOAT_ROOT}"/.tugboat/vhost-next.conf /etc/apache2/sites-enabled/ + # Configure KeepAliveTimeout in apache2.conf. This is set 5 seconds longer than the internal tools ALB. # The internal tools ALB idle timeout is set to longer than a typical GQL query takes. - sed -e 's/KeepAliveTimeout 5/KeepAliveTimeout 185/' -i /etc/apache2/apache2.conf @@ -184,11 +188,14 @@ services: # This command is shared by the clone and build stages, make sure to update both stages. - j2 "${TUGBOAT_ROOT}/.web/403-error-document.j2.html" -o "${TUGBOAT_ROOT}/.web/403-error-document.html" - j2 "${TUGBOAT_ROOT}/.storybook/403-error-document.j2.html" -o "${TUGBOAT_ROOT}/.storybook/403-error-document.html" + - j2 "${TUGBOAT_ROOT}/.next/403-error-document.j2.html" -o "${TUGBOAT_ROOT}/.next/403-error-document.html" + - j2 "${TUGBOAT_ROOT}/.next/503-error-document.j2.html" -o "${TUGBOAT_ROOT}/.next/503-error-document.html" - composer install - bash -lc 'nvm install' - bash -lc 'npm install' - bash -lc 'composer va:theme:compile' - bash -lc 'composer va:web:install' + - bash -lc 'composer va:next:install' # https://www.drush.org/latest/deploycommand/ (updatedb, cache:rebuild, config:import, deploy:hook) - drush deploy @@ -212,6 +219,8 @@ services: # This command is shared by the clone and build stages, make sure to update both stages. - j2 "${TUGBOAT_ROOT}/.web/403-error-document.j2.html" -o "${TUGBOAT_ROOT}/.web/403-error-document.html" - j2 "${TUGBOAT_ROOT}/.storybook/403-error-document.j2.html" -o "${TUGBOAT_ROOT}/.storybook/403-error-document.html" + - j2 "${TUGBOAT_ROOT}/.next/403-error-document.j2.html" -o "${TUGBOAT_ROOT}/.next/403-error-document.html" + - j2 "${TUGBOAT_ROOT}/.next/503-error-document.j2.html" -o "${TUGBOAT_ROOT}/.next/503-error-document.html" online: # We only want tests running on PRs, not branches like the base preview build of main. @@ -224,8 +233,10 @@ services: - find -L "${DOCROOT}/vendor/va-gov/content-build/node_modules/.bin" -type f -exec chmod +x {} \+ - find "${DOCROOT}/vendor/va-gov/content-build/script" -type f -exec chmod +x {} \+ - # Build storybook and the frontend in parallel + # Build storybook and the frontends in parallel - bash -lc 'time task --taskfile=tugboat.yml' + # Build next build server + - bash -lc 'composer va:next:start' memcache: image: tugboatqa/memcached:1.6 diff --git a/.tugboat/vhost-next.conf b/.tugboat/vhost-next.conf new file mode 100644 index 00000000000..d7fa2482347 --- /dev/null +++ b/.tugboat/vhost-next.conf @@ -0,0 +1,48 @@ +# If testing changes to this file on the tugboatqa/php:7.1-apache image (current), +# use `apache2ctl -S` to check for syntax issues then `killall apache2` to get changes to take. +# Or "Stop" then "Start" the preview as that will restart apache2 too. Worth noting that +# `service apache2 reload|restart` doesn't work on this image as `runit` is used. +# Also `sv restart apache` acts like it works but it doesn't and doesn't bubble up any errors. + + + + ServerName next-wildcard + # Route preview URLs with prefix of `next-` to folder where the generated site output is symlinked. + # e.g. https://next-msecydk1vl7ncmpkgh8vevjhzq25vacv.ci.cms.va.gov/ + ServerAlias next-* + VirtualDocumentRoot /var/lib/tugboat/docroot/next/.next + + Alias "/.next" "/var/lib/tugboat/.next" + ErrorDocument 403 /.next/403-error-document.html + ErrorDocument 503 /.next/503-error-document.html + + + Options FollowSymLinks + Require all granted + + + + Require all granted + + + ProxyPreserveHost on + # Ignore redirecting error doc directory + ProxyPass /.next/ ! + # Redirect requests to the running node server from next-build + ProxyPass / http://localhost:3000/ + ProxyPassReverse / http://localhost:3000/ + + # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, + # error, crit, alert, emerg. + # It is also possible to configure the loglevel for particular + # modules, e.g. + #LogLevel debug + + # On Tugboat these are symlinks to /dev/null by default. + # `rm /var/log/apache2/*.log` and they will be generated. + # Then `tail -f /var/log/apache2/*` will work. + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + SetEnvIf X-Forwarded-Proto "^https" HTTPS=on + diff --git a/composer.json b/composer.json index 6e6c5fd538a..b8b9d1bac16 100644 --- a/composer.json +++ b/composer.json @@ -207,7 +207,7 @@ "symfony/phpunit-bridge": "^5.1", "symfony/process": "^4.0", "symfony/routing": "^4.0", - "va-gov/content-build": "^0.0.3372", + "va-gov/content-build": "^0.0.3374", "vlucas/phpdotenv": "^5.3", "webflo/drupal-finder": "^1.0.0", "webmozart/path-util": "^2.3", @@ -383,7 +383,8 @@ "3047110 - Add workflow to taxonomy" : "https://www.drupal.org/files/issues/2023-04-14/3047110-45.patch", "3106205 - Length of menu_tree.url and menu_tree.route_param_key are too short (255 characters)": "https://www.drupal.org/files/issues/2023-05-24/3106205-length-menu-tree-too-short.patch", "3274419 - Make BaseFieldOverride inherit internal property from the base field": "https://www.drupal.org/files/issues/2023-03-13/3274419-45.patch", - "3333401 - Pager h4 cause accessibility flag on many pages": "https://www.drupal.org/files/issues/2023-07-27/3333401-56-configurable-heading-pager.patch" + "3333401 - Pager h4 cause accessibility flag on many pages": "https://www.drupal.org/files/issues/2023-07-27/3333401-56-configurable-heading-pager.patch", + "3382759 - Add multiple workflow content moderation filter to Views.": "https://www.drupal.org/files/issues/2023-08-24/3382759-8.patch" }, "drupal/danse": { "3364925 - added explicit access check": "https://www.drupal.org/files/issues/2023-06-05/3364925-added-explicit-access-check.patch" @@ -571,7 +572,10 @@ "va:theme:watch": "Watch VA.gov Claro theme source and compile as needed.", "va:web:build": "Perform a content build.", "va:web:install": "Prepare the content-build project.", - "va:web:prepare-dotenv": "Prepare the ./web/.env file." + "va:web:prepare-dotenv": "Prepare the ./web/.env file.", + "va:next:install": "Prepare the next-build project", + "va:next:build": "Build the next-build server for preview", + "va:next:start": "Start the next-build server for preview" }, "scripts": { "pre-install-cmd": [ @@ -817,6 +821,21 @@ "# Prepare the ./web/.env file.", "! ./scripts/should-run-directly.sh || ./scripts/web-prepare-dotenv.sh", "./scripts/should-run-directly.sh || ddev composer va:web:prepare-dotenv --" + ], + "va:next:install": [ + "# Prepare the next build project", + "! ./scripts/should-run-directly.sh || ./scripts/next-install.sh", + "./scripts/should-run-directly.sh || ddev composer va:next:install --" + ], + "va:next:build": [ + "# Prepare the next build server", + "! ./scripts/should-run-directly.sh || ./scripts/next-build.sh", + "./scripts/should-run-directly.sh || ddev composer va:next:build --" + ], + "va:next:start": [ + "# Start the next build server", + "! ./scripts/should-run-directly.sh || ./scripts/next-start.sh", + "./scripts/should-run-directly.sh || ddev composer va:next:start --" ] } } diff --git a/composer.lock b/composer.lock index ff06a7f9045..9c7cff52a61 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "2029832df0507f936056503739c48520", + "content-hash": "a719753bc58db6f1e66bb30d1a538748", "packages": [ { "name": "alchemy/zippy", @@ -6169,6 +6169,10 @@ "GPL-2.0-or-later" ], "authors": [ + { + "name": "Anybody", + "homepage": "https://www.drupal.org/user/291091" + }, { "name": "Hydra", "homepage": "https://www.drupal.org/user/647364" @@ -10688,7 +10692,7 @@ }, "require": { "bjeavons/zxcvbn-php": "^1.3", - "drupal/core": "^8 || ^9", + "drupal/core": "^8 || ^9 || ^10", "drupal/password_policy": "^3.1|^4.0" }, "type": "drupal-module", @@ -10697,8 +10701,8 @@ "dev-2.x": "2.x-dev" }, "drupal": { - "version": "8.x-2.0-beta1+4-dev", - "datestamp": "1668804356", + "version": "8.x-2.0-beta2+1-dev", + "datestamp": "1696647229", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -10726,6 +10730,10 @@ "name": "nerdstein", "homepage": "https://www.drupal.org/user/1557710" }, + { + "name": "nord102", + "homepage": "https://www.drupal.org/user/3471419" + }, { "name": "scor", "homepage": "https://www.drupal.org/user/52142" @@ -26892,16 +26900,16 @@ }, { "name": "va-gov/content-build", - "version": "v0.0.3372", + "version": "v0.0.3374", "source": { "type": "git", "url": "https://github.com/department-of-veterans-affairs/content-build.git", - "reference": "b2c66f1be86b262b28b6c086c217e6a308b3bfd7" + "reference": "3ffbbed51f3d002915d71383967db07efa1f5335" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/b2c66f1be86b262b28b6c086c217e6a308b3bfd7", - "reference": "b2c66f1be86b262b28b6c086c217e6a308b3bfd7", + "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/3ffbbed51f3d002915d71383967db07efa1f5335", + "reference": "3ffbbed51f3d002915d71383967db07efa1f5335", "shasum": "" }, "type": "node-project", @@ -26928,9 +26936,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.3372" + "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3374" }, - "time": "2023-10-23T14:31:55+00:00" + "time": "2023-10-25T18:07:01+00:00" }, { "name": "vlucas/phpdotenv", diff --git a/config/sync/core.entity_form_display.node.event.default.yml b/config/sync/core.entity_form_display.node.event.default.yml index 8c99f87f35d..a5a1bb89eea 100644 --- a/config/sync/core.entity_form_display.node.event.default.yml +++ b/config/sync/core.entity_form_display.node.event.default.yml @@ -4,6 +4,7 @@ status: true dependencies: config: - field.field.node.event.field_additional_information_abo + - field.field.node.event.field_additional_listings - field.field.node.event.field_address - field.field.node.event.field_administration - field.field.node.event.field_body @@ -23,6 +24,7 @@ dependencies: - field.field.node.event.field_media - field.field.node.event.field_meta_tags - field.field.node.event.field_order + - field.field.node.event.field_publish_to_outreach_cal - field.field.node.event.field_url_of_an_online_event - node.type.event - workflows.workflow.editorial @@ -46,7 +48,7 @@ third_party_settings: label: 'Section settings' region: content parent_name: '' - weight: 8 + weight: 9 format_type: details_sidebar format_settings: classes: '' @@ -64,7 +66,7 @@ third_party_settings: label: Location region: content parent_name: '' - weight: 7 + weight: 8 format_type: details format_settings: classes: '' @@ -81,7 +83,7 @@ third_party_settings: label: Registration region: content parent_name: '' - weight: 6 + weight: 7 format_type: fieldset format_settings: classes: '' @@ -142,7 +144,7 @@ third_party_settings: label: 'Meta Tags' region: content parent_name: '' - weight: 5 + weight: 6 format_type: fieldset format_settings: classes: '' @@ -173,7 +175,7 @@ third_party_settings: label: Free region: content parent_name: group_all_events_are_free - weight: 15 + weight: 32 format_type: html_element format_settings: classes: '' @@ -200,7 +202,7 @@ content: third_party_settings: { } field_additional_information_abo: type: text_textarea - weight: 31 + weight: 32 region: content settings: rows: 5 @@ -220,7 +222,7 @@ content: third_party_settings: { } field_body: type: text_textarea - weight: 4 + weight: 5 region: content settings: rows: 5 @@ -258,7 +260,10 @@ content: custom show_extra: true hide_date: false + separator: to add_abbreviations: '' + allday: true + remove_seconds: false third_party_settings: smart_date_recur: modal: true @@ -318,7 +323,7 @@ content: third_party_settings: { } field_last_saved_by_an_editor: type: datetime_timestamp - weight: 44 + weight: 16 region: content settings: { } third_party_settings: { } @@ -337,7 +342,11 @@ content: weight: 2 region: content settings: { } - third_party_settings: { } + third_party_settings: + limited_field_widgets: + limit_values: '1' + change_labels: + add_another: '' field_location_humanreadable: type: string_textfield weight: 16 @@ -354,7 +363,7 @@ content: third_party_settings: { } field_media: type: media_library_widget - weight: 3 + weight: 4 region: content settings: media_types: { } @@ -365,6 +374,13 @@ content: region: content settings: { } third_party_settings: { } + field_publish_to_outreach_cal: + type: boolean_checkbox + weight: 3 + region: content + settings: + display_label: true + third_party_settings: { } field_url_of_an_online_event: type: linkit weight: 15 @@ -411,6 +427,7 @@ content: settings: { } third_party_settings: { } hidden: + field_additional_listings: true field_event_cost: true field_meta_tags: true langcode: true diff --git a/config/sync/core.entity_form_display.node.q_a.default.yml b/config/sync/core.entity_form_display.node.q_a.default.yml index 453595c6462..59fdc4d7673 100644 --- a/config/sync/core.entity_form_display.node.q_a.default.yml +++ b/config/sync/core.entity_form_display.node.q_a.default.yml @@ -254,25 +254,20 @@ content: field_widget_replace: 0 open: 0 field_widget_display_settings: { } + additional_fields: + options: null third_party_settings: { } field_related_information: - type: paragraphs + type: entity_reference_paragraphs weight: 7 region: content settings: title: 'Link teaser' title_plural: 'Link teasers' edit_mode: open - closed_mode: summary - autocollapse: none - closed_mode_threshold: 0 add_mode: dropdown form_display_mode: default default_paragraph_type: link_teaser - features: - add_above: '0' - collapse_edit_all: collapse_edit_all - duplicate: '0' third_party_settings: { } field_standalone_page: type: boolean_checkbox @@ -316,9 +311,15 @@ content: maxlength: 70 counter_position: after js_prevent_submit: true + count_only_mode: false count_html_characters: false textcount_status_message: 'Characters remaining: @remaining_count' third_party_settings: { } + translation: + weight: 10 + region: content + settings: { } + third_party_settings: { } url_redirects: weight: 6 region: content diff --git a/config/sync/core.entity_form_display.taxonomy_term.health_care_service_taxonomy.default.yml b/config/sync/core.entity_form_display.taxonomy_term.health_care_service_taxonomy.default.yml index 7971d714bf8..1f19d6e09da 100644 --- a/config/sync/core.entity_form_display.taxonomy_term.health_care_service_taxonomy.default.yml +++ b/config/sync/core.entity_form_display.taxonomy_term.health_care_service_taxonomy.default.yml @@ -6,9 +6,13 @@ dependencies: - field.field.taxonomy_term.health_care_service_taxonomy.field_also_known_as - field.field.taxonomy_term.health_care_service_taxonomy.field_commonly_treated_condition - field.field.taxonomy_term.health_care_service_taxonomy.field_enforce_unique_combo_servi + - field.field.taxonomy_term.health_care_service_taxonomy.field_facility_service_descripti + - field.field.taxonomy_term.health_care_service_taxonomy.field_facility_service_header - field.field.taxonomy_term.health_care_service_taxonomy.field_health_service_api_id - field.field.taxonomy_term.health_care_service_taxonomy.field_online_self_service - field.field.taxonomy_term.health_care_service_taxonomy.field_owner + - field.field.taxonomy_term.health_care_service_taxonomy.field_regional_service_descripti + - field.field.taxonomy_term.health_care_service_taxonomy.field_regional_service_header - field.field.taxonomy_term.health_care_service_taxonomy.field_service_type_of_care - field.field.taxonomy_term.health_care_service_taxonomy.field_show_for_vamc_facilities - field.field.taxonomy_term.health_care_service_taxonomy.field_show_for_vba_facilities @@ -99,6 +103,10 @@ third_party_settings: - field_vba_friendly_name - field_vba_com_conditions - field_vba_service_descrip + - field_regional_service_header + - field_regional_service_descripti + - field_facility_service_header + - field_facility_service_descripti - field_online_self_service - field_vba_service_regions label: VBA @@ -165,6 +173,22 @@ content: settings: size: 1 third_party_settings: { } + field_facility_service_descripti: + type: string_textfield + weight: 15 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + field_facility_service_header: + type: string_textfield + weight: 14 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } field_health_service_api_id: type: string_textfield weight: 2 @@ -175,12 +199,28 @@ content: third_party_settings: { } field_online_self_service: type: link_default - weight: 12 + weight: 16 region: content settings: placeholder_url: '' placeholder_title: '' third_party_settings: { } + field_regional_service_descripti: + type: string_textfield + weight: 13 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + field_regional_service_header: + type: string_textfield + weight: 12 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } field_service_type_of_care: type: options_select weight: 15 @@ -249,7 +289,7 @@ content: third_party_settings: { } field_vba_service_regions: type: entity_reference_autocomplete - weight: 13 + weight: 17 region: content settings: match_operator: CONTAINS diff --git a/config/sync/core.entity_view_display.node.campaign_landing_page.teaser.yml b/config/sync/core.entity_view_display.node.campaign_landing_page.teaser.yml index b43aab7f65a..6faab443afc 100644 --- a/config/sync/core.entity_view_display.node.campaign_landing_page.teaser.yml +++ b/config/sync/core.entity_view_display.node.campaign_landing_page.teaser.yml @@ -62,6 +62,7 @@ content: weight: 100 region: content hidden: + breadcrumbs: true field_administration: true field_benefit_categories: true field_clp_audience: true diff --git a/config/sync/core.entity_view_display.node.event.default.yml b/config/sync/core.entity_view_display.node.event.default.yml index c765795f387..9dce9c4eb32 100644 --- a/config/sync/core.entity_view_display.node.event.default.yml +++ b/config/sync/core.entity_view_display.node.event.default.yml @@ -4,6 +4,7 @@ status: true dependencies: config: - field.field.node.event.field_additional_information_abo + - field.field.node.event.field_additional_listings - field.field.node.event.field_address - field.field.node.event.field_administration - field.field.node.event.field_body @@ -23,6 +24,7 @@ dependencies: - field.field.node.event.field_media - field.field.node.event.field_meta_tags - field.field.node.event.field_order + - field.field.node.event.field_publish_to_outreach_cal - field.field.node.event.field_url_of_an_online_event - node.type.event module: @@ -50,6 +52,8 @@ third_party_settings: group_c: children: - field_datetime_range_timezone + - field_listing + - field_additional_listings - field_media - field_body - field_url_of_an_online_event @@ -74,7 +78,7 @@ third_party_settings: label: Location-related parent_name: group_c region: content - weight: 28 + weight: 8 format_type: fieldset format_settings: classes: '' @@ -89,7 +93,7 @@ third_party_settings: label: 'Registration related' parent_name: group_c region: content - weight: 29 + weight: 9 format_type: fieldset format_settings: classes: '' @@ -120,7 +124,15 @@ content: label: above settings: { } third_party_settings: { } - weight: 29 + weight: 21 + region: content + field_additional_listings: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 3 region: content field_address: type: address_default @@ -134,7 +146,7 @@ content: label: above settings: { } third_party_settings: { } - weight: 25 + weight: 5 region: content field_datetime_range_timezone: type: smartdate_default @@ -146,8 +158,17 @@ content: force_chronological: false add_classes: false time_wrapper: true + localize: false + parts: + - start + - end + duration: + separator: ' | ' + unit: '' + decimals: 2 + suffix: h third_party_settings: { } - weight: 23 + weight: 1 region: content field_description: type: string @@ -163,14 +184,14 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 20 + weight: 19 region: content field_event_cta: type: list_default label: above settings: { } third_party_settings: { } - weight: 27 + weight: 7 region: content field_event_registrationrequired: type: boolean @@ -188,7 +209,7 @@ content: settings: link: true third_party_settings: { } - weight: 17 + weight: 18 region: content field_featured: type: boolean @@ -222,6 +243,14 @@ content: third_party_settings: { } weight: 17 region: content + field_listing: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 2 + region: content field_location_humanreadable: type: string label: above @@ -235,7 +264,7 @@ content: label: above settings: { } third_party_settings: { } - weight: 16 + weight: 17 region: content field_media: type: entity_reference_entity_view @@ -244,7 +273,7 @@ content: view_mode: default link: false third_party_settings: { } - weight: 24 + weight: 4 region: content field_order: type: list_default @@ -263,15 +292,15 @@ content: rel: '' target: '' third_party_settings: { } - weight: 26 + weight: 6 region: content hidden: breadcrumbs: true content_moderation_control: true field_administration: true field_last_saved_by_an_editor: true - field_listing: true field_meta_tags: true + field_publish_to_outreach_cal: true langcode: true links: true search_api_excerpt: true diff --git a/config/sync/core.entity_view_display.node.event.teaser.yml b/config/sync/core.entity_view_display.node.event.teaser.yml index b2e2adfdd9a..5ac4b47b0ac 100644 --- a/config/sync/core.entity_view_display.node.event.teaser.yml +++ b/config/sync/core.entity_view_display.node.event.teaser.yml @@ -5,6 +5,7 @@ dependencies: config: - core.entity_view_mode.node.teaser - field.field.node.event.field_additional_information_abo + - field.field.node.event.field_additional_listings - field.field.node.event.field_address - field.field.node.event.field_administration - field.field.node.event.field_body @@ -24,6 +25,7 @@ dependencies: - field.field.node.event.field_media - field.field.node.event.field_meta_tags - field.field.node.event.field_order + - field.field.node.event.field_publish_to_outreach_cal - field.field.node.event.field_url_of_an_online_event - node.type.event module: @@ -35,6 +37,18 @@ targetEntityType: node bundle: event mode: teaser content: + breadcrumbs: + type: link + label: hidden + settings: + trim_length: 80 + url_only: false + url_plain: false + rel: '' + target: '' + third_party_settings: { } + weight: -5 + region: content field_body: type: text_default label: hidden @@ -56,6 +70,7 @@ content: hidden: content_moderation_control: true field_additional_information_abo: true + field_additional_listings: true field_address: true field_administration: true field_description: true @@ -73,6 +88,7 @@ hidden: field_media: true field_meta_tags: true field_order: true + field_publish_to_outreach_cal: true field_url_of_an_online_event: true langcode: true links: true diff --git a/config/sync/core.entity_view_display.node.health_care_local_facility.external_content.yml b/config/sync/core.entity_view_display.node.health_care_local_facility.external_content.yml index 948e775d1c7..1fb0bbe2a06 100644 --- a/config/sync/core.entity_view_display.node.health_care_local_facility.external_content.yml +++ b/config/sync/core.entity_view_display.node.health_care_local_facility.external_content.yml @@ -255,6 +255,7 @@ content: weight: 10 region: content hidden: + breadcrumbs: true content_moderation_control: true field_administration: true field_description: true diff --git a/config/sync/core.entity_view_display.node.health_care_local_facility.ief_table.yml b/config/sync/core.entity_view_display.node.health_care_local_facility.ief_table.yml index dbec93712c5..d978097d787 100644 --- a/config/sync/core.entity_view_display.node.health_care_local_facility.ief_table.yml +++ b/config/sync/core.entity_view_display.node.health_care_local_facility.ief_table.yml @@ -106,6 +106,7 @@ content: weight: 2 region: content hidden: + breadcrumbs: true content_moderation_control: true field_address: true field_administration: true diff --git a/config/sync/core.entity_view_display.node.health_care_region_page.external_content.yml b/config/sync/core.entity_view_display.node.health_care_region_page.external_content.yml index bbfedd47ce9..9730686bfba 100644 --- a/config/sync/core.entity_view_display.node.health_care_region_page.external_content.yml +++ b/config/sync/core.entity_view_display.node.health_care_region_page.external_content.yml @@ -148,6 +148,7 @@ content: weight: 22 region: content hidden: + breadcrumbs: true content_moderation_control: true field_administration: true field_appointments_online: true diff --git a/config/sync/core.entity_view_display.node.nca_facility.external_content.yml b/config/sync/core.entity_view_display.node.nca_facility.external_content.yml index dd04d66c678..6f7affbd57f 100644 --- a/config/sync/core.entity_view_display.node.nca_facility.external_content.yml +++ b/config/sync/core.entity_view_display.node.nca_facility.external_content.yml @@ -162,6 +162,7 @@ content: weight: 10 region: content hidden: + breadcrumbs: true content_moderation_control: true field_administration: true field_geolocation: true diff --git a/config/sync/core.entity_view_display.node.nca_facility.teaser.yml b/config/sync/core.entity_view_display.node.nca_facility.teaser.yml index d9edc06ddf2..f62ad83ebab 100644 --- a/config/sync/core.entity_view_display.node.nca_facility.teaser.yml +++ b/config/sync/core.entity_view_display.node.nca_facility.teaser.yml @@ -37,6 +37,7 @@ content: weight: 1 region: content hidden: + breadcrumbs: true field_address: true field_administration: true field_facility_locator_api_id: true diff --git a/config/sync/core.entity_view_display.node.service_region.full.yml b/config/sync/core.entity_view_display.node.service_region.full.yml index f727835605f..ae8b02fc0ff 100644 --- a/config/sync/core.entity_view_display.node.service_region.full.yml +++ b/config/sync/core.entity_view_display.node.service_region.full.yml @@ -109,6 +109,7 @@ content: region: content hidden: body: true + breadcrumbs: true content_moderation_control: true langcode: true links: true diff --git a/config/sync/core.entity_view_display.node.service_region.teaser.yml b/config/sync/core.entity_view_display.node.service_region.teaser.yml index 3ddbe48c68b..812f580b10b 100644 --- a/config/sync/core.entity_view_display.node.service_region.teaser.yml +++ b/config/sync/core.entity_view_display.node.service_region.teaser.yml @@ -39,6 +39,7 @@ content: weight: 100 region: content hidden: + breadcrumbs: true field_administration: true field_facility_location: true field_last_saved_by_an_editor: true diff --git a/config/sync/core.entity_view_display.node.va_form.external_content.yml b/config/sync/core.entity_view_display.node.va_form.external_content.yml index f1d7a736f0f..a6048e5a405 100644 --- a/config/sync/core.entity_view_display.node.va_form.external_content.yml +++ b/config/sync/core.entity_view_display.node.va_form.external_content.yml @@ -158,6 +158,7 @@ content: weight: 0 region: content hidden: + breadcrumbs: true content_moderation_control: true field_administration: true field_alert: true diff --git a/config/sync/core.entity_view_display.node.va_form.teaser.yml b/config/sync/core.entity_view_display.node.va_form.teaser.yml index 70e36e6c099..3b95f1d8db5 100644 --- a/config/sync/core.entity_view_display.node.va_form.teaser.yml +++ b/config/sync/core.entity_view_display.node.va_form.teaser.yml @@ -41,6 +41,7 @@ content: weight: 0 region: content hidden: + breadcrumbs: true content_moderation_control: true field_administration: true field_alert: true diff --git a/config/sync/core.entity_view_display.node.vba_facility.external_content.yml b/config/sync/core.entity_view_display.node.vba_facility.external_content.yml index 7888a56e8bc..5debfb940d9 100644 --- a/config/sync/core.entity_view_display.node.vba_facility.external_content.yml +++ b/config/sync/core.entity_view_display.node.vba_facility.external_content.yml @@ -7,20 +7,20 @@ dependencies: - field.field.node.vba_facility.field_address - field.field.node.vba_facility.field_administration - field.field.node.vba_facility.field_cc_benefit_office_hours_va - - field.field.node.vba_facility.field_cc_cant_find_benefits - field.field.node.vba_facility.field_cc_benefits_hotline + - field.field.node.vba_facility.field_cc_cant_find_benefits + - field.field.node.vba_facility.field_cc_get_updates_from_vba + - field.field.node.vba_facility.field_cc_national_spotlight_1 + - field.field.node.vba_facility.field_cc_national_spotlight_2 + - field.field.node.vba_facility.field_cc_national_spotlight_3 - field.field.node.vba_facility.field_cc_vba_facility_overview - field.field.node.vba_facility.field_facility_locator_api_id - field.field.node.vba_facility.field_facility_vba_classificatio - field.field.node.vba_facility.field_geolocation - - field.field.node.vba_facility.field_cc_get_updates_from_vba - field.field.node.vba_facility.field_intro_text - field.field.node.vba_facility.field_last_saved_by_an_editor - field.field.node.vba_facility.field_location_services - field.field.node.vba_facility.field_media - - field.field.node.vba_facility.field_cc_national_spotlight_1 - - field.field.node.vba_facility.field_cc_national_spotlight_2 - - field.field.node.vba_facility.field_cc_national_spotlight_3 - field.field.node.vba_facility.field_non_va_location_url - field.field.node.vba_facility.field_non_va_official_name - field.field.node.vba_facility.field_office @@ -239,6 +239,7 @@ content: weight: 8 region: content hidden: + breadcrumbs: true content_moderation_control: true field_administration: true field_cc_benefit_office_hours_va: true diff --git a/config/sync/core.entity_view_display.node.vba_facility.ief_table.yml b/config/sync/core.entity_view_display.node.vba_facility.ief_table.yml index d9f38b868a4..b2abfefd863 100644 --- a/config/sync/core.entity_view_display.node.vba_facility.ief_table.yml +++ b/config/sync/core.entity_view_display.node.vba_facility.ief_table.yml @@ -7,20 +7,20 @@ dependencies: - field.field.node.vba_facility.field_address - field.field.node.vba_facility.field_administration - field.field.node.vba_facility.field_cc_benefit_office_hours_va - - field.field.node.vba_facility.field_cc_cant_find_benefits - field.field.node.vba_facility.field_cc_benefits_hotline + - field.field.node.vba_facility.field_cc_cant_find_benefits + - field.field.node.vba_facility.field_cc_get_updates_from_vba + - field.field.node.vba_facility.field_cc_national_spotlight_1 + - field.field.node.vba_facility.field_cc_national_spotlight_2 + - field.field.node.vba_facility.field_cc_national_spotlight_3 - field.field.node.vba_facility.field_cc_vba_facility_overview - field.field.node.vba_facility.field_facility_locator_api_id - field.field.node.vba_facility.field_facility_vba_classificatio - field.field.node.vba_facility.field_geolocation - - field.field.node.vba_facility.field_cc_get_updates_from_vba - field.field.node.vba_facility.field_intro_text - field.field.node.vba_facility.field_last_saved_by_an_editor - field.field.node.vba_facility.field_location_services - field.field.node.vba_facility.field_media - - field.field.node.vba_facility.field_cc_national_spotlight_1 - - field.field.node.vba_facility.field_cc_national_spotlight_2 - - field.field.node.vba_facility.field_cc_national_spotlight_3 - field.field.node.vba_facility.field_non_va_location_url - field.field.node.vba_facility.field_non_va_official_name - field.field.node.vba_facility.field_office @@ -171,6 +171,7 @@ content: weight: 5 region: content hidden: + breadcrumbs: true content_moderation_control: true field_administration: true field_cc_benefit_office_hours_va: true diff --git a/config/sync/core.entity_view_display.node.vba_facility.teaser.yml b/config/sync/core.entity_view_display.node.vba_facility.teaser.yml index f947d76988e..bab18a82b55 100644 --- a/config/sync/core.entity_view_display.node.vba_facility.teaser.yml +++ b/config/sync/core.entity_view_display.node.vba_facility.teaser.yml @@ -7,20 +7,20 @@ dependencies: - field.field.node.vba_facility.field_address - field.field.node.vba_facility.field_administration - field.field.node.vba_facility.field_cc_benefit_office_hours_va - - field.field.node.vba_facility.field_cc_cant_find_benefits - field.field.node.vba_facility.field_cc_benefits_hotline + - field.field.node.vba_facility.field_cc_cant_find_benefits + - field.field.node.vba_facility.field_cc_get_updates_from_vba + - field.field.node.vba_facility.field_cc_national_spotlight_1 + - field.field.node.vba_facility.field_cc_national_spotlight_2 + - field.field.node.vba_facility.field_cc_national_spotlight_3 - field.field.node.vba_facility.field_cc_vba_facility_overview - field.field.node.vba_facility.field_facility_locator_api_id - field.field.node.vba_facility.field_facility_vba_classificatio - field.field.node.vba_facility.field_geolocation - - field.field.node.vba_facility.field_cc_get_updates_from_vba - field.field.node.vba_facility.field_intro_text - field.field.node.vba_facility.field_last_saved_by_an_editor - field.field.node.vba_facility.field_location_services - field.field.node.vba_facility.field_media - - field.field.node.vba_facility.field_cc_national_spotlight_1 - - field.field.node.vba_facility.field_cc_national_spotlight_2 - - field.field.node.vba_facility.field_cc_national_spotlight_3 - field.field.node.vba_facility.field_non_va_location_url - field.field.node.vba_facility.field_non_va_official_name - field.field.node.vba_facility.field_office @@ -50,6 +50,7 @@ content: weight: 1 region: content hidden: + breadcrumbs: true field_address: true field_administration: true field_cc_benefit_office_hours_va: true diff --git a/config/sync/core.entity_view_display.node.vba_facility_service.search_index.yml b/config/sync/core.entity_view_display.node.vba_facility_service.search_index.yml index b91148adf2e..546d4ed7f46 100644 --- a/config/sync/core.entity_view_display.node.vba_facility_service.search_index.yml +++ b/config/sync/core.entity_view_display.node.vba_facility_service.search_index.yml @@ -48,6 +48,7 @@ content: weight: 1 region: content hidden: + breadcrumbs: true content_moderation_control: true field_administration: true field_last_saved_by_an_editor: true diff --git a/config/sync/core.entity_view_display.node.vba_facility_service.teaser.yml b/config/sync/core.entity_view_display.node.vba_facility_service.teaser.yml index 0d1468bd593..a54411a0d5b 100644 --- a/config/sync/core.entity_view_display.node.vba_facility_service.teaser.yml +++ b/config/sync/core.entity_view_display.node.vba_facility_service.teaser.yml @@ -24,6 +24,7 @@ content: weight: 0 region: content hidden: + breadcrumbs: true content_moderation_control: true field_administration: true field_enforce_unique_combo: true diff --git a/config/sync/core.entity_view_display.node.vet_center.external_content.yml b/config/sync/core.entity_view_display.node.vet_center.external_content.yml index 4ee1812d600..76f87f53c7f 100644 --- a/config/sync/core.entity_view_display.node.vet_center.external_content.yml +++ b/config/sync/core.entity_view_display.node.vet_center.external_content.yml @@ -110,6 +110,7 @@ content: weight: 4 region: content hidden: + breadcrumbs: true content_moderation_control: true field_administration: true field_cc_non_traditional_hours: true diff --git a/config/sync/core.entity_view_display.node.vet_center.teaser.yml b/config/sync/core.entity_view_display.node.vet_center.teaser.yml index 1990272f77d..0cb00f81549 100644 --- a/config/sync/core.entity_view_display.node.vet_center.teaser.yml +++ b/config/sync/core.entity_view_display.node.vet_center.teaser.yml @@ -39,6 +39,7 @@ content: weight: 0 region: content hidden: + breadcrumbs: true content_moderation_control: true field_address: true field_administration: true diff --git a/config/sync/core.entity_view_display.node.vet_center_mobile_vet_center.external_content.yml b/config/sync/core.entity_view_display.node.vet_center_mobile_vet_center.external_content.yml index 0125349c47d..496aa62aec0 100644 --- a/config/sync/core.entity_view_display.node.vet_center_mobile_vet_center.external_content.yml +++ b/config/sync/core.entity_view_display.node.vet_center_mobile_vet_center.external_content.yml @@ -102,6 +102,7 @@ content: weight: 5 region: content hidden: + breadcrumbs: true content_moderation_control: true field_administration: true field_last_saved_by_an_editor: true diff --git a/config/sync/core.entity_view_display.node.vet_center_outstation.external_content.yml b/config/sync/core.entity_view_display.node.vet_center_outstation.external_content.yml index a5b514b43d9..81ad93b076c 100644 --- a/config/sync/core.entity_view_display.node.vet_center_outstation.external_content.yml +++ b/config/sync/core.entity_view_display.node.vet_center_outstation.external_content.yml @@ -104,6 +104,7 @@ content: weight: 5 region: content hidden: + breadcrumbs: true content_moderation_control: true field_administration: true field_geolocation: true diff --git a/config/sync/core.entity_view_display.node.vet_center_outstation.teaser.yml b/config/sync/core.entity_view_display.node.vet_center_outstation.teaser.yml index 4c44d23ad42..a9f18a13309 100644 --- a/config/sync/core.entity_view_display.node.vet_center_outstation.teaser.yml +++ b/config/sync/core.entity_view_display.node.vet_center_outstation.teaser.yml @@ -37,6 +37,7 @@ content: weight: 100 region: content hidden: + breadcrumbs: true field_address: true field_administration: true field_facility_locator_api_id: true diff --git a/config/sync/core.entity_view_display.taxonomy_term.health_care_service_taxonomy.default.yml b/config/sync/core.entity_view_display.taxonomy_term.health_care_service_taxonomy.default.yml index 4ea68b3ba68..b68b4be3a0b 100644 --- a/config/sync/core.entity_view_display.taxonomy_term.health_care_service_taxonomy.default.yml +++ b/config/sync/core.entity_view_display.taxonomy_term.health_care_service_taxonomy.default.yml @@ -6,9 +6,13 @@ dependencies: - field.field.taxonomy_term.health_care_service_taxonomy.field_also_known_as - field.field.taxonomy_term.health_care_service_taxonomy.field_commonly_treated_condition - field.field.taxonomy_term.health_care_service_taxonomy.field_enforce_unique_combo_servi + - field.field.taxonomy_term.health_care_service_taxonomy.field_facility_service_descripti + - field.field.taxonomy_term.health_care_service_taxonomy.field_facility_service_header - field.field.taxonomy_term.health_care_service_taxonomy.field_health_service_api_id - field.field.taxonomy_term.health_care_service_taxonomy.field_online_self_service - field.field.taxonomy_term.health_care_service_taxonomy.field_owner + - field.field.taxonomy_term.health_care_service_taxonomy.field_regional_service_descripti + - field.field.taxonomy_term.health_care_service_taxonomy.field_regional_service_header - field.field.taxonomy_term.health_care_service_taxonomy.field_service_type_of_care - field.field.taxonomy_term.health_care_service_taxonomy.field_show_for_vamc_facilities - field.field.taxonomy_term.health_care_service_taxonomy.field_show_for_vba_facilities @@ -77,6 +81,22 @@ content: third_party_settings: { } weight: 13 region: content + field_facility_service_descripti: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 24 + region: content + field_facility_service_header: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 23 + region: content field_health_service_api_id: type: string label: above @@ -95,6 +115,22 @@ content: rel: '' target: '' third_party_settings: { } + weight: 25 + region: content + field_regional_service_descripti: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 22 + region: content + field_regional_service_header: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } weight: 21 region: content field_service_type_of_care: @@ -149,7 +185,7 @@ content: format_custom_false: '' format_custom_true: '' third_party_settings: { } - weight: 23 + weight: 27 region: content field_vba_com_conditions: type: string @@ -180,7 +216,7 @@ content: settings: link: true third_party_settings: { } - weight: 22 + weight: 26 region: content field_vba_type_of_care: type: list_default diff --git a/config/sync/core.entity_view_display.taxonomy_term.health_care_service_taxonomy.vamc_facility_service.yml b/config/sync/core.entity_view_display.taxonomy_term.health_care_service_taxonomy.vamc_facility_service.yml index 8c76b009e50..45ff64af5c9 100644 --- a/config/sync/core.entity_view_display.taxonomy_term.health_care_service_taxonomy.vamc_facility_service.yml +++ b/config/sync/core.entity_view_display.taxonomy_term.health_care_service_taxonomy.vamc_facility_service.yml @@ -7,9 +7,13 @@ dependencies: - field.field.taxonomy_term.health_care_service_taxonomy.field_also_known_as - field.field.taxonomy_term.health_care_service_taxonomy.field_commonly_treated_condition - field.field.taxonomy_term.health_care_service_taxonomy.field_enforce_unique_combo_servi + - field.field.taxonomy_term.health_care_service_taxonomy.field_facility_service_descripti + - field.field.taxonomy_term.health_care_service_taxonomy.field_facility_service_header - field.field.taxonomy_term.health_care_service_taxonomy.field_health_service_api_id - field.field.taxonomy_term.health_care_service_taxonomy.field_online_self_service - field.field.taxonomy_term.health_care_service_taxonomy.field_owner + - field.field.taxonomy_term.health_care_service_taxonomy.field_regional_service_descripti + - field.field.taxonomy_term.health_care_service_taxonomy.field_regional_service_header - field.field.taxonomy_term.health_care_service_taxonomy.field_service_type_of_care - field.field.taxonomy_term.health_care_service_taxonomy.field_show_for_vamc_facilities - field.field.taxonomy_term.health_care_service_taxonomy.field_show_for_vba_facilities @@ -78,9 +82,13 @@ hidden: field_also_known_as: true field_commonly_treated_condition: true field_enforce_unique_combo_servi: true + field_facility_service_descripti: true + field_facility_service_header: true field_health_service_api_id: true field_online_self_service: true field_owner: true + field_regional_service_descripti: true + field_regional_service_header: true field_service_type_of_care: true field_show_for_vamc_facilities: true field_show_for_vba_facilities: true diff --git a/config/sync/core.entity_view_display.taxonomy_term.health_care_service_taxonomy.vba_facility_service.yml b/config/sync/core.entity_view_display.taxonomy_term.health_care_service_taxonomy.vba_facility_service.yml index fdd9ca04242..375a9078227 100644 --- a/config/sync/core.entity_view_display.taxonomy_term.health_care_service_taxonomy.vba_facility_service.yml +++ b/config/sync/core.entity_view_display.taxonomy_term.health_care_service_taxonomy.vba_facility_service.yml @@ -7,9 +7,13 @@ dependencies: - field.field.taxonomy_term.health_care_service_taxonomy.field_also_known_as - field.field.taxonomy_term.health_care_service_taxonomy.field_commonly_treated_condition - field.field.taxonomy_term.health_care_service_taxonomy.field_enforce_unique_combo_servi + - field.field.taxonomy_term.health_care_service_taxonomy.field_facility_service_descripti + - field.field.taxonomy_term.health_care_service_taxonomy.field_facility_service_header - field.field.taxonomy_term.health_care_service_taxonomy.field_health_service_api_id - field.field.taxonomy_term.health_care_service_taxonomy.field_online_self_service - field.field.taxonomy_term.health_care_service_taxonomy.field_owner + - field.field.taxonomy_term.health_care_service_taxonomy.field_regional_service_descripti + - field.field.taxonomy_term.health_care_service_taxonomy.field_regional_service_header - field.field.taxonomy_term.health_care_service_taxonomy.field_service_type_of_care - field.field.taxonomy_term.health_care_service_taxonomy.field_show_for_vamc_facilities - field.field.taxonomy_term.health_care_service_taxonomy.field_show_for_vba_facilities @@ -75,9 +79,13 @@ hidden: field_also_known_as: true field_commonly_treated_condition: true field_enforce_unique_combo_servi: true + field_facility_service_descripti: true + field_facility_service_header: true field_health_service_api_id: true field_online_self_service: true field_owner: true + field_regional_service_descripti: true + field_regional_service_header: true field_service_type_of_care: true field_show_for_vamc_facilities: true field_show_for_vba_facilities: true diff --git a/config/sync/core.entity_view_display.taxonomy_term.health_care_service_taxonomy.vet_center_service.yml b/config/sync/core.entity_view_display.taxonomy_term.health_care_service_taxonomy.vet_center_service.yml index c385015b76a..ffb258753ed 100644 --- a/config/sync/core.entity_view_display.taxonomy_term.health_care_service_taxonomy.vet_center_service.yml +++ b/config/sync/core.entity_view_display.taxonomy_term.health_care_service_taxonomy.vet_center_service.yml @@ -7,9 +7,13 @@ dependencies: - field.field.taxonomy_term.health_care_service_taxonomy.field_also_known_as - field.field.taxonomy_term.health_care_service_taxonomy.field_commonly_treated_condition - field.field.taxonomy_term.health_care_service_taxonomy.field_enforce_unique_combo_servi + - field.field.taxonomy_term.health_care_service_taxonomy.field_facility_service_descripti + - field.field.taxonomy_term.health_care_service_taxonomy.field_facility_service_header - field.field.taxonomy_term.health_care_service_taxonomy.field_health_service_api_id - field.field.taxonomy_term.health_care_service_taxonomy.field_online_self_service - field.field.taxonomy_term.health_care_service_taxonomy.field_owner + - field.field.taxonomy_term.health_care_service_taxonomy.field_regional_service_descripti + - field.field.taxonomy_term.health_care_service_taxonomy.field_regional_service_header - field.field.taxonomy_term.health_care_service_taxonomy.field_service_type_of_care - field.field.taxonomy_term.health_care_service_taxonomy.field_show_for_vamc_facilities - field.field.taxonomy_term.health_care_service_taxonomy.field_show_for_vba_facilities @@ -77,9 +81,13 @@ hidden: field_also_known_as: true field_commonly_treated_condition: true field_enforce_unique_combo_servi: true + field_facility_service_descripti: true + field_facility_service_header: true field_health_service_api_id: true field_online_self_service: true field_owner: true + field_regional_service_descripti: true + field_regional_service_header: true field_service_type_of_care: true field_show_for_vamc_facilities: true field_show_for_vba_facilities: true diff --git a/config/sync/feature_toggle.features.yml b/config/sync/feature_toggle.features.yml index 3c70f0d3ef2..40c99c928c7 100644 --- a/config/sync/feature_toggle.features.yml +++ b/config/sync/feature_toggle.features.yml @@ -4,4 +4,4 @@ features: feature_all_hub_side_navs: FEATURE_ALL_HUB_SIDE_NAVS feature_single_value_field_link: FEATURE_SINGLE_VALUE_FIELD_LINK feature_health_connect_number: FEATURE_HEALTH_CONNECT_NUMBER - feature_mobile_app_promo: FEATURE_MOBILE_APP_PROMO + feature_event_outreach_checkbox: FEATURE_EVENT_OUTREACH_CHECKBOX diff --git a/config/sync/field.field.node.event.field_additional_listings.yml b/config/sync/field.field.node.event.field_additional_listings.yml new file mode 100644 index 00000000000..7cad3388545 --- /dev/null +++ b/config/sync/field.field.node.event.field_additional_listings.yml @@ -0,0 +1,38 @@ +uuid: 8a728072-bd70-4a45-9109-34daa8451ae8 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_additional_listings + - node.type.event + module: + - entity_reference_validators + - tmgmt_content +third_party_settings: + entity_reference_validators: + circular_reference: false + circular_reference_deep: false + duplicate_reference: false + tmgmt_content: + excluded: false +id: node.event.field_additional_listings +field_name: field_additional_listings +entity_type: node +bundle: event +label: 'Additional Listings' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:node' + handler_settings: + target_bundles: + event: event + sort: + field: _none + direction: ASC + auto_create: false + auto_create_bundle: '' +field_type: entity_reference diff --git a/config/sync/field.field.node.event.field_publish_to_outreach_cal.yml b/config/sync/field.field.node.event.field_publish_to_outreach_cal.yml new file mode 100644 index 00000000000..297adec89eb --- /dev/null +++ b/config/sync/field.field.node.event.field_publish_to_outreach_cal.yml @@ -0,0 +1,28 @@ +uuid: ba2d9d43-c4b9-4bfd-831a-9ef7544d43f8 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_publish_to_outreach_cal + - node.type.event + module: + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: node.event.field_publish_to_outreach_cal +field_name: field_publish_to_outreach_cal +entity_type: node +bundle: event +label: 'Publish to the National Outreach Calendar' +description: '' +required: false +translatable: false +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'Yes' + off_label: 'No' +field_type: boolean diff --git a/config/sync/field.field.taxonomy_term.health_care_service_taxonomy.field_facility_service_descripti.yml b/config/sync/field.field.taxonomy_term.health_care_service_taxonomy.field_facility_service_descripti.yml new file mode 100644 index 00000000000..e337b5b47ce --- /dev/null +++ b/config/sync/field.field.taxonomy_term.health_care_service_taxonomy.field_facility_service_descripti.yml @@ -0,0 +1,24 @@ +uuid: 4d8bf339-fe4c-440a-adcb-294d21f3b234 +langcode: en +status: true +dependencies: + config: + - field.storage.taxonomy_term.field_facility_service_descripti + - taxonomy.vocabulary.health_care_service_taxonomy + module: + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: taxonomy_term.health_care_service_taxonomy.field_facility_service_descripti +field_name: field_facility_service_descripti +entity_type: taxonomy_term +bundle: health_care_service_taxonomy +label: 'Facility service description' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/config/sync/field.field.taxonomy_term.health_care_service_taxonomy.field_facility_service_header.yml b/config/sync/field.field.taxonomy_term.health_care_service_taxonomy.field_facility_service_header.yml new file mode 100644 index 00000000000..5b988b758e1 --- /dev/null +++ b/config/sync/field.field.taxonomy_term.health_care_service_taxonomy.field_facility_service_header.yml @@ -0,0 +1,24 @@ +uuid: 0621ef26-5e83-4619-9ec8-9d904524daf5 +langcode: en +status: true +dependencies: + config: + - field.storage.taxonomy_term.field_facility_service_header + - taxonomy.vocabulary.health_care_service_taxonomy + module: + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: taxonomy_term.health_care_service_taxonomy.field_facility_service_header +field_name: field_facility_service_header +entity_type: taxonomy_term +bundle: health_care_service_taxonomy +label: 'Facility service header' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/config/sync/field.field.taxonomy_term.health_care_service_taxonomy.field_regional_service_descripti.yml b/config/sync/field.field.taxonomy_term.health_care_service_taxonomy.field_regional_service_descripti.yml new file mode 100644 index 00000000000..9c280dfacee --- /dev/null +++ b/config/sync/field.field.taxonomy_term.health_care_service_taxonomy.field_regional_service_descripti.yml @@ -0,0 +1,24 @@ +uuid: 4bcbbc89-3484-4924-bcc5-fe9579bfd3ce +langcode: en +status: true +dependencies: + config: + - field.storage.taxonomy_term.field_regional_service_descripti + - taxonomy.vocabulary.health_care_service_taxonomy + module: + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: taxonomy_term.health_care_service_taxonomy.field_regional_service_descripti +field_name: field_regional_service_descripti +entity_type: taxonomy_term +bundle: health_care_service_taxonomy +label: 'Regional service description' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/config/sync/field.field.taxonomy_term.health_care_service_taxonomy.field_regional_service_header.yml b/config/sync/field.field.taxonomy_term.health_care_service_taxonomy.field_regional_service_header.yml new file mode 100644 index 00000000000..f78a6e04e92 --- /dev/null +++ b/config/sync/field.field.taxonomy_term.health_care_service_taxonomy.field_regional_service_header.yml @@ -0,0 +1,24 @@ +uuid: 0c6de90d-3960-407c-ab9a-8266320925ef +langcode: en +status: true +dependencies: + config: + - field.storage.taxonomy_term.field_regional_service_header + - taxonomy.vocabulary.health_care_service_taxonomy + module: + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: taxonomy_term.health_care_service_taxonomy.field_regional_service_header +field_name: field_regional_service_header +entity_type: taxonomy_term +bundle: health_care_service_taxonomy +label: 'Regional service header' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/config/sync/field.storage.node.field_additional_listings.yml b/config/sync/field.storage.node.field_additional_listings.yml new file mode 100644 index 00000000000..f66f010832d --- /dev/null +++ b/config/sync/field.storage.node.field_additional_listings.yml @@ -0,0 +1,19 @@ +uuid: b7f382fa-a73c-4bdd-b7f7-4f4c1c0294e8 +langcode: en +status: true +dependencies: + module: + - node +id: node.field_additional_listings +field_name: field_additional_listings +entity_type: node +type: entity_reference +settings: + target_type: node +module: core +locked: false +cardinality: -1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.node.field_publish_to_outreach_cal.yml b/config/sync/field.storage.node.field_publish_to_outreach_cal.yml new file mode 100644 index 00000000000..760a11b0f32 --- /dev/null +++ b/config/sync/field.storage.node.field_publish_to_outreach_cal.yml @@ -0,0 +1,18 @@ +uuid: ad80a854-7f29-45c1-871a-2d087663f64a +langcode: en +status: true +dependencies: + module: + - node +id: node.field_publish_to_outreach_cal +field_name: field_publish_to_outreach_cal +entity_type: node +type: boolean +settings: { } +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.taxonomy_term.field_facility_service_descripti.yml b/config/sync/field.storage.taxonomy_term.field_facility_service_descripti.yml new file mode 100644 index 00000000000..eeae202f109 --- /dev/null +++ b/config/sync/field.storage.taxonomy_term.field_facility_service_descripti.yml @@ -0,0 +1,21 @@ +uuid: da41c0a6-f37e-4141-8dce-009c44544559 +langcode: en +status: true +dependencies: + module: + - taxonomy +id: taxonomy_term.field_facility_service_descripti +field_name: field_facility_service_descripti +entity_type: taxonomy_term +type: string +settings: + max_length: 255 + case_sensitive: false + is_ascii: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.taxonomy_term.field_facility_service_header.yml b/config/sync/field.storage.taxonomy_term.field_facility_service_header.yml new file mode 100644 index 00000000000..1f68f0d781b --- /dev/null +++ b/config/sync/field.storage.taxonomy_term.field_facility_service_header.yml @@ -0,0 +1,21 @@ +uuid: cfa50495-7f90-4ecb-818d-1c137df35fe9 +langcode: en +status: true +dependencies: + module: + - taxonomy +id: taxonomy_term.field_facility_service_header +field_name: field_facility_service_header +entity_type: taxonomy_term +type: string +settings: + max_length: 255 + case_sensitive: false + is_ascii: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.taxonomy_term.field_regional_service_descripti.yml b/config/sync/field.storage.taxonomy_term.field_regional_service_descripti.yml new file mode 100644 index 00000000000..0d98c78135c --- /dev/null +++ b/config/sync/field.storage.taxonomy_term.field_regional_service_descripti.yml @@ -0,0 +1,21 @@ +uuid: f3e3694e-df97-4493-93e8-81e6a34493c0 +langcode: en +status: true +dependencies: + module: + - taxonomy +id: taxonomy_term.field_regional_service_descripti +field_name: field_regional_service_descripti +entity_type: taxonomy_term +type: string +settings: + max_length: 255 + case_sensitive: false + is_ascii: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.taxonomy_term.field_regional_service_header.yml b/config/sync/field.storage.taxonomy_term.field_regional_service_header.yml new file mode 100644 index 00000000000..d038409adc6 --- /dev/null +++ b/config/sync/field.storage.taxonomy_term.field_regional_service_header.yml @@ -0,0 +1,21 @@ +uuid: 6a2939f6-917f-4e6b-a675-4e7fd8a826f1 +langcode: en +status: true +dependencies: + module: + - taxonomy +id: taxonomy_term.field_regional_service_header +field_name: field_regional_service_header +entity_type: taxonomy_term +type: string +settings: + max_length: 255 + case_sensitive: false + is_ascii: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/views.view.content.yml b/config/sync/views.view.content.yml index 567a031593f..02ab068810a 100644 --- a/config/sync/views.view.content.yml +++ b/config/sync/views.view.content.yml @@ -29,7 +29,6 @@ dependencies: - user.role.content_admin - user.role.content_creator_resources_and_support - user.role.redirect_administrator - - workflows.workflow.editorial module: - content_lock - content_moderation @@ -117,15 +116,17 @@ display: form_step: true buttons: false action_title: Action + clear_on_exposed: true + force_selection_info: false selected_actions: - action_id: node_save_action preconfiguration: - add_confirmation: 0 + add_confirmation: false - action_id: node_assign_owner_action preconfiguration: - add_confirmation: 0 + add_confirmation: false - action_id: publish_latest_revision_action - @@ -133,16 +134,14 @@ display: - action_id: views_bulk_edit preconfiguration: - add_confirmation: 0 - get_bundles_from_results: 1 + add_confirmation: false + get_bundles_from_results: true - action_id: views_bulk_operations_delete_entity - action_id: 'entity:pathauto_update_alias:node' preconfiguration: - add_confirmation: 0 - clear_on_exposed: true - force_selection_info: 0 + add_confirmation: false title: id: title table: node_field_data @@ -637,22 +636,17 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in - value: - all: all - editorial-draft: editorial-draft - editorial-review: editorial-review - editorial-published: editorial-published - editorial-archived: editorial-archived + plugin_id: moderation_state_multiple_workflow_filter + operator: or + value: { } group: 1 exposed: true expose: @@ -660,7 +654,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -670,15 +664,23 @@ display: remember_roles: authenticated: authenticated anonymous: '0' + content_api_consumer: '0' + content_creator_benefits_hubs: '0' + content_creator_resources_and_support: '0' + office_content_creator: '0' + vamc_content_creator: '0' + content_creator_vet_center: '0' + content_editor: '0' + content_reviewer: '0' + content_publisher: '0' + content_admin: '0' + redirect_administrator: '0' + admnistrator_users: '0' administrator: '0' - page_creator: '0' - layout_manager: '0' - page_reviewer: '0' - landing_page_creator: '0' - landing_page_reviewer: '0' - media_creator: '0' - media_manager: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -691,6 +693,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 taxonomy_entity_index_tid_depth: id: taxonomy_entity_index_tid_depth table: node @@ -926,7 +929,6 @@ display: - user.roles tags: - 'config:field.storage.node.field_administration' - - 'config:workflow_list' content_audit_csv_export: id: content_audit_csv_export display_title: 'Content audit CSV export' @@ -1460,16 +1462,16 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in + plugin_id: moderation_state_multiple_workflow_filter + operator: or value: { } group: 1 exposed: true @@ -1478,7 +1480,7 @@ display: label: 'Moderation state' description: '' use_operator: true - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -1501,7 +1503,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -1514,6 +1519,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -1639,7 +1645,6 @@ display: - user.roles tags: - 'config:field.storage.node.field_administration' - - 'config:workflow_list' - workbench_access_view deleted: false content_audit_page: @@ -2172,16 +2177,16 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in + plugin_id: moderation_state_multiple_workflow_filter + operator: or value: { } group: 1 exposed: true @@ -2190,7 +2195,7 @@ display: label: 'Moderation state' description: '' use_operator: true - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -2213,7 +2218,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -2226,6 +2234,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -2338,7 +2347,6 @@ display: - user.permissions tags: - 'config:field.storage.node.field_administration' - - 'config:workflow_list' - workbench_access_view deleted: false events_page: @@ -2403,6 +2411,7 @@ display: form_step: true buttons: false action_title: Action + clear_on_exposed: true selected_actions: - action_id: publish_latest_revision_action @@ -2416,8 +2425,7 @@ display: action_id: views_bulk_edit preconfiguration: label_override: '' - get_bundles_from_results: 1 - clear_on_exposed: true + get_bundles_from_results: true title: id: title table: node_field_data @@ -2935,22 +2943,17 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in - value: - all: all - editorial-draft: editorial-draft - editorial-review: editorial-review - editorial-published: editorial-published - editorial-archived: editorial-archived + plugin_id: moderation_state_multiple_workflow_filter + operator: or + value: { } group: 1 exposed: true expose: @@ -2958,7 +2961,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -2968,15 +2971,23 @@ display: remember_roles: authenticated: authenticated anonymous: '0' + content_api_consumer: '0' + content_creator_benefits_hubs: '0' + content_creator_resources_and_support: '0' + office_content_creator: '0' + vamc_content_creator: '0' + content_creator_vet_center: '0' + content_editor: '0' + content_reviewer: '0' + content_publisher: '0' + content_admin: '0' + redirect_administrator: '0' + admnistrator_users: '0' administrator: '0' - page_creator: '0' - layout_manager: '0' - page_reviewer: '0' - landing_page_creator: '0' - landing_page_reviewer: '0' - media_creator: '0' - media_manager: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -2989,6 +3000,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 taxonomy_entity_index_tid_depth: id: taxonomy_entity_index_tid_depth table: node @@ -3225,7 +3237,6 @@ display: tags: - 'config:field.storage.node.field_administration' - 'config:field.storage.node.field_facility_location' - - 'config:workflow_list' deleted: false outdated_content: id: outdated_content @@ -5924,22 +5935,17 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in - value: - all: all - editorial-draft: editorial-draft - editorial-review: editorial-review - editorial-published: editorial-published - editorial-archived: editorial-archived + plugin_id: moderation_state_multiple_workflow_filter + operator: or + value: { } group: 1 exposed: true expose: @@ -5947,7 +5953,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -5957,15 +5963,23 @@ display: remember_roles: authenticated: authenticated anonymous: '0' + content_api_consumer: '0' + content_creator_benefits_hubs: '0' + content_creator_resources_and_support: '0' + office_content_creator: '0' + vamc_content_creator: '0' + content_creator_vet_center: '0' + content_editor: '0' + content_reviewer: '0' + content_publisher: '0' + content_admin: '0' + redirect_administrator: '0' + admnistrator_users: '0' administrator: '0' - page_creator: '0' - layout_manager: '0' - page_reviewer: '0' - landing_page_creator: '0' - landing_page_reviewer: '0' - media_creator: '0' - media_manager: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -5978,6 +5992,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 field_administration_target_id: id: field_administration_target_id table: node__field_administration @@ -6087,7 +6102,6 @@ display: - user.permissions tags: - 'config:field.storage.node.field_administration' - - 'config:workflow_list' deleted: false page_2: id: page_2 @@ -6151,11 +6165,13 @@ display: form_step: true buttons: false action_title: Action + clear_on_exposed: true + force_selection_info: false selected_actions: 3: action_id: node_assign_owner_action preconfiguration: - add_confirmation: 1 + add_confirmation: true 9: action_id: archive_node_action 10: @@ -6163,21 +6179,19 @@ display: 11: action_id: views_bulk_edit preconfiguration: - add_confirmation: 1 - get_bundles_from_results: 1 + add_confirmation: true + get_bundles_from_results: true 12: action_id: views_bulk_operations_delete_entity 13: action_id: 'entity:pathauto_update_alias:node' preconfiguration: - add_confirmation: 1 + add_confirmation: true 15: action_id: 'entity:save_action:node' preconfiguration: + add_confirmation: true label_override: 'Resave content' - add_confirmation: 1 - clear_on_exposed: true - force_selection_info: 0 title: id: title table: node_field_data @@ -6619,7 +6633,6 @@ display: - user.roles tags: - 'config:field.storage.node.field_administration' - - 'config:workflow_list' deleted: false resources_support_dashboard: id: resources_support_dashboard @@ -6683,12 +6696,12 @@ display: form_step: true buttons: false action_title: Action + clear_on_exposed: true selected_actions: - action_id: publish_latest_revision_action preconfiguration: label_override: '' - clear_on_exposed: true title: id: title table: node_field_data @@ -7501,22 +7514,17 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in - value: - all: all - editorial-draft: editorial-draft - editorial-review: editorial-review - editorial-published: editorial-published - editorial-archived: editorial-archived + plugin_id: moderation_state_multiple_workflow_filter + operator: or + value: { } group: 1 exposed: true expose: @@ -7524,7 +7532,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -7534,15 +7542,23 @@ display: remember_roles: authenticated: authenticated anonymous: '0' + content_api_consumer: '0' + content_creator_benefits_hubs: '0' + content_creator_resources_and_support: '0' + office_content_creator: '0' + vamc_content_creator: '0' + content_creator_vet_center: '0' + content_editor: '0' + content_reviewer: '0' + content_publisher: '0' + content_admin: '0' + redirect_administrator: '0' + admnistrator_users: '0' administrator: '0' - page_creator: '0' - layout_manager: '0' - page_reviewer: '0' - landing_page_creator: '0' - landing_page_reviewer: '0' - media_creator: '0' - media_manager: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -7555,6 +7571,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 taxonomy_entity_index_tid_depth: id: taxonomy_entity_index_tid_depth table: node @@ -7871,5 +7888,4 @@ display: - 'config:field.storage.node.field_other_categories' - 'config:field.storage.node.field_primary_category' - 'config:field.storage.paragraph.field_topics' - - 'config:workflow_list' deleted: false diff --git a/config/sync/views.view.facility_services.yml b/config/sync/views.view.facility_services.yml index ef9558e02a2..65b0fdd2c81 100644 --- a/config/sync/views.view.facility_services.yml +++ b/config/sync/views.view.facility_services.yml @@ -168,7 +168,7 @@ dependencies: _core: default_config_hash: tS8PbpJX90aRFC3-UTgXzdqkq7_2frk2pz4TMijEebM id: facility_services -label: 'Facility Services' +label: 'Facility Services and other facility audits.' module: node description: '' tag: default @@ -1600,22 +1600,17 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in - value: - all: all - editorial-draft: editorial-draft - editorial-review: editorial-review - editorial-published: editorial-published - editorial-archived: editorial-archived + plugin_id: moderation_state_multiple_workflow_filter + operator: or + value: { } group: 1 exposed: true expose: @@ -1623,7 +1618,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -1633,15 +1628,23 @@ display: remember_roles: authenticated: authenticated anonymous: '0' + content_api_consumer: '0' + content_creator_benefits_hubs: '0' + content_creator_resources_and_support: '0' + office_content_creator: '0' + vamc_content_creator: '0' + content_creator_vet_center: '0' + content_editor: '0' + content_reviewer: '0' + content_publisher: '0' + content_admin: '0' + redirect_administrator: '0' + admnistrator_users: '0' administrator: '0' - page_creator: '0' - layout_manager: '0' - page_reviewer: '0' - landing_page_creator: '0' - landing_page_reviewer: '0' - media_creator: '0' - media_manager: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -1654,6 +1657,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -1838,7 +1842,6 @@ display: tags: - 'config:field.storage.node.field_administration' - 'config:field.storage.paragraph.field_title' - - 'config:workflow_list' - workbench_access_view accordion_audit_export: id: accordion_audit_export @@ -2402,22 +2405,17 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in - value: - all: all - editorial-draft: editorial-draft - editorial-review: editorial-review - editorial-published: editorial-published - editorial-archived: editorial-archived + plugin_id: moderation_state_multiple_workflow_filter + operator: or + value: { } group: 1 exposed: true expose: @@ -2425,7 +2423,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -2435,15 +2433,23 @@ display: remember_roles: authenticated: authenticated anonymous: '0' + content_api_consumer: '0' + content_creator_benefits_hubs: '0' + content_creator_resources_and_support: '0' + office_content_creator: '0' + vamc_content_creator: '0' + content_creator_vet_center: '0' + content_editor: '0' + content_reviewer: '0' + content_publisher: '0' + content_admin: '0' + redirect_administrator: '0' + admnistrator_users: '0' administrator: '0' - page_creator: '0' - layout_manager: '0' - page_reviewer: '0' - landing_page_creator: '0' - landing_page_reviewer: '0' - media_creator: '0' - media_manager: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -2456,6 +2462,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 field_administration_target_id: id: field_administration_target_id table: node__field_administration @@ -2584,7 +2591,6 @@ display: tags: - 'config:field.storage.node.field_administration' - 'config:field.storage.paragraph.field_title' - - 'config:workflow_list' addresses: id: addresses display_title: Addresses @@ -3373,16 +3379,16 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in + plugin_id: moderation_state_multiple_workflow_filter + operator: or value: { } group: 1 exposed: true @@ -3391,7 +3397,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -3414,7 +3420,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -3427,6 +3436,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -4037,7 +4047,6 @@ display: - 'config:field.storage.node.field_address' - 'config:field.storage.node.field_administration' - 'config:field.storage.node.field_geolocation' - - 'config:workflow_list' - workbench_access_view addresses_export: id: addresses_export @@ -4876,16 +4885,16 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in + plugin_id: moderation_state_multiple_workflow_filter + operator: or value: { } group: 1 exposed: true @@ -4894,7 +4903,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -4917,7 +4926,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -4930,6 +4942,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -5458,7 +5471,6 @@ display: tags: - 'config:field.storage.node.field_administration' - 'config:field.storage.node.field_geolocation' - - 'config:workflow_list' - workbench_access_view content_audit_facilities: id: content_audit_facilities @@ -6314,22 +6326,17 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in - value: - all: all - editorial-draft: editorial-draft - editorial-review: editorial-review - editorial-published: editorial-published - editorial-archived: editorial-archived + plugin_id: moderation_state_multiple_workflow_filter + operator: or + value: { } group: 1 exposed: true expose: @@ -6337,7 +6344,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -6347,15 +6354,23 @@ display: remember_roles: authenticated: authenticated anonymous: '0' + content_api_consumer: '0' + content_creator_benefits_hubs: '0' + content_creator_resources_and_support: '0' + office_content_creator: '0' + vamc_content_creator: '0' + content_creator_vet_center: '0' + content_editor: '0' + content_reviewer: '0' + content_publisher: '0' + content_admin: '0' + redirect_administrator: '0' + admnistrator_users: '0' administrator: '0' - page_creator: '0' - layout_manager: '0' - page_reviewer: '0' - landing_page_creator: '0' - landing_page_reviewer: '0' - media_creator: '0' - media_manager: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -6368,6 +6383,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -6617,7 +6633,6 @@ display: - 'config:field.storage.node.field_facility_locator_api_id' - 'config:field.storage.node.field_office' - 'config:field.storage.node.field_region_page' - - 'config:workflow_list' - workbench_access_view content_audit_facilities_export: id: content_audit_facilities_export @@ -7275,22 +7290,17 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in - value: - all: all - editorial-draft: editorial-draft - editorial-review: editorial-review - editorial-published: editorial-published - editorial-archived: editorial-archived + plugin_id: moderation_state_multiple_workflow_filter + operator: or + value: { } group: 1 exposed: true expose: @@ -7298,7 +7308,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -7308,15 +7318,23 @@ display: remember_roles: authenticated: authenticated anonymous: '0' + content_api_consumer: '0' + content_creator_benefits_hubs: '0' + content_creator_resources_and_support: '0' + office_content_creator: '0' + vamc_content_creator: '0' + content_creator_vet_center: '0' + content_editor: '0' + content_reviewer: '0' + content_publisher: '0' + content_admin: '0' + redirect_administrator: '0' + admnistrator_users: '0' administrator: '0' - page_creator: '0' - layout_manager: '0' - page_reviewer: '0' - landing_page_creator: '0' - landing_page_reviewer: '0' - media_creator: '0' - media_manager: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -7329,6 +7347,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 taxonomy_entity_index_tid_depth: id: taxonomy_entity_index_tid_depth table: node @@ -7467,7 +7486,6 @@ display: - 'config:field.storage.node.field_facility_locator_api_id' - 'config:field.storage.node.field_office' - 'config:field.storage.node.field_region_page' - - 'config:workflow_list' data_export_facility_urls: id: data_export_facility_urls display_title: 'Facility Urls' @@ -8813,16 +8831,16 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in + plugin_id: moderation_state_multiple_workflow_filter + operator: or value: { } group: 1 exposed: true @@ -8831,7 +8849,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -8854,7 +8872,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -8867,6 +8888,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -8988,7 +9010,6 @@ display: - 'config:field.storage.node.field_operating_status_facility' - 'config:field.storage.node.field_operating_status_more_info' - 'config:field.storage.node.field_supplemental_status' - - 'config:workflow_list' - workbench_access_view facility_status_page: id: facility_status_page @@ -10167,16 +10188,16 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in + plugin_id: moderation_state_multiple_workflow_filter + operator: or value: { } group: 1 exposed: true @@ -10185,7 +10206,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -10208,7 +10229,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -10221,6 +10245,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -10431,7 +10456,6 @@ display: - 'config:field.storage.node.field_operating_status_more_info' - 'config:field.storage.node.field_supplemental_status' - 'config:field.storage.node.field_supplemental_status_more_i' - - 'config:workflow_list' - workbench_access_view page_1: id: page_1 @@ -10830,22 +10854,17 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in - value: - all: all - editorial-draft: editorial-draft - editorial-review: editorial-review - editorial-published: editorial-published - editorial-archived: editorial-archived + plugin_id: moderation_state_multiple_workflow_filter + operator: or + value: { } group: 1 exposed: true expose: @@ -10853,7 +10872,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -10863,15 +10882,23 @@ display: remember_roles: authenticated: authenticated anonymous: '0' + content_api_consumer: '0' + content_creator_benefits_hubs: '0' + content_creator_resources_and_support: '0' + office_content_creator: '0' + vamc_content_creator: '0' + content_creator_vet_center: '0' + content_editor: '0' + content_reviewer: '0' + content_publisher: '0' + content_admin: '0' + redirect_administrator: '0' + admnistrator_users: '0' administrator: '0' - page_creator: '0' - layout_manager: '0' - page_reviewer: '0' - landing_page_creator: '0' - landing_page_reviewer: '0' - media_creator: '0' - media_manager: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -10884,6 +10911,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -11146,7 +11174,6 @@ display: - user.roles tags: - 'config:field.storage.node.field_media' - - 'config:workflow_list' - workbench_access_view vamc_facility_health_services_export: id: vamc_facility_health_services_export @@ -12747,16 +12774,16 @@ display: default_group_multiple: { } group_items: { } reduce_duplicates: false - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in + plugin_id: moderation_state_multiple_workflow_filter + operator: or value: { } group: 1 exposed: true @@ -12765,7 +12792,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -12788,7 +12815,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -12801,6 +12831,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 filter_groups: operator: AND groups: @@ -12927,7 +12958,6 @@ display: - 'config:field.storage.node.field_online_scheduling_availabl' - 'config:field.storage.node.field_referral_required' - 'config:field.storage.node.field_walk_ins_accepted' - - 'config:workflow_list' deleted: false vamc_facility_health_services_page: id: vamc_facility_health_services_page @@ -14475,16 +14505,16 @@ display: default_group_multiple: { } group_items: { } reduce_duplicates: false - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in + plugin_id: moderation_state_multiple_workflow_filter + operator: or value: { } group: 1 exposed: true @@ -14493,7 +14523,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -14516,7 +14546,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -14529,6 +14562,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -14875,7 +14909,6 @@ display: - 'config:field.storage.node.field_online_scheduling_availabl' - 'config:field.storage.node.field_referral_required' - 'config:field.storage.node.field_walk_ins_accepted' - - 'config:workflow_list' - workbench_access_view deleted: false vamc_facility_non_clinical_services_export: @@ -15978,16 +16011,16 @@ display: hierarchy: true limit: true error_message: true - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in + plugin_id: moderation_state_multiple_workflow_filter + operator: or value: { } group: 1 exposed: true @@ -15996,7 +16029,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -16019,7 +16052,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -16032,6 +16068,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 field_administration_target_id: id: field_administration_target_id table: node__field_administration @@ -16193,7 +16230,6 @@ display: - 'config:field.storage.node.field_administration' - 'config:field.storage.node.field_facility_location' - 'config:field.storage.node.field_facility_locator_api_id' - - 'config:workflow_list' deleted: false vamc_facility_non_clinical_services_page: id: vamc_facility_non_clinical_services_page @@ -17303,16 +17339,16 @@ display: hierarchy: true limit: true error_message: true - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in + plugin_id: moderation_state_multiple_workflow_filter + operator: or value: { } group: 1 exposed: true @@ -17321,7 +17357,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -17344,7 +17380,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -17357,6 +17396,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -17667,7 +17707,6 @@ display: - 'config:field.storage.node.field_administration' - 'config:field.storage.node.field_facility_location' - 'config:field.storage.node.field_facility_locator_api_id' - - 'config:workflow_list' - workbench_access_view deleted: false vamc_system_service_audit_export: @@ -20063,47 +20102,46 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + field_vamc_ehr_system_value: + id: field_vamc_ehr_system_value + table: node__field_vamc_ehr_system + field: field_vamc_ehr_system_value relationship: none group_type: group admin_label: '' - entity_type: node - plugin_id: moderation_state_filter - operator: in - value: - all: all - editorial-draft: editorial-draft - editorial-review: editorial-review - editorial-published: editorial-published - editorial-archived: editorial-archived + plugin_id: list_field + operator: or + value: { } group: 1 exposed: true expose: - operator_id: moderation_state_op - label: 'Moderation state' + operator_id: field_vamc_ehr_system_value_op + label: 'EHR System' description: '' use_operator: false - operator: moderation_state_op + operator: field_vamc_ehr_system_value_op operator_limit_selection: false operator_list: { } - identifier: moderation_state + identifier: field_vamc_ehr_system_value required: false remember: false multiple: false remember_roles: authenticated: authenticated anonymous: '0' + content_api_consumer: '0' + content_creator_benefits_hubs: '0' + content_creator_resources_and_support: '0' + office_content_creator: '0' + vamc_content_creator: '0' + content_creator_vet_center: '0' + content_editor: '0' + content_reviewer: '0' + content_publisher: '0' + content_admin: '0' + redirect_administrator: '0' + admnistrator_users: '0' administrator: '0' - page_creator: '0' - layout_manager: '0' - page_reviewer: '0' - landing_page_creator: '0' - landing_page_reviewer: '0' - media_creator: '0' - media_manager: '0' reduce: false is_grouped: false group_info: @@ -20117,27 +20155,29 @@ display: default_group: All default_group_multiple: { } group_items: { } - field_vamc_ehr_system_value: - id: field_vamc_ehr_system_value - table: node__field_vamc_ehr_system - field: field_vamc_ehr_system_value + reduce_duplicates: false + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' - plugin_id: list_field + entity_type: node + plugin_id: moderation_state_multiple_workflow_filter operator: or value: { } group: 1 exposed: true expose: - operator_id: field_vamc_ehr_system_value_op - label: 'EHR System' + operator_id: moderation_state_op + label: 'Moderation state' description: '' use_operator: false - operator: field_vamc_ehr_system_value_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } - identifier: field_vamc_ehr_system_value + identifier: moderation_state required: false remember: false multiple: false @@ -20157,7 +20197,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -20170,7 +20213,7 @@ display: default_group: All default_group_multiple: { } group_items: { } - reduce_duplicates: false + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -20424,7 +20467,6 @@ display: - 'config:field.storage.node.field_va_health_connect_phone' - 'config:field.storage.node.field_vamc_ehr_system' - 'config:field.storage.node.field_vamc_system_official_name' - - 'config:workflow_list' - workbench_access_view vet_center_services_export: id: vet_center_services_export @@ -21491,25 +21533,25 @@ display: hierarchy: true limit: true error_message: true - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in + plugin_id: moderation_state_multiple_workflow_filter + operator: or value: { } group: 1 exposed: true expose: - operator_id: moderation_state_op + operator_id: moderation_state_multiple_workflow_filter_op label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -21532,7 +21574,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -21545,6 +21590,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 field_administration_target_id: id: field_administration_target_id table: node__field_administration @@ -21698,7 +21744,6 @@ display: - 'config:field.storage.node.field_administration' - 'config:field.storage.node.field_body' - 'config:field.storage.node.field_facility_locator_api_id' - - 'config:workflow_list' deleted: false vet_center_services_page: id: vet_center_services_page @@ -22768,16 +22813,16 @@ display: hierarchy: true limit: true error_message: true - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in + plugin_id: moderation_state_multiple_workflow_filter + operator: or value: { } group: 1 exposed: true @@ -22786,7 +22831,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -22809,7 +22854,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -22822,6 +22870,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -23121,6 +23170,5 @@ display: - 'config:field.storage.node.field_administration' - 'config:field.storage.node.field_body' - 'config:field.storage.node.field_facility_locator_api_id' - - 'config:workflow_list' - workbench_access_view deleted: false diff --git a/config/sync/views.view.knowledge_base_article_administration.yml b/config/sync/views.view.knowledge_base_article_administration.yml index f6c22f218b7..6a8e4728119 100644 --- a/config/sync/views.view.knowledge_base_article_administration.yml +++ b/config/sync/views.view.knowledge_base_article_administration.yml @@ -694,16 +694,16 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in + plugin_id: moderation_state_multiple_workflow_filter + operator: or value: { } group: 1 exposed: true @@ -712,7 +712,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -735,7 +735,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -748,6 +751,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 field_products_target_id: id: field_products_target_id table: node__field_products @@ -931,7 +935,6 @@ display: tags: - 'config:field.storage.node.field_administration' - 'config:field.storage.node.field_products' - - 'config:workflow_list' knowledge_base_admin: id: knowledge_base_admin display_title: Page @@ -962,4 +965,3 @@ display: tags: - 'config:field.storage.node.field_administration' - 'config:field.storage.node.field_products' - - 'config:workflow_list' diff --git a/config/sync/views.view.metatag_audit.yml b/config/sync/views.view.metatag_audit.yml index e0ea2494224..aa45e065f11 100644 --- a/config/sync/views.view.metatag_audit.yml +++ b/config/sync/views.view.metatag_audit.yml @@ -1002,19 +1002,6 @@ display: granularity: second arguments: { } filters: - status: - id: status - table: node_field_data - field: status - entity_type: node - entity_field: status - plugin_id: boolean - value: '1' - group: 1 - expose: - operator: '' - operator_limit_selection: false - operator_list: { } type: id: type table: node_field_data @@ -1095,16 +1082,16 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in + plugin_id: moderation_state_multiple_workflow_filter + operator: or value: { } group: 1 exposed: true @@ -1113,7 +1100,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -1136,7 +1123,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -1149,6 +1139,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -1224,15 +1215,14 @@ display: changed: changed moderation_state: moderation_state field_administration: field_administration - nothing_2: nothing_2 - nothing: nothing - nothing_1: nothing_1 - field_meta_tags: field_meta_tags - field_meta_title: field_meta_title field_description: field_description field_intro_text: field_intro_text field_hero_image: field_hero_image field_media: field_media + nothing_2: nothing_2 + nothing: nothing + nothing_1: nothing_1 + field_meta_tags: field_meta_tags default: '-1' info: title: @@ -1284,57 +1274,50 @@ display: separator: '' empty_column: false responsive: '' - nothing_2: - align: '' - separator: '' - empty_column: false - responsive: '' - nothing: + field_description: + sortable: false + default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' - nothing_1: + field_intro_text: + sortable: false + default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' - field_meta_tags: + field_hero_image: sortable: false default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' - field_meta_title: + field_media: sortable: false default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' - field_description: - sortable: false - default_sort_order: asc + nothing_2: align: '' separator: '' empty_column: false responsive: '' - field_intro_text: - sortable: false - default_sort_order: asc + nothing: align: '' separator: '' empty_column: false responsive: '' - field_hero_image: - sortable: false - default_sort_order: asc + nothing_1: align: '' separator: '' empty_column: false responsive: '' - field_media: + field_meta_tags: sortable: false default_sort_order: asc align: '' @@ -1345,7 +1328,7 @@ display: sticky: false summary: '' empty_table: false - caption: '' + caption: 'Metatag audit results' description: '' row: type: fields @@ -1368,6 +1351,7 @@ display: - 'languages:language_interface' - url - url.query_args + - user - 'user.node_grants:view' - user.permissions tags: @@ -1377,7 +1361,7 @@ display: - 'config:field.storage.node.field_intro_text' - 'config:field.storage.node.field_media' - 'config:field.storage.node.field_meta_tags' - - 'config:workflow_list' + - workbench_access_view metatag_audit: id: metatag_audit display_title: 'Metatag Audit' @@ -1385,8 +1369,24 @@ display: position: 1 display_options: display_description: '' - display_extenders: { } + display_extenders: + jsonapi_views: + enabled: true path: admin/content/audit/metatag + menu: + type: tab + title: Metatags + description: '' + weight: 0 + expanded: false + menu_name: main + parent: '' + context: '0' + as_local_task: true + local_task_link_title: Metatags + local_task_parent: 'views_view:view.content.content_audit_page' + local_task_weight: 3 + local_task_custom_parent_route: '' cache_metadata: max-age: -1 contexts: @@ -1394,6 +1394,7 @@ display: - 'languages:language_interface' - url - url.query_args + - user - 'user.node_grants:view' - user.permissions tags: @@ -1403,4 +1404,4 @@ display: - 'config:field.storage.node.field_intro_text' - 'config:field.storage.node.field_media' - 'config:field.storage.node.field_meta_tags' - - 'config:workflow_list' + - workbench_access_view diff --git a/config/sync/views.view.rich_text_field_audit.yml b/config/sync/views.view.rich_text_field_audit.yml index 9fd04cdfd3c..cf8ead38a2e 100644 --- a/config/sync/views.view.rich_text_field_audit.yml +++ b/config/sync/views.view.rich_text_field_audit.yml @@ -57,6 +57,7 @@ dependencies: - node.type.vamc_system_policies_page - node.type.vamc_system_register_for_care - node.type.vba_facility + - node.type.vba_facility_service - node.type.vet_center - node.type.vet_center_cap - node.type.vet_center_facility_health_servi @@ -1254,18 +1255,17 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in - value: - all: all + plugin_id: moderation_state_multiple_workflow_filter + operator: or + value: { } group: 1 exposed: true expose: @@ -1273,7 +1273,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -1296,7 +1296,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -1309,6 +1312,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -1444,13 +1448,11 @@ display: nid: nid edit_node_1: edit_node_1 type: type + revision_uid: revision_uid changed: changed moderation_state: moderation_state field_administration: field_administration - field_phone_number: field_phone_number - field_mental_health_phone: field_mental_health_phone - field_va_health_connect_phone: field_va_health_connect_phone - field_phone_numbers_paragraph: field_phone_numbers_paragraph + field_content_block: field_content_block default: '-1' info: title: @@ -1481,58 +1483,46 @@ display: separator: '' empty_column: false responsive: '' - changed: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - moderation_state: - sortable: true + revision_uid: + sortable: false default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' - field_administration: + changed: sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' - field_phone_number: + moderation_state: sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' - field_mental_health_phone: + field_administration: sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' - field_va_health_connect_phone: - sortable: true + field_content_block: + sortable: false default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' - field_phone_numbers_paragraph: - align: '' - separator: '' - empty_column: false - responsive: '' override: true sticky: false summary: '' empty_table: false - caption: '' + caption: 'Button audit results' description: '' row: type: fields @@ -1577,7 +1567,6 @@ display: - 'config:field.storage.node.field_full_story' - 'config:field.storage.node.field_press_release_blurb' - 'config:field.storage.node.field_press_release_fulltext' - - 'config:workflow_list' - workbench_access_view buttons_export: id: buttons_export @@ -2231,18 +2220,17 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in - value: - all: all + plugin_id: moderation_state_multiple_workflow_filter + operator: or + value: { } group: 1 exposed: true expose: @@ -2250,7 +2238,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -2273,7 +2261,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -2286,6 +2277,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -2469,7 +2461,6 @@ display: tags: - 'config:field.storage.node.field_administration' - 'config:field.storage.node.field_content_block' - - 'config:workflow_list' - workbench_access_view content_audit_buttons: id: content_audit_buttons @@ -3188,18 +3179,17 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in - value: - all: all + plugin_id: moderation_state_multiple_workflow_filter + operator: or + value: { } group: 1 exposed: true expose: @@ -3207,7 +3197,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -3230,7 +3220,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -3243,6 +3236,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -3357,8 +3351,100 @@ display: operator: AND groups: 1: AND + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + title: title + nid: nid + edit_node_1: edit_node_1 + type: type + revision_uid: revision_uid + changed: changed + moderation_state: moderation_state + field_administration: field_administration + field_content_block: field_content_block + default: '-1' + info: + title: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + nid: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + edit_node_1: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + type: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + revision_uid: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + changed: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + moderation_state: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_administration: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_content_block: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: false + summary: '' + empty_table: false + caption: 'Button audit results' + description: '' + row: + type: fields + options: { } defaults: title: false + style: false + row: false relationships: false fields: false filters: false @@ -3386,7 +3472,9 @@ display: plugin_id: result empty: false content: "

Displaying @start - @end of @total

\r\n

This audit searches through all field_wysiwyg to find instances of 'usa-button' within the content which is used to create buttons.

" - display_extenders: { } + display_extenders: + jsonapi_views: + enabled: true path: admin/content/audit/buttons menu: type: tab @@ -3415,7 +3503,6 @@ display: tags: - 'config:field.storage.node.field_administration' - 'config:field.storage.node.field_content_block' - - 'config:workflow_list' - workbench_access_view content_audit_phone_numbers: id: content_audit_phone_numbers @@ -3423,6 +3510,7 @@ display: display_plugin: page position: 3 display_options: + title: 'Content Audit - Phone Numbers' fields: title: id: title @@ -4038,98 +4126,6 @@ display: separator: ', ' field_api_classes: false filters: - type_1: - id: type_1 - table: node_field_data - field: type - relationship: none - group_type: group - admin_label: '' - entity_type: node - entity_field: type - plugin_id: bundle - operator: in - value: - all: all - page: page - landing_page: landing_page - documentation_page: documentation_page - campaign_landing_page: campaign_landing_page - centralized_content: centralized_content - checklist: checklist - event: event - event_listing: event_listing - faq_multiple_q_a: faq_multiple_q_a - banner: banner - health_services_listing: health_services_listing - media_list_images: media_list_images - basic_landing_page: basic_landing_page - leadership_listing: leadership_listing - nca_facility: nca_facility - press_release: press_release - press_releases_listing: press_releases_listing - office: office - promo_banner: promo_banner - outreach_asset: outreach_asset - publication_listing: publication_listing - q_a: q_a - support_resources_detail_page: support_resources_detail_page - person_profile: person_profile - step_by_step: step_by_step - story_listing: story_listing - news_story: news_story - support_service: support_service - va_form: va_form - health_care_region_detail_page: health_care_region_detail_page - health_care_local_facility: health_care_local_facility - health_care_local_health_service: health_care_local_health_service - vha_facility_nonclinical_service: vha_facility_nonclinical_service - health_care_region_page: health_care_region_page - full_width_banner_alert: full_width_banner_alert - vamc_system_billing_insurance: vamc_system_billing_insurance - regional_health_care_service_des: regional_health_care_service_des - locations_listing: locations_listing - vamc_system_medical_records_offi: vamc_system_medical_records_offi - vamc_operating_status_and_alerts: vamc_operating_status_and_alerts - vamc_system_policies_page: vamc_system_policies_page - vamc_system_register_for_care: vamc_system_register_for_care - vba_facility: vba_facility - vet_center: vet_center - vet_center_cap: vet_center_cap - vet_center_facility_health_servi: vet_center_facility_health_servi - vet_center_locations_list: vet_center_locations_list - vet_center_mobile_vet_center: vet_center_mobile_vet_center - vet_center_outstation: vet_center_outstation - media_list_videos: media_list_videos - group: 1 - exposed: false - expose: - operator_id: '' - label: '' - description: '' - use_operator: false - operator: '' - operator_limit_selection: false - operator_list: { } - identifier: '' - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - reduce: false - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } title: id: title table: node_field_data @@ -4199,24 +4195,34 @@ display: value: page: page centralized_content: centralized_content - event: event - faq_multiple_q_a: faq_multiple_q_a - banner: banner basic_landing_page: basic_landing_page - media_list_images: media_list_images - media_list_videos: media_list_videos + nca_facility: nca_facility press_release: press_release press_releases_listing: press_releases_listing support_resources_detail_page: support_resources_detail_page person_profile: person_profile step_by_step: step_by_step - news_story: news_story + support_service: support_service health_care_region_detail_page: health_care_region_detail_page + health_care_local_facility: health_care_local_facility health_care_local_health_service: health_care_local_health_service + vha_facility_nonclinical_service: vha_facility_nonclinical_service health_care_region_page: health_care_region_page full_width_banner_alert: full_width_banner_alert + vamc_system_billing_insurance: vamc_system_billing_insurance regional_health_care_service_des: regional_health_care_service_des + vamc_system_medical_records_offi: vamc_system_medical_records_offi vamc_operating_status_and_alerts: vamc_operating_status_and_alerts + vamc_system_policies_page: vamc_system_policies_page + vamc_system_register_for_care: vamc_system_register_for_care + vba_facility: vba_facility + vba_facility_service: vba_facility_service + vet_center: vet_center + vet_center_cap: vet_center_cap + vet_center_facility_health_servi: vet_center_facility_health_servi + vet_center_locations_list: vet_center_locations_list + vet_center_mobile_vet_center: vet_center_mobile_vet_center + vet_center_outstation: vet_center_outstation group: 1 exposed: true expose: @@ -4247,6 +4253,9 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' + homepage_manager: '0' + translation_manager: '0' + next_js: '0' reduce: true is_grouped: false group_info: @@ -4260,18 +4269,17 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in - value: - all: all + plugin_id: moderation_state_multiple_workflow_filter + operator: or + value: { } group: 1 exposed: true expose: @@ -4279,7 +4287,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -4302,7 +4310,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -4315,6 +4326,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -4433,7 +4445,108 @@ display: operator: AND groups: 1: AND + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + title: title + nid: nid + edit_node_1: edit_node_1 + type: type + changed: changed + moderation_state: moderation_state + field_administration: field_administration + field_phone_number: field_phone_number + field_mental_health_phone: field_mental_health_phone + field_va_health_connect_phone: field_va_health_connect_phone + default: '-1' + info: + title: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + nid: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + edit_node_1: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + type: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + changed: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + moderation_state: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_administration: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_phone_number: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_mental_health_phone: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_va_health_connect_phone: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: false + summary: '' + empty_table: false + caption: 'Phone number audit results' + description: '' + row: + type: fields + options: { } defaults: + title: false + style: false + row: false fields: false filters: false filter_groups: false @@ -4471,7 +4584,6 @@ display: - 'config:field.storage.node.field_mental_health_phone' - 'config:field.storage.node.field_phone_number' - 'config:field.storage.node.field_va_health_connect_phone' - - 'config:workflow_list' - workbench_access_view phone_numbers_export: id: phone_numbers_export @@ -5316,29 +5428,28 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + workbench_access_section__section: + id: workbench_access_section__section + table: node + field: workbench_access_section__section relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter + plugin_id: workbench_access_section operator: in - value: - all: all + value: { } group: 1 exposed: true expose: - operator_id: moderation_state_op - label: 'Moderation state' + operator_id: workbench_access_section__section_op + label: Section description: '' use_operator: false - operator: moderation_state_op + operator: workbench_access_section__section_op operator_limit_selection: false operator_list: { } - identifier: moderation_state + identifier: workbench_access_section__section required: false remember: false multiple: false @@ -5358,7 +5469,7 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + reduce: 1 is_grouped: false group_info: label: '' @@ -5371,28 +5482,30 @@ display: default_group: All default_group_multiple: { } group_items: { } - workbench_access_section__section: - id: workbench_access_section__section - table: node - field: workbench_access_section__section + reduce_duplicates: 0 + section_filter: + show_hierarchy: 1 + combine: + id: combine + table: views + field: combine relationship: none group_type: group admin_label: '' - entity_type: node - plugin_id: workbench_access_section - operator: in - value: { } + plugin_id: combine + operator: contains + value: '' group: 1 exposed: true expose: - operator_id: workbench_access_section__section_op - label: Section + operator_id: combine_op + label: 'Phone Number contains' description: '' use_operator: false - operator: workbench_access_section__section_op + operator: combine_op operator_limit_selection: false operator_list: { } - identifier: workbench_access_section__section + identifier: phone required: false remember: false multiple: false @@ -5412,7 +5525,7 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: 1 + placeholder: '' is_grouped: false group_info: label: '' @@ -5425,30 +5538,32 @@ display: default_group: All default_group_multiple: { } group_items: { } - reduce_duplicates: 0 - section_filter: - show_hierarchy: 1 - combine: - id: combine - table: views - field: combine + fields: + field_phone_number: field_phone_number + field_mental_health_phone: field_mental_health_phone + field_va_health_connect_phone: field_va_health_connect_phone + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' - plugin_id: combine - operator: contains - value: '' + entity_type: node + plugin_id: moderation_state_multiple_workflow_filter + operator: or + value: { } group: 1 exposed: true expose: - operator_id: combine_op - label: 'Phone Number contains' + operator_id: moderation_state_op + label: 'Moderation state' description: '' use_operator: false - operator: combine_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } - identifier: phone + identifier: moderation_state required: false remember: false multiple: false @@ -5468,7 +5583,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - placeholder: '' + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -5481,10 +5599,7 @@ display: default_group: All default_group_multiple: { } group_items: { } - fields: - field_phone_number: field_phone_number - field_mental_health_phone: field_mental_health_phone - field_va_health_connect_phone: field_va_health_connect_phone + reduce_duplicates: 0 filter_groups: operator: AND groups: @@ -5539,5 +5654,4 @@ display: - 'config:field.storage.node.field_mental_health_phone' - 'config:field.storage.node.field_phone_number' - 'config:field.storage.node.field_va_health_connect_phone' - - 'config:workflow_list' - workbench_access_view diff --git a/config/sync/views.view.va_forms.yml b/config/sync/views.view.va_forms.yml index c638aadfe3c..5fd41dea3be 100644 --- a/config/sync/views.view.va_forms.yml +++ b/config/sync/views.view.va_forms.yml @@ -19,7 +19,6 @@ dependencies: - user.role.content_editor - user.role.content_publisher - user.role.content_reviewer - - workflows.workflow.editorial content: - 'taxonomy_term:administration:2c331a6d-b525-4f0c-8bea-4ecde41c7ef0' - 'taxonomy_term:administration:867e4dcf-2f99-401a-977a-adb441d53350' @@ -997,22 +996,17 @@ display: title: title field_va_form_name: field_va_form_name field_va_form_title: field_va_form_title - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in - value: - all: all - editorial-draft: editorial-draft - editorial-review: editorial-review - editorial-published: editorial-published - editorial-archived: editorial-archived + plugin_id: moderation_state_multiple_workflow_filter + operator: or + value: { } group: 1 exposed: true expose: @@ -1020,7 +1014,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -1032,7 +1026,10 @@ display: anonymous: '0' content_api_consumer: '0' content_creator_benefits_hubs: '0' + content_creator_resources_and_support: '0' + office_content_creator: '0' vamc_content_creator: '0' + content_creator_vet_center: '0' content_editor: '0' content_reviewer: '0' content_publisher: '0' @@ -1040,7 +1037,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -1053,6 +1053,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 field_va_form_administration_target_id: id: field_va_form_administration_target_id table: node__field_va_form_administration @@ -1285,7 +1286,6 @@ display: - 'config:field.storage.node.field_va_form_administration' - 'config:field.storage.node.field_va_form_name' - 'config:field.storage.node.field_va_form_title' - - 'config:workflow_list' audit: id: audit display_title: Audit @@ -2219,22 +2219,17 @@ display: fields: title: title field_va_form_name: field_va_form_name - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in - value: - all: all - editorial-draft: editorial-draft - editorial-review: editorial-review - editorial-published: editorial-published - editorial-archived: editorial-archived + plugin_id: moderation_state_multiple_workflow_filter + operator: or + value: { } group: 1 exposed: true expose: @@ -2242,7 +2237,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -2254,7 +2249,10 @@ display: anonymous: '0' content_api_consumer: '0' content_creator_benefits_hubs: '0' + content_creator_resources_and_support: '0' + office_content_creator: '0' vamc_content_creator: '0' + content_creator_vet_center: '0' content_editor: '0' content_reviewer: '0' content_publisher: '0' @@ -2262,7 +2260,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -2275,6 +2276,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -2729,7 +2731,6 @@ display: - 'config:field.storage.node.field_va_form_revision_date' - 'config:field.storage.node.field_va_form_tool_url' - 'config:field.storage.node.field_va_form_usage' - - 'config:workflow_list' - workbench_access_view csv_export: id: csv_export @@ -3611,22 +3612,17 @@ display: fields: title: title field_va_form_name: field_va_form_name - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in - value: - all: all - editorial-draft: editorial-draft - editorial-review: editorial-review - editorial-published: editorial-published - editorial-archived: editorial-archived + plugin_id: moderation_state_multiple_workflow_filter + operator: or + value: { } group: 1 exposed: true expose: @@ -3634,7 +3630,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -3646,7 +3642,10 @@ display: anonymous: '0' content_api_consumer: '0' content_creator_benefits_hubs: '0' + content_creator_resources_and_support: '0' + office_content_creator: '0' vamc_content_creator: '0' + content_creator_vet_center: '0' content_editor: '0' content_reviewer: '0' content_publisher: '0' @@ -3654,7 +3653,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -3667,6 +3669,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 workbench_access_section__section: id: workbench_access_section__section table: node @@ -4131,7 +4134,6 @@ display: - 'config:field.storage.node.field_va_form_revision_date' - 'config:field.storage.node.field_va_form_tool_url' - 'config:field.storage.node.field_va_form_usage' - - 'config:workflow_list' - workbench_access_view page_1: id: page_1 @@ -4171,4 +4173,3 @@ display: - 'config:field.storage.node.field_va_form_administration' - 'config:field.storage.node.field_va_form_name' - 'config:field.storage.node.field_va_form_title' - - 'config:workflow_list' diff --git a/config/sync/views.view.vamc_alerts_and_operating_statuses.yml b/config/sync/views.view.vamc_alerts_and_operating_statuses.yml index b6c4b742825..440f631119b 100644 --- a/config/sync/views.view.vamc_alerts_and_operating_statuses.yml +++ b/config/sync/views.view.vamc_alerts_and_operating_statuses.yml @@ -684,16 +684,16 @@ display: default_group: All default_group_multiple: { } group_items: { } - moderation_state: - id: moderation_state - table: node_field_data - field: moderation_state + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter relationship: none group_type: group admin_label: '' entity_type: node - plugin_id: moderation_state_filter - operator: in + plugin_id: moderation_state_multiple_workflow_filter + operator: or value: { } group: 1 exposed: true @@ -702,7 +702,7 @@ display: label: 'Moderation state' description: '' use_operator: false - operator: moderation_state_op + operator: moderation_state_multiple_workflow_filter_op operator_limit_selection: false operator_list: { } identifier: moderation_state @@ -713,7 +713,11 @@ display: authenticated: authenticated anonymous: '0' content_api_consumer: '0' - documentation_editor: '0' + content_creator_benefits_hubs: '0' + content_creator_resources_and_support: '0' + office_content_creator: '0' + vamc_content_creator: '0' + content_creator_vet_center: '0' content_editor: '0' content_reviewer: '0' content_publisher: '0' @@ -721,7 +725,10 @@ display: redirect_administrator: '0' admnistrator_users: '0' administrator: '0' - reduce: false + homepage_manager: '0' + translation_manager: '0' + next_js: '0' + reduce: 0 is_grouped: false group_info: label: '' @@ -734,6 +741,7 @@ display: default_group: All default_group_multiple: { } group_items: { } + reduce_duplicates: 0 status: id: status table: node_field_data @@ -1023,7 +1031,6 @@ display: tags: - 'config:field.storage.node.field_administration' - 'config:field.storage.node.field_banner_alert_vamcs' - - 'config:workflow_list' page_1: id: page_1 display_title: Page @@ -1053,4 +1060,3 @@ display: tags: - 'config:field.storage.node.field_administration' - 'config:field.storage.node.field_banner_alert_vamcs' - - 'config:workflow_list' diff --git a/docroot/modules/custom/va_gov_events/src/EventSubscriber/EntityEventSubscriber.php b/docroot/modules/custom/va_gov_events/src/EventSubscriber/EntityEventSubscriber.php index b3a543ceeda..4abaedfd528 100644 --- a/docroot/modules/custom/va_gov_events/src/EventSubscriber/EntityEventSubscriber.php +++ b/docroot/modules/custom/va_gov_events/src/EventSubscriber/EntityEventSubscriber.php @@ -2,9 +2,15 @@ namespace Drupal\va_gov_events\EventSubscriber; +use Drupal\Core\Session\AccountInterface; +use Drupal\Core\Session\AccountProxy; use Drupal\Core\StringTranslation\StringTranslationTrait; -use Drupal\Core\StringTranslation\TranslationInterface; +use Drupal\core_event_dispatcher\EntityHookEvents; +use Drupal\core_event_dispatcher\Event\Entity\EntityPresaveEvent; use Drupal\core_event_dispatcher\Event\Form\FormIdAlterEvent; +use Drupal\feature_toggle\FeatureStatus; +use Drupal\node\NodeInterface; +use Drupal\va_gov_user\Service\UserPermsService; use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** @@ -14,14 +20,89 @@ class EntityEventSubscriber implements EventSubscriberInterface { use StringTranslationTrait; + /** + * The 'publish to the national outreach calendar' field name. + */ + const PUBLISH_TO_OUTREACH_CAL_FIELD = 'field_publish_to_outreach_cal'; + + /** + * The 'field_listing' field name. + */ + const LISTING_FIELD = 'field_listing'; + + /** + * The 'field_additional_listings' field name. + */ + const ADDITIONAL_LISTING_FIELD = 'field_additional_listings'; + + /** + * The National Outreach Calendar node id. + */ + const OUTREACH_CAL_NID = 736; + + /** + * The 'Outreach Hub' Section term id. + */ + const OUTREACH_HUB_TID = 7; + + /** + * The Feature toggle name for outreach checkbox. + */ + const OUTREACH_CHECKBOX_FEATURE_NAME = 'feature_event_outreach_checkbox'; + + /** + * The list of users allowed to view the outreach checkbox. + */ + const OUTREACH_CHECKBOX_TEST_USERS = [ + 2910, + 1448, + 4356, + 2861, + 2922, + 3421, + 3314, + 4573, + 3864, + 1583, + 3610, + 2927, + ]; + + /** + * The User Perms Service. + * + * @var \Drupal\va_gov_user\Service\UserPermsService + */ + protected UserPermsService $userPermsService; + + /** + * The current user. + * + * @var \Drupal\Core\Session\AccountInterface + */ + protected AccountInterface $currentUser; + + /** + * TRUE if the outreach checkbox feature toggle is enabled. + * + * @var bool + */ + private bool $outreachCheckboxFeatureEnabled; + /** * Constructs the EventSubscriber object. * - * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation - * The string translation service. + * @param \Drupal\va_gov_user\Service\UserPermsService $user_perms_service + * The current user perms service. + * @param \Drupal\Core\Session\AccountProxy $account_proxy + * The account proxy service. + * @param \Drupal\feature_toggle\FeatureStatus $feature_status + * The feature status service. */ - public function __construct(TranslationInterface $string_translation) { - $this->stringTranslation = $string_translation; + public function __construct(UserPermsService $user_perms_service, AccountProxy $account_proxy, FeatureStatus $feature_status) { + $this->userPermsService = $user_perms_service; + $this->currentUser = $account_proxy->getAccount(); + $this->outreachCheckboxFeatureEnabled = $feature_status->getStatus(self::OUTREACH_CHECKBOX_FEATURE_NAME); } /** @@ -31,11 +112,55 @@ public static function getSubscribedEvents(): array { return [ 'hook_event_dispatcher.form_node_event_form.alter' => 'alterEventNodeForm', 'hook_event_dispatcher.form_node_event_edit_form.alter' => 'alterEventNodeForm', + EntityHookEvents::ENTITY_PRE_SAVE => 'entityPresave', ]; } /** - * Form alterations for eventcontent type. + * Determines if the 'add to National Outreach Calendar' checkbox is enabled. + * + * @return bool + * TRUE if the outreach checkbox should be enabled. + */ + protected function outreachCheckboxEnabled(): bool { + $admin = $this->userPermsService->hasAdminRole(TRUE); + return ( + $this->outreachCheckboxFeatureEnabled + && (in_array($this->currentUser->id(), self::OUTREACH_CHECKBOX_TEST_USERS) || $admin) + ); + } + + /** + * Determines if the current user is an 'Outreach Hub' only user. + * + * @return bool + * TRUE if the current user only has the 'Outreach Hub' section. + */ + protected function outreachHubOnlyUser(): bool { + $sections = $this->userPermsService->getSections($this->currentUser); + if (count($sections) === 1 && array_key_first($sections) === self::OUTREACH_HUB_TID) { + return TRUE; + } + return FALSE; + } + + /** + * Entity presave Event call. + * + * @param \Drupal\core_event_dispatcher\Event\Entity\EntityPresaveEvent $event + * The event. + * + * @throws \Drupal\Core\TypedData\Exception\MissingDataException + */ + public function entityPresave(EntityPresaveEvent $event): void { + $entity = $event->getEntity(); + if ($entity instanceof NodeInterface) { + $this->addToNationalOutreachCalendar($entity); + } + } + + /** + * Form alterations for event content type. * * @param \Drupal\core_event_dispatcher\Event\Form\FormIdAlterEvent $event * The event. @@ -45,6 +170,76 @@ public function alterEventNodeForm(FormIdAlterEvent $event): void { $this->addDisplayManagementToEventFields($form); $this->modifyFormFieldsetElements($form); $this->modifyRecurringEventsWidgetFieldPresentation($form); + $this->modifyAddToOutreachCalendarElements($form); + } + + /** + * Adds the event to the National Outreach Calendar (event_listing). + * + * The purpose of this method is to add the current node event to the National + * Outreach Calendar (an event listing node) if the $listingField + * checkbox/boolean has been set, or if the current user is an Outreach Hub + * user. + * + * @param \Drupal\node\NodeInterface $node + * The node to be modified. + * + * @throws \Drupal\Core\TypedData\Exception\MissingDataException + */ + public function addToNationalOutreachCalendar(NodeInterface $node): void { + if ($node->hasField(self::LISTING_FIELD) && + $node->hasField(self::PUBLISH_TO_OUTREACH_CAL_FIELD) && + $node->hasField(self::ADDITIONAL_LISTING_FIELD) && + $this->outreachCheckboxEnabled()) { + $addToCalValue = $node->get(self::PUBLISH_TO_OUTREACH_CAL_FIELD)->first()->getValue(); + if (isset($addToCalValue['value'])) { + $listings = $node->get(self::LISTING_FIELD)->getValue(); + $additionalListings = $node->get(self::ADDITIONAL_LISTING_FIELD)->getValue(); + if ($addToCalValue['value'] === 1 || $this->outreachHubOnlyUser()) { + // Add to Outreach calendar selected, or user is Outreach Hub only + // user. + if (!in_array(self::OUTREACH_CAL_NID, array_column($listings + $additionalListings, 'target_id'))) { + $additionalListings[] = [ + 'target_id' => self::OUTREACH_CAL_NID, + ]; + } + } + else { + // Checkbox is unset. Ensure that additional listings are removed. + $additionalListings = []; + } + $node->set(self::ADDITIONAL_LISTING_FIELD, $additionalListings); + } + } + } + + /** + * Form changes for 'Publish to National Outreach Calendar' related elements. + * + * @param array $form + * The form array. + */ + public function modifyAddToOutreachCalendarElements(array &$form) :void { + if ($this->outreachHubOnlyUser() && $this->outreachCheckboxEnabled()) { + // Disable the checkbox. + $form[self::PUBLISH_TO_OUTREACH_CAL_FIELD]['#disabled'] = TRUE; + // Set the default value of the checkbox. + $form[self::PUBLISH_TO_OUTREACH_CAL_FIELD]['widget']['value']['#default_value'] = TRUE; + // Override the field label for the checkbox. + $form[self::PUBLISH_TO_OUTREACH_CAL_FIELD]['widget']['value']['#title'] = $this->t('This event will automatically be published to the National Outreach Calendar'); + // Set the default value to the Outreach cal on the dropdown if is not + // already set. + if (empty($form[self::LISTING_FIELD]['widget']['#default_value'])) { + $form[self::LISTING_FIELD]['widget']['#default_value'] = self::OUTREACH_CAL_NID; + } + } + // Add the '- Select a value -' option (_none) since it was removed by + // the Limited Widgets for Unlimited Field module. + if (isset($form[self::LISTING_FIELD]['widget']['#options']) && !array_key_exists('_none', $form[self::LISTING_FIELD]['widget']['#options'])) { + $form[self::LISTING_FIELD]['widget']['#options'] = ['_none' => '- Select a value -'] + $form[self::LISTING_FIELD]['widget']['#options']; + } + // Only allow access to the checkbox if it should be enabled. + $form[self::PUBLISH_TO_OUTREACH_CAL_FIELD]['#access'] = $this->outreachCheckboxEnabled(); } /** @@ -53,7 +248,7 @@ public function alterEventNodeForm(FormIdAlterEvent $event): void { * @param array $form * The form. */ - public function modifyRecurringEventsWidgetFieldPresentation(array &$form) { + public function modifyRecurringEventsWidgetFieldPresentation(array &$form): void { // Add our js for toggling items depending on duration choices. $form['#attached']['library'][] = 'va_gov_events/recurring_dates'; @@ -126,7 +321,7 @@ public function modifyRecurringEventsWidgetFieldPresentation(array &$form) { * @param array $form * The form. */ - public function addDisplayManagementToEventFields(array &$form) { + public function addDisplayManagementToEventFields(array &$form): void { $form['#attached']['library'][] = 'va_gov_events/event_form_states_helpers'; } @@ -140,7 +335,7 @@ public function addDisplayManagementToEventFields(array &$form) { * @param array $form * The form. */ - public function modifyFormFieldSetElements(array &$form) { + public function modifyFormFieldSetElements(array &$form): void { // Remove the wrap and title around address widget. $form['field_address']['widget'][0]['#type'] = 'div'; unset($form['field_address']['widget'][0]['#title']); diff --git a/docroot/modules/custom/va_gov_events/va_gov_events.services.yml b/docroot/modules/custom/va_gov_events/va_gov_events.services.yml index df7b43518a3..57e983a8232 100644 --- a/docroot/modules/custom/va_gov_events/va_gov_events.services.yml +++ b/docroot/modules/custom/va_gov_events/va_gov_events.services.yml @@ -1,7 +1,7 @@ services: va_gov_events.entity_event_subscriber: class: Drupal\va_gov_events\EventSubscriber\EntityEventSubscriber - arguments: ['@string_translation'] + arguments: ['@va_gov_user.user_perms', '@current_user', '@feature_toggle.feature_status'] tags: - { name: event_subscriber } va_gov_events.route_subscriber: diff --git a/docroot/modules/custom/va_gov_facilities/js/displayServiceDescriptions.es6.js b/docroot/modules/custom/va_gov_facilities/js/displayServiceDescriptions.es6.js index 71c0ba37a36..653200794f5 100644 --- a/docroot/modules/custom/va_gov_facilities/js/displayServiceDescriptions.es6.js +++ b/docroot/modules/custom/va_gov_facilities/js/displayServiceDescriptions.es6.js @@ -142,6 +142,68 @@ p4.prepend(s4); } } + // VBA terms have nationalized regional data. + if ( + drupalSettings.availableHealthServices[service.value] !== undefined && + drupalSettings.availableHealthServices[service.value] + .vba_regional_service_header !== "" + ) { + const p5 = context.createElement("p"); + const s5 = context.createElement("strong"); + p5.textContent = drupalSettings.availableHealthServices[ + service.value + ].vba_regional_service_header.replace(/ /g, " "); + s5.textContent = "Regional service header: "; + div.classList.remove("no-content"); + div.appendChild(p5); + p5.prepend(s5); + } + if ( + drupalSettings.availableHealthServices[service.value] !== undefined && + drupalSettings.availableHealthServices[service.value] + .vba_regional_service_description !== "" + ) { + const p6 = context.createElement("p"); + const s6 = context.createElement("strong"); + p6.textContent = drupalSettings.availableHealthServices[ + service.value + ].vba_regional_service_description.replace(/ /g, " "); + s6.textContent = "Regional service description: "; + div.classList.remove("no-content"); + div.appendChild(p6); + p6.prepend(s6); + } + // VBA terms have nationalized facility data. + if ( + drupalSettings.availableHealthServices[service.value] !== undefined && + drupalSettings.availableHealthServices[service.value] + .vba_facility_service_header !== "" + ) { + const p7 = context.createElement("p"); + const s7 = context.createElement("strong"); + p7.textContent = drupalSettings.availableHealthServices[ + service.value + ].vba_facility_service_header.replace(/ /g, " "); + s7.textContent = "Facility service header: "; + div.classList.remove("no-content"); + div.appendChild(p7); + p7.prepend(s7); + } + if ( + drupalSettings.availableHealthServices[service.value] !== undefined && + drupalSettings.availableHealthServices[service.value] + .vba_facility_service_description !== "" + ) { + const p8 = context.createElement("p"); + const s8 = context.createElement("strong"); + p8.textContent = drupalSettings.availableHealthServices[ + service.value + ].vba_facility_service_description.replace(/ /g, " "); + s8.textContent = "Facility service description: "; + div.classList.remove("no-content"); + div.appendChild(p8); + p8.prepend(s8); + } // Plug in the term text below the select. service.after(div); // If we have contents, add a label above. diff --git a/docroot/modules/custom/va_gov_facilities/js/displayServiceDescriptions.js b/docroot/modules/custom/va_gov_facilities/js/displayServiceDescriptions.js index a3f1a7210bf..dd1bb170c31 100644 --- a/docroot/modules/custom/va_gov_facilities/js/displayServiceDescriptions.js +++ b/docroot/modules/custom/va_gov_facilities/js/displayServiceDescriptions.js @@ -78,6 +78,42 @@ p4.prepend(s4); } } + if (drupalSettings.availableHealthServices[service.value] !== undefined && drupalSettings.availableHealthServices[service.value].vba_regional_service_header !== "") { + var p5 = context.createElement("p"); + var s5 = context.createElement("strong"); + p5.textContent = drupalSettings.availableHealthServices[service.value].vba_regional_service_header.replace(/ /g, " "); + s5.textContent = "Regional service header: "; + div.classList.remove("no-content"); + div.appendChild(p5); + p5.prepend(s5); + } + if (drupalSettings.availableHealthServices[service.value] !== undefined && drupalSettings.availableHealthServices[service.value].vba_regional_service_description !== "") { + var p6 = context.createElement("p"); + var s6 = context.createElement("strong"); + p6.textContent = drupalSettings.availableHealthServices[service.value].vba_regional_service_description.replace(/ /g, " "); + s6.textContent = "Regional service description: "; + div.classList.remove("no-content"); + div.appendChild(p6); + p6.prepend(s6); + } + if (drupalSettings.availableHealthServices[service.value] !== undefined && drupalSettings.availableHealthServices[service.value].vba_facility_service_header !== "") { + var p7 = context.createElement("p"); + var s7 = context.createElement("strong"); + p7.textContent = drupalSettings.availableHealthServices[service.value].vba_facility_service_header.replace(/ /g, " "); + s7.textContent = "Facility service header: "; + div.classList.remove("no-content"); + div.appendChild(p7); + p7.prepend(s7); + } + if (drupalSettings.availableHealthServices[service.value] !== undefined && drupalSettings.availableHealthServices[service.value].vba_facility_service_description !== "") { + var p8 = context.createElement("p"); + var s8 = context.createElement("strong"); + p8.textContent = drupalSettings.availableHealthServices[service.value].vba_facility_service_description.replace(/ /g, " "); + s8.textContent = "Facility service description: "; + div.classList.remove("no-content"); + div.appendChild(p8); + p8.prepend(s8); + } service.after(div); if (div.textContent.length > 0) { var p = context.createElement("p"); diff --git a/docroot/modules/custom/va_gov_facilities/src/EventSubscriber/FacilitiesSubscriber.php b/docroot/modules/custom/va_gov_facilities/src/EventSubscriber/FacilitiesSubscriber.php index 73b0b7aac25..c2f58d0a6aa 100644 --- a/docroot/modules/custom/va_gov_facilities/src/EventSubscriber/FacilitiesSubscriber.php +++ b/docroot/modules/custom/va_gov_facilities/src/EventSubscriber/FacilitiesSubscriber.php @@ -480,6 +480,15 @@ public function buildHealthServicesDescriptionArrayAddToSettings(FormIdAlterEven 'tricare_description' => trim(strip_tags($tricare_description)), 'vc_vocabulary_service_description_label' => $vocabulary_definition['field_vet_center_service_descrip']->getLabel(), 'vc_vocabulary_description_help_text' => $vocabulary_definition['field_vet_center_service_descrip']->getDescription(), + // VBA has nationalized content we want to show from the vocabulary. + 'vba_regional_service_header' => $service_term->hasField('field_regional_service_header') + ? trim($service_term->get('field_regional_service_header')->getString()) : '', + 'vba_regional_service_description' => $service_term->hasField('field_regional_service_descripti') + ? trim($service_term->get('field_regional_service_descripti')->getString()) : '', + 'vba_facility_service_header' => $service_term->hasField('field_facility_service_header') + ? trim($service_term->get('field_facility_service_header')->getString()) : '', + 'vba_facility_service_description' => $service_term->hasField('field_facility_service_descripti') + ? trim($service_term->get('field_facility_service_descripti')->getString()) : '', ]; } $form['#attached']['drupalSettings']['availableHealthServices'] = $descriptions; diff --git a/docroot/themes/custom/vagovclaro/assets/scss/components/_fields.scss b/docroot/themes/custom/vagovclaro/assets/scss/components/_fields.scss index d3ee628d2fb..7bfefb1ef9a 100644 --- a/docroot/themes/custom/vagovclaro/assets/scss/components/_fields.scss +++ b/docroot/themes/custom/vagovclaro/assets/scss/components/_fields.scss @@ -226,3 +226,11 @@ body:not(.role-admin) { .magichead .fieldset__wrapper { margin-left: var(--spacing-xl); } + +#edit-field-publish-to-outreach-cal-wrapper div.form-item--field-publish-to-outreach-cal-value { + margin-left: auto; +} + +#edit-field-publish-to-outreach-cal-wrapper label { + margin-left: var(--spacing-xs); +} diff --git a/scripts/next-build.sh b/scripts/next-build.sh new file mode 100755 index 00000000000..ff134cf6fe5 --- /dev/null +++ b/scripts/next-build.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +#preview + +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" +source ~/.bashrc + +cd next + +APP_ENV=tugboat yarn build:preview \ No newline at end of file diff --git a/scripts/next-install.sh b/scripts/next-install.sh new file mode 100755 index 00000000000..e7063b52c2c --- /dev/null +++ b/scripts/next-install.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" +source ~/.bashrc + +# Installs the content-build dependencies. + +if [ ! -d next ]; then + git clone --single-branch --depth 1 https://github.com/department-of-veterans-affairs/next-build.git next +else + echo "Repo next-build already cloned." +fi + +cd next +#repo_root="$(git rev-parse --show-toplevel)" +#pushd "${repo_root}" > /dev/null + +nvm install 18.17.0 +nvm use 18.17.0 +corepack enable +corepack prepare yarn@stable --activate +echo "Node $(node -v)" +echo "NPM $(npm -v)" +echo "Yarn $(yarn -v)" + +#not sure how popd works +#pushd "./next" +yarn install +#popd + +#popd > /dev/null diff --git a/scripts/next-start.sh b/scripts/next-start.sh new file mode 100755 index 00000000000..65544641da5 --- /dev/null +++ b/scripts/next-start.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" +source ~/.bashrc + +cd next + +APP_ENV=tugboat yarn start diff --git a/tests/cypress/integration/features/content_type/event.feature b/tests/cypress/integration/features/content_type/event.feature index 6920dce76b6..58beddb9ef8 100644 --- a/tests/cypress/integration/features/content_type/event.feature +++ b/tests/cypress/integration/features/content_type/event.feature @@ -2,15 +2,16 @@ Feature: Content Type: Event Scenario: Log in and create an event. - Given I am logged in as a user with the "content_admin" role + Given I am logged in as a user with the "administrator" role + When I set the "feature_event_outreach_checkbox" feature toggle to "on" Then I create a "event" node Scenario: Confirm that event form conditional fields are cleared out if parent options change Given I am logged in as a user with the "content_admin" role - And I am at "node/add/event" + When I am at "node/add/event" # Check registration call to action conditional field - When I select option "Register" from dropdown "Call to action" + And I select option "Register" from dropdown "Call to action" And I fill in autocomplete field with selector "#edit-field-url-of-an-online-event-0-uri" with value "/node/5016" And I select option "- None -" from dropdown "Call to action" And I select option "Register" from dropdown "Call to action" @@ -33,7 +34,6 @@ Feature: Content Type: Event And the option "- None -" from dropdown "State" should be selected When I select the "Online" radio button Then an element with the selector "#edit-field-url-of-an-online-event-0-uri" should be empty - # EVENT FORM SPECS Scenario: Confirm that the default time zone when creating an event is set explicitly to Eastern. Given I am logged in as a user with the "content_admin" role @@ -42,7 +42,7 @@ Feature: Content Type: Event Scenario: Confirm that the event form conditional elements are shown or hidden appropriately Given I am logged in as a user with the "content_admin" role - And I am at "node/add/event" + When I am at "node/add/event" And I select the "At a VA facility" radio button Then I should see "Facility location" @@ -71,7 +71,7 @@ Feature: Content Type: Event And I should not see "Country" And I should see an element with the selector "#edit-field-url-of-an-online-event-0-uri" - # Registration checkbox reveals conditional form elements +# Registration checkbox reveals conditional form elements When I check the "Include registration information" checkbox Then "Cost" should be visible And I should see "Registration is required for this event" diff --git a/tests/cypress/integration/features/platform/file_upload.feature b/tests/cypress/integration/features/platform/file_upload.feature deleted file mode 100644 index e3e3cc71a68..00000000000 --- a/tests/cypress/integration/features/platform/file_upload.feature +++ /dev/null @@ -1,11 +0,0 @@ -@file_upload -Feature: Files can be uploaded and attached to nodes successfully - In order to reliably and predictably create content - As anybody involved in the project - I need to be able to upload and attach files to nodes. - - Scenario: We should be able to attach files to event nodes. - Given I am logged in as a user with the "content_admin" role - When I create a "event" node - Then "polygon_image.png" should exist - And an image with the selector 'div.field--name-image a img' should exist diff --git a/tests/cypress/integration/step_definitions/common/i_create_a_node.js b/tests/cypress/integration/step_definitions/common/i_create_a_node.js index d3535e4114a..ff6578e57ac 100644 --- a/tests/cypress/integration/step_definitions/common/i_create_a_node.js +++ b/tests/cypress/integration/step_definitions/common/i_create_a_node.js @@ -244,6 +244,7 @@ const creators = { "VA Alaska health care: Events", { force: true } ); + cy.get("#edit-field-publish-to-outreach-cal-value").check(); cy.findAllByLabelText("Street address").type( faker.address.streetAddress(), { force: true } @@ -279,6 +280,7 @@ const creators = { ).should("exist"); cy.get("form.node-form").find("input#edit-submit").click(); cy.get(".node__content").contains("Sun, Nov 5 2023, 10:00am - 11:00am MST"); + cy.get(".node__content").contains("Outreach events"); cy.scrollTo("top", { ensureScrollable: false }); cy.get(".tabs__tab a").contains("Edit").click({ force: true }); cy.get("#edit-field-datetime-range-timezone-0-manage-instances").click(); diff --git a/tests/cypress/integration/step_definitions/common/i_set_a_feature_toggle.js b/tests/cypress/integration/step_definitions/common/i_set_a_feature_toggle.js new file mode 100644 index 00000000000..c85b95fbd2c --- /dev/null +++ b/tests/cypress/integration/step_definitions/common/i_set_a_feature_toggle.js @@ -0,0 +1,14 @@ +import { When } from "@badeball/cypress-cucumber-preprocessor"; + +When( + "I set the {string} feature toggle to {string}", + (featureToggleMachineName, value) => { + const label = String.prototype.toUpperCase(featureToggleMachineName); + // Set the feature toggle to the value of "value". + let setValue = 0; + if (value === "on") { + setValue = 1; + } + return cy.setAFeatureToggle(featureToggleMachineName, label, setValue); + } +); diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js index 742ac2dbacd..e16f61c225e 100644 --- a/tests/cypress/support/commands.js +++ b/tests/cypress/support/commands.js @@ -321,6 +321,14 @@ Cypress.Commands.add("setWorkbenchAccessSections", (value) => { }); }); +Cypress.Commands.add("setAFeatureToggle", (name, label, value) => { + const command = ` + $feature = new \\Drupal\\feature_toggle\\Feature('${name}', '${label}'); + $service = \\Drupal::service('feature_toggle.feature_status')->setStatus($feature, ${value}); + `; + return cy.drupalDrushEval(command); +}); + compareSnapshotCommand(); Cypress.on("uncaught:exception", () => { diff --git a/tugboat.yml b/tugboat.yml index d8203432b5e..9e857281872 100644 --- a/tugboat.yml +++ b/tugboat.yml @@ -13,10 +13,16 @@ tasks: cmds: - drush va-gov:content-release:request-frontend-build + build-next: + desc: build next.js preview server + cmds: + - composer va:next:build + build: deps: - build-storybook - build-frontend + - build-next default: cmds: