From e40f6d17d6087e75faafdad5b5ed66a98739abfa Mon Sep 17 00:00:00 2001 From: catch <catch@35733.no-reply.drupal.org> Date: Mon, 25 Oct 2021 10:54:41 +0100 Subject: [PATCH] Issue #2852557 by bircher, alexpott, longwave, nedjo, dww: Config export key order is not predictable, use config schema to order keys for maps --- core/config/schema/core.data_types.schema.yml | 10 +- .../Drupal/Core/Block/BlockPluginTrait.php | 2 +- .../Condition/ConditionPluginCollection.php | 2 + core/lib/Drupal/Core/Config/Config.php | 4 +- .../Drupal/Core/Config/ConfigInstaller.php | 8 +- .../Core/Config/Entity/ConfigEntityBase.php | 15 + .../Drupal/Core/Config/StorableConfigBase.php | 26 +- ...ggregator_feed.aggregator_feed.default.yml | 12 +- .../views.view.aggregator_rss_feed.yml | 134 +-- .../views.view.aggregator_sources.yml | 188 ++-- .../optional/tour.tour.block-layout.yml | 19 +- .../config/install/block.block.test_block.yml | 18 +- .../tests/src/Kernel/BlockInterfaceTest.php | 2 +- .../tests/src/Kernel/BlockStorageUnitTest.php | 2 +- .../Kernel/Migrate/d6/MigrateBlockTest.php | 16 +- .../optional/views.view.block_content.yml | 300 +++--- .../install/block.block.foobargorilla.yml | 4 +- ....entity_form_display.node.book.default.yml | 12 +- ....entity_view_display.node.book.default.yml | 6 +- ...e.entity_view_display.node.book.teaser.yml | 6 +- .../core.entity_view_mode.node.print.yml | 4 +- .../config/optional/views.view.comment.yml | 868 +++++++++--------- .../optional/views.view.comments_recent.yml | 198 ++-- .../block.block.config_override_test.yml | 20 +- .../install/block.block.call_to_action.yml | 4 +- .../schema/config_schema_test.schema.yml | 15 + .../config/schema/config_test.schema.yml | 6 +- .../src/Functional/ConfigImportUITest.php | 7 +- .../ConfigInstallProfileOverrideTest.php | 2 +- .../ConfigSingleImportExportTest.php | 2 +- .../config/install/contact.form.feedback.yml | 4 +- .../optional/views.view.moderated_content.yml | 350 +++---- .../config/install/views.view.latest.yml | 164 ++-- ...st_content_moderation_field_state_test.yml | 116 +-- ...ent_moderation_filter_via_relationship.yml | 130 +-- ...ent_moderation_state_filter_base_table.yml | 136 +-- ...tate_filter_base_table_filter_group_or.yml | 150 +-- ...e_filter_base_table_filter_on_revision.yml | 132 +-- ...nt_moderation_state_filter_entity_test.yml | 100 +- ...moderation_state_filter_revision_table.yml | 160 ++-- ...ntent_moderation_state_sort_base_table.yml | 188 ++-- ...t_moderation_state_sort_revision_table.yml | 188 ++-- .../optional/views.view.contextual_recent.yml | 202 ++-- .../config/optional/views.view.watchdog.yml | 348 +++---- .../install/editor.editor.private_images.yml | 14 +- .../install/filter.format.private_images.yml | 12 +- ...ity_test.entity_test.field_test_import.yml | 10 +- ...y_test.entity_test.field_test_import_2.yml | 10 +- ...y_test.test_bundle.field_test_import_2.yml | 10 +- ....storage.entity_test.field_test_import.yml | 10 +- ...torage.entity_test.field_test_import_2.yml | 10 +- .../d6/MigrateFieldFormatterSettingsTest.php | 21 +- .../d6/MigrateFieldWidgetSettingsTest.php | 14 +- .../Migrate/d7/MigrateFieldInstanceTest.php | 12 +- .../file/config/optional/views.view.files.yml | 500 +++++----- .../install/filter.format.filter_test.yml | 6 +- .../install/filter.format.filtered_html.yml | 4 +- .../install/filter.format.full_html.yml | 2 +- ...entity_form_display.node.forum.default.yml | 12 +- ...m_display.taxonomy_term.forums.default.yml | 4 +- ..._display.comment.comment_forum.default.yml | 6 +- ...entity_view_display.node.forum.default.yml | 16 +- ....entity_view_display.node.forum.teaser.yml | 10 +- ...w_display.taxonomy_term.forums.default.yml | 6 +- .../field.field.node.forum.comment_forum.yml | 4 +- .../block.block.seven_help_search.yml | 10 +- .../image/config/schema/image.schema.yml | 8 +- .../optional/tour.tour.language-add.yml | 9 +- .../optional/tour.tour.language-edit.yml | 13 +- .../config/optional/tour.tour.language.yml | 23 +- .../views.view.no_entity_translation_view.yml | 130 +-- .../config/schema/layout_builder.schema.yml | 10 +- .../layout_builder/src/SectionComponent.php | 2 +- ..._test.bundle_with_extra_fields.default.yml | 12 +- .../install/views.view.test_block_view.yml | 156 ++-- .../config/optional/tour.tour.locale.yml | 21 +- .../block.block.test_default_config.yml | 2 +- .../config/optional/views.view.media.yml | 402 ++++---- .../media/config/schema/media.schema.yml | 16 +- .../media/src/Plugin/media/Source/OEmbed.php | 4 +- .../config/install/media.type.test.yml | 10 +- .../views.view.test_media_bulk_form.yml | 54 +- .../Rest/MediaTypeResourceTestBase.php | 4 +- ...e.entity_form_mode.media.media_library.yml | 4 +- ...e.entity_view_mode.media.media_library.yml | 4 +- .../install/views.view.media_library.yml | 662 ++++++------- ...y_form_display.media.type_five.default.yml | 8 +- ..._display.media.type_five.media_library.yml | 4 +- ...y_form_display.media.type_four.default.yml | 14 +- ..._display.media.type_four.media_library.yml | 8 +- ...ty_form_display.media.type_one.default.yml | 8 +- ..._form_display.media.type_three.default.yml | 10 +- ...display.media.type_three.media_library.yml | 4 +- ...ty_form_display.media.type_two.default.yml | 8 +- ...y_form_display.node.basic_page.default.yml | 26 +- ...y_view_display.media.type_five.default.yml | 22 +- ...ty_view_display.media.type_one.default.yml | 20 +- ...w_display.media.type_one.media_library.yml | 8 +- ..._view_display.media.type_three.default.yml | 24 +- ...ty_view_display.media.type_two.default.yml | 20 +- ...w_display.media.type_two.media_library.yml | 8 +- ...y_view_display.node.basic_page.default.yml | 14 +- ...edia.type_four.field_media_extra_image.yml | 16 +- ...media.type_four.field_media_test_image.yml | 14 +- ...edia.type_three.field_media_test_image.yml | 12 +- ....storage.media.field_media_extra_image.yml | 8 +- .../field.storage.media.field_media_test.yml | 2 +- ...field.storage.media.field_media_test_1.yml | 2 +- ...d.storage.media.field_media_test_image.yml | 8 +- ...ge.media.field_media_test_oembed_video.yml | 2 +- .../config/install/media.type.type_five.yml | 2 +- .../config/optional/views.view.archive.yml | 128 +-- .../config/optional/views.view.content.yml | 384 ++++---- .../optional/views.view.content_recent.yml | 196 ++-- .../config/optional/views.view.frontpage.yml | 304 +++--- .../config/optional/views.view.glossary.yml | 322 +++---- .../config/install/node.type.default.yml | 8 +- ...play.node.options_install_test.default.yml | 10 +- ...play.node.options_install_test.default.yml | 8 +- ...splay.node.options_install_test.teaser.yml | 8 +- ...d.field.node.options_install_test.body.yml | 2 +- ...tions_install_test.field_options_float.yml | 2 +- .../node.type.options_install_test.yml | 2 +- .../d7/MigrateResponsiveImageStylesTest.php | 12 +- .../install/search.page.dummy_search_type.yml | 4 +- .../system/config/install/system.date.yml | 4 +- .../config/install/system.maintenance.yml | 2 +- .../system/config/install/system.site.yml | 2 +- core/modules/system/system.post_update.php | 10 + .../views.view.test_entity_reference.yml | 84 +- ...view.test_entity_reference_entity_test.yml | 50 +- ...core.entity_view_mode.entity_test.full.yml | 8 +- ...core.entity_view_mode.entity_test.test.yml | 8 +- .../config/install/system.menu.changed.yml | 4 +- .../config/install/system.menu.original.yml | 4 +- ...sage.olivero_test_contact_form.default.yml | 14 +- ...tity_form_display.node.article.default.yml | 12 +- ...y_view_display.comment.comment.default.yml | 6 +- ...tity_view_display.node.article.default.yml | 26 +- ...ntity_view_display.node.article.teaser.yml | 20 +- .../field.field.node.article.comment.yml | 4 +- .../field.field.node.article.field_image.yml | 6 +- ...essage.field_multiple_value_form_field.yml | 2 +- .../field.storage.node.field_image.yml | 6 +- .../d6/MigrateSystemConfigurationTest.php | 12 +- .../d7/MigrateSystemConfigurationTest.php | 10 +- .../config/install/core.date_format.fancy.yml | 10 +- .../optional/views.view.taxonomy_term.yml | 134 +-- .../tour.tour.tour-test-legacy-location.yml | 13 +- .../install/tour.tour.tour-test-legacy.yml | 7 +- .../config/install/tour.tour.tour-test-2.yml | 9 +- .../config/install/tour.tour.tour-test.yml | 18 +- .../modules/user/config/install/user.mail.yml | 20 +- .../user/config/install/user.settings.yml | 2 +- .../optional/views.view.user_admin_people.yml | 426 ++++----- .../config/optional/views.view.who_s_new.yml | 162 ++-- .../optional/views.view.who_s_online.yml | 200 ++-- .../Migrate/d7/MigrateUserFloodTest.php | 6 +- .../install/views.view.test_bulk_form.yml | 144 +-- ...ew.test_cacheable_metadata_calculation.yml | 16 +- .../config/optional/tour.tour.views-ui.yml | 28 +- .../views.view.sa_contrib_2013_035.yml | 112 +-- .../install/block.block.seven_breadcrumbs.yml | 2 +- .../install/block.block.seven_content.yml | 2 +- .../config/install/block.block.seven_help.yml | 2 +- .../block.block.seven_local_actions.yml | 2 +- .../install/block.block.seven_messages.yml | 2 +- .../install/block.block.seven_page_title.yml | 2 +- .../block.block.seven_primary_local_tasks.yml | 2 +- ...lock.block.seven_secondary_local_tasks.yml | 2 +- .../block.block.umami_account_menu.yml | 2 +- .../install/block.block.umami_branding.yml | 2 +- .../install/block.block.umami_breadcrumbs.yml | 4 +- .../install/block.block.umami_content.yml | 2 +- .../install/block.block.umami_footer.yml | 2 +- .../config/install/block.block.umami_help.yml | 2 +- .../block.block.umami_languageswitcher.yml | 2 +- .../install/block.block.umami_local_tasks.yml | 2 +- .../install/block.block.umami_main_menu.yml | 2 +- .../install/block.block.umami_messages.yml | 2 +- .../install/block.block.umami_page_title.yml | 4 +- .../install/block.block.umami_search.yml | 2 +- ...mi_views_block__articles_aside_block_1.yml | 10 +- ...mi_views_block__promoted_items_block_1.yml | 4 +- ..._views_block__recipe_collections_block.yml | 2 +- ...lay.block_content.banner_block.default.yml | 14 +- ...rm_display.block_content.basic.default.yml | 2 +- ...block_content.disclaimer_block.default.yml | 10 +- ...ock_content.footer_promo_block.default.yml | 16 +- ...splay.contact_message.feedback.default.yml | 2 +- ...ntity_form_display.media.audio.default.yml | 10 +- ...ty_form_display.media.document.default.yml | 12 +- ...ntity_form_display.media.image.default.yml | 12 +- ...orm_display.media.remote_video.default.yml | 8 +- ...ntity_form_display.media.video.default.yml | 10 +- ...tity_form_display.node.article.default.yml | 16 +- ....entity_form_display.node.page.default.yml | 14 +- ...ntity_form_display.node.recipe.default.yml | 52 +- ....entity_form_display.user.user.default.yml | 4 +- ...lay.block_content.banner_block.default.yml | 14 +- ...ew_display.block_content.basic.default.yml | 6 +- ...block_content.disclaimer_block.default.yml | 8 +- ...ock_content.footer_promo_block.default.yml | 16 +- ...ntity_view_display.media.audio.default.yml | 2 +- ...ty_view_display.media.document.default.yml | 2 +- ...ntity_view_display.media.image.default.yml | 2 +- ...ty_view_display.media.image.medium_8_7.yml | 6 +- ...iew_display.media.image.responsive_3x2.yml | 4 +- ...splay.media.image.scale_crop_7_3_large.yml | 6 +- ...entity_view_display.media.image.square.yml | 4 +- ...iew_display.media.remote_video.default.yml | 2 +- ...ntity_view_display.media.video.default.yml | 8 +- ....entity_view_display.node.article.card.yml | 4 +- ..._view_display.node.article.card_common.yml | 4 +- ...w_display.node.article.card_common_alt.yml | 4 +- ...tity_view_display.node.article.default.yml | 20 +- ....entity_view_display.node.article.full.yml | 44 +- ...ntity_view_display.node.article.teaser.yml | 20 +- ....entity_view_display.node.page.default.yml | 12 +- ...ore.entity_view_display.node.page.full.yml | 26 +- ...e.entity_view_display.node.page.teaser.yml | 6 +- ...e.entity_view_display.node.recipe.card.yml | 8 +- ...y_view_display.node.recipe.card_common.yml | 4 +- ...ew_display.node.recipe.card_common_alt.yml | 4 +- ...ntity_view_display.node.recipe.default.yml | 42 +- ...e.entity_view_display.node.recipe.full.yml | 126 +-- ....entity_view_display.user.user.compact.yml | 8 +- ....entity_view_display.user.user.default.yml | 8 +- .../core.menu.static_menu_link_overrides.yml | 2 +- ...ontent.banner_block.field_content_link.yml | 2 +- ....footer_promo_block.field_content_link.yml | 2 +- ...eld.media.audio.field_media_audio_file.yml | 6 +- ...ld.media.document.field_media_document.yml | 8 +- ...ld.field.media.image.field_media_image.yml | 18 +- ...eld.media.video.field_media_video_file.yml | 6 +- .../field.field.user.user.user_picture.yml | 14 +- ...ield.storage.block_content.field_title.yml | 2 +- ...eld.storage.media.field_media_document.yml | 8 +- .../field.storage.media.field_media_image.yml | 14 +- ...storage.media.field_media_oembed_video.yml | 2 +- .../field.storage.node.field_ingredients.yml | 2 +- .../field.storage.user.user_picture.yml | 6 +- .../config/install/image.style.large_21_9.yml | 2 +- .../install/image.style.large_21_9_2x.yml | 2 +- .../install/image.style.large_3_2_2x.yml | 2 +- .../install/image.style.large_3_2_768x512.yml | 2 +- .../install/image.style.medium_21_9.yml | 2 +- .../install/image.style.medium_3_2_2x.yml | 2 +- .../image.style.medium_3_2_600x400.yml | 2 +- .../config/install/image.style.medium_8_7.yml | 2 +- .../image.style.scale_crop_7_3_large.yml | 2 +- .../config/install/image.style.small_21_9.yml | 2 +- .../install/image.style.square_large.yml | 2 +- .../install/image.style.square_medium.yml | 2 +- .../install/image.style.square_small.yml | 2 +- .../install/media.type.remote_video.yml | 2 +- .../responsive_image.styles.3_2_image.yml | 4 +- ...responsive_image.styles.hero_or_banner.yml | 4 +- .../responsive_image.styles.square.yml | 4 +- .../demo_umami/config/install/system.site.yml | 2 +- .../config/install/tour.tour.umami-front.yml | 35 +- .../config/install/user.settings.yml | 2 +- .../install/views.view.articles_aside.yml | 262 +++--- .../install/views.view.featured_articles.yml | 230 ++--- .../config/install/views.view.frontpage.yml | 334 +++---- .../install/views.view.promoted_items.yml | 292 +++--- .../install/views.view.recipe_collections.yml | 172 ++-- .../config/install/views.view.recipes.yml | 230 ++--- .../install/views.view.taxonomy_term.yml | 142 +-- .../install/workflows.workflow.editorial.yml | 12 +- .../block.block.umami_banner_home.yml | 10 +- .../block.block.umami_banner_recipes.yml | 10 +- .../optional/block.block.umami_disclaimer.yml | 8 +- .../block.block.umami_footer_promo.yml | 8 +- .../responsive_image.styles.narrow.yml | 4 +- .../optional/responsive_image.styles.wide.yml | 4 +- .../config/optional/views.view.media.yml | 402 ++++---- .../install/block.block.stark_admin.yml | 2 +- .../install/block.block.stark_branding.yml | 2 +- .../block.block.stark_local_actions.yml | 2 +- .../install/block.block.stark_local_tasks.yml | 2 +- .../install/block.block.stark_messages.yml | 2 +- .../install/block.block.stark_page_title.yml | 2 +- .../install/block.block.stark_tools.yml | 2 +- .../minimal/config/install/user.settings.yml | 2 +- .../block.block.bartik_account_menu.yml | 2 +- .../install/block.block.bartik_branding.yml | 2 +- .../block.block.bartik_breadcrumbs.yml | 2 +- .../install/block.block.bartik_content.yml | 2 +- .../install/block.block.bartik_footer.yml | 2 +- .../install/block.block.bartik_help.yml | 2 +- .../block.block.bartik_local_actions.yml | 2 +- .../block.block.bartik_local_tasks.yml | 2 +- .../install/block.block.bartik_main_menu.yml | 2 +- .../install/block.block.bartik_messages.yml | 2 +- .../install/block.block.bartik_page_title.yml | 2 +- .../install/block.block.bartik_powered.yml | 2 +- .../install/block.block.bartik_search.yml | 2 +- .../install/block.block.bartik_tools.yml | 2 +- .../install/block.block.seven_breadcrumbs.yml | 2 +- .../install/block.block.seven_content.yml | 2 +- .../config/install/block.block.seven_help.yml | 2 +- .../block.block.seven_local_actions.yml | 2 +- .../install/block.block.seven_messages.yml | 2 +- .../install/block.block.seven_page_title.yml | 2 +- .../block.block.seven_primary_local_tasks.yml | 2 +- ...lock.block.seven_secondary_local_tasks.yml | 2 +- ...tity_form_display.node.article.default.yml | 12 +- ....entity_form_display.node.page.default.yml | 12 +- ....entity_form_display.user.user.default.yml | 4 +- ...ew_display.block_content.basic.default.yml | 6 +- ...y_view_display.comment.comment.default.yml | 6 +- ...tity_view_display.node.article.default.yml | 26 +- ...ntity_view_display.node.article.teaser.yml | 20 +- ....entity_view_display.node.page.default.yml | 6 +- ...e.entity_view_display.node.page.teaser.yml | 6 +- ....entity_view_display.user.user.compact.yml | 8 +- ....entity_view_display.user.user.default.yml | 8 +- .../core.menu.static_menu_link_overrides.yml | 2 +- .../field.field.node.article.comment.yml | 4 +- .../field.field.node.article.field_image.yml | 6 +- .../field.field.user.user.user_picture.yml | 14 +- .../field.storage.node.field_image.yml | 6 +- .../field.storage.user.user_picture.yml | 6 +- .../standard/config/install/system.site.yml | 2 +- .../standard/config/install/user.settings.yml | 2 +- ...ntity_form_display.media.audio.default.yml | 10 +- ...ty_form_display.media.document.default.yml | 12 +- ...ntity_form_display.media.image.default.yml | 12 +- ...orm_display.media.remote_video.default.yml | 8 +- ...ntity_form_display.media.video.default.yml | 10 +- ...ntity_view_display.media.audio.default.yml | 2 +- ...view_display.media.audio.media_library.yml | 6 +- ...ty_view_display.media.document.default.yml | 2 +- ...w_display.media.document.media_library.yml | 6 +- ...ntity_view_display.media.image.default.yml | 4 +- ...view_display.media.image.media_library.yml | 6 +- ...iew_display.media.remote_video.default.yml | 2 +- ...splay.media.remote_video.media_library.yml | 6 +- ...ntity_view_display.media.video.default.yml | 8 +- ...view_display.media.video.media_library.yml | 6 +- ...eld.media.audio.field_media_audio_file.yml | 6 +- ...ld.media.document.field_media_document.yml | 8 +- ...ld.field.media.image.field_media_image.yml | 18 +- ...eld.media.video.field_media_video_file.yml | 6 +- ...eld.storage.media.field_media_document.yml | 8 +- .../field.storage.media.field_media_image.yml | 14 +- ...storage.media.field_media_oembed_video.yml | 2 +- .../optional/image.style.max_1300x1300.yml | 18 +- .../optional/image.style.max_2600x2600.yml | 18 +- .../optional/image.style.max_325x325.yml | 18 +- .../optional/image.style.max_650x650.yml | 18 +- .../optional/media.type.remote_video.yml | 2 +- .../responsive_image.styles.narrow.yml | 6 +- .../optional/responsive_image.styles.wide.yml | 6 +- .../optional/workflows.workflow.editorial.yml | 14 +- .../system.action.user_block_user_action.yml | 10 +- .../config/install/system.site.yml | 2 +- .../config/install/tour.tour.language.yml | 15 +- .../tour.tour.testing_config_overrides.yml | 17 +- ...r.tour.testing_config_overrides_module.yml | 9 +- .../config/install/language.entity.de.yml | 6 +- .../config/install/language.entity.es.yml | 6 +- ...sting_theme_optional_blocks_page_title.yml | 2 +- ...ing_theme_required_blocks_account_menu.yml | 6 +- .../KernelTests/Config/DefaultConfigTest.php | 8 + .../KernelTests/Config/TypedConfigTest.php | 2 +- .../Core/Config/ConfigCRUDTest.php | 2 +- .../Core/Config/ConfigSchemaTest.php | 66 +- .../config_install/multilingual.tar.gz | 88 +- .../testing_config_install.tar.gz | 82 +- .../block.block.claro_breadcrumbs.yml | 2 +- .../optional/block.block.claro_content.yml | 2 +- .../optional/block.block.claro_help.yml | 2 +- .../block.block.claro_local_actions.yml | 2 +- .../optional/block.block.claro_messages.yml | 2 +- .../optional/block.block.claro_page_title.yml | 2 +- .../block.block.claro_primary_local_tasks.yml | 2 +- ...lock.block.claro_secondary_local_tasks.yml | 2 +- .../block.block.olivero_account_menu.yml | 2 +- .../block.block.olivero_breadcrumbs.yml | 2 +- .../install/block.block.olivero_content.yml | 2 +- .../install/block.block.olivero_main_menu.yml | 2 +- .../install/block.block.olivero_messages.yml | 2 +- .../block.block.olivero_page_title.yml | 2 +- .../install/block.block.olivero_powered.yml | 2 +- ...lock.block.olivero_primary_local_tasks.yml | 2 +- ...ck.block.olivero_secondary_local_tasks.yml | 2 +- .../block.block.olivero_site_branding.yml | 2 +- .../block.block.primary_admin_actions.yml | 2 +- .../config/install/olivero.settings.yml | 12 +- .../optional/block.block.book_navigation.yml | 2 +- .../optional/block.block.olivero_help.yml | 2 +- ...block.block.olivero_search_form_narrow.yml | 2 +- .../block.block.olivero_search_form_wide.yml | 2 +- .../block.block.olivero_syndicate.yml | 2 +- 396 files changed, 6865 insertions(+), 6739 deletions(-) diff --git a/core/config/schema/core.data_types.schema.yml b/core/config/schema/core.data_types.schema.yml index 75cecbc45e12..640421d22423 100644 --- a/core/config/schema/core.data_types.schema.yml +++ b/core/config/schema/core.data_types.schema.yml @@ -108,11 +108,11 @@ _core_config_info: config_object: type: mapping mapping: + _core: + type: _core_config_info langcode: type: string label: 'Language code' - _core: - type: _core_config_info # Mail text with subject and body parts. mail: @@ -303,6 +303,9 @@ block_settings: label_display: type: string label: 'Display title' + provider: + type: string + label: 'Provider' status: type: boolean label: 'Status' @@ -312,9 +315,6 @@ block_settings: view_mode: type: string label: 'View mode' - provider: - type: string - label: 'Provider' context_mapping: type: sequence label: 'Context assignments' diff --git a/core/lib/Drupal/Core/Block/BlockPluginTrait.php b/core/lib/Drupal/Core/Block/BlockPluginTrait.php index cd4790e76e69..0ee7e54617a7 100644 --- a/core/lib/Drupal/Core/Block/BlockPluginTrait.php +++ b/core/lib/Drupal/Core/Block/BlockPluginTrait.php @@ -87,8 +87,8 @@ protected function baseConfigurationDefaults() { return [ 'id' => $this->getPluginId(), 'label' => '', - 'provider' => $this->pluginDefinition['provider'], 'label_display' => BlockPluginInterface::BLOCK_LABEL_VISIBLE, + 'provider' => $this->pluginDefinition['provider'], ]; } diff --git a/core/lib/Drupal/Core/Condition/ConditionPluginCollection.php b/core/lib/Drupal/Core/Condition/ConditionPluginCollection.php index 4d6dd7043348..ec15926c65ad 100644 --- a/core/lib/Drupal/Core/Condition/ConditionPluginCollection.php +++ b/core/lib/Drupal/Core/Condition/ConditionPluginCollection.php @@ -42,6 +42,8 @@ public function getConfiguration() { // configured, so remove the context_mapping from the instance config to // compare the remaining values. unset($instance_config['context_mapping']); + ksort($default_config); + ksort($instance_config); if ($default_config === $instance_config) { unset($configuration[$instance_id]); } diff --git a/core/lib/Drupal/Core/Config/Config.php b/core/lib/Drupal/Core/Config/Config.php index 38bb3d5db778..3a3ccbad3d57 100644 --- a/core/lib/Drupal/Core/Config/Config.php +++ b/core/lib/Drupal/Core/Config/Config.php @@ -208,9 +208,7 @@ public function save($has_trusted_data = FALSE) { if ($this->typedConfigManager->hasConfigSchema($this->name)) { // Ensure that the schema wrapper has the latest data. $this->schemaWrapper = NULL; - foreach ($this->data as $key => $value) { - $this->data[$key] = $this->castValue($key, $value); - } + $this->data = $this->castValue(NULL, $this->data); } else { foreach ($this->data as $key => $value) { diff --git a/core/lib/Drupal/Core/Config/ConfigInstaller.php b/core/lib/Drupal/Core/Config/ConfigInstaller.php index ec26a7ca0f19..16472b65ed10 100644 --- a/core/lib/Drupal/Core/Config/ConfigInstaller.php +++ b/core/lib/Drupal/Core/Config/ConfigInstaller.php @@ -351,13 +351,17 @@ protected function createConfiguration($collection, array $config_to_create) { $new_config = new Config($name, $this->getActiveStorages($collection), $this->eventDispatcher, $this->typedConfig); } if ($config_to_create[$name] !== FALSE) { - $new_config->setData($config_to_create[$name]); // Add a hash to configuration created through the installer so it is // possible to know if the configuration was created by installing an // extension and to track which version of the default config was used. if (!$this->isSyncing() && $collection == StorageInterface::DEFAULT_COLLECTION) { - $new_config->set('_core.default_config_hash', Crypt::hashBase64(serialize($config_to_create[$name]))); + $config_to_create[$name] = [ + '_core' => [ + 'default_config_hash' => Crypt::hashBase64(serialize($config_to_create[$name])), + ], + ] + $config_to_create[$name]; } + $new_config->setData($config_to_create[$name]); } if ($collection == StorageInterface::DEFAULT_COLLECTION && $entity_type = $this->configManager->getEntityTypeIdByName($name)) { // If we are syncing do not create configuration entities. Pluggable diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php index 72a90545e32b..fad13076ec03 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php @@ -317,6 +317,21 @@ public function preSave(EntityStorageInterface $storage) { // being written during a configuration synchronization then there is no // need to recalculate the dependencies. $this->calculateDependencies(); + // If the data is trusted we need to ensure that the dependencies are + // sorted as per their schema. If the save is not trusted then the + // configuration will be sorted by StorableConfigBase. + if ($this->trustedData) { + $mapping = ['config' => 0, 'content' => 1, 'module' => 2, 'theme' => 3, 'enforced' => 4]; + $dependency_sort = function ($dependencies) use ($mapping) { + // Only sort the keys that exist. + $mapping_to_replace = array_intersect_key($mapping, $dependencies); + return array_replace($mapping_to_replace, $dependencies); + }; + $this->dependencies = $dependency_sort($this->dependencies); + if (isset($this->dependencies['enforced'])) { + $this->dependencies['enforced'] = $dependency_sort($this->dependencies['enforced']); + } + } } } diff --git a/core/lib/Drupal/Core/Config/StorableConfigBase.php b/core/lib/Drupal/Core/Config/StorableConfigBase.php index 2defc68a34fb..f3202a764441 100644 --- a/core/lib/Drupal/Core/Config/StorableConfigBase.php +++ b/core/lib/Drupal/Core/Config/StorableConfigBase.php @@ -3,6 +3,7 @@ namespace Drupal\Core\Config; use Drupal\Core\Config\Schema\Ignore; +use Drupal\Core\Config\Schema\Mapping; use Drupal\Core\Config\Schema\Sequence; use Drupal\Core\Config\Schema\SequenceDataDefinition; use Drupal\Core\TypedData\PrimitiveInterface; @@ -164,8 +165,9 @@ protected function validateValue($key, $value) { /** * Casts the value to correct data type using the configuration schema. * - * @param string $key - * A string that maps to a key within the configuration data. + * @param string|null $key + * A string that maps to a key within the configuration data. If NULL the + * top level mapping will be processed. * @param mixed $value * Value to associate with the key. * @@ -176,7 +178,11 @@ protected function validateValue($key, $value) { * If the value is unsupported in configuration. */ protected function castValue($key, $value) { - $element = $this->getSchemaWrapper()->get($key); + $element = $this->getSchemaWrapper(); + if ($key !== NULL) { + $element = $element->get($key); + } + // Do not cast value if it is unknown or defined to be ignored. if ($element && ($element instanceof Undefined || $element instanceof Ignore)) { // Do validate the value (may throw UnsupportedDataTypeConfigException) @@ -208,7 +214,19 @@ protected function castValue($key, $value) { } // Recurse into any nested keys. foreach ($value as $nested_value_key => $nested_value) { - $value[$nested_value_key] = $this->castValue($key . '.' . $nested_value_key, $nested_value); + $lookup_key = $key ? $key . '.' . $nested_value_key : $nested_value_key; + $value[$nested_value_key] = $this->castValue($lookup_key, $nested_value); + } + + // Only sort maps when we have more than 1 element to sort. + if ($element instanceof Mapping && count($value) > 1) { + $mapping = $element->getDataDefinition()['mapping']; + if (is_array($mapping)) { + // Only sort the keys in $value. + $mapping = array_intersect_key($mapping, $value); + // Sort the array in $value using the mapping definition. + $value = array_replace($mapping, $value); + } } if ($element instanceof Sequence) { diff --git a/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml b/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml index e0232cfb51b7..1e107b32302f 100644 --- a/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml +++ b/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml @@ -10,11 +10,11 @@ mode: default content: checked: type: timestamp_ago - weight: 1 - region: content + label: inline settings: { } third_party_settings: { } - label: inline + weight: 1 + region: content description: weight: 3 region: content @@ -29,10 +29,10 @@ content: region: content link: type: uri_link - weight: 4 - region: content + label: inline settings: { } third_party_settings: { } - label: inline + weight: 4 + region: content hidden: more_link: true diff --git a/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml b/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml index c0f8d3f07fa5..e3aa6cfce27f 100644 --- a/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml +++ b/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml @@ -13,72 +13,25 @@ base_table: aggregator_item base_field: iid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access news feeds' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: full - options: - items_per_page: 10 - offset: 0 - id: 0 - total_pages: 0 - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: '‹ Previous' - next: 'Next ›' - first: '« First' - last: 'Last »' - quantity: 9 - style: - type: default - row: - type: 'entity:aggregator_item' + title: 'Aggregator RSS feed' fields: iid: + id: iid table: aggregator_item field: iid - id: iid relationship: none group_type: group admin_label: '' + entity_type: aggregator_item + entity_field: iid + plugin_id: field label: 'Item ID' exclude: false - plugin_id: field alter: alter_text: false text: '' @@ -119,42 +72,89 @@ display: empty_zero: false hide_alter_empty: true type: number_integer - entity_type: aggregator_item - entity_field: iid - filters: { } + pager: + type: full + options: + offset: 0 + items_per_page: 10 + total_pages: 0 + id: 0 + tags: + next: 'Next ›' + previous: '‹ Previous' + first: '« First' + last: 'Last »' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + quantity: 9 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access news feeds' + cache: + type: tag + options: { } + empty: { } sorts: { } - title: 'Aggregator RSS feed' + arguments: { } + filters: { } + style: + type: default + row: + type: 'entity:aggregator_item' + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - arguments: { } display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - url.query_args - user.permissions - cacheable: false - max-age: -1 tags: { } + cacheable: false feed_items: - display_plugin: feed id: feed_items display_title: Feed + display_plugin: feed position: 1 display_options: - path: aggregator/rss - display_description: '' defaults: arguments: true + display_description: '' display_extenders: { } + path: aggregator/rss cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - user.permissions - cacheable: false - max-age: -1 tags: { } + cacheable: false diff --git a/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml b/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml index 44428c73644b..228e80953612 100644 --- a/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml +++ b/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml @@ -16,74 +16,23 @@ base_table: aggregator_feed base_field: fid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access news feeds' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: full - options: - items_per_page: 10 - offset: 0 - id: 0 - total_pages: null - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: '‹ Previous' - next: 'Next ›' - first: '« First' - last: 'Last »' - quantity: 9 - style: - type: default - row: - type: 'entity:aggregator_feed' - options: - relationship: none - view_mode: summary + title: Sources fields: fid: + id: fid table: aggregator_feed field: fid - id: fid - plugin_id: field - type: number_integer relationship: none group_type: group admin_label: '' + entity_type: aggregator_feed + entity_field: fid + plugin_id: field label: '' exclude: false alter: @@ -125,36 +74,83 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - entity_type: aggregator_feed - entity_field: fid - filters: { } + type: number_integer + pager: + type: full + options: + offset: 0 + items_per_page: 10 + total_pages: null + id: 0 + tags: + next: 'Next ›' + previous: '‹ Previous' + first: '« First' + last: 'Last »' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + quantity: 9 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access news feeds' + cache: + type: tag + options: { } + empty: { } sorts: { } - title: Sources + arguments: { } + filters: { } + style: + type: default + row: + type: 'entity:aggregator_feed' + options: + relationship: none + view_mode: summary + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - arguments: { } display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - url.query_args - user.permissions - max-age: -1 tags: { } feed_1: - display_plugin: feed id: feed_1 display_title: Feed + display_plugin: feed position: 2 display_options: - style: - type: opml - options: - grouping: { } - path: aggregator/opml + title: 'OPML feed' fields: title: id: title @@ -163,6 +159,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: aggregator_feed + entity_field: title + plugin_id: field label: '' exclude: false alter: @@ -218,9 +217,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - plugin_id: field - entity_type: aggregator_feed - entity_field: title url: id: url table: aggregator_feed @@ -228,6 +224,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: aggregator_feed + entity_field: url + plugin_id: url label: '' exclude: false alter: @@ -270,9 +269,6 @@ display: empty_zero: false hide_alter_empty: true display_as_link: false - plugin_id: url - entity_type: aggregator_feed - entity_field: url description: id: description table: aggregator_feed @@ -280,6 +276,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: aggregator_feed + entity_field: description + plugin_id: xss label: '' exclude: false alter: @@ -321,9 +320,6 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: xss - entity_type: aggregator_feed - entity_field: description link: id: link table: aggregator_feed @@ -331,6 +327,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: aggregator_feed + entity_field: link + plugin_id: url label: '' exclude: false alter: @@ -373,12 +372,10 @@ display: empty_zero: false hide_alter_empty: true display_as_link: false - plugin_id: url - entity_type: aggregator_feed - entity_field: link - defaults: - fields: false - title: false + style: + type: opml + options: + grouping: { } row: type: opml_fields options: @@ -390,39 +387,42 @@ display: language_field: '' xml_url_field: url url_field: '' + defaults: + title: false + fields: false + display_extenders: { } + path: aggregator/opml + sitename_title: true displays: page_1: page_1 default: '0' - title: 'OPML feed' - sitename_title: true - display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - user.permissions - max-age: -1 tags: { } page_1: - display_plugin: page id: page_1 display_title: Page + display_plugin: page position: 1 display_options: + display_extenders: { } path: aggregator/sources menu: type: normal title: Sources description: '' weight: 0 - context: '0' menu_name: tools - display_extenders: { } + context: '0' cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - url.query_args - user.permissions - max-age: -1 tags: { } diff --git a/core/modules/block/config/optional/tour.tour.block-layout.yml b/core/modules/block/config/optional/tour.tour.block-layout.yml index 0b01a6bb0e92..c580d9c3ff3e 100644 --- a/core/modules/block/config/optional/tour.tour.block-layout.yml +++ b/core/modules/block/config/optional/tour.tour.block-layout.yml @@ -7,38 +7,39 @@ id: block-layout label: 'Block Layout Page' module: block routes: - - route_name: block.admin_display + - + route_name: block.admin_display tips: block-layout: id: block-layout plugin: text label: 'Block Layout' - body: 'Blocks are boxes of content rendered into an area, or region, of a web page that can be displayed in regions (such as footer or sidebar) on your page.' weight: 1 + body: 'Blocks are boxes of content rendered into an area, or region, of a web page that can be displayed in regions (such as footer or sidebar) on your page.' place-block: id: place-block plugin: text label: 'Place Blocks' - body: 'Any custom or contributed block can be added to a particular region by clicking on a button Place block. A new block can also be created by clicking on Place Block' weight: 2 - selector: '.button--small' + selector: .button--small + body: 'Any custom or contributed block can be added to a particular region by clicking on a button Place block. A new block can also be created by clicking on Place Block' block-region: id: block-region plugin: text label: 'Block Region' - body: 'Assign or change the region of a block by clicking here. A dropdown list with all the regions will appear.You can place one block in multiple regions.' weight: 3 - selector: '.block-region-select' + selector: .block-region-select + body: 'Assign or change the region of a block by clicking here. A dropdown list with all the regions will appear.You can place one block in multiple regions.' configure-block: id: configure-block plugin: text label: 'Configure Block' - body: 'By Clicking on "Configure" you can go ahead and edit the contents of the block, deal with the visibility settings and even change the placement of where it is on your theme.' weight: 4 - selector: '.dropbutton-widget' + selector: .dropbutton-widget + body: 'By Clicking on "Configure" you can go ahead and edit the contents of the block, deal with the visibility settings and even change the placement of where it is on your theme.' custom-block-library: id: custom-block-library plugin: text label: 'Custom Block Library' - body: 'The block management screen also has an another tab on the top which is used to add Custom blocks. The name of the tab is "Custom block library". This tab ultimately provides a link to add custom blocks.' weight: 5 + body: 'The block management screen also has an another tab on the top which is used to add Custom blocks. The name of the tab is "Custom block library". This tab ultimately provides a link to add custom blocks.' diff --git a/core/modules/block/tests/modules/block_test/config/install/block.block.test_block.yml b/core/modules/block/tests/modules/block_test/config/install/block.block.test_block.yml index f52790fcc7d0..e9d91e72e0c4 100644 --- a/core/modules/block/tests/modules/block_test/config/install/block.block.test_block.yml +++ b/core/modules/block/tests/modules/block_test/config/install/block.block.test_block.yml @@ -1,17 +1,17 @@ +langcode: en +status: true +dependencies: + module: + - block_test + theme: + - stark id: test_block theme: stark -weight: 0 -status: true -langcode: en region: '-1' +weight: 0 plugin: test_html settings: label: 'Test HTML block' + label_display: hidden provider: block_test - label_display: 'hidden' -dependencies: - module: - - block_test - theme: - - stark visibility: { } diff --git a/core/modules/block/tests/src/Kernel/BlockInterfaceTest.php b/core/modules/block/tests/src/Kernel/BlockInterfaceTest.php index 2550cf16a889..49772173409c 100644 --- a/core/modules/block/tests/src/Kernel/BlockInterfaceTest.php +++ b/core/modules/block/tests/src/Kernel/BlockInterfaceTest.php @@ -37,8 +37,8 @@ public function testBlockInterface() { $expected_configuration = [ 'id' => 'test_block_instantiation', 'label' => 'Custom Display Message', - 'provider' => 'block_test', 'label_display' => BlockPluginInterface::BLOCK_LABEL_VISIBLE, + 'provider' => 'block_test', 'display_message' => 'no message set', ]; // Initial configuration of the block at construction time. diff --git a/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php b/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php index a0a48693d36e..26b0b6354743 100644 --- a/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php +++ b/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php @@ -94,8 +94,8 @@ protected function createTests() { 'settings' => [ 'id' => 'test_html', 'label' => '', - 'provider' => 'block_test', 'label_display' => BlockPluginInterface::BLOCK_LABEL_VISIBLE, + 'provider' => 'block_test', ], 'visibility' => [], ]; diff --git a/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php b/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php index f39057308cac..daa3f107b646 100644 --- a/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php +++ b/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php @@ -129,13 +129,13 @@ public function testBlockMigration() { $visibility = [ 'user_role' => [ 'id' => 'user_role', - 'roles' => [ - 'authenticated' => 'authenticated', - ], + 'negate' => FALSE, 'context_mapping' => [ 'user' => '@user.current_user_context:current_user', ], - 'negate' => FALSE, + 'roles' => [ + 'authenticated' => 'authenticated', + ], ], ]; $settings = [ @@ -150,13 +150,13 @@ public function testBlockMigration() { $visibility = [ 'user_role' => [ 'id' => 'user_role', - 'roles' => [ - 'migrate_test_role_1' => 'migrate_test_role_1', - ], + 'negate' => FALSE, 'context_mapping' => [ 'user' => '@user.current_user_context:current_user', ], - 'negate' => FALSE, + 'roles' => [ + 'migrate_test_role_1' => 'migrate_test_role_1', + ], ], ]; $settings = [ diff --git a/core/modules/block_content/config/optional/views.view.block_content.yml b/core/modules/block_content/config/optional/views.view.block_content.yml index e4d32003d5db..6dc0482205ea 100644 --- a/core/modules/block_content/config/optional/views.view.block_content.yml +++ b/core/modules/block_content/config/optional/views.view.block_content.yml @@ -13,103 +13,12 @@ base_table: block_content_field_data base_field: id display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'administer blocks' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: true - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: mini - options: - items_per_page: 50 - offset: 0 - id: 0 - total_pages: null - tags: - previous: '‹ Previous' - next: 'Next ›' - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - style: - type: table - options: - grouping: { } - row_class: '' - default_row_class: true - override: true - sticky: false - caption: '' - summary: '' - description: '' - columns: - info: info - type: type - changed: changed - operations: operations - info: - info: - sortable: true - 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: desc - align: '' - separator: '' - empty_column: false - responsive: '' - operations: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - default: changed - empty_table: true - row: - type: fields + title: 'Custom block library' fields: info: id: info @@ -118,6 +27,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: null + entity_field: info + plugin_id: field label: 'Block description' exclude: false alter: @@ -173,9 +85,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: null - entity_field: info - plugin_id: field type: id: type table: block_content_field_data @@ -183,6 +92,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: block_content + entity_field: type + plugin_id: field label: 'Block type' exclude: false alter: @@ -238,9 +150,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: block_content - entity_field: type - plugin_id: field changed: id: changed table: block_content_field_data @@ -248,6 +157,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: block_content + entity_field: changed + plugin_id: field label: Updated exclude: false alter: @@ -289,14 +201,11 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - entity_type: block_content - entity_field: changed type: timestamp settings: date_format: short custom_date_format: '' timezone: '' - plugin_id: field operations: id: operations table: block_content @@ -304,6 +213,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: block_content + plugin_id: entity_operations label: Operations exclude: false alter: @@ -346,8 +257,66 @@ display: empty_zero: false hide_alter_empty: true destination: true + pager: + type: mini + options: + offset: 0 + items_per_page: 50 + total_pages: null + id: 0 + tags: + next: 'Next ›' + previous: '‹ Previous' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: true + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'administer blocks' + cache: + type: tag + options: { } + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + plugin_id: text_custom + empty: true + content: 'There are no custom blocks available.' + tokenize: false + block_content_listing_empty: + id: block_content_listing_empty + table: block_content + field: block_content_listing_empty + relationship: none + group_type: group + admin_label: '' entity_type: block_content - plugin_id: entity_operations + plugin_id: block_content_listing_empty + label: '' + empty: true + sorts: { } + arguments: { } filters: info: id: info @@ -356,6 +325,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: block_content + entity_field: info + plugin_id: string operator: contains value: '' group: 1 @@ -366,6 +338,8 @@ display: description: '' use_operator: false operator: info_op + operator_limit_selection: false + operator_list: { } identifier: info required: false remember: false @@ -374,8 +348,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -388,9 +360,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: block_content - entity_field: info - plugin_id: string type: id: type table: block_content_field_data @@ -398,6 +367,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: block_content + entity_field: type + plugin_id: bundle operator: in value: { } group: 1 @@ -408,6 +380,8 @@ display: description: '' use_operator: false operator: type_op + operator_limit_selection: false + operator_list: { } identifier: type required: false remember: false @@ -417,8 +391,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -431,9 +403,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: block_content - entity_field: type - plugin_id: bundle reusable: id: reusable table: block_content_field_data @@ -441,6 +410,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: block_content + entity_field: reusable + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -451,14 +423,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -471,52 +443,80 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: block_content - entity_field: reusable - plugin_id: boolean - sorts: { } - title: 'Custom block library' + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + info: info + type: type + changed: changed + operations: operations + default: changed + info: + info: + sortable: true + 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: desc + align: '' + separator: '' + empty_column: false + responsive: '' + operations: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: false + summary: '' + empty_table: true + caption: '' + description: '' + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - relationship: none - group_type: group - admin_label: '' - empty: true - tokenize: false - content: 'There are no custom blocks available.' - plugin_id: text_custom - block_content_listing_empty: - admin_label: '' - empty: true - field: block_content_listing_empty - group_type: group - id: block_content_listing_empty - label: '' - relationship: none - table: block_content - plugin_id: block_content_listing_empty - entity_type: block_content - relationships: { } - arguments: { } display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - url - url.query_args - user.permissions - max-age: -1 tags: { } page_1: - display_plugin: page id: page_1 display_title: Page + display_plugin: page position: 1 display_options: display_extenders: { } @@ -525,16 +525,16 @@ display: type: tab title: 'Custom block library' description: '' - parent: block.admin_display weight: 0 - context: '0' menu_name: admin + parent: block.admin_display + context: '0' cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - url - url.query_args - user.permissions - max-age: -1 tags: { } diff --git a/core/modules/block_content/tests/modules/block_content_test/config/install/block.block.foobargorilla.yml b/core/modules/block_content/tests/modules/block_content_test/config/install/block.block.foobargorilla.yml index 42858f7b58dc..0b3b1b3f6183 100644 --- a/core/modules/block_content/tests/modules/block_content_test/config/install/block.block.foobargorilla.yml +++ b/core/modules/block_content/tests/modules/block_content_test/config/install/block.block.foobargorilla.yml @@ -14,13 +14,13 @@ plugin: 'block_content:fb5e8434-3617-4a1d-a252-8273e95ec30e' settings: id: 'block_content:fb5e8434-3617-4a1d-a252-8273e95ec30e' label: 'Foobar Gorilla' - provider: block_content label_display: visible + provider: block_content status: true info: '' view_mode: default visibility: request_path: id: request_path - pages: '' negate: false + pages: '' diff --git a/core/modules/book/config/optional/core.entity_form_display.node.book.default.yml b/core/modules/book/config/optional/core.entity_form_display.node.book.default.yml index 4b7f304c27c2..053ea5ecf3f3 100644 --- a/core/modules/book/config/optional/core.entity_form_display.node.book.default.yml +++ b/core/modules/book/config/optional/core.entity_form_display.node.book.default.yml @@ -29,24 +29,24 @@ content: third_party_settings: { } promote: type: boolean_checkbox - settings: - display_label: true weight: 15 region: content + settings: + display_label: true third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 120 region: content + settings: + display_label: true third_party_settings: { } sticky: type: boolean_checkbox - settings: - display_label: true weight: 16 region: content + settings: + display_label: true third_party_settings: { } title: type: string_textfield diff --git a/core/modules/book/config/optional/core.entity_view_display.node.book.default.yml b/core/modules/book/config/optional/core.entity_view_display.node.book.default.yml index d6ef64df8621..505ab1ee5d23 100644 --- a/core/modules/book/config/optional/core.entity_view_display.node.book.default.yml +++ b/core/modules/book/config/optional/core.entity_view_display.node.book.default.yml @@ -13,12 +13,12 @@ bundle: book mode: default content: body: - label: hidden type: text_default - weight: 100 - region: content + label: hidden settings: { } third_party_settings: { } + weight: 100 + region: content links: weight: 101 region: content diff --git a/core/modules/book/config/optional/core.entity_view_display.node.book.teaser.yml b/core/modules/book/config/optional/core.entity_view_display.node.book.teaser.yml index 77a62c35ab9d..de8889116938 100644 --- a/core/modules/book/config/optional/core.entity_view_display.node.book.teaser.yml +++ b/core/modules/book/config/optional/core.entity_view_display.node.book.teaser.yml @@ -14,13 +14,13 @@ bundle: book mode: teaser content: body: - label: hidden type: text_summary_or_trimmed - weight: 100 - region: content + label: hidden settings: trim_length: 600 third_party_settings: { } + weight: 100 + region: content links: weight: 101 region: content diff --git a/core/modules/book/config/optional/core.entity_view_mode.node.print.yml b/core/modules/book/config/optional/core.entity_view_mode.node.print.yml index d615b03a170e..d695ac52d74a 100644 --- a/core/modules/book/config/optional/core.entity_view_mode.node.print.yml +++ b/core/modules/book/config/optional/core.entity_view_mode.node.print.yml @@ -1,11 +1,11 @@ langcode: en status: false dependencies: + module: + - node enforced: module: - book - module: - - node id: node.print label: Print targetEntityType: node diff --git a/core/modules/comment/config/optional/views.view.comment.yml b/core/modules/comment/config/optional/views.view.comment.yml index 45d566636fed..a7003253e303 100644 --- a/core/modules/comment/config/optional/views.view.comment.yml +++ b/core/modules/comment/config/optional/views.view.comment.yml @@ -13,120 +13,12 @@ base_table: comment_field_data base_field: cid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'administer comments' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Filter - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: full - options: - items_per_page: 50 - offset: 0 - id: 0 - total_pages: null - tags: - previous: '‹ previous' - next: 'next ›' - first: '« first' - last: 'last »' - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - quantity: 9 - style: - type: table - options: - grouping: { } - row_class: '' - default_row_class: true - override: true - sticky: true - caption: '' - summary: '' - description: '' - columns: - comment_bulk_form: comment_bulk_form - subject: subject - uid: uid - entity_id: entity_id - changed: changed - operations: operations - info: - comment_bulk_form: - align: '' - separator: '' - empty_column: false - responsive: '' - subject: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - uid: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - entity_id: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - changed: - sortable: true - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: priority-low - operations: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - default: changed - empty_table: true - row: - type: fields + title: Comments fields: comment_bulk_form: id: comment_bulk_form @@ -135,6 +27,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: comment + plugin_id: comment_bulk_form label: '' exclude: false alter: @@ -181,8 +75,6 @@ display: selected_actions: - comment_delete_action - comment_unpublish_action - plugin_id: comment_bulk_form - entity_type: comment subject: id: subject table: comment_field_data @@ -190,6 +82,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: comment + entity_field: subject + plugin_id: field label: Subject exclude: false alter: @@ -245,9 +140,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: comment - entity_field: subject - plugin_id: field uid: id: uid table: comment_field_data @@ -255,6 +147,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: comment + entity_field: uid + plugin_id: field label: '' exclude: true alter: @@ -310,9 +205,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: comment - entity_field: uid - plugin_id: field name: id: name table: comment_field_data @@ -320,6 +212,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: comment + entity_field: name + plugin_id: field label: Author exclude: false alter: @@ -374,9 +269,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: comment - entity_field: name - plugin_id: field entity_id: id: entity_id table: comment_field_data @@ -384,6 +276,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: comment + entity_field: entity_id + plugin_id: commented_entity label: 'Posted in' exclude: false alter: @@ -439,9 +334,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: comment - entity_field: entity_id - plugin_id: commented_entity changed: id: changed table: comment_field_data @@ -449,6 +341,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: comment + entity_field: changed + plugin_id: field label: Updated exclude: false alter: @@ -506,9 +401,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: comment - entity_field: changed - plugin_id: field operations: id: operations table: comment @@ -516,6 +408,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: comment + plugin_id: entity_operations label: Operations exclude: false alter: @@ -558,8 +452,6 @@ display: empty_zero: false hide_alter_empty: true destination: true - entity_type: comment - plugin_id: entity_operations name_1: id: name_1 table: users_field_data @@ -567,6 +459,9 @@ display: relationship: uid group_type: group admin_label: '' + entity_type: user + entity_field: name + plugin_id: field label: '' exclude: true alter: @@ -622,9 +517,74 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: user - entity_field: name - plugin_id: field + pager: + type: full + options: + offset: 0 + items_per_page: 50 + total_pages: null + id: 0 + tags: + next: 'next ›' + previous: '‹ previous' + first: '« first' + last: 'last »' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + quantity: 9 + exposed_form: + type: basic + options: + submit_button: Filter + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'administer comments' + cache: + type: tag + options: { } + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + plugin_id: text_custom + empty: true + content: 'No comments available.' + tokenize: false + sorts: + changed: + id: changed + table: comment_field_data + field: changed + relationship: none + group_type: group + admin_label: '' + entity_type: comment + entity_field: changed + plugin_id: date + order: DESC + expose: + label: '' + field_identifier: changed + exposed: false + granularity: second + arguments: { } filters: status: id: status @@ -633,6 +593,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: comment + entity_field: status + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -643,14 +606,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -663,9 +626,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: comment - entity_field: status - plugin_id: boolean subject: id: subject table: comment_field_data @@ -673,6 +633,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: comment + entity_field: subject + plugin_id: string operator: contains value: '' group: 1 @@ -683,6 +646,8 @@ display: description: '' use_operator: false operator: subject_op + operator_limit_selection: false + operator_list: { } identifier: subject required: false remember: false @@ -691,8 +656,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -705,9 +668,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: comment - entity_field: subject - plugin_id: string combine: id: combine table: views @@ -715,6 +675,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: combine operator: contains value: '' group: 1 @@ -725,6 +686,8 @@ display: description: '' use_operator: false operator: combine_op + operator_limit_selection: false + operator_list: { } identifier: author_name required: false remember: false @@ -733,8 +696,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -750,7 +711,6 @@ display: fields: name: name name_1: name_1 - plugin_id: combine langcode: id: langcode table: comment_field_data @@ -758,6 +718,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: comment + entity_field: langcode + plugin_id: language operator: in value: { } group: 1 @@ -768,6 +731,8 @@ display: description: '' use_operator: false operator: langcode_op + operator_limit_selection: false + operator_list: { } identifier: langcode required: false remember: false @@ -777,8 +742,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -791,51 +754,81 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: comment - entity_field: langcode - plugin_id: language - sorts: - changed: - id: changed - table: comment_field_data - field: changed - relationship: none - group_type: group - admin_label: '' - order: DESC - exposed: false - expose: - label: '' - field_identifier: changed - granularity: second - entity_type: comment - entity_field: changed - plugin_id: date - title: Comments - header: { } - footer: { } - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - relationship: none - group_type: group - admin_label: '' - empty: true - tokenize: false - content: 'No comments available.' - plugin_id: text_custom - arguments: { } - display_extenders: { } - use_more: false - use_more_always: true - use_more_text: more - use_ajax: false - hide_attachment_summary: false - show_admin_links: true - group_by: false - css_class: '' + filter_groups: + operator: AND + groups: + 1: AND + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + comment_bulk_form: comment_bulk_form + subject: subject + uid: uid + entity_id: entity_id + changed: changed + operations: operations + default: changed + info: + comment_bulk_form: + align: '' + separator: '' + empty_column: false + responsive: '' + subject: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + uid: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + entity_id: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + changed: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: priority-low + operations: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: true + summary: '' + empty_table: true + caption: '' + description: '' + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } relationships: uid: id: uid @@ -844,243 +837,66 @@ display: relationship: none group_type: group admin_label: author - required: false entity_type: comment entity_field: uid plugin_id: standard - filter_groups: - operator: AND - groups: - 1: AND + required: false + css_class: '' + use_ajax: false + group_by: false + show_admin_links: true + use_more: false + use_more_always: true + use_more_text: more + header: { } + footer: { } + hide_attachment_summary: false + display_extenders: { } cache_metadata: + max-age: 0 contexts: - 'languages:language_content' - 'languages:language_interface' - url - url.query_args - user.permissions - cacheable: false - max-age: 0 tags: { } + cacheable: false page_published: - display_plugin: page id: page_published display_title: 'Published comments' + display_plugin: page position: 1 display_options: - path: admin/content/comment - menu: - type: tab - title: Comments - description: 'Comments published' - parent: '' - weight: 0 - context: '0' - menu_name: admin display_description: 'The approved comments listing.' - display_extenders: { } - exposed_block: false display_comment: '' - cache_metadata: - contexts: - - 'languages:language_content' - - 'languages:language_interface' - - url - - url.query_args - - user.permissions - cacheable: false - max-age: 0 - tags: { } - page_unapproved: - display_plugin: page - id: page_unapproved - display_title: 'Unapproved comments' - position: 2 - display_options: - path: admin/content/comment/approval - menu: - type: tab - title: 'Unapproved comments' - description: 'Comments unapproved' - parent: '' - weight: 1 - context: '0' - menu_name: admin - display_description: 'The unapproved comments listing.' - filters: - status: - id: status - table: comment_field_data - field: status - relationship: none - group_type: group - admin_label: '' - operator: '=' - value: '0' - group: 1 - exposed: false - expose: - operator_id: '' - label: '' - description: '' - use_operator: false - operator: '' - identifier: '' - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - operator_limit_selection: false - operator_list: { } - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - entity_type: comment - entity_field: status - plugin_id: boolean - subject: - id: subject - table: comment_field_data - field: subject - relationship: none - group_type: group - admin_label: '' - operator: contains - value: '' - group: 1 - exposed: true - expose: - operator_id: subject_op - label: Subject - description: '' - use_operator: false - operator: subject_op - identifier: subject - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - anonymous: '0' - administrator: '0' - operator_limit_selection: false - operator_list: { } - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - entity_type: comment - entity_field: subject - plugin_id: string - combine: - id: combine - table: views - field: combine - relationship: none - group_type: group - admin_label: '' - operator: contains - value: '' - group: 1 - exposed: true - expose: - operator_id: combine_op - label: 'Author Name' - description: '' - use_operator: false - operator: combine_op - identifier: author_name - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - anonymous: '0' - administrator: '0' - operator_limit_selection: false - operator_list: { } - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - fields: - name: name - name_1: name_1 - plugin_id: combine - langcode: - id: langcode - table: comment_field_data - field: langcode - relationship: none - group_type: group - admin_label: '' - operator: in - value: { } - group: 1 - exposed: true - expose: - operator_id: langcode_op - label: Language - description: '' - use_operator: false - operator: langcode_op - identifier: langcode - required: false - remember: false - multiple: false - remember_roles: - authenticated: authenticated - anonymous: '0' - administrator: '0' - reduce: false - operator_limit_selection: false - operator_list: { } - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - entity_type: comment - entity_field: langcode - plugin_id: language - defaults: - filters: false - filter_groups: false - fields: false + exposed_block: false display_extenders: { } + path: admin/content/comment + menu: + type: tab + title: Comments + description: 'Comments published' + weight: 0 + menu_name: admin + parent: '' + context: '0' + cache_metadata: + max-age: 0 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions + tags: { } + cacheable: false + page_unapproved: + id: page_unapproved + display_title: 'Unapproved comments' + display_plugin: page + position: 2 + display_options: fields: comment_bulk_form: id: comment_bulk_form @@ -1089,6 +905,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: comment + plugin_id: comment_bulk_form label: '' exclude: false alter: @@ -1135,8 +953,6 @@ display: selected_actions: - comment_delete_action - comment_publish_action - plugin_id: comment_bulk_form - entity_type: comment subject: id: subject table: comment_field_data @@ -1144,6 +960,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: comment + entity_field: subject + plugin_id: field label: Subject exclude: false alter: @@ -1199,9 +1018,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: comment - entity_field: subject - plugin_id: field uid: id: uid table: comment_field_data @@ -1209,6 +1025,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: comment + entity_field: uid + plugin_id: field label: '' exclude: true alter: @@ -1264,9 +1083,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: comment - entity_field: uid - plugin_id: field name: id: name table: comment_field_data @@ -1274,6 +1090,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: comment + entity_field: name + plugin_id: field label: Author exclude: false alter: @@ -1328,9 +1147,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: comment - entity_field: name - plugin_id: field entity_id: id: entity_id table: comment_field_data @@ -1338,6 +1154,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: comment + entity_field: entity_id + plugin_id: commented_entity label: 'Posted in' exclude: false alter: @@ -1393,9 +1212,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: comment - entity_field: entity_id - plugin_id: commented_entity changed: id: changed table: comment_field_data @@ -1403,6 +1219,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: comment + entity_field: changed + plugin_id: field label: Updated exclude: false alter: @@ -1460,9 +1279,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: comment - entity_field: changed - plugin_id: field operations: id: operations table: comment @@ -1470,6 +1286,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: comment + plugin_id: entity_operations label: Operations exclude: false alter: @@ -1512,8 +1330,6 @@ display: empty_zero: false hide_alter_empty: true destination: true - entity_type: comment - plugin_id: entity_operations name_1: id: name_1 table: users_field_data @@ -1521,6 +1337,9 @@ display: relationship: uid group_type: group admin_label: '' + entity_type: user + entity_field: name + plugin_id: field label: '' exclude: true alter: @@ -1576,20 +1395,201 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: user - entity_field: name - plugin_id: field + filters: + status: + id: status + table: comment_field_data + field: status + relationship: none + group_type: group + admin_label: '' + entity_type: comment + entity_field: status + plugin_id: boolean + operator: '=' + value: '0' + 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 + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + subject: + id: subject + table: comment_field_data + field: subject + relationship: none + group_type: group + admin_label: '' + entity_type: comment + entity_field: subject + plugin_id: string + operator: contains + value: '' + group: 1 + exposed: true + expose: + operator_id: subject_op + label: Subject + description: '' + use_operator: false + operator: subject_op + operator_limit_selection: false + operator_list: { } + identifier: subject + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + combine: + id: combine + table: views + field: combine + relationship: none + group_type: group + admin_label: '' + plugin_id: combine + operator: contains + value: '' + group: 1 + exposed: true + expose: + operator_id: combine_op + label: 'Author Name' + description: '' + use_operator: false + operator: combine_op + operator_limit_selection: false + operator_list: { } + identifier: author_name + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + fields: + name: name + name_1: name_1 + langcode: + id: langcode + table: comment_field_data + field: langcode + relationship: none + group_type: group + admin_label: '' + entity_type: comment + entity_field: langcode + plugin_id: language + operator: in + value: { } + group: 1 + exposed: true + expose: + operator_id: langcode_op + label: Language + description: '' + use_operator: false + operator: langcode_op + operator_limit_selection: false + operator_list: { } + identifier: langcode + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + administrator: '0' + 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: { } filter_groups: operator: AND groups: 1: AND + defaults: + fields: false + filters: false + filter_groups: false + display_description: 'The unapproved comments listing.' + display_extenders: { } + path: admin/content/comment/approval + menu: + type: tab + title: 'Unapproved comments' + description: 'Comments unapproved' + weight: 1 + menu_name: admin + parent: '' + context: '0' cache_metadata: + max-age: 0 contexts: - 'languages:language_content' - 'languages:language_interface' - url - url.query_args - user.permissions - cacheable: false - max-age: 0 tags: { } + cacheable: false diff --git a/core/modules/comment/config/optional/views.view.comments_recent.yml b/core/modules/comment/config/optional/views.view.comments_recent.yml index 587040dad863..5e1528019361 100644 --- a/core/modules/comment/config/optional/views.view.comments_recent.yml +++ b/core/modules/comment/config/optional/views.view.comments_recent.yml @@ -14,59 +14,23 @@ base_table: comment_field_data base_field: cid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access comments' - cache: - type: tag - query: - type: views_query - exposed_form: - type: basic - pager: - type: some - options: - items_per_page: 10 - offset: 0 - style: - type: html_list - options: - grouping: { } - row_class: '' - default_row_class: true - type: ul - wrapper_class: item-list - class: '' - row: - type: fields - options: - default_field_elements: true - hide_empty: false - relationships: - node: - field: node - id: node - table: comment_field_data - required: true - plugin_id: standard + title: 'Recent comments' fields: subject: id: subject table: comment_field_data field: subject relationship: none - type: string - settings: - link_to_entity: true - plugin_id: field group_type: group admin_label: '' + entity_type: comment + entity_field: subject + plugin_id: field label: '' exclude: false alter: @@ -108,16 +72,19 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - entity_type: comment - entity_field: subject + type: string + settings: + link_to_entity: true changed: id: changed table: comment_field_data field: changed relationship: none - plugin_id: field group_type: group admin_label: '' + entity_type: comment + entity_field: changed + plugin_id: field label: '' exclude: false alter: @@ -164,36 +131,32 @@ display: future_format: '@interval hence' past_format: '@interval ago' granularity: 2 - entity_type: comment - entity_field: changed - filters: - status: - value: '1' - table: comment_field_data - field: status - id: status - plugin_id: boolean - expose: - operator: '' - operator_limit_selection: false - operator_list: { } - group: 1 - entity_type: comment - entity_field: status - status_node: - value: '1' - table: node_field_data - field: status - relationship: node - id: status_node - plugin_id: boolean - expose: - operator: '' - operator_limit_selection: false - operator_list: { } - group: 1 - entity_type: node - entity_field: status + pager: + type: some + options: + offset: 0 + items_per_page: 10 + exposed_form: + type: basic + access: + type: perm + options: + perm: 'access comments' + cache: + type: tag + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + plugin_id: text_custom + label: '' + empty: true + content: 'No comments available.' + tokenize: false sorts: created: id: created @@ -202,14 +165,14 @@ display: relationship: none group_type: group admin_label: '' + entity_type: comment + entity_field: created + plugin_id: date order: DESC - exposed: false expose: label: '' field_identifier: created - plugin_id: date - entity_type: comment - entity_field: created + exposed: false cid: id: cid table: comment_field_data @@ -217,51 +180,88 @@ display: relationship: none group_type: group admin_label: '' + entity_type: comment + entity_field: cid + plugin_id: field order: DESC - exposed: false expose: label: '' field_identifier: cid - plugin_id: field + exposed: false + filters: + status: + id: status + table: comment_field_data + field: status entity_type: comment - entity_field: cid - title: 'Recent comments' - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - relationship: none - group_type: group - admin_label: '' - label: '' - empty: true - content: 'No comments available.' - tokenize: false - plugin_id: text_custom + entity_field: status + plugin_id: boolean + value: '1' + group: 1 + expose: + operator: '' + operator_limit_selection: false + operator_list: { } + status_node: + id: status_node + table: node_field_data + field: status + relationship: node + entity_type: node + entity_field: status + plugin_id: boolean + value: '1' + group: 1 + expose: + operator: '' + operator_limit_selection: false + operator_list: { } + style: + type: html_list + options: + grouping: { } + row_class: '' + default_row_class: true + type: ul + wrapper_class: item-list + class: '' + row: + type: fields + options: + default_field_elements: true + hide_empty: false + query: + type: views_query + relationships: + node: + id: node + table: comment_field_data + field: node + plugin_id: standard + required: true display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - user.permissions - max-age: -1 tags: { } block_1: - display_plugin: block id: block_1 display_title: Block + display_plugin: block position: 1 display_options: + display_extenders: { } block_description: 'Recent comments' block_category: 'Lists (Views)' allow: items_per_page: true - display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - user.permissions - max-age: -1 tags: { } diff --git a/core/modules/config/tests/config_override_integration_test/config/install/block.block.config_override_test.yml b/core/modules/config/tests/config_override_integration_test/config/install/block.block.config_override_test.yml index be0616ff507e..6ff267a4cf83 100644 --- a/core/modules/config/tests/config_override_integration_test/config/install/block.block.config_override_test.yml +++ b/core/modules/config/tests/config_override_integration_test/config/install/block.block.config_override_test.yml @@ -1,24 +1,24 @@ +langcode: en +status: true +dependencies: + module: + - block_test + theme: + - classy id: config_override_test theme: classy -weight: 0 -status: true -langcode: en region: content +weight: 0 plugin: test_cache settings: label: 'Test HTML block' - provider: block_test label_display: visible + provider: block_test status: true info: '' view_mode: default -dependencies: - module: - - block_test - theme: - - classy visibility: request_path: id: request_path - pages: '' negate: false + pages: '' diff --git a/core/modules/config/tests/config_override_test/config/install/block.block.call_to_action.yml b/core/modules/config/tests/config_override_test/config/install/block.block.call_to_action.yml index 8951c0d22bb7..4e3f8742399e 100644 --- a/core/modules/config/tests/config_override_test/config/install/block.block.call_to_action.yml +++ b/core/modules/config/tests/config_override_test/config/install/block.block.call_to_action.yml @@ -14,13 +14,13 @@ plugin: 'block_content:d7c9d8ba-663f-41b4-8756-86bc55c44653' settings: id: 'block_content:d7c9d8ba-663f-41b4-8756-86bc55c44653' label: 'Shop for cheap now!' - provider: block_content label_display: visible + provider: block_content status: true info: '' view_mode: default visibility: request_path: id: request_path - pages: '' negate: false + pages: '' diff --git a/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml b/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml index ce894c243959..4dae83290481 100644 --- a/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml +++ b/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml @@ -335,3 +335,18 @@ config_schema_test.schema_sequence_sort: type: string bar: type: string + +config_schema_test.schema_mapping_sort: + type: config_object + mapping: + bar: + type: string + foo: + type: string + map: + type: mapping + mapping: + sub_foo: + type: string + sub_bar: + type: string diff --git a/core/modules/config/tests/config_test/config/schema/config_test.schema.yml b/core/modules/config/tests/config_test/config/schema/config_test.schema.yml index aee7896ac27f..1a0cf347a573 100644 --- a/core/modules/config/tests/config_test/config/schema/config_test.schema.yml +++ b/core/modules/config/tests/config_test/config/schema/config_test.schema.yml @@ -74,15 +74,15 @@ config_test.types: boolean: type: boolean label: 'Boolean' + exp: + type: float + label: 'Exponential' float: type: float label: 'Float' float_as_integer: type: float label: 'Float' - exp: - type: float - label: 'Exponential' hex: type: integer label: 'Hexadecimal' diff --git a/core/modules/config/tests/src/Functional/ConfigImportUITest.php b/core/modules/config/tests/src/Functional/ConfigImportUITest.php index 5d3ee5c3fd1a..5e4bdd1d13d7 100644 --- a/core/modules/config/tests/src/Functional/ConfigImportUITest.php +++ b/core/modules/config/tests/src/Functional/ConfigImportUITest.php @@ -183,8 +183,11 @@ public function testImport() { $sync->delete('text.settings'); $system_theme = $this->config('system.theme')->get(); - $system_theme['default'] = 'stark'; - $system_theme['admin'] = 'stark'; + $system_theme = [ + '_core' => $system_theme['_core'], + 'admin' => 'stark', + 'default' => 'stark', + ]; $sync->write('system.theme', $system_theme); // Set the state system to record installations and uninstallations. diff --git a/core/modules/config/tests/src/Functional/ConfigInstallProfileOverrideTest.php b/core/modules/config/tests/src/Functional/ConfigInstallProfileOverrideTest.php index f367a1377c26..e022d5f126d3 100644 --- a/core/modules/config/tests/src/Functional/ConfigInstallProfileOverrideTest.php +++ b/core/modules/config/tests/src/Functional/ConfigInstallProfileOverrideTest.php @@ -52,7 +52,7 @@ public function testInstallProfileConfigOverwrite() { ], 'logging' => 1, ]; - $expected_profile_data['_core']['default_config_hash'] = Crypt::hashBase64(serialize($expected_profile_data)); + $expected_profile_data = ['_core' => ['default_config_hash' => Crypt::hashBase64(serialize($expected_profile_data))]] + $expected_profile_data; // Verify that the original data matches. We have to read the module config // file directly, because the install profile default system.cron.yml diff --git a/core/modules/config/tests/src/Functional/ConfigSingleImportExportTest.php b/core/modules/config/tests/src/Functional/ConfigSingleImportExportTest.php index 2a74a11c4ef0..550ef3e4605d 100644 --- a/core/modules/config/tests/src/Functional/ConfigSingleImportExportTest.php +++ b/core/modules/config/tests/src/Functional/ConfigSingleImportExportTest.php @@ -263,7 +263,7 @@ public function testExport() { $this->assertSession()->optionExists('config_name', 'user.settings'); $this->drupalGet('admin/config/development/configuration/single/export/system.simple/system.image'); - $this->assertSession()->fieldValueEquals('export', "toolkit: gd\n_core:\n default_config_hash: durWHaKeBaq4d9Wpi4RqwADj1OufDepcnJuhVLmKN24\n"); + $this->assertSession()->fieldValueEquals('export', "_core:\n default_config_hash: durWHaKeBaq4d9Wpi4RqwADj1OufDepcnJuhVLmKN24\ntoolkit: gd\n"); // Verify that the date format entity type is selected when specified in // the URL. diff --git a/core/modules/contact/tests/modules/contact_test/config/install/contact.form.feedback.yml b/core/modules/contact/tests/modules/contact_test/config/install/contact.form.feedback.yml index d6e048f779b4..80e818a0f597 100644 --- a/core/modules/contact/tests/modules/contact_test/config/install/contact.form.feedback.yml +++ b/core/modules/contact/tests/modules/contact_test/config/install/contact.form.feedback.yml @@ -1,9 +1,9 @@ +langcode: en +status: true id: feedback label: 'Website feedback' recipients: { } reply: '' weight: 0 -status: true -langcode: en message: 'Your message has been sent.' redirect: '' diff --git a/core/modules/content_moderation/config/optional/views.view.moderated_content.yml b/core/modules/content_moderation/config/optional/views.view.moderated_content.yml index 4b4163334fb4..5cfc7a3ac2a7 100644 --- a/core/modules/content_moderation/config/optional/views.view.moderated_content.yml +++ b/core/modules/content_moderation/config/optional/views.view.moderated_content.yml @@ -1,12 +1,12 @@ langcode: en status: true dependencies: - enforced: - module: - - content_moderation module: - node - user + enforced: + module: + - content_moderation id: moderated_content label: 'Moderated content' module: views @@ -16,114 +16,12 @@ base_table: node_field_revision base_field: vid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'view any unpublished content' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Filter - reset_button: true - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: full - options: - items_per_page: 50 - offset: 0 - id: 0 - total_pages: null - tags: - previous: '‹ Previous' - next: 'Next ›' - first: '« First' - last: 'Last »' - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - quantity: 9 - style: - type: table - options: - grouping: { } - row_class: '' - default_row_class: true - override: true - sticky: true - caption: '' - summary: '' - description: '' - columns: - title: title - type: type - name: name - moderation_state: moderation_state - changed: changed - info: - title: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - type: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - name: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - moderation_state: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - changed: - sortable: true - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: '' - default: changed - empty_table: true - row: - type: fields + title: 'Moderated content' fields: title: id: title @@ -132,6 +30,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: title + plugin_id: field label: Title exclude: false alter: @@ -187,9 +88,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: node - entity_field: title - plugin_id: field type: id: type table: node_field_data @@ -197,6 +95,9 @@ display: relationship: nid group_type: group admin_label: '' + entity_type: node + entity_field: type + plugin_id: field label: 'Content type' exclude: false alter: @@ -252,9 +153,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: node - entity_field: type - plugin_id: field name: id: name table: users_field_data @@ -262,6 +160,9 @@ display: relationship: uid group_type: group admin_label: '' + entity_type: user + entity_field: name + plugin_id: field label: Author exclude: false alter: @@ -317,9 +218,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: user - entity_field: name - plugin_id: field moderation_state: id: moderation_state table: node_field_revision @@ -327,6 +225,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: field label: 'Moderation state' exclude: false alter: @@ -381,8 +281,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: node - plugin_id: field changed: id: changed table: node_field_revision @@ -390,6 +288,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: changed + plugin_id: field label: Updated exclude: false alter: @@ -447,9 +348,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: node - entity_field: changed - plugin_id: field operations: id: operations table: node_revision @@ -457,6 +355,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: entity_operations label: Operations exclude: false alter: @@ -499,8 +399,58 @@ display: empty_zero: false hide_alter_empty: true destination: true - entity_type: node - plugin_id: entity_operations + pager: + type: full + options: + offset: 0 + items_per_page: 50 + total_pages: null + id: 0 + tags: + next: 'Next ›' + previous: '‹ Previous' + first: '« First' + last: 'Last »' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + quantity: 9 + exposed_form: + type: basic + options: + submit_button: Filter + reset_button: true + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'view any unpublished content' + cache: + type: tag + options: { } + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + plugin_id: text_custom + empty: true + content: 'No moderated content available. Only pending versions of content, such as drafts, are listed here.' + tokenize: false + sorts: { } + arguments: { } filters: latest_translation_affected_revision: id: latest_translation_affected_revision @@ -509,6 +459,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: latest_translation_affected_revision operator: '=' value: '' group: 1 @@ -519,14 +471,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -539,8 +491,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - plugin_id: latest_translation_affected_revision title: id: title table: node_field_revision @@ -548,6 +498,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: title + plugin_id: string operator: contains value: '' group: 1 @@ -558,6 +511,8 @@ display: description: '' use_operator: false operator: title_op + operator_limit_selection: false + operator_list: { } identifier: title required: false remember: false @@ -566,8 +521,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -580,9 +533,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: title - plugin_id: string type: id: type table: node_field_data @@ -590,6 +540,9 @@ display: relationship: nid group_type: group admin_label: '' + entity_type: node + entity_field: type + plugin_id: bundle operator: in value: { } group: 1 @@ -600,6 +553,8 @@ display: description: '' use_operator: false operator: type_op + operator_limit_selection: false + operator_list: { } identifier: type required: false remember: false @@ -609,8 +564,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -623,9 +576,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: type - plugin_id: bundle moderation_state: id: moderation_state table: node_field_revision @@ -633,6 +583,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: moderation_state_filter operator: in value: editorial-draft: editorial-draft @@ -645,6 +597,8 @@ display: description: '' use_operator: false operator: moderation_state_op + operator_limit_selection: false + operator_list: { } identifier: moderation_state required: false remember: false @@ -654,8 +608,6 @@ display: anonymous: '0' administrator: '0' reduce: true - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -668,8 +620,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - plugin_id: moderation_state_filter langcode: id: langcode table: node_field_revision @@ -677,6 +627,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: langcode + plugin_id: language operator: in value: { } group: 1 @@ -687,6 +640,8 @@ display: description: '' use_operator: false operator: langcode_op + operator_limit_selection: false + operator_list: { } identifier: langcode required: false remember: false @@ -696,8 +651,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -710,9 +663,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: langcode - plugin_id: language moderation_state_1: id: moderation_state_1 table: node_field_revision @@ -720,6 +670,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: moderation_state_filter operator: 'not in' value: editorial-published: editorial-published @@ -731,6 +683,8 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false @@ -738,8 +692,6 @@ display: remember_roles: authenticated: authenticated reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -752,24 +704,75 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - plugin_id: moderation_state_filter - sorts: { } - title: 'Moderated content' - header: { } - footer: { } - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - relationship: none - group_type: group - admin_label: '' - empty: true - tokenize: false - content: 'No moderated content available. Only pending versions of content, such as drafts, are listed here.' - plugin_id: text_custom + filter_groups: + operator: AND + groups: + 1: AND + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + title: title + type: type + name: name + moderation_state: moderation_state + changed: changed + default: changed + info: + title: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + type: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + name: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + moderation_state: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + changed: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: true + summary: '' + empty_table: true + caption: '' + description: '' + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } relationships: nid: id: nid @@ -778,10 +781,10 @@ display: relationship: none group_type: group admin_label: 'Get the actual content from a content revision.' - required: false entity_type: node entity_field: nid plugin_id: standard + required: false uid: id: uid table: node_field_revision @@ -789,16 +792,13 @@ display: relationship: none group_type: group admin_label: User - required: false entity_type: node entity_field: uid plugin_id: standard - arguments: { } + required: false + header: { } + footer: { } display_extenders: { } - filter_groups: - operator: AND - groups: - 1: AND cache_metadata: max-age: -1 contexts: @@ -810,14 +810,14 @@ display: - user.permissions tags: { } moderated_content: - display_plugin: page id: moderated_content display_title: 'Moderated content' + display_plugin: page position: 1 display_options: + display_description: '' display_extenders: { } path: admin/content/moderated - display_description: '' cache_metadata: max-age: -1 contexts: diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.latest.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.latest.yml index c926797457b4..83a6b62da89b 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.latest.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.latest.yml @@ -16,61 +16,12 @@ base_table: node_field_revision base_field: vid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'view all revisions' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: full - options: - items_per_page: 10 - offset: 0 - id: 0 - total_pages: null - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: '‹ Previous' - next: 'Next ›' - first: '« First' - last: 'Last »' - quantity: 9 - style: - type: table - row: - type: fields + title: Latest fields: nid: id: nid @@ -79,6 +30,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: nid + plugin_id: field label: 'Node ID' exclude: false alter: @@ -135,9 +89,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: node - entity_field: nid - plugin_id: field vid: id: vid table: node_field_revision @@ -145,6 +96,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: vid + plugin_id: field label: 'Revision ID' exclude: false alter: @@ -201,34 +155,27 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: node - entity_field: vid - plugin_id: field title: id: title table: node_field_revision field: title + relationship: none + group_type: group + admin_label: '' entity_type: node entity_field: title + plugin_id: field + label: Title + exclude: false alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false - hide_empty: false - empty_zero: false - settings: - link_to_entity: false - plugin_id: field - relationship: none - group_type: group - admin_label: '' - label: Title - exclude: false element_type: '' element_class: '' element_label_type: '' @@ -238,9 +185,13 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true click_sort_column: value type: string + settings: + link_to_entity: false group_column: value group_columns: { } group_rows: true @@ -258,6 +209,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: moderation_state_field label: 'Moderation state' exclude: false alter: @@ -312,8 +265,47 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: node - plugin_id: moderation_state_field + pager: + type: full + options: + offset: 0 + items_per_page: 10 + total_pages: null + id: 0 + tags: + next: 'Next ›' + previous: '‹ Previous' + first: '« First' + last: 'Last »' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + quantity: 9 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'view all revisions' + cache: + type: tag + options: { } + empty: { } + sorts: { } + arguments: { } filters: latest_revision: id: latest_revision @@ -322,6 +314,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: latest_revision operator: '=' value: '' group: 1 @@ -332,14 +326,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -352,15 +346,21 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - plugin_id: latest_revision - sorts: { } - title: Latest + style: + type: table + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - arguments: { } display_extenders: { } cache_metadata: max-age: -1 @@ -372,9 +372,9 @@ display: - user.permissions tags: { } page_1: - display_plugin: page id: page_1 display_title: Page + display_plugin: page position: 1 display_options: display_extenders: { } @@ -383,11 +383,11 @@ display: type: normal title: Drafts description: '' + weight: 0 expanded: false + menu_name: main parent: '' - weight: 0 context: '0' - menu_name: main cache_metadata: max-age: -1 contexts: diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_field_state_test.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_field_state_test.yml index b81830f2c311..a9bb036dc76e 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_field_state_test.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_field_state_test.yml @@ -14,76 +14,34 @@ base_table: node_field_data base_field: nid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: some - options: - items_per_page: 10 - offset: 0 - style: - type: default - row: - type: fields - options: - default_field_elements: true - inline: { } - separator: '' - hide_empty: false + title: test_content_moderation_field_state_test fields: title: id: title table: node_field_data field: title + relationship: none + group_type: group + admin_label: '' entity_type: node entity_field: title + plugin_id: field label: '' + exclude: false alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false - hide_empty: false - empty_zero: false - settings: - link_to_entity: true - plugin_id: field - relationship: none - group_type: group - admin_label: '' - exclude: false element_type: '' element_class: '' element_label_type: '' @@ -93,9 +51,13 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true click_sort_column: value type: string + settings: + link_to_entity: true group_column: value group_columns: { } group_rows: true @@ -113,6 +75,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: field label: '' exclude: false alter: @@ -167,16 +131,52 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: node - plugin_id: field - filters: { } + pager: + type: some + options: + offset: 0 + items_per_page: 10 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } sorts: { } - title: test_content_moderation_field_state_test + arguments: { } + filters: { } + style: + type: default + row: + type: fields + options: + default_field_elements: true + inline: { } + separator: '' + hide_empty: false + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - arguments: { } display_extenders: { } cache_metadata: max-age: -1 @@ -187,9 +187,9 @@ display: - user.permissions tags: { } page_1: - display_plugin: page id: page_1 display_title: Page + display_plugin: page position: 1 display_options: display_extenders: { } diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_filter_via_relationship.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_filter_via_relationship.yml index bc78b88ad286..9ba9e46819ea 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_filter_via_relationship.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_filter_via_relationship.yml @@ -14,44 +14,12 @@ base_table: users_field_data base_field: uid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access user profiles' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: none - options: - offset: 0 - style: - type: default - row: - type: fields + title: test_content_moderation_filter_via_relationship fields: name: id: name @@ -60,6 +28,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + entity_field: name + plugin_id: field label: '' exclude: false alter: @@ -115,9 +86,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: user - entity_field: name - plugin_id: field title: id: title table: node_field_data @@ -125,6 +93,9 @@ display: relationship: uid group_type: group admin_label: '' + entity_type: node + entity_field: title + plugin_id: field label: '' exclude: false alter: @@ -180,9 +151,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: node - entity_field: title - plugin_id: field moderation_state: id: moderation_state table: node_field_data @@ -190,6 +158,8 @@ display: relationship: uid group_type: group admin_label: '' + entity_type: node + plugin_id: moderation_state_field label: '' exclude: false alter: @@ -244,8 +214,44 @@ display: multi_type: separator separator: ', ' field_api_classes: false + pager: + type: none + options: + offset: 0 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access user profiles' + cache: + type: tag + options: { } + empty: { } + sorts: + vid: + id: vid + table: node_field_data + field: vid + relationship: uid + group_type: group + admin_label: '' entity_type: node - plugin_id: moderation_state_field + entity_field: vid + plugin_id: standard + order: ASC + expose: + label: '' + exposed: false + arguments: { } filters: moderation_state: id: moderation_state @@ -254,6 +260,8 @@ display: relationship: uid group_type: group admin_label: '' + entity_type: node + plugin_id: moderation_state_filter operator: in value: { } group: 1 @@ -285,27 +293,18 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - plugin_id: moderation_state_filter - sorts: - vid: - id: vid - table: node_field_data - field: vid - relationship: uid - group_type: group - admin_label: '' - order: ASC - exposed: false - expose: - label: '' - entity_type: node - entity_field: vid - plugin_id: standard - title: test_content_moderation_filter_via_relationship - header: { } - footer: { } - empty: { } + style: + type: default + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } relationships: uid: id: uid @@ -314,11 +313,12 @@ display: relationship: none group_type: group admin_label: nodes - required: true entity_type: user entity_field: uid plugin_id: standard - arguments: { } + required: true + header: { } + footer: { } display_extenders: { } cache_metadata: max-age: -1 @@ -330,9 +330,9 @@ display: tags: - 'config:workflow_list' page_1: - display_plugin: page id: page_1 display_title: Page + display_plugin: page position: 1 display_options: display_extenders: { } diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table.yml index 3f2ab5aa1b3c..6083d953b9bb 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table.yml @@ -14,54 +14,11 @@ base_table: node_field_data base_field: nid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: none - options: - offset: 0 - style: - type: default - options: - grouping: { } - row_class: '' - default_row_class: true - uses_fields: false - row: - type: fields - options: - inline: { } - separator: '' - hide_empty: false - default_field_elements: true fields: nid: id: nid @@ -70,6 +27,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: nid + plugin_id: field label: '' exclude: false alter: @@ -126,9 +86,44 @@ display: multi_type: separator separator: ', ' field_api_classes: false + pager: + type: none + options: + offset: 0 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } + sorts: + nid: + id: nid + table: node_field_data + field: nid + relationship: none + group_type: group + admin_label: '' entity_type: node entity_field: nid - plugin_id: field + plugin_id: standard + order: ASC + expose: + label: '' + exposed: false + arguments: { } filters: moderation_state: id: moderation_state @@ -137,6 +132,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: moderation_state_filter operator: in value: { } group: 1 @@ -168,8 +165,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - plugin_id: moderation_state_filter moderation_state_1: id: moderation_state_1 table: node_field_data @@ -177,6 +172,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: moderation_state_filter operator: 'not empty' value: { } group: 1 @@ -206,28 +203,31 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - plugin_id: moderation_state_filter - sorts: - nid: - id: nid - table: node_field_data - field: nid - relationship: none - group_type: group - admin_label: '' - order: ASC - exposed: false - expose: - label: '' - entity_type: node - entity_field: nid - plugin_id: standard + style: + type: default + options: + grouping: { } + row_class: '' + default_row_class: true + uses_fields: false + row: + type: fields + options: + default_field_elements: true + inline: { } + separator: '' + hide_empty: false + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - arguments: { } display_extenders: { } cache_metadata: max-age: -1 @@ -240,9 +240,9 @@ display: tags: - 'config:workflow_list' page_1: - display_plugin: page id: page_1 display_title: Page + display_plugin: page position: 1 display_options: display_extenders: { } diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table_filter_group_or.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table_filter_group_or.yml index 6b193c78810f..d9ea2ff1fa16 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table_filter_group_or.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table_filter_group_or.yml @@ -14,54 +14,11 @@ base_table: node_field_data base_field: nid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: none - options: - offset: 0 - style: - type: default - options: - grouping: { } - row_class: '' - default_row_class: true - uses_fields: false - row: - type: fields - options: - inline: { } - separator: '' - hide_empty: false - default_field_elements: true fields: nid: id: nid @@ -70,6 +27,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: nid + plugin_id: field label: '' exclude: false alter: @@ -126,9 +86,44 @@ display: multi_type: separator separator: ', ' field_api_classes: false + pager: + type: none + options: + offset: 0 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } + sorts: + nid: + id: nid + table: node_field_data + field: nid + relationship: none + group_type: group + admin_label: '' entity_type: node entity_field: nid - plugin_id: field + plugin_id: standard + order: ASC + expose: + label: '' + exposed: false + arguments: { } filters: moderation_state: id: moderation_state @@ -137,6 +132,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: moderation_state_filter operator: in value: { } group: 1 @@ -147,6 +144,8 @@ display: description: '' use_operator: false operator: moderation_state_op + operator_limit_selection: false + operator_list: { } identifier: default_revision_state required: false remember: false @@ -156,8 +155,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -170,8 +167,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - plugin_id: moderation_state_filter moderation_state_1: id: moderation_state_1 table: node_field_data @@ -179,6 +174,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: moderation_state_filter operator: 'not empty' value: { } group: 2 @@ -189,6 +186,8 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false @@ -196,8 +195,6 @@ display: remember_roles: authenticated: authenticated reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -210,34 +207,37 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - plugin_id: moderation_state_filter - sorts: - nid: - id: nid - table: node_field_data - field: nid - relationship: none - group_type: group - admin_label: '' - order: ASC - exposed: false - expose: - label: '' - entity_type: node - entity_field: nid - plugin_id: standard - header: { } - footer: { } - empty: { } - relationships: { } - arguments: { } - display_extenders: { } filter_groups: operator: AND groups: 1: OR 2: OR + style: + type: default + options: + grouping: { } + row_class: '' + default_row_class: true + uses_fields: false + row: + type: fields + options: + default_field_elements: true + inline: { } + separator: '' + hide_empty: false + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } + header: { } + footer: { } + display_extenders: { } cache_metadata: max-age: -1 contexts: @@ -249,9 +249,9 @@ display: tags: - 'config:workflow_list' page_1: - display_plugin: page id: page_1 display_title: Page + display_plugin: page position: 1 display_options: display_extenders: { } diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table_filter_on_revision.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table_filter_on_revision.yml index 0fdbd646be8b..4ebe6ca4b935 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table_filter_on_revision.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_base_table_filter_on_revision.yml @@ -14,54 +14,11 @@ base_table: node_field_data base_field: nid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: none - options: - offset: 0 - style: - type: default - options: - grouping: { } - row_class: '' - default_row_class: true - uses_fields: false - row: - type: fields - options: - inline: { } - separator: '' - hide_empty: false - default_field_elements: true fields: nid: id: nid @@ -70,6 +27,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: nid + plugin_id: field label: '' exclude: false alter: @@ -126,9 +86,44 @@ display: multi_type: separator separator: ', ' field_api_classes: false + pager: + type: none + options: + offset: 0 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } + sorts: + nid: + id: nid + table: node_field_data + field: nid + relationship: none + group_type: group + admin_label: '' entity_type: node entity_field: nid - plugin_id: field + plugin_id: standard + order: ASC + expose: + label: '' + exposed: false + arguments: { } filters: moderation_state: id: moderation_state @@ -137,6 +132,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: moderation_state_filter operator: in value: { } group: 1 @@ -168,28 +165,31 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - plugin_id: moderation_state_filter - sorts: - nid: - id: nid - table: node_field_data - field: nid - relationship: none - group_type: group - admin_label: '' - order: ASC - exposed: false - expose: - label: '' - entity_type: node - entity_field: nid - plugin_id: standard + style: + type: default + options: + grouping: { } + row_class: '' + default_row_class: true + uses_fields: false + row: + type: fields + options: + default_field_elements: true + inline: { } + separator: '' + hide_empty: false + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - arguments: { } display_extenders: { } cache_metadata: max-age: -1 @@ -202,9 +202,9 @@ display: tags: - 'config:workflow_list' page_1: - display_plugin: page id: page_1 display_title: Page + display_plugin: page position: 1 display_options: display_extenders: { } diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_entity_test.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_entity_test.yml index 81492f644d59..3412e50e4b89 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_entity_test.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_entity_test.yml @@ -13,53 +13,11 @@ base_table: entity_test_no_bundle base_field: id display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: none - options: { } - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: none - options: - offset: 0 - style: - type: default - options: - grouping: { } - row_class: '' - default_row_class: true - uses_fields: false - row: - type: fields - options: - inline: { } - separator: '' - hide_empty: false - default_field_elements: true fields: entity_id: id: entity_id @@ -68,6 +26,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: standard label: '' exclude: false alter: @@ -109,7 +68,29 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: standard + pager: + type: none + options: + offset: 0 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: none + options: { } + cache: + type: tag + options: { } + empty: { } + sorts: { } + arguments: { } filters: moderation_state: id: moderation_state @@ -118,6 +99,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: entity_test_no_bundle + plugin_id: moderation_state_filter operator: in value: { } group: 1 @@ -149,14 +132,31 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: entity_test_no_bundle - plugin_id: moderation_state_filter - sorts: { } + style: + type: default + options: + grouping: { } + row_class: '' + default_row_class: true + uses_fields: false + row: + type: fields + options: + default_field_elements: true + inline: { } + separator: '' + hide_empty: false + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - arguments: { } display_extenders: { } cache_metadata: max-age: -1 diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_revision_table.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_revision_table.yml index 717a9b7ce2e3..652b2c93cae6 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_revision_table.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter_revision_table.yml @@ -13,68 +13,11 @@ base_table: node_field_revision base_field: vid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'view all revisions' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: mini - options: - items_per_page: 10 - offset: 0 - id: 0 - total_pages: null - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: ‹‹ - next: ›› - style: - type: default - options: - grouping: { } - row_class: '' - default_row_class: true - uses_fields: false - row: - type: fields - options: - inline: { } - separator: '' - hide_empty: false - default_field_elements: true fields: nid: id: nid @@ -83,6 +26,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: nid + plugin_id: field label: '' exclude: false alter: @@ -139,9 +85,58 @@ display: multi_type: separator separator: ', ' field_api_classes: false + pager: + type: mini + options: + offset: 0 + items_per_page: 10 + total_pages: null + id: 0 + tags: + next: ›› + previous: ‹‹ + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'view all revisions' + cache: + type: tag + options: { } + empty: { } + sorts: + vid: + id: vid + table: node_field_revision + field: vid + relationship: none + group_type: group + admin_label: '' entity_type: node - entity_field: nid - plugin_id: field + entity_field: vid + plugin_id: standard + order: ASC + expose: + label: '' + exposed: false + arguments: { } filters: moderation_state: id: moderation_state @@ -150,6 +145,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: moderation_state_filter operator: in value: { } group: 1 @@ -181,28 +178,31 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - plugin_id: moderation_state_filter - sorts: - vid: - id: vid - table: node_field_revision - field: vid - relationship: none - group_type: group - admin_label: '' - order: ASC - exposed: false - expose: - label: '' - entity_type: node - entity_field: vid - plugin_id: standard + style: + type: default + options: + grouping: { } + row_class: '' + default_row_class: true + uses_fields: false + row: + type: fields + options: + default_field_elements: true + inline: { } + separator: '' + hide_empty: false + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - arguments: { } display_extenders: { } cache_metadata: max-age: -1 diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_sort_base_table.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_sort_base_table.yml index 4de436d34668..d87062da1c85 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_sort_base_table.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_sort_base_table.yml @@ -14,92 +14,11 @@ base_table: node_field_data base_field: nid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: mini - options: - items_per_page: 10 - offset: 0 - id: 0 - total_pages: null - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: ‹‹ - next: ›› - style: - type: table - options: - grouping: { } - row_class: '' - default_row_class: true - override: true - sticky: false - caption: '' - summary: '' - description: '' - columns: - nid: nid - moderation_state: moderation_state - info: - nid: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - moderation_state: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - default: '-1' - empty_table: false - row: - type: fields - options: - inline: { } - separator: '' - hide_empty: false - default_field_elements: true fields: nid: id: nid @@ -108,6 +27,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: nid + plugin_id: field label: '' exclude: false alter: @@ -164,9 +86,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: node - entity_field: nid - plugin_id: field moderation_state: id: moderation_state table: node_field_data @@ -174,6 +93,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: moderation_state_field label: 'Moderation state' exclude: false alter: @@ -228,9 +149,42 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: node - plugin_id: moderation_state_field - filters: { } + pager: + type: mini + options: + offset: 0 + items_per_page: 10 + total_pages: null + id: 0 + tags: + next: ›› + previous: ‹‹ + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } sorts: moderation_state: id: moderation_state @@ -239,17 +193,63 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: moderation_state_sort order: ASC - exposed: true expose: label: 'Moderation state' - entity_type: node - plugin_id: moderation_state_sort + exposed: true + arguments: { } + filters: { } + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + nid: nid + moderation_state: moderation_state + default: '-1' + info: + nid: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + moderation_state: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: false + summary: '' + empty_table: false + caption: '' + description: '' + row: + type: fields + options: + default_field_elements: true + inline: { } + separator: '' + hide_empty: false + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - arguments: { } display_extenders: { } cache_metadata: max-age: -1 diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_sort_revision_table.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_sort_revision_table.yml index 1dab5bb7ee23..0e481bc59596 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_sort_revision_table.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_sort_revision_table.yml @@ -13,92 +13,11 @@ base_table: node_field_revision base_field: vid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'view all revisions' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: mini - options: - items_per_page: 10 - offset: 0 - id: 0 - total_pages: null - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: ‹‹ - next: ›› - style: - type: table - options: - grouping: { } - row_class: '' - default_row_class: true - override: true - sticky: false - caption: '' - summary: '' - description: '' - columns: - vid: vid - moderation_state: moderation_state - info: - vid: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - moderation_state: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - default: '-1' - empty_table: false - row: - type: fields - options: - inline: { } - separator: '' - hide_empty: false - default_field_elements: true fields: vid: id: vid @@ -107,6 +26,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: vid + plugin_id: field label: '' exclude: false alter: @@ -163,9 +85,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: node - entity_field: vid - plugin_id: field moderation_state: id: moderation_state table: node_field_revision @@ -173,6 +92,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: moderation_state_field label: 'Moderation state' exclude: false alter: @@ -227,9 +148,42 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: node - plugin_id: moderation_state_field - filters: { } + pager: + type: mini + options: + offset: 0 + items_per_page: 10 + total_pages: null + id: 0 + tags: + next: ›› + previous: ‹‹ + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'view all revisions' + cache: + type: tag + options: { } + empty: { } sorts: moderation_state: id: moderation_state @@ -238,17 +192,63 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: moderation_state_sort order: ASC - exposed: true expose: label: 'Moderation state' - entity_type: node - plugin_id: moderation_state_sort + exposed: true + arguments: { } + filters: { } + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + vid: vid + moderation_state: moderation_state + default: '-1' + info: + vid: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + moderation_state: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: false + summary: '' + empty_table: false + caption: '' + description: '' + row: + type: fields + options: + default_field_elements: true + inline: { } + separator: '' + hide_empty: false + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - arguments: { } display_extenders: { } cache_metadata: max-age: -1 diff --git a/core/modules/contextual/tests/modules/contextual_test/config/optional/views.view.contextual_recent.yml b/core/modules/contextual/tests/modules/contextual_test/config/optional/views.view.contextual_recent.yml index d073a73dfed4..e57d17ea0f40 100644 --- a/core/modules/contextual/tests/modules/contextual_test/config/optional/views.view.contextual_recent.yml +++ b/core/modules/contextual/tests/modules/contextual_test/config/optional/views.view.contextual_recent.yml @@ -13,75 +13,34 @@ base_table: node_field_data base_field: nid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: some - options: - items_per_page: 10 - offset: 0 - style: - type: html_list - options: - grouping: { } - row_class: '' - default_row_class: true - type: ul - wrapper_class: item-list - class: '' - row: - type: fields + title: 'Recent content' fields: title: id: title table: node_field_data field: title + relationship: none + group_type: group + admin_label: '' entity_type: node entity_field: title + plugin_id: field label: '' exclude: false alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false - hide_empty: false - empty_zero: false - relationship: none - group_type: group - admin_label: '' element_type: '' element_class: '' element_label_type: '' @@ -91,11 +50,12 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true type: string settings: link_to_entity: true - plugin_id: field changed: id: changed table: node_field_data @@ -103,6 +63,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: changed + plugin_id: field label: '' exclude: false alter: @@ -157,9 +120,57 @@ display: multi_type: separator separator: ', ' field_api_classes: false + pager: + type: some + options: + offset: 0 + items_per_page: 10 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + plugin_id: text_custom + empty: true + content: 'No content available.' + tokenize: false + sorts: + changed: + id: changed + table: node_field_data + field: changed + relationship: none + group_type: group + admin_label: '' entity_type: node entity_field: changed - plugin_id: field + plugin_id: date + order: DESC + expose: + label: '' + exposed: false + granularity: second + arguments: { } filters: status_extra: id: status_extra @@ -168,6 +179,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: node_status operator: '=' value: false group: 1 @@ -178,14 +191,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -198,8 +211,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - plugin_id: node_status langcode: id: langcode table: node_field_data @@ -207,6 +218,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: langcode + plugin_id: language operator: in value: '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' @@ -218,6 +232,8 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false @@ -225,8 +241,6 @@ display: remember_roles: authenticated: authenticated reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -239,40 +253,25 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: langcode - plugin_id: language - sorts: - changed: - id: changed - table: node_field_data - field: changed - relationship: none - group_type: group - admin_label: '' - order: DESC - exposed: false - expose: - label: '' - granularity: second - entity_type: node - entity_field: changed - plugin_id: date - title: 'Recent content' - header: { } - footer: { } - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - relationship: none - group_type: group - admin_label: '' - empty: true - tokenize: false - content: 'No content available.' - plugin_id: text_custom + style: + type: html_list + options: + grouping: { } + row_class: '' + default_row_class: true + type: ul + wrapper_class: item-list + class: '' + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } relationships: uid: id: uid @@ -281,47 +280,48 @@ display: relationship: none group_type: group admin_label: author - required: true entity_type: node entity_field: uid plugin_id: standard - arguments: { } - display_extenders: { } + required: true use_more: false use_more_always: false use_more_text: More - link_url: '' link_display: '0' + link_url: '' + header: { } + footer: { } + display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - user - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } block_1: - display_plugin: block id: block_1 display_title: Block + display_plugin: block position: 2 display_options: - display_extenders: { } - defaults: - style: false - row: false row: type: 'entity:node' options: relationship: none view_mode: teaser + defaults: + style: false + row: false + display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - user - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } diff --git a/core/modules/dblog/config/optional/views.view.watchdog.yml b/core/modules/dblog/config/optional/views.view.watchdog.yml index b3da477847b6..a21b0ea38655 100644 --- a/core/modules/dblog/config/optional/views.view.watchdog.yml +++ b/core/modules/dblog/config/optional/views.view.watchdog.yml @@ -13,131 +13,12 @@ base_table: watchdog base_field: wid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access site reports' - cache: - type: none - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Filter - reset_button: true - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: false - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: mini - options: - items_per_page: 50 - offset: 0 - id: 0 - total_pages: null - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: ‹‹ - next: ›› - style: - type: table - options: - grouping: { } - row_class: '{{ type }} {{ severity }}' - default_row_class: true - override: true - sticky: false - caption: '' - summary: '' - description: '' - columns: - nothing: nothing - wid: wid - severity: severity - type: type - timestamp: timestamp - message: message - name: name - link: link - info: - nothing: - align: '' - separator: '' - empty_column: false - responsive: priority-medium - wid: - sortable: false - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: priority-low - severity: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-low - type: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-medium - timestamp: - sortable: true - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: priority-low - message: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - name: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-medium - link: - align: '' - separator: '' - empty_column: false - responsive: priority-low - default: wid - empty_table: false - row: - type: fields + title: 'Recent log messages' fields: nothing: id: nothing @@ -146,6 +27,7 @@ display: relationship: none group_type: group admin_label: Icon + plugin_id: custom label: '' exclude: false alter: @@ -187,7 +69,6 @@ display: hide_empty: false empty_zero: false hide_alter_empty: false - plugin_id: custom wid: id: wid table: watchdog @@ -195,6 +76,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: standard label: WID exclude: true alter: @@ -236,7 +118,6 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: standard severity: id: severity table: watchdog @@ -244,6 +125,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: machine_name label: Severity exclude: true alter: @@ -286,7 +168,6 @@ display: empty_zero: false hide_alter_empty: true machine_name: false - plugin_id: machine_name type: id: type table: watchdog @@ -294,6 +175,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: standard label: Type exclude: false alter: @@ -335,7 +217,6 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: standard timestamp: id: timestamp table: watchdog @@ -343,6 +224,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: date label: Date exclude: false alter: @@ -387,7 +269,6 @@ display: date_format: short custom_date_format: '' timezone: '' - plugin_id: date message: id: message table: watchdog @@ -395,6 +276,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: dblog_message label: Message exclude: false alter: @@ -437,7 +319,6 @@ display: empty_zero: false hide_alter_empty: true replace_variables: true - plugin_id: dblog_message name: id: name table: users_field_data @@ -445,6 +326,9 @@ display: relationship: uid group_type: group admin_label: '' + entity_type: user + entity_field: name + plugin_id: field label: User exclude: false alter: @@ -500,9 +384,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: user - entity_field: name - plugin_id: field link: id: link table: watchdog @@ -510,6 +391,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: dblog_operations label: Operations exclude: false alter: @@ -551,7 +433,68 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: dblog_operations + pager: + type: mini + options: + offset: 0 + items_per_page: 50 + total_pages: null + id: 0 + tags: + next: ›› + previous: ‹‹ + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + exposed_form: + type: basic + options: + submit_button: Filter + reset_button: true + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: false + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access site reports' + cache: + type: none + options: { } + empty: + area: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: 'No log messages available.' + plugin_id: text_custom + empty: true + content: 'No log messages available.' + tokenize: false + sorts: + wid: + id: wid + table: watchdog + field: wid + relationship: none + group_type: group + admin_label: '' + plugin_id: standard + order: DESC + expose: + label: '' + field_identifier: wid + exposed: false + arguments: { } filters: type: id: type @@ -560,6 +503,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: dblog_types operator: in value: { } group: 1 @@ -570,6 +514,8 @@ display: description: '' use_operator: false operator: type_op + operator_limit_selection: false + operator_list: { } identifier: type required: false remember: false @@ -579,8 +525,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -593,7 +537,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: dblog_types severity: id: severity table: watchdog @@ -601,6 +544,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: in_operator operator: in value: { } group: 1 @@ -611,6 +555,8 @@ display: description: '' use_operator: false operator: severity_op + operator_limit_selection: false + operator_list: { } identifier: severity required: false remember: false @@ -620,8 +566,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -634,36 +578,95 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: in_operator - sorts: - wid: - id: wid - table: watchdog - field: wid - relationship: none - group_type: group - admin_label: '' - order: DESC - exposed: false - expose: - label: '' - field_identifier: wid - plugin_id: standard - title: 'Recent log messages' - header: { } - footer: { } - empty: - area: - id: area_text_custom - table: views - field: area_text_custom - relationship: none - group_type: group - admin_label: 'No log messages available.' - empty: true - tokenize: false - content: 'No log messages available.' - plugin_id: text_custom + filter_groups: + operator: AND + groups: + 1: AND + style: + type: table + options: + grouping: { } + row_class: '{{ type }} {{ severity }}' + default_row_class: true + columns: + nothing: nothing + wid: wid + severity: severity + type: type + timestamp: timestamp + message: message + name: name + link: link + default: wid + info: + nothing: + align: '' + separator: '' + empty_column: false + responsive: priority-medium + wid: + sortable: false + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: priority-low + severity: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-low + type: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-medium + timestamp: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: priority-low + message: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + name: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-medium + link: + align: '' + separator: '' + empty_column: false + responsive: priority-low + override: true + sticky: false + summary: '' + empty_table: false + caption: '' + description: '' + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } relationships: uid: id: uid @@ -672,15 +675,12 @@ display: relationship: none group_type: group admin_label: User - required: false plugin_id: standard - arguments: { } - display_extenders: { } - filter_groups: - operator: AND - groups: - 1: AND + required: false css_class: admin-dblog + header: { } + footer: { } + display_extenders: { } cache_metadata: max-age: -1 contexts: @@ -691,9 +691,9 @@ display: - user.permissions tags: { } page: - display_plugin: page id: page display_title: Page + display_plugin: page position: 1 display_options: display_extenders: { } diff --git a/core/modules/editor/tests/editor_private_test/config/install/editor.editor.private_images.yml b/core/modules/editor/tests/editor_private_test/config/install/editor.editor.private_images.yml index 2de126a1cea6..b8a536708d99 100644 --- a/core/modules/editor/tests/editor_private_test/config/install/editor.editor.private_images.yml +++ b/core/modules/editor/tests/editor_private_test/config/install/editor.editor.private_images.yml @@ -1,6 +1,11 @@ -format: private_images -status: true langcode: en +status: true +dependencies: + config: + - filter.format.private_images + module: + - ckeditor +format: private_images editor: ckeditor settings: toolbar: @@ -27,8 +32,3 @@ image_upload: max_dimensions: width: null height: null -dependencies: - config: - - filter.format.private_images - module: - - ckeditor diff --git a/core/modules/editor/tests/editor_private_test/config/install/filter.format.private_images.yml b/core/modules/editor/tests/editor_private_test/config/install/filter.format.private_images.yml index 261bd901797a..33e777b24cc5 100644 --- a/core/modules/editor/tests/editor_private_test/config/install/filter.format.private_images.yml +++ b/core/modules/editor/tests/editor_private_test/config/install/filter.format.private_images.yml @@ -1,7 +1,10 @@ -format: private_images -name: 'Private images' -status: true langcode: en +status: true +dependencies: + module: + - editor +name: 'Private images' +format: private_images filters: editor_file_reference: id: editor_file_reference @@ -18,6 +21,3 @@ filters: allowed_html: '<img src alt data-entity-type data-entity-uuid>' filter_html_help: true filter_html_nofollow: false -dependencies: - module: - - editor diff --git a/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import.yml b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import.yml index 0cfd11a2c4e8..3e9c0a4c5224 100644 --- a/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import.yml +++ b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import.yml @@ -1,5 +1,8 @@ -id: entity_test.entity_test.field_test_import langcode: en +dependencies: + config: + - field.storage.entity_test.field_test_import +id: entity_test.entity_test.field_test_import field_name: field_test_import entity_type: entity_test bundle: entity_test @@ -8,8 +11,5 @@ description: '' required: false default_value: { } default_value_callback: '' -settings: { } +settings: { } field_type: text -dependencies: - config: - - field.storage.entity_test.field_test_import diff --git a/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import_2.yml b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import_2.yml index f73354f549ef..faf99c3a89a6 100644 --- a/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import_2.yml +++ b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.entity_test.field_test_import_2.yml @@ -1,5 +1,8 @@ -id: entity_test.entity_test.field_test_import_2 langcode: en +dependencies: + config: + - field.storage.entity_test.field_test_import_2 +id: entity_test.entity_test.field_test_import_2 field_name: field_test_import_2 entity_type: entity_test bundle: entity_test @@ -8,8 +11,5 @@ description: '' required: false default_value: { } default_value_callback: '' -settings: { } +settings: { } field_type: text -dependencies: - config: - - field.storage.entity_test.field_test_import_2 diff --git a/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.test_bundle.field_test_import_2.yml b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.test_bundle.field_test_import_2.yml index 75c856fa01e8..95a19af3c777 100644 --- a/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.test_bundle.field_test_import_2.yml +++ b/core/modules/field/tests/modules/field_test_config/config/install/field.field.entity_test.test_bundle.field_test_import_2.yml @@ -1,5 +1,8 @@ -id: entity_test.test_bundle.field_test_import_2 langcode: en +dependencies: + config: + - field.storage.entity_test.field_test_import_2 +id: entity_test.test_bundle.field_test_import_2 field_name: field_test_import_2 entity_type: entity_test bundle: test_bundle @@ -8,8 +11,5 @@ description: '' required: false default_value: { } default_value_callback: '' -settings: { } +settings: { } field_type: text -dependencies: - config: - - field.storage.entity_test.field_test_import_2 diff --git a/core/modules/field/tests/modules/field_test_config/config/install/field.storage.entity_test.field_test_import.yml b/core/modules/field/tests/modules/field_test_config/config/install/field.storage.entity_test.field_test_import.yml index f6ca4ab030c8..74f42810ca48 100644 --- a/core/modules/field/tests/modules/field_test_config/config/install/field.storage.entity_test.field_test_import.yml +++ b/core/modules/field/tests/modules/field_test_config/config/install/field.storage.entity_test.field_test_import.yml @@ -1,5 +1,9 @@ -id: entity_test.field_test_import langcode: en +dependencies: + module: + - entity_test + - text +id: entity_test.field_test_import field_name: field_test_import entity_type: entity_test type: text @@ -12,9 +16,5 @@ translatable: false indexes: format: - format -dependencies: - module: - - entity_test - - text persist_with_no_fields: false custom_storage: false diff --git a/core/modules/field/tests/modules/field_test_config/config/install/field.storage.entity_test.field_test_import_2.yml b/core/modules/field/tests/modules/field_test_config/config/install/field.storage.entity_test.field_test_import_2.yml index 35f53c54f699..5d1482894521 100644 --- a/core/modules/field/tests/modules/field_test_config/config/install/field.storage.entity_test.field_test_import_2.yml +++ b/core/modules/field/tests/modules/field_test_config/config/install/field.storage.entity_test.field_test_import_2.yml @@ -1,5 +1,9 @@ -id: entity_test.field_test_import_2 langcode: en +dependencies: + module: + - entity_test + - text +id: entity_test.field_test_import_2 field_name: field_test_import_2 entity_type: entity_test type: text @@ -12,9 +16,5 @@ translatable: false indexes: format: - format -dependencies: - module: - - entity_test - - text persist_with_no_fields: false custom_storage: false diff --git a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php index 8d990138cd17..b78961183c80 100644 --- a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php +++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php @@ -47,11 +47,11 @@ public function testEntityDisplaySettings() { // Run tests. $field_name = "field_test"; $expected = [ - 'label' => 'above', - 'weight' => 1, 'type' => 'text_trimmed', + 'label' => 'above', 'settings' => ['trim_length' => 600], 'third_party_settings' => [], + 'weight' => 1, 'region' => 'content', ]; @@ -95,10 +95,10 @@ public function testEntityDisplaySettings() { $expected['weight'] = 2; $expected['type'] = 'number_decimal'; $expected['settings'] = [ - 'scale' => 2, - 'decimal_separator' => '.', - 'thousand_separator' => ',', - 'prefix_suffix' => TRUE, + 'thousand_separator' => ',', + 'decimal_separator' => '.', + 'scale' => 2, + 'prefix_suffix' => TRUE, ]; $component = $display->getComponent('field_test_three'); $this->assertSame($expected, $component); @@ -145,7 +145,7 @@ public function testEntityDisplaySettings() { // Test the image field formatter settings. $expected['weight'] = 9; $expected['type'] = 'image'; - $expected['settings'] = ['image_style' => '', 'image_link' => '']; + $expected['settings'] = ['image_link' => '', 'image_style' => '']; $component = $display->getComponent('field_test_imagefield'); $this->assertSame($expected, $component); $display = EntityViewDisplay::load('node.story.teaser'); @@ -161,10 +161,9 @@ public function testEntityDisplaySettings() { $this->assertSame($expected, $component); // Test date field. - $defaults = ['format_type' => 'fallback', 'timezone_override' => '']; $expected['weight'] = 10; $expected['type'] = 'datetime_default'; - $expected['settings'] = ['format_type' => 'fallback'] + $defaults; + $expected['settings'] = ['timezone_override' => '', 'format_type' => 'fallback']; $component = $display->getComponent('field_test_date'); $this->assertSame($expected, $component); $display = EntityViewDisplay::load('node.story.default'); @@ -178,13 +177,13 @@ public function testEntityDisplaySettings() { $component = $display->getComponent('field_test_datestamp'); $this->assertSame($expected, $component); $display = EntityViewDisplay::load('node.story.teaser'); - $expected['settings'] = ['format_type' => 'medium'] + $defaults; + $expected['settings'] = ['timezone_override' => '', 'format_type' => 'medium']; $component = $display->getComponent('field_test_datestamp'); $this->assertSame($expected, $component); // Test datetime field. $expected['weight'] = 12; - $expected['settings'] = ['format_type' => 'short'] + $defaults; + $expected['settings'] = ['timezone_override' => '', 'format_type' => 'short']; $component = $display->getComponent('field_test_datetime'); $this->assertSame($expected, $component); $display = EntityViewDisplay::load('node.story.default'); diff --git a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php index a1bb4a73741b..c986b0c37365 100644 --- a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php +++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php @@ -37,10 +37,16 @@ public function testWidgetSettings() { // Text field. $component = $form_display->getComponent('field_test'); - $expected = ['weight' => 1, 'type' => 'text_textfield']; - $expected['settings'] = ['size' => 60, 'placeholder' => '']; - $expected['third_party_settings'] = []; - $expected['region'] = 'content'; + $expected = [ + 'type' => 'text_textfield', + 'weight' => 1, + 'region' => 'content', + 'settings' => [ + 'size' => 60, + 'placeholder' => '', + ], + 'third_party_settings' => [], + ]; $this->assertSame($expected, $component, 'Text field settings are correct.'); // Integer field. diff --git a/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceTest.php b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceTest.php index a8cd47d682c0..7d4f9180d8b0 100644 --- a/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceTest.php +++ b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceTest.php @@ -176,18 +176,18 @@ public function testFieldInstances() { $this->assertEntity('node.article.field_node_reference', 'Node Reference', 'entity_reference', FALSE, TRUE); $this->assertEntity('node.article.field_user_reference', 'User Reference', 'entity_reference', FALSE, TRUE); $expected_handler_settings = [ - 'include_anonymous' => TRUE, + 'sort' => [ + 'field' => '_none', + 'direction' => 'ASC', + ], + 'auto_create' => FALSE, 'filter' => [ 'type' => 'role', 'role' => [ 'authenticated user' => 'authenticated user', ], ], - 'sort' => [ - 'field' => '_none', - 'direction' => 'ASC', - ], - 'auto_create' => FALSE, + 'include_anonymous' => TRUE, ]; $field = FieldConfig::load('node.article.field_user_reference'); $actual = $field->getSetting('handler_settings'); diff --git a/core/modules/file/config/optional/views.view.files.yml b/core/modules/file/config/optional/views.view.files.yml index 3541044cff18..e4d72592fb97 100644 --- a/core/modules/file/config/optional/views.view.files.yml +++ b/core/modules/file/config/optional/views.view.files.yml @@ -13,156 +13,34 @@ base_table: file_managed base_field: fid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access files overview' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Filter - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: mini - options: - items_per_page: 50 - offset: 0 - id: 0 - total_pages: 0 - tags: - previous: '‹ Previous' - next: 'Next ›' - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - style: - type: table - options: - grouping: { } - row_class: '' - default_row_class: true - override: true - sticky: false - caption: '' - summary: '' - description: '' - columns: - fid: fid - filename: filename - filemime: filemime - filesize: filesize - status: status - created: created - changed: changed - count: count - info: - fid: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - filename: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - filemime: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-medium - filesize: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-low - status: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-low - created: - sortable: true - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: '' - changed: - sortable: true - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: '' - count: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-medium - default: changed - empty_table: true - row: - type: fields + title: Files fields: fid: id: fid table: file_managed field: fid + relationship: none + group_type: group + admin_label: '' + entity_type: file + entity_field: fid + plugin_id: field + label: Fid + exclude: true alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false - hide_empty: false - empty_zero: false - relationship: none - group_type: group - admin_label: '' - label: Fid - exclude: true element_type: '' element_class: '' element_label_type: '' @@ -172,10 +50,9 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true - plugin_id: field - entity_type: file - entity_field: fid filename: id: filename table: file_managed @@ -183,6 +60,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: filename + plugin_id: field label: Name exclude: false alter: @@ -236,9 +116,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - plugin_id: field - entity_type: file - entity_field: filename filemime: id: filemime table: file_managed @@ -246,6 +123,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: filemime + plugin_id: field label: 'MIME type' exclude: false alter: @@ -288,9 +168,6 @@ display: empty_zero: false hide_alter_empty: true type: file_filemime - plugin_id: field - entity_type: file - entity_field: filemime filesize: id: filesize table: file_managed @@ -298,6 +175,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: filesize + plugin_id: field label: Size exclude: false alter: @@ -340,9 +220,6 @@ display: empty_zero: false hide_alter_empty: true type: file_size - plugin_id: field - entity_type: file - entity_field: filesize status: id: status table: file_managed @@ -350,6 +227,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: status + plugin_id: field label: Status exclude: false alter: @@ -396,9 +276,6 @@ display: format: custom format_custom_false: Temporary format_custom_true: Permanent - plugin_id: field - entity_type: file - entity_field: status created: id: created table: file_managed @@ -406,6 +283,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: created + plugin_id: field label: 'Upload date' exclude: false alter: @@ -452,9 +332,6 @@ display: date_format: medium custom_date_format: '' timezone: '' - plugin_id: field - entity_type: file - entity_field: created changed: id: changed table: file_managed @@ -462,6 +339,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: changed + plugin_id: field label: 'Changed date' exclude: false alter: @@ -508,9 +388,6 @@ display: date_format: medium custom_date_format: '' timezone: '' - plugin_id: field - entity_type: file - entity_field: changed count: id: count table: file_usage @@ -518,6 +395,7 @@ display: relationship: fid group_type: sum admin_label: '' + plugin_id: numeric label: 'Used in' exclude: false alter: @@ -567,7 +445,51 @@ display: format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz prefix: '' suffix: '' - plugin_id: numeric + pager: + type: mini + options: + offset: 0 + items_per_page: 50 + total_pages: 0 + id: 0 + tags: + next: 'Next ›' + previous: '‹ Previous' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + exposed_form: + type: basic + options: + submit_button: Filter + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access files overview' + cache: + type: tag + options: { } + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + plugin_id: text_custom + empty: true + content: 'No files available.' + sorts: { } + arguments: { } filters: filename: id: filename @@ -576,6 +498,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: filename + plugin_id: string operator: word value: '' group: 1 @@ -586,6 +511,8 @@ display: description: '' use_operator: false operator: filename_op + operator_limit_selection: false + operator_list: { } identifier: filename required: false remember: false @@ -594,8 +521,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -608,9 +533,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: string - entity_type: file - entity_field: filename filemime: id: filemime table: file_managed @@ -618,6 +540,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: filemime + plugin_id: string operator: word value: '' group: 1 @@ -628,6 +553,8 @@ display: description: '' use_operator: false operator: filemime_op + operator_limit_selection: false + operator_list: { } identifier: filemime required: false remember: false @@ -636,8 +563,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -650,9 +575,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: string - entity_type: file - entity_field: filemime status: id: status table: file_managed @@ -660,6 +582,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: status + plugin_id: file_status operator: in value: { } group: 1 @@ -670,6 +595,8 @@ display: description: '' use_operator: false operator: status_op + operator_limit_selection: false + operator_list: { } identifier: status required: false remember: false @@ -679,8 +606,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -693,21 +618,95 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: file_status - entity_type: file - entity_field: status - sorts: { } - title: Files - header: { } - footer: { } - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - empty: true - content: 'No files available.' - plugin_id: text_custom + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + fid: fid + filename: filename + filemime: filemime + filesize: filesize + status: status + created: created + changed: changed + count: count + default: changed + info: + fid: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + filename: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + filemime: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-medium + filesize: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-low + status: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-low + created: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: '' + changed: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: '' + count: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-medium + override: true + sticky: false + summary: '' + empty_table: true + caption: '' + description: '' + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } relationships: fid: id: fid @@ -717,34 +716,26 @@ display: group_type: group admin_label: 'File usage' required: true - arguments: { } group_by: true show_admin_links: true + header: { } + footer: { } display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - url - url.query_args - user.permissions - max-age: -1 tags: { } page_1: - display_plugin: page id: page_1 display_title: 'Files overview' + display_plugin: page position: 1 display_options: - path: admin/content/files - menu: - type: tab - title: Files - description: '' - menu_name: admin - weight: 0 - context: '' - display_description: '' defaults: pager: true relationships: false @@ -757,59 +748,32 @@ display: group_type: group admin_label: 'File usage' required: false + display_description: '' display_extenders: { } + path: admin/content/files + menu: + type: tab + title: Files + description: '' + weight: 0 + menu_name: admin + context: '' cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - url - url.query_args - user.permissions - max-age: -1 tags: { } page_2: - display_plugin: page id: page_2 display_title: 'File usage' + display_plugin: page position: 2 display_options: - display_description: '' - path: admin/content/files/usage/% - empty: { } - defaults: - empty: false - pager: false - filters: false - filter_groups: false - fields: false - group_by: false - title: false - arguments: false - style: false - row: false - relationships: false - pager: - type: mini - options: - items_per_page: 10 - offset: 0 - id: 0 - total_pages: 0 - tags: - previous: '‹ Previous' - next: 'Next ›' - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - filters: { } - filter_groups: - operator: AND - groups: { } + title: 'File usage' fields: entity_label: id: entity_label @@ -818,6 +782,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: entity_label label: Entity exclude: false alter: @@ -860,7 +825,6 @@ display: empty_zero: false hide_alter_empty: true link_to_entity: true - plugin_id: entity_label type: id: type table: file_usage @@ -868,6 +832,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: standard label: 'Entity type' exclude: false alter: @@ -909,7 +874,6 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: standard module: id: module table: file_usage @@ -917,6 +881,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: standard label: 'Registering module' exclude: false alter: @@ -958,7 +923,6 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: standard count: id: count table: file_usage @@ -966,6 +930,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: numeric label: 'Use count' exclude: false alter: @@ -1015,9 +980,25 @@ display: format_plural_string: !!binary MQNAY291bnQ= prefix: '' suffix: '' - plugin_id: numeric - group_by: false - title: 'File usage' + pager: + type: mini + options: + offset: 0 + items_per_page: 10 + total_pages: 0 + id: 0 + tags: + next: 'Next ›' + previous: '‹ Previous' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + empty: { } arguments: fid: id: fid @@ -1026,6 +1007,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: fid + plugin_id: file_fid default_action: 'not found' exception: value: all @@ -1040,8 +1024,8 @@ display: summary_options: base_path: '' count: true - items_per_page: 25 override: false + items_per_page: 25 summary: sort_order: asc number_of_records: 0 @@ -1053,25 +1037,22 @@ display: validate_options: { } break_phrase: false not: false - plugin_id: file_fid - entity_type: file - entity_field: fid + filters: { } + filter_groups: + operator: AND + groups: { } style: type: table options: grouping: { } row_class: '' default_row_class: true - override: true - sticky: false - caption: '' - summary: '' - description: '' columns: entity_label: entity_label type: type module: module count: count + default: entity_label info: entity_label: sortable: true @@ -1101,11 +1082,27 @@ display: separator: '' empty_column: false responsive: '' - default: entity_label + override: true + sticky: false + summary: '' empty_table: true + caption: '' + description: '' row: type: fields options: { } + defaults: + empty: false + title: false + pager: false + group_by: false + style: false + row: false + relationships: false + fields: false + arguments: false + filters: false + filter_groups: false relationships: fid: id: fid @@ -1115,12 +1112,15 @@ display: group_type: group admin_label: 'File usage' required: true + group_by: false + display_description: '' display_extenders: { } + path: admin/content/files/usage/% cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url - url.query_args - user.permissions - max-age: -1 tags: { } diff --git a/core/modules/filter/tests/filter_test/config/install/filter.format.filter_test.yml b/core/modules/filter/tests/filter_test/config/install/filter.format.filter_test.yml index d3d77fcbd3e8..c9009137e9ab 100644 --- a/core/modules/filter/tests/filter_test/config/install/filter.format.filter_test.yml +++ b/core/modules/filter/tests/filter_test/config/install/filter.format.filter_test.yml @@ -1,11 +1,11 @@ -format: filter_test +langcode: en +status: true name: 'Test format' +format: filter_test weight: 2 roles: - anonymous - authenticated -status: true -langcode: en filters: filter_html_escape: id: filter_html_escape diff --git a/core/modules/filter/tests/filter_test/config/install/filter.format.filtered_html.yml b/core/modules/filter/tests/filter_test/config/install/filter.format.filtered_html.yml index ba403db3bf6d..b8b6d54176ac 100644 --- a/core/modules/filter/tests/filter_test/config/install/filter.format.filtered_html.yml +++ b/core/modules/filter/tests/filter_test/config/install/filter.format.filtered_html.yml @@ -1,12 +1,12 @@ -format: filtered_html name: 'Filtered HTML' +format: filtered_html weight: 1 filters: filter_url: id: filter_url provider: filter - weight: -1 status: true + weight: -1 filter_html: id: filter_html provider: filter diff --git a/core/modules/filter/tests/filter_test/config/install/filter.format.full_html.yml b/core/modules/filter/tests/filter_test/config/install/filter.format.full_html.yml index abb56629f672..d145aabc0f82 100644 --- a/core/modules/filter/tests/filter_test/config/install/filter.format.full_html.yml +++ b/core/modules/filter/tests/filter_test/config/install/filter.format.full_html.yml @@ -1,3 +1,3 @@ -format: full_html name: 'Full HTML' +format: full_html weight: 2 diff --git a/core/modules/forum/config/optional/core.entity_form_display.node.forum.default.yml b/core/modules/forum/config/optional/core.entity_form_display.node.forum.default.yml index 2f87d23d5955..7cffa6e7b507 100644 --- a/core/modules/forum/config/optional/core.entity_form_display.node.forum.default.yml +++ b/core/modules/forum/config/optional/core.entity_form_display.node.forum.default.yml @@ -38,24 +38,24 @@ content: third_party_settings: { } promote: type: boolean_checkbox - settings: - display_label: true weight: 15 region: content + settings: + display_label: true third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 120 region: content + settings: + display_label: true third_party_settings: { } sticky: type: boolean_checkbox - settings: - display_label: true weight: 16 region: content + settings: + display_label: true third_party_settings: { } taxonomy_forums: type: options_select diff --git a/core/modules/forum/config/optional/core.entity_form_display.taxonomy_term.forums.default.yml b/core/modules/forum/config/optional/core.entity_form_display.taxonomy_term.forums.default.yml index 51fa06906f3a..77d5c7f3835f 100644 --- a/core/modules/forum/config/optional/core.entity_form_display.taxonomy_term.forums.default.yml +++ b/core/modules/forum/config/optional/core.entity_form_display.taxonomy_term.forums.default.yml @@ -27,10 +27,10 @@ content: third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 100 region: content + settings: + display_label: true third_party_settings: { } hidden: forum_container: true diff --git a/core/modules/forum/config/optional/core.entity_view_display.comment.comment_forum.default.yml b/core/modules/forum/config/optional/core.entity_view_display.comment.comment_forum.default.yml index befeba89ae88..5ea4c3e2ccfd 100644 --- a/core/modules/forum/config/optional/core.entity_view_display.comment.comment_forum.default.yml +++ b/core/modules/forum/config/optional/core.entity_view_display.comment.comment_forum.default.yml @@ -12,12 +12,12 @@ bundle: comment_forum mode: default content: comment_body: - label: hidden type: text_default - weight: 0 - region: content + label: hidden settings: { } third_party_settings: { } + weight: 0 + region: content links: weight: 100 region: content diff --git a/core/modules/forum/config/optional/core.entity_view_display.node.forum.default.yml b/core/modules/forum/config/optional/core.entity_view_display.node.forum.default.yml index f3e8c5c61322..cef22c474afc 100644 --- a/core/modules/forum/config/optional/core.entity_view_display.node.forum.default.yml +++ b/core/modules/forum/config/optional/core.entity_view_display.node.forum.default.yml @@ -17,30 +17,30 @@ bundle: forum mode: default content: body: - label: hidden type: text_default - weight: 0 - region: content + label: hidden settings: { } third_party_settings: { } + weight: 0 + region: content comment_forum: - label: hidden type: comment_default - weight: 20 - region: content + label: hidden settings: view_mode: default pager_id: 0 third_party_settings: { } + weight: 20 + region: content links: weight: 100 region: content taxonomy_forums: type: entity_reference_label - weight: -1 - region: content label: above settings: link: true third_party_settings: { } + weight: -1 + region: content hidden: { } diff --git a/core/modules/forum/config/optional/core.entity_view_display.node.forum.teaser.yml b/core/modules/forum/config/optional/core.entity_view_display.node.forum.teaser.yml index 7b174f442919..dead32ab200a 100644 --- a/core/modules/forum/config/optional/core.entity_view_display.node.forum.teaser.yml +++ b/core/modules/forum/config/optional/core.entity_view_display.node.forum.teaser.yml @@ -16,23 +16,23 @@ bundle: forum mode: teaser content: body: - label: hidden type: text_summary_or_trimmed - weight: 100 - region: content + label: hidden settings: trim_length: 600 third_party_settings: { } + weight: 100 + region: content links: weight: 101 region: content taxonomy_forums: type: entity_reference_label - weight: 10 - region: content label: above settings: link: true third_party_settings: { } + weight: 10 + region: content hidden: comment_forum: true diff --git a/core/modules/forum/config/optional/core.entity_view_display.taxonomy_term.forums.default.yml b/core/modules/forum/config/optional/core.entity_view_display.taxonomy_term.forums.default.yml index b326039a46c3..256291dac2f1 100644 --- a/core/modules/forum/config/optional/core.entity_view_display.taxonomy_term.forums.default.yml +++ b/core/modules/forum/config/optional/core.entity_view_display.taxonomy_term.forums.default.yml @@ -13,10 +13,10 @@ mode: default content: description: type: text_default - weight: 0 - region: content + label: above settings: { } third_party_settings: { } - label: above + weight: 0 + region: content hidden: forum_container: true diff --git a/core/modules/forum/config/optional/field.field.node.forum.comment_forum.yml b/core/modules/forum/config/optional/field.field.node.forum.comment_forum.yml index 8812273ee67c..e5edd7e086c6 100644 --- a/core/modules/forum/config/optional/field.field.node.forum.comment_forum.yml +++ b/core/modules/forum/config/optional/field.field.node.forum.comment_forum.yml @@ -18,15 +18,15 @@ default_value: - status: 2 cid: 0 - last_comment_name: null last_comment_timestamp: 0 + last_comment_name: null last_comment_uid: 0 comment_count: 0 default_value_callback: '' settings: default_mode: 0 per_page: 50 - form_location: true anonymous: 0 + form_location: true preview: 1 field_type: comment diff --git a/core/modules/help_topics/config/optional/block.block.seven_help_search.yml b/core/modules/help_topics/config/optional/block.block.seven_help_search.yml index d44236ce9d6e..6d93b8f8b85d 100644 --- a/core/modules/help_topics/config/optional/block.block.seven_help_search.yml +++ b/core/modules/help_topics/config/optional/block.block.seven_help_search.yml @@ -1,14 +1,14 @@ langcode: en status: true dependencies: - enforced: - config: - - search.page.help_search module: - search - system theme: - seven + enforced: + config: + - search.page.help_search id: seven_help_search theme: seven region: help @@ -18,12 +18,12 @@ plugin: search_form_block settings: id: search_form_block label: 'Search help' - provider: search label_display: visible + provider: search page_id: help_search visibility: request_path: id: request_path - pages: /admin/help negate: false context_mapping: { } + pages: /admin/help diff --git a/core/modules/image/config/schema/image.schema.yml b/core/modules/image/config/schema/image.schema.yml index 4fcb6c7c591b..bf0bddf5f246 100644 --- a/core/modules/image/config/schema/image.schema.yml +++ b/core/modules/image/config/schema/image.schema.yml @@ -14,14 +14,14 @@ image.style.*: sequence: type: mapping mapping: + uuid: + type: uuid id: type: string - data: - type: image.effect.[%parent.id] weight: type: integer - uuid: - type: uuid + data: + type: image.effect.[%parent.id] image.effect.*: type: mapping diff --git a/core/modules/language/config/optional/tour.tour.language-add.yml b/core/modules/language/config/optional/tour.tour.language-add.yml index 53fdc3593d47..faa333d93111 100644 --- a/core/modules/language/config/optional/tour.tour.language-add.yml +++ b/core/modules/language/config/optional/tour.tour.language-add.yml @@ -7,24 +7,25 @@ id: language-add label: 'Adding languages' module: language routes: - - route_name: language.add + - + route_name: language.add tips: language-add-overview: id: language-add-overview plugin: text label: 'Adding languages' - body: '<p>This page provides the ability to add common languages to your site.</p><p>If the desired language is not available, you can add a custom language.</p>' weight: 1 + body: '<p>This page provides the ability to add common languages to your site.</p><p>If the desired language is not available, you can add a custom language.</p>' language-add-choose: id: language-add-choose plugin: text label: 'Select language' - body: '<p>Choose a language from the list, or choose "Custom language..." at the end of the list.</p><p>Click the "Add language" button when you are done choosing your language.</p><p>When adding a custom language, you will get an additional form where you can provide the name, code, and direction of the language.</p>' weight: 2 selector: '#edit-predefined-langcode' + body: '<p>Choose a language from the list, or choose "Custom language..." at the end of the list.</p><p>Click the "Add language" button when you are done choosing your language.</p><p>When adding a custom language, you will get an additional form where you can provide the name, code, and direction of the language.</p>' language-add-continue: id: language-add-continue plugin: text label: 'Continuing on' - body: '<p>Now that you have an overview of the "Add languages" feature, you can continue by:<ul><li>Adding a language</li><li>Adding a custom language</li><li><a href="[site:url]admin/config/regional/language">Viewing configured languages</a></li></ul></p>' weight: 3 + body: '<p>Now that you have an overview of the "Add languages" feature, you can continue by:<ul><li>Adding a language</li><li>Adding a custom language</li><li><a href="[site:url]admin/config/regional/language">Viewing configured languages</a></li></ul></p>' diff --git a/core/modules/language/config/optional/tour.tour.language-edit.yml b/core/modules/language/config/optional/tour.tour.language-edit.yml index 6e60d8501a67..2a50b89e3a8d 100644 --- a/core/modules/language/config/optional/tour.tour.language-edit.yml +++ b/core/modules/language/config/optional/tour.tour.language-edit.yml @@ -7,38 +7,39 @@ id: language-edit label: 'Editing languages' module: language routes: - - route_name: entity.configurable_language.edit_form + - + route_name: entity.configurable_language.edit_form tips: language-edit-overview: id: language-edit-overview plugin: text label: 'Editing languages' - body: '<p>This page provides the ability to edit a language on your site, including custom languages.</p>' weight: 1 + body: '<p>This page provides the ability to edit a language on your site, including custom languages.</p>' language-edit-langcode: id: language-edit-langcode plugin: text label: 'Language code' - body: '<p>You cannot change the code of a language on the site, since it is used by the system to keep track of the language.</p>' weight: 2 selector: '#edit-langcode-view' + body: '<p>You cannot change the code of a language on the site, since it is used by the system to keep track of the language.</p>' language-edit-label: id: language-edit-label plugin: text label: 'Language name' - body: '<p>The language name is used throughout the site for all users and is written in English. Names of built-in languages can be translated using the Interface Translation module, and names of both built-in and custom languages can be translated using the Configuration Translation module.</p>' weight: 3 selector: '#edit-label' + body: '<p>The language name is used throughout the site for all users and is written in English. Names of built-in languages can be translated using the Interface Translation module, and names of both built-in and custom languages can be translated using the Configuration Translation module.</p>' language-edit-direction: id: language-edit-direction plugin: text label: 'Language direction' - body: '<p>Choose if the language is a "Left to right" or "Right to left" language.</p><p>Note that not all themes support "Right to left" layouts, so test your theme if you are using "Right to left".</p>' weight: 4 selector: '#edit-direction--wrapper--description' + body: '<p>Choose if the language is a "Left to right" or "Right to left" language.</p><p>Note that not all themes support "Right to left" layouts, so test your theme if you are using "Right to left".</p>' language-edit-continue: id: language-edit-continue plugin: text label: 'Continuing on' - body: '<p>Now that you have an overview of the "Edit language" feature, you can continue by:<ul><li>Editing a language</li><li><a href="[site:url]admin/config/regional/language">Viewing configured languages</a></li></ul></p>' weight: 5 + body: '<p>Now that you have an overview of the "Edit language" feature, you can continue by:<ul><li>Editing a language</li><li><a href="[site:url]admin/config/regional/language">Viewing configured languages</a></li></ul></p>' diff --git a/core/modules/language/config/optional/tour.tour.language.yml b/core/modules/language/config/optional/tour.tour.language.yml index 1149058fd138..08f2ede4ff48 100644 --- a/core/modules/language/config/optional/tour.tour.language.yml +++ b/core/modules/language/config/optional/tour.tour.language.yml @@ -7,45 +7,46 @@ id: language label: Language module: language routes: - - route_name: entity.configurable_language.collection + - + route_name: entity.configurable_language.collection tips: language-overview: id: language-overview plugin: text label: Languages - body: '<p>The "Languages" page allows you to add, edit, delete, and reorder languages for the site.</p>' weight: 1 + body: '<p>The "Languages" page allows you to add, edit, delete, and reorder languages for the site.</p>' language-add: id: language-add plugin: text label: 'Adding languages' - body: '<p>To add more languages to your site, click the "Add language" button.</p><p>Added languages will be displayed in the language list and can then be edited or deleted.</p>' weight: 2 - selector: '.button-action' + selector: .button-action + body: '<p>To add more languages to your site, click the "Add language" button.</p><p>Added languages will be displayed in the language list and can then be edited or deleted.</p>' language-reorder: id: language-reorder plugin: text label: 'Reordering languages' - body: '<p>To reorder the languages on your site, use the drag icons next to each language.</p><p>The order shown here is the display order for language lists on the site such as in the language switcher blocks provided by the Interface Translation and Content Translation modules.</p><p>When you are done with reordering the languages, click the "Save configuration" button for the changes to take effect.</p>' weight: 3 - selector: '.draggable' + selector: .draggable + body: '<p>To reorder the languages on your site, use the drag icons next to each language.</p><p>The order shown here is the display order for language lists on the site such as in the language switcher blocks provided by the Interface Translation and Content Translation modules.</p><p>When you are done with reordering the languages, click the "Save configuration" button for the changes to take effect.</p>' language-default: id: language-default plugin: text label: 'Set a language as default' - body: '<p>You can change the default language of the site by choosing one of your configured languages as default. The site will use the default language in situations where no choice is made but a language should be set, for example as the language of the displayed interface.</p>' weight: 4 - selector: '.js-form-item-site-default-language' + selector: .js-form-item-site-default-language + body: '<p>You can change the default language of the site by choosing one of your configured languages as default. The site will use the default language in situations where no choice is made but a language should be set, for example as the language of the displayed interface.</p>' language-operations: id: language-operations plugin: text label: 'Modifying languages' - body: '<p>Operations are provided for editing and deleting your languages.</p><p>You can edit the name and the direction of the language.</p><p>Deleted languages can be added back at a later time. Deleting a language will remove all interface translations associated with it, and content in this language will be set to be language neutral. Note that you cannot delete the default language of the site.</p>' weight: 5 - selector: '.dropbutton-wrapper' + selector: .dropbutton-wrapper + body: '<p>Operations are provided for editing and deleting your languages.</p><p>You can edit the name and the direction of the language.</p><p>Deleted languages can be added back at a later time. Deleting a language will remove all interface translations associated with it, and content in this language will be set to be language neutral. Note that you cannot delete the default language of the site.</p>' language-continue: id: language-continue plugin: text label: 'Continuing on' - body: '<p>Now that you have an overview of the "Languages" page, you can continue by:<ul><li><a href="[site:url]admin/config/regional/language/add">Adding a language</a></li><li>Reordering languages</li><li>Editing a language</li><li>Deleting a language</li></ul></p>' weight: 6 + body: '<p>Now that you have an overview of the "Languages" page, you can continue by:<ul><li><a href="[site:url]admin/config/regional/language/add">Adding a language</a></li><li>Reordering languages</li><li>Editing a language</li><li>Deleting a language</li></ul></p>' diff --git a/core/modules/language/tests/language_test/config/optional/views.view.no_entity_translation_view.yml b/core/modules/language/tests/language_test/config/optional/views.view.no_entity_translation_view.yml index c482df542263..4d65f5df6058 100644 --- a/core/modules/language/tests/language_test/config/optional/views.view.no_entity_translation_view.yml +++ b/core/modules/language/tests/language_test/config/optional/views.view.no_entity_translation_view.yml @@ -12,66 +12,12 @@ base_table: no_language_entity_test base_field: id display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: none - options: { } - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: full - options: - items_per_page: 10 - offset: 0 - id: 0 - total_pages: null - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: '‹ Previous' - next: 'Next ›' - first: '« First' - last: 'Last »' - quantity: 9 - style: - type: default - row: - type: fields - options: - default_field_elements: true - inline: - operations: operations - separator: '' - hide_empty: false + title: 'No Entity Translation View' fields: uuid: id: uuid @@ -80,6 +26,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: no_language_entity_test + entity_field: uuid + plugin_id: field label: '' exclude: false alter: @@ -135,17 +84,68 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: no_language_entity_test - entity_field: uuid - plugin_id: field - filters: { } + pager: + type: full + options: + offset: 0 + items_per_page: 10 + total_pages: null + id: 0 + tags: + next: 'Next ›' + previous: '‹ Previous' + first: '« First' + last: 'Last »' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + quantity: 9 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: none + options: { } + cache: + type: tag + options: { } + empty: { } sorts: { } - title: 'No Entity Translation View' + arguments: { } + filters: { } + style: + type: default + row: + type: fields + options: + default_field_elements: true + inline: + operations: operations + separator: '' + hide_empty: false + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - arguments: { } display_extenders: { } cache_metadata: max-age: -1 @@ -155,9 +155,9 @@ display: - url.query_args tags: { } page_1: - display_plugin: page id: page_1 display_title: Page + display_plugin: page position: 1 display_options: display_extenders: { } diff --git a/core/modules/layout_builder/config/schema/layout_builder.schema.yml b/core/modules/layout_builder/config/schema/layout_builder.schema.yml index 862c90ecbed9..7bc4461891b5 100644 --- a/core/modules/layout_builder/config/schema/layout_builder.schema.yml +++ b/core/modules/layout_builder/config/schema/layout_builder.schema.yml @@ -38,14 +38,14 @@ layout_builder.component: type: mapping label: 'Component' mapping: - configuration: - type: block.settings.[id] - region: - type: string - label: 'Region' uuid: type: uuid label: 'UUID' + region: + type: string + label: 'Region' + configuration: + type: block.settings.[id] weight: type: integer label: 'Weight' diff --git a/core/modules/layout_builder/src/SectionComponent.php b/core/modules/layout_builder/src/SectionComponent.php index b14fc6ae3d5e..2627ccf1d862 100644 --- a/core/modules/layout_builder/src/SectionComponent.php +++ b/core/modules/layout_builder/src/SectionComponent.php @@ -292,8 +292,8 @@ public function toArray() { 'uuid' => $this->getUuid(), 'region' => $this->getRegion(), 'configuration' => $this->getConfiguration(), - 'additional' => $this->additional, 'weight' => $this->getWeight(), + 'additional' => $this->additional, ]; } diff --git a/core/modules/layout_builder/tests/modules/layout_builder_defaults_test/config/install/core.entity_view_display.entity_test.bundle_with_extra_fields.default.yml b/core/modules/layout_builder/tests/modules/layout_builder_defaults_test/config/install/core.entity_view_display.entity_test.bundle_with_extra_fields.default.yml index 7c1bf15e6caa..069aa0341957 100644 --- a/core/modules/layout_builder/tests/modules/layout_builder_defaults_test/config/install/core.entity_view_display.entity_test.bundle_with_extra_fields.default.yml +++ b/core/modules/layout_builder/tests/modules/layout_builder_defaults_test/config/install/core.entity_view_display.entity_test.bundle_with_extra_fields.default.yml @@ -5,32 +5,32 @@ dependencies: - layout_builder third_party_settings: layout_builder: + enabled: true + allow_custom: false sections: - layout_id: layout_twocol_section layout_settings: - column_widths: '50-50' + column_widths: 50-50 components: 1445597a-c674-431d-ac0a-277d99347a7f: uuid: 1445597a-c674-431d-ac0a-277d99347a7f region: first configuration: + id: 'extra_field_block:entity_test:bundle_with_extra_fields:display_extra_field' label_display: '0' context_mapping: entity: layout_builder.entity - id: 'extra_field_block:entity_test:bundle_with_extra_fields:display_extra_field' - additional: { } weight: 1 - allow_custom: false - enabled: true + additional: { } id: entity_test.bundle_with_extra_fields.default targetEntityType: entity_test bundle: bundle_with_extra_fields mode: default content: display_extra_field: - weight: 100 settings: { } third_party_settings: { } + weight: 100 region: content hidden: { } diff --git a/core/modules/layout_builder/tests/modules/layout_builder_views_test/config/install/views.view.test_block_view.yml b/core/modules/layout_builder/tests/modules/layout_builder_views_test/config/install/views.view.test_block_view.yml index a18531356470..4cf930937bfb 100644 --- a/core/modules/layout_builder/tests/modules/layout_builder_views_test/config/install/views.view.test_block_view.yml +++ b/core/modules/layout_builder/tests/modules/layout_builder_views_test/config/install/views.view.test_block_view.yml @@ -15,56 +15,21 @@ base_table: node_field_data base_field: nid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: some - options: - items_per_page: 5 - offset: 0 - style: - type: default - row: - type: fields + title: 'Test Block View' fields: title: id: title table: node_field_data field: title - settings: - link_to_entity: true - plugin_id: field relationship: none group_type: group admin_label: '' + plugin_id: field label: '' exclude: false alter: @@ -108,6 +73,8 @@ display: hide_alter_empty: true click_sort_column: value type: string + settings: + link_to_entity: true group_column: value group_columns: { } group_rows: true @@ -118,40 +85,73 @@ display: multi_type: separator separator: ', ' field_api_classes: false - filters: - status: - value: '1' - table: node_field_data - field: status - plugin_id: boolean - entity_type: node - entity_field: status - id: status - expose: - operator: '' - group: 1 + pager: + type: some + options: + offset: 0 + items_per_page: 5 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } sorts: created: id: created table: node_field_data field: created - order: DESC - entity_type: node - entity_field: created - plugin_id: date relationship: none group_type: group admin_label: '' - exposed: false + entity_type: node + entity_field: created + plugin_id: date + order: DESC expose: label: '' + exposed: false granularity: second - title: 'Test Block View' + 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: '' + style: + type: default + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - arguments: { } display_extenders: { } cache_metadata: max-age: -1 @@ -162,9 +162,9 @@ display: - user.permissions tags: { } block_1: - display_plugin: block id: block_1 display_title: Block + display_plugin: block position: 1 display_options: display_extenders: { } @@ -177,24 +177,24 @@ display: - user.permissions tags: { } block_2: - display_plugin: block id: block_2 display_title: 'Teaser block' + display_plugin: block position: 2 display_options: - display_extenders: { } - display_description: '' style: type: default options: { } - defaults: - style: false - row: false row: type: 'entity:node' options: relationship: none view_mode: teaser + defaults: + style: false + row: false + display_description: '' + display_extenders: { } cache_metadata: max-age: -1 contexts: @@ -204,13 +204,12 @@ display: - user.permissions tags: { } block_3: - display_plugin: block id: block_3 display_title: 'Exposed form block' + display_plugin: block position: 3 display_options: - display_extenders: { } - display_description: '' + title: 'Test Block View: Exposed form block' filters: status: id: status @@ -219,6 +218,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: status + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -253,20 +255,18 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: boolean - entity_type: node - entity_field: status - defaults: - filters: false - filter_groups: false - use_ajax: false - title: false filter_groups: operator: AND groups: 1: AND + defaults: + title: false + use_ajax: false + filters: false + filter_groups: false use_ajax: true - title: 'Test Block View: Exposed form block' + display_description: '' + display_extenders: { } cache_metadata: max-age: -1 contexts: diff --git a/core/modules/locale/config/optional/tour.tour.locale.yml b/core/modules/locale/config/optional/tour.tour.locale.yml index bcd7a9ce4e00..e79a088cfb04 100644 --- a/core/modules/locale/config/optional/tour.tour.locale.yml +++ b/core/modules/locale/config/optional/tour.tour.locale.yml @@ -7,59 +7,60 @@ id: locale label: Translation module: locale routes: - - route_name: locale.translate_page + - + route_name: locale.translate_page tips: locale-overview: id: locale-overview plugin: text label: 'User interface translation' - body: 'This page allows you to translate the user interface or modify existing translations. If you have installed your site initially in English, you must first add another language on the <a href="[site:url]admin/config/regional/language">Languages page</a>, in order to use this page.' weight: 1 + body: 'This page allows you to translate the user interface or modify existing translations. If you have installed your site initially in English, you must first add another language on the <a href="[site:url]admin/config/regional/language">Languages page</a>, in order to use this page.' locale-language: id: locale-language plugin: text label: 'Translation language' - body: 'Choose the language you want to translate.' weight: 2 selector: '#edit-langcode' + body: 'Choose the language you want to translate.' locale-search: id: locale-search plugin: text label: Search - body: 'Enter the specific word or sentence you want to translate, you can also write just a part of a word.' weight: 3 selector: '#edit-string' + body: 'Enter the specific word or sentence you want to translate, you can also write just a part of a word.' locale-filter: id: locale-filter plugin: text label: 'Filter the search' - body: 'You can search for untranslated strings if you want to translate something that isn''t translated yet. If you want to modify an existing translation, you might want to search only for translated strings.' weight: 4 selector: '#edit-translation' + body: 'You can search for untranslated strings if you want to translate something that isn''t translated yet. If you want to modify an existing translation, you might want to search only for translated strings.' locale-submit: id: locale-submit plugin: text label: 'Apply your search criteria' - body: 'To apply your search criteria, click on the <em>Filter</em> button.' weight: 5 selector: '#edit-submit' + body: 'To apply your search criteria, click on the <em>Filter</em> button.' locale-translate: id: locale-translate plugin: text label: Translate - body: 'You can write your own translation in the text fields of the right column. Try to figure out in which context the text will be used in order to translate it in the appropriate way.' weight: 6 - selector: '.js-form-type-textarea' + selector: .js-form-type-textarea + body: 'You can write your own translation in the text fields of the right column. Try to figure out in which context the text will be used in order to translate it in the appropriate way.' locale-validate: id: locale-validate plugin: text label: 'Validate the translation' - body: 'When you have finished your translations, click on the <em>Save translations</em> button. You must save your translations, each time before changing the page or making a new search.' weight: 7 selector: '#edit-submit--2' + body: 'When you have finished your translations, click on the <em>Save translations</em> button. You must save your translations, each time before changing the page or making a new search.' locale-continue: id: locale-continue plugin: text label: 'Continuing on' - body: 'The translations you have made here will be used on your site''s user interface. If you want to use them on another site or modify them on an external translation editor, you can <a href="[site:url]admin/config/regional/translate/export">export them</a> to a .po file and <a href="[site:url]admin/config/regional/translate/import">import them</a> later.' weight: 8 + body: 'The translations you have made here will be used on your site''s user interface. If you want to use them on another site or modify them on an external translation editor, you can <a href="[site:url]admin/config/regional/translate/export">export them</a> to a .po file and <a href="[site:url]admin/config/regional/translate/import">import them</a> later.' diff --git a/core/modules/locale/tests/modules/locale_test/config/optional/block.block.test_default_config.yml b/core/modules/locale/tests/modules/locale_test/config/optional/block.block.test_default_config.yml index 15f08072d093..35c784171dc8 100644 --- a/core/modules/locale/tests/modules/locale_test/config/optional/block.block.test_default_config.yml +++ b/core/modules/locale/tests/modules/locale_test/config/optional/block.block.test_default_config.yml @@ -12,8 +12,8 @@ plugin: local_tasks_block settings: id: local_tasks_block label: Tabs - provider: core label_display: '0' + provider: core primary: true secondary: true visibility: { } diff --git a/core/modules/media/config/optional/views.view.media.yml b/core/modules/media/config/optional/views.view.media.yml index df4df46c72c9..0f2cba90c213 100644 --- a/core/modules/media/config/optional/views.view.media.yml +++ b/core/modules/media/config/optional/views.view.media.yml @@ -16,122 +16,12 @@ base_table: media_field_data base_field: mid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access media overview' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Filter - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: full - options: - items_per_page: 50 - offset: 0 - id: 0 - total_pages: null - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: '‹ Previous' - next: 'Next ›' - first: '« First' - last: 'Last »' - quantity: 9 - style: - type: table - options: - grouping: { } - row_class: '' - default_row_class: true - override: true - sticky: false - caption: '' - summary: '' - description: '' - columns: - name: name - bundle: bundle - changed: changed - uid: uid - status: status - thumbnail__target_id: thumbnail__target_id - info: - name: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - bundle: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - changed: - sortable: true - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: '' - uid: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - status: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - thumbnail__target_id: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - default: changed - empty_table: true - row: - type: fields + title: Media fields: media_bulk_form: id: media_bulk_form @@ -140,6 +30,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + plugin_id: bulk_form label: '' exclude: false alter: @@ -184,8 +76,6 @@ display: action_title: Action include_exclude: exclude selected_actions: { } - entity_type: media - plugin_id: bulk_form thumbnail__target_id: id: thumbnail__target_id table: media_field_data @@ -193,6 +83,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: thumbnail + plugin_id: field label: Thumbnail exclude: false alter: @@ -237,8 +130,8 @@ display: click_sort_column: target_id type: image settings: - image_style: thumbnail image_link: '' + image_style: thumbnail group_column: '' group_columns: { } group_rows: true @@ -249,34 +142,27 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: media - entity_field: thumbnail - plugin_id: field name: id: name table: media_field_data field: name + relationship: none + group_type: group + admin_label: '' entity_type: media entity_field: media + plugin_id: field + label: 'Media name' + exclude: false alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false - hide_empty: false - empty_zero: false - settings: - link_to_entity: true - plugin_id: field - relationship: none - group_type: group - admin_label: '' - label: 'Media name' - exclude: false element_type: '' element_class: '' element_label_type: '' @@ -286,9 +172,13 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true click_sort_column: value type: string + settings: + link_to_entity: true group_column: value group_columns: { } group_rows: true @@ -306,6 +196,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: bundle + plugin_id: field label: Type exclude: false alter: @@ -361,9 +254,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: media - entity_field: bundle - plugin_id: field uid: id: uid table: media_field_data @@ -371,6 +261,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: uid + plugin_id: field label: Author exclude: false alter: @@ -426,9 +319,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: media - entity_field: uid - plugin_id: field status: id: status table: media_field_data @@ -436,6 +326,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: status + plugin_id: field label: Status exclude: false alter: @@ -481,8 +374,8 @@ display: type: boolean settings: format: custom - format_custom_true: Published format_custom_false: Unpublished + format_custom_true: Published group_column: value group_columns: { } group_rows: true @@ -493,9 +386,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: media - entity_field: status - plugin_id: field changed: id: changed table: media_field_data @@ -503,6 +393,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: changed + plugin_id: field label: Updated exclude: false alter: @@ -560,9 +453,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: media - entity_field: changed - plugin_id: field operations: id: operations table: media @@ -570,6 +460,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + plugin_id: entity_operations label: Operations exclude: false alter: @@ -612,8 +504,74 @@ display: empty_zero: false hide_alter_empty: true destination: true + pager: + type: full + options: + offset: 0 + items_per_page: 50 + total_pages: null + id: 0 + tags: + next: 'Next ›' + previous: '‹ Previous' + first: '« First' + last: 'Last »' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + quantity: 9 + exposed_form: + type: basic + options: + submit_button: Filter + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access media overview' + cache: + type: tag + options: { } + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + plugin_id: text_custom + empty: true + content: 'No media available.' + tokenize: false + sorts: + created: + id: created + table: media_field_data + field: created + relationship: none + group_type: group + admin_label: '' entity_type: media - plugin_id: entity_operations + entity_field: created + plugin_id: date + order: DESC + expose: + label: '' + field_identifier: created + exposed: false + granularity: second + arguments: { } filters: name: id: name @@ -622,6 +580,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: name + plugin_id: string operator: contains value: '' group: 1 @@ -632,6 +593,8 @@ display: description: '' use_operator: false operator: name_op + operator_limit_selection: false + operator_list: { } identifier: name required: false remember: false @@ -640,8 +603,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -654,9 +615,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: media - entity_field: name - plugin_id: string bundle: id: bundle table: media_field_data @@ -664,6 +622,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: bundle + plugin_id: bundle operator: in value: { } group: 1 @@ -674,6 +635,8 @@ display: description: '' use_operator: false operator: bundle_op + operator_limit_selection: false + operator_list: { } identifier: type required: false remember: false @@ -683,8 +646,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -697,9 +658,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: media - entity_field: bundle - plugin_id: bundle status: id: status table: media_field_data @@ -707,6 +665,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: status + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -717,14 +678,14 @@ display: description: null use_operator: false operator: status_op + operator_limit_selection: false + operator_list: { } identifier: status required: true remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: true group_info: label: 'Published status' @@ -745,9 +706,6 @@ display: title: Unpublished operator: '=' value: '0' - plugin_id: boolean - entity_type: media - entity_field: status status_extra: id: status_extra table: media_field_data @@ -755,6 +713,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + plugin_id: media_status operator: '=' value: '' group: 1 @@ -785,8 +745,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: media - plugin_id: media_status langcode: id: langcode table: media_field_data @@ -794,6 +752,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: langcode + plugin_id: language operator: in value: { } group: 1 @@ -804,6 +765,8 @@ display: description: '' use_operator: false operator: langcode_op + operator_limit_selection: false + operator_list: { } identifier: langcode required: false remember: false @@ -813,8 +776,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -827,43 +788,82 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: media - entity_field: langcode - plugin_id: language - sorts: - created: - id: created - table: media_field_data - field: created - order: DESC - entity_type: media - entity_field: created - plugin_id: date - relationship: none - group_type: group - admin_label: '' - exposed: false - expose: - label: '' - field_identifier: created - granularity: second - title: Media + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + name: name + bundle: bundle + changed: changed + uid: uid + status: status + thumbnail__target_id: thumbnail__target_id + default: changed + info: + name: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + bundle: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + changed: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: '' + uid: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + status: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + thumbnail__target_id: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: false + summary: '' + empty_table: true + caption: '' + description: '' + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - relationship: none - group_type: group - admin_label: '' - empty: true - tokenize: false - content: 'No media available.' - plugin_id: text_custom - relationships: { } - arguments: { } display_extenders: { } cache_metadata: max-age: 0 @@ -876,23 +876,23 @@ display: - user.permissions tags: { } media_page_list: - display_plugin: page id: media_page_list display_title: Media + display_plugin: page position: 1 display_options: + display_description: '' display_extenders: { } path: admin/content/media menu: type: tab title: Media description: '' + weight: 0 expanded: false + menu_name: main parent: '' - weight: 0 context: '0' - menu_name: main - display_description: '' cache_metadata: max-age: 0 contexts: diff --git a/core/modules/media/config/schema/media.schema.yml b/core/modules/media/config/schema/media.schema.yml index a419dd866e03..08bf800f5975 100644 --- a/core/modules/media/config/schema/media.schema.yml +++ b/core/modules/media/config/schema/media.schema.yml @@ -31,14 +31,14 @@ media.type.*: source: type: string label: 'Source' - source_configuration: - type: media.source.[%parent.source] queue_thumbnail_downloads: type: boolean label: 'Whether the thumbnail downloads should be queued' new_revision: type: boolean label: 'Whether a new revision should be created by default' + source_configuration: + type: media.source.[%parent.source] field_map: type: sequence label: 'Field map' @@ -112,15 +112,15 @@ filter_settings.media_embed: default_view_mode: type: string label: 'The view mode that is used by default' - allowed_media_types: - type: sequence - label: 'Media types selectable in the Media Library' - sequence: - type: string - label: 'Media type' allowed_view_modes: type: sequence label: 'View modes selectable in the "Edit media" dialog' sequence: type: string label: 'View mode' + allowed_media_types: + type: sequence + label: 'Media types selectable in the Media Library' + sequence: + type: string + label: 'Media type' diff --git a/core/modules/media/src/Plugin/media/Source/OEmbed.php b/core/modules/media/src/Plugin/media/Source/OEmbed.php index fd6bcf11a516..bfe8a7d86269 100644 --- a/core/modules/media/src/Plugin/media/Source/OEmbed.php +++ b/core/modules/media/src/Plugin/media/Source/OEmbed.php @@ -378,10 +378,10 @@ public function validateConfigurationForm(array &$form, FormStateInterface $form * {@inheritdoc} */ public function defaultConfiguration() { - return [ + return parent::defaultConfiguration() + [ 'thumbnails_directory' => 'public://oembed_thumbnails/[date:custom:Y-m]', 'providers' => [], - ] + parent::defaultConfiguration(); + ]; } /** diff --git a/core/modules/media/tests/modules/media_test_type/config/install/media.type.test.yml b/core/modules/media/tests/modules/media_test_type/config/install/media.type.test.yml index 96beb46ebf24..fed2c14ce74f 100644 --- a/core/modules/media/tests/modules/media_test_type/config/install/media.type.test.yml +++ b/core/modules/media/tests/modules/media_test_type/config/install/media.type.test.yml @@ -1,11 +1,11 @@ +langcode: en +status: true +dependencies: { } id: test label: 'Test type' description: 'Test type.' source: test source_configuration: - test_config_value: 'Kakec' -status: true -langcode: en -dependencies: { } + test_config_value: Kakec field_map: - metadata_attribute: 'field_attribute_config_test' + metadata_attribute: field_attribute_config_test diff --git a/core/modules/media/tests/modules/media_test_views/config/install/views.view.test_media_bulk_form.yml b/core/modules/media/tests/modules/media_test_views/config/install/views.view.test_media_bulk_form.yml index b80556d0a481..7fb69207acf2 100644 --- a/core/modules/media/tests/modules/media_test_views/config/install/views.view.test_media_bulk_form.yml +++ b/core/modules/media/tests/modules/media_test_views/config/install/views.view.test_media_bulk_form.yml @@ -13,20 +13,19 @@ base_table: media_field_data base_field: mid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - style: - type: table - row: - type: fields + title: 'Entity bulk form test view' fields: media_bulk_form: id: media_bulk_form table: media field: media_bulk_form + entity_type: media + plugin_id: bulk_form element_type: '' element_class: '' element_label_type: '' @@ -42,22 +41,16 @@ display: action_title: 'With selection' include_exclude: exclude selected_actions: { } - entity_type: media - plugin_id: bulk_form name: id: name table: media_field_data field: name - entity_type: media - entity_field: media - hide_empty: false - empty_zero: false - settings: - link_to_entity: false - plugin_id: field relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: media + plugin_id: field label: 'Media name' exclude: false element_type: '' @@ -69,9 +62,13 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true click_sort_column: value type: string + settings: + link_to_entity: false group_column: value group_columns: { } group_rows: true @@ -89,6 +86,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: status + plugin_id: field label: Status exclude: false element_type: '' @@ -107,8 +107,8 @@ display: type: boolean settings: format: custom - format_custom_true: Published format_custom_false: Unpublished + format_custom_true: Published group_column: value group_columns: { } group_rows: true @@ -119,9 +119,7 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: media - entity_field: status - plugin_id: field + empty: { } sorts: mid: id: mid @@ -130,24 +128,26 @@ display: relationship: none group_type: group admin_label: '' - order: ASC - exposed: false - expose: - label: '' entity_type: media entity_field: mid plugin_id: standard - title: 'Entity bulk form test view' + order: ASC + expose: + label: '' + exposed: false + arguments: { } + style: + type: table + row: + type: fields + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - arguments: { } display_extenders: { } page_1: - display_plugin: page id: page_1 display_title: Page + display_plugin: page position: 1 display_options: path: test-media-bulk-form diff --git a/core/modules/media/tests/src/Functional/Rest/MediaTypeResourceTestBase.php b/core/modules/media/tests/src/Functional/Rest/MediaTypeResourceTestBase.php index 7e3fb090692e..6f3256750798 100644 --- a/core/modules/media/tests/src/Functional/Rest/MediaTypeResourceTestBase.php +++ b/core/modules/media/tests/src/Functional/Rest/MediaTypeResourceTestBase.php @@ -57,9 +57,9 @@ protected function getExpectedNormalizedEntity() { 'id' => 'camelids', 'label' => NULL, 'langcode' => 'en', - 'new_revision' => FALSE, - 'queue_thumbnail_downloads' => FALSE, 'source' => 'file', + 'queue_thumbnail_downloads' => FALSE, + 'new_revision' => FALSE, 'source_configuration' => [ 'source_field' => '', ], diff --git a/core/modules/media_library/config/install/core.entity_form_mode.media.media_library.yml b/core/modules/media_library/config/install/core.entity_form_mode.media.media_library.yml index 3406f026b491..d96dd313f8b0 100644 --- a/core/modules/media_library/config/install/core.entity_form_mode.media.media_library.yml +++ b/core/modules/media_library/config/install/core.entity_form_mode.media.media_library.yml @@ -1,11 +1,11 @@ langcode: en status: true dependencies: + module: + - media enforced: module: - media_library - module: - - media id: media.media_library label: 'Media library' targetEntityType: media diff --git a/core/modules/media_library/config/install/core.entity_view_mode.media.media_library.yml b/core/modules/media_library/config/install/core.entity_view_mode.media.media_library.yml index 3406f026b491..d96dd313f8b0 100644 --- a/core/modules/media_library/config/install/core.entity_view_mode.media.media_library.yml +++ b/core/modules/media_library/config/install/core.entity_view_mode.media.media_library.yml @@ -1,11 +1,11 @@ langcode: en status: true dependencies: + module: + - media enforced: module: - media_library - module: - - media id: media.media_library label: 'Media library' targetEntityType: media diff --git a/core/modules/media_library/config/install/views.view.media_library.yml b/core/modules/media_library/config/install/views.view.media_library.yml index 1bd04639ef33..329f0aa1a604 100644 --- a/core/modules/media_library/config/install/views.view.media_library.yml +++ b/core/modules/media_library/config/install/views.view.media_library.yml @@ -4,14 +4,14 @@ dependencies: config: - core.entity_view_mode.media.media_library - image.style.media_library - enforced: - module: - - media_library module: - image - media - media_library - user + enforced: + module: + - media_library id: media_library label: 'Media library' module: views @@ -21,67 +21,12 @@ base_table: media_field_data base_field: mid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access media overview' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: 'Apply filters' - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: false - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: mini - options: - items_per_page: 24 - offset: 0 - id: 0 - total_pages: null - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '6, 12, 24, 48' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: ‹‹ - next: ›› - style: - type: default - options: - grouping: { } - row_class: '' - default_row_class: true - row: - type: fields - options: - default_field_elements: true - inline: { } - separator: '' - hide_empty: false + title: Media fields: media_bulk_form: id: media_bulk_form @@ -90,6 +35,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + plugin_id: bulk_form label: '' exclude: false alter: @@ -134,8 +81,6 @@ display: action_title: Action include_exclude: exclude selected_actions: { } - entity_type: media - plugin_id: bulk_form rendered_entity: id: rendered_entity table: media @@ -143,6 +88,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + plugin_id: rendered_entity label: '' exclude: false alter: @@ -185,8 +132,100 @@ display: empty_zero: false hide_alter_empty: true view_mode: media_library + pager: + type: mini + options: + offset: 0 + items_per_page: 24 + total_pages: null + id: 0 + tags: + next: ›› + previous: ‹‹ + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '6, 12, 24, 48' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + exposed_form: + type: basic + options: + submit_button: 'Apply filters' + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: false + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access media overview' + cache: + type: tag + options: { } + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + plugin_id: text_custom + empty: true + content: 'No media available.' + tokenize: false + sorts: + created: + id: created + table: media_field_data + field: created + relationship: none + group_type: group + admin_label: '' entity_type: media - plugin_id: rendered_entity + entity_field: created + plugin_id: date + order: DESC + expose: + label: 'Newest first' + field_identifier: created + exposed: true + granularity: second + name: + id: name + table: media_field_data + field: name + relationship: none + group_type: group + admin_label: '' + entity_type: media + entity_field: name + plugin_id: standard + order: ASC + expose: + label: 'Name (A-Z)' + field_identifier: name + exposed: true + name_1: + id: name_1 + table: media_field_data + field: name + relationship: none + group_type: group + admin_label: '' + entity_type: media + entity_field: name + plugin_id: standard + order: DESC + expose: + label: 'Name (Z-A)' + field_identifier: name_1 + exposed: true filters: status: id: status @@ -195,6 +234,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: status + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -205,14 +247,14 @@ display: description: null use_operator: false operator: status_op + operator_limit_selection: false + operator_list: { } identifier: status required: true remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: true group_info: label: Published @@ -233,9 +275,6 @@ display: title: Unpublished operator: '=' value: '0' - plugin_id: boolean - entity_type: media - entity_field: status name: id: name table: media_field_data @@ -243,6 +282,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: name + plugin_id: string operator: contains value: '' group: 1 @@ -253,6 +295,8 @@ display: description: '' use_operator: false operator: name_op + operator_limit_selection: false + operator_list: { } identifier: name required: false remember: false @@ -261,8 +305,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -275,9 +317,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: media - entity_field: name - plugin_id: string bundle: id: bundle table: media_field_data @@ -285,6 +324,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: bundle + plugin_id: bundle operator: in value: { } group: 1 @@ -295,6 +337,8 @@ display: description: '' use_operator: false operator: bundle_op + operator_limit_selection: false + operator_list: { } identifier: type required: false remember: false @@ -304,8 +348,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: 'Media type' @@ -321,9 +363,6 @@ display: 1: { } 2: { } 3: { } - entity_type: media - entity_field: bundle - plugin_id: bundle status_extra: id: status_extra table: media_field_data @@ -331,6 +370,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + plugin_id: media_status operator: '=' value: '' group: 1 @@ -361,8 +402,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: media - plugin_id: media_status langcode: id: langcode table: media_field_data @@ -370,6 +409,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: langcode + plugin_id: language operator: in value: { } group: 1 @@ -380,6 +422,8 @@ display: description: '' use_operator: false operator: langcode_op + operator_limit_selection: false + operator_list: { } identifier: langcode required: false remember: false @@ -389,8 +433,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -403,75 +445,33 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: media - entity_field: langcode - plugin_id: language - sorts: - created: - id: created - table: media_field_data - field: created - relationship: none - group_type: group - admin_label: '' - order: DESC - exposed: true - expose: - label: 'Newest first' - field_identifier: created - granularity: second - entity_type: media - entity_field: created - plugin_id: date - name: - id: name - table: media_field_data - field: name - relationship: none - group_type: group - admin_label: '' - order: ASC - exposed: true - expose: - label: 'Name (A-Z)' - field_identifier: name - entity_type: media - entity_field: name - plugin_id: standard - name_1: - id: name_1 - table: media_field_data - field: name - relationship: none - group_type: group - admin_label: '' - order: DESC - exposed: true - expose: - label: 'Name (Z-A)' - field_identifier: name_1 - entity_type: media - entity_field: name - plugin_id: standard - title: Media + style: + type: default + options: + grouping: { } + row_class: '' + default_row_class: true + row: + type: fields + options: + default_field_elements: true + inline: { } + separator: '' + hide_empty: false + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } + css_class: '' + use_ajax: true header: { } footer: { } - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - relationship: none - group_type: group - admin_label: '' - empty: true - tokenize: false - content: 'No media available.' - plugin_id: text_custom - relationships: { } display_extenders: { } - use_ajax: true - css_class: '' cache_metadata: max-age: 0 contexts: @@ -483,13 +483,11 @@ display: - user.permissions tags: { } page: - display_plugin: page id: page display_title: Page + display_plugin: page position: 1 display_options: - display_extenders: { } - path: admin/content/media-grid fields: media_bulk_form: id: media_bulk_form @@ -498,6 +496,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + plugin_id: bulk_form label: '' exclude: false alter: @@ -542,8 +542,6 @@ display: action_title: Action include_exclude: exclude selected_actions: { } - entity_type: media - plugin_id: bulk_form name: id: name table: media_field_data @@ -551,6 +549,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: name + plugin_id: field label: '' exclude: true alter: @@ -606,9 +607,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: media - entity_field: name - plugin_id: field edit_media: id: edit_media table: media @@ -616,6 +614,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + plugin_id: entity_link_edit label: '' exclude: false alter: @@ -657,11 +657,9 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - text: 'Edit' + text: Edit output_url_as_text: false absolute: false - entity_type: media - plugin_id: entity_link_edit delete_media: id: delete_media table: media @@ -669,6 +667,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + plugin_id: entity_link_delete label: '' exclude: false alter: @@ -710,11 +710,9 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - text: 'Delete' + text: Delete output_url_as_text: false absolute: false - entity_type: media - plugin_id: entity_link_delete rendered_entity: id: rendered_entity table: media @@ -722,6 +720,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + plugin_id: rendered_entity label: '' exclude: false alter: @@ -764,10 +764,10 @@ display: empty_zero: false hide_alter_empty: true view_mode: media_library - entity_type: media - plugin_id: rendered_entity defaults: fields: false + display_extenders: { } + path: admin/content/media-grid cache_metadata: max-age: 0 contexts: @@ -781,13 +781,11 @@ display: tags: { } # @todo Lock down access in https://www.drupal.org/node/2983179 widget: - display_plugin: page id: widget display_title: Widget + display_plugin: page position: 2 display_options: - display_extenders: { } - path: admin/content/media-widget fields: media_library_select_form: id: media_library_select_form @@ -796,6 +794,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + plugin_id: media_library_select_form label: '' exclude: false alter: @@ -837,8 +837,6 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - entity_type: media - plugin_id: media_library_select_form rendered_entity: id: rendered_entity table: media @@ -846,6 +844,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + plugin_id: rendered_entity label: '' exclude: false alter: @@ -888,21 +888,52 @@ display: empty_zero: false hide_alter_empty: true view_mode: media_library - entity_type: media - plugin_id: rendered_entity - defaults: - fields: false - access: false - filters: false - filter_groups: false - arguments: false - header: false - css_class: false - display_description: '' access: type: perm options: perm: 'view media' + arguments: + bundle: + id: bundle + table: media_field_data + field: bundle + relationship: none + group_type: group + admin_label: '' + entity_type: media + entity_field: bundle + plugin_id: string + default_action: ignore + exception: + value: all + title_enable: false + title: All + title_enable: false + title: '' + default_argument_type: fixed + default_argument_options: + argument: '' + default_argument_skip_url: false + summary_options: + base_path: '' + count: true + override: false + items_per_page: 24 + summary: + sort_order: asc + number_of_records: 0 + format: default_summary + specify_validation: false + validate: + type: none + fail: 'not found' + validate_options: { } + glossary: false + limit: 0 + case: none + path_case: none + transform_dash: false + break_phrase: false filters: status: id: status @@ -911,6 +942,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: status + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -921,14 +955,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -941,9 +975,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: media - entity_field: status - plugin_id: boolean name: id: name table: media_field_data @@ -951,6 +982,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: name + plugin_id: string operator: contains value: '' group: 1 @@ -961,6 +995,8 @@ display: description: '' use_operator: false operator: name_op + operator_limit_selection: false + operator_list: { } identifier: name required: false remember: false @@ -969,8 +1005,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -983,9 +1017,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: media - entity_field: name - plugin_id: string default_langcode: id: default_langcode table: media_field_data @@ -993,6 +1024,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: default_langcode + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -1023,74 +1057,40 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: media - entity_field: default_langcode - plugin_id: boolean filter_groups: operator: AND groups: 1: AND - arguments: - bundle: - id: bundle - table: media_field_data - field: bundle - relationship: none - group_type: group - admin_label: '' - default_action: ignore - exception: - value: all - title_enable: false - title: All - title_enable: false - title: '' - default_argument_type: fixed - default_argument_options: - argument: '' - default_argument_skip_url: false - summary_options: - base_path: '' - count: true - items_per_page: 24 - override: false - summary: - sort_order: asc - number_of_records: 0 - format: default_summary - specify_validation: false - validate: - type: none - fail: 'not found' - validate_options: { } - glossary: false - limit: 0 - case: none - path_case: none - transform_dash: false - break_phrase: false - entity_type: media - entity_field: bundle - plugin_id: string + defaults: + access: false + css_class: false + fields: false + arguments: false + filters: false + filter_groups: false + header: false + css_class: '' + display_description: '' header: display_link_grid: id: display_link_grid table: views field: display_link - display_id: widget - label: 'Grid' plugin_id: display_link + label: Grid empty: true + display_id: widget display_link_table: id: display_link_table table: views field: display_link - display_id: widget_table - label: 'Table' plugin_id: display_link + label: Table empty: true - css_class: '' + display_id: widget_table rendering_language: '***LANGUAGE_language_interface***' + display_extenders: { } + path: admin/content/media-widget cache_metadata: max-age: -1 contexts: @@ -1101,88 +1101,69 @@ display: - user.permissions tags: { } widget_table: - display_plugin: page id: widget_table display_title: 'Widget (table)' + display_plugin: page position: 3 display_options: - display_extenders: { } - path: admin/content/media-widget-table - style: - type: table - options: - row_class: 'media-library-item media-library-item--table js-media-library-item js-click-to-select' - default_row_class: true - defaults: - style: false - row: false - fields: false - access: false - filters: false - filter_groups: false - arguments: false - header: false - css_class: false - row: - type: fields fields: media_library_select_form: id: media_library_select_form - label: '' table: media field: media_library_select_form relationship: none entity_type: media plugin_id: media_library_select_form - element_wrapper_class: '' + label: '' element_class: '' + element_wrapper_class: '' thumbnail__target_id: id: thumbnail__target_id - label: Thumbnail table: media_field_data field: thumbnail__target_id relationship: none - type: image entity_type: media entity_field: thumbnail plugin_id: field + label: Thumbnail + type: image settings: - image_style: media_library image_link: '' + image_style: media_library name: id: name - label: Name table: media_field_data field: name relationship: none - type: string entity_type: media entity_field: name plugin_id: field + label: Name + type: string settings: link_to_entity: false uid: id: uid - label: Author table: media_field_revision field: uid relationship: none - type: entity_reference_label entity_type: media entity_field: uid plugin_id: field + label: Author + type: entity_reference_label settings: link: true changed: id: changed - label: Updated table: media_field_data field: changed relationship: none - type: timestamp entity_type: media entity_field: changed plugin_id: field + label: Updated + type: timestamp settings: date_format: short custom_date_format: '' @@ -1191,6 +1172,48 @@ display: type: perm options: perm: 'view media' + arguments: + bundle: + id: bundle + table: media_field_data + field: bundle + relationship: none + group_type: group + admin_label: '' + entity_type: media + entity_field: bundle + plugin_id: string + default_action: ignore + exception: + value: all + title_enable: false + title: All + title_enable: false + title: '' + default_argument_type: fixed + default_argument_options: + argument: '' + default_argument_skip_url: false + summary_options: + base_path: '' + count: true + override: false + items_per_page: 24 + summary: + sort_order: asc + number_of_records: 0 + format: default_summary + specify_validation: false + validate: + type: none + fail: 'not found' + validate_options: { } + glossary: false + limit: 0 + case: none + path_case: none + transform_dash: false + break_phrase: false filters: status: id: status @@ -1199,6 +1222,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: status + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -1209,14 +1235,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -1229,9 +1255,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: media - entity_field: status - plugin_id: boolean name: id: name table: media_field_data @@ -1239,6 +1262,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: name + plugin_id: string operator: contains value: '' group: 1 @@ -1249,6 +1275,8 @@ display: description: '' use_operator: false operator: name_op + operator_limit_selection: false + operator_list: { } identifier: name required: false remember: false @@ -1257,8 +1285,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -1271,9 +1297,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: media - entity_field: name - plugin_id: string default_langcode: id: default_langcode table: media_field_data @@ -1281,6 +1304,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: default_langcode + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -1311,74 +1337,48 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: media - entity_field: default_langcode - plugin_id: boolean filter_groups: operator: AND groups: 1: AND - arguments: - bundle: - id: bundle - table: media_field_data - field: bundle - relationship: none - group_type: group - admin_label: '' - default_action: ignore - exception: - value: all - title_enable: false - title: All - title_enable: false - title: '' - default_argument_type: fixed - default_argument_options: - argument: '' - default_argument_skip_url: false - summary_options: - base_path: '' - count: true - items_per_page: 24 - override: false - summary: - sort_order: asc - number_of_records: 0 - format: default_summary - specify_validation: false - validate: - type: none - fail: 'not found' - validate_options: { } - glossary: false - limit: 0 - case: none - path_case: none - transform_dash: false - break_phrase: false - entity_type: media - entity_field: bundle - plugin_id: string + style: + type: table + options: + row_class: 'media-library-item media-library-item--table js-media-library-item js-click-to-select' + default_row_class: true + row: + type: fields + defaults: + access: false + css_class: false + style: false + row: false + fields: false + arguments: false + filters: false + filter_groups: false + header: false + css_class: '' header: display_link_grid: id: display_link_grid table: views field: display_link - display_id: widget - label: 'Grid' plugin_id: display_link + label: Grid empty: true + display_id: widget display_link_table: id: display_link_table table: views field: display_link - display_id: widget_table - label: 'Table' plugin_id: display_link + label: Table empty: true - css_class: '' + display_id: widget_table rendering_language: '***LANGUAGE_language_interface***' + display_extenders: { } + path: admin/content/media-widget-table cache_metadata: max-age: -1 contexts: diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_five.default.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_five.default.yml index 98206155d25b..12aef59bc480 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_five.default.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_five.default.yml @@ -20,11 +20,11 @@ content: field_media_test_oembed_video: type: oembed_textfield weight: 0 + region: content settings: size: 60 placeholder: '' third_party_settings: { } - region: content name: type: string_textfield weight: -5 @@ -41,19 +41,19 @@ content: third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 100 region: content + settings: + display_label: true third_party_settings: { } uid: type: entity_reference_autocomplete weight: 5 + region: content settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' - region: content third_party_settings: { } hidden: { } diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_five.media_library.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_five.media_library.yml index 4a41a6179bbb..2919fae48b42 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_five.media_library.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_five.media_library.yml @@ -11,13 +11,13 @@ bundle: type_five mode: media_library content: field_media_test_oembed_video: + type: oembed_textfield weight: 1 + region: content settings: size: 60 placeholder: '' third_party_settings: { } - type: oembed_textfield - region: content name: type: string_textfield weight: 0 diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_four.default.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_four.default.yml index 5303563d91d6..cb4834ab2a36 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_four.default.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_four.default.yml @@ -21,21 +21,21 @@ content: settings: { } third_party_settings: { } field_media_test_image: + type: image_image weight: 0 + region: content settings: progress_indicator: throbber preview_image_style: medium third_party_settings: { } - type: image_image - region: content field_media_extra_image: + type: image_image weight: 1 + region: content settings: progress_indicator: throbber preview_image_style: medium third_party_settings: { } - type: image_image - region: content name: type: string_textfield weight: -5 @@ -52,19 +52,19 @@ content: third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 100 region: content + settings: + display_label: true third_party_settings: { } uid: type: entity_reference_autocomplete weight: 5 + region: content settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' - region: content third_party_settings: { } hidden: { } diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_four.media_library.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_four.media_library.yml index 0abef4849c17..ff86187b2742 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_four.media_library.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_four.media_library.yml @@ -14,21 +14,21 @@ bundle: type_four mode: media_library content: field_media_test_image: + type: image_image weight: 2 + region: content settings: progress_indicator: throbber preview_image_style: thumbnail third_party_settings: { } - type: image_image - region: content field_media_extra_image: + type: image_image weight: 1 + region: content settings: progress_indicator: throbber preview_image_style: medium third_party_settings: { } - type: image_image - region: content name: type: string_textfield weight: 0 diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_one.default.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_one.default.yml index 2e07c3d2194f..d65edb2d58cd 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_one.default.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_one.default.yml @@ -16,13 +16,13 @@ content: settings: { } third_party_settings: { } field_media_test: + type: string_textfield + weight: 11 + region: content settings: size: 60 placeholder: '' third_party_settings: { } - type: string_textfield - weight: 11 - region: content name: type: string_textfield weight: -5 @@ -34,11 +34,11 @@ content: uid: type: entity_reference_autocomplete weight: 5 + region: content settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' - region: content third_party_settings: { } hidden: { } diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_three.default.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_three.default.yml index c70d348c779a..8e981a1df53d 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_three.default.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_three.default.yml @@ -20,13 +20,13 @@ content: settings: { } third_party_settings: { } field_media_test_image: + type: image_image weight: 0 + region: content settings: progress_indicator: throbber preview_image_style: medium third_party_settings: { } - type: image_image - region: content name: type: string_textfield weight: -5 @@ -43,19 +43,19 @@ content: third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 100 region: content + settings: + display_label: true third_party_settings: { } uid: type: entity_reference_autocomplete weight: 5 + region: content settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' - region: content third_party_settings: { } hidden: { } diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_three.media_library.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_three.media_library.yml index c7fdfc74f9b6..3a4db6f7f1a4 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_three.media_library.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_three.media_library.yml @@ -14,13 +14,13 @@ bundle: type_three mode: media_library content: field_media_test_image: + type: image_image weight: 1 + region: content settings: progress_indicator: throbber preview_image_style: thumbnail third_party_settings: { } - type: image_image - region: content name: type: string_textfield weight: 0 diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_two.default.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_two.default.yml index acc954e827eb..2b330b9fac02 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_two.default.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_two.default.yml @@ -16,13 +16,13 @@ content: settings: { } third_party_settings: { } field_media_test_1: + type: string_textfield + weight: 11 + region: content settings: size: 60 placeholder: '' third_party_settings: { } - type: string_textfield - weight: 11 - region: content name: type: string_textfield weight: -5 @@ -34,11 +34,11 @@ content: uid: type: entity_reference_autocomplete weight: 5 + region: content settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' - region: content third_party_settings: { } hidden: { } diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.node.basic_page.default.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.node.basic_page.default.yml index 0fd908e713ee..7536145f9021 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.node.basic_page.default.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.node.basic_page.default.yml @@ -23,6 +23,7 @@ content: field_twin_media: type: media_library_widget weight: 122 + region: content settings: media_types: - type_three @@ -30,57 +31,56 @@ content: - type_two - type_four third_party_settings: { } - region: content field_single_media_type: type: media_library_widget weight: 124 + region: content settings: { } third_party_settings: { } - region: content field_unlimited_media: type: media_library_widget weight: 121 + region: content settings: { } third_party_settings: { } - region: content field_noadd_media: type: media_library_widget weight: 123 + region: content settings: { } third_party_settings: { } - region: content field_null_types_media: type: media_library_widget weight: 125 + region: content settings: { } third_party_settings: { } - region: content field_empty_types_media: type: media_library_widget weight: 126 + region: content settings: { } third_party_settings: { } - region: content promote: type: boolean_checkbox - settings: - display_label: true weight: 15 region: content + settings: + display_label: true third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 120 region: content + settings: + display_label: true third_party_settings: { } sticky: type: boolean_checkbox - settings: - display_label: true weight: 16 region: content + settings: + display_label: true third_party_settings: { } title: type: string_textfield @@ -93,11 +93,11 @@ content: uid: type: entity_reference_autocomplete weight: 5 + region: content settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' - region: content third_party_settings: { } hidden: { } diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_five.default.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_five.default.yml index fe83091a08f9..4f61361ba1d8 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_five.default.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_five.default.yml @@ -12,39 +12,39 @@ bundle: type_five mode: default content: created: - label: hidden type: timestamp - weight: 0 - region: content + label: hidden settings: date_format: medium custom_date_format: '' timezone: '' third_party_settings: { } + weight: 0 + region: content field_media_test_oembed_video: - weight: 6 + type: oembed label: hidden settings: max_width: 0 max_height: 0 third_party_settings: { } - type: oembed + weight: 6 region: content thumbnail: type: image - weight: 5 label: hidden settings: - image_style: thumbnail image_link: '' - region: content + image_style: thumbnail third_party_settings: { } + weight: 5 + region: content uid: - label: hidden type: author - weight: 0 - region: content + label: hidden settings: { } third_party_settings: { } + weight: 0 + region: content hidden: name: true diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_one.default.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_one.default.yml index 95670b3557bb..0896be0546ae 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_one.default.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_one.default.yml @@ -14,37 +14,37 @@ bundle: type_one mode: default content: created: - label: hidden type: timestamp - weight: 0 - region: content + label: hidden settings: date_format: medium custom_date_format: '' timezone: '' third_party_settings: { } + weight: 0 + region: content field_media_test: + type: string label: above settings: link_to_entity: true third_party_settings: { } - type: string weight: 6 region: content thumbnail: type: image - weight: 5 label: hidden settings: - image_style: thumbnail image_link: '' - region: content + image_style: thumbnail third_party_settings: { } + weight: 5 + region: content uid: - label: hidden type: author - weight: 0 - region: content + label: hidden settings: { } third_party_settings: { } + weight: 0 + region: content hidden: { } diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_one.media_library.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_one.media_library.yml index da7a4e95177b..e2a264a2d7ec 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_one.media_library.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_one.media_library.yml @@ -14,22 +14,22 @@ bundle: type_one mode: media_library content: field_media_test: + type: string label: above settings: link_to_entity: true third_party_settings: { } - type: string weight: 6 region: content thumbnail: type: image - weight: 5 label: hidden settings: - image_style: thumbnail image_link: '' - region: content + image_style: thumbnail third_party_settings: { } + weight: 5 + region: content hidden: created: true name: true diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_three.default.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_three.default.yml index de6650e2b49d..f30978cd40a1 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_three.default.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_three.default.yml @@ -14,39 +14,39 @@ bundle: type_three mode: default content: created: - label: hidden type: timestamp - weight: 0 - region: content + label: hidden settings: date_format: medium custom_date_format: '' timezone: '' third_party_settings: { } + weight: 0 + region: content field_media_test_image: - weight: 6 + type: image label: above settings: - image_style: '' image_link: '' + image_style: '' third_party_settings: { } - type: image + weight: 6 region: content thumbnail: type: image - weight: 5 label: hidden settings: - image_style: thumbnail image_link: '' - region: content + image_style: thumbnail third_party_settings: { } + weight: 5 + region: content uid: - label: hidden type: author - weight: 0 - region: content + label: hidden settings: { } third_party_settings: { } + weight: 0 + region: content hidden: name: true diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_two.default.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_two.default.yml index a884fee4ce93..e41145a9449f 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_two.default.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_two.default.yml @@ -14,37 +14,37 @@ bundle: type_two mode: default content: created: - label: hidden type: timestamp - weight: 0 - region: content + label: hidden settings: date_format: medium custom_date_format: '' timezone: '' third_party_settings: { } + weight: 0 + region: content field_media_test_1: + type: string label: above settings: link_to_entity: false third_party_settings: { } - type: string weight: 6 region: content thumbnail: type: image - weight: 5 label: hidden settings: - image_style: thumbnail image_link: '' - region: content + image_style: thumbnail third_party_settings: { } + weight: 5 + region: content uid: - label: hidden type: author - weight: 0 - region: content + label: hidden settings: { } third_party_settings: { } + weight: 0 + region: content hidden: { } diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_two.media_library.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_two.media_library.yml index e9e1723b25bd..7fa8c291c07f 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_two.media_library.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_two.media_library.yml @@ -14,22 +14,22 @@ bundle: type_two mode: media_library content: field_media_test_1: + type: string label: above settings: link_to_entity: true third_party_settings: { } - type: string weight: 6 region: content thumbnail: type: image - weight: 5 label: hidden settings: - image_style: thumbnail image_link: '' - region: content + image_style: thumbnail third_party_settings: { } + weight: 5 + region: content hidden: created: true name: true diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.node.basic_page.default.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.node.basic_page.default.yml index 2bc3f5c48e2f..8533d1669a02 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.node.basic_page.default.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.node.basic_page.default.yml @@ -15,61 +15,61 @@ mode: default content: field_twin_media: type: entity_reference_entity_view - weight: 102 label: above settings: view_mode: default link: false third_party_settings: { } + weight: 102 region: content field_single_media_type: type: entity_reference_entity_view - weight: 101 label: above settings: view_mode: default link: false third_party_settings: { } + weight: 101 region: content field_unlimited_media: type: entity_reference_entity_view - weight: 101 label: above settings: view_mode: default link: false third_party_settings: { } + weight: 101 region: content field_noadd_media: type: entity_reference_entity_view - weight: 103 label: above settings: view_mode: default link: false third_party_settings: { } + weight: 103 region: content field_empty_types_media: type: entity_reference_entity_view - weight: 104 label: above settings: view_mode: default link: false third_party_settings: { } + weight: 104 region: content field_null_types_media: type: entity_reference_entity_view - weight: 105 label: above settings: view_mode: default link: false third_party_settings: { } + weight: 105 region: content links: - weight: 100 settings: { } third_party_settings: { } + weight: 100 region: content hidden: { } diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.media.type_four.field_media_extra_image.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.media.type_four.field_media_extra_image.yml index 3bd38cb4d201..c8acdb80243a 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.media.type_four.field_media_extra_image.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.media.type_four.field_media_extra_image.yml @@ -10,28 +10,28 @@ id: media.type_three.field_media_extra_image field_name: field_media_extra_image entity_type: media bundle: type_four -label: Extra Image +label: 'Extra Image' description: '' required: false translatable: true default_value: { } default_value_callback: '' settings: - file_extensions: 'jpg' + handler: 'default:file' + handler_settings: { } + file_directory: type-four-extra-dir + file_extensions: jpg + max_filesize: '' + max_resolution: '' + min_resolution: '' alt_field: false alt_field_required: false title_field: false title_field_required: false - max_resolution: '' - min_resolution: '' default_image: uuid: null alt: '' title: '' width: null height: null - file_directory: 'type-four-extra-dir' - max_filesize: '' - handler: 'default:file' - handler_settings: { } field_type: image diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.media.type_four.field_media_test_image.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.media.type_four.field_media_test_image.yml index e1d4e5194de4..a5dd5e68ab87 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.media.type_four.field_media_test_image.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.media.type_four.field_media_test_image.yml @@ -17,21 +17,21 @@ translatable: true default_value: { } default_value_callback: '' settings: - file_extensions: 'jpg' + handler: 'default:file' + handler_settings: { } + file_directory: type-four-dir + file_extensions: jpg + max_filesize: '' + max_resolution: '' + min_resolution: '' alt_field: true alt_field_required: true title_field: false title_field_required: false - max_resolution: '' - min_resolution: '' default_image: uuid: null alt: '' title: '' width: null height: null - file_directory: 'type-four-dir' - max_filesize: '' - handler: 'default:file' - handler_settings: { } field_type: image diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.media.type_three.field_media_test_image.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.media.type_three.field_media_test_image.yml index 27bce7e47806..27e2e4680e5c 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.media.type_three.field_media_test_image.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.media.type_three.field_media_test_image.yml @@ -17,21 +17,21 @@ translatable: true default_value: { } default_value_callback: '' settings: + handler: 'default:file' + handler_settings: { } + file_directory: type-three-dir file_extensions: 'png gif jpg jpeg' + max_filesize: '' + max_resolution: '' + min_resolution: '' alt_field: true alt_field_required: true title_field: false title_field_required: false - max_resolution: '' - min_resolution: '' default_image: uuid: null alt: '' title: '' width: null height: null - file_directory: 'type-three-dir' - max_filesize: '' - handler: 'default:file' - handler_settings: { } field_type: image diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_extra_image.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_extra_image.yml index a81f94ab23c8..1ffd0cdc5518 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_extra_image.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_extra_image.yml @@ -10,16 +10,16 @@ field_name: field_media_extra_image entity_type: media type: image settings: + target_type: file + display_field: false + display_default: false + uri_scheme: public default_image: uuid: null alt: '' title: '' width: null height: null - target_type: file - display_field: false - display_default: false - uri_scheme: public module: image locked: false cardinality: 1 diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test.yml index 40a77916ec7f..5c13412a9ac1 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test.yml @@ -9,8 +9,8 @@ entity_type: media type: string settings: max_length: 255 - is_ascii: false case_sensitive: false + is_ascii: false module: core locked: false cardinality: 1 diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test_1.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test_1.yml index 73b11058e4f1..9945414597f1 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test_1.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test_1.yml @@ -9,8 +9,8 @@ entity_type: media type: string settings: max_length: 255 - is_ascii: false case_sensitive: false + is_ascii: false module: core locked: false cardinality: 1 diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test_image.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test_image.yml index db94e9312ab1..7d0cc1194c8b 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test_image.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test_image.yml @@ -10,16 +10,16 @@ field_name: field_media_test_image entity_type: media type: image settings: + target_type: file + display_field: false + display_default: false + uri_scheme: public default_image: uuid: null alt: '' title: '' width: null height: null - target_type: file - display_field: false - display_default: false - uri_scheme: public module: image locked: false cardinality: 1 diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test_oembed_video.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test_oembed_video.yml index 9dcb13cfc103..646a9809957f 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test_oembed_video.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test_oembed_video.yml @@ -9,8 +9,8 @@ entity_type: media type: string settings: max_length: 255 - is_ascii: false case_sensitive: false + is_ascii: false module: core locked: false cardinality: 1 diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/media.type.type_five.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/media.type.type_five.yml index 6a58c9897c99..aa2d917f43ad 100644 --- a/core/modules/media_library/tests/modules/media_library_test/config/install/media.type.type_five.yml +++ b/core/modules/media_library/tests/modules/media_library_test/config/install/media.type.type_five.yml @@ -8,9 +8,9 @@ source: 'oembed:video' queue_thumbnail_downloads: false new_revision: false source_configuration: + source_field: field_media_test_oembed_video thumbnails_directory: 'public://oembed_thumbnails' providers: - YouTube - Vimeo - source_field: field_media_test_oembed_video field_map: { } diff --git a/core/modules/node/config/optional/views.view.archive.yml b/core/modules/node/config/optional/views.view.archive.yml index 9ac4c063b226..581bc7f9424d 100644 --- a/core/modules/node/config/optional/views.view.archive.yml +++ b/core/modules/node/config/optional/views.view.archive.yml @@ -20,39 +20,18 @@ display: display_plugin: default position: 0 display_options: - query: - type: views_query - options: - query_comment: '' - disable_sql_rewrite: false - distinct: false - replica: false - query_tags: { } title: 'Monthly archive' - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc + fields: { } pager: type: mini options: - items_per_page: 10 offset: 0 - id: 0 + items_per_page: 10 total_pages: 0 + id: 0 + tags: + next: ›› + previous: ‹‹ expose: items_per_page: false items_per_page_label: 'Items per page' @@ -61,60 +40,75 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - tags: - previous: ‹‹ - next: ›› + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } sorts: created: id: created table: node_field_data field: created - order: DESC - plugin_id: date relationship: none group_type: group admin_label: '' - exposed: false + entity_type: node + entity_field: created + plugin_id: date + order: DESC expose: label: '' field_identifier: created + exposed: false granularity: second - entity_type: node - entity_field: created arguments: created_year_month: id: created_year_month table: node_field_data field: created_year_month + entity_type: node + plugin_id: date_year_month default_action: summary exception: title_enable: true title_enable: true title: '{{ arguments.created_year_month }}' default_argument_type: fixed - summary: - sort_order: desc - format: default_summary summary_options: override: true items_per_page: 30 + summary: + sort_order: desc + format: default_summary specify_validation: true - plugin_id: date_year_month - entity_type: node filters: status: id: status table: node_field_data field: status + entity_type: node + entity_field: status + plugin_id: boolean value: '1' group: 0 expose: operator: '0' operator_limit_selection: false operator_list: { } - plugin_id: boolean - entity_type: node - entity_field: status langcode: id: langcode table: node_field_data @@ -122,6 +116,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: langcode + plugin_id: language operator: in value: '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' @@ -133,6 +130,8 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false @@ -140,8 +139,6 @@ display: remember_roles: authenticated: authenticated reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -154,9 +151,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: language - entity_type: node - entity_field: langcode style: type: default options: @@ -168,20 +162,26 @@ display: type: 'entity:node' options: view_mode: teaser + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - fields: { } display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } block_1: id: block_1 @@ -189,38 +189,38 @@ display: display_plugin: block position: 1 display_options: - query: - type: views_query - options: { } - defaults: - arguments: false arguments: created_year_month: id: created_year_month table: node_field_data field: created_year_month + entity_type: node + plugin_id: date_year_month default_action: summary exception: title_enable: true title_enable: true title: '{{ arguments.created_year_month }}' default_argument_type: fixed - summary: - format: default_summary summary_options: items_per_page: 30 + summary: + format: default_summary specify_validation: true - plugin_id: date_year_month - entity_type: node + query: + type: views_query + options: { } + defaults: + arguments: false display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } page_1: id: page_1 @@ -231,14 +231,14 @@ display: query: type: views_query options: { } - path: archive display_extenders: { } + path: archive cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } diff --git a/core/modules/node/config/optional/views.view.content.yml b/core/modules/node/config/optional/views.view.content.yml index 7d69b2763b8b..a784f217b3b8 100644 --- a/core/modules/node/config/optional/views.view.content.yml +++ b/core/modules/node/config/optional/views.view.content.yml @@ -13,134 +13,19 @@ base_table: node_field_data base_field: nid display: default: + id: default + display_title: Default + display_plugin: default + position: 0 display_options: - access: - type: perm - options: - perm: 'access content overview' - cache: - type: tag - query: - type: views_query - exposed_form: - type: basic - options: - submit_button: Filter - reset_button: true - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: full - options: - items_per_page: 50 - tags: - previous: '‹ Previous' - next: 'Next ›' - first: '« First' - last: 'Last »' - style: - type: table - options: - grouping: { } - row_class: '' - default_row_class: true - override: true - sticky: true - caption: '' - summary: '' - description: '' - columns: - node_bulk_form: node_bulk_form - title: title - type: type - name: name - status: status - changed: changed - edit_node: edit_node - delete_node: delete_node - dropbutton: dropbutton - timestamp: title - info: - node_bulk_form: - align: '' - separator: '' - empty_column: false - responsive: '' - title: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - type: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - name: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-low - status: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - changed: - sortable: true - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: priority-low - edit_node: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - delete_node: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - dropbutton: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - timestamp: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - default: changed - empty_table: true - row: - type: fields + title: Content fields: node_bulk_form: id: node_bulk_form table: node field: node_bulk_form + entity_type: node + plugin_id: node_bulk_form label: '' exclude: false alter: @@ -151,12 +36,13 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: node_bulk_form - entity_type: node title: id: title table: node_field_data field: title + entity_type: node + entity_field: title + plugin_id: field label: Title exclude: false alter: @@ -167,12 +53,9 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - entity_type: node - entity_field: title type: string settings: link_to_entity: true - plugin_id: field type: id: type table: node_field_data @@ -180,6 +63,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: type + plugin_id: field label: 'Content type' exclude: false alter: @@ -235,14 +121,14 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: node - entity_field: type - plugin_id: field name: id: name table: users_field_data field: name relationship: uid + entity_type: user + entity_field: name + plugin_id: field label: Author exclude: false alter: @@ -253,14 +139,14 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: field type: user_name - entity_type: user - entity_field: name status: id: status table: node_field_data field: status + entity_type: node + entity_field: status + plugin_id: field label: Status exclude: false alter: @@ -274,15 +160,15 @@ display: type: boolean settings: format: custom - format_custom_true: Published format_custom_false: Unpublished - plugin_id: field - entity_type: node - entity_field: status + format_custom_true: Published changed: id: changed table: node_field_data field: changed + entity_type: node + entity_field: changed + plugin_id: field label: Updated exclude: false alter: @@ -298,9 +184,6 @@ display: date_format: short custom_date_format: '' timezone: '' - plugin_id: field - entity_type: node - entity_field: changed operations: id: operations table: node @@ -308,6 +191,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: entity_operations label: Operations exclude: false alter: @@ -350,7 +234,41 @@ display: empty_zero: false hide_alter_empty: true destination: true - plugin_id: entity_operations + pager: + type: full + options: + items_per_page: 50 + tags: + next: 'Next ›' + previous: '‹ Previous' + first: '« First' + last: 'Last »' + exposed_form: + type: basic + options: + submit_button: Filter + reset_button: true + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content overview' + cache: + type: tag + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + plugin_id: text_custom + empty: true + content: 'No content available.' + sorts: { } + arguments: { } filters: title: id: title @@ -359,6 +277,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: title + plugin_id: string operator: contains value: '' group: 1 @@ -369,6 +290,8 @@ display: description: '' use_operator: false operator: title_op + operator_limit_selection: false + operator_list: { } identifier: title required: false remember: false @@ -377,8 +300,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -391,9 +312,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: string - entity_type: node - entity_field: title type: id: type table: node_field_data @@ -401,6 +319,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: type + plugin_id: bundle operator: in value: { } group: 1 @@ -411,6 +332,8 @@ display: description: '' use_operator: false operator: type_op + operator_limit_selection: false + operator_list: { } identifier: type required: false remember: false @@ -420,8 +343,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -434,9 +355,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: bundle - entity_type: node - entity_field: type status: id: status table: node_field_data @@ -444,6 +362,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: status + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -454,14 +375,14 @@ display: description: '' use_operator: false operator: status_op + operator_limit_selection: false + operator_list: { } identifier: status required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: true group_info: label: 'Published status' @@ -482,9 +403,6 @@ display: title: Unpublished operator: '=' value: '0' - plugin_id: boolean - entity_type: node - entity_field: status langcode: id: langcode table: node_field_data @@ -492,6 +410,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: langcode + plugin_id: language operator: in value: { } group: 1 @@ -502,6 +423,8 @@ display: description: '' use_operator: false operator: langcode_op + operator_limit_selection: false + operator_list: { } identifier: langcode required: false remember: false @@ -511,8 +434,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -525,51 +446,131 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: language - entity_type: node - entity_field: langcode status_extra: id: status_extra table: node_field_data field: status_extra + entity_type: node + plugin_id: node_status operator: '=' value: false - plugin_id: node_status group: 1 - entity_type: node expose: operator_limit_selection: false operator_list: { } - sorts: { } - title: Content - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - empty: true - content: 'No content available.' - plugin_id: text_custom - arguments: { } + filter_groups: + operator: AND + groups: + 1: AND + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + node_bulk_form: node_bulk_form + title: title + type: type + name: name + status: status + changed: changed + edit_node: edit_node + delete_node: delete_node + dropbutton: dropbutton + timestamp: title + default: changed + info: + node_bulk_form: + align: '' + separator: '' + empty_column: false + responsive: '' + title: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + type: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + name: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-low + status: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + changed: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: priority-low + edit_node: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + delete_node: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + dropbutton: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + timestamp: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: true + summary: '' + empty_table: true + caption: '' + description: '' + row: + type: fields + query: + type: views_query relationships: uid: id: uid table: node_field_data field: uid admin_label: author - required: true plugin_id: standard + required: true show_admin_links: false - filter_groups: - operator: AND - groups: - 1: AND display_extenders: { } - display_plugin: default - display_title: Default - id: default - position: 0 cache_metadata: + max-age: 0 contexts: - 'languages:language_content' - 'languages:language_interface' @@ -578,30 +579,30 @@ display: - user - 'user.node_grants:view' - user.permissions - max-age: 0 tags: { } page_1: + id: page_1 + display_title: Page + display_plugin: page + position: 1 display_options: + display_extenders: { } path: admin/content/node menu: type: 'default tab' title: Content description: '' - menu_name: admin weight: -10 + menu_name: admin context: '' tab_options: type: normal title: Content description: 'Find and manage content' - menu_name: admin weight: -10 - display_extenders: { } - display_plugin: page - display_title: Page - id: page_1 - position: 1 + menu_name: admin cache_metadata: + max-age: 0 contexts: - 'languages:language_content' - 'languages:language_interface' @@ -610,5 +611,4 @@ display: - user - 'user.node_grants:view' - user.permissions - max-age: 0 tags: { } diff --git a/core/modules/node/config/optional/views.view.content_recent.yml b/core/modules/node/config/optional/views.view.content_recent.yml index ec80480d247c..70180fde059c 100644 --- a/core/modules/node/config/optional/views.view.content_recent.yml +++ b/core/modules/node/config/optional/views.view.content_recent.yml @@ -13,75 +13,34 @@ base_table: node_field_data base_field: nid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: some - options: - items_per_page: 10 - offset: 0 - style: - type: html_list - options: - grouping: { } - row_class: '' - default_row_class: true - type: ul - wrapper_class: item-list - class: '' - row: - type: fields + title: 'Recent content' fields: title: id: title table: node_field_data field: title + relationship: none + group_type: group + admin_label: '' entity_type: node entity_field: title + plugin_id: field label: '' exclude: false alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false - hide_empty: false - empty_zero: false - relationship: none - group_type: group - admin_label: '' element_type: '' element_class: '' element_label_type: '' @@ -91,11 +50,12 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true type: string settings: link_to_entity: true - plugin_id: field changed: id: changed table: node_field_data @@ -103,6 +63,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: changed + plugin_id: field label: '' exclude: false alter: @@ -157,9 +120,58 @@ display: multi_type: separator separator: ', ' field_api_classes: false + pager: + type: some + options: + offset: 0 + items_per_page: 10 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + plugin_id: text_custom + empty: true + content: 'No content available.' + tokenize: false + sorts: + changed: + id: changed + table: node_field_data + field: changed + relationship: none + group_type: group + admin_label: '' entity_type: node entity_field: changed - plugin_id: field + plugin_id: date + order: DESC + expose: + label: '' + field_identifier: changed + exposed: false + granularity: second + arguments: { } filters: status_extra: id: status_extra @@ -168,6 +180,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: node_status operator: '=' value: false group: 1 @@ -178,14 +192,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -198,8 +212,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - plugin_id: node_status langcode: id: langcode table: node_field_data @@ -207,6 +219,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: langcode + plugin_id: language operator: in value: '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' @@ -218,6 +233,8 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false @@ -225,8 +242,6 @@ display: remember_roles: authenticated: authenticated reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -239,41 +254,25 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: langcode - plugin_id: language - sorts: - changed: - id: changed - table: node_field_data - field: changed - relationship: none - group_type: group - admin_label: '' - order: DESC - exposed: false - expose: - label: '' - field_identifier: changed - granularity: second - entity_type: node - entity_field: changed - plugin_id: date - title: 'Recent content' - header: { } - footer: { } - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - relationship: none - group_type: group - admin_label: '' - empty: true - tokenize: false - content: 'No content available.' - plugin_id: text_custom + style: + type: html_list + options: + grouping: { } + row_class: '' + default_row_class: true + type: ul + wrapper_class: item-list + class: '' + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } relationships: uid: id: uid @@ -282,39 +281,40 @@ display: relationship: none group_type: group admin_label: author - required: true entity_type: node entity_field: uid plugin_id: standard - arguments: { } - display_extenders: { } + required: true use_more: false use_more_always: false use_more_text: More - link_url: '' link_display: '0' + link_url: '' + header: { } + footer: { } + display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - user - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } block_1: - display_plugin: block id: block_1 display_title: Block + display_plugin: block position: 1 display_options: display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - user - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } diff --git a/core/modules/node/config/optional/views.view.frontpage.yml b/core/modules/node/config/optional/views.view.frontpage.yml index 3b0bd8941297..51ef73dcfbb9 100644 --- a/core/modules/node/config/optional/views.view.frontpage.yml +++ b/core/modules/node/config/optional/views.view.frontpage.yml @@ -16,7 +16,44 @@ base_table: node_field_data base_field: nid display: default: + id: default + display_title: Default + display_plugin: default + position: 0 display_options: + title: '' + fields: { } + pager: + type: full + options: + offset: 0 + items_per_page: 10 + total_pages: 0 + id: 0 + tags: + next: 'Next ›' + previous: '‹ Previous' + first: '« First' + last: 'Last »' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + quantity: 9 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc access: type: perm options: @@ -26,28 +63,28 @@ display: options: { } empty: area_text_custom: - admin_label: '' - content: 'No front page content has been created yet.<br/>Follow the <a target="_blank" href="https://www.drupal.org/docs/user_guide/en/index.html">User Guide</a> to start building your site.' - empty: true + id: area_text_custom + table: views field: area_text_custom + relationship: none group_type: group - id: area_text_custom + admin_label: '' + plugin_id: text_custom label: '' - relationship: none - table: views + empty: true + content: 'No front page content has been created yet.<br/>Follow the <a target="_blank" href="https://www.drupal.org/docs/user_guide/en/index.html">User Guide</a> to start building your site.' tokenize: false - plugin_id: text_custom node_listing_empty: - admin_label: '' - empty: true - field: node_listing_empty - group_type: group id: node_listing_empty - label: '' - relationship: none table: node - plugin_id: node_listing_empty + field: node_listing_empty + relationship: none + group_type: group + admin_label: '' entity_type: node + plugin_id: node_listing_empty + label: '' + empty: true title: id: title table: views @@ -55,74 +92,97 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: title label: '' empty: true title: 'Welcome to [site:name]' - plugin_id: title - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc + sorts: + sticky: + id: sticky + table: node_field_data + field: sticky + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: sticky + plugin_id: boolean + order: DESC + expose: + label: '' + field_identifier: sticky + exposed: false + created: + id: created + table: node_field_data + field: created + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: created + plugin_id: date + order: DESC + expose: + label: '' + field_identifier: created + exposed: false + granularity: second + arguments: { } filters: promote: + id: promote + table: node_field_data + field: promote + relationship: none + group_type: group admin_label: '' + entity_type: node + entity_field: promote + plugin_id: boolean + operator: '=' + value: '1' + group: 1 + exposed: false expose: - description: '' - identifier: '' + operator_id: '' label: '' - multiple: false + description: '' + use_operator: false operator: '' - operator_id: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false remember: false + multiple: false remember_roles: authenticated: authenticated - required: false - use_operator: false - operator_limit_selection: false - operator_list: { } - exposed: false - field: promote - group: 1 + is_grouped: false group_info: - default_group: All - default_group_multiple: { } + label: '' description: '' - group_items: { } identifier: '' - label: '' - multiple: false optional: true - remember: false widget: select - group_type: group - id: promote - is_grouped: false - operator: '=' - relationship: none + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + status: + id: status table: node_field_data - value: '1' - plugin_id: boolean + field: status entity_type: node - entity_field: promote - status: + entity_field: status + plugin_id: boolean + value: '1' + group: 1 expose: operator: '' operator_limit_selection: false operator_list: { } - field: status - group: 1 - id: status - table: node_field_data - value: '1' - plugin_id: boolean - entity_type: node - entity_field: status langcode: id: langcode table: node_field_data @@ -130,6 +190,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: langcode + plugin_id: language operator: in value: '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' @@ -141,6 +204,8 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false @@ -148,8 +213,6 @@ display: remember_roles: authenticated: authenticated reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -162,148 +225,85 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: language - entity_type: node - entity_field: langcode - pager: - type: full + style: + type: default options: - items_per_page: 10 - offset: 0 - id: 0 - total_pages: 0 - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: '‹ Previous' - next: 'Next ›' - first: '« First' - last: 'Last »' - quantity: 9 + grouping: { } + row_class: '' + default_row_class: true + uses_fields: false + row: + type: 'entity:node' + options: + view_mode: teaser query: type: views_query options: + query_comment: '' disable_sql_rewrite: false distinct: false replica: false - query_comment: '' query_tags: { } - row: - type: 'entity:node' - options: - view_mode: teaser - sorts: - sticky: - admin_label: '' - expose: - label: '' - field_identifier: sticky - exposed: false - field: sticky - group_type: group - id: sticky - order: DESC - relationship: none - table: node_field_data - plugin_id: boolean - entity_type: node - entity_field: sticky - created: - field: created - id: created - order: DESC - table: node_field_data - plugin_id: date - relationship: none - group_type: group - admin_label: '' - exposed: false - expose: - label: '' - field_identifier: created - granularity: second - entity_type: node - entity_field: created - style: - type: default - options: - grouping: { } - row_class: '' - default_row_class: true - uses_fields: false - title: '' + relationships: { } header: { } footer: { } - relationships: { } - fields: { } - arguments: { } display_extenders: { } - display_plugin: default - display_title: Default - id: default - position: 0 cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } feed_1: - display_plugin: feed id: feed_1 display_title: Feed + display_plugin: feed position: 2 display_options: - sitename_title: true - path: rss.xml - displays: - page_1: page_1 - default: '' pager: type: some options: - items_per_page: 10 offset: 0 + items_per_page: 10 style: type: rss options: - description: '' grouping: { } uses_fields: false + description: '' row: type: node_rss options: relationship: none view_mode: rss display_extenders: { } + path: rss.xml + sitename_title: true + displays: + page_1: page_1 + default: '' cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } page_1: - display_options: - path: node - display_extenders: { } - display_plugin: page - display_title: Page id: page_1 + display_title: Page + display_plugin: page position: 1 + display_options: + display_extenders: { } + path: node cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } diff --git a/core/modules/node/config/optional/views.view.glossary.yml b/core/modules/node/config/optional/views.view.glossary.yml index f1b8b9a16b06..fe5eef1b7228 100644 --- a/core/modules/node/config/optional/views.view.glossary.yml +++ b/core/modules/node/config/optional/views.view.glossary.yml @@ -20,59 +20,17 @@ display: display_plugin: default position: 0 display_options: - query: - type: views_query - options: - query_comment: '' - disable_sql_rewrite: false - distinct: false - replica: false - query_tags: { } - use_ajax: true - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: mini - options: - items_per_page: 36 - offset: 0 - id: 0 - total_pages: 0 - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: ‹‹ - next: ›› fields: title: id: title table: node_field_data field: title - plugin_id: field relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: title + plugin_id: field label: Title exclude: false alter: @@ -114,18 +72,17 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - entity_type: node - entity_field: title name: id: name table: users_field_data field: name - label: Author relationship: uid - plugin_id: field - type: user_name group_type: group admin_label: '' + entity_type: user + entity_field: name + plugin_id: field + label: Author exclude: false alter: alter_text: false @@ -166,22 +123,18 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - entity_type: user - entity_field: name + type: user_name changed: id: changed table: node_field_data field: changed - label: 'Last update' - type: timestamp - settings: - date_format: long - custom_date_format: '' - timezone: '' - plugin_id: field relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: changed + plugin_id: field + label: 'Last update' exclude: false alter: alter_text: false @@ -222,104 +175,96 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - entity_type: node - entity_field: changed + type: timestamp + settings: + date_format: long + custom_date_format: '' + timezone: '' + pager: + type: mini + options: + offset: 0 + items_per_page: 36 + total_pages: 0 + id: 0 + tags: + next: ›› + previous: ‹‹ + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } + sorts: { } arguments: title: id: title table: node_field_data field: title + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: title + plugin_id: string default_action: default exception: title_enable: true + title_enable: false + title: '' default_argument_type: fixed default_argument_options: argument: a + default_argument_skip_url: false + summary_options: { } summary: format: default_summary specify_validation: true + validate: + type: none + fail: 'not found' + validate_options: { } glossary: true limit: 1 case: upper path_case: lower transform_dash: false - plugin_id: string - relationship: none - group_type: group - admin_label: '' - title_enable: false - title: '' - default_argument_skip_url: false - summary_options: { } - validate: - type: none - fail: 'not found' - validate_options: { } break_phrase: false - entity_type: node - entity_field: title - relationships: - uid: - id: uid - table: node_field_data - field: uid - plugin_id: standard - relationship: none - group_type: group - admin_label: author - required: false - style: - type: table - options: - columns: - title: title - name: name - changed: changed - default: title - info: - title: - sortable: true - separator: '' - name: - sortable: true - separator: '' - changed: - sortable: true - separator: '' - override: true - sticky: false - grouping: { } - row_class: '' - default_row_class: true - uses_fields: false - order: asc - summary: '' - empty_table: false - row: - type: fields - options: - inline: { } - separator: '' - hide_empty: false - default_field_elements: true - header: { } - footer: { } - empty: { } - sorts: { } filters: status: - expose: - operator: '' - operator_limit_selection: false - operator_list: { } - field: status - group: 1 id: status table: node_field_data - value: '1' - plugin_id: boolean + field: status entity_type: node entity_field: status + plugin_id: boolean + value: '1' + group: 1 + expose: + operator: '' + operator_limit_selection: false + operator_list: { } langcode: id: langcode table: node_field_data @@ -327,6 +272,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: langcode + plugin_id: language operator: in value: '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' @@ -338,6 +286,8 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false @@ -345,8 +295,6 @@ display: remember_roles: authenticated: authenticated reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -359,11 +307,64 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: language - entity_type: node - entity_field: langcode + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + uses_fields: false + columns: + title: title + name: name + changed: changed + default: title + info: + title: + sortable: true + separator: '' + name: + sortable: true + separator: '' + changed: + sortable: true + separator: '' + override: true + sticky: false + summary: '' + order: asc + empty_table: false + row: + type: fields + options: + default_field_elements: true + inline: { } + separator: '' + hide_empty: false + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: + uid: + id: uid + table: node_field_data + field: uid + relationship: none + group_type: group + admin_label: author + plugin_id: standard + required: false + use_ajax: true + header: { } + footer: { } display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' @@ -371,7 +372,6 @@ display: - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } attachment_1: id: attachment_1 @@ -379,59 +379,60 @@ display: display_plugin: attachment position: 2 display_options: - query: - type: views_query - options: { } pager: type: none options: offset: 0 items_per_page: 0 - defaults: - arguments: false arguments: title: id: title table: node_field_data field: title + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: title + plugin_id: string default_action: summary exception: title_enable: true + title_enable: false + title: '' default_argument_type: fixed default_argument_options: argument: a - summary: - format: unformatted_summary + default_argument_skip_url: false summary_options: items_per_page: 25 inline: true separator: ' | ' + summary: + format: unformatted_summary specify_validation: true + validate: + type: none + fail: 'not found' + validate_options: { } glossary: true limit: 1 case: upper path_case: lower transform_dash: false - plugin_id: string - relationship: none - group_type: group - admin_label: '' - title_enable: false - title: '' - default_argument_skip_url: false - validate: - type: none - fail: 'not found' - validate_options: { } break_phrase: false - entity_type: node - entity_field: title + query: + type: views_query + options: { } + defaults: + arguments: false + display_extenders: { } displays: default: default page_1: page_1 inherit_arguments: false - display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' @@ -439,7 +440,6 @@ display: - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } page_1: id: page_1 @@ -450,6 +450,7 @@ display: query: type: views_query options: { } + display_extenders: { } path: glossary menu: type: normal @@ -457,8 +458,8 @@ display: weight: 0 menu_name: main parent: '' - display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' @@ -466,5 +467,4 @@ display: - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } diff --git a/core/modules/node/tests/modules/node_test_config/config/install/node.type.default.yml b/core/modules/node/tests/modules/node_test_config/config/install/node.type.default.yml index b65ee9faf8fc..cfb29c6d8cbf 100644 --- a/core/modules/node/tests/modules/node_test_config/config/install/node.type.default.yml +++ b/core/modules/node/tests/modules/node_test_config/config/install/node.type.default.yml @@ -1,9 +1,9 @@ -type: default +langcode: en +status: true name: Default +type: default description: 'Default description.' help: '' new_revision: true -display_submitted: true preview_mode: 1 -status: true -langcode: en +display_submitted: true diff --git a/core/modules/options/tests/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml b/core/modules/options/tests/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml index aecc9590fd01..be0227637338 100644 --- a/core/modules/options/tests/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml +++ b/core/modules/options/tests/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml @@ -6,6 +6,7 @@ dependencies: - node.type.options_install_test module: - text +third_party_settings: { } id: node.options_install_test.default targetEntityType: node bundle: options_install_test @@ -37,17 +38,17 @@ content: third_party_settings: { } promote: type: boolean_checkbox - settings: - display_label: true weight: 15 region: content + settings: + display_label: true third_party_settings: { } sticky: type: boolean_checkbox - settings: - display_label: true weight: 16 region: content + settings: + display_label: true third_party_settings: { } body: type: text_textarea_with_summary @@ -60,4 +61,3 @@ content: show_summary: false third_party_settings: { } hidden: { } -third_party_settings: { } diff --git a/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml b/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml index aaea1cb90e9c..c01e00f9eb78 100644 --- a/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml +++ b/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml @@ -7,6 +7,7 @@ dependencies: module: - text - user +third_party_settings: { } id: node.options_install_test.default targetEntityType: node bundle: options_install_test @@ -16,12 +17,11 @@ content: weight: 100 region: content body: - label: hidden type: text_default - weight: 101 - region: content + label: hidden settings: { } third_party_settings: { } + weight: 101 + region: content hidden: langcode: true -third_party_settings: { } diff --git a/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml b/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml index 6e79af94ee5c..91af21c292ce 100644 --- a/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml +++ b/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml @@ -8,6 +8,7 @@ dependencies: module: - text - user +third_party_settings: { } id: node.options_install_test.teaser targetEntityType: node bundle: options_install_test @@ -17,13 +18,12 @@ content: weight: 100 region: content body: - label: hidden type: text_summary_or_trimmed - weight: 101 - region: content + label: hidden settings: trim_length: 600 third_party_settings: { } + weight: 101 + region: content hidden: langcode: true -third_party_settings: { } diff --git a/core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.body.yml b/core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.body.yml index 2078a84485de..8e21dfb0c0b5 100644 --- a/core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.body.yml +++ b/core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.body.yml @@ -4,6 +4,7 @@ dependencies: config: - field.storage.node.body - node.type.options_install_test +third_party_settings: { } id: node.options_install_test.body field_name: body entity_type: node @@ -16,5 +17,4 @@ default_value: { } default_value_callback: '' settings: display_summary: true -third_party_settings: { } field_type: text_with_summary diff --git a/core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.field_options_float.yml b/core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.field_options_float.yml index 39fd25eb88f1..60f7f8f8670b 100644 --- a/core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.field_options_float.yml +++ b/core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.field_options_float.yml @@ -4,6 +4,7 @@ dependencies: config: - field.storage.node.field_options_float - node.type.options_install_test +third_party_settings: { } id: node.options_install_test.field_options_float field_name: field_options_float entity_type: node @@ -15,5 +16,4 @@ translatable: true default_value: { } default_value_callback: '' settings: { } -third_party_settings: { } field_type: list_float diff --git a/core/modules/options/tests/options_config_install_test/config/install/node.type.options_install_test.yml b/core/modules/options/tests/options_config_install_test/config/install/node.type.options_install_test.yml index 5d843bc1fd0a..f77ed98081e4 100644 --- a/core/modules/options/tests/options_config_install_test/config/install/node.type.options_install_test.yml +++ b/core/modules/options/tests/options_config_install_test/config/install/node.type.options_install_test.yml @@ -1,6 +1,7 @@ langcode: en status: true dependencies: { } +third_party_settings: { } name: options_install_test type: options_install_test description: null @@ -8,4 +9,3 @@ help: null new_revision: false preview_mode: 1 display_submitted: true -third_party_settings: { } diff --git a/core/modules/responsive_image/tests/src/Kernel/Migrate/d7/MigrateResponsiveImageStylesTest.php b/core/modules/responsive_image/tests/src/Kernel/Migrate/d7/MigrateResponsiveImageStylesTest.php index 52f3a377cb0b..95b7b31109a9 100644 --- a/core/modules/responsive_image/tests/src/Kernel/Migrate/d7/MigrateResponsiveImageStylesTest.php +++ b/core/modules/responsive_image/tests/src/Kernel/Migrate/d7/MigrateResponsiveImageStylesTest.php @@ -31,14 +31,12 @@ public function setUp(): void { public function testResponsiveImageStyles() { $expected_image_style_mappings = [ [ - 'breakpoint_id' => 'responsive_image.computer', - 'multiplier' => 'multiplier_1', 'image_mapping_type' => 'image_style', 'image_mapping' => 'custom_image_style_1', + 'breakpoint_id' => 'responsive_image.computer', + 'multiplier' => 'multiplier_1', ], [ - 'breakpoint_id' => 'responsive_image.computer', - 'multiplier' => 'multiplier_2', 'image_mapping_type' => 'sizes', 'image_mapping' => [ 'sizes' => '2', @@ -47,10 +45,10 @@ public function testResponsiveImageStyles() { 'custom_image_style_2', ], ], + 'breakpoint_id' => 'responsive_image.computer', + 'multiplier' => 'multiplier_2', ], [ - 'breakpoint_id' => 'responsive_image.computertwo', - 'multiplier' => 'multiplier_2', 'image_mapping_type' => 'sizes', 'image_mapping' => [ 'sizes' => '2', @@ -59,6 +57,8 @@ public function testResponsiveImageStyles() { 'custom_image_style_2', ], ], + 'breakpoint_id' => 'responsive_image.computertwo', + 'multiplier' => 'multiplier_2', ], ]; $this->assertSame($expected_image_style_mappings, ResponsiveImageStyle::load('narrow') diff --git a/core/modules/search/tests/modules/search_extra_type/config/install/search.page.dummy_search_type.yml b/core/modules/search/tests/modules/search_extra_type/config/install/search.page.dummy_search_type.yml index f80bfd9f1775..85c41d1a0594 100644 --- a/core/modules/search/tests/modules/search_extra_type/config/install/search.page.dummy_search_type.yml +++ b/core/modules/search/tests/modules/search_extra_type/config/install/search.page.dummy_search_type.yml @@ -1,7 +1,7 @@ +langcode: en +status: true id: dummy_search_type label: 'Dummy search type' -status: true -langcode: en path: dummy_path plugin: search_extra_type_search configuration: { } diff --git a/core/modules/system/config/install/system.date.yml b/core/modules/system/config/install/system.date.yml index 6470af2f481b..410acafee406 100644 --- a/core/modules/system/config/install/system.date.yml +++ b/core/modules/system/config/install/system.date.yml @@ -1,9 +1,9 @@ +first_day: 0 country: default: '' -first_day: 0 timezone: default: '' user: configurable: true - warn: false default: 0 + warn: false diff --git a/core/modules/system/config/install/system.maintenance.yml b/core/modules/system/config/install/system.maintenance.yml index 40cfeb21a516..2c1a44ba6f89 100644 --- a/core/modules/system/config/install/system.maintenance.yml +++ b/core/modules/system/config/install/system.maintenance.yml @@ -1,2 +1,2 @@ -message: '@site is currently under maintenance. We should be back shortly. Thank you for your patience.' langcode: en +message: '@site is currently under maintenance. We should be back shortly. Thank you for your patience.' diff --git a/core/modules/system/config/install/system.site.yml b/core/modules/system/config/install/system.site.yml index d1ab8de7c6bd..4ec5420035f5 100644 --- a/core/modules/system/config/install/system.site.yml +++ b/core/modules/system/config/install/system.site.yml @@ -1,3 +1,4 @@ +langcode: en uuid: '' name: '' mail: '' @@ -8,5 +9,4 @@ page: front: /user/login admin_compact_mode: false weight_select_max: 100 -langcode: en default_langcode: en diff --git a/core/modules/system/system.post_update.php b/core/modules/system/system.post_update.php index f3f84c507bac..0cc50521c1a4 100644 --- a/core/modules/system/system.post_update.php +++ b/core/modules/system/system.post_update.php @@ -204,3 +204,13 @@ function system_post_update_service_advisory_settings() { function system_post_update_delete_authorize_settings() { \Drupal::configFactory()->getEditable('system.authorize')->delete(); } + +/** + * Sort all configuration according to its schema. + */ +function system_post_update_sort_all_config() { + $factory = \Drupal::configFactory(); + foreach ($factory->listAll() as $name) { + $factory->getEditable($name)->save(); + } +} diff --git a/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml b/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml index 9b9c7447be06..4feb259aa78e 100644 --- a/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml +++ b/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml @@ -13,25 +13,11 @@ base_table: node_field_data base_field: nid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: null display_options: - access: - type: none - cache: - type: tag - query: - type: views_query - exposed_form: - type: basic - pager: - type: full - style: - type: default - row: - type: fields fields: type: id: type @@ -40,6 +26,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: type + plugin_id: field label: '' exclude: true alter: @@ -95,9 +84,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: node - entity_field: type - plugin_id: field title: id: title table: node_field_data @@ -105,6 +91,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: title + plugin_id: field label: '' exclude: false alter: @@ -146,21 +135,14 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: field - entity_type: node - entity_field: title - filters: - status: - value: '1' - table: node_field_data - field: status - id: status - expose: - operator: '' - group: 1 - plugin_id: boolean - entity_type: node - entity_field: status + pager: + type: full + exposed_form: + type: basic + access: + type: none + cache: + type: tag sorts: nid: id: nid @@ -169,13 +151,31 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: nid + plugin_id: standard order: ASC - exposed: false expose: label: '' + exposed: false + filters: + status: + id: status + table: node_field_data + field: status entity_type: node - entity_field: nid - plugin_id: standard + entity_field: status + plugin_id: boolean + value: '1' + group: 1 + expose: + operator: '' + style: + type: default + row: + type: fields + query: + type: views_query display_extenders: { } cache_metadata: max-age: -1 @@ -187,22 +187,21 @@ display: - user.permissions tags: { } entity_reference_1: - display_plugin: entity_reference id: entity_reference_1 display_title: EntityReference + display_plugin: entity_reference position: null display_options: + pager: + type: none + options: + offset: 0 style: type: entity_reference options: grouping: { } search_fields: title: title - pager: - type: none - options: - offset: 0 - display_extenders: { } row: type: entity_reference options: @@ -210,6 +209,7 @@ display: inline: { } separator: ': ' hide_empty: false + display_extenders: { } cache_metadata: max-age: -1 contexts: diff --git a/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference_entity_test.yml b/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference_entity_test.yml index 26fe3c83c172..22b9dc919257 100644 --- a/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference_entity_test.yml +++ b/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference_entity_test.yml @@ -13,36 +13,22 @@ base_table: entity_test base_field: id display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: none - cache: - type: tag - query: - type: views_query - exposed_form: - type: basic - pager: - type: full - style: - type: default - row: - type: fields fields: name: + id: name table: entity_test field: name - id: name - entity_type: null - entity_field: name - plugin_id: field relationship: none group_type: group admin_label: '' + entity_type: null + entity_field: name + plugin_id: field label: '' exclude: false alter: @@ -97,23 +83,37 @@ display: multi_type: separator separator: ', ' field_api_classes: false - filters: { } + pager: + type: full + exposed_form: + type: basic + access: + type: none + cache: + type: tag + empty: { } sorts: { } + arguments: { } + filters: { } + style: + type: default + row: + type: fields + query: + type: views_query + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - arguments: { } display_extenders: { } entity_reference_1: - display_plugin: entity_reference id: entity_reference_1 display_title: EntityReference + display_plugin: entity_reference position: null display_options: - display_extenders: { } style: type: entity_reference options: search_fields: name: name + display_extenders: { } diff --git a/core/modules/system/tests/modules/entity_test/config/install/core.entity_view_mode.entity_test.full.yml b/core/modules/system/tests/modules/entity_test/config/install/core.entity_view_mode.entity_test.full.yml index 321b3721c6b4..292277a3addb 100644 --- a/core/modules/system/tests/modules/entity_test/config/install/core.entity_view_mode.entity_test.full.yml +++ b/core/modules/system/tests/modules/entity_test/config/install/core.entity_view_mode.entity_test.full.yml @@ -1,8 +1,8 @@ -id: entity_test.full -label: Full status: false -cache: true -targetEntityType: entity_test dependencies: module: - entity_test +id: entity_test.full +label: Full +targetEntityType: entity_test +cache: true diff --git a/core/modules/system/tests/modules/entity_test/config/install/core.entity_view_mode.entity_test.test.yml b/core/modules/system/tests/modules/entity_test/config/install/core.entity_view_mode.entity_test.test.yml index 37534a356ba0..46b525bb90af 100644 --- a/core/modules/system/tests/modules/entity_test/config/install/core.entity_view_mode.entity_test.test.yml +++ b/core/modules/system/tests/modules/entity_test/config/install/core.entity_view_mode.entity_test.test.yml @@ -1,8 +1,8 @@ -id: entity_test.test -label: Test status: false -cache: false -targetEntityType: entity_test dependencies: module: - entity_test +id: entity_test.test +label: Test +targetEntityType: entity_test +cache: false diff --git a/core/modules/system/tests/modules/menu_test/config/install/system.menu.changed.yml b/core/modules/system/tests/modules/menu_test/config/install/system.menu.changed.yml index 4530fee37c81..219eef58085e 100644 --- a/core/modules/system/tests/modules/menu_test/config/install/system.menu.changed.yml +++ b/core/modules/system/tests/modules/menu_test/config/install/system.menu.changed.yml @@ -1,5 +1,5 @@ +langcode: en id: changed -label: Changed test menu +label: 'Changed test menu' description: 'The changed menu for menu_test tests.' -langcode: en locked: true diff --git a/core/modules/system/tests/modules/menu_test/config/install/system.menu.original.yml b/core/modules/system/tests/modules/menu_test/config/install/system.menu.original.yml index c3443fd01720..ce2d7a98cad6 100644 --- a/core/modules/system/tests/modules/menu_test/config/install/system.menu.original.yml +++ b/core/modules/system/tests/modules/menu_test/config/install/system.menu.original.yml @@ -1,5 +1,5 @@ +langcode: en id: original -label: Original test menu +label: 'Original test menu' description: 'The original menu for menu_test tests.' -langcode: en locked: true diff --git a/core/modules/system/tests/modules/olivero_test/config/install/core.entity_form_display.contact_message.olivero_test_contact_form.default.yml b/core/modules/system/tests/modules/olivero_test/config/install/core.entity_form_display.contact_message.olivero_test_contact_form.default.yml index 94ea7ba27532..cf928565cb03 100644 --- a/core/modules/system/tests/modules/olivero_test/config/install/core.entity_form_display.contact_message.olivero_test_contact_form.default.yml +++ b/core/modules/system/tests/modules/olivero_test/config/install/core.entity_form_display.contact_message.olivero_test_contact_form.default.yml @@ -11,40 +11,40 @@ mode: default content: copy: weight: 50 + region: content settings: { } third_party_settings: { } - region: content field_multiple_value_form_field: + type: string_textfield weight: 51 + region: content settings: size: 60 placeholder: '' third_party_settings: { } - type: string_textfield - region: content mail: weight: -40 + region: content settings: { } third_party_settings: { } - region: content message: type: string_textarea weight: 0 + region: content settings: rows: 12 placeholder: '' - region: content third_party_settings: { } name: weight: -50 + region: content settings: { } third_party_settings: { } - region: content preview: weight: 40 + region: content settings: { } third_party_settings: { } - region: content subject: type: string_textfield weight: -10 diff --git a/core/modules/system/tests/modules/olivero_test/config/install/core.entity_form_display.node.article.default.yml b/core/modules/system/tests/modules/olivero_test/config/install/core.entity_form_display.node.article.default.yml index 1f7102dd49ed..a0333f736a43 100644 --- a/core/modules/system/tests/modules/olivero_test/config/install/core.entity_form_display.node.article.default.yml +++ b/core/modules/system/tests/modules/olivero_test/config/install/core.entity_form_display.node.article.default.yml @@ -66,24 +66,24 @@ content: third_party_settings: { } promote: type: boolean_checkbox - settings: - display_label: true weight: 15 region: content + settings: + display_label: true third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 120 region: content + settings: + display_label: true third_party_settings: { } sticky: type: boolean_checkbox - settings: - display_label: true weight: 16 region: content + settings: + display_label: true third_party_settings: { } title: type: string_textfield diff --git a/core/modules/system/tests/modules/olivero_test/config/install/core.entity_view_display.comment.comment.default.yml b/core/modules/system/tests/modules/olivero_test/config/install/core.entity_view_display.comment.comment.default.yml index 6ae213d3ee0d..b9fdd2bac71d 100644 --- a/core/modules/system/tests/modules/olivero_test/config/install/core.entity_view_display.comment.comment.default.yml +++ b/core/modules/system/tests/modules/olivero_test/config/install/core.entity_view_display.comment.comment.default.yml @@ -12,12 +12,12 @@ bundle: comment mode: default content: comment_body: - label: hidden type: text_default - weight: 0 - region: content + label: hidden settings: { } third_party_settings: { } + weight: 0 + region: content links: weight: 100 region: content diff --git a/core/modules/system/tests/modules/olivero_test/config/install/core.entity_view_display.node.article.default.yml b/core/modules/system/tests/modules/olivero_test/config/install/core.entity_view_display.node.article.default.yml index 5019b6503d79..653fb9eef53a 100644 --- a/core/modules/system/tests/modules/olivero_test/config/install/core.entity_view_display.node.article.default.yml +++ b/core/modules/system/tests/modules/olivero_test/config/install/core.entity_view_display.node.article.default.yml @@ -21,40 +21,40 @@ mode: default content: body: type: text_default - weight: 0 - region: content + label: hidden settings: { } third_party_settings: { } - label: hidden + weight: 0 + region: content comment: type: comment_default - weight: 110 - region: content label: above settings: view_mode: default pager_id: 0 third_party_settings: { } + weight: 110 + region: content field_image: type: image - weight: -1 - region: content + label: hidden settings: - image_style: large image_link: '' + image_style: large third_party_settings: { } - label: hidden + weight: -1 + region: content field_tags: type: entity_reference_label - weight: 10 - region: content label: above settings: link: true third_party_settings: { } - links: - weight: 100 + weight: 10 region: content + links: settings: { } third_party_settings: { } + weight: 100 + region: content hidden: { } diff --git a/core/modules/system/tests/modules/olivero_test/config/install/core.entity_view_display.node.article.teaser.yml b/core/modules/system/tests/modules/olivero_test/config/install/core.entity_view_display.node.article.teaser.yml index 7b96908bed1c..ffc5ebf81839 100644 --- a/core/modules/system/tests/modules/olivero_test/config/install/core.entity_view_display.node.article.teaser.yml +++ b/core/modules/system/tests/modules/olivero_test/config/install/core.entity_view_display.node.article.teaser.yml @@ -20,29 +20,29 @@ mode: teaser content: body: type: text_summary_or_trimmed - weight: 0 - region: content + label: hidden settings: trim_length: 600 third_party_settings: { } - label: hidden + weight: 0 + region: content field_image: type: image - weight: -1 - region: content + label: hidden settings: - image_style: medium image_link: content + image_style: medium third_party_settings: { } - label: hidden + weight: -1 + region: content field_tags: type: entity_reference_label - weight: 10 - region: content + label: above settings: link: true third_party_settings: { } - label: above + weight: 10 + region: content links: weight: 100 region: content diff --git a/core/modules/system/tests/modules/olivero_test/config/install/field.field.node.article.comment.yml b/core/modules/system/tests/modules/olivero_test/config/install/field.field.node.article.comment.yml index 922015ed9666..cf3b12af98f5 100644 --- a/core/modules/system/tests/modules/olivero_test/config/install/field.field.node.article.comment.yml +++ b/core/modules/system/tests/modules/olivero_test/config/install/field.field.node.article.comment.yml @@ -18,15 +18,15 @@ default_value: - status: 2 cid: 0 - last_comment_name: null last_comment_timestamp: 0 + last_comment_name: null last_comment_uid: 0 comment_count: 0 default_value_callback: '' settings: default_mode: 1 per_page: 50 - form_location: true anonymous: 0 + form_location: true preview: 1 field_type: comment diff --git a/core/modules/system/tests/modules/olivero_test/config/install/field.field.node.article.field_image.yml b/core/modules/system/tests/modules/olivero_test/config/install/field.field.node.article.field_image.yml index b4b1c1466b7d..ab7b9940a74a 100644 --- a/core/modules/system/tests/modules/olivero_test/config/install/field.field.node.article.field_image.yml +++ b/core/modules/system/tests/modules/olivero_test/config/install/field.field.node.article.field_image.yml @@ -17,14 +17,16 @@ translatable: true default_value: { } default_value_callback: '' settings: + handler: 'default:file' + handler_settings: { } file_directory: '[date:custom:Y]-[date:custom:m]' file_extensions: 'png gif jpg jpeg' max_filesize: '' max_resolution: '' min_resolution: '' alt_field: true - title_field: false alt_field_required: true + title_field: false title_field_required: false default_image: uuid: null @@ -32,6 +34,4 @@ settings: title: '' width: null height: null - handler: 'default:file' - handler_settings: { } field_type: image diff --git a/core/modules/system/tests/modules/olivero_test/config/install/field.storage.contact_message.field_multiple_value_form_field.yml b/core/modules/system/tests/modules/olivero_test/config/install/field.storage.contact_message.field_multiple_value_form_field.yml index faef29520340..e45c010b4065 100644 --- a/core/modules/system/tests/modules/olivero_test/config/install/field.storage.contact_message.field_multiple_value_form_field.yml +++ b/core/modules/system/tests/modules/olivero_test/config/install/field.storage.contact_message.field_multiple_value_form_field.yml @@ -9,8 +9,8 @@ entity_type: contact_message type: string settings: max_length: 255 - is_ascii: false case_sensitive: false + is_ascii: false module: core locked: false cardinality: -1 diff --git a/core/modules/system/tests/modules/olivero_test/config/install/field.storage.node.field_image.yml b/core/modules/system/tests/modules/olivero_test/config/install/field.storage.node.field_image.yml index e4da7085460c..a6964d3b0aab 100644 --- a/core/modules/system/tests/modules/olivero_test/config/install/field.storage.node.field_image.yml +++ b/core/modules/system/tests/modules/olivero_test/config/install/field.storage.node.field_image.yml @@ -10,6 +10,9 @@ field_name: field_image entity_type: node type: image settings: + target_type: file + display_field: false + display_default: false uri_scheme: public default_image: uuid: null @@ -17,9 +20,6 @@ settings: title: '' width: null height: null - target_type: file - display_field: false - display_default: false module: image locked: false cardinality: 1 diff --git a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemConfigurationTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemConfigurationTest.php index 7f1543393cc5..56aa2f221a1b 100644 --- a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemConfigurationTest.php +++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemConfigurationTest.php @@ -26,20 +26,20 @@ class MigrateSystemConfigurationTest extends MigrateDrupal6TestBase { 'logging' => 1, ], 'system.date' => [ + 'first_day' => 4, // country is not handled by the migration. 'country' => [ 'default' => '', ], - 'first_day' => 4, // timezone is not handled by the migration. 'timezone' => [ 'default' => 'Europe/Paris', 'user' => [ 'configurable' => FALSE, - // warn is not handled by the migration. - 'warn' => FALSE, // default is not handled by the migration. 'default' => 0, + // warn is not handled by the migration. + 'warn' => FALSE, ], ], ], @@ -60,9 +60,9 @@ class MigrateSystemConfigurationTest extends MigrateDrupal6TestBase { 'error_level' => 'some', ], 'system.maintenance' => [ - 'message' => 'Drupal is currently under maintenance. We should be back shortly. Thank you for your patience.', // langcode is not handled by the migration. 'langcode' => 'en', + 'message' => 'Drupal is currently under maintenance. We should be back shortly. Thank you for your patience.', ], 'system.performance' => [ 'cache' => [ @@ -96,6 +96,8 @@ class MigrateSystemConfigurationTest extends MigrateDrupal6TestBase { ], ], 'system.site' => [ + // langcode and default_langcode are not handled by the migration. + 'langcode' => 'en', // uuid is not handled by the migration. 'uuid' => '', 'name' => 'site_name', @@ -108,8 +110,6 @@ class MigrateSystemConfigurationTest extends MigrateDrupal6TestBase { ], 'admin_compact_mode' => FALSE, 'weight_select_max' => 100, - // langcode and default_langcode are not handled by the migration. - 'langcode' => 'en', 'default_langcode' => 'en', ], ]; diff --git a/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php b/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php index 76b01343b68e..4c5e11e3ac36 100644 --- a/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php +++ b/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php @@ -25,17 +25,17 @@ class MigrateSystemConfigurationTest extends MigrateDrupal7TestBase { 'logging' => 1, ], 'system.date' => [ + 'first_day' => 1, 'country' => [ 'default' => 'US', ], - 'first_day' => 1, 'timezone' => [ 'default' => 'America/Chicago', 'user' => [ 'configurable' => TRUE, - 'warn' => TRUE, // DRUPAL_USER_TIMEZONE_SELECT (D7 API) 'default' => 2, + 'warn' => TRUE, ], ], ], @@ -61,9 +61,9 @@ class MigrateSystemConfigurationTest extends MigrateDrupal7TestBase { ], ], 'system.maintenance' => [ - 'message' => 'This is a custom maintenance mode message.', // langcode is not handled by the migration. 'langcode' => 'en', + 'message' => 'This is a custom maintenance mode message.', ], 'system.performance' => [ 'cache' => [ @@ -97,6 +97,8 @@ class MigrateSystemConfigurationTest extends MigrateDrupal7TestBase { ], ], 'system.site' => [ + // langcode and default_langcode are not handled by the migration. + 'langcode' => 'en', // uuid is not handled by the migration. 'uuid' => '', 'name' => 'The Site Name', @@ -109,8 +111,6 @@ class MigrateSystemConfigurationTest extends MigrateDrupal7TestBase { ], 'admin_compact_mode' => TRUE, 'weight_select_max' => 40, - // langcode and default_langcode are not handled by the migration. - 'langcode' => 'en', 'default_langcode' => 'en', ], ]; diff --git a/core/modules/system/tests/themes/test_basetheme/config/install/core.date_format.fancy.yml b/core/modules/system/tests/themes/test_basetheme/config/install/core.date_format.fancy.yml index b42fbae9628d..ca93fc041024 100644 --- a/core/modules/system/tests/themes/test_basetheme/config/install/core.date_format.fancy.yml +++ b/core/modules/system/tests/themes/test_basetheme/config/install/core.date_format.fancy.yml @@ -1,13 +1,13 @@ # Themes are not supposed to provide/install this kind of config normally. # This exists for testing purposes only. # @see \Drupal\KernelTests\Core\Theme\ThemeInstallerTest -id: fancy -label: 'Fancy date' -status: true langcode: en -locked: false -pattern: 'U' +status: true dependencies: enforced: theme: - test_basetheme +id: fancy +label: 'Fancy date' +locked: false +pattern: U diff --git a/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml b/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml index 0fa147dda59f..ea53e4f31117 100644 --- a/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml +++ b/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml @@ -21,38 +21,17 @@ display: display_plugin: default position: 0 display_options: - query: - type: views_query - options: - query_comment: '' - disable_sql_rewrite: false - distinct: false - replica: false - query_tags: { } - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc + fields: { } pager: type: mini options: - items_per_page: 10 offset: 0 - id: 0 + items_per_page: 10 total_pages: 0 + id: 0 + tags: + next: ›› + previous: ‹‹ expose: items_per_page: false items_per_page_label: 'Items per page' @@ -61,36 +40,51 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - tags: - previous: ‹‹ - next: ›› + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } sorts: sticky: id: sticky table: taxonomy_index field: sticky - order: DESC - plugin_id: standard relationship: none group_type: group admin_label: '' - exposed: false + plugin_id: standard + order: DESC expose: label: '' field_identifier: sticky + exposed: false created: id: created table: taxonomy_index field: created - order: DESC - plugin_id: date relationship: none group_type: group admin_label: '' - exposed: false + plugin_id: date + order: DESC expose: label: '' field_identifier: created + exposed: false granularity: second arguments: tid: @@ -100,6 +94,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: taxonomy_index_tid default_action: 'not found' exception: value: '' @@ -114,8 +109,8 @@ display: summary_options: base_path: '' count: true - items_per_page: 25 override: false + items_per_page: 25 summary: sort_order: asc number_of_records: 0 @@ -125,15 +120,14 @@ display: type: 'entity:taxonomy_term' fail: 'not found' validate_options: + bundles: { } access: true operation: view multiple: 0 - bundles: { } break_phrase: false add_table: false require_value: false reduce_duplicates: false - plugin_id: taxonomy_index_tid filters: langcode: id: langcode @@ -142,6 +136,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: langcode + plugin_id: language operator: in value: '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' @@ -153,6 +150,8 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false @@ -160,8 +159,6 @@ display: remember_roles: authenticated: authenticated reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -174,9 +171,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: language - entity_type: node - entity_field: langcode status: id: status table: taxonomy_index @@ -184,6 +178,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -194,14 +189,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -214,7 +209,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: boolean style: type: default options: @@ -226,6 +220,17 @@ display: type: 'entity:node' options: view_mode: teaser + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } + link_display: page_1 + link_url: '' header: entity_taxonomy_term: id: entity_taxonomy_term @@ -234,27 +239,22 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: entity empty: true - tokenize: true target: '{{ raw_arguments.tid }}' view_mode: full + tokenize: true bypass_access: false - plugin_id: entity footer: { } - empty: { } - relationships: { } - fields: { } display_extenders: { } - link_url: '' - link_display: page_1 cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } feed_1: id: feed_1 @@ -262,37 +262,37 @@ display: display_plugin: feed position: 2 display_options: - query: - type: views_query - options: { } pager: type: some options: - items_per_page: 10 offset: 0 - path: taxonomy/term/%/feed - displays: - page_1: page_1 - default: '0' + items_per_page: 10 style: type: rss options: - description: '' grouping: { } uses_fields: false + description: '' row: type: node_rss options: relationship: none view_mode: default + query: + type: views_query + options: { } display_extenders: { } + path: taxonomy/term/%/feed + displays: + page_1: page_1 + default: '0' cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } page_1: id: page_1 @@ -303,14 +303,14 @@ display: query: type: views_query options: { } - path: taxonomy/term/% display_extenders: { } + path: taxonomy/term/% cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } diff --git a/core/modules/tour/tests/tour_legacy_test/config/install/tour.tour.tour-test-legacy-location.yml b/core/modules/tour/tests/tour_legacy_test/config/install/tour.tour.tour-test-legacy-location.yml index 6de9d25fe601..3113e47e2645 100644 --- a/core/modules/tour/tests/tour_legacy_test/config/install/tour.tour.tour-test-legacy-location.yml +++ b/core/modules/tour/tests/tour_legacy_test/config/install/tour.tour.tour-test-legacy-location.yml @@ -1,30 +1,31 @@ id: tour-test-legacy-location -module: tour_test label: 'Tour test the location property' +module: tour_test routes: - - route_name: some_tour_route + - + route_name: some_tour_route tips: location-test-top: id: location-test-top plugin: text label: 'Top position' - body: 'Top that, top that' location: top + body: 'Top that, top that' location-test-bottom: id: location-test-bottom plugin: text label: 'Bottom position' - body: 'You can give all that you can, but you will never top that' location: bottom + body: 'You can give all that you can, but you will never top that' location-test-left: id: location-test-left plugin: text label: 'Left position' - body: "You can dream until you're blue but you can never top that, huh-huh!" location: left + body: 'You can dream until you''re blue but you can never top that, huh-huh!' location-test-right: id: location-test-right plugin: text label: 'Right position' - body: "I don't really give a [pause] about trying to top that" location: right + body: 'I don''t really give a [pause] about trying to top that' diff --git a/core/modules/tour/tests/tour_legacy_test/config/install/tour.tour.tour-test-legacy.yml b/core/modules/tour/tests/tour_legacy_test/config/install/tour.tour.tour-test-legacy.yml index 8c8e5a72ffc3..2a1b021bbfca 100644 --- a/core/modules/tour/tests/tour_legacy_test/config/install/tour.tour.tour-test-legacy.yml +++ b/core/modules/tour/tests/tour_legacy_test/config/install/tour.tour.tour-test-legacy.yml @@ -1,9 +1,10 @@ +langcode: en id: tour-test-legacy -module: tour_test label: 'Tour test Legacy' -langcode: en +module: tour_test routes: - - route_name: tour_test.legacy + - + route_name: tour_test.legacy tips: tour-test-legacy-1: id: tour-test-legacy-1 diff --git a/core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test-2.yml b/core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test-2.yml index 26cc8dd9e431..5531e285c405 100644 --- a/core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test-2.yml +++ b/core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test-2.yml @@ -1,14 +1,15 @@ +langcode: en id: tour-test-2 -module: tour_test label: 'Tour test english' -langcode: en +module: tour_test routes: - - route_name: tour_test.2 + - + route_name: tour_test.2 tips: tour-test-2: id: tour-test-2 plugin: text label: 'The quick brown fox' - body: 'Per lo più in pianura.' weight: 2 selector: '#tour-test-2' + body: 'Per lo più in pianura.' diff --git a/core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test.yml b/core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test.yml index cfb9b317b0dd..5ca1fa48998b 100644 --- a/core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test.yml +++ b/core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test.yml @@ -1,10 +1,12 @@ +langcode: en id: tour-test -module: tour_test label: 'Tour test english' -langcode: en +module: tour_test routes: - - route_name: tour_test.1 - - route_name: tour_test.3 + - + route_name: tour_test.1 + - + route_name: tour_test.3 route_params: locale: foo tips: @@ -12,16 +14,16 @@ tips: id: tour-test-1 plugin: text label: 'The first tip' - body: 'Is <a href="[site:url]">[site:name]</a> always the best dressed?' weight: 1 selector: '#tour-test-1' + body: 'Is <a href="[site:url]">[site:name]</a> always the best dressed?' tour-test-action: id: tour-test-3 plugin: text label: 'The action' - body: 'The action button of awesome' weight: 2 - selector: '.button-action' + selector: .button-action + body: 'The action button of awesome' tour-test-3: id: tour-test-3 plugin: image @@ -32,6 +34,6 @@ tips: id: tour-test-6 plugin: text label: 'Im a list' - body: '<p>Im all these things:</p><ul><li>Modal</li><li>Awesome</li></ul>' weight: 6 selector: '#tour-test-3' + body: '<p>Im all these things:</p><ul><li>Modal</li><li>Awesome</li></ul>' diff --git a/core/modules/user/config/install/user.mail.yml b/core/modules/user/config/install/user.mail.yml index fd2ab1a93758..382de7a59c07 100644 --- a/core/modules/user/config/install/user.mail.yml +++ b/core/modules/user/config/install/user.mail.yml @@ -1,4 +1,6 @@ +langcode: en cancel_confirm: + subject: 'Account cancellation request for [user:display-name] at [site:name]' body: |- [user:display-name] @@ -13,8 +15,8 @@ cancel_confirm: This link expires in one day and nothing will happen if it is not used. -- [site:name] team - subject: 'Account cancellation request for [user:display-name] at [site:name]' password_reset: + subject: 'Replacement login information for [user:display-name] at [site:name]' body: |- [user:display-name], @@ -27,8 +29,8 @@ password_reset: This link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used. -- [site:name] team - subject: 'Replacement login information for [user:display-name] at [site:name]' register_admin_created: + subject: 'An administrator created an account for you at [site:name]' body: |- [user:display-name], @@ -44,8 +46,8 @@ register_admin_created: password: Your password -- [site:name] team - subject: 'An administrator created an account for you at [site:name]' register_no_approval_required: + subject: 'Account details for [user:display-name] at [site:name]' body: |- [user:display-name], @@ -61,22 +63,22 @@ register_no_approval_required: password: Your password -- [site:name] team - subject: 'Account details for [user:display-name] at [site:name]' register_pending_approval: + subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)' body: |- [user:display-name], Thank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details. -- [site:name] team - subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)' register_pending_approval_admin: + subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)' body: |- [user:display-name] has applied for an account. [user:edit-url] - subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)' status_activated: + subject: 'Account details for [user:display-name] at [site:name] (approved)' body: |- [user:display-name], @@ -94,21 +96,19 @@ status_activated: password: Your password -- [site:name] team - subject: 'Account details for [user:display-name] at [site:name] (approved)' status_blocked: + subject: 'Account details for [user:display-name] at [site:name] (blocked)' body: |- [user:display-name], Your account on [site:name] has been blocked. -- [site:name] team - subject: 'Account details for [user:display-name] at [site:name] (blocked)' status_canceled: + subject: 'Account details for [user:display-name] at [site:name] (canceled)' body: |- [user:display-name], Your account on [site:name] has been canceled. -- [site:name] team - subject: 'Account details for [user:display-name] at [site:name] (canceled)' -langcode: en diff --git a/core/modules/user/config/install/user.settings.yml b/core/modules/user/config/install/user.settings.yml index 8372ccdb73a9..3232949963b3 100644 --- a/core/modules/user/config/install/user.settings.yml +++ b/core/modules/user/config/install/user.settings.yml @@ -1,3 +1,4 @@ +langcode: en anonymous: Anonymous verify_mail: true notify: @@ -13,4 +14,3 @@ register: visitors cancel_method: user_cancel_block password_reset_timeout: 86400 password_strength: true -langcode: en diff --git a/core/modules/user/config/optional/views.view.user_admin_people.yml b/core/modules/user/config/optional/views.view.user_admin_people.yml index 7a6de5a7f3a0..d49503f8148f 100644 --- a/core/modules/user/config/optional/views.view.user_admin_people.yml +++ b/core/modules/user/config/optional/views.view.user_admin_people.yml @@ -12,131 +12,12 @@ base_table: users_field_data base_field: uid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'administer users' - cache: - type: tag - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Filter - reset_button: true - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: full - options: - items_per_page: 50 - offset: 0 - id: 0 - total_pages: 0 - tags: - previous: '‹ Previous' - next: 'Next ›' - first: '« First' - last: 'Last »' - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - quantity: 9 - style: - type: table - options: - grouping: { } - row_class: '' - default_row_class: true - override: true - sticky: false - summary: '' - columns: - user_bulk_form: user_bulk_form - name: name - status: status - rid: rid - created: created - access: access - edit_node: edit_node - dropbutton: dropbutton - info: - user_bulk_form: - align: '' - separator: '' - empty_column: false - responsive: '' - name: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - status: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-low - rid: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-low - created: - sortable: true - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: priority-low - access: - sortable: true - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: priority-low - edit_node: - align: '' - separator: '' - empty_column: false - responsive: priority-low - dropbutton: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - default: created - empty_table: true - row: - type: fields + title: People fields: user_bulk_form: id: user_bulk_form @@ -145,6 +26,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + plugin_id: user_bulk_form label: 'Bulk update' exclude: false alter: @@ -186,8 +69,6 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: user_bulk_form - entity_type: user name: id: name table: users_field_data @@ -195,6 +76,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + entity_field: name + plugin_id: field label: Username exclude: false alter: @@ -236,10 +120,7 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: field type: user_name - entity_type: user - entity_field: name status: id: status table: users_field_data @@ -247,6 +128,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + entity_field: status + plugin_id: field label: Status exclude: false alter: @@ -288,14 +172,11 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: field type: boolean settings: format: custom - format_custom_true: Active format_custom_false: Blocked - entity_type: user - entity_field: status + format_custom_true: Active roles_target_id: id: roles_target_id table: user__roles @@ -303,6 +184,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: user_roles label: Roles exclude: false alter: @@ -346,7 +228,6 @@ display: hide_alter_empty: true type: ul separator: ', ' - plugin_id: user_roles created: id: created table: users_field_data @@ -354,6 +235,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + entity_field: created + plugin_id: field label: 'Member for' exclude: false alter: @@ -400,9 +284,6 @@ display: future_format: '@interval' past_format: '@interval' granularity: 2 - plugin_id: field - entity_type: user - entity_field: created access: id: access table: users_field_data @@ -410,6 +291,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + entity_field: access + plugin_id: field label: 'Last access' exclude: false alter: @@ -456,9 +340,6 @@ display: future_format: '@interval hence' past_format: '@interval ago' granularity: 2 - plugin_id: field - entity_type: user - entity_field: access operations: id: operations table: users @@ -466,6 +347,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + plugin_id: entity_operations label: Operations exclude: false alter: @@ -508,8 +391,6 @@ display: empty_zero: false hide_alter_empty: true destination: true - entity_type: user - plugin_id: entity_operations mail: id: mail table: users_field_data @@ -517,6 +398,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + entity_field: mail + plugin_id: field label: '' exclude: true alter: @@ -571,9 +455,72 @@ display: multi_type: separator separator: ', ' field_api_classes: false - plugin_id: field + pager: + type: full + options: + offset: 0 + items_per_page: 50 + total_pages: 0 + id: 0 + tags: + next: 'Next ›' + previous: '‹ Previous' + first: '« First' + last: 'Last »' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + quantity: 9 + exposed_form: + type: basic + options: + submit_button: Filter + reset_button: true + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'administer users' + cache: + type: tag + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + plugin_id: text_custom + empty: true + content: 'No people available.' + tokenize: false + sorts: + created: + id: created + table: users_field_data + field: created + relationship: none + group_type: group + admin_label: '' entity_type: user - entity_field: mail + entity_field: created + plugin_id: date + order: DESC + expose: + label: '' + field_identifier: created + exposed: false + granularity: second filters: combine: id: combine @@ -582,6 +529,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: combine operator: contains value: '' group: 1 @@ -592,6 +540,8 @@ display: description: '' use_operator: false operator: combine_op + operator_limit_selection: false + operator_list: { } identifier: user required: false remember: false @@ -600,8 +550,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -617,7 +565,6 @@ display: fields: name: name mail: mail - plugin_id: combine status: id: status table: users_field_data @@ -625,6 +572,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + entity_field: status + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -635,6 +585,8 @@ display: description: '' use_operator: false operator: status_op + operator_limit_selection: false + operator_list: { } identifier: status required: false remember: false @@ -643,8 +595,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: true group_info: label: Status @@ -665,9 +615,6 @@ display: title: Blocked operator: '=' value: '0' - plugin_id: boolean - entity_type: user - entity_field: status roles_target_id: id: roles_target_id table: user__roles @@ -675,6 +622,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: user_roles operator: or value: { } group: 1 @@ -685,6 +633,8 @@ display: description: '' use_operator: false operator: roles_target_id_op + operator_limit_selection: false + operator_list: { } identifier: role required: false remember: false @@ -694,8 +644,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -709,7 +657,6 @@ display: default_group_multiple: { } group_items: { } reduce_duplicates: false - plugin_id: user_roles permission: id: permission table: user__roles @@ -717,6 +664,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: user_permissions operator: or value: { } group: 1 @@ -727,6 +675,8 @@ display: description: '' use_operator: false operator: permission_op + operator_limit_selection: false + operator_list: { } identifier: permission required: false remember: false @@ -736,8 +686,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -751,7 +699,6 @@ display: default_group_multiple: { } group_items: { } reduce_duplicates: false - plugin_id: user_permissions default_langcode: id: default_langcode table: users_field_data @@ -759,6 +706,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + entity_field: default_langcode + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -769,14 +719,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -789,9 +739,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: user - entity_field: default_langcode - plugin_id: boolean uid_raw: id: uid_raw table: users_field_data @@ -799,6 +746,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + plugin_id: numeric operator: '!=' value: min: '' @@ -812,14 +761,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -832,93 +781,144 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: numeric - entity_type: user - sorts: - created: - id: created - table: users_field_data - field: created - relationship: none - group_type: group - admin_label: '' - order: DESC - exposed: false - expose: - label: '' - field_identifier: created - granularity: second - plugin_id: date - entity_type: user - entity_field: created - title: People - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - relationship: none - group_type: group - admin_label: '' - empty: true - tokenize: false - content: 'No people available.' - plugin_id: text_custom + filter_groups: + operator: AND + groups: + 1: AND + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + user_bulk_form: user_bulk_form + name: name + status: status + rid: rid + created: created + access: access + edit_node: edit_node + dropbutton: dropbutton + default: created + info: + user_bulk_form: + align: '' + separator: '' + empty_column: false + responsive: '' + name: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + status: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-low + rid: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-low + created: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: priority-low + access: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: priority-low + edit_node: + align: '' + separator: '' + empty_column: false + responsive: priority-low + dropbutton: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: false + summary: '' + empty_table: true + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + css_class: '' + use_ajax: false + group_by: false + show_admin_links: true use_more: false use_more_always: false use_more_text: more + link_display: page_1 + link_url: '' display_comment: '' - use_ajax: false hide_attachment_summary: false - show_admin_links: true - group_by: false - link_url: '' - link_display: page_1 - css_class: '' - filter_groups: - operator: AND - groups: - 1: AND display_extenders: { } cache_metadata: + max-age: 0 contexts: - 'languages:language_content' - 'languages:language_interface' - url - url.query_args - user.permissions - max-age: 0 tags: { } page_1: - display_plugin: page id: page_1 display_title: Page + display_plugin: page position: 1 display_options: - path: admin/people/list + defaults: + show_admin_links: false show_admin_links: false + display_extenders: { } + path: admin/people/list menu: type: 'default tab' title: List description: 'Find and manage people interacting with your site.' - menu_name: admin weight: -10 + menu_name: admin context: '' tab_options: type: normal title: People description: 'Manage user accounts, roles, and permissions.' - menu_name: admin weight: 0 - defaults: - show_admin_links: false - display_extenders: { } + menu_name: admin cache_metadata: + max-age: 0 contexts: - 'languages:language_content' - 'languages:language_interface' - url - url.query_args - user.permissions - max-age: 0 tags: { } diff --git a/core/modules/user/config/optional/views.view.who_s_new.yml b/core/modules/user/config/optional/views.view.who_s_new.yml index 1054052d3aa7..ef81f19213b4 100644 --- a/core/modules/user/config/optional/views.view.who_s_new.yml +++ b/core/modules/user/config/optional/views.view.who_s_new.yml @@ -12,68 +12,34 @@ base_table: users_field_data base_field: uid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: some - options: - items_per_page: 5 - offset: 0 - style: - type: html_list - row: - type: fields + title: 'Who''s new' fields: name: id: name table: users_field_data field: name - label: '' + relationship: none + group_type: group + admin_label: '' + entity_type: user + entity_field: name plugin_id: field - type: user_name + label: '' + exclude: false alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false - hide_empty: false - empty_zero: false - relationship: none - group_type: group - admin_label: '' - exclude: false element_type: '' element_class: '' element_label_type: '' @@ -83,23 +49,65 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true + type: user_name + pager: + type: some + options: + offset: 0 + items_per_page: 5 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } + sorts: + created: + id: created + table: users_field_data + field: created + relationship: none + group_type: group + admin_label: '' entity_type: user - entity_field: name + entity_field: created + plugin_id: date + order: DESC + expose: + label: '' + field_identifier: created + exposed: false + granularity: second + arguments: { } filters: status: - value: '1' + id: status table: users_field_data field: status - id: status + entity_type: user + entity_field: status + plugin_id: boolean + value: '1' + group: 1 expose: operator: '0' operator_limit_selection: false operator_list: { } - group: 1 - plugin_id: boolean - entity_type: user - entity_field: status access: id: access table: users_field_data @@ -107,6 +115,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + entity_field: access + plugin_id: date operator: '>' value: min: '' @@ -121,14 +132,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -141,54 +152,43 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: date - entity_type: user - entity_field: access - sorts: - created: - id: created - table: users_field_data - field: created - relationship: none - group_type: group - admin_label: '' - order: DESC - exposed: false - expose: - label: '' - field_identifier: created - granularity: second - plugin_id: date - entity_type: user - entity_field: created - title: 'Who''s new' + style: + type: html_list + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - arguments: { } display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - user.permissions - max-age: -1 tags: { } block_1: - display_plugin: block id: block_1 display_title: 'Who''s new' + display_plugin: block position: 1 display_options: display_description: 'A list of new users' + display_extenders: { } block_description: 'Who''s new' block_category: User - display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - user.permissions - max-age: -1 tags: { } diff --git a/core/modules/user/config/optional/views.view.who_s_online.yml b/core/modules/user/config/optional/views.view.who_s_online.yml index 2b40ccf43d7e..d9dc4d51cce2 100644 --- a/core/modules/user/config/optional/views.view.who_s_online.yml +++ b/core/modules/user/config/optional/views.view.who_s_online.yml @@ -12,75 +12,34 @@ base_table: users_field_data base_field: uid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access user profiles' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: some - options: - items_per_page: 10 - offset: 0 - style: - type: html_list - options: - grouping: { } - row_class: '' - default_row_class: true - type: ul - wrapper_class: item-list - class: '' - row: - type: fields + title: 'Who''s online' fields: name: id: name table: users_field_data field: name - label: '' + relationship: none + group_type: group + admin_label: '' + entity_type: user + entity_field: name plugin_id: field - type: user_name + label: '' + exclude: false alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false - hide_empty: false - empty_zero: false - relationship: none - group_type: group - admin_label: '' - exclude: false element_type: '' element_class: '' element_label_type: '' @@ -90,23 +49,76 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true + type: user_name + pager: + type: some + options: + offset: 0 + items_per_page: 10 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access user profiles' + cache: + type: tag + options: { } + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + plugin_id: text_custom + empty: true + content: 'There are currently 0 users online.' + tokenize: false + sorts: + access: + id: access + table: users_field_data + field: access + relationship: none + group_type: group + admin_label: '' entity_type: user - entity_field: name + entity_field: access + plugin_id: date + order: DESC + expose: + label: '' + field_identifier: access + exposed: false + granularity: second + arguments: { } filters: status: - value: '1' + id: status table: users_field_data field: status - id: status + entity_type: user + entity_field: status + plugin_id: boolean + value: '1' + group: 1 expose: operator: '0' operator_limit_selection: false operator_list: { } - group: 1 - plugin_id: boolean - entity_type: user - entity_field: status access: id: access table: users_field_data @@ -114,6 +126,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + entity_field: access + plugin_id: date operator: '>=' value: min: '' @@ -128,6 +143,8 @@ display: description: 'A user is considered online for this long after they have last viewed a page.' use_operator: false operator: access_op + operator_limit_selection: false + operator_list: { } identifier: access required: false remember: false @@ -136,8 +153,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -150,27 +165,26 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: date - entity_type: user - entity_field: access - sorts: - access: - id: access - table: users_field_data - field: access - order: DESC - relationship: none - group_type: group - admin_label: '' - exposed: false - expose: - label: '' - field_identifier: access - granularity: second - plugin_id: date - entity_type: user - entity_field: access - title: 'Who''s online' + style: + type: html_list + options: + grouping: { } + row_class: '' + default_row_class: true + type: ul + wrapper_class: item-list + class: '' + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: result: id: result @@ -179,45 +193,31 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: result empty: false content: 'There are currently @total users online.' - plugin_id: result footer: { } - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - relationship: none - group_type: group - admin_label: '' - empty: true - tokenize: false - content: 'There are currently 0 users online.' - plugin_id: text_custom - relationships: { } - arguments: { } display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - user.permissions - max-age: -1 tags: { } who_s_online_block: - display_plugin: block id: who_s_online_block display_title: 'Who''s online' + display_plugin: block position: 1 display_options: - block_description: 'Who''s online' display_description: 'A list of users that are currently logged in.' display_extenders: { } + block_description: 'Who''s online' cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - user.permissions - max-age: -1 tags: { } diff --git a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserFloodTest.php b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserFloodTest.php index 11459ce7ede7..c9344958798b 100644 --- a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserFloodTest.php +++ b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserFloodTest.php @@ -25,14 +25,14 @@ protected function setUp(): void { */ public function testMigration() { $expected = [ + '_core' => [ + 'default_config_hash' => 'UYfMzeP1S8jKm9PSvxf7nQNe8DsNS-3bc2WSNNXBQWs', + ], 'uid_only' => TRUE, 'ip_limit' => 30, 'ip_window' => 7200, 'user_limit' => 22, 'user_window' => 86400, - '_core' => [ - 'default_config_hash' => 'UYfMzeP1S8jKm9PSvxf7nQNe8DsNS-3bc2WSNNXBQWs', - ], ]; $this->assertSame($expected, $this->config('user.flood')->get()); } diff --git a/core/modules/views/tests/modules/action_bulk_test/config/install/views.view.test_bulk_form.yml b/core/modules/views/tests/modules/action_bulk_test/config/install/views.view.test_bulk_form.yml index 6fb7ae1e5b08..17665763fbd0 100644 --- a/core/modules/views/tests/modules/action_bulk_test/config/install/views.view.test_bulk_form.yml +++ b/core/modules/views/tests/modules/action_bulk_test/config/install/views.view.test_bulk_form.yml @@ -13,72 +13,32 @@ base_table: node_field_data base_field: nid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: null display_options: - access: - type: perm - cache: - type: tag - query: - type: views_query - exposed_form: - type: basic - pager: - type: full - options: - items_per_page: 10 - style: - type: table - options: - grouping: { } - row_class: '' - default_row_class: true - override: true - sticky: false - summary: '' - columns: - title: title - node_bulk_form: node_bulk_form - info: - title: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - bulk_form: - align: '' - separator: '' - empty_column: false - responsive: '' - default: '' - empty_table: false - row: - type: fields + title: form fields: title: id: title table: node_field_data field: title + entity_type: node + entity_field: title + plugin_id: field label: '' alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false hide_empty: false empty_zero: false - plugin_id: field - entity_type: node - entity_field: title node_bulk_form: id: node_bulk_form table: node @@ -86,6 +46,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: node_bulk_form label: 'Bulk form' exclude: false alter: @@ -127,54 +89,92 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: node_bulk_form - entity_type: node - filters: - status: - value: '1' - table: node_field_data - field: status - id: status - expose: - operator: '' - group: 1 - plugin_id: boolean - entity_type: node - entity_field: status + pager: + type: full + options: + items_per_page: 10 + exposed_form: + type: basic + access: + type: perm + cache: + type: tag sorts: created: id: created table: node_field_data field: created - order: DESC - plugin_id: date entity_type: node entity_field: created - title: form + plugin_id: date + order: DESC + 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: '' + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + title: title + node_bulk_form: node_bulk_form + default: '' + info: + title: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + bulk_form: + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: false + summary: '' + empty_table: false + row: + type: fields + query: + type: views_query page_1: - display_plugin: page id: page_1 display_title: Page + display_plugin: page position: null display_options: path: test_bulk_form page_2: - display_plugin: page id: page_2 display_title: Page + display_plugin: page position: null display_options: - path: test_bulk_form_empty - defaults: - style: false - empty: false - style: - type: default empty: area: id: area table: views field: area_text_custom + plugin_id: text_custom empty: true content: 'This view is empty.' - plugin_id: text_custom + style: + type: default + defaults: + empty: false + style: false + path: test_bulk_form_empty diff --git a/core/modules/views/tests/modules/views_test_cacheable_metadata_calculation/config/install/views.view.test_cacheable_metadata_calculation.yml b/core/modules/views/tests/modules/views_test_cacheable_metadata_calculation/config/install/views.view.test_cacheable_metadata_calculation.yml index a64742a46fb2..fb7af90c3b5b 100644 --- a/core/modules/views/tests/modules/views_test_cacheable_metadata_calculation/config/install/views.view.test_cacheable_metadata_calculation.yml +++ b/core/modules/views/tests/modules/views_test_cacheable_metadata_calculation/config/install/views.view.test_cacheable_metadata_calculation.yml @@ -12,23 +12,23 @@ base_table: users_field_data base_field: uid display: default: + id: default + display_title: Default + display_plugin: default + position: 0 display_options: + pager: + type: full + exposed_form: + type: basic access: type: test_cacheable_metadata_access cache: type: tag - exposed_form: - type: basic - pager: - type: full style: type: default row: type: fields - display_plugin: default - display_title: Default - id: default - position: 0 cache_metadata: max-age: -1 contexts: diff --git a/core/modules/views_ui/config/optional/tour.tour.views-ui.yml b/core/modules/views_ui/config/optional/tour.tour.views-ui.yml index 09a6b2a5c0db..644b51f03659 100644 --- a/core/modules/views_ui/config/optional/tour.tour.views-ui.yml +++ b/core/modules/views_ui/config/optional/tour.tour.views-ui.yml @@ -16,70 +16,70 @@ tips: id: views-main plugin: text label: 'Manage view settings' - body: 'View or edit the configuration.' weight: 1 + body: 'View or edit the configuration.' views-ui-displays: id: views-ui-displays plugin: text label: 'Displays in this view' - body: 'A display is a way of outputting the results, e.g., as a page or a block. A view can contain multiple displays, which are listed here. The active display is highlighted.' weight: 2 selector: '#views-display-top' + body: 'A display is a way of outputting the results, e.g., as a page or a block. A view can contain multiple displays, which are listed here. The active display is highlighted.' views-ui-view-admin: id: views-ui-view-admin plugin: text label: 'View administration' - body: 'Perform administrative tasks, including adding a description and creating a clone. Click the drop-down button to view the available options.' weight: 3 position: right selector: '#views-display-extra-actions' + body: 'Perform administrative tasks, including adding a description and creating a clone. Click the drop-down button to view the available options.' views-ui-format: id: views-ui-format plugin: text label: 'Output format' - body: 'Choose how to output results. E.g., choose <em>Content</em> to output each item completely, using your configured display settings. Or choose <em>Fields</em>, which allows you to output only specific fields for each result. Additional formats can be added by installing modules to <em>extend</em> Drupal''s base functionality.' weight: 4 - selector: '.views-ui-display-tab-bucket.format' + selector: .views-ui-display-tab-bucket.format + body: 'Choose how to output results. E.g., choose <em>Content</em> to output each item completely, using your configured display settings. Or choose <em>Fields</em>, which allows you to output only specific fields for each result. Additional formats can be added by installing modules to <em>extend</em> Drupal''s base functionality.' views-ui-fields: id: views-ui-fields plugin: text label: Fields - body: 'If this view uses fields, they are listed here. You can click on a field to configure it.' weight: 5 - selector: '.views-ui-display-tab-bucket.field' + selector: .views-ui-display-tab-bucket.field + body: 'If this view uses fields, they are listed here. You can click on a field to configure it.' views-ui-filter: id: views-ui-filter plugin: text label: 'Filter your view' - body: 'Add filters to limit the results in the output. E.g., to only show content that is <em>published</em>, you would add a filter for <em>Published</em> and select <em>Yes</em>.' weight: 6 - selector: '.views-ui-display-tab-bucket.filter' + selector: .views-ui-display-tab-bucket.filter + body: 'Add filters to limit the results in the output. E.g., to only show content that is <em>published</em>, you would add a filter for <em>Published</em> and select <em>Yes</em>.' views-ui-filter-operations: id: views-ui-filter-operations plugin: text label: 'Filter actions' - body: 'Add, rearrange or remove filters.' weight: 7 selector: '.views-ui-display-tab-bucket.filter .dropbutton-widget' + body: 'Add, rearrange or remove filters.' views-ui-sorts: id: views-ui-sorts plugin: text label: 'Sort Criteria' - body: 'Control the order in which the results are output. Click on an active sort rule to configure it.' weight: 8 - selector: '.views-ui-display-tab-bucket.sort' + selector: .views-ui-display-tab-bucket.sort + body: 'Control the order in which the results are output. Click on an active sort rule to configure it.' views-ui-sorts-operations: id: views-ui-sorts-operations plugin: text label: 'Sort actions' - body: 'Add, rearrange or remove sorting rules.' weight: 9 selector: '.views-ui-display-tab-bucket.sort .dropbutton-widget' + body: 'Add, rearrange or remove sorting rules.' views-ui-preview: id: views-ui-preview plugin: text label: Preview - body: 'Show a preview of the view output.' weight: 10 position: right selector: '#preview-submit' + body: 'Show a preview of the view output.' diff --git a/core/modules/views_ui/tests/modules/views_ui_test/config/install/views.view.sa_contrib_2013_035.yml b/core/modules/views_ui/tests/modules/views_ui_test/config/install/views.view.sa_contrib_2013_035.yml index e1d7eaacf18b..80029fb944ac 100644 --- a/core/modules/views_ui/tests/modules/views_ui_test/config/install/views.view.sa_contrib_2013_035.yml +++ b/core/modules/views_ui/tests/modules/views_ui_test/config/install/views.view.sa_contrib_2013_035.yml @@ -13,54 +13,12 @@ base_table: node_field_data base_field: nid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: none - options: - offset: 0 - style: - type: default - options: - grouping: { } - row_class: '' - default_row_class: true - uses_fields: false - row: - type: fields - options: - inline: { } - separator: '' - hide_empty: false - default_field_elements: true + title: '<marquee>VIEWS TITLE</marquee>' fields: title: id: title @@ -69,6 +27,9 @@ display: relationship: none group_type: group admin_label: '<marquee>test</marquee>' + entity_type: node + entity_field: title + plugin_id: field label: '' exclude: false alter: @@ -110,9 +71,6 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: field - entity_type: node - entity_field: title title_1: id: title_1 table: node_field_data @@ -120,6 +78,9 @@ display: relationship: none group_type: group admin_label: '<script>alert("XSS")</script>' + entity_type: node + entity_field: title + plugin_id: field label: '' exclude: false alter: @@ -161,11 +122,54 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: field - entity_type: node - entity_field: title - filters: { } + pager: + type: none + options: + offset: 0 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } sorts: { } + arguments: { } + filters: { } + style: + type: default + options: + grouping: { } + row_class: '' + default_row_class: true + uses_fields: false + row: + type: fields + options: + default_field_elements: true + inline: { } + separator: '' + hide_empty: false + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: area: id: area @@ -173,14 +177,10 @@ display: field: area plugin_id: text footer: { } - empty: { } - relationships: { } - arguments: { } - title: '<marquee>VIEWS TITLE</marquee>' page_1: - display_plugin: page id: page_1 display_title: Page + display_plugin: page position: 2 display_options: path: foobar diff --git a/core/profiles/demo_umami/config/install/block.block.seven_breadcrumbs.yml b/core/profiles/demo_umami/config/install/block.block.seven_breadcrumbs.yml index edbdfbd125df..fb8fc8add236 100644 --- a/core/profiles/demo_umami/config/install/block.block.seven_breadcrumbs.yml +++ b/core/profiles/demo_umami/config/install/block.block.seven_breadcrumbs.yml @@ -14,6 +14,6 @@ plugin: system_breadcrumb_block settings: id: system_breadcrumb_block label: Breadcrumbs - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/profiles/demo_umami/config/install/block.block.seven_content.yml b/core/profiles/demo_umami/config/install/block.block.seven_content.yml index d92214c67df9..3a68a17efa69 100644 --- a/core/profiles/demo_umami/config/install/block.block.seven_content.yml +++ b/core/profiles/demo_umami/config/install/block.block.seven_content.yml @@ -14,6 +14,6 @@ plugin: system_main_block settings: id: system_main_block label: 'Main page content' - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/profiles/demo_umami/config/install/block.block.seven_help.yml b/core/profiles/demo_umami/config/install/block.block.seven_help.yml index 9a4e2180f3b2..7baf371d5740 100644 --- a/core/profiles/demo_umami/config/install/block.block.seven_help.yml +++ b/core/profiles/demo_umami/config/install/block.block.seven_help.yml @@ -14,6 +14,6 @@ plugin: help_block settings: id: help_block label: Help - provider: help label_display: '0' + provider: help visibility: { } diff --git a/core/profiles/demo_umami/config/install/block.block.seven_local_actions.yml b/core/profiles/demo_umami/config/install/block.block.seven_local_actions.yml index 61cdb177c832..a4df3350b5f0 100644 --- a/core/profiles/demo_umami/config/install/block.block.seven_local_actions.yml +++ b/core/profiles/demo_umami/config/install/block.block.seven_local_actions.yml @@ -12,6 +12,6 @@ plugin: local_actions_block settings: id: local_actions_block label: 'Primary admin actions' - provider: core label_display: '0' + provider: core visibility: { } diff --git a/core/profiles/demo_umami/config/install/block.block.seven_messages.yml b/core/profiles/demo_umami/config/install/block.block.seven_messages.yml index f7b6038b230e..992033d5e715 100644 --- a/core/profiles/demo_umami/config/install/block.block.seven_messages.yml +++ b/core/profiles/demo_umami/config/install/block.block.seven_messages.yml @@ -14,6 +14,6 @@ plugin: system_messages_block settings: id: system_messages_block label: 'Status messages' - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/profiles/demo_umami/config/install/block.block.seven_page_title.yml b/core/profiles/demo_umami/config/install/block.block.seven_page_title.yml index 56df293f3bb3..7a8579a329e3 100644 --- a/core/profiles/demo_umami/config/install/block.block.seven_page_title.yml +++ b/core/profiles/demo_umami/config/install/block.block.seven_page_title.yml @@ -12,6 +12,6 @@ plugin: page_title_block settings: id: page_title_block label: 'Page title' - provider: core label_display: '0' + provider: core visibility: { } diff --git a/core/profiles/demo_umami/config/install/block.block.seven_primary_local_tasks.yml b/core/profiles/demo_umami/config/install/block.block.seven_primary_local_tasks.yml index d0017c2c8fe1..de72133937f9 100644 --- a/core/profiles/demo_umami/config/install/block.block.seven_primary_local_tasks.yml +++ b/core/profiles/demo_umami/config/install/block.block.seven_primary_local_tasks.yml @@ -12,8 +12,8 @@ plugin: local_tasks_block settings: id: local_tasks_block label: 'Primary tabs' - provider: core label_display: '0' + provider: core primary: true secondary: false visibility: { } diff --git a/core/profiles/demo_umami/config/install/block.block.seven_secondary_local_tasks.yml b/core/profiles/demo_umami/config/install/block.block.seven_secondary_local_tasks.yml index 33391991c7db..6478c6726c93 100644 --- a/core/profiles/demo_umami/config/install/block.block.seven_secondary_local_tasks.yml +++ b/core/profiles/demo_umami/config/install/block.block.seven_secondary_local_tasks.yml @@ -12,8 +12,8 @@ plugin: local_tasks_block settings: id: local_tasks_block label: 'Secondary tabs' - provider: core label_display: '0' + provider: core primary: false secondary: true visibility: { } diff --git a/core/profiles/demo_umami/config/install/block.block.umami_account_menu.yml b/core/profiles/demo_umami/config/install/block.block.umami_account_menu.yml index df9d54d7b7f3..87e9ca03047b 100644 --- a/core/profiles/demo_umami/config/install/block.block.umami_account_menu.yml +++ b/core/profiles/demo_umami/config/install/block.block.umami_account_menu.yml @@ -16,8 +16,8 @@ plugin: 'system_menu_block:account' settings: id: 'system_menu_block:account' label: 'User account menu' - provider: system label_display: '0' + provider: system level: 1 depth: 1 expand_all_items: false diff --git a/core/profiles/demo_umami/config/install/block.block.umami_branding.yml b/core/profiles/demo_umami/config/install/block.block.umami_branding.yml index 9414ee7f16c7..c5d4d071f32d 100644 --- a/core/profiles/demo_umami/config/install/block.block.umami_branding.yml +++ b/core/profiles/demo_umami/config/install/block.block.umami_branding.yml @@ -14,8 +14,8 @@ plugin: system_branding_block settings: id: system_branding_block label: 'Site branding' - provider: system label_display: '0' + provider: system use_site_logo: true use_site_name: false use_site_slogan: true diff --git a/core/profiles/demo_umami/config/install/block.block.umami_breadcrumbs.yml b/core/profiles/demo_umami/config/install/block.block.umami_breadcrumbs.yml index 277ebc721626..3907896e00f4 100644 --- a/core/profiles/demo_umami/config/install/block.block.umami_breadcrumbs.yml +++ b/core/profiles/demo_umami/config/install/block.block.umami_breadcrumbs.yml @@ -14,11 +14,11 @@ plugin: system_breadcrumb_block settings: id: system_breadcrumb_block label: Breadcrumbs - provider: system label_display: '0' + provider: system visibility: request_path: id: request_path - pages: '<front>' negate: true context_mapping: { } + pages: '<front>' diff --git a/core/profiles/demo_umami/config/install/block.block.umami_content.yml b/core/profiles/demo_umami/config/install/block.block.umami_content.yml index ac2245f9f033..b7014f14d2d9 100644 --- a/core/profiles/demo_umami/config/install/block.block.umami_content.yml +++ b/core/profiles/demo_umami/config/install/block.block.umami_content.yml @@ -14,6 +14,6 @@ plugin: system_main_block settings: id: system_main_block label: 'Main page content' - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/profiles/demo_umami/config/install/block.block.umami_footer.yml b/core/profiles/demo_umami/config/install/block.block.umami_footer.yml index 4b0303e3b246..91aacef37d43 100644 --- a/core/profiles/demo_umami/config/install/block.block.umami_footer.yml +++ b/core/profiles/demo_umami/config/install/block.block.umami_footer.yml @@ -16,8 +16,8 @@ plugin: 'system_menu_block:footer' settings: id: 'system_menu_block:footer' label: 'Tell us what you think' - provider: system label_display: '1' + provider: system level: 1 depth: 0 expand_all_items: false diff --git a/core/profiles/demo_umami/config/install/block.block.umami_help.yml b/core/profiles/demo_umami/config/install/block.block.umami_help.yml index 171306506d0c..a2beba03bca7 100644 --- a/core/profiles/demo_umami/config/install/block.block.umami_help.yml +++ b/core/profiles/demo_umami/config/install/block.block.umami_help.yml @@ -14,6 +14,6 @@ plugin: help_block settings: id: help_block label: Help - provider: help label_display: '0' + provider: help visibility: { } diff --git a/core/profiles/demo_umami/config/install/block.block.umami_languageswitcher.yml b/core/profiles/demo_umami/config/install/block.block.umami_languageswitcher.yml index e54620e4a14d..c31e779486a5 100644 --- a/core/profiles/demo_umami/config/install/block.block.umami_languageswitcher.yml +++ b/core/profiles/demo_umami/config/install/block.block.umami_languageswitcher.yml @@ -14,6 +14,6 @@ plugin: 'language_block:language_interface' settings: id: 'language_block:language_interface' label: 'Language switcher' - provider: language label_display: '0' + provider: language visibility: { } diff --git a/core/profiles/demo_umami/config/install/block.block.umami_local_tasks.yml b/core/profiles/demo_umami/config/install/block.block.umami_local_tasks.yml index 031d5d70d688..825a72dfa1d4 100644 --- a/core/profiles/demo_umami/config/install/block.block.umami_local_tasks.yml +++ b/core/profiles/demo_umami/config/install/block.block.umami_local_tasks.yml @@ -12,8 +12,8 @@ plugin: local_tasks_block settings: id: local_tasks_block label: Tabs - provider: core label_display: '0' + provider: core primary: true secondary: true visibility: { } diff --git a/core/profiles/demo_umami/config/install/block.block.umami_main_menu.yml b/core/profiles/demo_umami/config/install/block.block.umami_main_menu.yml index c267a7f54ed4..f75b01ab2398 100644 --- a/core/profiles/demo_umami/config/install/block.block.umami_main_menu.yml +++ b/core/profiles/demo_umami/config/install/block.block.umami_main_menu.yml @@ -16,8 +16,8 @@ plugin: 'system_menu_block:main' settings: id: 'system_menu_block:main' label: 'Main navigation' - provider: system label_display: '0' + provider: system level: 1 depth: 1 expand_all_items: false diff --git a/core/profiles/demo_umami/config/install/block.block.umami_messages.yml b/core/profiles/demo_umami/config/install/block.block.umami_messages.yml index a802e7d05a1e..96a0bd53fd2c 100644 --- a/core/profiles/demo_umami/config/install/block.block.umami_messages.yml +++ b/core/profiles/demo_umami/config/install/block.block.umami_messages.yml @@ -14,6 +14,6 @@ plugin: system_messages_block settings: id: system_messages_block label: 'Status messages' - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/profiles/demo_umami/config/install/block.block.umami_page_title.yml b/core/profiles/demo_umami/config/install/block.block.umami_page_title.yml index 4266f111ab55..048f9a690651 100644 --- a/core/profiles/demo_umami/config/install/block.block.umami_page_title.yml +++ b/core/profiles/demo_umami/config/install/block.block.umami_page_title.yml @@ -14,11 +14,11 @@ plugin: page_title_block settings: id: page_title_block label: 'Page title' - provider: core label_display: '0' + provider: core visibility: request_path: id: request_path - pages: '<front>' negate: true context_mapping: { } + pages: '<front>' diff --git a/core/profiles/demo_umami/config/install/block.block.umami_search.yml b/core/profiles/demo_umami/config/install/block.block.umami_search.yml index 4acc93c78e1a..b16b1c6da773 100644 --- a/core/profiles/demo_umami/config/install/block.block.umami_search.yml +++ b/core/profiles/demo_umami/config/install/block.block.umami_search.yml @@ -14,7 +14,7 @@ plugin: search_form_block settings: id: search_form_block label: Search - provider: search label_display: visible + provider: search page_id: node_search visibility: { } diff --git a/core/profiles/demo_umami/config/install/block.block.umami_views_block__articles_aside_block_1.yml b/core/profiles/demo_umami/config/install/block.block.umami_views_block__articles_aside_block_1.yml index a6859df75cda..8fc0cd3a9a96 100644 --- a/core/profiles/demo_umami/config/install/block.block.umami_views_block__articles_aside_block_1.yml +++ b/core/profiles/demo_umami/config/install/block.block.umami_views_block__articles_aside_block_1.yml @@ -17,15 +17,15 @@ plugin: 'views_block:articles_aside-block_1' settings: id: 'views_block:articles_aside-block_1' label: '' - provider: views label_display: visible + provider: views views_label: '' items_per_page: none visibility: - entity_bundle:node: - id: entity_bundle:node - bundles: - article: article + 'entity_bundle:node': + id: 'entity_bundle:node' negate: false context_mapping: node: '@node.node_route_context:node' + bundles: + article: article diff --git a/core/profiles/demo_umami/config/install/block.block.umami_views_block__promoted_items_block_1.yml b/core/profiles/demo_umami/config/install/block.block.umami_views_block__promoted_items_block_1.yml index 17c8ae23fe20..21a2e54d50ea 100644 --- a/core/profiles/demo_umami/config/install/block.block.umami_views_block__promoted_items_block_1.yml +++ b/core/profiles/demo_umami/config/install/block.block.umami_views_block__promoted_items_block_1.yml @@ -17,13 +17,13 @@ plugin: 'views_block:promoted_items-block_1' settings: id: 'views_block:promoted_items-block_1' label: '' - provider: views label_display: '0' + provider: views views_label: '' items_per_page: none visibility: request_path: id: request_path - pages: '<front>' negate: false context_mapping: { } + pages: '<front>' diff --git a/core/profiles/demo_umami/config/install/block.block.umami_views_block__recipe_collections_block.yml b/core/profiles/demo_umami/config/install/block.block.umami_views_block__recipe_collections_block.yml index 057373496e3a..979c049b14b5 100644 --- a/core/profiles/demo_umami/config/install/block.block.umami_views_block__recipe_collections_block.yml +++ b/core/profiles/demo_umami/config/install/block.block.umami_views_block__recipe_collections_block.yml @@ -16,8 +16,8 @@ plugin: 'views_block:recipe_collections-block' settings: id: 'views_block:recipe_collections-block' label: '' - provider: views label_display: visible + provider: views views_label: '' items_per_page: none visibility: { } diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.banner_block.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.banner_block.default.yml index ccacac9995e6..a15fc89314fd 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.banner_block.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.banner_block.default.yml @@ -16,36 +16,36 @@ bundle: banner_block mode: default content: field_content_link: + type: link_default weight: 4 + region: content settings: placeholder_url: '' placeholder_title: '' third_party_settings: { } - type: link_default - region: content field_media_image: type: media_library_widget weight: 6 + region: content settings: media_types: { } third_party_settings: { } - region: content field_summary: + type: string_textarea weight: 3 + region: content settings: rows: 5 placeholder: '' third_party_settings: { } - type: string_textarea - region: content field_title: + type: string_textfield weight: 1 + region: content settings: size: 60 placeholder: '' third_party_settings: { } - type: string_textfield - region: content info: type: string_textfield weight: 0 diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.basic.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.basic.default.yml index 1f08c728c171..3cc105a91e54 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.basic.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.basic.default.yml @@ -38,8 +38,8 @@ content: third_party_settings: { } translation: weight: 10 + region: content settings: { } third_party_settings: { } - region: content hidden: moderation_state: true diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.disclaimer_block.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.disclaimer_block.default.yml index 14bc219b9b85..f3a9ae6ab25d 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.disclaimer_block.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.disclaimer_block.default.yml @@ -13,21 +13,21 @@ bundle: disclaimer_block mode: default content: field_copyright: + type: text_textarea weight: 28 + region: content settings: rows: 5 placeholder: '' third_party_settings: { } - type: text_textarea - region: content field_disclaimer: + type: text_textarea weight: 27 + region: content settings: rows: 5 placeholder: '' third_party_settings: { } - type: text_textarea - region: content info: type: string_textfield weight: -5 @@ -45,8 +45,8 @@ content: third_party_settings: { } translation: weight: 10 + region: content settings: { } third_party_settings: { } - region: content hidden: moderation_state: true diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.footer_promo_block.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.footer_promo_block.default.yml index 336985a8175b..8593290a1d5a 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.footer_promo_block.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.block_content.footer_promo_block.default.yml @@ -16,36 +16,36 @@ bundle: footer_promo_block mode: default content: field_content_link: + type: link_default weight: 4 + region: content settings: placeholder_url: '' placeholder_title: '' third_party_settings: { } - type: link_default - region: content field_media_image: + type: media_library_widget weight: 6 + region: content settings: media_types: { } third_party_settings: { } - type: media_library_widget - region: content field_summary: + type: string_textarea weight: 3 + region: content settings: rows: 5 placeholder: '' third_party_settings: { } - type: string_textarea - region: content field_title: + type: string_textfield weight: 1 + region: content settings: size: 60 placeholder: '' third_party_settings: { } - type: string_textfield - region: content info: type: string_textfield weight: 0 diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.contact_message.feedback.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.contact_message.feedback.default.yml index 140fb222491c..49dffcc828e0 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.contact_message.feedback.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.contact_message.feedback.default.yml @@ -28,10 +28,10 @@ content: message: type: string_textarea weight: 3 + region: content settings: rows: 12 placeholder: '' - region: content third_party_settings: { } name: weight: 0 diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.media.audio.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.media.audio.default.yml index ac659d316055..8a4b960ce518 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.media.audio.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.media.audio.default.yml @@ -19,12 +19,12 @@ content: settings: { } third_party_settings: { } field_media_audio_file: + type: file_generic weight: 0 + region: content settings: progress_indicator: throbber third_party_settings: { } - type: file_generic - region: content langcode: type: language_select weight: 2 @@ -40,20 +40,20 @@ content: third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 100 region: content + settings: + display_label: true third_party_settings: { } uid: type: entity_reference_autocomplete weight: 5 + region: content settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' - region: content third_party_settings: { } hidden: moderation_state: true diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.media.document.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.media.document.default.yml index 971b5c28ebdc..fa0da0605557 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.media.document.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.media.document.default.yml @@ -19,12 +19,12 @@ content: settings: { } third_party_settings: { } field_media_document: - settings: - progress_indicator: throbber - third_party_settings: { } type: file_generic weight: 0 region: content + settings: + progress_indicator: throbber + third_party_settings: { } langcode: type: language_select weight: 2 @@ -40,20 +40,20 @@ content: third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 100 region: content + settings: + display_label: true third_party_settings: { } uid: type: entity_reference_autocomplete weight: 5 + region: content settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' - region: content third_party_settings: { } hidden: moderation_state: true diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.media.image.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.media.image.default.yml index eb3032bf8db0..11b8c8e34bfb 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.media.image.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.media.image.default.yml @@ -20,13 +20,13 @@ content: settings: { } third_party_settings: { } field_media_image: + type: image_image + weight: 1 + region: content settings: progress_indicator: throbber preview_image_style: thumbnail third_party_settings: { } - type: image_image - weight: 1 - region: content langcode: type: language_select weight: 2 @@ -50,10 +50,10 @@ content: third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 7 region: content + settings: + display_label: true third_party_settings: { } translation: weight: 6 @@ -63,12 +63,12 @@ content: uid: type: entity_reference_autocomplete weight: 4 + region: content settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' - region: content third_party_settings: { } hidden: moderation_state: true diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.media.remote_video.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.media.remote_video.default.yml index 9ff0e4538269..8bd323161e99 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.media.remote_video.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.media.remote_video.default.yml @@ -21,11 +21,11 @@ content: field_media_oembed_video: type: oembed_textfield weight: 0 + region: content settings: size: 60 placeholder: '' third_party_settings: { } - region: content langcode: type: language_select weight: 2 @@ -41,20 +41,20 @@ content: third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 100 region: content + settings: + display_label: true third_party_settings: { } uid: type: entity_reference_autocomplete weight: 4 + region: content settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' - region: content third_party_settings: { } hidden: moderation_state: true diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.media.video.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.media.video.default.yml index b9340255334a..64760c1b4268 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.media.video.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.media.video.default.yml @@ -19,12 +19,12 @@ content: settings: { } third_party_settings: { } field_media_video_file: + type: file_generic weight: 0 + region: content settings: progress_indicator: throbber third_party_settings: { } - type: file_generic - region: content langcode: type: language_select weight: 2 @@ -40,20 +40,20 @@ content: third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 100 region: content + settings: + display_label: true third_party_settings: { } uid: type: entity_reference_autocomplete weight: 5 + region: content settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' - region: content third_party_settings: { } hidden: moderation_state: true diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.node.article.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.node.article.default.yml index dc4f3a67b8c7..1294ccd21da0 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.node.article.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.node.article.default.yml @@ -35,12 +35,12 @@ content: settings: { } third_party_settings: { } field_media_image: + type: media_library_widget weight: 5 + region: content settings: media_types: { } third_party_settings: { } - type: media_library_widget - region: content field_tags: type: entity_reference_autocomplete_tags weight: 3 @@ -72,24 +72,24 @@ content: third_party_settings: { } promote: type: boolean_checkbox - settings: - display_label: true weight: 8 region: content + settings: + display_label: true third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 11 region: content + settings: + display_label: true third_party_settings: { } sticky: type: boolean_checkbox - settings: - display_label: true weight: 9 region: content + settings: + display_label: true third_party_settings: { } title: type: string_textfield diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.node.page.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.node.page.default.yml index e339e5e368ac..b0a871e0f235 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.node.page.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.node.page.default.yml @@ -52,24 +52,24 @@ content: third_party_settings: { } promote: type: boolean_checkbox - settings: - display_label: true weight: 3 region: content + settings: + display_label: true third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 7 region: content + settings: + display_label: true third_party_settings: { } sticky: type: boolean_checkbox - settings: - display_label: true weight: 4 region: content + settings: + display_label: true third_party_settings: { } title: type: string_textfield @@ -81,9 +81,9 @@ content: third_party_settings: { } translation: weight: 10 + region: content settings: { } third_party_settings: { } - region: content uid: type: entity_reference_autocomplete weight: 1 diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.node.recipe.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.node.recipe.default.yml index 5686fa2fce65..bd9f57c3160f 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.node.recipe.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.node.recipe.default.yml @@ -32,79 +32,79 @@ content: settings: { } third_party_settings: { } field_cooking_time: + type: number weight: 3 + region: content settings: placeholder: '' third_party_settings: { } - type: number - region: content field_difficulty: + type: options_select weight: 5 + region: content settings: { } third_party_settings: { } - type: options_select - region: content field_ingredients: + type: string_textfield weight: 11 + region: content settings: size: 60 placeholder: '' third_party_settings: { } - type: string_textfield - region: content field_media_image: type: media_library_widget weight: 9 + region: content settings: media_types: { } third_party_settings: { } - region: content field_number_of_servings: + type: number weight: 4 + region: content settings: placeholder: '' third_party_settings: { } - type: number - region: content field_preparation_time: + type: number weight: 2 + region: content settings: placeholder: '' third_party_settings: { } - type: number - region: content field_recipe_category: + type: options_buttons weight: 6 + region: content settings: { } third_party_settings: { } - type: options_buttons - region: content field_recipe_instruction: + type: text_textarea weight: 13 + region: content settings: rows: 5 placeholder: '' third_party_settings: { } - type: text_textarea - region: content field_summary: + type: text_textarea weight: 10 + region: content settings: rows: 5 placeholder: '' third_party_settings: { } - type: text_textarea - region: content field_tags: + type: entity_reference_autocomplete_tags weight: 7 + region: content settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' third_party_settings: { } - type: entity_reference_autocomplete_tags - region: content langcode: type: language_select weight: 1 @@ -132,24 +132,24 @@ content: third_party_settings: { } promote: type: boolean_checkbox - settings: - display_label: true weight: 16 region: content + settings: + display_label: true third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 19 region: content + settings: + display_label: true third_party_settings: { } sticky: type: boolean_checkbox - settings: - display_label: true weight: 17 region: content + settings: + display_label: true third_party_settings: { } title: type: string_textfield @@ -167,11 +167,11 @@ content: uid: type: entity_reference_autocomplete weight: 14 + region: content settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' - region: content third_party_settings: { } hidden: { } diff --git a/core/profiles/demo_umami/config/install/core.entity_form_display.user.user.default.yml b/core/profiles/demo_umami/config/install/core.entity_form_display.user.user.default.yml index bcd230c637f2..3540e4d59bdb 100644 --- a/core/profiles/demo_umami/config/install/core.entity_form_display.user.user.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_form_display.user.user.default.yml @@ -26,11 +26,11 @@ content: region: content user_picture: type: image_image + weight: -1 + region: content settings: progress_indicator: throbber preview_image_style: thumbnail third_party_settings: { } - weight: -1 - region: content hidden: langcode: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.banner_block.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.banner_block.default.yml index cdeba466e1f0..26b01cedd130 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.banner_block.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.banner_block.default.yml @@ -15,7 +15,7 @@ bundle: banner_block mode: default content: field_content_link: - weight: 4 + type: link label: hidden settings: trim_length: 80 @@ -24,31 +24,31 @@ content: rel: '' target: '' third_party_settings: { } - type: link + weight: 4 region: content field_media_image: type: entity_reference_entity_view - weight: 1 label: hidden settings: view_mode: scale_crop_7_3_large link: false third_party_settings: { } + weight: 1 region: content field_summary: - weight: 3 + type: basic_string label: hidden settings: { } third_party_settings: { } - type: basic_string + weight: 3 region: content field_title: - weight: 2 + type: string label: hidden settings: link_to_entity: false third_party_settings: { } - type: string + weight: 2 region: content hidden: langcode: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.basic.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.basic.default.yml index 057e01cc93c9..98fff02c4b15 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.basic.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.basic.default.yml @@ -12,11 +12,11 @@ bundle: basic mode: default content: body: - label: hidden type: text_default - weight: 0 - region: content + label: hidden settings: { } third_party_settings: { } + weight: 0 + region: content hidden: langcode: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.disclaimer_block.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.disclaimer_block.default.yml index 92cef668805a..0c03defd3698 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.disclaimer_block.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.disclaimer_block.default.yml @@ -13,18 +13,18 @@ bundle: disclaimer_block mode: default content: field_copyright: - weight: 2 + type: text_default label: hidden settings: { } third_party_settings: { } - type: text_default + weight: 2 region: content field_disclaimer: - weight: 1 + type: text_default label: hidden settings: { } third_party_settings: { } - type: text_default + weight: 1 region: content hidden: langcode: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.footer_promo_block.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.footer_promo_block.default.yml index a2f2262290c2..2eb2ccc483a4 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.footer_promo_block.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.block_content.footer_promo_block.default.yml @@ -15,7 +15,7 @@ bundle: footer_promo_block mode: default content: field_content_link: - weight: 4 + type: link label: hidden settings: trim_length: 80 @@ -24,31 +24,31 @@ content: rel: '' target: '' third_party_settings: { } - type: link + weight: 4 region: content field_media_image: - weight: 1 + type: entity_reference_entity_view label: hidden settings: view_mode: medium_8_7 link: false third_party_settings: { } - type: entity_reference_entity_view + weight: 1 region: content field_summary: - weight: 3 + type: basic_string label: hidden settings: { } third_party_settings: { } - type: basic_string + weight: 3 region: content field_title: - weight: 2 + type: string label: hidden settings: link_to_entity: false third_party_settings: { } - type: string + weight: 2 region: content hidden: langcode: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.media.audio.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.media.audio.default.yml index 7de868a262ea..423be9932211 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.media.audio.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.media.audio.default.yml @@ -13,7 +13,6 @@ mode: default content: field_media_audio_file: type: file_audio - weight: 0 label: visually_hidden settings: controls: true @@ -21,6 +20,7 @@ content: loop: false multiple_file_display_type: tags third_party_settings: { } + weight: 0 region: content hidden: created: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.media.document.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.media.document.default.yml index 367a8bf35261..461b32f11acb 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.media.document.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.media.document.default.yml @@ -12,10 +12,10 @@ bundle: document mode: default content: field_media_document: + type: file_default label: visually_hidden settings: { } third_party_settings: { } - type: file_default weight: 1 region: content hidden: diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.default.yml index f88401921502..16a9d5a4c461 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.default.yml @@ -13,12 +13,12 @@ bundle: image mode: default content: field_media_image: + type: responsive_image label: visually_hidden settings: responsive_image_style: 3_2_image image_link: '' third_party_settings: { } - type: responsive_image weight: 1 region: content hidden: diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.medium_8_7.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.medium_8_7.yml index 1521cf84fd48..5b8d5f446c98 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.medium_8_7.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.medium_8_7.yml @@ -11,20 +11,20 @@ dependencies: - layout_builder third_party_settings: layout_builder: - allow_custom: false enabled: false + allow_custom: false id: media.image.medium_8_7 targetEntityType: media bundle: image mode: medium_8_7 content: field_media_image: + type: image label: visually_hidden settings: - image_style: medium_8_7 image_link: '' + image_style: medium_8_7 third_party_settings: { } - type: image weight: 1 region: content hidden: diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.responsive_3x2.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.responsive_3x2.yml index b12d2fcee990..fa1e74775e00 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.responsive_3x2.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.responsive_3x2.yml @@ -11,20 +11,20 @@ dependencies: - responsive_image third_party_settings: layout_builder: - allow_custom: false enabled: false + allow_custom: false id: media.image.responsive_3x2 targetEntityType: media bundle: image mode: responsive_3x2 content: field_media_image: + type: responsive_image label: visually_hidden settings: responsive_image_style: 3_2_image image_link: '' third_party_settings: { } - type: responsive_image weight: 1 region: content hidden: diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.scale_crop_7_3_large.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.scale_crop_7_3_large.yml index a8832f44093a..3f8818176b1c 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.scale_crop_7_3_large.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.scale_crop_7_3_large.yml @@ -11,20 +11,20 @@ dependencies: - layout_builder third_party_settings: layout_builder: - allow_custom: false enabled: false + allow_custom: false id: media.image.scale_crop_7_3_large targetEntityType: media bundle: image mode: scale_crop_7_3_large content: field_media_image: + type: image label: visually_hidden settings: - image_style: scale_crop_7_3_large image_link: '' + image_style: scale_crop_7_3_large third_party_settings: { } - type: image weight: 1 region: content hidden: diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.square.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.square.yml index 9f90a89f086f..0b01d6c50b28 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.square.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.media.image.square.yml @@ -11,20 +11,20 @@ dependencies: - responsive_image third_party_settings: layout_builder: - allow_custom: false enabled: false + allow_custom: false id: media.image.square targetEntityType: media bundle: image mode: square content: field_media_image: + type: responsive_image label: visually_hidden settings: responsive_image_style: square image_link: '' third_party_settings: { } - type: responsive_image weight: 1 region: content hidden: diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.media.remote_video.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.media.remote_video.default.yml index 6894add2a9bd..b42d301febf6 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.media.remote_video.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.media.remote_video.default.yml @@ -13,12 +13,12 @@ mode: default content: field_media_oembed_video: type: oembed - weight: 0 label: hidden settings: max_width: 0 max_height: 0 third_party_settings: { } + weight: 0 region: content hidden: created: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.media.video.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.media.video.default.yml index e33e0c10d3a4..c3bcba99b6e5 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.media.video.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.media.video.default.yml @@ -13,17 +13,17 @@ mode: default content: field_media_video_file: type: file_video - weight: 0 label: visually_hidden settings: - muted: false - width: 640 - height: 480 controls: true autoplay: false loop: false multiple_file_display_type: tags + muted: false + width: 640 + height: 480 third_party_settings: { } + weight: 0 region: content hidden: created: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card.yml index c39d367972e9..64e9a1aef748 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card.yml @@ -17,13 +17,13 @@ mode: card content: field_media_image: type: entity_reference_entity_view - weight: 1 - region: content label: hidden settings: view_mode: responsive_3x2 link: false third_party_settings: { } + weight: 1 + region: content hidden: body: true content_moderation_control: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card_common.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card_common.yml index 95e50c39c792..9ff759350b91 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card_common.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card_common.yml @@ -17,13 +17,13 @@ mode: card_common content: field_media_image: type: entity_reference_entity_view - weight: 1 - region: content label: hidden settings: view_mode: responsive_3x2 link: false third_party_settings: { } + weight: 1 + region: content hidden: body: true content_moderation_control: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card_common_alt.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card_common_alt.yml index a926fe01b46c..03be00eaf12c 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card_common_alt.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.card_common_alt.yml @@ -17,13 +17,13 @@ mode: card_common_alt content: field_media_image: type: entity_reference_entity_view - weight: 1 - region: content label: hidden settings: view_mode: responsive_3x2 link: false third_party_settings: { } + weight: 1 + region: content hidden: body: true content_moderation_control: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.default.yml index bf9d6d6017e3..a215f56e1d10 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.default.yml @@ -13,8 +13,8 @@ dependencies: - user third_party_settings: layout_builder: - allow_custom: false enabled: false + allow_custom: false id: node.article.default targetEntityType: node bundle: article @@ -22,33 +22,33 @@ mode: default content: body: type: text_default - weight: 3 - region: content + label: hidden settings: { } third_party_settings: { } - label: hidden + weight: 3 + region: content field_media_image: - weight: 2 + type: entity_reference_entity_view label: hidden settings: view_mode: responsive_3x2 link: false third_party_settings: { } - type: entity_reference_entity_view + weight: 2 region: content field_tags: type: entity_reference_label - weight: 0 - region: content label: above settings: link: true third_party_settings: { } - links: - weight: 4 + weight: 0 region: content + links: settings: { } third_party_settings: { } + weight: 4 + region: content hidden: content_moderation_control: true langcode: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.full.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.full.yml index 3f2d6a4293c3..ab8d49faceb1 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.full.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.full.yml @@ -15,8 +15,8 @@ dependencies: - user third_party_settings: layout_builder: - allow_custom: true enabled: true + allow_custom: true sections: - layout_id: layout_onecol @@ -27,26 +27,26 @@ third_party_settings: uuid: 439cd644-2346-4467-b296-2c9453bd18c2 region: content configuration: + id: 'field_block:node:article:field_tags' label_display: '0' context_mapping: entity: layout_builder.entity - id: 'field_block:node:article:field_tags' formatter: type: entity_reference_label label: inline settings: link: true third_party_settings: { } - additional: { } weight: 0 + additional: { } 02d32417-145b-41a4-8d7a-27e4477b9666: uuid: 02d32417-145b-41a4-8d7a-27e4477b9666 region: content configuration: + id: 'field_block:node:article:field_media_image' label_display: '0' context_mapping: entity: layout_builder.entity - id: 'field_block:node:article:field_media_image' formatter: type: entity_reference_entity_view label: hidden @@ -54,43 +54,43 @@ third_party_settings: view_mode: responsive_3x2 link: false third_party_settings: { } - additional: { } weight: 1 + additional: { } f73af85e-15fc-4672-8b72-3ed91353e08c: uuid: f73af85e-15fc-4672-8b72-3ed91353e08c region: content configuration: + id: 'field_block:node:article:body' label_display: '0' context_mapping: entity: layout_builder.entity - id: 'field_block:node:article:body' formatter: type: text_default + label: hidden settings: { } third_party_settings: { } - label: hidden - additional: { } weight: 2 + additional: { } 957850fc-d5ea-4a6f-b3c9-dd2e4811a5c4: uuid: 957850fc-d5ea-4a6f-b3c9-dd2e4811a5c4 region: content configuration: + id: 'extra_field_block:node:article:links' label_display: '0' context_mapping: entity: layout_builder.entity - id: 'extra_field_block:node:article:links' - additional: { } weight: 3 + additional: { } 937c9738-b63e-409f-897a-c9fc98f6716e: uuid: 937c9738-b63e-409f-897a-c9fc98f6716e region: content configuration: + id: 'extra_field_block:node:article:content_moderation_control' label_display: '0' context_mapping: entity: layout_builder.entity - id: 'extra_field_block:node:article:content_moderation_control' - additional: { } weight: 4 + additional: { } third_party_settings: { } id: node.article.full targetEntityType: node @@ -99,38 +99,38 @@ mode: full content: body: type: text_default + label: hidden + settings: { } + third_party_settings: { } weight: 3 region: content + content_moderation_control: settings: { } third_party_settings: { } - label: hidden - content_moderation_control: weight: 5 region: content - settings: { } - third_party_settings: { } field_media_image: type: entity_reference_entity_view - weight: 2 - region: content label: hidden settings: view_mode: responsive_3x2 link: false third_party_settings: { } + weight: 2 + region: content field_tags: type: entity_reference_label - weight: 0 - region: content label: inline settings: link: true third_party_settings: { } - links: - weight: 4 + weight: 0 region: content + links: settings: { } third_party_settings: { } + weight: 4 + region: content hidden: langcode: true layout_builder__layout: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.teaser.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.teaser.yml index 1499fbde6448..3c497b06183c 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.teaser.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.article.teaser.yml @@ -18,34 +18,34 @@ mode: teaser content: body: type: text_summary_or_trimmed - weight: 2 - region: content + label: hidden settings: trim_length: 600 third_party_settings: { } - label: hidden + weight: 2 + region: content field_media_image: type: entity_reference_entity_view - weight: 1 - region: content label: hidden settings: view_mode: responsive_3x2 link: false third_party_settings: { } + weight: 1 + region: content field_tags: type: entity_reference_label - weight: 3 - region: content + label: above settings: link: true third_party_settings: { } - label: above - links: - weight: 4 + weight: 3 region: content + links: settings: { } third_party_settings: { } + weight: 4 + region: content hidden: content_moderation_control: true langcode: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.default.yml index b60af1b346c6..f2ba01f1eaae 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.default.yml @@ -11,30 +11,30 @@ dependencies: - user third_party_settings: layout_builder: - allow_custom: false enabled: false + allow_custom: false id: node.page.default targetEntityType: node bundle: page mode: default content: body: - label: hidden type: text_default + label: hidden + settings: { } + third_party_settings: { } weight: 0 region: content + content_moderation_control: settings: { } third_party_settings: { } - content_moderation_control: weight: 2 region: content + links: settings: { } third_party_settings: { } - links: weight: 1 region: content - settings: { } - third_party_settings: { } hidden: langcode: true layout_builder__layout: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.full.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.full.yml index 7d0134637673..a1f918afdac0 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.full.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.full.yml @@ -13,8 +13,8 @@ dependencies: - user third_party_settings: layout_builder: - allow_custom: true enabled: true + allow_custom: true sections: - layout_id: layout_onecol @@ -25,37 +25,37 @@ third_party_settings: uuid: 74a08c63-70dc-42e7-89f8-e4c62efb07ce region: content configuration: + id: 'field_block:node:page:body' label_display: '0' context_mapping: entity: layout_builder.entity - id: 'field_block:node:page:body' formatter: - label: hidden type: text_default + label: hidden settings: { } third_party_settings: { } - additional: { } weight: 0 + additional: { } 57ad7b26-a88b-439e-a056-40f2de29a943: uuid: 57ad7b26-a88b-439e-a056-40f2de29a943 region: content configuration: + id: 'extra_field_block:node:page:links' label_display: '0' context_mapping: entity: layout_builder.entity - id: 'extra_field_block:node:page:links' - additional: { } weight: 1 + additional: { } 01b94e28-e38c-4849-98d6-ed77bca30afc: uuid: 01b94e28-e38c-4849-98d6-ed77bca30afc region: content configuration: + id: 'extra_field_block:node:page:content_moderation_control' label_display: '0' context_mapping: entity: layout_builder.entity - id: 'extra_field_block:node:page:content_moderation_control' - additional: { } weight: 2 + additional: { } third_party_settings: { } id: node.page.full targetEntityType: node @@ -63,22 +63,22 @@ bundle: page mode: full content: body: - label: hidden type: text_default + label: hidden + settings: { } + third_party_settings: { } weight: 0 region: content + content_moderation_control: settings: { } third_party_settings: { } - content_moderation_control: weight: 2 region: content + links: settings: { } third_party_settings: { } - links: weight: 1 region: content - settings: { } - third_party_settings: { } hidden: langcode: true layout_builder__layout: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.teaser.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.teaser.yml index 2ae8bd9c1468..618a3fbfc614 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.teaser.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.page.teaser.yml @@ -15,13 +15,13 @@ bundle: page mode: teaser content: body: - label: hidden type: text_summary_or_trimmed - weight: 100 - region: content + label: hidden settings: trim_length: 600 third_party_settings: { } + weight: 100 + region: content links: weight: 101 region: content diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card.yml index 53dd3b04b32d..fe830bbb3f5b 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card.yml @@ -24,21 +24,21 @@ bundle: recipe mode: card content: field_difficulty: - weight: 0 + type: list_default label: inline settings: { } third_party_settings: { } - type: list_default + weight: 0 region: content field_media_image: type: entity_reference_entity_view - weight: 2 - region: content label: hidden settings: view_mode: responsive_3x2 link: false third_party_settings: { } + weight: 2 + region: content hidden: content_moderation_control: true field_cooking_time: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card_common.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card_common.yml index e4f7e9b8f2e7..fd7ca9e720c2 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card_common.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card_common.yml @@ -24,13 +24,13 @@ mode: card_common content: field_media_image: type: entity_reference_entity_view - weight: 1 - region: content label: hidden settings: view_mode: responsive_3x2 link: false third_party_settings: { } + weight: 1 + region: content hidden: content_moderation_control: true field_cooking_time: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card_common_alt.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card_common_alt.yml index 229f4e1fdd94..2ed345327016 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card_common_alt.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.card_common_alt.yml @@ -24,13 +24,13 @@ mode: card_common_alt content: field_media_image: type: entity_reference_entity_view - weight: 1 - region: content label: hidden settings: view_mode: square link: false third_party_settings: { } + weight: 1 + region: content hidden: content_moderation_control: true field_cooking_time: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.default.yml index 20daf4d00151..f90b2086e1a1 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.default.yml @@ -24,91 +24,91 @@ bundle: recipe mode: default content: field_cooking_time: - weight: 6 + type: number_integer label: above settings: thousand_separator: '' prefix_suffix: true third_party_settings: { } - type: number_integer + weight: 6 region: content field_difficulty: - weight: 8 + type: list_default label: above settings: { } third_party_settings: { } - type: list_default + weight: 8 region: content field_ingredients: - weight: 9 + type: string label: above settings: link_to_entity: false third_party_settings: { } - type: string + weight: 9 region: content field_media_image: type: entity_reference_entity_view - weight: 4 label: hidden settings: view_mode: responsive_3x2 link: false third_party_settings: { } + weight: 4 region: content field_number_of_servings: - weight: 7 + type: number_integer label: above settings: thousand_separator: '' prefix_suffix: true third_party_settings: { } - type: number_integer + weight: 7 region: content field_preparation_time: - weight: 5 + type: number_integer label: above settings: thousand_separator: '' prefix_suffix: true third_party_settings: { } - type: number_integer + weight: 5 region: content field_recipe_category: - weight: 1 + type: entity_reference_label label: above settings: link: true third_party_settings: { } - type: entity_reference_label + weight: 1 region: content field_recipe_instruction: - weight: 10 + type: text_default label: above settings: { } third_party_settings: { } - type: text_default + weight: 10 region: content field_summary: - weight: 0 + type: text_default label: hidden settings: { } third_party_settings: { } - type: text_default + weight: 0 region: content field_tags: - weight: 2 + type: entity_reference_label label: above settings: link: true third_party_settings: { } - type: entity_reference_label + weight: 2 region: content links: - weight: 11 - region: content settings: { } third_party_settings: { } + weight: 11 + region: content hidden: content_moderation_control: true langcode: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.full.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.full.yml index eddea371d1fc..a8dcbb80a267 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.full.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.node.recipe.full.yml @@ -25,6 +25,8 @@ dependencies: - umami third_party_settings: layout_builder: + enabled: true + allow_custom: true sections: - layout_id: layout_onecol @@ -35,49 +37,49 @@ third_party_settings: uuid: eadd557c-6414-40e5-9a95-355720385477 region: content configuration: + id: 'field_block:node:recipe:field_tags' label_display: '0' context_mapping: entity: layout_builder.entity - id: 'field_block:node:recipe:field_tags' formatter: + type: entity_reference_label label: inline settings: link: true third_party_settings: { } - type: entity_reference_label - additional: { } weight: 3 + additional: { } 0eff9e1d-4e73-4748-b910-e5568df1d5aa: uuid: 0eff9e1d-4e73-4748-b910-e5568df1d5aa region: content configuration: + id: 'field_block:node:recipe:field_recipe_category' label_display: '0' context_mapping: entity: layout_builder.entity - id: 'field_block:node:recipe:field_recipe_category' formatter: + type: entity_reference_label label: inline settings: link: true third_party_settings: { } - type: entity_reference_label - additional: { } weight: 2 + additional: { } 44801518-fe93-421a-bdcb-550493c7925d: uuid: 44801518-fe93-421a-bdcb-550493c7925d region: content configuration: + id: 'field_block:node:recipe:field_summary' label_display: '0' context_mapping: entity: layout_builder.entity - id: 'field_block:node:recipe:field_summary' formatter: + type: text_default label: hidden settings: { } third_party_settings: { } - type: text_default - additional: { } weight: 4 + additional: { } third_party_settings: { } - layout_id: layout_oneplusfourgrid_section @@ -90,104 +92,104 @@ third_party_settings: configuration: id: 'field_block:node:recipe:field_media_image' label: 'Media Image' - provider: layout_builder label_display: '0' + provider: layout_builder + context_mapping: + entity: layout_builder.entity + view_mode: view_mode formatter: - label: hidden type: entity_reference_entity_view + label: hidden settings: view_mode: responsive_3x2 third_party_settings: { } - context_mapping: - entity: layout_builder.entity - view_mode: view_mode - additional: { } weight: 4 + additional: { } df8bfafc-210c-4d86-9745-e47081ab0fd4: uuid: df8bfafc-210c-4d86-9745-e47081ab0fd4 region: fifth configuration: + id: 'field_block:node:recipe:field_difficulty' label_display: '0' context_mapping: entity: layout_builder.entity - id: 'field_block:node:recipe:field_difficulty' formatter: + type: list_default label: inline settings: { } third_party_settings: { } - type: list_default - additional: { } weight: 0 + additional: { } a2d450d0-08ce-4123-bca0-411bfa1da132: uuid: a2d450d0-08ce-4123-bca0-411bfa1da132 region: fourth configuration: + id: 'field_block:node:recipe:field_number_of_servings' label_display: '0' context_mapping: entity: layout_builder.entity - id: 'field_block:node:recipe:field_number_of_servings' formatter: + type: number_integer label: inline settings: thousand_separator: '' prefix_suffix: false third_party_settings: { } - type: number_integer - additional: { } weight: 0 + additional: { } f91febc6-d924-47a2-8ffd-b71d3b2597c7: uuid: f91febc6-d924-47a2-8ffd-b71d3b2597c7 region: third configuration: + id: 'field_block:node:recipe:field_cooking_time' label_display: '0' context_mapping: entity: layout_builder.entity - id: 'field_block:node:recipe:field_cooking_time' formatter: + type: number_integer label: inline settings: thousand_separator: '' prefix_suffix: true third_party_settings: { } - type: number_integer - additional: { } weight: 0 + additional: { } 00488840-db50-4afe-9c30-a123e6707fa9: uuid: 00488840-db50-4afe-9c30-a123e6707fa9 region: second configuration: + id: 'field_block:node:recipe:field_preparation_time' label_display: '0' context_mapping: entity: layout_builder.entity - id: 'field_block:node:recipe:field_preparation_time' formatter: + type: number_integer label: inline settings: thousand_separator: '' prefix_suffix: true third_party_settings: { } - type: number_integer - additional: { } weight: 0 + additional: { } 69d8bce1-28ae-4287-a05b-a2166679f867: uuid: 69d8bce1-28ae-4287-a05b-a2166679f867 region: first configuration: id: 'field_block:node:recipe:field_media_image' label: 'Media Image' - provider: layout_builder label_display: '0' + provider: layout_builder + context_mapping: + entity: layout_builder.entity + view_mode: view_mode formatter: - label: hidden type: entity_reference_entity_view + label: hidden settings: view_mode: responsive_3x2 third_party_settings: { } - context_mapping: - entity: layout_builder.entity - view_mode: view_mode - additional: { } weight: 0 + additional: { } third_party_settings: { } - layout_id: layout_twocol_section @@ -199,33 +201,33 @@ third_party_settings: uuid: 6924bf2e-8baa-4081-803a-7a2d3b7d8e14 region: first configuration: + id: 'field_block:node:recipe:field_ingredients' label_display: '0' context_mapping: entity: layout_builder.entity - id: 'field_block:node:recipe:field_ingredients' formatter: + type: string label: above settings: link_to_entity: false third_party_settings: { } - type: string - additional: { } weight: 0 + additional: { } f61cae40-5865-4c4c-98fa-14b8234e7b98: uuid: f61cae40-5865-4c4c-98fa-14b8234e7b98 region: second configuration: + id: 'field_block:node:recipe:field_recipe_instruction' label_display: '0' context_mapping: entity: layout_builder.entity - id: 'field_block:node:recipe:field_recipe_instruction' formatter: + type: text_default label: above settings: { } third_party_settings: { } - type: text_default - additional: { } weight: 0 + additional: { } third_party_settings: { } - layout_id: layout_onecol @@ -236,96 +238,94 @@ third_party_settings: uuid: d4b753a7-e1b1-4062-a1d0-a2666362693e region: content configuration: + id: 'extra_field_block:node:recipe:content_moderation_control' label_display: '0' context_mapping: entity: layout_builder.entity - id: 'extra_field_block:node:recipe:content_moderation_control' - additional: { } weight: 0 + additional: { } third_party_settings: { } - allow_custom: true - enabled: true id: node.recipe.full targetEntityType: node bundle: recipe mode: full content: content_moderation_control: - weight: 10 - region: content settings: { } third_party_settings: { } + weight: 10 + region: content field_cooking_time: - weight: 5 + type: number_integer label: inline settings: thousand_separator: '' prefix_suffix: true third_party_settings: { } - type: number_integer + weight: 5 region: content field_difficulty: - weight: 7 + type: list_default label: inline settings: { } third_party_settings: { } - type: list_default + weight: 7 region: content field_ingredients: - weight: 8 + type: string label: above settings: link_to_entity: false third_party_settings: { } - type: string + weight: 8 region: content field_number_of_servings: - weight: 6 + type: number_integer label: inline settings: thousand_separator: '' prefix_suffix: false third_party_settings: { } - type: number_integer + weight: 6 region: content field_preparation_time: - weight: 4 + type: number_integer label: inline settings: thousand_separator: '' prefix_suffix: true third_party_settings: { } - type: number_integer + weight: 4 region: content field_recipe_category: - weight: 1 + type: entity_reference_label label: inline settings: link: true third_party_settings: { } - type: entity_reference_label + weight: 1 region: content field_recipe_instruction: - weight: 9 + type: text_default label: above settings: { } third_party_settings: { } - type: text_default + weight: 9 region: content field_summary: - weight: 0 + type: text_default label: hidden settings: { } third_party_settings: { } - type: text_default + weight: 0 region: content field_tags: - weight: 2 + type: entity_reference_label label: inline settings: link: true third_party_settings: { } - type: entity_reference_label + weight: 2 region: content hidden: field_media_image: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.user.user.compact.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.user.user.compact.yml index 0cfcf3a111f3..8be9ae22d3f4 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.user.user.compact.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.user.user.compact.yml @@ -15,13 +15,13 @@ mode: compact content: user_picture: type: image - weight: 0 - region: content + label: hidden settings: - image_style: thumbnail image_link: content + image_style: thumbnail third_party_settings: { } - label: hidden + weight: 0 + region: content hidden: langcode: true member_for: true diff --git a/core/profiles/demo_umami/config/install/core.entity_view_display.user.user.default.yml b/core/profiles/demo_umami/config/install/core.entity_view_display.user.user.default.yml index 0e18a05ea1a6..eccb0f7ec163 100644 --- a/core/profiles/demo_umami/config/install/core.entity_view_display.user.user.default.yml +++ b/core/profiles/demo_umami/config/install/core.entity_view_display.user.user.default.yml @@ -17,12 +17,12 @@ content: region: content user_picture: type: image - weight: 0 - region: content + label: hidden settings: - image_style: thumbnail image_link: content + image_style: thumbnail third_party_settings: { } - label: hidden + weight: 0 + region: content hidden: langcode: true diff --git a/core/profiles/demo_umami/config/install/core.menu.static_menu_link_overrides.yml b/core/profiles/demo_umami/config/install/core.menu.static_menu_link_overrides.yml index 114c789369a4..14af566d7fd7 100644 --- a/core/profiles/demo_umami/config/install/core.menu.static_menu_link_overrides.yml +++ b/core/profiles/demo_umami/config/install/core.menu.static_menu_link_overrides.yml @@ -1,7 +1,7 @@ definitions: contact__site_page: - enabled: true menu_name: footer parent: '' weight: 0 expanded: false + enabled: true diff --git a/core/profiles/demo_umami/config/install/field.field.block_content.banner_block.field_content_link.yml b/core/profiles/demo_umami/config/install/field.field.block_content.banner_block.field_content_link.yml index a264fe1eb119..0ee3a806cfdc 100644 --- a/core/profiles/demo_umami/config/install/field.field.block_content.banner_block.field_content_link.yml +++ b/core/profiles/demo_umami/config/install/field.field.block_content.banner_block.field_content_link.yml @@ -17,6 +17,6 @@ translatable: true default_value: { } default_value_callback: '' settings: - link_type: 17 title: 2 + link_type: 17 field_type: link diff --git a/core/profiles/demo_umami/config/install/field.field.block_content.footer_promo_block.field_content_link.yml b/core/profiles/demo_umami/config/install/field.field.block_content.footer_promo_block.field_content_link.yml index 06e5a850f46d..ae9ccf5495d5 100644 --- a/core/profiles/demo_umami/config/install/field.field.block_content.footer_promo_block.field_content_link.yml +++ b/core/profiles/demo_umami/config/install/field.field.block_content.footer_promo_block.field_content_link.yml @@ -17,6 +17,6 @@ translatable: true default_value: { } default_value_callback: '' settings: - link_type: 17 title: 2 + link_type: 17 field_type: link diff --git a/core/profiles/demo_umami/config/install/field.field.media.audio.field_media_audio_file.yml b/core/profiles/demo_umami/config/install/field.field.media.audio.field_media_audio_file.yml index 5e013f3e974c..a4bb52eb859a 100644 --- a/core/profiles/demo_umami/config/install/field.field.media.audio.field_media_audio_file.yml +++ b/core/profiles/demo_umami/config/install/field.field.media.audio.field_media_audio_file.yml @@ -17,10 +17,10 @@ translatable: true default_value: { } default_value_callback: '' settings: - file_extensions: 'mp3 wav aac' + handler: 'default:file' + handler_settings: { } file_directory: '[date:custom:Y]-[date:custom:m]' + file_extensions: 'mp3 wav aac' max_filesize: '' description_field: false - handler: 'default:file' - handler_settings: { } field_type: file diff --git a/core/profiles/demo_umami/config/install/field.field.media.document.field_media_document.yml b/core/profiles/demo_umami/config/install/field.field.media.document.field_media_document.yml index 80a364686fbe..fb0b9909e2e8 100644 --- a/core/profiles/demo_umami/config/install/field.field.media.document.field_media_document.yml +++ b/core/profiles/demo_umami/config/install/field.field.media.document.field_media_document.yml @@ -4,11 +4,11 @@ dependencies: config: - field.storage.media.field_media_document - media.type.document + module: + - file enforced: module: - media - module: - - file id: media.document.field_media_document field_name: field_media_document entity_type: media @@ -20,10 +20,10 @@ translatable: true default_value: { } default_value_callback: '' settings: + handler: 'default:file' + handler_settings: { } file_directory: '[date:custom:Y]-[date:custom:m]' file_extensions: 'txt rtf doc docx ppt pptx xls xlsx pdf odf odg odp ods odt fodt fods fodp fodg key numbers pages' max_filesize: '' - handler: 'default:file' - handler_settings: { } description_field: false field_type: file diff --git a/core/profiles/demo_umami/config/install/field.field.media.image.field_media_image.yml b/core/profiles/demo_umami/config/install/field.field.media.image.field_media_image.yml index f6a62cc5958e..689315625eee 100644 --- a/core/profiles/demo_umami/config/install/field.field.media.image.field_media_image.yml +++ b/core/profiles/demo_umami/config/install/field.field.media.image.field_media_image.yml @@ -4,11 +4,11 @@ dependencies: config: - field.storage.media.field_media_image - media.type.image + module: + - image enforced: module: - media - module: - - image id: media.image.field_media_image field_name: field_media_image entity_type: media @@ -20,21 +20,21 @@ translatable: true default_value: { } default_value_callback: '' settings: + handler: 'default:file' + handler_settings: { } + file_directory: '[date:custom:Y]-[date:custom:m]' + file_extensions: 'png gif jpg jpeg' + max_filesize: '' + max_resolution: '' + min_resolution: '' alt_field: true alt_field_required: true title_field: false title_field_required: false - max_resolution: '' - min_resolution: '' default_image: uuid: null alt: '' title: '' width: null height: null - file_directory: '[date:custom:Y]-[date:custom:m]' - file_extensions: 'png gif jpg jpeg' - max_filesize: '' - handler: 'default:file' - handler_settings: { } field_type: image diff --git a/core/profiles/demo_umami/config/install/field.field.media.video.field_media_video_file.yml b/core/profiles/demo_umami/config/install/field.field.media.video.field_media_video_file.yml index 19c3b26cb0d8..b6c0be146e45 100644 --- a/core/profiles/demo_umami/config/install/field.field.media.video.field_media_video_file.yml +++ b/core/profiles/demo_umami/config/install/field.field.media.video.field_media_video_file.yml @@ -17,10 +17,10 @@ translatable: true default_value: { } default_value_callback: '' settings: - file_extensions: mp4 + handler: 'default:file' + handler_settings: { } file_directory: '[date:custom:Y]-[date:custom:m]' + file_extensions: mp4 max_filesize: '' description_field: false - handler: 'default:file' - handler_settings: { } field_type: file diff --git a/core/profiles/demo_umami/config/install/field.field.user.user.user_picture.yml b/core/profiles/demo_umami/config/install/field.field.user.user.user_picture.yml index e06bd7d74d47..1038af3419e8 100644 --- a/core/profiles/demo_umami/config/install/field.field.user.user.user_picture.yml +++ b/core/profiles/demo_umami/config/install/field.field.user.user.user_picture.yml @@ -17,21 +17,21 @@ translatable: true default_value: { } default_value_callback: '' settings: - file_extensions: 'png gif jpg jpeg' + handler: 'default:file' + handler_settings: { } file_directory: 'pictures/[date:custom:Y]-[date:custom:m]' + file_extensions: 'png gif jpg jpeg' max_filesize: '' - alt_field: false - title_field: false max_resolution: '' min_resolution: '' + alt_field: false + alt_field_required: false + title_field: false + title_field_required: false default_image: uuid: null alt: '' title: '' width: null height: null - alt_field_required: false - title_field_required: false - handler: 'default:file' - handler_settings: { } field_type: image diff --git a/core/profiles/demo_umami/config/install/field.storage.block_content.field_title.yml b/core/profiles/demo_umami/config/install/field.storage.block_content.field_title.yml index 6e1b0b7f0d08..3031ad63d599 100644 --- a/core/profiles/demo_umami/config/install/field.storage.block_content.field_title.yml +++ b/core/profiles/demo_umami/config/install/field.storage.block_content.field_title.yml @@ -9,8 +9,8 @@ entity_type: block_content type: string settings: max_length: 255 - is_ascii: false case_sensitive: false + is_ascii: false module: core locked: false cardinality: 1 diff --git a/core/profiles/demo_umami/config/install/field.storage.media.field_media_document.yml b/core/profiles/demo_umami/config/install/field.storage.media.field_media_document.yml index 6d7d42535c1d..309e509de09f 100644 --- a/core/profiles/demo_umami/config/install/field.storage.media.field_media_document.yml +++ b/core/profiles/demo_umami/config/install/field.storage.media.field_media_document.yml @@ -1,21 +1,21 @@ langcode: en status: true dependencies: - enforced: - module: - - media module: - file - media + enforced: + module: + - media id: media.field_media_document field_name: field_media_document entity_type: media type: file settings: - uri_scheme: public target_type: file display_field: false display_default: false + uri_scheme: public module: file locked: false cardinality: 1 diff --git a/core/profiles/demo_umami/config/install/field.storage.media.field_media_image.yml b/core/profiles/demo_umami/config/install/field.storage.media.field_media_image.yml index 231200d59b33..59a6fbe14297 100644 --- a/core/profiles/demo_umami/config/install/field.storage.media.field_media_image.yml +++ b/core/profiles/demo_umami/config/install/field.storage.media.field_media_image.yml @@ -1,28 +1,28 @@ langcode: en status: true dependencies: - enforced: - module: - - media module: - file - image - media + enforced: + module: + - media id: media.field_media_image field_name: field_media_image entity_type: media type: image settings: + target_type: file + display_field: false + display_default: false + uri_scheme: public default_image: uuid: null alt: '' title: '' width: null height: null - target_type: file - display_field: false - display_default: false - uri_scheme: public module: image locked: false cardinality: 1 diff --git a/core/profiles/demo_umami/config/install/field.storage.media.field_media_oembed_video.yml b/core/profiles/demo_umami/config/install/field.storage.media.field_media_oembed_video.yml index 7485f1a6d24d..e8664f0b181c 100644 --- a/core/profiles/demo_umami/config/install/field.storage.media.field_media_oembed_video.yml +++ b/core/profiles/demo_umami/config/install/field.storage.media.field_media_oembed_video.yml @@ -9,8 +9,8 @@ entity_type: media type: string settings: max_length: 255 - is_ascii: false case_sensitive: false + is_ascii: false module: core locked: false cardinality: 1 diff --git a/core/profiles/demo_umami/config/install/field.storage.node.field_ingredients.yml b/core/profiles/demo_umami/config/install/field.storage.node.field_ingredients.yml index 8adf10e609ac..79a4fc5671a8 100644 --- a/core/profiles/demo_umami/config/install/field.storage.node.field_ingredients.yml +++ b/core/profiles/demo_umami/config/install/field.storage.node.field_ingredients.yml @@ -9,8 +9,8 @@ entity_type: node type: string settings: max_length: 255 - is_ascii: false case_sensitive: false + is_ascii: false module: core locked: false cardinality: -1 diff --git a/core/profiles/demo_umami/config/install/field.storage.user.user_picture.yml b/core/profiles/demo_umami/config/install/field.storage.user.user_picture.yml index 82536283efc4..6d0476df6c20 100644 --- a/core/profiles/demo_umami/config/install/field.storage.user.user_picture.yml +++ b/core/profiles/demo_umami/config/install/field.storage.user.user_picture.yml @@ -10,6 +10,9 @@ field_name: user_picture entity_type: user type: image settings: + target_type: file + display_field: false + display_default: false uri_scheme: public default_image: uuid: null @@ -17,9 +20,6 @@ settings: title: '' width: null height: null - target_type: file - display_field: false - display_default: false module: image locked: false cardinality: 1 diff --git a/core/profiles/demo_umami/config/install/image.style.large_21_9.yml b/core/profiles/demo_umami/config/install/image.style.large_21_9.yml index f2be28f7abb3..da059b013d55 100644 --- a/core/profiles/demo_umami/config/install/image.style.large_21_9.yml +++ b/core/profiles/demo_umami/config/install/image.style.large_21_9.yml @@ -9,6 +9,6 @@ effects: id: image_scale_and_crop weight: 1 data: - anchor: center-center width: 1440 height: 620 + anchor: center-center diff --git a/core/profiles/demo_umami/config/install/image.style.large_21_9_2x.yml b/core/profiles/demo_umami/config/install/image.style.large_21_9_2x.yml index d65f5f593842..82324faa8bef 100644 --- a/core/profiles/demo_umami/config/install/image.style.large_21_9_2x.yml +++ b/core/profiles/demo_umami/config/install/image.style.large_21_9_2x.yml @@ -9,6 +9,6 @@ effects: id: image_scale_and_crop weight: 1 data: - anchor: center-center width: 2880 height: 1240 + anchor: center-center diff --git a/core/profiles/demo_umami/config/install/image.style.large_3_2_2x.yml b/core/profiles/demo_umami/config/install/image.style.large_3_2_2x.yml index 709d3c3593ec..973194caad8c 100644 --- a/core/profiles/demo_umami/config/install/image.style.large_3_2_2x.yml +++ b/core/profiles/demo_umami/config/install/image.style.large_3_2_2x.yml @@ -9,6 +9,6 @@ effects: id: image_scale_and_crop weight: 1 data: - anchor: center-center width: 1536 height: 1024 + anchor: center-center diff --git a/core/profiles/demo_umami/config/install/image.style.large_3_2_768x512.yml b/core/profiles/demo_umami/config/install/image.style.large_3_2_768x512.yml index 9c0273d45177..d2e66b3e7b1c 100644 --- a/core/profiles/demo_umami/config/install/image.style.large_3_2_768x512.yml +++ b/core/profiles/demo_umami/config/install/image.style.large_3_2_768x512.yml @@ -9,6 +9,6 @@ effects: id: image_scale_and_crop weight: 1 data: - anchor: center-center width: 768 height: 512 + anchor: center-center diff --git a/core/profiles/demo_umami/config/install/image.style.medium_21_9.yml b/core/profiles/demo_umami/config/install/image.style.medium_21_9.yml index d6b0d6a08ce2..0c4c28944fff 100644 --- a/core/profiles/demo_umami/config/install/image.style.medium_21_9.yml +++ b/core/profiles/demo_umami/config/install/image.style.medium_21_9.yml @@ -9,6 +9,6 @@ effects: id: image_scale_and_crop weight: 1 data: - anchor: center-center width: 1024 height: 440 + anchor: center-center diff --git a/core/profiles/demo_umami/config/install/image.style.medium_3_2_2x.yml b/core/profiles/demo_umami/config/install/image.style.medium_3_2_2x.yml index e617febb44f7..61e911f4386c 100644 --- a/core/profiles/demo_umami/config/install/image.style.medium_3_2_2x.yml +++ b/core/profiles/demo_umami/config/install/image.style.medium_3_2_2x.yml @@ -9,6 +9,6 @@ effects: id: image_scale_and_crop weight: 1 data: - anchor: center-center width: 1200 height: 800 + anchor: center-center diff --git a/core/profiles/demo_umami/config/install/image.style.medium_3_2_600x400.yml b/core/profiles/demo_umami/config/install/image.style.medium_3_2_600x400.yml index 8ae09daff011..6de2dcafc0d9 100644 --- a/core/profiles/demo_umami/config/install/image.style.medium_3_2_600x400.yml +++ b/core/profiles/demo_umami/config/install/image.style.medium_3_2_600x400.yml @@ -9,6 +9,6 @@ effects: id: image_scale_and_crop weight: 1 data: - anchor: center-center width: 600 height: 400 + anchor: center-center diff --git a/core/profiles/demo_umami/config/install/image.style.medium_8_7.yml b/core/profiles/demo_umami/config/install/image.style.medium_8_7.yml index 0283770805f8..7ec98a6f7fc3 100644 --- a/core/profiles/demo_umami/config/install/image.style.medium_8_7.yml +++ b/core/profiles/demo_umami/config/install/image.style.medium_8_7.yml @@ -9,6 +9,6 @@ effects: id: image_scale_and_crop weight: 1 data: - anchor: center-center width: 266 height: 236 + anchor: center-center diff --git a/core/profiles/demo_umami/config/install/image.style.scale_crop_7_3_large.yml b/core/profiles/demo_umami/config/install/image.style.scale_crop_7_3_large.yml index 1488edd9702f..4464e11dc359 100644 --- a/core/profiles/demo_umami/config/install/image.style.scale_crop_7_3_large.yml +++ b/core/profiles/demo_umami/config/install/image.style.scale_crop_7_3_large.yml @@ -9,6 +9,6 @@ effects: id: image_scale_and_crop weight: 1 data: - anchor: center-center width: 1440 height: 617 + anchor: center-center diff --git a/core/profiles/demo_umami/config/install/image.style.small_21_9.yml b/core/profiles/demo_umami/config/install/image.style.small_21_9.yml index 54cddab9f945..81f3c7ca9042 100644 --- a/core/profiles/demo_umami/config/install/image.style.small_21_9.yml +++ b/core/profiles/demo_umami/config/install/image.style.small_21_9.yml @@ -9,6 +9,6 @@ effects: id: image_scale_and_crop weight: 1 data: - anchor: center-center width: 768 height: 330 + anchor: center-center diff --git a/core/profiles/demo_umami/config/install/image.style.square_large.yml b/core/profiles/demo_umami/config/install/image.style.square_large.yml index 55081c33abed..5a1ada29bf63 100644 --- a/core/profiles/demo_umami/config/install/image.style.square_large.yml +++ b/core/profiles/demo_umami/config/install/image.style.square_large.yml @@ -9,6 +9,6 @@ effects: id: image_scale_and_crop weight: 1 data: - anchor: center-center width: 900 height: 900 + anchor: center-center diff --git a/core/profiles/demo_umami/config/install/image.style.square_medium.yml b/core/profiles/demo_umami/config/install/image.style.square_medium.yml index e920ef91417a..a4bce4f9fce6 100644 --- a/core/profiles/demo_umami/config/install/image.style.square_medium.yml +++ b/core/profiles/demo_umami/config/install/image.style.square_medium.yml @@ -9,6 +9,6 @@ effects: id: image_scale_and_crop weight: 1 data: - anchor: center-center width: 600 height: 600 + anchor: center-center diff --git a/core/profiles/demo_umami/config/install/image.style.square_small.yml b/core/profiles/demo_umami/config/install/image.style.square_small.yml index 97b37fadff22..50a859fd2b7d 100644 --- a/core/profiles/demo_umami/config/install/image.style.square_small.yml +++ b/core/profiles/demo_umami/config/install/image.style.square_small.yml @@ -9,6 +9,6 @@ effects: id: image_scale_and_crop weight: 1 data: - anchor: center-center width: 300 height: 300 + anchor: center-center diff --git a/core/profiles/demo_umami/config/install/media.type.remote_video.yml b/core/profiles/demo_umami/config/install/media.type.remote_video.yml index ad299681f398..203d69832765 100644 --- a/core/profiles/demo_umami/config/install/media.type.remote_video.yml +++ b/core/profiles/demo_umami/config/install/media.type.remote_video.yml @@ -8,10 +8,10 @@ source: 'oembed:video' queue_thumbnail_downloads: false new_revision: true source_configuration: + source_field: field_media_oembed_video thumbnails_directory: 'public://oembed_thumbnails/[date:custom:Y-m]' providers: - YouTube - Vimeo - source_field: field_media_oembed_video field_map: title: name diff --git a/core/profiles/demo_umami/config/install/responsive_image.styles.3_2_image.yml b/core/profiles/demo_umami/config/install/responsive_image.styles.3_2_image.yml index b8fb0982aae1..43c42b67e05e 100644 --- a/core/profiles/demo_umami/config/install/responsive_image.styles.3_2_image.yml +++ b/core/profiles/demo_umami/config/install/responsive_image.styles.3_2_image.yml @@ -10,8 +10,6 @@ id: 3_2_image label: '3:2 Image' image_style_mappings: - - breakpoint_id: responsive_image.viewport_sizing - multiplier: 1x image_mapping_type: sizes image_mapping: sizes: 100vw @@ -20,5 +18,7 @@ image_style_mappings: - large_3_2_768x512 - medium_3_2_2x - medium_3_2_600x400 + breakpoint_id: responsive_image.viewport_sizing + multiplier: 1x breakpoint_group: responsive_image fallback_image_style: large_3_2_768x512 diff --git a/core/profiles/demo_umami/config/install/responsive_image.styles.hero_or_banner.yml b/core/profiles/demo_umami/config/install/responsive_image.styles.hero_or_banner.yml index 152dc24af95b..564ddf7e10cc 100644 --- a/core/profiles/demo_umami/config/install/responsive_image.styles.hero_or_banner.yml +++ b/core/profiles/demo_umami/config/install/responsive_image.styles.hero_or_banner.yml @@ -10,8 +10,6 @@ id: hero_or_banner label: 'Hero or Banner' image_style_mappings: - - breakpoint_id: responsive_image.viewport_sizing - multiplier: 1x image_mapping_type: sizes image_mapping: sizes: 100vw @@ -20,5 +18,7 @@ image_style_mappings: - large_21_9_2x - medium_21_9 - small_21_9 + breakpoint_id: responsive_image.viewport_sizing + multiplier: 1x breakpoint_group: responsive_image fallback_image_style: small_21_9 diff --git a/core/profiles/demo_umami/config/install/responsive_image.styles.square.yml b/core/profiles/demo_umami/config/install/responsive_image.styles.square.yml index 1464ff84c065..cad30ff74d3c 100644 --- a/core/profiles/demo_umami/config/install/responsive_image.styles.square.yml +++ b/core/profiles/demo_umami/config/install/responsive_image.styles.square.yml @@ -9,8 +9,6 @@ id: square label: Square image_style_mappings: - - breakpoint_id: responsive_image.viewport_sizing - multiplier: 1x image_mapping_type: sizes image_mapping: sizes: 100vw @@ -18,5 +16,7 @@ image_style_mappings: - square_large - square_medium - square_small + breakpoint_id: responsive_image.viewport_sizing + multiplier: 1x breakpoint_group: responsive_image fallback_image_style: square_medium diff --git a/core/profiles/demo_umami/config/install/system.site.yml b/core/profiles/demo_umami/config/install/system.site.yml index 46a19562fec1..cc529097b646 100644 --- a/core/profiles/demo_umami/config/install/system.site.yml +++ b/core/profiles/demo_umami/config/install/system.site.yml @@ -1,3 +1,4 @@ +langcode: en uuid: '' name: '' mail: '' @@ -8,5 +9,4 @@ page: front: /node admin_compact_mode: false weight_select_max: 100 -langcode: en default_langcode: en diff --git a/core/profiles/demo_umami/config/install/tour.tour.umami-front.yml b/core/profiles/demo_umami/config/install/tour.tour.umami-front.yml index 58003cb5689d..219e88de87fb 100644 --- a/core/profiles/demo_umami/config/install/tour.tour.umami-front.yml +++ b/core/profiles/demo_umami/config/install/tour.tour.umami-front.yml @@ -7,63 +7,64 @@ id: umami-front label: 'Front page' module: demo_umami routes: - - route_name: view.frontpage.page_1 + - + route_name: view.frontpage.page_1 tips: welcome: id: welcome plugin: text - label: Welcome to the Umami Drupal demo - body: Drupal is a powerful open source content management system and this demo, based on a fictional food magazine called Umami, will introduce you to some of Drupal's concepts and features. + label: 'Welcome to the Umami Drupal demo' weight: 1 + body: 'Drupal is a powerful open source content management system and this demo, based on a fictional food magazine called Umami, will introduce you to some of Drupal''s concepts and features.' out-of-the-box: id: out-of-the-box plugin: text - label: Drupal's core capabilities - body: Drupal provides many of the features you need to start building powerful websites right out-of-the-box. The features presented in this demo are based entirely on Drupal 8's core functionality. + label: 'Drupal''s core capabilities' weight: 2 + body: 'Drupal provides many of the features you need to start building powerful websites right out-of-the-box. The features presented in this demo are based entirely on Drupal 8''s core functionality.' navigation: id: navigation plugin: text label: Navigation - body: This is the main navigation menu for the Umami website. It is simple to create and administer menus and you can create as many menus as your site requires. For example, this site provides this main navigation as well as the user navigation displayed above. weight: 3 position: right - selector: '.menu-main__link.is-active' + selector: .menu-main__link.is-active + body: 'This is the main navigation menu for the Umami website. It is simple to create and administer menus and you can create as many menus as your site requires. For example, this site provides this main navigation as well as the user navigation displayed above.' umami-theme: id: umami-theme plugin: text - label: The Umami theme - body: This website uses the custom Umami theme to style its appearance. This theme has been created using CSS and by customizing Drupal's HTML templates that are built using the popular Twig templating system. Themes are also available for download and installation. + label: 'The Umami theme' weight: 4 position: left selector: '.block-type-banner-block .summary' + body: 'This website uses the custom Umami theme to style its appearance. This theme has been created using CSS and by customizing Drupal''s HTML templates that are built using the popular Twig templating system. Themes are also available for download and installation.' managing-content: id: managing-content plugin: text - label: Managing content - body: This example website provides a collection of articles and recipes that demonstrate how content can easily be managed in a flexible and structured way. + label: 'Managing content' weight: 5 position: left selector: '.view-promoted-items--single .read-more__link' + body: 'This example website provides a collection of articles and recipes that demonstrate how content can easily be managed in a flexible and structured way.' umami-front-views: id: umami-front-content plugin: text - label: Configuring content display - body: Display modes can be configured to provide different presentations of content. These promoted articles and recipes use the display modes feature to format the images with different ratios. + label: 'Configuring content display' weight: 6 position: right selector: '.view-promoted-items--double .node:nth-child(1)' + body: 'Display modes can be configured to provide different presentations of content. These promoted articles and recipes use the display modes feature to format the images with different ratios.' umami-views: id: umami-views plugin: text - label: Displaying content with Views - body: Drupal makes it simple to create lists of filtered content and control how the content is displayed using the Views feature. This latest recipes example uses a view to fetch the most recent four recipes, displays the view as a block that is positioned on the front page with the block system. + label: 'Displaying content with Views' weight: 7 position: left selector: '.view-frontpage .node:nth-child(1)' + body: 'Drupal makes it simple to create lists of filtered content and control how the content is displayed using the Views feature. This latest recipes example uses a view to fetch the most recent four recipes, displays the view as a block that is positioned on the front page with the block system.' front-bookend: id: front-bookend plugin: text - label: Continue exploring Drupal - body: The front page tour is now over. Feel free to click around and continue exploring Drupal. + label: 'Continue exploring Drupal' weight: 8 + body: 'The front page tour is now over. Feel free to click around and continue exploring Drupal.' diff --git a/core/profiles/demo_umami/config/install/user.settings.yml b/core/profiles/demo_umami/config/install/user.settings.yml index e3b3a89b0878..cdc311b3c7d6 100644 --- a/core/profiles/demo_umami/config/install/user.settings.yml +++ b/core/profiles/demo_umami/config/install/user.settings.yml @@ -1,3 +1,4 @@ +langcode: en anonymous: Anonymous verify_mail: true notify: @@ -13,4 +14,3 @@ register: admin_only cancel_method: user_cancel_block password_reset_timeout: 86400 password_strength: true -langcode: en diff --git a/core/profiles/demo_umami/config/install/views.view.articles_aside.yml b/core/profiles/demo_umami/config/install/views.view.articles_aside.yml index b1821bc6e239..cf15ea0a49fb 100644 --- a/core/profiles/demo_umami/config/install/views.view.articles_aside.yml +++ b/core/profiles/demo_umami/config/install/views.view.articles_aside.yml @@ -16,74 +16,34 @@ base_table: node_field_data base_field: nid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: some - options: - items_per_page: 3 - offset: 0 - style: - type: default - row: - type: 'entity:node' - options: - relationship: none - view_mode: card + title: 'More featured articles' fields: title: id: title table: node_field_data field: title + relationship: none + group_type: group + admin_label: '' entity_type: node entity_field: title + plugin_id: field label: '' + exclude: false alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false - hide_empty: false - empty_zero: false - settings: - link_to_entity: true - plugin_id: field - relationship: none - group_type: group - admin_label: '' - exclude: false element_type: '' element_class: '' element_label_type: '' @@ -93,9 +53,13 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true click_sort_column: value type: string + settings: + link_to_entity: true group_column: value group_columns: { } group_rows: true @@ -106,29 +70,121 @@ display: multi_type: separator separator: ', ' field_api_classes: false + pager: + type: some + options: + offset: 0 + items_per_page: 3 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } + sorts: + created: + id: created + table: node_field_data + field: created + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: created + plugin_id: date + order: DESC + expose: + label: '' + field_identifier: created + exposed: false + granularity: second + nid: + id: nid + table: node_field_data + field: nid + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: nid + plugin_id: standard + order: ASC + expose: + label: '' + field_identifier: nid + exposed: false + arguments: + nid: + id: nid + table: node_field_data + field: nid + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: nid + plugin_id: node_nid + default_action: default + exception: + value: all + title_enable: false + title: All + title_enable: false + title: '' + default_argument_type: node + default_argument_options: { } + default_argument_skip_url: false + summary_options: + base_path: '' + count: true + override: false + items_per_page: 25 + summary: + sort_order: asc + number_of_records: 0 + format: default_summary + specify_validation: false + validate: + type: none + fail: 'not found' + validate_options: { } + break_phrase: false + not: true filters: status: - value: '1' + id: status table: node_field_data field: status - plugin_id: boolean entity_type: node entity_field: status - id: status + plugin_id: boolean + value: '1' + group: 1 expose: operator: '' operator_limit_selection: false operator_list: { } - group: 1 type: id: type table: node_field_data field: type - value: - article: article entity_type: node entity_field: type plugin_id: bundle + value: + article: article expose: operator_limit_selection: false operator_list: { } @@ -139,6 +195,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: langcode + plugin_id: language operator: in value: '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' @@ -150,6 +209,8 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false @@ -157,8 +218,6 @@ display: remember_roles: authenticated: authenticated reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -171,83 +230,24 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: langcode - plugin_id: language - sorts: - created: - id: created - table: node_field_data - field: created - order: DESC - entity_type: node - entity_field: created - plugin_id: date - relationship: none - group_type: group - admin_label: '' - exposed: false - expose: - label: '' - field_identifier: created - granularity: second - nid: - id: nid - table: node_field_data - field: nid + style: + type: default + row: + type: 'entity:node' + options: relationship: none - group_type: group - admin_label: '' - order: ASC - exposed: false - expose: - label: '' - field_identifier: nid - entity_type: node - entity_field: nid - plugin_id: standard - title: 'More featured articles' + view_mode: card + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - arguments: - nid: - id: nid - table: node_field_data - field: nid - relationship: none - group_type: group - admin_label: '' - default_action: default - exception: - value: all - title_enable: false - title: All - title_enable: false - title: '' - default_argument_type: node - default_argument_options: { } - default_argument_skip_url: false - summary_options: - base_path: '' - count: true - items_per_page: 25 - override: false - summary: - sort_order: asc - number_of_records: 0 - format: default_summary - specify_validation: false - validate: - type: none - fail: 'not found' - validate_options: { } - break_phrase: false - not: true - entity_type: node - entity_field: nid - plugin_id: node_nid display_extenders: { } cache_metadata: max-age: -1 @@ -259,9 +259,9 @@ display: - user.permissions tags: { } block_1: - display_plugin: block id: block_1 display_title: Block + display_plugin: block position: 1 display_options: display_extenders: { } diff --git a/core/profiles/demo_umami/config/install/views.view.featured_articles.yml b/core/profiles/demo_umami/config/install/views.view.featured_articles.yml index a547a78769f9..0e432c783a59 100644 --- a/core/profiles/demo_umami/config/install/views.view.featured_articles.yml +++ b/core/profiles/demo_umami/config/install/views.view.featured_articles.yml @@ -17,87 +17,34 @@ base_table: node_field_data base_field: nid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: mini - options: - items_per_page: 9 - offset: 0 - id: 0 - total_pages: null - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: ‹‹ - next: ›› - style: - type: default - row: - type: 'entity:node' - options: - relationship: none - view_mode: card + title: Articles fields: title: id: title table: node_field_data field: title + relationship: none + group_type: group + admin_label: '' entity_type: node entity_field: title + plugin_id: field label: '' + exclude: false alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false - hide_empty: false - empty_zero: false - settings: - link_to_entity: true - plugin_id: field - relationship: none - group_type: group - admin_label: '' - exclude: false element_type: '' element_class: '' element_label_type: '' @@ -107,9 +54,13 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true click_sort_column: value type: string + settings: + link_to_entity: true group_column: value group_columns: { } group_rows: true @@ -120,33 +71,102 @@ display: multi_type: separator separator: ', ' field_api_classes: false + pager: + type: mini + options: + offset: 0 + items_per_page: 9 + total_pages: null + id: 0 + tags: + next: ›› + previous: ‹‹ + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } + sorts: + created: + id: created + table: node_field_data + field: created + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: created + plugin_id: date + order: DESC + expose: + label: '' + field_identifier: created + exposed: false + granularity: second + nid: + id: nid + table: node_field_data + field: nid + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: nid + plugin_id: standard + order: ASC + expose: + label: '' + field_identifier: nid + exposed: false + arguments: { } filters: status: - value: '1' + id: status table: node_field_data field: status - plugin_id: boolean entity_type: node entity_field: status - id: status + plugin_id: boolean + value: '1' + group: 1 expose: operator: '' operator_limit_selection: false operator_list: { } - group: 1 type: id: type table: node_field_data field: type - value: - article: article entity_type: node entity_field: type plugin_id: bundle + value: + article: article + group: 1 expose: operator_limit_selection: false operator_list: { } - group: 1 default_langcode: id: default_langcode table: node_field_data @@ -154,6 +174,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: default_langcode + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -184,53 +207,30 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: default_langcode - plugin_id: boolean - sorts: - created: - id: created - table: node_field_data - field: created - order: DESC - entity_type: node - entity_field: created - plugin_id: date - relationship: none - group_type: group - admin_label: '' - exposed: false - expose: - label: '' - field_identifier: created - granularity: second - nid: - id: nid - table: node_field_data - field: nid - relationship: none - group_type: group - admin_label: '' - order: ASC - exposed: false - expose: - label: '' - field_identifier: nid - entity_type: node - entity_field: nid - plugin_id: standard - title: Articles - header: { } - footer: { } - empty: { } - relationships: { } - arguments: { } - display_extenders: { } - css_class: grid--3 filter_groups: operator: AND groups: 1: AND + style: + type: default + row: + type: 'entity:node' + options: + relationship: none + view_mode: card + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } + css_class: grid--3 + header: { } + footer: { } + display_extenders: { } cache_metadata: max-age: -1 contexts: @@ -241,23 +241,23 @@ display: - user.permissions tags: { } page_1: - display_plugin: page id: page_1 display_title: Page + display_plugin: page position: 1 display_options: + rendering_language: '***LANGUAGE_language_interface***' display_extenders: { } path: articles menu: type: normal title: Articles description: '' + weight: 20 expanded: false + menu_name: main parent: '' - weight: 20 context: '0' - menu_name: main - rendering_language: '***LANGUAGE_language_interface***' cache_metadata: max-age: -1 contexts: diff --git a/core/profiles/demo_umami/config/install/views.view.frontpage.yml b/core/profiles/demo_umami/config/install/views.view.frontpage.yml index f614159078d9..0c3387aaa6f1 100644 --- a/core/profiles/demo_umami/config/install/views.view.frontpage.yml +++ b/core/profiles/demo_umami/config/install/views.view.frontpage.yml @@ -17,7 +17,28 @@ base_table: node_field_data base_field: nid display: default: + id: default + display_title: Default + display_plugin: default + position: 0 display_options: + title: Home + fields: { } + pager: + type: some + options: + offset: 0 + items_per_page: 4 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc access: type: perm options: @@ -27,28 +48,28 @@ display: options: { } empty: area_text_custom: - admin_label: '' - content: 'No front page content has been created yet.' - empty: true + id: area_text_custom + table: views field: area_text_custom + relationship: none group_type: group - id: area_text_custom + admin_label: '' + plugin_id: text_custom label: '' - relationship: none - table: views + empty: true + content: 'No front page content has been created yet.' tokenize: false - plugin_id: text_custom node_listing_empty: - admin_label: '' - empty: true - field: node_listing_empty - group_type: group id: node_listing_empty - label: '' - relationship: none table: node - plugin_id: node_listing_empty + field: node_listing_empty + relationship: none + group_type: group + admin_label: '' entity_type: node + plugin_id: node_listing_empty + label: '' + empty: true title: id: title table: views @@ -56,74 +77,112 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: title label: '' empty: true title: 'Welcome to [site:name]' - plugin_id: title - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc + sorts: + sticky: + id: sticky + table: node_field_data + field: sticky + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: sticky + plugin_id: boolean + order: DESC + expose: + label: '' + field_identifier: sticky + exposed: false + created: + id: created + table: node_field_data + field: created + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: created + plugin_id: date + order: DESC + expose: + label: '' + field_identifier: created + exposed: false + granularity: second + nid: + id: nid + table: node_field_data + field: nid + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: nid + plugin_id: standard + order: ASC + expose: + label: '' + field_identifier: nid + exposed: false + arguments: { } filters: promote: + id: promote + table: node_field_data + field: promote + relationship: none + group_type: group admin_label: '' + entity_type: node + entity_field: promote + plugin_id: boolean + operator: '=' + value: '1' + group: 1 + exposed: false expose: - description: '' - identifier: '' + operator_id: '' label: '' - multiple: false + description: '' + use_operator: false operator: '' - operator_id: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false remember: false + multiple: false remember_roles: authenticated: authenticated - required: false - use_operator: false - operator_limit_selection: false - operator_list: { } - exposed: false - field: promote - group: 1 + is_grouped: false group_info: - default_group: All - default_group_multiple: { } + label: '' description: '' - group_items: { } identifier: '' - label: '' - multiple: false optional: true - remember: false widget: select - group_type: group - id: promote - is_grouped: false - operator: '=' - relationship: none + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + status: + id: status table: node_field_data - value: '1' - plugin_id: boolean + field: status entity_type: node - entity_field: promote - status: + entity_field: status + plugin_id: boolean + value: '1' + group: 1 expose: operator: '' operator_limit_selection: false operator_list: { } - field: status - group: 1 - id: status - table: node_field_data - value: '1' - plugin_id: boolean - entity_type: node - entity_field: status type: id: type table: node_field_data @@ -131,6 +190,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: type + plugin_id: bundle operator: in value: recipe: recipe @@ -142,6 +204,8 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false @@ -149,8 +213,6 @@ display: remember_roles: authenticated: authenticated reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -163,9 +225,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: type - plugin_id: bundle default_langcode: id: default_langcode table: node_field_data @@ -173,6 +232,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: default_langcode + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -203,82 +265,31 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: default_langcode - plugin_id: boolean - pager: - type: some + filter_groups: + operator: AND + groups: + 1: AND + style: + type: default options: - items_per_page: 4 - offset: 0 + grouping: { } + row_class: '' + default_row_class: true + uses_fields: false + row: + type: 'entity:node' + options: + relationship: none + view_mode: card_common query: type: views_query options: + query_comment: '' disable_sql_rewrite: false distinct: false replica: false - query_comment: '' query_tags: { } - row: - type: 'entity:node' - options: - relationship: none - view_mode: card_common - sorts: - sticky: - admin_label: '' - expose: - label: '' - field_identifier: sticky - exposed: false - field: sticky - group_type: group - id: sticky - order: DESC - relationship: none - table: node_field_data - plugin_id: boolean - entity_type: node - entity_field: sticky - created: - field: created - id: created - order: DESC - table: node_field_data - plugin_id: date - relationship: none - group_type: group - admin_label: '' - exposed: false - expose: - label: '' - field_identifier: created - granularity: second - entity_type: node - entity_field: created - nid: - id: nid - table: node_field_data - field: nid - relationship: none - group_type: group - admin_label: '' - order: ASC - exposed: false - expose: - label: '' - field_identifier: nid - entity_type: node - entity_field: nid - plugin_id: standard - style: - type: default - options: - grouping: { } - row_class: '' - default_row_class: true - uses_fields: false - title: Home + relationships: { } header: area: id: area @@ -287,77 +298,68 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: text empty: false - tokenize: false content: value: '<p class="text-align-center">Explore recipes across every type of occasion, ingredient, and skill level.</p>' format: full_html - plugin_id: text + tokenize: false footer: { } - relationships: { } - fields: { } - arguments: { } display_extenders: { } - filter_groups: - operator: AND - groups: - 1: AND - display_plugin: default - display_title: Default - id: default - position: 0 cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } feed_1: - display_plugin: feed id: feed_1 display_title: Feed + display_plugin: feed position: 2 display_options: - sitename_title: true - path: rss.xml - displays: - page_1: page_1 - default: '' + enabled: false pager: type: some options: - items_per_page: 10 offset: 0 + items_per_page: 10 style: type: rss options: - description: '' grouping: { } uses_fields: false + description: '' row: type: node_rss options: relationship: none view_mode: rss - display_extenders: { } - enabled: false rendering_language: '***LANGUAGE_language_interface***' + display_extenders: { } + path: rss.xml + sitename_title: true + displays: + page_1: page_1 + default: '' cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } page_1: + id: page_1 + display_title: Page + display_plugin: page + position: 1 display_options: - path: node - display_extenders: { } - css_class: grid--2 defaults: css_class: false header: false + css_class: grid--2 header: area: id: area @@ -366,21 +368,19 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: text empty: false - tokenize: false content: value: '<p class="text-align-center">Explore recipes across every type of occasion, ingredient, and skill level</p>' format: full_html - plugin_id: text + tokenize: false rendering_language: '***LANGUAGE_language_interface***' - display_plugin: page - display_title: Page - id: page_1 - position: 1 + display_extenders: { } + path: node cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } diff --git a/core/profiles/demo_umami/config/install/views.view.promoted_items.yml b/core/profiles/demo_umami/config/install/views.view.promoted_items.yml index 7d1262f62c2a..427c7d24afd9 100644 --- a/core/profiles/demo_umami/config/install/views.view.promoted_items.yml +++ b/core/profiles/demo_umami/config/install/views.view.promoted_items.yml @@ -18,74 +18,34 @@ base_table: node_field_data base_field: nid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: some - options: - items_per_page: 1 - offset: 0 - style: - type: default - row: - type: 'entity:node' - options: - relationship: none - view_mode: card_common + title: 'Promoted Items Double' fields: title: id: title table: node_field_data field: title + relationship: none + group_type: group + admin_label: '' entity_type: node entity_field: title + plugin_id: field label: '' + exclude: false alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false - hide_empty: false - empty_zero: false - settings: - link_to_entity: true - plugin_id: field - relationship: none - group_type: group - admin_label: '' - exclude: false element_type: '' element_class: '' element_label_type: '' @@ -95,9 +55,13 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true click_sort_column: value type: string + settings: + link_to_entity: true group_column: value group_columns: { } group_rows: true @@ -108,20 +72,61 @@ display: multi_type: separator separator: ', ' field_api_classes: false + pager: + type: some + options: + offset: 0 + items_per_page: 1 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } + sorts: + created: + id: created + table: node_field_data + field: created + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: created + plugin_id: date + order: DESC + expose: + label: '' + field_identifier: created + exposed: false + granularity: second + arguments: { } filters: status: - value: '1' + id: status table: node_field_data field: status - plugin_id: boolean entity_type: node entity_field: status - id: status + plugin_id: boolean + value: '1' + group: 1 expose: operator: '' operator_limit_selection: false operator_list: { } - group: 1 promote: id: promote table: node_field_data @@ -129,6 +134,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: promote + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -139,14 +147,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -159,9 +167,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: promote - plugin_id: boolean type: id: type table: node_field_data @@ -169,6 +174,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: type + plugin_id: bundle operator: in value: article: article @@ -181,6 +189,8 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false @@ -188,8 +198,6 @@ display: remember_roles: authenticated: authenticated reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -202,32 +210,24 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: type - plugin_id: bundle - sorts: - created: - id: created - table: node_field_data - field: created - order: DESC - entity_type: node - entity_field: created - plugin_id: date + style: + type: default + row: + type: 'entity:node' + options: relationship: none - group_type: group - admin_label: '' - exposed: false - expose: - label: '' - field_identifier: created - granularity: second - title: 'Promoted Items Double' + view_mode: card_common + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - arguments: { } display_extenders: { } cache_metadata: max-age: -1 @@ -238,50 +238,30 @@ display: - user.permissions tags: { } attachment_1: - display_plugin: attachment id: attachment_1 display_title: 'Attachment: Promoted Items Double' + display_plugin: attachment position: 3 display_options: - display_extenders: { } - displays: - block_1: block_1 - attachment_position: after - style: - type: default - options: { } - defaults: - style: false - row: false - css_class: false - filters: false - filter_groups: false - row: - type: 'entity:node' - options: - relationship: none - view_mode: card_common_alt pager: type: some options: - items_per_page: 2 offset: 0 - display_description: '' - css_class: view-promoted-items--double + items_per_page: 2 filters: status: - value: '1' + id: status table: node_field_data field: status - plugin_id: boolean entity_type: node entity_field: status - id: status + plugin_id: boolean + value: '1' + group: 1 expose: operator: '' operator_limit_selection: false operator_list: { } - group: 1 promote: id: promote table: node_field_data @@ -289,6 +269,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: promote + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -299,14 +282,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -319,9 +302,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: promote - plugin_id: boolean type: id: type table: node_field_data @@ -329,6 +309,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: type + plugin_id: bundle operator: in value: recipe: recipe @@ -340,6 +323,8 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false @@ -347,8 +332,6 @@ display: remember_roles: authenticated: authenticated reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -361,9 +344,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: type - plugin_id: bundle default_langcode: id: default_langcode table: node_field_data @@ -371,6 +351,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: default_langcode + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -401,14 +384,31 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: default_langcode - plugin_id: boolean filter_groups: operator: AND groups: 1: AND + style: + type: default + options: { } + row: + type: 'entity:node' + options: + relationship: none + view_mode: card_common_alt + defaults: + css_class: false + style: false + row: false + filters: false + filter_groups: false + css_class: view-promoted-items--double + display_description: '' rendering_language: '***LANGUAGE_language_interface***' + display_extenders: { } + displays: + block_1: block_1 + attachment_position: after cache_metadata: max-age: -1 contexts: @@ -417,32 +417,25 @@ display: - user.permissions tags: { } block_1: - display_plugin: block id: block_1 display_title: 'Block: Promoted Items - Single' + display_plugin: block position: 1 display_options: - display_extenders: { } - display_description: '' - css_class: 'container view-promoted-items--single' - defaults: - css_class: false - filters: false - filter_groups: false filters: status: - value: '1' + id: status table: node_field_data field: status - plugin_id: boolean entity_type: node entity_field: status - id: status + plugin_id: boolean + value: '1' + group: 1 expose: operator: '' operator_limit_selection: false operator_list: { } - group: 1 promote: id: promote table: node_field_data @@ -450,6 +443,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: promote + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -460,14 +456,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -480,9 +476,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: promote - plugin_id: boolean type: id: type table: node_field_data @@ -490,6 +483,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: type + plugin_id: bundle operator: in value: article: article @@ -501,6 +497,8 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false @@ -508,8 +506,6 @@ display: remember_roles: authenticated: authenticated reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -522,9 +518,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: type - plugin_id: bundle default_langcode: id: default_langcode table: node_field_data @@ -532,6 +525,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: default_langcode + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -562,14 +558,18 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: default_langcode - plugin_id: boolean filter_groups: operator: AND groups: 1: AND + defaults: + css_class: false + filters: false + filter_groups: false + css_class: 'container view-promoted-items--single' + display_description: '' rendering_language: '***LANGUAGE_language_interface***' + display_extenders: { } cache_metadata: max-age: -1 contexts: diff --git a/core/profiles/demo_umami/config/install/views.view.recipe_collections.yml b/core/profiles/demo_umami/config/install/views.view.recipe_collections.yml index 9113af5ef799..a66f543f8011 100644 --- a/core/profiles/demo_umami/config/install/views.view.recipe_collections.yml +++ b/core/profiles/demo_umami/config/install/views.view.recipe_collections.yml @@ -15,81 +15,34 @@ base_table: taxonomy_term_field_data base_field: tid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: some - options: - items_per_page: 16 - offset: 0 - style: - type: grid - options: - grouping: { } - columns: 4 - automatic_width: false - alignment: vertical - col_class_default: true - col_class_custom: '' - row_class_default: true - row_class_custom: '' - row: - type: fields + title: 'Recipe collections' fields: name: id: name table: taxonomy_term_field_data field: name + relationship: none + group_type: group + admin_label: '' entity_type: taxonomy_term entity_field: name + plugin_id: term_name label: '' + exclude: false alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false - hide_empty: false - empty_zero: false - type: string - settings: - link_to_entity: true - plugin_id: term_name - relationship: none - group_type: group - admin_label: '' - exclude: false element_type: '' element_class: '' element_label_type: '' @@ -99,8 +52,13 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true click_sort_column: value + type: string + settings: + link_to_entity: true group_column: value group_columns: { } group_rows: true @@ -112,20 +70,60 @@ display: separator: ', ' field_api_classes: false convert_spaces: false + pager: + type: some + options: + offset: 0 + items_per_page: 16 + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } + sorts: + name: + id: name + table: taxonomy_term_field_data + field: name + relationship: none + group_type: group + admin_label: '' + entity_type: taxonomy_term + entity_field: name + plugin_id: standard + order: ASC + expose: + label: '' + field_identifier: name + exposed: false + arguments: { } filters: vid: id: vid table: taxonomy_term_field_data field: vid - value: - tags: tags entity_type: taxonomy_term entity_field: vid plugin_id: bundle + value: + tags: tags + group: 1 expose: operator_limit_selection: false operator_list: { } - group: 1 default_langcode: id: default_langcode table: taxonomy_term_field_data @@ -133,6 +131,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: taxonomy_term + entity_field: default_langcode + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -163,36 +164,35 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: taxonomy_term - entity_field: default_langcode - plugin_id: boolean - sorts: - name: - id: name - table: taxonomy_term_field_data - field: name - relationship: none - group_type: group - admin_label: '' - order: ASC - exposed: false - expose: - label: '' - field_identifier: name - entity_type: taxonomy_term - entity_field: name - plugin_id: standard - title: 'Recipe collections' - header: { } - footer: { } - empty: { } - relationships: { } - arguments: { } - display_extenders: { } filter_groups: operator: AND groups: 1: AND + style: + type: grid + options: + grouping: { } + columns: 4 + automatic_width: false + alignment: vertical + row_class_custom: '' + row_class_default: true + col_class_custom: '' + col_class_default: true + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } + header: { } + footer: { } + display_extenders: { } cache_metadata: max-age: -1 contexts: @@ -201,14 +201,14 @@ display: - user.permissions tags: { } block: - display_plugin: block id: block display_title: Block + display_plugin: block position: 1 display_options: + rendering_language: '***LANGUAGE_language_interface***' display_extenders: { } block_hide_empty: true - rendering_language: '***LANGUAGE_language_interface***' cache_metadata: max-age: -1 contexts: diff --git a/core/profiles/demo_umami/config/install/views.view.recipes.yml b/core/profiles/demo_umami/config/install/views.view.recipes.yml index 80af602c9a05..b61340ad1bca 100644 --- a/core/profiles/demo_umami/config/install/views.view.recipes.yml +++ b/core/profiles/demo_umami/config/install/views.view.recipes.yml @@ -17,87 +17,34 @@ base_table: node_field_data base_field: nid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: mini - options: - items_per_page: 12 - offset: 0 - id: 0 - total_pages: null - tags: - previous: ‹‹ - next: ›› - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - style: - type: default - row: - type: 'entity:node' - options: - relationship: none - view_mode: card + title: Recipes fields: title: id: title table: node_field_data field: title + relationship: none + group_type: group + admin_label: '' entity_type: node entity_field: title + plugin_id: field label: '' + exclude: false alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false - hide_empty: false - empty_zero: false - settings: - link_to_entity: true - plugin_id: field - relationship: none - group_type: group - admin_label: '' - exclude: false element_type: '' element_class: '' element_label_type: '' @@ -107,9 +54,13 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true click_sort_column: value type: string + settings: + link_to_entity: true group_column: value group_columns: { } group_rows: true @@ -120,33 +71,102 @@ display: multi_type: separator separator: ', ' field_api_classes: false + pager: + type: mini + options: + offset: 0 + items_per_page: 12 + total_pages: null + id: 0 + tags: + next: ›› + previous: ‹‹ + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } + sorts: + created: + id: created + table: node_field_data + field: created + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: created + plugin_id: date + order: DESC + expose: + label: '' + field_identifier: created + exposed: false + granularity: second + nid: + id: nid + table: node_field_data + field: nid + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: nid + plugin_id: standard + order: ASC + expose: + label: '' + field_identifier: nid + exposed: false + arguments: { } filters: status: - value: '1' + id: status table: node_field_data field: status - plugin_id: boolean entity_type: node entity_field: status - id: status + plugin_id: boolean + value: '1' + group: 1 expose: operator: '' operator_limit_selection: false operator_list: { } - group: 1 type: id: type table: node_field_data field: type - value: - recipe: recipe entity_type: node entity_field: type plugin_id: bundle + value: + recipe: recipe + group: 1 expose: operator_limit_selection: false operator_list: { } - group: 1 default_langcode: id: default_langcode table: node_field_data @@ -154,6 +174,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: default_langcode + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -184,53 +207,30 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: default_langcode - plugin_id: boolean - sorts: - created: - id: created - table: node_field_data - field: created - order: DESC - entity_type: node - entity_field: created - plugin_id: date - relationship: none - group_type: group - admin_label: '' - exposed: false - expose: - label: '' - field_identifier: created - granularity: second - nid: - id: nid - table: node_field_data - field: nid - relationship: none - group_type: group - admin_label: '' - order: ASC - exposed: false - expose: - label: '' - field_identifier: nid - entity_type: node - entity_field: nid - plugin_id: standard - title: Recipes - header: { } - footer: { } - empty: { } - relationships: { } - arguments: { } - display_extenders: { } - css_class: grid--4 filter_groups: operator: AND groups: 1: AND + style: + type: default + row: + type: 'entity:node' + options: + relationship: none + view_mode: card + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } + css_class: grid--4 + header: { } + footer: { } + display_extenders: { } cache_metadata: max-age: -1 contexts: @@ -241,23 +241,23 @@ display: - user.permissions tags: { } page_1: - display_plugin: page id: page_1 display_title: Page + display_plugin: page position: 1 display_options: + rendering_language: '***LANGUAGE_language_interface***' display_extenders: { } path: recipes menu: type: normal title: Recipes description: '' + weight: 30 expanded: false + menu_name: main parent: '' - weight: 30 context: '0' - menu_name: main - rendering_language: '***LANGUAGE_language_interface***' cache_metadata: max-age: -1 contexts: diff --git a/core/profiles/demo_umami/config/install/views.view.taxonomy_term.yml b/core/profiles/demo_umami/config/install/views.view.taxonomy_term.yml index 7b8355922d3a..ecacb414f4e6 100644 --- a/core/profiles/demo_umami/config/install/views.view.taxonomy_term.yml +++ b/core/profiles/demo_umami/config/install/views.view.taxonomy_term.yml @@ -21,41 +21,17 @@ display: display_plugin: default position: 0 display_options: - query: - type: views_query - options: - query_comment: '' - disable_sql_rewrite: false - distinct: false - replica: false - query_tags: { } - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - exposed_form: - type: basic - options: - submit_button: Apply - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc + fields: { } pager: type: mini options: - items_per_page: 12 offset: 0 - id: 0 + items_per_page: 12 total_pages: 0 + id: 0 tags: - previous: ‹‹ next: ›› + previous: ‹‹ expose: items_per_page: false items_per_page_label: 'Items per page' @@ -64,33 +40,51 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } sorts: sticky: id: sticky table: taxonomy_index field: sticky - order: DESC - plugin_id: standard relationship: none group_type: group admin_label: '' - exposed: false + plugin_id: standard + order: DESC expose: label: '' field_identifier: sticky + exposed: false created: id: created table: taxonomy_index field: created - order: DESC - plugin_id: date relationship: none group_type: group admin_label: '' - exposed: false + plugin_id: date + order: DESC expose: label: '' field_identifier: created + exposed: false granularity: second arguments: tid: @@ -100,6 +94,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: taxonomy_index_tid default_action: 'not found' exception: value: '' @@ -114,8 +109,8 @@ display: summary_options: base_path: '' count: true - items_per_page: 25 override: false + items_per_page: 25 summary: sort_order: asc number_of_records: 0 @@ -125,15 +120,14 @@ display: type: 'entity:taxonomy_term' fail: 'not found' validate_options: + bundles: { } access: true operation: view multiple: 0 - bundles: { } break_phrase: false add_table: false require_value: false reduce_duplicates: false - plugin_id: taxonomy_index_tid filters: status: id: status @@ -142,6 +136,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -152,14 +147,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -172,7 +167,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: boolean default_langcode: id: default_langcode table: node_field_data @@ -180,6 +174,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: default_langcode + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -210,9 +207,10 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: default_langcode - plugin_id: boolean + filter_groups: + operator: AND + groups: + 1: AND style: type: default options: @@ -225,6 +223,18 @@ display: options: relationship: none view_mode: card + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } + css_class: grid--4 + link_display: page_1 + link_url: '' header: entity_taxonomy_term: id: entity_taxonomy_term @@ -233,32 +243,22 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: entity empty: true - tokenize: true target: '{{ raw_arguments.tid }}' view_mode: full + tokenize: true bypass_access: false - plugin_id: entity footer: { } - empty: { } - relationships: { } - fields: { } display_extenders: { } - link_url: '' - link_display: page_1 - css_class: grid--4 - filter_groups: - operator: AND - groups: - 1: AND cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } feed_1: id: feed_1 @@ -266,39 +266,39 @@ display: display_plugin: feed position: 2 display_options: - query: - type: views_query - options: { } + enabled: false pager: type: some options: - items_per_page: 10 offset: 0 - path: taxonomy/term/%/feed - displays: - page_1: page_1 - default: '0' + items_per_page: 10 style: type: rss options: - description: '' grouping: { } uses_fields: false + description: '' row: type: node_rss options: relationship: none view_mode: default - display_extenders: { } - enabled: false + query: + type: views_query + options: { } rendering_language: '***LANGUAGE_language_interface***' + display_extenders: { } + path: taxonomy/term/%/feed + displays: + page_1: page_1 + default: '0' cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } page_1: id: page_1 @@ -309,15 +309,15 @@ display: query: type: views_query options: { } - path: taxonomy/term/% - display_extenders: { } rendering_language: '***LANGUAGE_language_interface***' + display_extenders: { } + path: taxonomy/term/% cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } diff --git a/core/profiles/demo_umami/config/install/workflows.workflow.editorial.yml b/core/profiles/demo_umami/config/install/workflows.workflow.editorial.yml index 601289de9442..811320522d37 100644 --- a/core/profiles/demo_umami/config/install/workflows.workflow.editorial.yml +++ b/core/profiles/demo_umami/config/install/workflows.workflow.editorial.yml @@ -19,14 +19,14 @@ type_settings: default_revision: true draft: label: Draft + weight: -5 published: false default_revision: false - weight: -5 published: label: Published + weight: 0 published: true default_revision: true - weight: 0 transitions: archive: label: Archive @@ -48,18 +48,18 @@ type_settings: weight: 4 create_new_draft: label: 'Create New Draft' - to: draft - weight: 0 from: - draft - published + to: draft + weight: 0 publish: label: Publish - to: published - weight: 1 from: - draft - published + to: published + weight: 1 entity_types: node: - article diff --git a/core/profiles/demo_umami/config/optional/block.block.umami_banner_home.yml b/core/profiles/demo_umami/config/optional/block.block.umami_banner_home.yml index 7af458eb353d..024f70d48a64 100644 --- a/core/profiles/demo_umami/config/optional/block.block.umami_banner_home.yml +++ b/core/profiles/demo_umami/config/optional/block.block.umami_banner_home.yml @@ -3,14 +3,14 @@ status: true dependencies: content: - 'block_content:banner_block:9aadf4a1-ded6-4017-a10d-a5e043396edf' - enforced: - module: - - demo_umami_content module: - block_content - system theme: - umami + enforced: + module: + - demo_umami_content id: umami_banner_home theme: umami region: banner_top @@ -20,14 +20,14 @@ plugin: 'block_content:9aadf4a1-ded6-4017-a10d-a5e043396edf' settings: id: 'block_content:9aadf4a1-ded6-4017-a10d-a5e043396edf' label: 'Umami Home Banner' - provider: block_content label_display: '0' + provider: block_content status: true info: '' view_mode: full visibility: request_path: id: request_path - pages: '<front>' negate: false context_mapping: { } + pages: '<front>' diff --git a/core/profiles/demo_umami/config/optional/block.block.umami_banner_recipes.yml b/core/profiles/demo_umami/config/optional/block.block.umami_banner_recipes.yml index a37d73c4ed5d..5176f5f1c90e 100644 --- a/core/profiles/demo_umami/config/optional/block.block.umami_banner_recipes.yml +++ b/core/profiles/demo_umami/config/optional/block.block.umami_banner_recipes.yml @@ -3,14 +3,14 @@ status: true dependencies: content: - 'block_content:banner_block:4c7d58a3-a45d-412d-9068-259c57e40541' - enforced: - module: - - demo_umami_content module: - block_content - system theme: - umami + enforced: + module: + - demo_umami_content id: umami_banner_recipes theme: umami region: banner_top @@ -20,14 +20,14 @@ plugin: 'block_content:4c7d58a3-a45d-412d-9068-259c57e40541' settings: id: 'block_content:4c7d58a3-a45d-412d-9068-259c57e40541' label: 'Umami Recipes Banner' - provider: block_content label_display: '0' + provider: block_content status: true info: '' view_mode: full visibility: request_path: id: request_path - pages: "/recipes\r\n" negate: false context_mapping: { } + pages: "/recipes\r\n" diff --git a/core/profiles/demo_umami/config/optional/block.block.umami_disclaimer.yml b/core/profiles/demo_umami/config/optional/block.block.umami_disclaimer.yml index 178024cdf4b1..6817c0e70942 100644 --- a/core/profiles/demo_umami/config/optional/block.block.umami_disclaimer.yml +++ b/core/profiles/demo_umami/config/optional/block.block.umami_disclaimer.yml @@ -3,13 +3,13 @@ status: true dependencies: content: - 'block_content:disclaimer_block:9b4dcd67-99f3-48d0-93c9-2c46648b29de' - enforced: - module: - - demo_umami_content module: - block_content theme: - umami + enforced: + module: + - demo_umami_content id: umami_disclaimer theme: umami region: bottom @@ -19,8 +19,8 @@ plugin: 'block_content:9b4dcd67-99f3-48d0-93c9-2c46648b29de' settings: id: 'block_content:9b4dcd67-99f3-48d0-93c9-2c46648b29de' label: 'Umami disclaimer' - provider: block_content label_display: '0' + provider: block_content status: true info: '' view_mode: full diff --git a/core/profiles/demo_umami/config/optional/block.block.umami_footer_promo.yml b/core/profiles/demo_umami/config/optional/block.block.umami_footer_promo.yml index 1e8b82b2b3f9..8f80552d2c28 100644 --- a/core/profiles/demo_umami/config/optional/block.block.umami_footer_promo.yml +++ b/core/profiles/demo_umami/config/optional/block.block.umami_footer_promo.yml @@ -3,13 +3,13 @@ status: true dependencies: content: - 'block_content:footer_promo_block:924ab293-8f5f-45a1-9c7f-2423ae61a241' - enforced: - module: - - demo_umami_content module: - block_content theme: - umami + enforced: + module: + - demo_umami_content id: umami_footer_promo theme: umami region: footer @@ -19,8 +19,8 @@ plugin: 'block_content:924ab293-8f5f-45a1-9c7f-2423ae61a241' settings: id: 'block_content:924ab293-8f5f-45a1-9c7f-2423ae61a241' label: 'Umami footer promo' - provider: block_content label_display: '0' + provider: block_content status: true info: '' view_mode: full diff --git a/core/profiles/demo_umami/config/optional/responsive_image.styles.narrow.yml b/core/profiles/demo_umami/config/optional/responsive_image.styles.narrow.yml index 8f2426783fa6..51590cd7b205 100644 --- a/core/profiles/demo_umami/config/optional/responsive_image.styles.narrow.yml +++ b/core/profiles/demo_umami/config/optional/responsive_image.styles.narrow.yml @@ -9,8 +9,6 @@ id: narrow label: Narrow image_style_mappings: - - breakpoint_id: responsive_image.viewport_sizing - multiplier: 1x image_mapping_type: sizes image_mapping: sizes: '(min-width: 1290px) 325px, (min-width: 851px) 25vw, (min-width: 560px) 50vw, 100vw' @@ -18,5 +16,7 @@ image_style_mappings: - max_1300x1300 - max_650x650 - max_325x325 + breakpoint_id: responsive_image.viewport_sizing + multiplier: 1x breakpoint_group: responsive_image fallback_image_style: max_325x325 diff --git a/core/profiles/demo_umami/config/optional/responsive_image.styles.wide.yml b/core/profiles/demo_umami/config/optional/responsive_image.styles.wide.yml index f689ba8170fe..06cb8a98e805 100644 --- a/core/profiles/demo_umami/config/optional/responsive_image.styles.wide.yml +++ b/core/profiles/demo_umami/config/optional/responsive_image.styles.wide.yml @@ -10,8 +10,6 @@ id: wide label: Wide image_style_mappings: - - breakpoint_id: responsive_image.viewport_sizing - multiplier: 1x image_mapping_type: sizes image_mapping: sizes: '(min-width: 1290px) 1290px, 100vw' @@ -20,5 +18,7 @@ image_style_mappings: - max_1300x1300 - max_650x650 - max_325x325 + breakpoint_id: responsive_image.viewport_sizing + multiplier: 1x breakpoint_group: responsive_image fallback_image_style: max_325x325 diff --git a/core/profiles/demo_umami/config/optional/views.view.media.yml b/core/profiles/demo_umami/config/optional/views.view.media.yml index df4df46c72c9..0f2cba90c213 100644 --- a/core/profiles/demo_umami/config/optional/views.view.media.yml +++ b/core/profiles/demo_umami/config/optional/views.view.media.yml @@ -16,122 +16,12 @@ base_table: media_field_data base_field: mid display: default: - display_plugin: default id: default display_title: Default + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access media overview' - cache: - type: tag - options: { } - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Filter - reset_button: false - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: full - options: - items_per_page: 50 - offset: 0 - id: 0 - total_pages: null - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: '‹ Previous' - next: 'Next ›' - first: '« First' - last: 'Last »' - quantity: 9 - style: - type: table - options: - grouping: { } - row_class: '' - default_row_class: true - override: true - sticky: false - caption: '' - summary: '' - description: '' - columns: - name: name - bundle: bundle - changed: changed - uid: uid - status: status - thumbnail__target_id: thumbnail__target_id - info: - name: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - bundle: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - changed: - sortable: true - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: '' - uid: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - status: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - thumbnail__target_id: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - default: changed - empty_table: true - row: - type: fields + title: Media fields: media_bulk_form: id: media_bulk_form @@ -140,6 +30,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + plugin_id: bulk_form label: '' exclude: false alter: @@ -184,8 +76,6 @@ display: action_title: Action include_exclude: exclude selected_actions: { } - entity_type: media - plugin_id: bulk_form thumbnail__target_id: id: thumbnail__target_id table: media_field_data @@ -193,6 +83,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: thumbnail + plugin_id: field label: Thumbnail exclude: false alter: @@ -237,8 +130,8 @@ display: click_sort_column: target_id type: image settings: - image_style: thumbnail image_link: '' + image_style: thumbnail group_column: '' group_columns: { } group_rows: true @@ -249,34 +142,27 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: media - entity_field: thumbnail - plugin_id: field name: id: name table: media_field_data field: name + relationship: none + group_type: group + admin_label: '' entity_type: media entity_field: media + plugin_id: field + label: 'Media name' + exclude: false alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false - hide_empty: false - empty_zero: false - settings: - link_to_entity: true - plugin_id: field - relationship: none - group_type: group - admin_label: '' - label: 'Media name' - exclude: false element_type: '' element_class: '' element_label_type: '' @@ -286,9 +172,13 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true click_sort_column: value type: string + settings: + link_to_entity: true group_column: value group_columns: { } group_rows: true @@ -306,6 +196,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: bundle + plugin_id: field label: Type exclude: false alter: @@ -361,9 +254,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: media - entity_field: bundle - plugin_id: field uid: id: uid table: media_field_data @@ -371,6 +261,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: uid + plugin_id: field label: Author exclude: false alter: @@ -426,9 +319,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: media - entity_field: uid - plugin_id: field status: id: status table: media_field_data @@ -436,6 +326,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: status + plugin_id: field label: Status exclude: false alter: @@ -481,8 +374,8 @@ display: type: boolean settings: format: custom - format_custom_true: Published format_custom_false: Unpublished + format_custom_true: Published group_column: value group_columns: { } group_rows: true @@ -493,9 +386,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: media - entity_field: status - plugin_id: field changed: id: changed table: media_field_data @@ -503,6 +393,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: changed + plugin_id: field label: Updated exclude: false alter: @@ -560,9 +453,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: media - entity_field: changed - plugin_id: field operations: id: operations table: media @@ -570,6 +460,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + plugin_id: entity_operations label: Operations exclude: false alter: @@ -612,8 +504,74 @@ display: empty_zero: false hide_alter_empty: true destination: true + pager: + type: full + options: + offset: 0 + items_per_page: 50 + total_pages: null + id: 0 + tags: + next: 'Next ›' + previous: '‹ Previous' + first: '« First' + last: 'Last »' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + quantity: 9 + exposed_form: + type: basic + options: + submit_button: Filter + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access media overview' + cache: + type: tag + options: { } + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + plugin_id: text_custom + empty: true + content: 'No media available.' + tokenize: false + sorts: + created: + id: created + table: media_field_data + field: created + relationship: none + group_type: group + admin_label: '' entity_type: media - plugin_id: entity_operations + entity_field: created + plugin_id: date + order: DESC + expose: + label: '' + field_identifier: created + exposed: false + granularity: second + arguments: { } filters: name: id: name @@ -622,6 +580,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: name + plugin_id: string operator: contains value: '' group: 1 @@ -632,6 +593,8 @@ display: description: '' use_operator: false operator: name_op + operator_limit_selection: false + operator_list: { } identifier: name required: false remember: false @@ -640,8 +603,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -654,9 +615,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: media - entity_field: name - plugin_id: string bundle: id: bundle table: media_field_data @@ -664,6 +622,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: bundle + plugin_id: bundle operator: in value: { } group: 1 @@ -674,6 +635,8 @@ display: description: '' use_operator: false operator: bundle_op + operator_limit_selection: false + operator_list: { } identifier: type required: false remember: false @@ -683,8 +646,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -697,9 +658,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: media - entity_field: bundle - plugin_id: bundle status: id: status table: media_field_data @@ -707,6 +665,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: status + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -717,14 +678,14 @@ display: description: null use_operator: false operator: status_op + operator_limit_selection: false + operator_list: { } identifier: status required: true remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: true group_info: label: 'Published status' @@ -745,9 +706,6 @@ display: title: Unpublished operator: '=' value: '0' - plugin_id: boolean - entity_type: media - entity_field: status status_extra: id: status_extra table: media_field_data @@ -755,6 +713,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + plugin_id: media_status operator: '=' value: '' group: 1 @@ -785,8 +745,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: media - plugin_id: media_status langcode: id: langcode table: media_field_data @@ -794,6 +752,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: media + entity_field: langcode + plugin_id: language operator: in value: { } group: 1 @@ -804,6 +765,8 @@ display: description: '' use_operator: false operator: langcode_op + operator_limit_selection: false + operator_list: { } identifier: langcode required: false remember: false @@ -813,8 +776,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -827,43 +788,82 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: media - entity_field: langcode - plugin_id: language - sorts: - created: - id: created - table: media_field_data - field: created - order: DESC - entity_type: media - entity_field: created - plugin_id: date - relationship: none - group_type: group - admin_label: '' - exposed: false - expose: - label: '' - field_identifier: created - granularity: second - title: Media + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + name: name + bundle: bundle + changed: changed + uid: uid + status: status + thumbnail__target_id: thumbnail__target_id + default: changed + info: + name: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + bundle: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + changed: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: '' + uid: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + status: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + thumbnail__target_id: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: false + summary: '' + empty_table: true + caption: '' + description: '' + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - relationship: none - group_type: group - admin_label: '' - empty: true - tokenize: false - content: 'No media available.' - plugin_id: text_custom - relationships: { } - arguments: { } display_extenders: { } cache_metadata: max-age: 0 @@ -876,23 +876,23 @@ display: - user.permissions tags: { } media_page_list: - display_plugin: page id: media_page_list display_title: Media + display_plugin: page position: 1 display_options: + display_description: '' display_extenders: { } path: admin/content/media menu: type: tab title: Media description: '' + weight: 0 expanded: false + menu_name: main parent: '' - weight: 0 context: '0' - menu_name: main - display_description: '' cache_metadata: max-age: 0 contexts: diff --git a/core/profiles/minimal/config/install/block.block.stark_admin.yml b/core/profiles/minimal/config/install/block.block.stark_admin.yml index 4a30bafa0d22..b5a1006900d2 100644 --- a/core/profiles/minimal/config/install/block.block.stark_admin.yml +++ b/core/profiles/minimal/config/install/block.block.stark_admin.yml @@ -16,8 +16,8 @@ plugin: 'system_menu_block:admin' settings: id: 'system_menu_block:admin' label: Administration - provider: system label_display: visible + provider: system level: 1 depth: 0 expand_all_items: false diff --git a/core/profiles/minimal/config/install/block.block.stark_branding.yml b/core/profiles/minimal/config/install/block.block.stark_branding.yml index f3407459c8e5..2a7faaccd12b 100644 --- a/core/profiles/minimal/config/install/block.block.stark_branding.yml +++ b/core/profiles/minimal/config/install/block.block.stark_branding.yml @@ -14,8 +14,8 @@ plugin: system_branding_block settings: id: system_branding_block label: 'Site branding' - provider: system label_display: '0' + provider: system use_site_logo: true use_site_name: true use_site_slogan: true diff --git a/core/profiles/minimal/config/install/block.block.stark_local_actions.yml b/core/profiles/minimal/config/install/block.block.stark_local_actions.yml index 66b19e6b9cdf..7915dd72262e 100644 --- a/core/profiles/minimal/config/install/block.block.stark_local_actions.yml +++ b/core/profiles/minimal/config/install/block.block.stark_local_actions.yml @@ -12,6 +12,6 @@ plugin: local_actions_block settings: id: local_actions_block label: 'Primary admin actions' - provider: core label_display: '0' + provider: core visibility: { } diff --git a/core/profiles/minimal/config/install/block.block.stark_local_tasks.yml b/core/profiles/minimal/config/install/block.block.stark_local_tasks.yml index df1321954de6..b14bf21d7bf2 100644 --- a/core/profiles/minimal/config/install/block.block.stark_local_tasks.yml +++ b/core/profiles/minimal/config/install/block.block.stark_local_tasks.yml @@ -12,8 +12,8 @@ plugin: local_tasks_block settings: id: local_tasks_block label: Tabs - provider: core label_display: '0' + provider: core primary: true secondary: true visibility: { } diff --git a/core/profiles/minimal/config/install/block.block.stark_messages.yml b/core/profiles/minimal/config/install/block.block.stark_messages.yml index 085f7ee66d3b..9f7b8c4fa83d 100644 --- a/core/profiles/minimal/config/install/block.block.stark_messages.yml +++ b/core/profiles/minimal/config/install/block.block.stark_messages.yml @@ -14,6 +14,6 @@ plugin: system_messages_block settings: id: system_messages_block label: 'Status messages' - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/profiles/minimal/config/install/block.block.stark_page_title.yml b/core/profiles/minimal/config/install/block.block.stark_page_title.yml index d5fe87c9c46b..7b7f098bbd36 100644 --- a/core/profiles/minimal/config/install/block.block.stark_page_title.yml +++ b/core/profiles/minimal/config/install/block.block.stark_page_title.yml @@ -12,6 +12,6 @@ plugin: page_title_block settings: id: page_title_block label: 'Page title' - provider: core label_display: '0' + provider: core visibility: { } diff --git a/core/profiles/minimal/config/install/block.block.stark_tools.yml b/core/profiles/minimal/config/install/block.block.stark_tools.yml index fa8e72462b4a..854e3bda4e8b 100644 --- a/core/profiles/minimal/config/install/block.block.stark_tools.yml +++ b/core/profiles/minimal/config/install/block.block.stark_tools.yml @@ -16,8 +16,8 @@ plugin: 'system_menu_block:tools' settings: id: 'system_menu_block:tools' label: Tools - provider: system label_display: visible + provider: system level: 1 depth: 0 expand_all_items: false diff --git a/core/profiles/minimal/config/install/user.settings.yml b/core/profiles/minimal/config/install/user.settings.yml index 04195552a33c..39c032288a38 100644 --- a/core/profiles/minimal/config/install/user.settings.yml +++ b/core/profiles/minimal/config/install/user.settings.yml @@ -1,3 +1,4 @@ +langcode: en anonymous: Anonymous verify_mail: true notify: @@ -13,4 +14,3 @@ register: visitors_admin_approval cancel_method: user_cancel_block password_reset_timeout: 86400 password_strength: true -langcode: en diff --git a/core/profiles/standard/config/install/block.block.bartik_account_menu.yml b/core/profiles/standard/config/install/block.block.bartik_account_menu.yml index 7999f9a5edc0..0a88322e7bdc 100644 --- a/core/profiles/standard/config/install/block.block.bartik_account_menu.yml +++ b/core/profiles/standard/config/install/block.block.bartik_account_menu.yml @@ -16,8 +16,8 @@ plugin: 'system_menu_block:account' settings: id: 'system_menu_block:account' label: 'User account menu' - provider: system label_display: '0' + provider: system level: 1 depth: 1 expand_all_items: false diff --git a/core/profiles/standard/config/install/block.block.bartik_branding.yml b/core/profiles/standard/config/install/block.block.bartik_branding.yml index 6cf70a77c98c..2846213b9119 100644 --- a/core/profiles/standard/config/install/block.block.bartik_branding.yml +++ b/core/profiles/standard/config/install/block.block.bartik_branding.yml @@ -14,8 +14,8 @@ plugin: system_branding_block settings: id: system_branding_block label: 'Site branding' - provider: system label_display: '0' + provider: system use_site_logo: true use_site_name: true use_site_slogan: true diff --git a/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml b/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml index bce3d01baaa8..5d036c5f48e4 100644 --- a/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml +++ b/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml @@ -14,6 +14,6 @@ plugin: system_breadcrumb_block settings: id: system_breadcrumb_block label: Breadcrumbs - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_content.yml b/core/profiles/standard/config/install/block.block.bartik_content.yml index b1e0c801b445..007a65b82773 100644 --- a/core/profiles/standard/config/install/block.block.bartik_content.yml +++ b/core/profiles/standard/config/install/block.block.bartik_content.yml @@ -14,6 +14,6 @@ plugin: system_main_block settings: id: system_main_block label: 'Main page content' - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_footer.yml b/core/profiles/standard/config/install/block.block.bartik_footer.yml index 3e689c96b7f6..87ea1193b452 100644 --- a/core/profiles/standard/config/install/block.block.bartik_footer.yml +++ b/core/profiles/standard/config/install/block.block.bartik_footer.yml @@ -16,8 +16,8 @@ plugin: 'system_menu_block:footer' settings: id: 'system_menu_block:footer' label: 'Footer menu' - provider: system label_display: '0' + provider: system level: 1 depth: 0 expand_all_items: false diff --git a/core/profiles/standard/config/install/block.block.bartik_help.yml b/core/profiles/standard/config/install/block.block.bartik_help.yml index cf344d360c89..9d52ab412a18 100644 --- a/core/profiles/standard/config/install/block.block.bartik_help.yml +++ b/core/profiles/standard/config/install/block.block.bartik_help.yml @@ -14,6 +14,6 @@ plugin: help_block settings: id: help_block label: Help - provider: help label_display: '0' + provider: help visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_local_actions.yml b/core/profiles/standard/config/install/block.block.bartik_local_actions.yml index a58496db1c8e..cd2e4e206397 100644 --- a/core/profiles/standard/config/install/block.block.bartik_local_actions.yml +++ b/core/profiles/standard/config/install/block.block.bartik_local_actions.yml @@ -12,6 +12,6 @@ plugin: local_actions_block settings: id: local_actions_block label: 'Primary admin actions' - provider: core label_display: '0' + provider: core visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_local_tasks.yml b/core/profiles/standard/config/install/block.block.bartik_local_tasks.yml index 6b7c5d3a4ff0..11d56655d112 100644 --- a/core/profiles/standard/config/install/block.block.bartik_local_tasks.yml +++ b/core/profiles/standard/config/install/block.block.bartik_local_tasks.yml @@ -12,8 +12,8 @@ plugin: local_tasks_block settings: id: local_tasks_block label: Tabs - provider: core label_display: '0' + provider: core primary: true secondary: true visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_main_menu.yml b/core/profiles/standard/config/install/block.block.bartik_main_menu.yml index e2b601baf86a..ddc3454a4a1c 100644 --- a/core/profiles/standard/config/install/block.block.bartik_main_menu.yml +++ b/core/profiles/standard/config/install/block.block.bartik_main_menu.yml @@ -16,8 +16,8 @@ plugin: 'system_menu_block:main' settings: id: 'system_menu_block:main' label: 'Main navigation' - provider: system label_display: '0' + provider: system level: 1 depth: 1 expand_all_items: false diff --git a/core/profiles/standard/config/install/block.block.bartik_messages.yml b/core/profiles/standard/config/install/block.block.bartik_messages.yml index e6bb7d76605a..f5d3cc2ab9c6 100644 --- a/core/profiles/standard/config/install/block.block.bartik_messages.yml +++ b/core/profiles/standard/config/install/block.block.bartik_messages.yml @@ -14,6 +14,6 @@ plugin: system_messages_block settings: id: system_messages_block label: 'Status messages' - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_page_title.yml b/core/profiles/standard/config/install/block.block.bartik_page_title.yml index 21cfb2f0e9a1..26eadb6b08d8 100644 --- a/core/profiles/standard/config/install/block.block.bartik_page_title.yml +++ b/core/profiles/standard/config/install/block.block.bartik_page_title.yml @@ -12,6 +12,6 @@ plugin: page_title_block settings: id: page_title_block label: 'Page title' - provider: core label_display: '0' + provider: core visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_powered.yml b/core/profiles/standard/config/install/block.block.bartik_powered.yml index bb74cc80d7af..447b92630cde 100644 --- a/core/profiles/standard/config/install/block.block.bartik_powered.yml +++ b/core/profiles/standard/config/install/block.block.bartik_powered.yml @@ -14,6 +14,6 @@ plugin: system_powered_by_block settings: id: system_powered_by_block label: 'Powered by Drupal' - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_search.yml b/core/profiles/standard/config/install/block.block.bartik_search.yml index 8a21f816dc6b..6e11e33439af 100644 --- a/core/profiles/standard/config/install/block.block.bartik_search.yml +++ b/core/profiles/standard/config/install/block.block.bartik_search.yml @@ -14,7 +14,7 @@ plugin: search_form_block settings: id: search_form_block label: Search - provider: search label_display: visible + provider: search page_id: node_search visibility: { } diff --git a/core/profiles/standard/config/install/block.block.bartik_tools.yml b/core/profiles/standard/config/install/block.block.bartik_tools.yml index 8734d2e0c4c1..baf222491f6e 100644 --- a/core/profiles/standard/config/install/block.block.bartik_tools.yml +++ b/core/profiles/standard/config/install/block.block.bartik_tools.yml @@ -16,8 +16,8 @@ plugin: 'system_menu_block:tools' settings: id: 'system_menu_block:tools' label: Tools - provider: system label_display: visible + provider: system level: 1 depth: 0 expand_all_items: false diff --git a/core/profiles/standard/config/install/block.block.seven_breadcrumbs.yml b/core/profiles/standard/config/install/block.block.seven_breadcrumbs.yml index edbdfbd125df..fb8fc8add236 100644 --- a/core/profiles/standard/config/install/block.block.seven_breadcrumbs.yml +++ b/core/profiles/standard/config/install/block.block.seven_breadcrumbs.yml @@ -14,6 +14,6 @@ plugin: system_breadcrumb_block settings: id: system_breadcrumb_block label: Breadcrumbs - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/profiles/standard/config/install/block.block.seven_content.yml b/core/profiles/standard/config/install/block.block.seven_content.yml index d92214c67df9..3a68a17efa69 100644 --- a/core/profiles/standard/config/install/block.block.seven_content.yml +++ b/core/profiles/standard/config/install/block.block.seven_content.yml @@ -14,6 +14,6 @@ plugin: system_main_block settings: id: system_main_block label: 'Main page content' - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/profiles/standard/config/install/block.block.seven_help.yml b/core/profiles/standard/config/install/block.block.seven_help.yml index 9a4e2180f3b2..7baf371d5740 100644 --- a/core/profiles/standard/config/install/block.block.seven_help.yml +++ b/core/profiles/standard/config/install/block.block.seven_help.yml @@ -14,6 +14,6 @@ plugin: help_block settings: id: help_block label: Help - provider: help label_display: '0' + provider: help visibility: { } diff --git a/core/profiles/standard/config/install/block.block.seven_local_actions.yml b/core/profiles/standard/config/install/block.block.seven_local_actions.yml index 61cdb177c832..a4df3350b5f0 100644 --- a/core/profiles/standard/config/install/block.block.seven_local_actions.yml +++ b/core/profiles/standard/config/install/block.block.seven_local_actions.yml @@ -12,6 +12,6 @@ plugin: local_actions_block settings: id: local_actions_block label: 'Primary admin actions' - provider: core label_display: '0' + provider: core visibility: { } diff --git a/core/profiles/standard/config/install/block.block.seven_messages.yml b/core/profiles/standard/config/install/block.block.seven_messages.yml index f7b6038b230e..992033d5e715 100644 --- a/core/profiles/standard/config/install/block.block.seven_messages.yml +++ b/core/profiles/standard/config/install/block.block.seven_messages.yml @@ -14,6 +14,6 @@ plugin: system_messages_block settings: id: system_messages_block label: 'Status messages' - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/profiles/standard/config/install/block.block.seven_page_title.yml b/core/profiles/standard/config/install/block.block.seven_page_title.yml index 56df293f3bb3..7a8579a329e3 100644 --- a/core/profiles/standard/config/install/block.block.seven_page_title.yml +++ b/core/profiles/standard/config/install/block.block.seven_page_title.yml @@ -12,6 +12,6 @@ plugin: page_title_block settings: id: page_title_block label: 'Page title' - provider: core label_display: '0' + provider: core visibility: { } diff --git a/core/profiles/standard/config/install/block.block.seven_primary_local_tasks.yml b/core/profiles/standard/config/install/block.block.seven_primary_local_tasks.yml index d0017c2c8fe1..de72133937f9 100644 --- a/core/profiles/standard/config/install/block.block.seven_primary_local_tasks.yml +++ b/core/profiles/standard/config/install/block.block.seven_primary_local_tasks.yml @@ -12,8 +12,8 @@ plugin: local_tasks_block settings: id: local_tasks_block label: 'Primary tabs' - provider: core label_display: '0' + provider: core primary: true secondary: false visibility: { } diff --git a/core/profiles/standard/config/install/block.block.seven_secondary_local_tasks.yml b/core/profiles/standard/config/install/block.block.seven_secondary_local_tasks.yml index 33391991c7db..6478c6726c93 100644 --- a/core/profiles/standard/config/install/block.block.seven_secondary_local_tasks.yml +++ b/core/profiles/standard/config/install/block.block.seven_secondary_local_tasks.yml @@ -12,8 +12,8 @@ plugin: local_tasks_block settings: id: local_tasks_block label: 'Secondary tabs' - provider: core label_display: '0' + provider: core primary: false secondary: true visibility: { } diff --git a/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml b/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml index 1f7102dd49ed..a0333f736a43 100644 --- a/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml +++ b/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml @@ -66,24 +66,24 @@ content: third_party_settings: { } promote: type: boolean_checkbox - settings: - display_label: true weight: 15 region: content + settings: + display_label: true third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 120 region: content + settings: + display_label: true third_party_settings: { } sticky: type: boolean_checkbox - settings: - display_label: true weight: 16 region: content + settings: + display_label: true third_party_settings: { } title: type: string_textfield diff --git a/core/profiles/standard/config/install/core.entity_form_display.node.page.default.yml b/core/profiles/standard/config/install/core.entity_form_display.node.page.default.yml index 342988cbe27e..edb853ed3de0 100644 --- a/core/profiles/standard/config/install/core.entity_form_display.node.page.default.yml +++ b/core/profiles/standard/config/install/core.entity_form_display.node.page.default.yml @@ -36,24 +36,24 @@ content: third_party_settings: { } promote: type: boolean_checkbox - settings: - display_label: true weight: 15 region: content + settings: + display_label: true third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 120 region: content + settings: + display_label: true third_party_settings: { } sticky: type: boolean_checkbox - settings: - display_label: true weight: 16 region: content + settings: + display_label: true third_party_settings: { } title: type: string_textfield diff --git a/core/profiles/standard/config/install/core.entity_form_display.user.user.default.yml b/core/profiles/standard/config/install/core.entity_form_display.user.user.default.yml index 683222926890..8098d4688a6d 100644 --- a/core/profiles/standard/config/install/core.entity_form_display.user.user.default.yml +++ b/core/profiles/standard/config/install/core.entity_form_display.user.user.default.yml @@ -26,10 +26,10 @@ content: region: content user_picture: type: image_image + weight: -1 + region: content settings: progress_indicator: throbber preview_image_style: thumbnail third_party_settings: { } - weight: -1 - region: content hidden: { } diff --git a/core/profiles/standard/config/install/core.entity_view_display.block_content.basic.default.yml b/core/profiles/standard/config/install/core.entity_view_display.block_content.basic.default.yml index e494882d40a8..f4bb96567d4c 100644 --- a/core/profiles/standard/config/install/core.entity_view_display.block_content.basic.default.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.block_content.basic.default.yml @@ -12,10 +12,10 @@ bundle: basic mode: default content: body: - label: hidden type: text_default - weight: 0 - region: content + label: hidden settings: { } third_party_settings: { } + weight: 0 + region: content hidden: { } diff --git a/core/profiles/standard/config/install/core.entity_view_display.comment.comment.default.yml b/core/profiles/standard/config/install/core.entity_view_display.comment.comment.default.yml index 6ae213d3ee0d..b9fdd2bac71d 100644 --- a/core/profiles/standard/config/install/core.entity_view_display.comment.comment.default.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.comment.comment.default.yml @@ -12,12 +12,12 @@ bundle: comment mode: default content: comment_body: - label: hidden type: text_default - weight: 0 - region: content + label: hidden settings: { } third_party_settings: { } + weight: 0 + region: content links: weight: 100 region: content diff --git a/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml b/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml index 5019b6503d79..653fb9eef53a 100644 --- a/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml @@ -21,40 +21,40 @@ mode: default content: body: type: text_default - weight: 0 - region: content + label: hidden settings: { } third_party_settings: { } - label: hidden + weight: 0 + region: content comment: type: comment_default - weight: 110 - region: content label: above settings: view_mode: default pager_id: 0 third_party_settings: { } + weight: 110 + region: content field_image: type: image - weight: -1 - region: content + label: hidden settings: - image_style: large image_link: '' + image_style: large third_party_settings: { } - label: hidden + weight: -1 + region: content field_tags: type: entity_reference_label - weight: 10 - region: content label: above settings: link: true third_party_settings: { } - links: - weight: 100 + weight: 10 region: content + links: settings: { } third_party_settings: { } + weight: 100 + region: content hidden: { } diff --git a/core/profiles/standard/config/install/core.entity_view_display.node.article.teaser.yml b/core/profiles/standard/config/install/core.entity_view_display.node.article.teaser.yml index 7b96908bed1c..ffc5ebf81839 100644 --- a/core/profiles/standard/config/install/core.entity_view_display.node.article.teaser.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.node.article.teaser.yml @@ -20,29 +20,29 @@ mode: teaser content: body: type: text_summary_or_trimmed - weight: 0 - region: content + label: hidden settings: trim_length: 600 third_party_settings: { } - label: hidden + weight: 0 + region: content field_image: type: image - weight: -1 - region: content + label: hidden settings: - image_style: medium image_link: content + image_style: medium third_party_settings: { } - label: hidden + weight: -1 + region: content field_tags: type: entity_reference_label - weight: 10 - region: content + label: above settings: link: true third_party_settings: { } - label: above + weight: 10 + region: content links: weight: 100 region: content diff --git a/core/profiles/standard/config/install/core.entity_view_display.node.page.default.yml b/core/profiles/standard/config/install/core.entity_view_display.node.page.default.yml index 8afd9423ec6b..bd70482cd1da 100644 --- a/core/profiles/standard/config/install/core.entity_view_display.node.page.default.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.node.page.default.yml @@ -13,12 +13,12 @@ bundle: page mode: default content: body: - label: hidden type: text_default - weight: 100 - region: content + label: hidden settings: { } third_party_settings: { } + weight: 100 + region: content links: weight: 101 region: content diff --git a/core/profiles/standard/config/install/core.entity_view_display.node.page.teaser.yml b/core/profiles/standard/config/install/core.entity_view_display.node.page.teaser.yml index bc7a68c5b5fd..34a70d932faa 100644 --- a/core/profiles/standard/config/install/core.entity_view_display.node.page.teaser.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.node.page.teaser.yml @@ -14,13 +14,13 @@ bundle: page mode: teaser content: body: - label: hidden type: text_summary_or_trimmed - weight: 100 - region: content + label: hidden settings: trim_length: 600 third_party_settings: { } + weight: 100 + region: content links: weight: 101 region: content diff --git a/core/profiles/standard/config/install/core.entity_view_display.user.user.compact.yml b/core/profiles/standard/config/install/core.entity_view_display.user.user.compact.yml index 2ff13ad10f02..e67de152a4b9 100644 --- a/core/profiles/standard/config/install/core.entity_view_display.user.user.compact.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.user.user.compact.yml @@ -15,12 +15,12 @@ mode: compact content: user_picture: type: image - weight: 0 - region: content + label: hidden settings: - image_style: thumbnail image_link: content + image_style: thumbnail third_party_settings: { } - label: hidden + weight: 0 + region: content hidden: member_for: true diff --git a/core/profiles/standard/config/install/core.entity_view_display.user.user.default.yml b/core/profiles/standard/config/install/core.entity_view_display.user.user.default.yml index ef1fdd79ce42..ee56a2b2c46b 100644 --- a/core/profiles/standard/config/install/core.entity_view_display.user.user.default.yml +++ b/core/profiles/standard/config/install/core.entity_view_display.user.user.default.yml @@ -17,11 +17,11 @@ content: region: content user_picture: type: image - weight: 0 - region: content + label: hidden settings: - image_style: thumbnail image_link: content + image_style: thumbnail third_party_settings: { } - label: hidden + weight: 0 + region: content hidden: { } diff --git a/core/profiles/standard/config/install/core.menu.static_menu_link_overrides.yml b/core/profiles/standard/config/install/core.menu.static_menu_link_overrides.yml index 114c789369a4..14af566d7fd7 100644 --- a/core/profiles/standard/config/install/core.menu.static_menu_link_overrides.yml +++ b/core/profiles/standard/config/install/core.menu.static_menu_link_overrides.yml @@ -1,7 +1,7 @@ definitions: contact__site_page: - enabled: true menu_name: footer parent: '' weight: 0 expanded: false + enabled: true diff --git a/core/profiles/standard/config/install/field.field.node.article.comment.yml b/core/profiles/standard/config/install/field.field.node.article.comment.yml index 922015ed9666..cf3b12af98f5 100644 --- a/core/profiles/standard/config/install/field.field.node.article.comment.yml +++ b/core/profiles/standard/config/install/field.field.node.article.comment.yml @@ -18,15 +18,15 @@ default_value: - status: 2 cid: 0 - last_comment_name: null last_comment_timestamp: 0 + last_comment_name: null last_comment_uid: 0 comment_count: 0 default_value_callback: '' settings: default_mode: 1 per_page: 50 - form_location: true anonymous: 0 + form_location: true preview: 1 field_type: comment diff --git a/core/profiles/standard/config/install/field.field.node.article.field_image.yml b/core/profiles/standard/config/install/field.field.node.article.field_image.yml index b4b1c1466b7d..ab7b9940a74a 100644 --- a/core/profiles/standard/config/install/field.field.node.article.field_image.yml +++ b/core/profiles/standard/config/install/field.field.node.article.field_image.yml @@ -17,14 +17,16 @@ translatable: true default_value: { } default_value_callback: '' settings: + handler: 'default:file' + handler_settings: { } file_directory: '[date:custom:Y]-[date:custom:m]' file_extensions: 'png gif jpg jpeg' max_filesize: '' max_resolution: '' min_resolution: '' alt_field: true - title_field: false alt_field_required: true + title_field: false title_field_required: false default_image: uuid: null @@ -32,6 +34,4 @@ settings: title: '' width: null height: null - handler: 'default:file' - handler_settings: { } field_type: image diff --git a/core/profiles/standard/config/install/field.field.user.user.user_picture.yml b/core/profiles/standard/config/install/field.field.user.user.user_picture.yml index e06bd7d74d47..1038af3419e8 100644 --- a/core/profiles/standard/config/install/field.field.user.user.user_picture.yml +++ b/core/profiles/standard/config/install/field.field.user.user.user_picture.yml @@ -17,21 +17,21 @@ translatable: true default_value: { } default_value_callback: '' settings: - file_extensions: 'png gif jpg jpeg' + handler: 'default:file' + handler_settings: { } file_directory: 'pictures/[date:custom:Y]-[date:custom:m]' + file_extensions: 'png gif jpg jpeg' max_filesize: '' - alt_field: false - title_field: false max_resolution: '' min_resolution: '' + alt_field: false + alt_field_required: false + title_field: false + title_field_required: false default_image: uuid: null alt: '' title: '' width: null height: null - alt_field_required: false - title_field_required: false - handler: 'default:file' - handler_settings: { } field_type: image diff --git a/core/profiles/standard/config/install/field.storage.node.field_image.yml b/core/profiles/standard/config/install/field.storage.node.field_image.yml index e4da7085460c..a6964d3b0aab 100644 --- a/core/profiles/standard/config/install/field.storage.node.field_image.yml +++ b/core/profiles/standard/config/install/field.storage.node.field_image.yml @@ -10,6 +10,9 @@ field_name: field_image entity_type: node type: image settings: + target_type: file + display_field: false + display_default: false uri_scheme: public default_image: uuid: null @@ -17,9 +20,6 @@ settings: title: '' width: null height: null - target_type: file - display_field: false - display_default: false module: image locked: false cardinality: 1 diff --git a/core/profiles/standard/config/install/field.storage.user.user_picture.yml b/core/profiles/standard/config/install/field.storage.user.user_picture.yml index 82536283efc4..6d0476df6c20 100644 --- a/core/profiles/standard/config/install/field.storage.user.user_picture.yml +++ b/core/profiles/standard/config/install/field.storage.user.user_picture.yml @@ -10,6 +10,9 @@ field_name: user_picture entity_type: user type: image settings: + target_type: file + display_field: false + display_default: false uri_scheme: public default_image: uuid: null @@ -17,9 +20,6 @@ settings: title: '' width: null height: null - target_type: file - display_field: false - display_default: false module: image locked: false cardinality: 1 diff --git a/core/profiles/standard/config/install/system.site.yml b/core/profiles/standard/config/install/system.site.yml index 46a19562fec1..cc529097b646 100644 --- a/core/profiles/standard/config/install/system.site.yml +++ b/core/profiles/standard/config/install/system.site.yml @@ -1,3 +1,4 @@ +langcode: en uuid: '' name: '' mail: '' @@ -8,5 +9,4 @@ page: front: /node admin_compact_mode: false weight_select_max: 100 -langcode: en default_langcode: en diff --git a/core/profiles/standard/config/install/user.settings.yml b/core/profiles/standard/config/install/user.settings.yml index 04195552a33c..39c032288a38 100644 --- a/core/profiles/standard/config/install/user.settings.yml +++ b/core/profiles/standard/config/install/user.settings.yml @@ -1,3 +1,4 @@ +langcode: en anonymous: Anonymous verify_mail: true notify: @@ -13,4 +14,3 @@ register: visitors_admin_approval cancel_method: user_cancel_block password_reset_timeout: 86400 password_strength: true -langcode: en diff --git a/core/profiles/standard/config/optional/core.entity_form_display.media.audio.default.yml b/core/profiles/standard/config/optional/core.entity_form_display.media.audio.default.yml index f016c1ee47b5..55854bcb88ab 100644 --- a/core/profiles/standard/config/optional/core.entity_form_display.media.audio.default.yml +++ b/core/profiles/standard/config/optional/core.entity_form_display.media.audio.default.yml @@ -19,12 +19,12 @@ content: settings: { } third_party_settings: { } field_media_audio_file: + type: file_generic weight: 0 + region: content settings: progress_indicator: throbber third_party_settings: { } - type: file_generic - region: content path: type: path weight: 30 @@ -33,20 +33,20 @@ content: third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 100 region: content + settings: + display_label: true third_party_settings: { } uid: type: entity_reference_autocomplete weight: 5 + region: content settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' - region: content third_party_settings: { } hidden: name: true diff --git a/core/profiles/standard/config/optional/core.entity_form_display.media.document.default.yml b/core/profiles/standard/config/optional/core.entity_form_display.media.document.default.yml index 82cedc37e0cf..cab3df27a713 100644 --- a/core/profiles/standard/config/optional/core.entity_form_display.media.document.default.yml +++ b/core/profiles/standard/config/optional/core.entity_form_display.media.document.default.yml @@ -18,28 +18,28 @@ content: settings: { } third_party_settings: { } field_media_document: - settings: - progress_indicator: throbber - third_party_settings: { } type: file_generic weight: 0 region: content + settings: + progress_indicator: throbber + third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 100 region: content + settings: + display_label: true third_party_settings: { } uid: type: entity_reference_autocomplete weight: 5 + region: content settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' - region: content third_party_settings: { } hidden: name: true diff --git a/core/profiles/standard/config/optional/core.entity_form_display.media.image.default.yml b/core/profiles/standard/config/optional/core.entity_form_display.media.image.default.yml index 1203f9415998..5c1795cb0e13 100644 --- a/core/profiles/standard/config/optional/core.entity_form_display.media.image.default.yml +++ b/core/profiles/standard/config/optional/core.entity_form_display.media.image.default.yml @@ -19,29 +19,29 @@ content: settings: { } third_party_settings: { } field_media_image: + type: image_image + weight: 0 + region: content settings: progress_indicator: throbber preview_image_style: thumbnail third_party_settings: { } - type: image_image - weight: 0 - region: content status: type: boolean_checkbox - settings: - display_label: true weight: 100 region: content + settings: + display_label: true third_party_settings: { } uid: type: entity_reference_autocomplete weight: 5 + region: content settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' - region: content third_party_settings: { } hidden: name: true diff --git a/core/profiles/standard/config/optional/core.entity_form_display.media.remote_video.default.yml b/core/profiles/standard/config/optional/core.entity_form_display.media.remote_video.default.yml index 3fe271b4f73a..0f57855dd0a4 100644 --- a/core/profiles/standard/config/optional/core.entity_form_display.media.remote_video.default.yml +++ b/core/profiles/standard/config/optional/core.entity_form_display.media.remote_video.default.yml @@ -21,11 +21,11 @@ content: field_media_oembed_video: type: oembed_textfield weight: 0 + region: content settings: size: 60 placeholder: '' third_party_settings: { } - region: content path: type: path weight: 30 @@ -34,20 +34,20 @@ content: third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 100 region: content + settings: + display_label: true third_party_settings: { } uid: type: entity_reference_autocomplete weight: 5 + region: content settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' - region: content third_party_settings: { } hidden: name: true diff --git a/core/profiles/standard/config/optional/core.entity_form_display.media.video.default.yml b/core/profiles/standard/config/optional/core.entity_form_display.media.video.default.yml index f1001d6c7b7b..e3fdffe0dab7 100644 --- a/core/profiles/standard/config/optional/core.entity_form_display.media.video.default.yml +++ b/core/profiles/standard/config/optional/core.entity_form_display.media.video.default.yml @@ -19,12 +19,12 @@ content: settings: { } third_party_settings: { } field_media_video_file: + type: file_generic weight: 0 + region: content settings: progress_indicator: throbber third_party_settings: { } - type: file_generic - region: content path: type: path weight: 30 @@ -33,20 +33,20 @@ content: third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 100 region: content + settings: + display_label: true third_party_settings: { } uid: type: entity_reference_autocomplete weight: 5 + region: content settings: match_operator: CONTAINS match_limit: 10 size: 60 placeholder: '' - region: content third_party_settings: { } hidden: name: true diff --git a/core/profiles/standard/config/optional/core.entity_view_display.media.audio.default.yml b/core/profiles/standard/config/optional/core.entity_view_display.media.audio.default.yml index d77376c92068..2956f6913195 100644 --- a/core/profiles/standard/config/optional/core.entity_view_display.media.audio.default.yml +++ b/core/profiles/standard/config/optional/core.entity_view_display.media.audio.default.yml @@ -13,7 +13,6 @@ mode: default content: field_media_audio_file: type: file_audio - weight: 0 label: visually_hidden settings: controls: true @@ -21,6 +20,7 @@ content: loop: false multiple_file_display_type: tags third_party_settings: { } + weight: 0 region: content hidden: created: true diff --git a/core/profiles/standard/config/optional/core.entity_view_display.media.audio.media_library.yml b/core/profiles/standard/config/optional/core.entity_view_display.media.audio.media_library.yml index e74e3ebde6b2..f4a4055de4fe 100644 --- a/core/profiles/standard/config/optional/core.entity_view_display.media.audio.media_library.yml +++ b/core/profiles/standard/config/optional/core.entity_view_display.media.audio.media_library.yml @@ -15,13 +15,13 @@ mode: media_library content: thumbnail: type: image - weight: 0 - region: content label: hidden settings: - image_style: thumbnail image_link: '' + image_style: thumbnail third_party_settings: { } + weight: 0 + region: content hidden: created: true field_media_audio_file: true diff --git a/core/profiles/standard/config/optional/core.entity_view_display.media.document.default.yml b/core/profiles/standard/config/optional/core.entity_view_display.media.document.default.yml index aa2ad55d42dc..12187dbfbe58 100644 --- a/core/profiles/standard/config/optional/core.entity_view_display.media.document.default.yml +++ b/core/profiles/standard/config/optional/core.entity_view_display.media.document.default.yml @@ -12,10 +12,10 @@ bundle: document mode: default content: field_media_document: + type: file_default label: visually_hidden settings: { } third_party_settings: { } - type: file_default weight: 1 region: content hidden: diff --git a/core/profiles/standard/config/optional/core.entity_view_display.media.document.media_library.yml b/core/profiles/standard/config/optional/core.entity_view_display.media.document.media_library.yml index 967d1a4acfbc..24c0bee08038 100644 --- a/core/profiles/standard/config/optional/core.entity_view_display.media.document.media_library.yml +++ b/core/profiles/standard/config/optional/core.entity_view_display.media.document.media_library.yml @@ -15,13 +15,13 @@ mode: media_library content: thumbnail: type: image - weight: 0 - region: content label: hidden settings: - image_style: thumbnail image_link: '' + image_style: thumbnail third_party_settings: { } + weight: 0 + region: content hidden: created: true field_media_document: true diff --git a/core/profiles/standard/config/optional/core.entity_view_display.media.image.default.yml b/core/profiles/standard/config/optional/core.entity_view_display.media.image.default.yml index aeaebb2ecff7..0f0e8e414f03 100644 --- a/core/profiles/standard/config/optional/core.entity_view_display.media.image.default.yml +++ b/core/profiles/standard/config/optional/core.entity_view_display.media.image.default.yml @@ -13,12 +13,12 @@ bundle: image mode: default content: field_media_image: + type: image label: visually_hidden settings: - image_style: 'large' image_link: '' + image_style: large third_party_settings: { } - type: image weight: 1 region: content hidden: diff --git a/core/profiles/standard/config/optional/core.entity_view_display.media.image.media_library.yml b/core/profiles/standard/config/optional/core.entity_view_display.media.image.media_library.yml index a916760ad99b..75e513c9935b 100644 --- a/core/profiles/standard/config/optional/core.entity_view_display.media.image.media_library.yml +++ b/core/profiles/standard/config/optional/core.entity_view_display.media.image.media_library.yml @@ -15,13 +15,13 @@ mode: media_library content: thumbnail: type: image - weight: 0 - region: content label: hidden settings: - image_style: medium image_link: '' + image_style: medium third_party_settings: { } + weight: 0 + region: content hidden: created: true field_media_image: true diff --git a/core/profiles/standard/config/optional/core.entity_view_display.media.remote_video.default.yml b/core/profiles/standard/config/optional/core.entity_view_display.media.remote_video.default.yml index cc8c1388c634..f25014bd0f37 100644 --- a/core/profiles/standard/config/optional/core.entity_view_display.media.remote_video.default.yml +++ b/core/profiles/standard/config/optional/core.entity_view_display.media.remote_video.default.yml @@ -13,12 +13,12 @@ mode: default content: field_media_oembed_video: type: oembed - weight: 0 label: hidden settings: max_width: 0 max_height: 0 third_party_settings: { } + weight: 0 region: content hidden: created: true diff --git a/core/profiles/standard/config/optional/core.entity_view_display.media.remote_video.media_library.yml b/core/profiles/standard/config/optional/core.entity_view_display.media.remote_video.media_library.yml index 59fb8739f3d2..f56315c47ab3 100644 --- a/core/profiles/standard/config/optional/core.entity_view_display.media.remote_video.media_library.yml +++ b/core/profiles/standard/config/optional/core.entity_view_display.media.remote_video.media_library.yml @@ -15,13 +15,13 @@ mode: media_library content: thumbnail: type: image - weight: 0 - region: content label: hidden settings: - image_style: medium image_link: '' + image_style: medium third_party_settings: { } + weight: 0 + region: content hidden: created: true field_media_oembed_video: true diff --git a/core/profiles/standard/config/optional/core.entity_view_display.media.video.default.yml b/core/profiles/standard/config/optional/core.entity_view_display.media.video.default.yml index 38606f726aa2..3c26f17aae3e 100644 --- a/core/profiles/standard/config/optional/core.entity_view_display.media.video.default.yml +++ b/core/profiles/standard/config/optional/core.entity_view_display.media.video.default.yml @@ -13,17 +13,17 @@ mode: default content: field_media_video_file: type: file_video - weight: 0 label: visually_hidden settings: - muted: false - width: 640 - height: 480 controls: true autoplay: false loop: false multiple_file_display_type: tags + muted: false + width: 640 + height: 480 third_party_settings: { } + weight: 0 region: content hidden: created: true diff --git a/core/profiles/standard/config/optional/core.entity_view_display.media.video.media_library.yml b/core/profiles/standard/config/optional/core.entity_view_display.media.video.media_library.yml index 33d4e8855553..5df8e5074a8c 100644 --- a/core/profiles/standard/config/optional/core.entity_view_display.media.video.media_library.yml +++ b/core/profiles/standard/config/optional/core.entity_view_display.media.video.media_library.yml @@ -15,13 +15,13 @@ mode: media_library content: thumbnail: type: image - weight: 0 - region: content label: hidden settings: - image_style: thumbnail image_link: '' + image_style: thumbnail third_party_settings: { } + weight: 0 + region: content hidden: created: true field_media_video_file: true diff --git a/core/profiles/standard/config/optional/field.field.media.audio.field_media_audio_file.yml b/core/profiles/standard/config/optional/field.field.media.audio.field_media_audio_file.yml index 5e013f3e974c..a4bb52eb859a 100644 --- a/core/profiles/standard/config/optional/field.field.media.audio.field_media_audio_file.yml +++ b/core/profiles/standard/config/optional/field.field.media.audio.field_media_audio_file.yml @@ -17,10 +17,10 @@ translatable: true default_value: { } default_value_callback: '' settings: - file_extensions: 'mp3 wav aac' + handler: 'default:file' + handler_settings: { } file_directory: '[date:custom:Y]-[date:custom:m]' + file_extensions: 'mp3 wav aac' max_filesize: '' description_field: false - handler: 'default:file' - handler_settings: { } field_type: file diff --git a/core/profiles/standard/config/optional/field.field.media.document.field_media_document.yml b/core/profiles/standard/config/optional/field.field.media.document.field_media_document.yml index 80a364686fbe..fb0b9909e2e8 100644 --- a/core/profiles/standard/config/optional/field.field.media.document.field_media_document.yml +++ b/core/profiles/standard/config/optional/field.field.media.document.field_media_document.yml @@ -4,11 +4,11 @@ dependencies: config: - field.storage.media.field_media_document - media.type.document + module: + - file enforced: module: - media - module: - - file id: media.document.field_media_document field_name: field_media_document entity_type: media @@ -20,10 +20,10 @@ translatable: true default_value: { } default_value_callback: '' settings: + handler: 'default:file' + handler_settings: { } file_directory: '[date:custom:Y]-[date:custom:m]' file_extensions: 'txt rtf doc docx ppt pptx xls xlsx pdf odf odg odp ods odt fodt fods fodp fodg key numbers pages' max_filesize: '' - handler: 'default:file' - handler_settings: { } description_field: false field_type: file diff --git a/core/profiles/standard/config/optional/field.field.media.image.field_media_image.yml b/core/profiles/standard/config/optional/field.field.media.image.field_media_image.yml index f6a62cc5958e..689315625eee 100644 --- a/core/profiles/standard/config/optional/field.field.media.image.field_media_image.yml +++ b/core/profiles/standard/config/optional/field.field.media.image.field_media_image.yml @@ -4,11 +4,11 @@ dependencies: config: - field.storage.media.field_media_image - media.type.image + module: + - image enforced: module: - media - module: - - image id: media.image.field_media_image field_name: field_media_image entity_type: media @@ -20,21 +20,21 @@ translatable: true default_value: { } default_value_callback: '' settings: + handler: 'default:file' + handler_settings: { } + file_directory: '[date:custom:Y]-[date:custom:m]' + file_extensions: 'png gif jpg jpeg' + max_filesize: '' + max_resolution: '' + min_resolution: '' alt_field: true alt_field_required: true title_field: false title_field_required: false - max_resolution: '' - min_resolution: '' default_image: uuid: null alt: '' title: '' width: null height: null - file_directory: '[date:custom:Y]-[date:custom:m]' - file_extensions: 'png gif jpg jpeg' - max_filesize: '' - handler: 'default:file' - handler_settings: { } field_type: image diff --git a/core/profiles/standard/config/optional/field.field.media.video.field_media_video_file.yml b/core/profiles/standard/config/optional/field.field.media.video.field_media_video_file.yml index 19c3b26cb0d8..b6c0be146e45 100644 --- a/core/profiles/standard/config/optional/field.field.media.video.field_media_video_file.yml +++ b/core/profiles/standard/config/optional/field.field.media.video.field_media_video_file.yml @@ -17,10 +17,10 @@ translatable: true default_value: { } default_value_callback: '' settings: - file_extensions: mp4 + handler: 'default:file' + handler_settings: { } file_directory: '[date:custom:Y]-[date:custom:m]' + file_extensions: mp4 max_filesize: '' description_field: false - handler: 'default:file' - handler_settings: { } field_type: file diff --git a/core/profiles/standard/config/optional/field.storage.media.field_media_document.yml b/core/profiles/standard/config/optional/field.storage.media.field_media_document.yml index 6d7d42535c1d..309e509de09f 100644 --- a/core/profiles/standard/config/optional/field.storage.media.field_media_document.yml +++ b/core/profiles/standard/config/optional/field.storage.media.field_media_document.yml @@ -1,21 +1,21 @@ langcode: en status: true dependencies: - enforced: - module: - - media module: - file - media + enforced: + module: + - media id: media.field_media_document field_name: field_media_document entity_type: media type: file settings: - uri_scheme: public target_type: file display_field: false display_default: false + uri_scheme: public module: file locked: false cardinality: 1 diff --git a/core/profiles/standard/config/optional/field.storage.media.field_media_image.yml b/core/profiles/standard/config/optional/field.storage.media.field_media_image.yml index 231200d59b33..59a6fbe14297 100644 --- a/core/profiles/standard/config/optional/field.storage.media.field_media_image.yml +++ b/core/profiles/standard/config/optional/field.storage.media.field_media_image.yml @@ -1,28 +1,28 @@ langcode: en status: true dependencies: - enforced: - module: - - media module: - file - image - media + enforced: + module: + - media id: media.field_media_image field_name: field_media_image entity_type: media type: image settings: + target_type: file + display_field: false + display_default: false + uri_scheme: public default_image: uuid: null alt: '' title: '' width: null height: null - target_type: file - display_field: false - display_default: false - uri_scheme: public module: image locked: false cardinality: 1 diff --git a/core/profiles/standard/config/optional/field.storage.media.field_media_oembed_video.yml b/core/profiles/standard/config/optional/field.storage.media.field_media_oembed_video.yml index 7485f1a6d24d..e8664f0b181c 100644 --- a/core/profiles/standard/config/optional/field.storage.media.field_media_oembed_video.yml +++ b/core/profiles/standard/config/optional/field.storage.media.field_media_oembed_video.yml @@ -9,8 +9,8 @@ entity_type: media type: string settings: max_length: 255 - is_ascii: false case_sensitive: false + is_ascii: false module: core locked: false cardinality: 1 diff --git a/core/profiles/standard/config/optional/image.style.max_1300x1300.yml b/core/profiles/standard/config/optional/image.style.max_1300x1300.yml index 5c9ca1d2a243..9a72789c8495 100644 --- a/core/profiles/standard/config/optional/image.style.max_1300x1300.yml +++ b/core/profiles/standard/config/optional/image.style.max_1300x1300.yml @@ -1,18 +1,18 @@ +langcode: en +dependencies: + module: + - responsive_image + enforced: + module: + - responsive_image name: max_1300x1300 label: 'Max 1300x1300' effects: 04caae9a-fa3e-4ea6-ae09-9c26aec7d308: + uuid: 04caae9a-fa3e-4ea6-ae09-9c26aec7d308 id: image_scale + weight: 1 data: width: 1300 height: 1300 upscale: false - weight: 1 - uuid: 04caae9a-fa3e-4ea6-ae09-9c26aec7d308 -langcode: en -dependencies: - module: - - responsive_image - enforced: - module: - - responsive_image diff --git a/core/profiles/standard/config/optional/image.style.max_2600x2600.yml b/core/profiles/standard/config/optional/image.style.max_2600x2600.yml index cef91d50ccf7..9754e2f925cb 100644 --- a/core/profiles/standard/config/optional/image.style.max_2600x2600.yml +++ b/core/profiles/standard/config/optional/image.style.max_2600x2600.yml @@ -1,18 +1,18 @@ +langcode: en +dependencies: + module: + - responsive_image + enforced: + module: + - responsive_image name: max_2600x2600 label: 'Max 2600x2600' effects: 9b311dd1-0351-45a1-9500-cd069e4670cb: + uuid: 9b311dd1-0351-45a1-9500-cd069e4670cb id: image_scale + weight: 3 data: width: 2600 height: 2600 upscale: false - weight: 3 - uuid: 9b311dd1-0351-45a1-9500-cd069e4670cb -langcode: en -dependencies: - module: - - responsive_image - enforced: - module: - - responsive_image diff --git a/core/profiles/standard/config/optional/image.style.max_325x325.yml b/core/profiles/standard/config/optional/image.style.max_325x325.yml index 30cb39e03029..e6bc09b25f57 100644 --- a/core/profiles/standard/config/optional/image.style.max_325x325.yml +++ b/core/profiles/standard/config/optional/image.style.max_325x325.yml @@ -1,18 +1,18 @@ +langcode: en +dependencies: + module: + - responsive_image + enforced: + module: + - responsive_image name: max_325x325 label: 'Max 325x325' effects: cb842cc8-682f-42a6-bd05-5a1ac726f0d8: + uuid: cb842cc8-682f-42a6-bd05-5a1ac726f0d8 id: image_scale + weight: 1 data: width: 325 height: 325 upscale: false - weight: 1 - uuid: cb842cc8-682f-42a6-bd05-5a1ac726f0d8 -langcode: en -dependencies: - module: - - responsive_image - enforced: - module: - - responsive_image diff --git a/core/profiles/standard/config/optional/image.style.max_650x650.yml b/core/profiles/standard/config/optional/image.style.max_650x650.yml index 30bd8c44f1f3..87b47f784a92 100644 --- a/core/profiles/standard/config/optional/image.style.max_650x650.yml +++ b/core/profiles/standard/config/optional/image.style.max_650x650.yml @@ -1,18 +1,18 @@ +langcode: en +dependencies: + module: + - responsive_image + enforced: + module: + - responsive_image name: max_650x650 label: 'Max 650x650' effects: 949c201a-77f5-48f6-ba00-be91eb1aad47: + uuid: 949c201a-77f5-48f6-ba00-be91eb1aad47 id: image_scale + weight: 1 data: width: 650 height: 650 upscale: false - weight: 1 - uuid: 949c201a-77f5-48f6-ba00-be91eb1aad47 -langcode: en -dependencies: - module: - - responsive_image - enforced: - module: - - responsive_image diff --git a/core/profiles/standard/config/optional/media.type.remote_video.yml b/core/profiles/standard/config/optional/media.type.remote_video.yml index ad299681f398..203d69832765 100644 --- a/core/profiles/standard/config/optional/media.type.remote_video.yml +++ b/core/profiles/standard/config/optional/media.type.remote_video.yml @@ -8,10 +8,10 @@ source: 'oembed:video' queue_thumbnail_downloads: false new_revision: true source_configuration: + source_field: field_media_oembed_video thumbnails_directory: 'public://oembed_thumbnails/[date:custom:Y-m]' providers: - YouTube - Vimeo - source_field: field_media_oembed_video field_map: title: name diff --git a/core/profiles/standard/config/optional/responsive_image.styles.narrow.yml b/core/profiles/standard/config/optional/responsive_image.styles.narrow.yml index df56ec9d1e37..64be41160a84 100644 --- a/core/profiles/standard/config/optional/responsive_image.styles.narrow.yml +++ b/core/profiles/standard/config/optional/responsive_image.styles.narrow.yml @@ -1,17 +1,15 @@ uuid: 8eb79e19-da57-4bd3-8304-4e0b5a147276 +langcode: en status: true dependencies: config: - image.style.max_1300x1300 - image.style.max_650x650 - image.style.max_325x325 -langcode: en id: narrow label: Narrow image_style_mappings: - - breakpoint_id: responsive_image.viewport_sizing - multiplier: 1x image_mapping_type: sizes image_mapping: sizes: '(min-width: 1290px) 325px, (min-width: 851px) 25vw, (min-width: 560px) 50vw, 100vw' @@ -19,5 +17,7 @@ image_style_mappings: - max_1300x1300 - max_650x650 - max_325x325 + breakpoint_id: responsive_image.viewport_sizing + multiplier: 1x breakpoint_group: responsive_image fallback_image_style: max_325x325 diff --git a/core/profiles/standard/config/optional/responsive_image.styles.wide.yml b/core/profiles/standard/config/optional/responsive_image.styles.wide.yml index 8e07611c659f..033d70a9a8f0 100644 --- a/core/profiles/standard/config/optional/responsive_image.styles.wide.yml +++ b/core/profiles/standard/config/optional/responsive_image.styles.wide.yml @@ -1,4 +1,5 @@ uuid: 5cffd3ef-5656-4446-b200-b771d8076568 +langcode: en status: true dependencies: config: @@ -6,13 +7,10 @@ dependencies: - image.style.max_1300x1300 - image.style.max_650x650 - image.style.max_325x325 -langcode: en id: wide label: Wide image_style_mappings: - - breakpoint_id: responsive_image.viewport_sizing - multiplier: 1x image_mapping_type: sizes image_mapping: sizes: '(min-width: 1290px) 1290px, 100vw' @@ -21,5 +19,7 @@ image_style_mappings: - max_1300x1300 - max_650x650 - max_325x325 + breakpoint_id: responsive_image.viewport_sizing + multiplier: 1x breakpoint_group: responsive_image fallback_image_style: max_325x325 diff --git a/core/profiles/standard/config/optional/workflows.workflow.editorial.yml b/core/profiles/standard/config/optional/workflows.workflow.editorial.yml index 0d1154b36e3c..e462b2ab956f 100644 --- a/core/profiles/standard/config/optional/workflows.workflow.editorial.yml +++ b/core/profiles/standard/config/optional/workflows.workflow.editorial.yml @@ -4,7 +4,7 @@ dependencies: module: - content_moderation id: editorial -label: 'Editorial' +label: Editorial type: content_moderation type_settings: states: @@ -15,14 +15,14 @@ type_settings: default_revision: true draft: label: Draft + weight: -5 published: false default_revision: false - weight: -5 published: label: Published + weight: 0 published: true default_revision: true - weight: 0 transitions: archive: label: Archive @@ -44,17 +44,17 @@ type_settings: weight: 4 create_new_draft: label: 'Create New Draft' - to: draft - weight: 0 from: - draft - published + to: draft + weight: 0 publish: label: Publish - to: published - weight: 1 from: - draft - published + to: published + weight: 1 entity_types: { } default_moderation_state: draft diff --git a/core/profiles/testing_config_overrides/config/install/system.action.user_block_user_action.yml b/core/profiles/testing_config_overrides/config/install/system.action.user_block_user_action.yml index f902ff1a68f5..6960a91d204a 100644 --- a/core/profiles/testing_config_overrides/config/install/system.action.user_block_user_action.yml +++ b/core/profiles/testing_config_overrides/config/install/system.action.user_block_user_action.yml @@ -1,9 +1,9 @@ -id: user_block_user_action -label: 'Overridden block the selected user(s)' -status: true langcode: en -type: user -plugin: user_block_user_action +status: true dependencies: module: - user +id: user_block_user_action +label: 'Overridden block the selected user(s)' +type: user +plugin: user_block_user_action diff --git a/core/profiles/testing_config_overrides/config/install/system.site.yml b/core/profiles/testing_config_overrides/config/install/system.site.yml index 56104f4bffbf..6b9711224ebc 100644 --- a/core/profiles/testing_config_overrides/config/install/system.site.yml +++ b/core/profiles/testing_config_overrides/config/install/system.site.yml @@ -1,3 +1,4 @@ +langcode: en uuid: '' name: 'Test - this is overridden by the installer site configure form' mail: '' @@ -8,5 +9,4 @@ page: front: /user/login admin_compact_mode: false weight_select_max: 91 -langcode: en default_langcode: en diff --git a/core/profiles/testing_config_overrides/config/install/tour.tour.language.yml b/core/profiles/testing_config_overrides/config/install/tour.tour.language.yml index 0d83ee83f606..62fdee424c50 100644 --- a/core/profiles/testing_config_overrides/config/install/tour.tour.language.yml +++ b/core/profiles/testing_config_overrides/config/install/tour.tour.language.yml @@ -1,21 +1,22 @@ -id: language +langcode: en # The enforced dependency ensures that profile configuration in config/install # can depend on optional configuration of modules and themes it installs. dependencies: + module: + - language enforced: config: - tour.tour.testing_config_overrides_module - module: - - language -module: language +id: language label: Language -langcode: en +module: language routes: - - route_name: entity.configurable_language.collection + - + route_name: entity.configurable_language.collection tips: language-overview: id: language-overview plugin: text label: Languages - body: '<p>The "Languages" page allows you to add, edit, delete, and reorder languages for the site.</p>' weight: 1 + body: '<p>The "Languages" page allows you to add, edit, delete, and reorder languages for the site.</p>' diff --git a/core/profiles/testing_config_overrides/config/optional/tour.tour.testing_config_overrides.yml b/core/profiles/testing_config_overrides/config/optional/tour.tour.testing_config_overrides.yml index f36b14593aca..489f84c9ab32 100644 --- a/core/profiles/testing_config_overrides/config/optional/tour.tour.testing_config_overrides.yml +++ b/core/profiles/testing_config_overrides/config/optional/tour.tour.testing_config_overrides.yml @@ -1,21 +1,22 @@ -id: testing_config_overrides -module: testing_config_overrides +langcode: en # This depends on configuration in the install's config/install directory so we # can test that this configuration is installed. dependencies: + module: + - testing_config_overrides enforced: config: - tour.tour.language - module: - - testing_config_overrides -label: Config override test -langcode: en +id: testing_config_overrides +label: 'Config override test' +module: testing_config_overrides routes: - - route_name: entity.configurable_language.collection + - + route_name: entity.configurable_language.collection tips: language-overview: id: language-overview plugin: text label: Languages - body: '<p>The "Languages" page allows you to add, edit, delete, and reorder languages for the site.</p>' weight: 1 + body: '<p>The "Languages" page allows you to add, edit, delete, and reorder languages for the site.</p>' diff --git a/core/profiles/testing_config_overrides/modules/testing_config_overrides_module/config/optional/tour.tour.testing_config_overrides_module.yml b/core/profiles/testing_config_overrides/modules/testing_config_overrides_module/config/optional/tour.tour.testing_config_overrides_module.yml index a6f7e7a70e54..e1957ccaaf09 100644 --- a/core/profiles/testing_config_overrides/modules/testing_config_overrides_module/config/optional/tour.tour.testing_config_overrides_module.yml +++ b/core/profiles/testing_config_overrides/modules/testing_config_overrides_module/config/optional/tour.tour.testing_config_overrides_module.yml @@ -1,13 +1,14 @@ +langcode: en id: testing_config_overrides_module +label: 'Config override test' module: testing_config_overrides_module -label: Config override test -langcode: en routes: - - route_name: system.admin + - + route_name: system.admin tips: overview: id: block-seven-content plugin: text label: Test - body: '<p>This is a test.</p>' weight: 1 + body: '<p>This is a test.</p>' diff --git a/core/profiles/testing_multilingual_with_english/config/install/language.entity.de.yml b/core/profiles/testing_multilingual_with_english/config/install/language.entity.de.yml index 22c040ac5966..a348c65a7066 100644 --- a/core/profiles/testing_multilingual_with_english/config/install/language.entity.de.yml +++ b/core/profiles/testing_multilingual_with_english/config/install/language.entity.de.yml @@ -1,7 +1,7 @@ +langcode: en +status: true id: de label: German -direction: 'ltr' +direction: ltr weight: 0 locked: false -status: true -langcode: en diff --git a/core/profiles/testing_multilingual_with_english/config/install/language.entity.es.yml b/core/profiles/testing_multilingual_with_english/config/install/language.entity.es.yml index 626b3439699a..6635cbbc535f 100644 --- a/core/profiles/testing_multilingual_with_english/config/install/language.entity.es.yml +++ b/core/profiles/testing_multilingual_with_english/config/install/language.entity.es.yml @@ -1,7 +1,7 @@ +langcode: en +status: true id: es label: Spanish -direction: 'ltr' +direction: ltr weight: 0 locked: false -status: true -langcode: en diff --git a/core/profiles/testing_themes_blocks/themes/testing_theme_optional_blocks/config/optional/block.block.testing_theme_optional_blocks_page_title.yml b/core/profiles/testing_themes_blocks/themes/testing_theme_optional_blocks/config/optional/block.block.testing_theme_optional_blocks_page_title.yml index 9377cb4721d1..1620400e4489 100644 --- a/core/profiles/testing_themes_blocks/themes/testing_theme_optional_blocks/config/optional/block.block.testing_theme_optional_blocks_page_title.yml +++ b/core/profiles/testing_themes_blocks/themes/testing_theme_optional_blocks/config/optional/block.block.testing_theme_optional_blocks_page_title.yml @@ -12,6 +12,6 @@ plugin: page_title_block settings: id: page_title_block label: 'Page title' - provider: core label_display: '0' + provider: core visibility: { } diff --git a/core/profiles/testing_themes_blocks/themes/testing_theme_required_blocks/config/install/block.block.testing_theme_required_blocks_account_menu.yml b/core/profiles/testing_themes_blocks/themes/testing_theme_required_blocks/config/install/block.block.testing_theme_required_blocks_account_menu.yml index 83aca4cb98b0..da833c5f3012 100644 --- a/core/profiles/testing_themes_blocks/themes/testing_theme_required_blocks/config/install/block.block.testing_theme_required_blocks_account_menu.yml +++ b/core/profiles/testing_themes_blocks/themes/testing_theme_required_blocks/config/install/block.block.testing_theme_required_blocks_account_menu.yml @@ -8,12 +8,12 @@ theme: testing_theme_required_blocks region: secondary_menu weight: -4 provider: null -plugin: system_menu_block:account +plugin: 'system_menu_block:account' settings: - id: system_menu_block:account + id: 'system_menu_block:account' label: 'User account menu' - provider: system label_display: '0' + provider: system level: 1 depth: 1 expand_all_items: false diff --git a/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php b/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php index 01a44fda3b91..d79ea5b0e0be 100644 --- a/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php +++ b/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php @@ -147,6 +147,9 @@ protected function doTestsOnConfigStorage(StorageInterface $default_config_stora // the cache layer. $active_config_storage = $this->container->get('config.storage'); + /** @var \Drupal\Core\Config\ConfigFactoryInterface $config_factory */ + $config_factory = $this->container->get('config.factory'); + foreach ($default_config_storage->listAll() as $config_name) { if ($active_config_storage->exists($config_name)) { // If it is a config entity re-save it. This ensures that any @@ -159,6 +162,11 @@ protected function doTestsOnConfigStorage(StorageInterface $default_config_stora ->getConfigPrefix()); $entity_storage->load($id)->calculateDependencies()->save(); } + else { + // Ensure simple configuration is re-saved so any schema sorting is + // applied. + $config_factory->getEditable($config_name)->save(); + } $result = $config_manager->diff($default_config_storage, $active_config_storage, $config_name); // ::assertConfigDiff will throw an exception if the configuration is // different. diff --git a/core/tests/Drupal/KernelTests/Config/TypedConfigTest.php b/core/tests/Drupal/KernelTests/Config/TypedConfigTest.php index ff9f7afa01bc..7a40310b3161 100644 --- a/core/tests/Drupal/KernelTests/Config/TypedConfigTest.php +++ b/core/tests/Drupal/KernelTests/Config/TypedConfigTest.php @@ -75,7 +75,7 @@ public function testTypedDataAPI() { $typed_config_manager = \Drupal::service('config.typed'); $typed_config = $typed_config_manager->createFromNameAndData('config_test.validation', \Drupal::configFactory()->get('config_test.validation')->get()); $this->assertInstanceOf(TypedConfigInterface::class, $typed_config); - $this->assertEquals(['llama', 'cat', 'giraffe', 'uuid', '_core'], array_keys($typed_config->getElements())); + $this->assertEquals(['_core', 'llama', 'cat', 'giraffe', 'uuid'], array_keys($typed_config->getElements())); $config_test_entity = \Drupal::entityTypeManager()->getStorage('config_test')->create([ 'id' => 'asterix', diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php index 127c7fb06c1d..9994e9db6fde 100644 --- a/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php +++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php @@ -288,7 +288,7 @@ public function testDataTypes() { 'string' => 'string', 'string_int' => '1', ]; - $data['_core']['default_config_hash'] = Crypt::hashBase64(serialize($data)); + $data = ['_core' => ['default_config_hash' => Crypt::hashBase64(serialize($data))]] + $data; $this->assertSame($data, $config->get()); // Re-set each key using Config::set(). diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php index 6d5b86712f2d..a07a3fd7cf63 100644 --- a/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php +++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php @@ -354,47 +354,47 @@ public function testSchemaData() { */ public function testConfigSaveWithSchema() { $untyped_values = [ - 'string' => 1, - 'empty_string' => '', - 'null_string' => NULL, + // Test a custom type. + 'config_schema_test_integer' => '1', + 'config_schema_test_integer_empty_string' => '', 'integer' => '100', 'null_integer' => '', + 'float' => '3.14', + 'null_float' => '', + 'string' => 1, + 'null_string' => NULL, + 'empty_string' => '', 'boolean' => 1, // If the config schema doesn't have a type it shouldn't be casted. 'no_type' => 1, 'mapping' => [ 'string' => 1, ], - 'float' => '3.14', - 'null_float' => '', 'sequence' => [1, 0, 1], 'sequence_bc' => [1, 0, 1], // Not in schema and therefore should be left untouched. 'not_present_in_schema' => TRUE, - // Test a custom type. - 'config_schema_test_integer' => '1', - 'config_schema_test_integer_empty_string' => '', ]; $untyped_to_typed = $untyped_values; $typed_values = [ - 'string' => '1', - 'empty_string' => '', - 'null_string' => NULL, + 'config_schema_test_integer' => 1, + 'config_schema_test_integer_empty_string' => NULL, 'integer' => 100, 'null_integer' => NULL, + 'float' => 3.14, + 'null_float' => NULL, + 'string' => '1', + 'null_string' => NULL, + 'empty_string' => '', 'boolean' => TRUE, 'no_type' => 1, 'mapping' => [ 'string' => '1', ], - 'float' => 3.14, - 'null_float' => NULL, 'sequence' => [TRUE, FALSE, TRUE], 'sequence_bc' => [TRUE, FALSE, TRUE], 'not_present_in_schema' => TRUE, - 'config_schema_test_integer' => 1, - 'config_schema_test_integer_empty_string' => NULL, ]; // Save config which has a schema that enforces types. @@ -420,6 +420,24 @@ public function testConfigSaveWithSchema() { $this->assertSame($original_data, $installed_data); } + /** + * Test configuration value data type enforcement using schemas. + */ + public function testConfigSaveMappingSort() { + // Top level map sorting. + $data = [ + 'foo' => '1', + 'bar' => '2', + ]; + // Save config which has a schema that enforces types. + $this->config('config_schema_test.schema_mapping_sort') + ->setData($data) + ->save(); + $this->assertSame(['bar' => '2', 'foo' => '1'], $this->config('config_schema_test.schema_mapping_sort')->get()); + $this->config('config_schema_test.schema_mapping_sort')->set('map', ['sub_bar' => '2', 'sub_foo' => '1'])->save(); + $this->assertSame(['sub_foo' => '1', 'sub_bar' => '2'], $this->config('config_schema_test.schema_mapping_sort')->get('map')); + } + /** * Tests configuration sequence sorting using schemas. */ @@ -612,9 +630,9 @@ public function testConfigSaveWithWrappingSchema() { $typed_values = [ 'tests' => [ [ - 'wrapper_value' => 'foo', 'plugin_id' => 'wrapper:foo', 'internal_value' => '100', + 'wrapper_value' => 'foo', ], ], ]; @@ -646,10 +664,10 @@ public function testConfigSaveWithWrappingSchemaDoubleBrackets() { $typed_values = [ 'tests' => [ [ - 'wrapper_value' => 'foo', + 'another_key' => 100, 'foo' => 'turtle', 'bar' => 'horse', - 'another_key' => 100, + 'wrapper_value' => 'foo', ], ], ]; @@ -679,10 +697,10 @@ public function testConfigSaveWithWrappingSchemaDoubleBrackets() { $typed_values = [ 'tests' => [ [ - 'wrapper_value' => 'foo', + 'another_key' => '100', 'foo' => 'cat', 'bar' => 'dog', - 'another_key' => '100', + 'wrapper_value' => 'foo', ], ], ]; @@ -701,16 +719,16 @@ public function testConfigSaveWithWrappingSchemaDoubleBrackets() { $typed_values = [ 'tests' => [ [ - 'wrapper_value' => 'foo', + 'another_key' => 100, 'foo' => 'cat', 'bar' => 'dog', - 'another_key' => 100, + 'wrapper_value' => 'foo', ], [ - 'wrapper_value' => 'foo', + 'another_key' => '100', 'foo' => 'turtle', 'bar' => 'horse', - 'another_key' => '100', + 'wrapper_value' => 'foo', ], ], ]; diff --git a/core/tests/fixtures/config_install/multilingual.tar.gz b/core/tests/fixtures/config_install/multilingual.tar.gz index e60ae04ec242..16c76a4698aa 100644 --- a/core/tests/fixtures/config_install/multilingual.tar.gz +++ b/core/tests/fixtures/config_install/multilingual.tar.gz @@ -1,40 +1,48 @@ -‹�üÓ¸]�í}érë8²fÿöSp:¦ÃÝî‹£¢oK–%o’¬Í²|ë$A‰EÒ\´MÍÃܘóýbÔn[>§dºªÌïDø nù%@fB³]}t¦Åƒú#cË9›í¿4M‹<O‘ÿ%Qˆÿ§ÙdŸ€Áÿ(†ã$‰E‰á)š–þEíÞ@DžßŠgC}ðÆyø4Ó|ãxò,Ôêÿ?¢È2Î)Ž©È -4Ù�¼h�š†$AB4uièĆN_w tN!ç¿Ž0 -ΩÐЉ<äÈÑ-œŸP”î:¦Õ'[¨`„h|6FNt.»Fd£í3ðN8@ãu)ÇUwý¸È@&ŒìPM*W0œS¥n¡(]Á‚Y¸A~a<oËEöˆÏ3K‡¾×o¼’@×OȃnˆøIr±ô2>ê[®ƒ÷,iÐWMË“)²úƒðœbN<ßàCþ9åD¶}âÙQߧŸ&·®’‡ScÇ•Ÿž(-§¿rå×Ϥ(jÈ>§ -dß -B†ø^pùú¢«7ŸªV€åu~NM¬ÀÒlD ©ƒ‰ß”âwCãM4ó c¨Ð¶UW€?˜ í�Ä¿³l+Äuü/Šúß'Ÿ-‡9>Úžþ×|,1Xr×Ðÿ´$pXÿÓXõ³´È XÿK,Ãåú?$ú_ç“DpOÞ4e�YV,/Ñš!ˆ¬.˜ß¡ÿ¥ÝÍæíc¨0YirY-.šòS1€SóB,?kcÄöCWC×ø í¾à—ü�A¬QWš~M³§êzYY¢²÷´úËg4úik]jyôô]*ý”&çERücÕvûnúš7JHžl·4À'C'-ŸŠßç?Þ„¶ -uÒGQ‡ø/rì6ÿYšå„œÿY á¿Ì³Š< èœxê@Ñ‘tÝ@¢Äi†‰¤ïàÿwýÞ4Ç P(¶BXvÇASª¡ rJÎ¥5™¸žsㇶ|[»Ü ú–¤¾Ìv|•9kC0¯~«¶WèþÒ9k²ßûÖús*¶ë¨ô¬mÒ“·ð2å?É"{ÿ!FÇaÿ;øÏïµÿËçüÏ ÿY–çdÎ4”€Ûƒ2¯É@gŽæi šû‘ü×-jÚ¥Ýì Áí¸o$Þóúí®Â]†<¸¼)ÏkV穪É7½=þÇ’úNö³Ø×õ&÷7ÏX1¿ µà4'gÅZbÕzߦ±.ÉV¼Äÿ~¶ã?˜óâÿE“rþg„ÿ’®Ó¢‰[}Dó&à9kžf¡±gêãïáÿ¶ýÍSÿG”ß°[N·¨Ïf·Õër³*Z¤V‡‘îqµa¥ï<ø:°çNãêzK)ô¿olçU•@î;©î°wÂÚèàCT|h»ýOßÅ+£8Ÿ`ìóŒ‚�öѱÿ¿¼ƒÿÂ.ÿqóŸÿf‚”ÿEŠl@¤ðøõY„›Í+œÄÐœð ý¡Z3FœéUogêlVlë¶Í0¥;þñ²Ã\ þ•-ƒžQ -`)À¯ôÿ1ëmÂ|d¼{`YãÛƒ�;gmÄïŠZÿ0@ú`Ÿÿ¾G5´BKä?½Çgrþg„ÿ´ÁŠ<#Ë@ lÿ늄զ°+Ð’Œïáÿw]ž{aÉ»þãÍѤ³à{abúR1œ5ž/ŠUÇrìõ Óß úZRßiþs¯}]Õ+ß;a£ÛQñ¡ßy_ÿ%ìó?t]ûˆÿ_Þ1þ/Ió¿±ÿEFÌùŸþ#(Œ!€–yð<+�²:¶tdh4lj}”ùßX¸Žh!Ì.êÖðÎ(2 Óœ5H—Õ3äɬv90«ÎìñI—‡½ÁÕ0ØPÉ]£ð¬n\ù»æÓ3×ÃéËÉrÚ—¼Ý3†H5]Ã3|¢A¬ Ž§ñŸùÝöŸfòö?$ü7uš6LŽŒÿf½$M¢ À14R…1°F~/ÿÁz›¶ÒÈn ×ÝGºx€÷^ï©\Ä©>“;l¹Ì<J\ÝôÃv0‰&ÉxÿR(O–mn9- ˆèR‰èžžV!#½)†!ò GK?QãoÆ·Ö)WçÖiîë°=þÂ1V4¸ »þ?núóùÿOBÊLvy˜D˜ÿHP‡:Ð(+<î@?&ÿ/ë ;ì4îÇ}]ì4X_¿á-ÕF—7C!²èv0¬µ@{ó%”+pÕ®ÞQ%\òë{`Œœê‡ð:ÿCk|$p¸ýgvçÿi1ÿÏ©ÿÆj,-°�Ñæ?Ï �BC�‚&@™º$Êú1ù?œ™öôéºùxm蓪 @w¤?ÍJ•Îƒ[¿¾äZc¶Ö|²ËÑå6ÿ‰Pîë�Rújë+‚_Ú¸å?êy㿃—ù?vpp4àÚžÍÛÿLðŸ× Eb 8I’/,îÿ -0hÑ0thÊóîñ¿÷ðÿIº.:ÓªÚ5ÚµÉîÚaôÈ©² —ŸFíšxÛ¯MË4ª®ùå6ù«¤è gû!¼ÌÿãµýùÏ3{ö?›·ÿ™ õÿS4× ™ÏꀂÈIf«™"á»ã?ÞÃÿª4¶ôިɃæ\ðÃ/ÀJ±h SŸGÃ2.h(ÜÓFû¿ßö·ßj÷ã?oïàeþO:â�àôÿ¹|ü/,çÿu““0ëY™¦eh´Æâþ¿,+ -h^9êøßô¶Äw÷A–ûvÒ¿æÇz¡Pn]/ü9b¤ùhaL}§àÌÞšÿD(·ùßÅ%¯·þ¿t»9ûáeþÏô³ä¿°ÏÿÜÿ7$ü ƒ? Ë�Úà5ÀÓˆ² ËÀà!/2Ëk’qLþׇhd5¢G¥©=4XUÖ¯Šw -ßì÷îÐýó£4õÌZ¥¯7þÆøÊmþ÷pÉëýþ¼í^ç¿‚à8ù/ì´ÿ,Ãäþÿ٠ῆ œdM‘pÿ_P€,C˜‚¢k+É< ÉáÁƒÓª{y1rë|Ï»‡t»T®³Fߺ¾2Ûë&œÚãÎLßæÿJ(÷9O¾¦òù€°ÇÛ=fèoŒïæ?#æó!á?#‰P1Dh -Û™Çö¿©I€äæБÉa#à¨ãn_ºƒbt¥ÝU§Ü…k/Ÿ†ýçÖ|P.–ǺÖéªÓ;ݬiîI{ãôWŒ/%5Æ…;„O¼\Ö6€ýU¦†?QùÔÿkØãÿV4ÎÔÿÙýøŸÜÿ?¤óÿ2â‘ @ -‹ùd�Mw$ ¬¨ðŠ¡“ÿÎâN0°Ô†×ªÜ¶ÛbT.DŠÄÙcs4¾Ù7€µ¿Œÿ%B¹§’â: ÷þy{ü®×�8ÜþïöÿE>÷ÿËËüOø§³@§!¶ÿ ¨�Bp’®› -Ëq†(“ÿ{æó° _;Åþ캢\±ÒM/à.*Šü4çÍ t;¶µ§iØC„rþqéöçÔ1ÿ‘Zá<Ö�êá3¦xF\¢ü?¾ÿ/î÷ÿóñ¿lòi~õ…ØÚ—€ÂÉ0tNàxIÃÿ‹c^$ú±mÝ„ù>ŸKOwõÁ}å¶òäjOcT(?t¸»�YQê»%ŸK½Ð\îãÚGáe,Ôí¹‡Ò°[àeÒœÏ~í¿lòb¡i‡ü1#ÛÎ$ÿ'íçÿÉÇÿ²A¨‹,îri@̆Äÿé˜ÿ¢.é¼&Ë‚)½Âÿ¤½}[i:älûáµ3«Ÿ©¡w#ÔD}‹TØëYÙš„}‡¯êA2!°ÐuD�ÞYFü¾ â›ÈUÀ.Þà¿)ð°ý/îùÿJùø_&HãM†ƒÍY#ùÿ4N�š©‹@cQS8l½–ÿïHüŸØ½…|5•ZÕ ÛçƒòÐ~n>…ë®� yW«L/üΚÿX@Wm«•sþGðÿ}} ZøÃÎ~“"8ÄžÞmÿ‰ÉÇÿ2AÚþã/ò2XS�/³,æ›(ÃàLÄò'iËó¡lÞLÔʢؼS¯y¥™%rCg ]Ö+¢=i\u½·æÿ¦€®ì€V\HÅ…¹p‡ùï£�®ß¢�òŸÝíÿ³›Çÿg‚tþÏб•Ïé@§eðÈ”€,Ç–�/ ’Á(Œü±ö¿X¹¨7Àðžmj†vUz݆¨µå³¢=ûÅÞm½u¡>öøKÇÿD@w@RºN÷c9}¬¼(ïlá þ‡Gý{Ïø·kÿ|žÿ7¤ù?MZ”x$ü À›¢“1!¶ ¯Ò»çÿ~„þÕ…òÜõ™Q§wK‡ÍB¥øÂcK¼Ÿ„O,UrŒxó.â×ôOäsÉûv²—sûûð2ÿãñUÝ{P?Â\àaþ»ü—ø¼ÿŸ –ù?9™þ€×9@ÃD@†¬©éI"üžü?ß=þ/1‚¯ÞÕîõ~$–Äá5]³™ÛB{c4—íBwåþzü?•Ï¥¸HwóÑÿïÁüÿÔñ!oÿ3A‘p_Ñš``û_y q264]çaŒÆü¸ýÿ0n\—UÓí ÇÎCËWªž^â/ÚðæR-{u¦0/j)-ÂÊ ºV�[ãÿqÆ]¨ënôòø®^DÂÿYˆœÀr›ö{…CüD²þ› ˆŒÀHCÑŒ@çãÙ`ÍÔ$']œ>ÎÀÛýtsîÀ±¥'¹6SúrÓB¶±Ü´W…vHÒÖÑqÆ:§á¥{$y~ºíÄ:„líVêÁp BÛ‚A²Ÿ¤¿K¶C,¤Éaò², ýú¥*±ü‘l[cõbÙ¹>I‡?ÇÉ*±`œí/Mè—Üø;*9¤¼ØÊÃ3Ãt -õ‡¨ÖÊ3:Ìjý>z“FC]Ìî\hÏ™bõ²ó»Ó:1ÿãÔŒD£ãç'ÄÏ=RÝ ò}Ëøí™ÀñŸáøÝñŽËÇÿ2h˱â•jÞ—¹ÇèI…v@#Žú”ëÊ“©×«j 8@¶Ê}íù¶ÓîUw²žc±ª?[&+ýœöŸÙ]ÿ‹á%!ç&ðÝ)Ööc+LÊ·Ùd™ƒ•À™iÙæ†Ýë2ÿT¯]´Ìæœ.…£'åvq¥ rÎþ?b;îÓù¿ÿGfrþg/ÂeUƒ¡>PkíaápnFt»Ð(.ìš+°h`]]KÚõåý]Å¢‹½ç§É½qéH3¢s%ð{GÊÿÐõq_,™÷Ó\cžíú_ìîúøô|ü?¤þÿ2bEIÐ'’øIS€‚L0Œ$q«+¢üîü¿/Ïÿ%›¤È¸Øq¥çz÷ZO°¡6/”à®'\»¥[oÐâø‰$=\_µ -㇠O "²'±(§+ãÆé°v¸žL6É]¨S+Ä/“µøÖÉú“.PzÿÉínGéÐ7,&)ô™“ЇN`Ãjör\1ö<ZÅAyȬ ½œãªñM.ß›Ž…Ï«)û–—Èôû“1nþòŸå÷ì1ÿË -tßòÈ�@¼rÏŠ ± ÆL8}²¬ÃÊ'–žœeX>Ò±ÐΓEn¾%| ¾aúFN -÷sw ˜Çþô.T½¦¨’.3-‘c ñf`<?Þü¤4@°"^æ&ć"²=Kƒ1 ,G%Ÿÿ˜ªà�ÿ†ÞÍÿ)J|nÿg‚ÔÿŸÖ Ai€xA�¼ˆ +Š 4i¦¨ë’šÿ§v}[ÅÑTîµkú9l²%§iJãV½_h3©¡ðÛêðQkœ$ úé=ÍX3ž$ÒzNÅuµRCŸ$""ɦ§ÂŠz©Qç<Ø;Z/¾“œn=-)Ø\O<>aÛ€X]9òí½+ⲸÒÎuâ½Í˨KE-±ëËÃ(t½½ˆKû-|öÒe9Ž€Tÿ¨xÐþcvõ¿Àl®ÿ³Àre%õ -í)œj0p§êê<}àZúª¯ò¶š/[÷Ã*×5ŠªêGå‚TÛwSÇR;ú“6F#¡Âk¬1k\‡³B®G>Ëiúox Â{Axÿ„/ÛüÇ;ü_(áïi…/ÎÿÕ÷ÇÝ·ºÆû¾?gýÀÉ÷çIüoþý?›ß?vªû�KàPûOvv×äòþ_&€ŽëÌÇ.±÷οÿŸcݼ)þBØäÿr;õ?ûíž_ ó·ý—$6·ÿ3Aê>}xðßÿ×µsî1¼ÅÿÅì·å}Xâ ÿ9z7þƒÉã?³Á2|¢æ†ô<ÛÒÉTfž*ñ«`“ÿ‰»}â ±u¬pÃíÿÞúO"ûd‚”ÿò¹ ô¡ná^@Nÿ¯‚×øoºî1R¿ÆøöŸÎùŸ –íÿ½…(QÞ¿ÿ»o90oÿ¿ -6ùG�ž%ã8¹$ê÷ìß´ÔAþ»üg¤<ÿk6Øt(Xê‚ö¿ÿOÙn®¾�6ùÿQ¾`‡Ûÿ½üLîÿ Rïª6þÌ.X•|}7gü×ÀÛíÿqFòŸßËÿ&Ñùú/™à…ö?øBx›ÿ¶ÛÏ„ÿ»ù_i‰ÍÇÿ3ÁKöÿµcéVlþ( * 7þ´xmü/t]ûX>@‡Çÿ÷üD!ÿÊ)ç¯ïñ…œ9Ù¿6ùÿQ¹ ÷ÿwí–çsû?,Ûü‹ˆpŸ´ùQAßÊ�¾^hÿ¡N¢ã\j�'HM~ØøþslÎÿL°ä“Þ€~º‚šeäüÿxÉþ‡‘èè¿iÖoCügv×gÉ”@Îÿ,0FAç9ýW`…ˆBAøïÿ¦HV×Az —ò\ŸÂïÁ€˜c+ˆ¸¯àžQ®=Ac7 C£9¥ùh‚Ψ -<Ä? ¿ "ÊÃ{$<žåjå÷…·ü#ÇÈÈÿ—ÙóÿÍý²ÁjÕ$ËÁÜ÷n™–ýœ¦_/´ÿ¤È4ÿÍ»ù_&·ÿ3A2ÿ_ò#æÁ?_oÆÿ)�à0ÿ÷üÿ%6oÿ3Á2þÏéÛV0È5ÀWÃÛóÿÇ™<È~Ïÿ_âóüï™à…ùÿ|.ðá£ÚüMâ?·—ÿ]òõ_²AšÿYZ‚0#^á�E–ŠL<1DšÖí˜ùíâcÉ3J÷Ð7Û7/V‡Í››ËËy¯å6oh¨“«» ‹ -q’g|ÁC%IAK²ÖRv蟬Sn§kþì×û»ÇGåüØÄ!þ³ìnÿó?Ïÿ“ ÒõŸyE iÄ�)þƒt E&’Öà‘ñ}üY,YÛò ók™œµŸ…óßÄÁö×ÿ—òþFHø¯‹¢H‹†�xAf¯Ñ -€–+@‰exâ¡ýÊú¯?Öþ£Ú£hß]Ü–`O朋ꀥ«s�Àœæn5«lOdš-Ý^\x“t½gÇ8ÙÌT’NT ãô5•Â®TJ¾Øë[ø¨œ?›8ÈÿÝø_Ì1÷ÿÍiû¯h-�ÀŠ:<+ó@1 @‰Öh]Ô sÜüïœpÌ®æ, 5õ>u4›-ÔJ{M¯‡=C}jëãq„‰ý¥òäµLE¯(�.W�ïÁŠÿcüN?(øaþïÙÿ|nÿgüÙ KO÷ôœr4²3I/ÄÛÌÕÅ� Ä{ œ.’Ã`0Ú)»;:aãv‰³SkÐß)ÐÁºäÀzQÕ.’zßP Ô:f-jº•â¤×©=Ý_[Î"¼ëµÖ8(é¹ØÇŠÿ껡›§ïËø~û_Ä›9ÿ³@€‚ ]ûɃ>£x÷¥Tœ¤ë—n䓤ÿñížLkF~o t1„Y}zšlqç3Ö%Τ/Ÿ€7dã¦êÚ´ Î'jJôÌ.ÑýuûZ Äîób´5©jÞ_XÂü¾ûØšjÌÝé½rCË—¢~+þ“•¿>iýWÜõÜ[ÿUÌóÿdhÇ+Ê«ÄùÛ7±E¾]œ„Û…d)£„“‘/øZUK2Ó¸]ëRA:ŒåÚFË“Àªšd ¢Í«¿ýCrBºjÑv)X.gBÆ©nø]õ¾žŒg7*??¨vS›\·w;Ó,§\¿nG³ÞÀâçl½]kÜ«Ÿ¹V6î$Á^ò�ÿ\¼Á1^ÿ‡Ëýÿ2ŽŸ©Aè'KzÅ}å墦HEÉlÛr\~'0Y.rgÈ%3‚ÕoS¢G®<5|4vqÐÁí=‘º â…#ÓLDó|wˆë›¥S±5ú·U幧? -OQ±M‚IKl‹Azçß¾™¡wfÄg®ß¥¾mÜWðíoñª•Ë+};|I˜úÄ4I–lµëÉŠÍ£Žn‘.¡yy›±v™@[5à<H1¨£'ø–>×7ŒO´Æžë‡êR#%5¿€îž§²Wh\›>4[aÀ6›ÝŠ"¡ZEœ4ÛRyð\V5á¢~_åöÑWE¼|ò'¯ÿËðÌŽþçE&Ïÿ’ ˆ‚Ž³|©á�ß¹®[¯>^´ôÇNý®Õ».)Àëü3':Ž«ÝZÇ.Í.ŸŸ¦“k–ß7^ˆù6p¯<üíQßkâ?ÏóËõ¿ˆ#ñÿäóüÙ ™ÿáy‘L“š&€7(&↠pÈÀä½ó?Xi$ë'Ý&@¡: Pžfô°ÄÜÚ!|‚•›¹ÕQSe«‘R.UùY_jÃÎMçR]ÇóAûrºš*Å¥i{xz’¬h߃gG}‹ŠÉ\çùVçä”Óuo6™QúÓ/qûÿÇpDz–>šG ä¿Àn·ÿ,#Ðùøo&Hø/s£á~8ÐL^¼,Ò�A@T34yE„HüHþuoZsάxÝѤIw{5QTŸ‡ªh0þD›ø£…ÇÌç^ó_NWJ Š-U�•œò¢&xž¯£^ãäOä¿HïðŸ�9ÿ³@ÂÍ`dÄAÐk�^Ðd ãO�üM ˆxE“ÑGòß.U•ñäºRˆäÖTöC]Ôù–/Í…‡{¿t?ëép:Òn q´Ãÿ9}Y,O: vëú -Zàþ{¾›Ô«p¸ýçwøO‹bÿ‘ þÓ«ŒhÙD&àYQ�Šaê@ƒ -âx’Ž[‘>’ÿ5ºY*¶Ÿ[Þ¸uk¼Ç»]vH·*ݹn\Íw¤TAÝôd¥³æÿ¶œ®˜Ÿ¯Èº”éãmŠ,fòºØ©í+pŸà%þGôÏÿ±ÿG²þ7mÂ>÷ÿÌ ÿ%Þ0eW€)˜ÿ‚N²:ÐE^0eQ¦ ýCùo‘æòÎð 4T·r{q_y¬tËÃn™¹–^¿ ŽA¨øzÓ-lðKN×üOŠß5°]ÅWø¨œ›8ÈN\ñŸ¸8ÿS>ÿ› þš ÐP€À€˜ú<Ï1@9H‚dB–cä?”ÿå*ð‚ÅÝLŸŠÞÓ¸ õ2ç%M yµºˆ7ï5¿Û½ªô×üßÓù[¸ì]ÌßøñW¤ý -/ð?rŽÜ8ÜÿgvÇÿX6÷ÿÎiü·ÂÉH“$ÀȃíC2Ã耗D Jœ,(èÝñß?Âÿ›¢3ªWÃÀ¸÷GöãÌ÷Qý¢] 3{4gô‹ñ¿]9])&»k5@¬ÿñ»º�{~•ð2ÿÛ8ÜÿÖí¿”ðŸÉÇÿ3AÂEb‘™` HXϳØþg4 ²¢!ÐC‹û‘üïWV+𦛶çõ–8U¯.î½I¥p_ÒçRí®<íÖçÆCx½Åÿ—{�åwY»Õ|-s`›ÿd5N�¥Æ›ÇQ�‡ù/í¶ÿœ˜ûÿd‚4þ“QLÅÐ’õ÷ÿE2o2€ÑDÖÔxW þÃü'’t€ÿ¥ùÜ[´Íöà‘¡ËåÆpŠò|o^jwwsðØoø·÷Á¸àÞðI<ø‹rºR�Er„ -d«$Â$þÅ߃,5A|OKMðJm_B¼Àd~·¨�ò_ÚŸÿÏýÿ²AÂi“•€ç p‰ +gQ£ ¨¼;þûGøïLü;E+[ö¢8³Ú°®ø §\òŠÉ(;ÃÖ Õ -ÅZ”:kþïËéJ\ćö5�uÝœðMMðB½^Uðÿ#çÈÀáþ¿°Ë)ïÿgƒÔÿG×ĈБ"^€dêOD�a>A]B²Äüøüÿ;øߺ:A“kê²Á̹>š.`á¶ÌD¨Î§œ)ݵiD¯ùÿ‚œnt´°^ªñÏKýKþGáÀõÅq¿§8Ćvã¿8)ïÿgl‡™XäSnâö8²í”]ˆœÈU~qïÏíË~¹9jêuÛÔƒÇîÔ¼n/†%^2£¦aöÿL|ù³!å¿î?íà -‡øϲìnü—ÛÿÙ ø(¸väì£çÈòÑ9a N¡ïXNÿœÂƘLÓ»‡‘ï»>>ÈÒŠHŠ…¦…í0ª¼¸ê-f—åVw8¿ºèF7ó,ŸTؾ~´š¿Ì•E¦HùOâS?ÿ³ÿͳRîÿ— âî°?ß`nœ™Å´ü $qÊ$L9´Æhá:hë¤ËÈw=ôí)ò-}Dzû‰Å¿•bMQDŸ¬c¦7j:¤<”Nä?²•û6-Ôº·Åd+ÝÆs¹Â¶›y¢/,c:ôæR×usåñ½Xòß2ÍOã?³;þGøŸûÿe‚x†lçs°-ª 7ûìª÷,;-{›ªL:cx9˜uÕIUV…Û00œp(Wa]é¯û´]iî>èæ)™~HùOºŸgÿsÄÿ_ Iò'oçív€¶íNUË ùH<Û…F°l§W©Vô$9@<S®Ÿ`‰ñ\úsugÖ8«ñ²,s¸'òrÿ¢£”=s¨qZ¡~ý|u·Üу¢ý8U¡(ÜÏ]%”óaƒ,òß“d7ýãç~'8ØþoÿÿÑ\Þþg‚¡‡úêsmâ -CIÂáÄíðÊÝÜtÚƒ+T¦ÉÈ}œßß5ýÛ^eÖ¿jëÍI›/~#§ï[üÿ à ÿYq×þçùÜÿ?þFî…÷Cù#¿{oQ>ó†Òõ,¾ù<-”†L=2KÈÓ›hðp7¾±|Ný?RþÛn¿{xŸ“ÿ•áø½öŸÎãÿ3A<Œ;ý2m>°zêFp†ÁÂVØ2œ ý‹ªõLÏKú°`êÆLb§Ì¢ÍÔc&ÂB®þ�Hù?†–ýyãÂ^þ?VÊý2ÁVÆãÕ¼7ðT"”ßë‡R4¸‡æ=ëôaM}êÜ—£ù5k\Ò‹Ž,Ê‹»ZË^ܺù´Þïkþ“H âùø ë¿Òônû/ryþ¿L0FAÞþ‹d!¦¬€Ò#ßGNhÏɲkȧ6eƒê"*¸‘mP¢Hu²ëã“Ϩö�:#jîF”éú䟤7¶ùÝé¶÷àl€BõÑ2ý²$U.ý]iˆV·-O[á°õäbI©û‘kvÛ7Ÿ™9ýÏ%ÿ‘¥ÎÑ™¯ÿÆ3»ýÿ|ý·¬Æÿ ‘ãu(�1à¡, è,ÒYÖàu‘SŽ¹þ[U-dÆ JóNƒŸ>Е~GÅÚóhQ•¥àn6„Fy¨Œiìï›JæÚ½wן"²{Šï!ÉL{éžÞYÎ( |D²Ø$q&½´púÕW‰Ûâ?Éýë¿I{í?Ïäí&Hã¡© ¤i@‘! xƒ–”e °bäcò?€Þ¥ÅöJ÷Z™7®Ûj·ýÀN:FC,µô+ú3ó64 -w‰¿,™KöÈŽ„‰Kþñ7b®‡0/†Qðå™þ26ùoº.î~‚ý/ìµÿ"›ûÿf‚4ÿ4!p ³ÞP s¢4Éé²!±Â1ù/Í}»+,”…ÑgQ1Ò‹låþùñ¶Um˜WŠÝj¶ê|Ië–¥BYùŸHæR”“½mâ·âÞ‹ƒ»ãX/ä¬6ùO:zŸÿÉ{óÿ¬Ïÿe‚´ý×EÑ%È,CÚVÆ–€hÍ@<uѤ•wÇÿ¿‡ÿ ¶ ¹¡é^?Œh“k g7"£Í›òC± y‹^©Q·z`ä¸rÌ"™©}-‡ràÄêÇDß5ýcE$KBçJà6ùOæ‚?eýgi/þÏý³AÂQÖH4 Üëç…•Y 1Š.J¬a2<wLþ/ª`òÀ,MxwUcdã¹ÐT/¢J}(Ê7“öL*ÞÚª\ÑgIûKæR´ãmÒÇ䬄ñ?Q®"÷°]Ció4"9×{Hùï!?¶œ>cüŸ¡÷ü1ÿËñúÉêÏý4bg‰?/}¢q<¿ç#Ïwu«xžþÂòÒ¡ÊÓ<9s{}Âd}C²Öó·_Îþþçá,üÕsú¿ö-óס‡þ£ÿ+¾À¯ÃàWKw ¦æ¯¦=ùUï[¿jŸhÿjØö¯h†~…÷ÿùÍ"+1¢™nG$ùïªâo¸â œcvÿ{±ÅOô_¾}#§Â11~þ¥úE»wüóçô/‚Æ?ÐFÿÄ÷OÕÜ÷-"Çøù[Røó·äÍ5æøtæŸgཟ½¶(‹Dgì4憎þ‹ÜÚ_©)(Ÿn’Ó)lŠ„+ ’5+Ï~þæáÊ“j¿Å7sz2|Ç«ÆBh£xµLu¸I±‚ÂÒ=¯5¿lìú¸Ð¾Æ–ÝÀ¼x6/Êý‡&ý|aÌfÝÁô²·Å‡Üuóë Õÿ~ðQ‹?þå=ñß{þŸŒ˜ûd}�Ù‰ÖØ´¨NOp?j$acâ!Êð‰…¦ê8¶±Ì|ϬnÛ¾’jµ/zs1ãVÇœö™º÷+Aç•x[¹i8 »”/™Rþ“¹ÿOóÿJò¿nçÈã?²AÒÿ3EÆ‘)Þ9üé�ê -h]‘EÖ„Š©K'ÉÝULì84‚ö ñKggþ…fpìÙèLwÇ'íöa¢E–v%Osñ>ÙâÓ8)ó9õÌÈ~Ã?±œ“d-Z\‡õ0U4I,ÚYýYõ›ds"gD#ÑÛh©x¾C-æm%ë]·ÍÂ]óRµÆÅy½ÚŸÕíg£,.®9Oš?ÿ)£ËSþÇ‹ÿžõmWƒÇ÷=ÄÞóÿ–Øœÿ™À„Üùrâ¬mÖ%™Ñâ~Ô·‰cœ-Ýw×ÏÈY«ëcöF¾½Ü -Ð:wTÒ'D0Œü$&3I“dUó,Xun¶â®‘eZzšj-=cy‡Ëý$÷óV]‰‚À -Ä=ÿ-¾¿ÐáïG‘„ªÅÆFçB¸°uK/?±…@\\Bq1iÛÅ?¶Úÿ?+þ‹ßÿáù|ü'ÄímÌ‘;È ‡h7¡öXUæÁ\«6ÄÚâfÈ¡Õ`ŒÂ¨Þ›%Ò‚_þÐôøÓƒ$ÿ8Pb‹î£†�ó¯ÿ/Šùüo&XexˆÆc’ÐÁFNŸ4Ÿ‡39GhªIR³X¿åTøX½<Ù“¥¾¦Ó\m2¾úŻŽ- òH°ß/ˆ!ufÚ®û1©bÿãvý?y†ÉÛÿL€»ÿªëØó¥myj:Ü'Ðdgj9†;=§8¢b«{y8Ù[Oî—NϬ.Ð=Ó’‡·cå¾5™™’Ó¨!¹ÔZ€Ót¶ÛªÕ‹nkŒŒóÿC£?ò_Úÿã$>ÿÏéb1Oý1¡.™•<§þúŸqBGà -ð‹™2ö÷_?ýâüâ–ó$ª"ùuëµÇÀ\§4„j DÁúO2¸|×pFjè¹>6Çù鋸NúÜ{šo!󿈇n[ú[©ÉD*qó \ŸÒ]oN -¡càŽ@ÌXÊ -)ËÁwתùî”< ¹ròLÉ5®ý¿HaÞ¾<§ÈDnrÀNÜG]sû®¬d:×Gä–f£øYÚ«{A3ÏòQ€¯Œ�Q~@rOø7rOS˶ñ«ñ<üb,3¾Å¤B|KF\�Ôæ«¢BÇÅß#ˆ´!ÒIZÎBz+[÷¹ü$æî…o¶óÈxlL]ßPñÍ¢ð{?xü£8˜fYÏ:Øï‡Àvûä•óûâ×HÊR(¯¾óúSá÷G‘6„0’×wtDž.½rø{‘\ˆq@#>c j:@>ŠËH-äe¤ŽÉÛ8£®Ã•(@3Dþû¤áô»…¡‰ˆÆŠ“1Sñƒn9?¿W|Ô·‚¬vŒ»ûˆL½K*âpQ¸·ÀWÜ®=„´Füô+ùHæŒú3ËAüŽâïŸv®·ÿÿ4®_œøÌl^wù×7NŠ ë̈Œxâ»%é8É5È“&3ÉCÇoþgysò’×—}§žqv¾ëëñur\Ë·ïN ¦‰Ãß#WÛAÄËÚâ/¿Hréù½JO*! -±Y|¿*"¾¤øWâsl©ÁzÊóìtš!þÁ†\oÅ¿§wB-ï䌪“olm´qÉ!´ùI|¤#{‰¶ÇŸó:^ŠZN,yŠjn„«Ã2¼ú‚?íÄO±4%Õ¥ï5–‘ûÔßWOTÁêüã•4"o®øÍÅï;ïþlM>dXa,¹ü(‰s¼ÔÏä _oÓÔy¡ÁK¤bYáŸÞÞù,M•~ðy‹úû’ûkAÒR÷òï£UgGŒÒê¾³{ð½‘^eýIÿâx±¬ïƒŸcy™|W²‘1Ã5ëî„cë—ÏQ³W¹Óf\Ë3J•èy¦Øêâ&¬M¬Á³qñ§LHÿø.îÎâæÊ™Ýèø³@ý¿öü?D\šÿdÄÿ‹g5Q`9(4m�^“X�%‰Š®ëâ/À£æÿ -‹»jݸ)>_ÐZuÒ2ÂÐAÚÈóoŠr_eËWÏÓ»Y¸iþ¥l®‚�Ë’8ÇiêFb¬ µCÒmùc+°±{£�êë+ëÅÁ?û|&6øá†× ‰]ŒŽ;tÿÌÿ)Ïÿ‘ Òü?<£À xQÌš:`DÉD’¢h†®“ÿÆ }Ç–j¡ð,>><*AôPònÚDôF×÷Ó[¿S¯{¾Ü»Nø¿)›k°Yº£˜\¼1ÿ?ÙÿCâ^ðÿÈÛÿL°jYÏ©U“zûaÎÕÄ»;f¸ã†¸$öæÜž0ZúmM+,‹÷:Ø;–¦Õº`»]ÕWFª—õ½=î¸wÖÞSrÆòø95±p×ÂõS²:ï$}ü1 -îÎBäñ³ì̯¨¤cîFø…È"OÓë£A觞6ñ…¿£Ãâó£é ^¥¯»ÕÎSi!ñ|OgÄËú€“ž= *õAk|—»ÞåÈ‘#GŽ9räÈ‘#GŽ9räÈ‘#Ç×Åÿ!k �¸������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������� \ No newline at end of file +‹������ì]Sòº·ÀŸk>wÞì<»m’¾xŠ +È› +óŸé¤I +…R°-ož9ßý¤-ˆ‚ +>qŸsºœÑ’Æ6´ë·²²Ò¬Zî˜[ñï $þÐ$läx¿—#÷×±D¢"ý•5,½þ‰,~~ÉH–eU…+¿$# ÿÊJGkÁ'2¾u6ûË&–C¼ëíÛÿ¿T¦S‡g¡Œ¹mèÀ–Î�RmˆÍаÆ!±©Á-žq‰×£cÆϳÜˈ«NƒólèOy†ñ ÷÷¨ÃƒóL6KÇžíô¢ldƒeòÑï÷¦¿cåå£1›ºüm ñ!ìóѦ4RÇŒIÇ~\ĸM¦nh&7û$èŸg¹¼vErvîšû¹Ñ²¥ç• >-:5<éŽÞÜO +>�UD3Ñ}¥â™äd«Óø¼çŒ=ñÉaÜ"¾i;~fæÜéõÃ󬜙øã™ØåŸg½©ëf&î´çˆêgIÓÍèË™1EçñÁÏ2CÇëÅ×#:óÇ5³Y—XÜ=Ïæ¢ÏNú$mY—›Ì &.YžggNàX.;6y¹t.ŸEÇã+5 ŵ‘Ä&_LˆÇL⺦#ê‰f7à™øPŽë„â°ÿ•Íþwæ§õ0•ŸkÇþ[¾Ð¡¹ÇëöØIÃpËþ«Š¤¦öÿ’ØŠ[Á*! ÛÖQ +¤IêB±ýû,ën7n«yCn/ +³beø|Ñлù€Ìíµôd¸ÒÇw`oŠ^Y÷µ¿oàûœÃùbÙ¥,ûÊ\¯–˜ì«þ~‹~ÖV7»Þ{¶kÒϤ³÷Íù4àf þÙtǽñê2¿*õHôͶKQ™x«òÃLü.ÿb“¸&¡QÅìã_…Êÿš¥”ÿSH¿Žƒ /` +U€tBA¹(e\Õ Ål®}ÿ/ƒ~gÛ£:Èå›Ï8, F÷AC«ò`ê¼¢3›'Þµ—¸úMµø +ô7šú>íâ,!÷6Ž?þÍÑ>Àý½:Øï|gDüe6ö벫Z@]šŸòÈ>â?$Áð8ôÀ?Úéÿ5YKù?…$ü+ +‚:´m@4ŽEÿÏd #KTÆPB’El¬|'ÿHªeÝF7£ž;ÔÐdÒk=°"P¼.-«N»[±ôëÎÿ±¦H¿²‡þøXŸ²ÿºÆù-bbÄVâ¥÷¸h&Û”œÖ¼Çï´ñÑÿ«Ûñ,\‚”ÿH¿F©¤Ú¢×粂Š°HR�³Úˈ…ÿ·þ¿pOý?1 +¨î6½‡<],n*åR£¢ÖÔ¬šC:ÕÁeÏ»÷)p—^ýªüÆ(ô¾ÛùÐ$DíN÷EØ©°qÚbW6ÞõNÿÿ^'¾H?àìò?âA@züXÿ¯øÇÛü« +„)ÿ§ÿDá†ÎP%Ì�Òt•áh2 &KÿÀøWªlíIåfa.ù}VZ²\¸EŶ|…›½+WÏV +r¯,ÀZ?ÿê݈|άøy`«Ö« @|²ëý‡‡N`vùŸˆ6š¡ºüX`/ÿÒÿ¢”ÿSH¿Äɺ°Î„ÿOeM˜ËPdK×ØWøÿ2èúrlõÁ\ð%ŸµŸ‘w‡g¶¯åÃEýé"_ñ¯¯”¯åÞ+Ð7šz û?}s¨ß©ðjØ/veã]ÿò±þ{²Ë8»Gìüÿ×´ÿ_Kã'‘„N0“™Ž¤#R00ˆB…'@9³$U,eþ7V®#z‹‹š3¸ey´{‹ºA¤‚lN˜>[T‹}»â-»TtúWƒà•áHZqŒ1Â;³ºñÁšÿ]ÕÜ„Vç”Ó¾ÑÕýÍHÈM{ìHø[Tt-"¬Áñ,À>þ¡Š~ÉPÒd¤HÂDý¿¨‘ò +Iø·©$1Fñl ê5XšÄ�”%n`CfÂ4Ê¢XŸc« Ý&.?<úóç{r7étK¹@Ó…ÞVJ%ùQƒ5Û[Ál:Kâýk¥Ì¬ûÜÒª ©n6QݳLDg«FMHr?b´ðWvô7û»#lÊÕ¹s–>ëðJvøï‡#a{DA茎4ØÏ¿¼Å¿&á4þYÍÿ[Š¥HX\b\ôÿBÄH�[˜è2¡šªÓcò?XØî¼[n<–Uü"�CÚ].Û÷ãZ¹›#¥Ú躥iÂÿ¥|1WÊm¶°*ýþöŸ– ÿ<¨¥ðoÉÇüŸ.þ¡¶Ýÿ+Rÿ;‰¬úÑÙ‚$`C"ø׸ +%X\Õ Ä•Xè˜üku7l×ïF=ª¶ëŠO¯Ñ£cºü¢x=ÀSGj5€¬°i´†oùßeÿ#îcìSÚ÷ÉûüÆ^Ø?šøþ‘œòIøG”šL$�5M3EŒÿ™˜¤2F‰3ùàøß!üwµ›éE{^1X«:»¥c7œ>BSg �z©;lUÕ›^u^’xeì”o @%*úĤüï“÷ù?žïÉ^þѶÿ¯*éó?§‘Õó†e!‹è@Öe …2@° +¦+\±l•¨äàõ‡ð_Ñ–OíÛPí7–xb0?G.óy§ßoäÚr:(‰‚º»¯üÿ]ß¿õ™ß;ü©¿¿GÞçÎù€âÿ+iüï$²žÿ§6ÔõŠ.I�Ý�–d)Âÿ×uà XBÆQãó›zÆ÷æ¼Ô›)³^h.Wj–Ÿý%—µåð™Í}/7Ú ÿ‘R¾åÿA”|Üûÿçá!¥Ÿ¼Ïÿ’ßåApœ@À^þñÿŠ$ËéüÿI$áßâkª@·MøÿØ�ºNl`cƒZPÑt$‘còï'd^ñoîŠwÃq u&wDjJ5…õœò•Ýzv®Ã¹;j/è†ÿ7JùÖtV»âé€,BxG>æÿ”ý?ÞíÿSþO" ÿ˜È’&]@bÈHâᮆRe¦ KcÇä¿6àC§>}4Ö}]1õAí*k F¯sËïžµùÄ®^öhýÙ¾åûãþ©ï€ìðô7–/÷ÿ2Nãÿ'’„YS‰ÁT +,CüëHøÿ¶¥(7å6Fà¨ñ¿qOûùé•u[™Ã‹±“/v½§æ²_Ê—FÔj?˜ó[jWq&Y{ãõ^Ð/$GŒ·:üä)— pÿÊ–²ƒ¿²éÔÿG²Ãÿˆ3g::éóPU¶ù åÿ²šÿÓ9â``Cüs[î€&q¬¨2˜qLþ½ç[Ì$UåGSo¹-uZÊM º#{8ºº×@q?—Äÿ¥Ü±�Iñ>ýó™ìðôÇ~x\`ÿ¿íÿc”>ÿwYç?*€JDŒÿ1€AP£Ô6™ª“ÿœûÌ—Ë0§—½|oQ¾4®”váºÀ‹KCïÔe#(ÜŒ\«;_-쉔rÿ¸tý)úŸKÌ?÷B'\ÆÀ‰;ü;Zø;z$:—ñûãênü/ÿŸFVüsK—^ªaH@xû0 ®F!†H³ÄààÏ×ÿÅK[÷$úqû-:ÁxyK—K{[ëß]Þ\vÇV·~͆¹ÒýÃ=¼ ¸3M–ú¾Ñϵ]h¬?‹Úãa1VêÖrÂW«k)¡ýuÒœŸ¾ìÿyÍÿÌáó„/úeO]÷$ù ¶íÿkJÿ?$üª*Š¡?VeÁ¿ÿ£‚•jYºŽmíþ“þösiÓ¾]?,{‹ËA—i—„L®qÍðÀ´ç(ýK¥¼(9³°çIáU-H‚/ +ºY >¬Wü½câF¤&`[>áߎ´p¿ÿ¯î<ÿ¯¦ñ¿“Èjý¯-C%t+ÊÿgA,›ªÀ’ Õ2 ¤Èåÿ;ÿ3·óì¢ØFµ2u×GAià>5ž€!èbßV/ç~{ÿPЗ¾¿ÙL™ÿù„ÿ€ŸöMGÜØÅ?2ûøG’²íÿkRÿ;‰¬úqáU¤C Ø:HWÁ›ªÆ Í„¡f}/ÿö}ɾž™—ÏùFÌ'+Ë.`ï^ß*Ö/UwÖ`pJ(ílø /~@3.ÌÆ…©°Wöóïó@Ü®b�öò¯lÿ£\�)ÿ§Õü£ÂˇPI7�â¶t=ö†5&²þ½þ¿zyQ«ƒÁÒ°˜u•Ã‡ºjµôûÒzòó›ZóÂ|ì "ìVvøOtÛ�$¥›t?Ž×Fa2MoäþCN‚#Dÿ‰ÿÁmÿÃôý'‘UþO[R5ÄU îZÀ°e¨„?€ ƒiÏÿý þ•gãéÁ—‡íÎ44r—…ÀÇMõnvÄ=SóX&ËŽ6ø'ú¹æ¾•|JÙþš¼Ï_¥ãÑ„Ð#Ìîç{þOÓÒü§‘uþO¨ËD&�Š;�…6 Ìæ@'ŠmQÂ5•|%ÿÏ—ãÿš|ÑÌùæmõŽö¦jA”Q¹êÊ7¹ÖôG|Ù.å‹ÜÃ’è½Mü¥Ÿkp±ú˜Fÿ¿"Ÿðÿ£ñ”öÿ'‘„ƒGË}UX˜ ÿ_W° .Ü‹RÈò%ÿ¹ÿ€ÕË%Ów#ï¾é• - ‹¹.š¥IMÎ-Ì,Ãçð²_Ù€7ñÿ8ã.¡t<}?þŸw%ár/pÆÇMûý"ûøÇêöûß p�RþO!{°T.ïŸd¹«ÝO«½¾BlWjwÓÁdV¯›Ï‹Û1q—r¾Rlg6Ì'ÙíâDtLl÷V›KŒšdí\•ÛwÙzÓ})tÃ(ϧÃózSñO«OQþÕ¶[£hkû öMâ:$H>'ùò’íP¨{²Ù„uYEÖßÞñ„V¸®9WÄqèüQ’=¡«™—…qÞÀUjÀ¤áä_gubþãÔŒ‘E·'ÎO(Z;4Ç3îûûç™À÷ñ/Cô–E‚0}þï$²'Oëh¹¶¶A=ŒœÚ>è³ù¤S±@~ €Yi–zÖÓM»Õ©Àv<'~çÍgµMåP‰ ôïu²ÒŸéÿå÷A §üŸD>çŸë:$—Êó’,™ÛicÝukÕ‹¦ÝXJ…pØ5nž¯,¬güñ\ô#'\u”?ýÍR9DbïëÇùßÎÿ-øOßÿsÙ³Nçz(µrõü³[c…÷«²f•‹w·—Ž”ï<ugw¬èi}{*Üà©r› ißœgáãÔüëeÅ8öÅ*™÷³ÆlyÚ÷)Ûó¥ñÿÓÈêù+ª†)€j´þG³`p[r4Ãj¨úÁù?ߟÿK6£¡÷¾'óí±öT{x"N—ÔÍÆ…Üvpy\¸™ô›Í4í¾|ÕÌ]Œî_= ©l&VåÕ›qã‚UX;ÜL&›Q+̹ +;5EïâÛ$ëO.«ö'Í}»²ˆŸ9IRèË™Ð'^à’Xî:®?yô²jÂýÀ V§óÆfÜÈõu£BùÆ#sEßú'½ÿQäâ›»ÿ½ü+hÇÿWÓõÿ§‘=ïå¹-ù±7¿ ~§á¦Fu¹©B…©×}öôx Y¡ÏÉ¥ZF ¾3‰�ñ;€^P‹U>~U…׋^P!+zÆ¡I-æøœ +õ_&oÆù;!/ø;RË¿£JAêB|«$Öß«Å¿—8žÝ´cš‚=ü˲´ÿk0ÍÿyY=ÿ/Q†-UaÊРÖÂ-[¥TSÉQóUË7ùPÎÍé]¿Z–žÂ†Rð¶6jÖz¹:[hu5o*ƒG«žI:ô³»H5c{r–I´õ<»Q×—7õÈR&QéØI6Í8}0Od²rJâœ;ûâ]›wì$âÂ7ß6*xý>ñ¸Â[âåÌSßÝ9£(ûƒ3m'þôú4æÚ¼jÊæôdŽ'; ˆKÿyÒ ïÿYÙÿoõ�÷ú²¼åÿ!9}þã4ò¹.9wƒ +|`yÓô§¥œ–W[·sÏ1Û´kø_"Ka‹z9\ä2ëw4™ïXgâÎÉ20ƒþxn¾Ô£ý±CfÔ“ÊZÖ“ëã9"Æ5Œ?ä_È–ÿ'þ¢_Yümz‘ÿçü¿Ü1èú®svÿ¡è ¿£û¢õ¿éýÿ~y}ÿ¿ë]°ûú mó¯i0]ÿuy= X=JyÅ}ŸŒîý{g¶œ8²æñ¹öS0ÓáÓ“e-©¢£ÏÁ`°ÙÁàŠA¤¤„$´�"ü2çæbb¡_l”`6Ÿ*,wú_Tilò÷åö-Jw_~vmò¿Y¨©cýTî Gùßÿ¤y.õÿLFKæ³äëÖ]ÏAŠþÇÿ™)öç¢Mþ#§úØ 8Îÿ~ýg&ÝÿMDÈ´Ì`l‘ý¾¬’¯þ3ÒñßÕOYüõ?ÞÁ?½—ÿ•Kó¿&£øt%ïøöŸ08!Õ‡ëíõÿiVÇ×ÿ{ùx!å?Xÿ§k3Ò&ÿår”v/ÿú&£¥wE+üšŒ«›™øÛ·Òdéç¡MþW—ù ¾,æ?–÷q¥ãüïíÿÓiþ§d´JŸP±¼²mCWˆ+sJÿ¹è-þ<ò;Öñý¿]þÃéÿ•ˆ–ü߸6úãtàÜô&ÿ':�<¾ÿ·wþN�Rþ“Њ³oèî ÅÿÜ´ÉÿGå‚;>ÿgwó?Ã4ÿK2ZÍÿs>ñ÷ɨ8ã»>rôtà<tÈÿ養2•ãŸÞ«ÿ*PL:ÿODcìºQìñå?ȹo»ÞÿÊXNËÄŠ‡T+c[N&üaäó0F¤sè‘ õ%óhS<¶Ü63c?ÈÈžâ/™"9<ß@Þëú;|FÂÃЗԬü¹ôöù_”V/œ?d ŽŽÿµWÿ%ÿ–Œœÿ]¶þøÏ7,B»ýÇ¿úº‰RjV½æÿ«YÖ)J¿Fú÷÷ÿù4ÿkBZ1_ÓqÊûêíñß°ú‰øÿìîÿ žÿ%¢Cãÿ©+z4ü»Ø%.@©9øiu`üG +Éáå‚ë¹hŠ{Ëßm¾cÿ¥Óý¿D´b¾è#G ÿqe]M÷ÿÎCoÿù¦šÿÏnþ'JçÿÉh]5Q73ص±¢kº‚œ”þ3ÑkëÿÓDþÇ:îÿ³ÿÇôþs"JcþÏ[åó³©cü³ìîúrLšÿ#-ó?G H�¦�%HÄ3Dç(ž¢I>eþG㺛·Õ|[÷u_8|yظ¿¿¹ žšVãžBŠ:½}p;8%yàŽ£Rœ8–äšÍžsñ’¢p;]ógÿyÿôú(ŸßMãŸavãCþÓøÿD´¬ÿ%Ž¢0 –Øð¬�™CHÒ°È1*Äê¿ÇD»¢¶i#ó jé”ÚÏÒGù7utüßÛÿ‡©ÿoBŠùWxž§x•�eJQ"`8$04$'4¯Ôý¾ñWº¼ñ+åÑ“Èš¹ò€¡Ê� Ø’¬Œ©H1ùR.gO—õžMõb3Ri¹QÕË×L +³6)i±×·ôQ1›:Êÿ®ÿOÈ?—®ÿÑrü—d†3�Àð +!TN�H dJáeDŸ6ÿ;Ëå°Ö‘ÍÒOé³HÁóù¢WlMýÙÝðIí}k)ãqxÝxþöÊ‹×"_1�lj�Þ£5ÿãðoúAÀóÏíæÿ†lêÿ›ˆŽc*w°ðäÃ:‡ó ÒÖ*~=Û)^OŸÚ•oµ;Ý\x7^µÒ»yå"ì@¤KÓºüš1eR„™$÷€í…ak‹ Óžo¶º¿£ckç‚B¸Þ¾bî´êöw.(÷åÊgÿ±ÿ„Zóoâ¾åéèÇNúë]óÿ-þ¹4þ?!½Í¿ƒkw;É{ä;“ÅØmÉBY«åt.¨uºÍy¶BÏñƒòT¨Ëå»î²ö“4ÆQ÷UÿºXVBq-ß!Iÿ£í¶ƒ5}NÞ=À˲&8¤úò2~èFÛádzHXÊá‡.6ÂI�V{/“ÎÐ[þV)ù¯iÍ?©×õIõ_Ã¥ç~ý×tÿ/½Í¿:±üÂäÑÅ•ûÊôfèZO¥¹¬›…ê]ËÏÍŸ:˜j«R¯õÄdD€ƒ5ò=FæháÜ~ûrìbäm_$E‘âí;Q1ÅךڧbŸÅíVW‚´¡®ª$nëfâbF›?ýí7’–õ¶¯‚U9²‹™9ðßÕîç}ÿá" }tÈ#üÓµ;þCšI÷ÿÑÛü?Lf¢ßitMÏeNQp¥ÈO-¡0˜z2—«ÖŠ£)Üs='.ºWåQqÇçv«þ!š¢¸\äNÈîú½KÐ}7l|9ypðØ +ÛDf8Þ“þ»ññIáÈeN³_ldží‚_¦¤k8¯ýe=ÚÙÖåÆ›\ì„·ôÂ9I-™[<Ïþzu¥yö5JúÅrúQQJ÷jãs¹W¿DU+W?éêø´Âf™šÄÅ_õÅ˱Ç櫦åmݱ,ÆæÛ*ùkFÖeŠŒžŠ76LdBOzÜ«åïuà‡7êcÛr¼ÞÊ"¥Û#g¨|ò'×ÿ Íý~ýßtþ—ˆÞ¶ÿLµÜÍ5•n»úÐ|ºËKÀ«pÂò¦i¢r§Ò6òó›É·E‘n_åîy<Nëºý5t æC ×ÒÞG}¼èÿÂUý/6ªF0ÍÿšŒâóeZÐ4dYä�Ô8H†€R8•ãX¬†ßÑ{ÏB[WñŽ; C:Õ‘ó osj˜§KÆ€ó¾¡â} úUÜè1åœ/òe8ï-Ô¾oßÈ£»è<h¿Ÿ®‡òÑÕe‹wy×!>ƒmø}Lïâ³Î¯[ |%·\¾¬A㥟¾ÄíþÇhDæñº2 +NcŽòÏmæáIþ(¤ç?‰(æ_dZ×á@Ö ÈS ¼„�1ÍHƒ0ÿ‘ü»U™áíÎhÚ :O¾7(O†=^¥©<uF›D½ð¿ßO×F ¾´2™ø–ƒ–àµvÎÇ +¼Æ¿ožÎ埧vø§)6Íÿ’ˆbþe•1‹X@ Œ + '‹@Ùjø CIñGòoäËÒxzWÌúbs&:ðsUØt„ Ë=Öœ|mþ¤ ÙH.©üh‡ÿ~zجn:bvÛ:+p€Û±âíµS-�Žÿp›Zà¹4þ#ÅüS2#©4¯QÀÏIÕ # ³á·"P’ð‘üW¨Fþº5ÑKP-YhC«Ã©f±(êm}hc©ªš-Jíþ·ûéšüZ|y ¿ge4'|œ!ÉÌ^·�;ûD‡ø÷e²UŸ ÿ‘ÿw\ÿ› +ç„6õÿLD1ÿT5QÐx5äŸS( !F +9MäEJU>”ÃdšÃo Þ³Š¥\Ø-v +ÃN¾êv?Ë'9JÃÊnð¿ÕO_ø/¿k`»‰sÜø¨œ/›:Ê8æ¯ø§96ªÿ¤ù_QÌ?'s…8T¢!K™g!8ACKc?”ÿ¶tëÚîâa®ÌxûÛ¸”⃼,pP®€†ZMv:Ûbÿ…ÿ~º†¿^{ùo>Gì×:À¿ožxp|ýOïîÿ1tzþ—ˆ–ñß+bY�- +t8ÿW Ò´ ÀËH`ENÂïŽÿþþï¯mohj~µì¹j)èŒîܪöq5×*{õ¹1 +ÆCÓ%·±ÿ·ÛO×F ÇÖ‹ ³ÿñ»–�{ žI8ÌÿiW�Ç×ÿÜËø/ÄüSéþ"Šù—K¬Æñ„zÈ„óZ<ëÅÑÏ1É¿XïêMמ ʪM~Ö»ÍÕìi1[Ë+ú$_y(Ì:Õ@}ôî¶ø?¼h¯^x×L`·™óšlóOj½ô¢°½èáiÀqþ…ÝñŸ„„¥ü' eü'-i’*Ó$ëC¸þ§%ˆP£-óŒ&CJHùnþIO:Â>ìEKk º4U(Ôg€•¤IM»‘gÐí×RíÑg{ǃì§kpM^Éx’À6Ž‰Þñ7÷ו%ˆ>ÓʼÒÚYX€ü+¤ò‹qBp”aïü?tRþ“PÌ?B”ƪ8D#�YDðŠh54μL©Hzwü÷÷ðoNI.èÆâz:fäaUrêf!o_gõúº=lšM¯4A¾ýÂÿ~?]€\ôÒ¾È E±|Ó{Óh÷ç5ø÷ÍÏ�Ž¯ÿ¹]þ…týŸŒ–þ?Š¬bšW‚%@‘£?ò„‹ýýçÿïà¿YsÛ]·Á6Q¥¶g”-u’ˆzÁ¬Ûe5á¡e +#ê…ÿýtc ÇàP‹?/ú‘VüûÞÀrôʼn*¾më¸ÿÿÿ4dùtýŸˆHˆP ¤…]~Éf8û†qÙϪ®X†‹š7ýBcÔPª†¦¸ÝÎL»k-†y¨éQCÕú?/?›–ü+ÎéÓ>¬uŒ†avãØ4þ'½ 9ŵ)“ۧÅü¦ÐìƒÛ\Ç¿*^0ˆÿÖC»®nRðæÂ8ØXFäìà‰¯;xŒMÏíÍcêfÿk†‘¢v_ÆŽc9á‹%ñÔgÆBŸ£–ü“¨ÒO㟥wã¿YFHýÑÛü?Jmßé2ÅZ‹â*RQÒ˜b§>)™V£(N•…®Î†v t,ëBÓ×#É$9Ze;ÁFÃQšOã…eâë7¾cÙøê›ïèÊ ŽôvâµÃVBˆUôÆ;ã„ļ¤Ñ†ß©ÿº¦}ÿ´°7þ3éü?½Í?ÝAæÝæÞ´,ö¸’窦7˨*µ¯o»}ʨð[s;å‹è¬mås0t»=#5ö™õ¥p¥¡ËkŸý›§"ZòO–Ÿ7ÿga:þ’Þæ߃b?×–ò‹'m(³r¶z7¹}X¨ÜàÚèøwÍÕKòÄ>ÉÿdÍzºébÅwpÏ· ©îj`^§ZQâä�Ñ™»rö=ÛrôÆh®ýq/*FÏÐéJ -ù×Ç$EMÿô¹ß‰ŽŽÿ¤þãvþ'ŠIÇÿDt4O;ºÕF÷÷íÖà(s:²ºAí¡á”žŠóþmcXmL[°À9õ‹¡û½‰âT“¸ß¿‚¶øÿ ÀQþ™½üiþ„t$ÿ£ïtnQ _£ T¥ŽÃÆd–Í骯屘÷þàña\ª0ð‚Té᪼¯¦èÿe´äß°úýp]ö9ù_éýù¿ ¤ñ¿‰èHþg˜CwaHL͇N®¬O¨ ¯³š¢ÎfF/ZtURç<Ê^DÛøá¢JບnÆý´ªùŠtãóöÿ¸½üŒÆÿ%¢·ùwžúžàjH«1fUzßÚµ‚ÜÁ’zC-Ú"/.*McQ²n.¶2¯·èíÝ#+5N½ðO"%ˆçã'Ô¥¨Ýõ?Ϥþ¿‰èH^>®ÜÕ5§ Å›lNë¼Þi‰³¦7,øOâu^ª:¾¥uZ÷â¶{à»n´“wù’’8£»ÅwlzF@ª¹a'³Ùå2œq–o¨gH:uòÔ oþ’i 9Ê–ŸÑ,‡üï\Ç:&ïKËÔÿ¨6k¾/£¯ÿi~×ÿ/ÿ––ñ?˜g¡‚8 bZ‰ˆVÂ`…aT¨ð¬tÊúoåÞõ@¤-7´ëpöHûí^E½®LF‹²(¸ó!Ê©…¡46g‘¿ï²g¾¸÷nøògHß½?CœO>òÒ½|ÐÍ‘›q0É=¯’@ĘxôNñV Àå¹W‰ÛâŸdoþŒúoµË?¤Òý¿D´ŒÿEš„±,ID€*%$Š$@âJb8L‹§äßEöÎ<å‹ÖÔïZ½Nÿî‘™¶Õ:Ÿo*·Ô#«eƒR³±¿Ô3WôgÉÝõb—üð7_Y÷;"¾#÷ìI?¬Mþ5Ë +—pŸ0ÿçöÆžNçÿ‰h™ÿ©XåXP’R¯J4Yž2‡EŒQî”üct¸…´Pû¾ö•k¦X›tKÍr]»•Œf£Y…y¹S²%â?î™+PˆŸmƒßŒ–f¸FGv!¥þ]Ú䟬È>#þ‡åÙ]þ˜îÿ%¢åø/K’¤*šŒÿŒÎx È*†)¼FIïŽÿÿu¦Ø¡fÝ=Ž(mç÷]ž–ƒF½ðx•íÅS¾^ÕŸÀȴĈÒ37RûêfÆDS½¾;õ—„NÀ1mòONp?¥þ³°ÿGR‚§ü' ˜^”9D© èpÕ% +‰ Ð’ÂŒªÑ=%ÿ×¹2˜>Ò‹E=ÜVhQd½œ_¬Ålá~Úš×%£'•y<þG=se�ZÑ“mè£ rWLüg,ÍÃf¸nç59XF$§–`OKþmìD3§ÏØÿ§©=ÿÈs©ÿ_"z›S™Q\×£:ζîÂÙÀ@ËM´\¡ÿØ &9u>ïfÄ”®ëqýǸúsû?FóØŸ—ºÛùz¶KÁ®»Žçé/t{ùDC®×ƒ$wn×'Œë’ZÏWÿüò·¿õæÞ³möŸûºö<´ñßûÏáxºÏºb=»3íY3¦ÏJ_–Qx£ñ¬Æ3žãgäÚ¿þוN*1â¹bø$ðºá«°a×B;ñùÃE¿Ñ¯ÿ¼º"·¼1™|üöŸùj®õT»‰.üþÛò_ŒÔßótÏÀ¿‡Ÿ?S±¼p•â›ÿßÞ‘-'nóÌW¨ò²IÕ +P[©àc³Œ1»Æ©-JÇdt¡•ÏôÌH ìgãÓ.kfè9ú˜«»ÇüpD?Ñ"ºo.qñò/%ð×‡à—› "n‘(‚ËÁõ¥ðã¯Ð´…… .nAq/j≠ôÍÊ⇣�#§hHcÞî_0Ô˜ëD^Ë7…Jµ^)qËëÿ0ýF¯õøã/ñÿ~dÿYVøþï ð¼þ¿q~S;©¬ë!)»ýµ—OJÙv NЩìÔ[=¯çœòËC¼s‰šÛh1rI2æ1âæ‚‘hO ÍóC+ß\Ìñ[ÝÓ¸¤3û/ÿu+þ÷ÿ8</ÿÍåM=ªu†áXÍË병í/»íq|W®£®33?*«)P—3?/ÿt[i)eSA–"ʦ"á?È5£^KF½¦T,nj¾ÖÝÆu×ÐDs +`0Æ.}~Eš8¨høn!rü±F5DºÈ”Kù†ÿdö‰õÜŽà¢÷ÿÄö +ôaZŒ#ÐŒ˜é#꘶@öxO€C(ðBÝTÊüÕr½zkb½0ù'OöÇŽ¯kû·Ý%ÿÕÒ¶ý·¬–¹üž—ÿzØÈWÓDEíãÞƒ–ôfÍñýÊ1lãã]¥)«3MYÍoœ“ãÞ¼ÍñæË#ñßlÑkdu4÷Ì¢k¡ùV\„RÙƒõD`“ÐIÿ‹Ð: +Ý"-NBWË/„Œ¡ñÙÛ€Œls“ËÄ[#Û² ´•H[˜~Ó(Ò9\T'`á7^ÞÄ·¦á÷@NþßÊÿKÞöÿ”d~þsx^þ§WvnÛõe´ÔÛ=¥³jÝËfl÷ÊfsÚ>˜§0£Šáh:¥S,‘‘L:`h§ÿjñøÏ„ì(F(ŽñÒ뵎�vËÿ£ý¿Råö_÷4S´ÐUõú¸ûIi·í«(¨5u¬%©3wOªããËÕ•£N>7××…€òÆ0}òHÿd€åOÑr|ÿuB?Øyþ'mûHeþþËa`Ç»lC«½BWå~íþ“[¿êÏ,ÕëuPí4êôEI7*_úÎíqïKTÀ;þ‘ï9Ëtm#vÖW-ÁÇÂöLÑ$PdÕfÓ¯4ŸÇ~9$ùUïÏò¯*ÕíýE•¹üž—WnI×].Uºg³äzx~©?HýÀ<=Ofug´jŹ=™™'ãüù{C ]À%ú=2 d“ùmÐ2µÖdWŸÄÇëwÒ´£ÀÑ–"œ~´Xø©äöápçÙþÉMó?y_ 9Íuì³*©Yê>‚{*èy‚«™h«ž"Å1ôœ»<ñ$ +Ü~ú£$tD=´‘õŒNÇ6¦x]M/lÁ0EÀ½3ü` ‰šg +ÁÂ[°cÁöpûV=ô$æFÏh"Æÿ•&wº7g .sÃè[ù–Ùôê8DsF¶î Ö£›¬Eè!°Cáúq7`ânBËð¯&в…í8xˆ‚�m‘†R”¸Y&C&ŠÂæ 1ÒÜîZ´ðCs„‘£8Ï×“É ár>›3Ü}] Í!î@i×~…ßȸ0|û¥8&†áRE2@”_“S^€|&øÃ@ÐGÖ ¨Ð"1Jœ§ûa1A!"i€†„yVÒ1) +qÆš£ðeÜñîeÌ¢±ÅðÈ=—øim© Þ�PgFZ +7 #£Ü÷°qOÍW”ÇF¸á¯ë.þçYavR/ñžü˜ ÇÕƒÙÎfÍé`®É €V‡®¸½”Öý¥B´ë„$'¬ã½®û%Læù#Ì¢¡?ל‹<¾ÍkŒ¦&ŠñR(Ú¿ +Ê;1§-#œ×.œ›þéܦ®¸ŠŒ¥öÁIÂO+ÕDBŠûç×b±ªpØ ùÁ†fË9ëg cM* +]`{c–¤Yh“r!2øßi0S`J#Øbç85Û#lº1ákºŸ`t˜á3B¿Ì9ï ÛQtlt13}Áè¤óæd#ãG¨€Ì- +7å™vL¥”Ú\“‡‰æOÌ—ßØ…”z‡×†›«¥'¦KÊi;ÿ'K¦·ÔlŒâ÷h8Æ^:3‘ßs1dßÌ[ÙÎj‹·ÞçÖ˜¬;t{´¯þ¤ØöÞ¡ñs=zý?9ÿ }¼1ĪÚ[º~²ÿ[ ö_`ÿ±ÿƒÇÿ>PC-¹¢+ÕŠ$‹õRÉe]ˆšªJbÝ0IH®j{ÿq_]]¶»fëxvRÒÛó¾Oª¤Oƒ°u\*o›M¬ µòYü”73'ÀfšBTá;fÆžvÄ&xv е£/4ˆ ‰(¼Ã²ˆ¢hý8ø[Óà-aCþ<×x1¬ Ñ~/ƒvÊy[þ«U…ßÿXürÙ0E³ªÉ¢¬Ô±V±±¬¨RëuÝ4ô}Ê¿Ù*]VN;ýûêL¹ý|×<’ϧAë´ÀpzqµøºÝ ¬ /¨üoòæZl¦né2×/"ÿolÿ¡JOØðûŸƒÀŽøŸòt1é¶K_n?·w§+U–‡FY9ëN$õn2Ô›µéywÒw/§yõMØ !›©Ä(s9¢ÖÝDqx~ŒSˆigþÂhíõ—»EH“í„·2Ò=ý,=Ûdqâ{þñQ©GgC´Dšßæ6^Ôû!SMY¹ô¾ÌEñÄßzßœôeë:eÛ\?ÁRSäRiÅ!3»ù×[¦ràÀ8pàÀ8pàÀ‡ï?‡ry�¸� \ No newline at end of file diff --git a/core/tests/fixtures/config_install/testing_config_install.tar.gz b/core/tests/fixtures/config_install/testing_config_install.tar.gz index 8bbe94512532..38fc20382c7b 100644 --- a/core/tests/fixtures/config_install/testing_config_install.tar.gz +++ b/core/tests/fixtures/config_install/testing_config_install.tar.gz @@ -1,37 +1,45 @@ -‹�3Õ¸]�í}{sâJ²çüíOÁNì„g"N¹õ~8NÌ^ÆƘ—¾ç†¢$•@ —õൽßgïÿû æ‹m•$À€mè>4>sZÙn©T”JRþ²²²²2UËÕ&Wjü7¡?Q n›ÎÕ¶þr*¢(Jà¸ù_øøŠIÎ Ñø_ŽfYQ¤‘fÅE<Cý%G¬PDžwų 6ú ®f\Ož%·þÿß„¢ÈÔ¯s¢ÀjœÄª�‰ª8$Š@eÐ4„’Èð£jt†š«£ëœá_à×FÁu.ô#t¡#9:r4×¹œæ:†9$G¹È‹ Dö•œè*f.\n»zd¡íø$!{SJØñBÑ\?.Ò‘#+T’Æ•F×¹R/_ï`ÞÈß#?o/:R©áenj‘ìPMúä•|�êœvAô‹_$7Ko㣡é:øÌÔ‘ -}Å0ý ¼˜!s8 -¯sô…ç»S|É¿Î9‘e]xV44qõˤë -y8%FÑuÜøåE€ÂÐt†ñû w~¿f.gAY×¹<97ƒÐ‡!î.ßÜtý†âªŠn˜_×¹©˜ª…È4%mÐñ›òBün(|ˆættZ–bâð3 ‹øw¦e†¸ÿËýŸ‹ÏæÃŒ>‡Ô=ù¯ú˜c0çžn8 ÿ)‘g‰üghü‡,ÿE†2ùJ俦#¦5H,¥Nƒ*Y�´Ê 9êü7ÈÿSIwã±Ú¯dº;/Moj“eñQz.pf…ò‹j#fº*2ÙaĽ’î+~[ÀÄu-Ù©÷${*®W%"{Oª¿]k-Ñ/ÛXêæVW/é—©H ð˺ék~Uê@òd»¥®´ü8¿|-jd -N"á_`™mü3ÃfúßY(Á¿*‰´!É`x㟠P9†š®B•ƒ4ÅKò7àÿ›Þ4»ò…ö’Ëãžý<ŠuDNɹ1§S×sîÂØ’ªõ›W@ßâÔ·ÑŽï"g£Èú]ÀoµöÜߪ³{Ó7mè/r±^—Kkmƒž¼…·!ÿIÙ{øa09 úÀ?·7þ‹´˜áÿ”àŸç9D±dž‚€)@^å«ÄhˆÑ8ƒû‘ø×�%¨êõ8àƒª=´&"çyÃNOfoBÜÜ—u³û\S¥ûÁþcN=ýÌôÇm}ˆý×5ÖÈï@58æ¤V,%Ö£w€p7õMÉyÁ[øž×þC <½ƒg2üŸ…üK’.Ï�UDàx•2T !Ž$¨º(}·þÕSÿ{„ײÚN¯ ÍçÕZ¥üX“5RjãöDóØúøvè<ù°N뮲%†ßfÛyW$~'ͽ#ö*lT¢ë8hŽïš‹BŒå�†(ò·Uôµ¼cÐ9—ØÇ¿‚�Ñ©ÿ¿ƒaoþϲþÏA þ¡ -y™gy¬ðc!À1† -d!À3‚À¨dx~ÂüŸ¯Õõ kxµê\™ÏmÉthºôÀõoºôßÞYR!èå ÿJ¬øù?F½Eô£�«?6ìÔzeˆßUnuýx3À„À>þ=ÜG%4CJÄ?½;þ‹|6ÿ?¥ú?#j4ÔiÀó2ÿ9(•§ j†LͱHü‘ú¿´ðÂ’!ôüþ-д»äœ&?5|±Î[/ÅBÍ1ÑS¹§‡¯€¾áÔ#Õö] ošzã{6ððsÅuþàÓý=ÚÇèºÖ ÿ¿±þKí¯ÿ -™þJíÿªÀQHb�+ò2à2’5Àò,2αX<œdý7f®jóbÃ?èt‡ýyK†T‰V<]šÎë7#£æÌûÏš4ŒîÆÁ+Á‘ôâs„7VuãÆZÿMk®%IƒÌ‚£´ƒ“û’·{¥ãé‰b¸¾ Ã+\ÏR!–§“�‡ÆVwÇ\3Ãÿ9(õÿJP‹‡~Ka Éš„ÅŠ51M0DŽ=ÿ _}[qbµùJ¯ïÏ–O°é žËù@˜is©Ë”Ët_d†v‚i4Mìý+¦¼X¹å˜YÉ Kx—üï#Ï2//°žö˃aˆ|ÓÒ/9û‹þe€ÅÊÝ5®öÙ¯ýC{ø…6–3¸à|ó<ôgëÿŸD©þÏA5Ž”Aáù¿lP�²,Æ¿dŽ¡T¤Sâÿ¦Ñ²Ân«i5¡Ûb|ížë›Š…Š7÷c>2©Î# =jƒÎ$Æÿš)×à®S{È•pÉ{�èÎÑûøMûD2àðøOï®ÿS“áÿ”à4K«ÇøUÀ!YÕD€DŽaXJBš¦žÿã¹Q´fÏ•Ç~Eצ5ÿ€ÞD{ž—n»On£röm¦þøl•£›mü¦Ü—¤ôÝ¡?¿uð°4²‘‡ÞÆ¿í:áèd -ÀwŒÿÿg¡ÿ†À²†Ž§þ0þ%Fþø%BÕ$Yåöÿ>ÿÏb5*vg5¥§wêÓ͵¨Ï*’ •Ÿ'ºPÖge -Õ6ø™rü5Rô¡ý½ÿÓý„âŸÛ³ÿ3L6þŸ…Rû/è¢Àâ©?ÊDÿ—€*H*d]×EÄj¢xôúß1ø¯‰‹SLº¬0z\ðž¬ûyx[(˜£Q·D7ѸŒZ2ûüjüßû;ûñ€Ÿ÷èmüÏ:¡ð{æÿ—áÿ”®ÿS<+òªtžØÿYZ’ ‹Å F¢yê¤úÿ¬Zâzû¤ÌÊÃ)3V8[ËçËíÊÒ_ Z\L–úÌwòÞÄlðO˜rÿ=\òþèÿ[¯—¡ÿ½ÿ‚þ9ñÏïã?³ÿŸ…üSH5¨q�BYÃø7ð‘ÎC 3È0 RÒO‰ÿÆMÌVÔ—Õ§£HãÆ]áA懃Ô|é‹3ϨߵÖÒeÿ#L¹ÿ.yÞŸýGÐûø·Pœf!à þùñeþÿç¡ÿ¬ c¨«:ˆñ¯32žúcýŸ—%¦$MgŒ£÷ÿƒþɃ³š_mÞ4‹·Á ¼&¤:¥rƒÑ‡fåÎè,ÍûpfÙݹ¶ÿ5Sîr)^ |O"dëoÐþ-÷”[cúfüÓB¶þw&J×ÿ4•Ó$Q4C€ãE<þóH�<D²ÀH¥“êÿîP -zýQ!ºSj3¶èš…›çñ𥽕e[S»=eö uÕ½HöÞ8Ã5âKI‹qáà'—`ý’+çÆ¿ä²uÿ÷hÿ6ÒÍÈ>ëþV`ö÷ÿdþÿg¡Ôÿ‡X^ç%€'^p¢Î‰Ãê€ÎÉH¥TF2Ô“ŽÿÎò×1ÔÇýJ_‘:VGˆÊùHYË6&öÝĺ/Æ”ý|bÿK˜rO$Åd@æúóíá?¹~xZàðø¿;ÿ8*³ÿ…Rý«ÿEë� -¢DD<õgh�•å9Êýhÿÿc🷖h±óRÅ)ç•[ùŽé–î[¼•¥ç±°xJUÛRŸgéÆ”{ðK ?ƒþÇã9¡.b Øø_‘½‰WÄ%:À¯ñÇÏÿwýñQfÿ;¥ëÿ,Ík±Õ_D2à°î$^äÒƒ†O©ôÑúÿÛûú±ú£ŽæñüâA[,Äç‡Æ¨y[½}vÕçÖ½>É—ŸzOìC€Ì(Ùê»ÅŸ+¹ð¸:ÇtˆÂ›˜©;¥{m5üWAs>ûµÿaè5þ§&š%øwÈ#²¬³ÄÿaÅýø?™ýï<”Žÿ†®1"Ããñ_Àú¿¬A ²d' jh*«ê,÷Þú2Þ~,�7r¶ü°âÌoÇϺx¡wÏ7dDC“Ý2•yÙœ†C‡ -ïA² °fÐÍŽ�|²Úñwù†ˆ;‘‰€]ú�ÿ~p¢m€‡õaßÿ7³ÿ…Rüs¬apÉýëÿ*+�’ÈR†F1ïÌÿO„ÿ©5XúÀ÷C®×<в|.(—Ç S¶æbÉd<ÔogE¿»Á?fÐõØßng˜ÿú�ÿ‚¾6RLüaç¿KÂ?GíŽÿ´Heö¿³P‚šgiAqø¥1ê±$PY†P2tÖˆsÀ;óÿáßx*÷SåvYx¼3ïñN5J<dŸÆÎH½iôokú¨³Ô´Áÿ¯t´ãÂ\\˜éé0þ}àÏõ{ÀAü3»ó†fèÿç tügUŽ¡‰ÿ?˲@è¢%M0ð,àÇŽÿÂm±Ñã&ó¨êê]žôZ‚Ú‘ŠÆúâÕF»¨ôÜ û\Ûà» )Ý„û1! -^”M¶èü‡'°þcÿcwõžËâÿœ…RükH–„€DÉ,à‘ê€%öDѲȽÿ÷{à_[Ê/=ŸžtUÊ?æoKÏ÷ÛBs>3rÑÑCà-zˆÛÀ?áÏî;ÉY†ío£·ñÛW5×ö v‚µÀÃøçwñ/²Ùüÿ,”îÿ¥Z£hEÿ¨¢!Æ tQ”E ýŽøÿGØÿEºØÎûÊC½© #¡$Œ+\¥nÑÕ|gG6ZtË…›N¾·€ÒpcÿOùs%�Šéifýÿú�ÿg³ÿsIü¯-û6þŸ‡üs”$àoÂUæÀ1:dšÃJ�¢%ÚÐ(•æ~‡þ„�°[•²b¸ƒ±í<µ}¹æi%®Ø÷7JÙkÐùEIWJÁdÞŽj°eÿ'ðÑv¸ÝL¤ÿó9éž6ì÷šáŸ§ÈøÏóÍ3,#ä(š§2ÿßóЩILº8zœŽ‡éᶩ%±6SàrÃD–¾:´Ö…VH¢ÖQqÀ:gá¥g$x~zìÄ2„í6êÁp¤@Ë„AržD¿KŽC̤ÉÁprDÒ¥ÙD¿Ã¯üb<0Žè—íK:—V< „¹JÒ]®ZÚ-õ Ö†ÁÃÔ(Tjù©©“È®—[³Ii'ÂgÄßA1þãÐŒD¢ãÇ'´Lg¢¸Säû¦þû#Â?½ÿŸÁÙøÂ@À؈3Õ¹Gˆù.vA+ÛfcÆö¤éÌÔTPX� ÔÚå¡úRívµ? FþÌ‹ú«U°ÒÏÿinwÿ'ò™ÿÏYÈwgXÚÛf˜¢£Io?¤ge?XèÖ ËK\ó¹Q/¶ÇU -'Ïruy§òR†þŠõ¸ÏÆ?Ïíã?[ÿ;yž"+*µ‘˜KŒVþpî'T'ß*,ºË3hdÞUDµrÓ|¸5©ÂàåyÚÔo±82"*tJñº>ž‹%ë~ª«/Λÿ‹ÙÍÿ'p™ýÿ<”ÆÿÑiCâETÄõ?J�2Kñ€b5M—xŠ“˜oÉÿ÷Æú_rH&ñ‡<]W|iô^ ù[ÊcQ|Å-U½Q›å¦¢øT¹kç‹öÓ+O ²1+§™qã‚Ô¬n–“CÒef†XâE6ÉÅ· ÖŸLÒþ'ÝÝÞY¤A_7˜DЧ/B:C¨Z+‹bìy´Þå!?0ƒôvŽ«Ä\½7 3Ÿk+)úV·8ë÷'ö‘<üÿgwÿ/'dþç!šozÄ�gîY$fÔ8¿„3$Y%hFº0µ¤–núHÃL»H2Ü|Ið|!Ìô…T -.l8AJäDÒ:˜½u…\”Ùæwòã„ß?–¬MÜþÀs^ ï*rQ^Þ ÊIÕ{¡*òÍ»°$Ïå¨ÃÌàð”˜l¯ÒÍ¿¦£ÏJQp�ÿ4Míåÿ¹,þçY(ÿyNF§ž§hÀé" ¢ Ñ‚ªqÜIãÕ+ÕB(LfJÔÕ+ÔKøÈ”œGC´Ûa¾¥ÏŖ̵«µq_m]$úe‡,RåTŸ8ð%ÜzÛ°ë:SM]$,+"É¡‡Â‚z©RïyÜ»_ÚäÞI*Ä…[OK -^ç+l+ë;G¾µwG\öwÚ¹O|öú6ÊJP‹Ìæö0 -]o¯qéïï§æ-Ëè4”ÊÿªÒÿf7ÿ+Oó™þwZeVRީКÁE #w¦¬ëi#×ÔÐqº[ÙlŽklO/(Š•óbAè<ÌSéjϪ&ü-§2ú¼U çùLwûZ-Ó§>`WÆ ã¾®è0þwí¿<Ïföß³P¢ÿ *Å< ø -,àdI-! s,b!XÖøÆü±º±vÎ.ûøâè"™7ÆyЕ]qÛÆòÙïäg¢]üGŽ~rpÐþÃS»øéÌÿã,”Æ£²” "›À/q�2mȆÁëÏ ç¨Þ¬‡bµëk#†ª-��ŠªfÙšJSª‹Þ4õ÷vôµ£gÝur÷¯ÿÖLÃü×_¾'T˜í(°Ÿýžÿ¨´‹ÿåü÷íõ~‹¾ÿ™þJð¯ò"ËC¥Iü @‘’fPe I”ÐIã?²|=ÕYBsjCjh>_*·i4«ŒºòÜÑlû„ý$þæÊ-üCϳL,º¼‹6Ãÿ1´Æ¿ßé²�Äÿnü'šç2ýÿ<„?;Aé¥ã^^ç•8a#@¼/1V—#0‚NŸp¶*H.ƒÑd§Àvw -4‚Æíg§Õ`¸S ‚MÉõâZ‰ƒˆkñ¨ê]£µò½ÛÂtÐ?7+¦³oÂF½m"§íÒÿº¡ ðäðúï®ýOÀGþÏA -‚tí׃>´Q¼cÅéúEàF>1úÅ4<æœü >@éb„wyI`êÚÐt¶KdáAéÊ‚"%…ôŒG7¨YéTäðIè½,í £Š5£Y4ùE³×oÏóuzŽ´A¹¥fkÀßHkü“•ÿOòÿÜ÷ÿâD>óÿ:A+8XC^1,¬‘o§¡·ÉRf‚ÔÈ] ÞkêÕèrýjsتÕDV ‡´¡¯Ö6W•Àº™íe›ÅÕ÷~H*¤«–Û¥`µœA|¸rotø¨v?Zú‹•_žT¿¯OoÆ;¨ÎUÓ)7*¨8ŒLnÁ4:õVSùL_ùdcÞ§®ÿѳÿ§³üç¡x÷¥„~²¤Ï•WNHAÎÐ2ãøl±a~§0qÛñ[!#Xÿ6zàÆSåÁG¶‹Û„Ö×½ñKý<þæùî·þ6%®“XýÛzŒòÜËW? -«(›Xï£0ô‚ë/_ŒÐ»Òýȃ֕ëc¯´àË«Ž_þ»nõåð=É^È™O4–ÄgÓ\n–+^_uÜp«FêCyqŠ…X¼L!Ie¿6[^](ø’>ØÆMâ5*+‘”´ü±ÒÚú�Ý�%ߺéëÏŽ%j嶂'‡ài™T&^³ÐÍÔ¦Ÿ–Ò@jŸêÿKïÆÿ¥9æ3ù"ê6qùˆ·Ïå×Á4jýb[ëwíA¥$o4np/¬à8¬õê]«4¿yy^ÞÒÝL°ü±) ±pcz¼ÿÏÉ-DÆiíT¶ Cøç8n7þÇfùÎB+ÿZä9]$ñÿDŠ2ÃI�Q‚¡ “5Aþ‘ñÿBŽm¼Ì–M¶ØQµ<¶ƒ^µ¾ª³š,Û£¾Ëjh»‚ß®7ýlóé«ä@¤ôU&€ÍîÏŠ†&Q“µÎë®I•ËÍl6YQúÓ»¸¾ÿxëFšÚdq!pÿü^üoNÌðJã‰<”((M"ù?‘j�Q4ŽC¦‘q¼ÿÿ÷à?h¨Œpß^°Æ×›L©Þ .(£ÚËXtÚŸªS²ôèÅRüïóéZÔð¥•È%UÞ”ïµóóH÷ð9§“�ñ/ìÆÿc¨lÿïy(Íÿk°HxÊ`�ÇÉ*UN´ŽhÄ*DüÅ¿UªÉö´r›¤öLòC\Û}þ©é—šógµª“üïðéÛ`Ué€ØmëgoàßóÝÄPwª ÀáñOÿ„Ìÿó,”Žÿ¬Œ Ë @e9pŒ$UäYÀ3"Í -£«òÅz,:/f•Ó«nó8·ÇŒ©ömo¡éw‹üCÉ5Ð0<IÞ¤ÿÙáÓ5ò›Iñü¡‹û‹ãhƒïK€Ö~ìzÿ‘JŒþgÄÿnü/Œ.[ÿ9¥ñ¿¡ h’Ä�Äÿ“•ÌÊÐ5^fU%ýHü39*Kõ~…õj[o>æG£|Pê•ŸŸoéæ}£`Ï)X¸Õ•Wúÿ6ŸnðŸeØnâg4¼ÿ�NOiý;füß‹ÿM3™ýÿ,”úK*¥QløÐHþ?(Óx IÅSsNGïäÿ< þFzà>7¯ÆÃ|/BÜrê·”ðæÉ5¡VG¸¿Ý¤ÿyͧkðß8IV`ùXëOe@ô¡xÕÌO(�ÞÀäœxpxþ¿ÿ—Éò‡ÒüßÃk¬l�Q£DÀ©x& "†A1’®ŒfüPûÿ}ÁÇŽ5ja WÉ՟»!j;µ°5·&{ì8c _ÿ»|ºÈv§› �Öþí£¦�{ þ‚àmüŸvpxüßÍÿC3T6þŸ…Rü’Á0²DÉÐ�§A@•f�2ªQªLIÆÑû?¿ÿE±/ärÏšMZò‚·.s¿ÂçJ1¯kÂ]Ym>©£éØÊn¶ðÿö »ºpÔ`·™ŸK ØÆ?I ĉ ”øð4à0þwçÿ4›Åÿ>¥ñ¿$ʆ,’U?p,™ ¨*$ž’X‡§¾“ÿ÷4ù¿J‹…·ìQŸ¦ÊåÖ°²üÒ4nÔ‡‡…?ê[~µùØy÷ž[§ÿÙçÓµ�(+¹p„r«}'ñ/þüc% â>$Á;ýà ükÐÑuBpÿ»û?š§2üŸ…Rû?yÖ!M�Åh@bŒ™“C6è -GÇùü;SÿAV˦µ,LmF7d¿å”K^!/ê…BwܵۡPoƒRwƒÿ}>Ý$‹/íK€Ô47rÂ%ÁíþyEÁøœk�‡çÿ{ú¿˜ÍÿÏC þu -#\'®?ŒÌ`ü*(A�,¯B +c”Œ¾ßþþÛÍ ÛÙGMÒé;D³%ÌW{ÆH„ÊbÖﳆøÐqÄ µÁÿ|új - ~‡ðV‹^èÇ´ÂŽ\ß\¢±àþia/þ+dëg!²×(Þid`–O±‰Çc’YócÈ.V¤·lúëfX~œ<j ËЂ~ofT:Ëq‰ÓÆôäQ7†Ù€?.¥ø×ü•üó/GÄÜõÿ¥9–Î⟅‘‚‘kÅ›œ}ô™>²‘ÊúŽé¯sø“Hµ{ù¾ë“´�”,P$‚ãp˜Ô> 7øæLfè}Ó4ÊuYš-&–Y(<ä}›§½"hÛ~ ŠHÔ©A&7~<¥ø'ÛS? ÿ,»—ÿ‹²ùÿY(žû‹Wp㵦„d›2Ù¥š6ZºÚªtù®‡¾<G¾©VYyc+ Ä«(òlÒ^m™~ÕÒ¡@ -Or7òûÌm³Cñõ^õV6˜Û^ë¥|Ëto¥©¶4õÙØ[ˆ=×Í$Æ·Ò -ÿ¦a|ÞøOíåÿd„lþŠWÈæq<ËtP Xêñ@ά‹ðüÀ´Ò²¡J÷ cÛѼ§Lk’ÂWÃ@w±Tƒ ¹[¸ë)«.Pl3èeþ”â?Nöyú?ñÿáq-š% þÅlýÿ,-Ë)¦ -ò‘y–I~ºdœ^‡ZÑ’à�ñJ¹v±Ná¥ØpnÚ‘ÄéëZ8˜A8ä¤a±+—–c¬²j¾Qy¹{XŽ¨â¨`õG‚Âøæ•C)3œƒRü›6‰u3<}ìwBíûñŸ©Ìþ{h¨¼DiBK‘?¸Þ“ûûngt‡Ê”3¸ýEóáѯnçûÇqãqÚáʼßÊàûï@[øÿA -ÀAüs{ñ96³ÿ…B×µ&&ž…õCñ#¿w«¨�_8]îy&÷ø2Ë—Æt#2JÈÓœûhôô`W뻩‚?û3ú€Rü§æÛωÿJó»ù?91ÓÿÏC±Oú§dÙ|dôÔXàŒƒ¥%3e8ûÅšùB-JÚ8ohú\dfô²C7d}.À,¥Û¿¥ø·¡i}ÚüŸöâÿ1bfÿ?mE<^›ä½‘§–8 üÁ0£QMƺòÜm–£E…«ê7Ô²+ Òò¡Þ¶–U÷&LÚàŸì” žçÏÿÈR{ù…,ÿËyÈFAï.ÿƒ!Ρ Ì!²q6òúÜkÆÈÕÝ(ÈÈwøšB\-úÿú¿AN5‘þëÿ…W¹ò5“\Ÿº¡H„c| ÿür[|,ZžùZß4ü²(ÞÞä‡sê¶%˜½Ž4k‡ãr4 -%¹áG®ÑëÜK™4ù´Â?r¢«Ô9úìùß8z/ÿ³Ègóÿ³PÿCÐay Cšøÿr:5|*È,/ÑÅ ->eþ·šRI´”Ý7{¢n‡]¥®ê/“eMƒ‡ùõòX¶Yìï›ræƽ÷•/ÎŽwøë(‰L{é^>˜Î$ÀŠD±×I âL<z§hk#ÀåÏž%nÿ$ô§äÛ³ÿsÙþßóPÿO…"ÃEN§u Òj‡x,™Sâ?€ÞÉJ·nE^´*¥7¬<1Ó®ÞJmíŽzbü¢õüCâïsæ -ýyrBb|Ä.ù;À}c=„Á„x1L‚ŸéoÓkü®‹'ƒŸ ÿïÍÿyÉâÿ…Òø?²Žh -j€(p†n�•at@IªjHOK§Íÿ,.|«Ç/å¥>dP!Ò -Ìmó¥_m×ZÆlµÛ ®¤öÊb¾¬%™äcÎÜ„ø2ñ ®£4œÇ¶�h“YŒé®oÇò!Cÿ‡ôÿd®÷ûXawýg²øç¡ÿ4¢5ž‘( J¢8‰3€„8¬ H"Vÿy¨Aæ¤ã‹y„ìØp+OÊ`Ûãù}_ ÕÅc«üTÈ«ÞrPj5̘8®ãŸpæ«Ð¾¦“sàÔÆ�S�IJèü‡è5þÉZðçäÞÿ¹lÿßy(Á¿,Šch@Yã'2i™È`x]†¯ 'ÿŠ50}¢—ËGøpW§%ý%ÿ¨£ÛÆXʗ粒X¨ZŠt«Í“ñ?æÌ•�hD¡‰Ï¶Q[Hµò¿ä\#Dž8èXUPé–äLìRŠù±ÆôöšÚóÿá>³ÿŸ…âüIöçaºc߆óÄŸ—ºÐ‚x?¿ç#Ïw5ëý<Ã¥é¥'B…£8Rs;=a’ÞÿèòËoWÿ_×á<üê9ïCÓø:öÐÿ~Å7ø:¾ššû5˜_ kúUš_Uˆ+Z_uËúŠæè+¼üÏ/&IĈ暑à¿ë†¿à†ƒpÁý5öb‹Ÿè¿}ùBªB›¨¿þR£Ø4oâ‚þšþEPÿ篡Z蟸ÿ¹ºæÊnäè¿~I -ý’TQ]}«Óÿ|UŸýêý³3Bñ¶H;c÷ñ!÷×ÿ ]ûknƒœƒ«¤z«"áÈŒO¦xŠýë7ž4û%îÌåÅøˆW™ÐBq¶Le³q3Çð2Cô¼Vü²ý1°v¾SQu42Š/F±<|z¤^Šú|ÞÍ^ S-<e®›?¥òß~TòÇ¿±ÿƒÙóÿ ³ý_ç!mY‰ÔxP]^ày”$Ãlâ!J“=àSÍ; ˜g¾eE·c݉õú„¼‘1h»Ý5fCºH ^àmÐ-¢gÉ÷-§e•º™È9¥ø'kÿŸæÿʼn{þŸlfÿ=¥ñ¡F锯AŠâ¤! h¯Ê%@Me/ÒÝÅÔ¹ŠC”+×Áªé//ˆ¿XºRóhmÏBWšk_–;„‰DYé˜ÅÆçäˆKâ�Í×¹/duöþ‰é\$yiqÔÂTè$ûÒfÈŽHpÙ‰lB#Ò‰Ú–F+!ô "jчúã(>Ap+èó‘ÎLšè姪ӞvʨÁ¹}³q³p*•â?Nþ{5´\žÞôþyfÿ¼HgãÿYÈ€S<ùrâ¨m¦’Èhñ<êËÔѯlSóÝÀ5Â+Rk¯>Flä[«£�mbG%sBÃÈO¢Áa�“1IT5ÏÔÈ…õäfë"ž™†©¥¡ÖÒ«®Î“ØÏ[m%B ÷úø.~, -ªwÉ_V™ÛÚc¨n¹ZÙ·,©%oq÷4‹¹-óc§/kÿÞaj¶ðÿYû¿vó?Ò—ÙÎCñcdòB&à!X-ž¯÷kò"X¨µ–P_Þ9=4[´žŸ4s½DFmà+“É¿5<þôD‚\($:Ü2ÆÿÞþO!óÿ<#<D¶M:XÈ’áóp$‡ÂÍTQ|,4ª¬ûµfàIž$UbëS»È˦%Žž²`\"ŠÔ•a¹î ýÓAûÇïÙÿèlþÂÓÅu¬ÅJ‰6=%5÷ñ9™™Žîήs,±Ö½ºœœ®û¥;0jKÔ¤ÛÒ¸jËÍötnˆN«Ž¤RPoVÕ˜^»^ïZ½ “g¢ÿ?t÷çAü‹¿;þ³"›íÿ<¥Ébœú6.Y•¼Îýõ?『ºà³�Äö÷_¿üæüæäWëdWEòëÜ‚l[mÇÀXÏ©99ê(ÃÜãòuÜÂiaàFøÚOägo6à:éOð쨾‰Œÿ"šej¬¥&©ÄË#çú9Íõ¤::žøǦȜæL÷.nUõÝyrçä™’{Üú‘Âz£ss#¹É+quí^™Ér®¦ÈLÕBñ³tÖ}AsÏôQ€ïŒ�åtü€¤Oø7#Ò§™iYøÕx~1¦w1iwI› ÷úUåBí¿âïDêi$,g>íÊV?W_ÃÀ/ão¶óˆ 6f®¯+¸³(üÖÿ(ÞL³j'¾ñ÷3€åÉ+;å÷ů¥ ¶"¯¿óæSá÷—#cîeüúñ‰†ÈÓ¥!÷Š¿‰…HîB®ÁØC"7!Åe¤ò2â^¬ÞÆU®®Y!òã†Ëof†GD$VŒ9?è–Óó±ÜdK%Ù[»È†©£¸"Þ. -7Û-ð·[!m?ýš?R†¹Êý™ù ~Gñ÷O'×Û׉7ŽoN|f^ßwõ7'ÅuFD,ž¸·$'¹yÒda&yèøÍÿæ¬îsM^òæ¶GÊg绾ÿßg(ÇU0ûîZJ8ü¾êŒ þ2¤er‡Ukñ—ß$÷üQ¹'å…X¾]_RÜÁ5ûœšk°œò<+]fˆðŠ¯ñ×Õ"ßÇRÙ´'¹UO®r òÍWc\r ½þ$>ÒÙ{‰´ÇŸõ:NE M'æ¼W‚ªn„›Ã<¼þ‚¿ì3Ä/17%Í¥ïõu†oû¹¿¯‚õøÇŸ)B>þXñ{‹ß>ÒwÞüÕzH7Øoð£$>Ìq¢Ÿé‘ÃÞൢóÆp—ðĪÁ?½¶óYr*ýàóäUîï+äoIM}Ë¿‘Öó6J›ûÁ@Oï²yŠdvqºÇXµ÷ƒŸcu›|S˜‘JoY×»O}fÐ6 kî߶;ó¥ã†•¥úÄÁèñ/9æ}íÏi…Ší?¾‹§³x¸r¶~è ÿ×~üQÌÖÎB‰ÿ£Ëˆ’ ÍË€“ H<Mñ”Ê󼦫ú)÷ÿŒùåC¡ß^Š”Z›¶õpÄw‘:ñüû‚4T˜rÿîedx÷K7ÿ±âÍõ&Àüª$çq™z„‘=fj"©EÛC¾mV¶bo»ÄÁ&9øgƒÏ¤WøðÐë„D/F§]:ˆzÿ/dñ?ÎB þEÁc5%ž2XÀI<²@€fU]dZ34á”ø×辶Toù¡ÿôœ¿ ¢§’wß!R`0©4gU¿Ûhx¾4¨$øÍ›ðºtGЙ8Šbü²ÿ‡¸ŸÿKà³õß³Ðzd½Î%C*ºˆ½0JâÏãÛqC\ûrn/m¶ùm-*¬Š÷&Ø;V¦uV°Ý)ÈúÂ;vêU{[÷jíY˜’«ë×¹©‰§®ŸJu½‹ôñmŽÜ4äñ³ì¬®(dbîFø…HGQ›«Aè§~6ñ¿aÂ2ciîÙ\]õ'®ŠÐóC½mw:ž~oNAuöÜ`nh£Ý®R?¥<Ë(£Œ2Ê(£Œ2Ê(£Œ2Ê(£Œ2Êh›þ?ß5÷�h�������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������� \ No newline at end of file +‹������ì]W꼶€×µ¿‚»u³³Þ6MšÖ;>DQAAPqì1:’4…B[°-_îqþûI[ÖzY¬wŸÓéZBlK™Ïœ33Í,óF|øƒ¥¿£˜†C‹Ú¾üXøÞ·C‰"EG(ù«¬¼ý›ˆ*¾©HUU]W‰ +¿)*FDýVPv_È$ùÔ…Â7‡2—Ÿ÷Ûõþ©L&®}Z ºÆ‘¡1 ³„�!ªJ©A Fñ=>²ÅiÁ OäU‹'Ñi!'âÄcØ"ஈNO +> +·—l + -¢Xø?|L~¤Ê%Ûý‘=ñÄûòEÜþº5QNj´Éx±•íÜêÓ¨Z¨<Kä‚⥋þ¢m”àПç.Ÿ˜r˯îÇ•€â'É}£â'ÙÁ–‡ EÏò•kFCËqÃ(>™ ·×OêÉ8Må[ái!˜xÞÉØ›ô\Ùý{vêVòᬔ¢ÓtçßO"ÇnÐK¯GräÏ{ +eÂ;-“×n‡4–ç²j·l7{tqZ˜º‘Ë<!ßXŸÍë¥óÄ4Ù‡š^©q,¯"7Å|LÛ¢žg¹²ŸüÂêEâ$Ý•ë¹±Üí +…ÿ9ùÓz˜ËŸ¶eÿY(5Fjîá\Àû¯¬mØ*0·ÿÇÌþs[تÊ104…Ä)†nê@eX‡*EµñOØÿCYw§uõØ(™jg^™žÕ‡/å–ñTŠèÌ)ëÕgæØ‹GL¸Zo‚ÞX÷•làû‚JÃùjÙ•Ï,ûÒ\¯v–™ì-«þq¯W‹þýNZÝÂêÝïÛ&ý»òýcs>‰„ɶ¼Qo´¼ÌoZš|²ÍÖHv¦Á²}?¿Í¿Ü¤žEy⃢ƒ]üëÜàŸÈà#çÿ’ñÏ¢:†i�ˆ±äé0!à6£QUÁ†ùüÿ4è·Žã7A±t÷‚ãêàÁ¿Z¤!¢IP ÎÜét4.ƒÒÀ3®go@§©Ó.‹`ÈõSàßííÜ?곆ý6t}. +i\WXöÚúäÒü©ˆì3þc Cÿü£-ÿOT-çÿ’ñ1Š†`b…DPÌ0°È‘ƒ~'ÿ(:cg^«‹£+¿ç {íS;‹8»¬.nç©ÎŒËîÿ©¦îI?ÜAº¯/ÙÛã•ü6eÑž˜' ©•xõÞ‘§i¯[Žk>â¿wÜü¢cu3ÿƒaÎÿQ$ãß0lÓ10Œ Ì4`R¦.Ö Ê›¿ÿËð4ü£€šÞ]ðPâóùU½VmÕˆM¬úànÈÇZcpÞîC¼Eм¨½3 +½ŸËí|j’óÎv÷‰EØê°Ê£ syÔÂ$–,G4“ðƒPࣔNz½Že¶ù÷EÑž8”óÿ¶ÿúÖø’œÿcHÆ?e›XÃ2à—F�A‡S`¨ëq +±FÿÀø×öPsÆõ«¹5Ÿ—Úü¶UµrÏ:ê¾ë]xF)êÚÕ¨øƬø“ñ¿¤ÞKÈöÞI€Õ¿Nlôz“H¯Uaõþþi€#mþÇòØ=q(°“uÓÿë8ÿG–ñ?$\¥¶ +06¥ÿGÔ« Ü1UªHäwÆÿÆbWý!|œ‹…˜v^Pp‹§NHJñ¼ù\.Õ7èßÃÚ¥Ú{úZS÷ÿµOA_ïêÆ·:¬ñn»q(äçJûüÇû[²Í<ytþßö˜ÿU¶æ1Rrþ!Ëü?Ó‘"4‚M€®S˜hXŽ°‘&ÍÃAæSå:`„0/߸ƒk»¤‚NïqÞ4©RQ±mLç³¾SæOÜtûƒèáÈÎâc„fuÓï5ÿ»ìùjIn’±Â‰„ß9ï›\ݶžXÎ(ôiüCöó•Öàp`—ÿ×tòMÕ4¨Ê_*Iù'$ÿ"Ëû?hRƒ@פëGDÕ€arCš†5…ëAÚ¾ügzõ5¶dèÝáÚÃc8{¹§·ãîSµé3>7:°ZU‰vã„q;šN¦Y¾¥”'+Ÿ[M•5qº‰î&C1öÜï' XÂ^ž×˜Æ±L+ÿ*øÙu¥Y¹8•ÝþôeÿÇÈÿýØ—¦G6Ä® ÀnþÕ þ‰‚óùÿ£HÆ¿pTMeÅ! ¡S`2N€ BM1çìüæNÙ›=ÕZ5›Oëá�Cþ4¯œwîG7µ3í·֓Wdü¿SÊW#pÑ®_*ËÖOÑïØÿnKìO£›œü ùœÿãåÿ4mÓÿËq€žóYŽÿ”#Uò¯@€LGTÓ¤ÿw„‰ °ü’ÉÿÙMÓ‹;Í[¿ÇõN†ü=º–'Êg—<q•v¨ÐžÜöð=ÿÛìÆ}Š}Nû.ù˜Äýƒ€_à)9ÿG‘ŒG×4Ç–CGèÒÿéþå/…Pæ†ÉðÞ÷ïÃÿ¹š”;³ºõ`·Ók>òâÉ£f6ˆ€Q}¶úU¯1«*¢¾æ?UÊ÷ ž4}arþwÉÇü.öOd'ÿh3þסšÇÿG‘eþë6Ñ59ôW™™ø0Ý`@7mÛ&Bã„ì=ÿ·ÿu²xvywØÑô~kǦéy©äöûŠz³˜ª²¡ijOoâÿíØ¿ýUÜŸüy¼¿C>æ&Ä€¿àÿ¡šÏÿE–óÿ +Öf°q’ÿ×T&u€Iäx@@CÅÊAÇÿ³« +zˆF÷Ö¬Ú›Âi¯†|^,Vïj/áB¨d1|±gaPîšÿD)ßóÿ [>÷þÿ~xÈéß%ó¿4ôD&°“¼Á?TT%ÏÿE2þ5Ý4¡`60uʲ¡)Céÿ±iتbp:{¯ÿÙ‡|?¦³zxu{v[ŽnPw|K•v¥zíž[»pÚ/îe<óüÎœ¯ù§”ï AwùV:ð™EÈóÈçüÓÿãmÿŸóÉøW#œr(5%ÿš#·lL4 +ŽCu¦pa’ÿ›ºÍÉ£Ùb÷Mhƒ›‹Òµ‰Z½îµ¸}~$³±Ó8ïñæK8|Ïÿ6öŸçýóØÙâßréo*?íÿUœçÿ$Ëü?gˆ„ª:@˜Hþ±Ð¦ÂÔ¡Ab4þõŒèá±_š\°ëúL+ÜÒÙÓ ÷|·èWKUŸ³Îƒ5»æNƒN²µ7AïýJ¶Ç´qÃág7¹¬m€÷¯Bµ0øW!Ÿ÷ÿL¶ø÷…íNü£®ÿÑt¸É?Î×ÿG–÷ÿ ]Ã66�P�Dl Hld +¦0h8ì ñðrm¢Æà±öhm¯OªÅ‰I4Ïw†þÅл,èša1ËÿeJ¹e²æ6 ¿õç+Ùâ?êÂø°Ànÿ¿ÿcäù¿£Èrü/‡ÿŽ¢Ú€êÄH&ˆý¡ +(dFŠ£ëöÞ÷ÿïÃÑ{‹E\4jA©7¯›°S¹ìFZùÜ4žú¢U®|=Í–{¥ÜÂ?mÝAŽþ×’ò/‚Ø©°|ù ÿH– þHn‰Žäeüýù¿Íû¡¢æãÿãÈrþ_S1O³þD˜�Éؘ` lÝQ©‚¦îÿ¼þwG¡ï±ßæcŒ×|± O×7ýÛó«ó§{j^ÚÃbõþá^»Ž„;É–ú¾ÓÏ•]h^Ë/´'â³T©Û‹±X.©å”÷WEsþôeÿÇÈ[þ§®˜eüÉ/gâyG©ÿ£‘ÍøŸÀ<ÿYúÇæ@,ý¿.ã“SÀ´d% s8Ó˜¡Ïæÿ3ûµH´i× ^ׂùùàÉ&甎/ñ€IÏ…ýsX›WÝiÜ”øâ&Ê‚¯ +º^ _¬Vü}ÿÀ¤'‘›€Mù‚ÿ0:Ð2ÀÝñ¿¾}ÿžÿ;Š,ùGšã ®è8f’ÿ“ñ?Ót€„cMq¸?ÿˆÿ©×} A8†ŽÙ¨AÓQTxÏg`*>IËä\7Îgå°³æ_*è«ï¿»Ë™ÿù‚ÿHÐ÷-W~±ó¿evñ¸ÿë$ÏÿE2þU¬©:(¹áW•ÔKKÀ45ÛVy29øÉøÿ@ü;÷Uçrj¿”Zg`6n]0§‚©v?úììæñ\÷¦-[›Pλkþß*èkp—6ÒÆ<Ø)»ùE$¿®¿c�vò7Çÿª”œÿcÈÒÿC‡™)ú4¹ÿ_Ó4`êº lâPƒëŽü^ÿ¯Ÿ—oš`p[ÌfEÜ}hê¬m”sö–ºW7we뱋δ§úÿ™‚n€¬u]îÇ zÒ(Œ'ùàà|Á,ht€ìß>ù?m3þÇZ^ÿã(²äŸÓ†�†bj�9jhIþ_(ªI´½×ÿý +þõóù!T‡î•âZÅóJâÇ;ýv?A$‹vÆ‹Öøgú¹â¾½ÊÙþ9ù˜ÿ4¿ÊGþ˜òÌîæsþ˜ÿ"Ëõÿª®rj€Š’ÜÿO�#ÐQlBLÂÅߨÿ¿GþŸ¨å»bh]7nyo¢WôA ÕžzUliß‹NµtÖ.>,¨Ñ[çÿ—ú¹2�ååË<ûÿ3òÿGËÿ£¤þ×Fþ?÷ÿÇ‘Œ¤º¢@˜‰u€ €©"ÕP®0ýøà7kUËu~pšõ1¯ r›^žYÕñZ\Tl« _âó~}m�Þåÿücñ¾Ünn +vJÆÿ<AäŽ[öûUvñ¼QÿO#zîÿ"_cÙBµ*({•‹Ç9ó®ù¹rMê½èzê”jõâÔµ¢áÄoT›³ae£<ÀÚ�d¥îÒ¢t¶Üî-7õ]ž•ð\ò˜´;®ðìÕ¦÷ÚèÅIÍ;%-ô&òŸ–¯’šüËí =v²µ¹Ó1ûõ\e¯³ÚyÙv,u?ÛJLC¶•<…ͧIQ=©œ'¯5 ÓBËZ€ÙÉ-;þ7‘”ÿ´4cbÑå7’Ö'ôÜ`h¦"]ûïWßÅ¿ºYÿ*Z^ÿ÷8²£N—Ý%ÅŽw@3øîÍL{0¦³q·Î@i€U¿«öØóU§Ý¿ç_îM²‘>�'Àà?YR›ücU¬ôÏø‘-ÿóù¿£È×üÃÐèyÆê¬FÛëv°nŸnå;§µP*ñðɼz¹`xãñ áh&ˆïÆK'ú§?f.ŸHpýiþ1ÚâáœÿcÈŽu:—C¥]l–^¼ÆCÑw/j„ÕÎn¯Ï]¥Ô}~šÞÚg)÷‰òžÿñDŽ¼-FcÞ·"÷E6âÜüeÉ< +å )›÷c#{qÜçÁÍù?ŒòüÿqdYÿÇV˜€ÉüŸ¢SS0P4Îm+È€?óü¿æÿ²Íd´½ëNàRgDžož©ûD›V«lF×]\U®Æý; M ¹¯]ÜËþý›;•=IUyùdÜ´a™ÖŽ×Ó€ÙfrÖÌ¥išøɳøÖÅú³±Êòü³Ó}¿²ˆÓÐvšUÐWOâ‘GcʼUF1½óèuÔX„‘-Œ¬ô$W×KåùÖ’¾Õ!Žúý'‰Œßìþ÷¨ÿ±ùü_ çõÿ#_èÐúpôØ è[ñEÍ,›/¸BÆÕ¥~EðíE\1ç@ XoküñÐ' €ô@¯Ü¥úŸ>¶"è%«P¡qâò¬—톂KÙ3rþÊ0ŒþJtô¯¤StâÓ¡°&Á$¶åÓ@Rc[ÉÛ‘,1Jþù`ô_+YnõÇrñïØ£n`%ßÓ!MÁþUUÙ¬ÿ‰‰–×ÿ<Š,ý?F¦€È+*@6¡Àº˜Ct®êŒ#tÐú?ÚU)Ö‡3krÛoÔ”ç¸+AË!þÝM¯Ø´ç¤i¢»«úà‘5O2‡þ½LRX˜ÜÀ—iëia®¯OêQ•“L¥Ó@$Û´ÒòAÒ"Ññ2(I×<n½—¾µ~ÄNÖ!m|÷i“†·ÏO;¼ ^< ½#ʶ_8ÒÆqÒWoc,*ëÃÓI<o@Úú÷O!Ïëþ¥ýÿà®øÂÍç¿¢$%œÛÿ#È×vºêÞêÚƒ]²¬pR-’’Þ¾ž®ÕáOÌC|Ž´çÍZ</¾w«6Y˜jêÍè"²¢þhf½öãý‘ËÿÌèÿµ¬æÓ—÷€ýpX÷q%»ùGñÂ0_ÿqÉâ?)XÇIÁ—ÿeïJ—Ç‘ôü®§ÐLl‡§#–eÞGEEOë°d[÷eI¡�A€¢ÄË<t…hçÿ¾A¿Ø$%ëpYž[®m38$„(_‰Ìü’9ŠWd•’Q +Ï!0ˆãð¿Yÿ!Þnlƒ³Ë^tqò)1ðâ:‹fàíTWÜ?cyïßä#É!þC[{upòüG8Œÿä%:‹ÿ<‹¤üo4f�Gc + ’&Bž’™§�‹¬`Ì‘cšW´ÿPc(šµbµF2gë–®¯(ŠZÑ\U5Êæ\¦ÙRµXtçi¼·m=ŽóÝ?þ lüñ¯‹ï)vŸö½çŸUñ¿^þg¹ÞOÉàŸÏâ?Î" þUAâx,ÒÆ*Cø $Z¡ ¦Y#Y’Ñ«ò?rBáj¯± + Έ–Ëõ¸Ò›‡‹›éHëAËêPÁ0á‹fåþëš$N—ïâŸËðÿÙâߊ~Ó7:8‰éÐÿÃólÿq9áŒ4 +ù¶€JT£a;?¨æ£~ã[ëÆ°×ÁUÐlt-ÿ(þÄÇŽ¶sñ%g«$›”D¯×ÑÐë 5¶¿£‚Ŧ!¹LMf –sÐ� È÷[ìƒQ}ý NüÇ–÷þåÙâßFº xƒ,ÓþßÃó?a³ó¿³Èóø¯Pë¦w£wâà~mù=UªãVÑVÁ°»Ì7˜%ªÁQ¹ø}äû©ï×°PœÀ±™lŸR·ˆï„9ô‹4\acInˆ_ ÔÇ£û..È:0ìýV™ÑÚ´ñã‡ûF€Æé—É0~R¶ø'.úwŠÿŒã¿ã¿3ÿïYäyük÷NX¾¿óQã¶1¿šúΨºT »Ü¼é…Ååhbð+¶Ùk´[ãƒã`Æ�§¶v¤p´ÑßoN÷‰‡4yŽÐ‹#«¾7Ô΢õe'9l3j¢+MÆÐ6.ÓM'j;Ì~fÙ£Ïö{7’©3t¿•Ú¸3HhXî‰~Ѹgýÿ'tïêÿchö0ÿ“ÏøŸÏ$Ïãvµº¢ÆùöU¯Øøf›r¡^î*”gu·Înj3·Uè®ÿqöåؼ$R 6Á7±’hŒlÝ4bÚ·ø¼ +æ ;ˆÛ ÃßÞ›=ô£ÁÓ̓‡,'ØÑ.€LæïB"ÃÒð‘_\Ï™FãR¿ÌIDf´Éýe»ô¹ÎÅÎM>ò¢.ãG +ùI¸þ—ËK¸Ÿ5/tùÙñô8*Í¿Üy0ÿò—8lmóQ—§?“¤X.<²cIBAõ£d÷ªí{=ÒÐŒÐ+7Äêe̱VþcÊk²ò/Ó/öÄG 5Œ7*);,ù`’©½kü/#Úœ˜ñÿGž×ÿl³>,vá°ß¬uG7%…r'Ó&ω¶mƒú Ñ7KË«ûoë +Óß×ÿDAÍ"!qú|æÙýI%áBøâô8ÿ'2žMDTøZgA§ðÏó‡ñŸåÿŸG6ñÑ?„×4Š„ÿO¢YJay™B´ˆ¡xŠÊ[òÿ<×¼_¬[\±§Â<лþ ÚX‰ÕEݯ»“¡ÃAžê:¢×Ö·I?ûót§8iÝ©ð˜ýãš¡n]âëü²7ÀÒåâÑìL<Jú×'ðçXøg«×Q'ñ/ñób†ÿ³HÊÿ% @¦DA™ÔÿD*¦D3”Œ4Äb…Aøåñÿ?‚¿©²âmwÅáŠ;˜Í;ô`ÔÇ“úýt,jŒ7WçÞlí2« ñ<O·J ]Ú¨€\ÒåIMð½q>ŽøþCûõ4ÀIü‹ô!ÿ7åÿžGÒú¿˜C¢ˆ%И¥x^Q)Eå!ÅhˆAVÞÿf©®Xó›J>”»Ù¨°Ø仞´ +w-¯ÔZŽ XÌÔª&Îð0OŸÖ�›N'tÀáXA<×s’µ×2�N¯ÿGûQÈâ?Ï"éúÏ)p¼H©ÏS<+Ë”* %°Ã‰˜ÕTåMñß ;¥BïÞ¨òZÕið.ïØ)ÝVP»^åk}¤Ô©&veå±üÏÁ<Ý"¿•4oÁ8ÑóF¯cZÀïk€ƒÑ>ö‰<…ÿP%§ógÄ?/áŸËâ?Ï")ÿ7E(Ë,…&ñŸœB)œÂSN…Œ$óè-ñÏ”°,7j‚jWkuò“IÞ/ Êß¾U˜Öm³`-iP¨hãýÿþ<}ÄÒü¢€ý!>âÀø÷Áü5Oÿ^²þñ3LÿyIã¿e•†4 Ôÿ�&2D$«‘iÎkè;õ?_ÿµ‰æ;ßZµ±[>‹§ ?¿ž{íqpuçàÚ(€ ©ÛÊcùŸÝyºÿ•TöíúS>«v†ù€ +à ü‡ö+[�§íæðüÍüç‘´þ·È +S0%AZ¢x5²,! +cš•5ˆYˆßôüÿ¶àS‡ÍzàkÕ•>3‡K§©£f±WÚKs¶²¦¶=¥`qgý?œ§[%ÐA–34�¢Ý¿õ"àhÀ žÆÿëZ�§×áÿÑõÿçÿXÆ,«@J’1¤xT +¨K!ŒTH« +-ãçþþ‹ÒPž(幘µ••`Ù}övƒo7żÅë²ÚºS'ó©™]íáÿi ¿¹ð"àp˜µ ØÇ?©0Ž+6Œã—¯£�Nãÿ°þ'Íeü/ç‘”ÿKV‚‰xý4Šçˆ% ª%´ÌAȼúú¿¯Sÿ«´Z¹ëîM†].·§(÷-|¥Öj+o2ÔÛ^µuç[yç–ß–ÿ9ž§[P WrÁå6 "ñ÷Ýh‚ø™6šà;£} ðþ!°!2_QœÄ¿tìÿÏø?Ï#éù?‘Ñ�%²P¤xš…”ÌŠþ^F,IÐ_Ìÿò#ø·ç^MQˆ¹.Ì-V6¯m—Kn!/i…BÚt»ØèR¥þ#þçéc1°øÒ±ÈОÕOŒûçUOà?´_ypÚþ?ÚÿK™ýIð¯ÑÂ5úÃ*l„¬R2-Š'¨@f8VПÿ¿�ÿÝ–ßú®eYq:Z¬A¾:�L„D0^-†CKµž-ÍèGü?1OwL�õö�Oøç…~,ü‡ÁÄñŒ5z‹€“ñÿ"{ÈÿÂeõÎ#$)(N ÂÑ”O±Ç¤²æó]‹œæËu~ÝòVæ•^îÌ:°ibè|Ó[OK<œ2³Ž†õ}ÍñÞß8“]Iñ½·*þù—ð? +GüÿÅÿEž¹ÐZ(,³b®Z¸ÜPäÅjf…B-ïYã©®å Ѩˆ$íƒ<˜xÈŸ8fœäì¡ûÐð…ìÀ/€g¶þ%iz™¦/#Ïs<R€VDšCêzÒ;Óo")þIé»áŸãŽêEÆg†ÿsÈóø¿Sú¡7d+-4ÕŠ‚ÙÊ }_®°½NEžÃµ¡-¦îJ8Îÿ³áùÉG&éȱÉív>%&o íµ_…žã¢Ëo¡gÀɦ*olHìB<’ÓoïLˆzɲ _.ü¿ßúOÕÿd…ÌÿwyÿÌ�ظš,ãy]ÕÀ×ì`*×AS鮇:m6DškùƒCþâx[Æ|¦a#l" Å9»mŠÌÃLÛÞûgø°’â?.ö~û&[ÿßINååÊz±¯”Ö#<U95ß¼¹¿®'5º8)˜Ã‰8 +Bkå(¬ñ?9‹±aû†‡®é�Rö.Y˜·T+0!ˆððÓ¶„×ØKà +q\eĬ‚ð[IŠÃ"¤4úës¿9yþGâ÷ùŸè,þ÷<r’§\ãÙím¿7¹FeڞϜáªUëxÕQe©_w¦ÍμǗ¯½ÿ©‹ôñ}˜ÖÉ”„¾?©ìáÿ6�'ñÏñ?fõÏ$'øCop ª¨�îyM¸ß¹_äKS¦âr¡}NîjVµqX8psfDV¹®eÐÿ™%ÅzÎú>ü¯Ìñþ_’2ÿÿYäÿ3GÙSm*l,§^±nÜÓ«œæ1Ô–»`Ö=¦©hKÔ‹ñ#£N¼ñCËã~RIñoÃ|7û?Âý‘ý/eöÿYäyü{#=ÂIàkë 1þÖo•ÃÕ _Õ®èu_åuÑ5×Uçjÿ{ŒÇÛ#zwâŽÉLË”ÁO#ø'™$òñüõ9úÐÿÇ‹Yý—óÈóøÿ&Ô‡öÊ’T¹ÊëKºÒAO^tƒi9É…’ÒôBz·éAòýøðîâwBBœC~C$7ôüè£r»ó-×pB?ç#ϱãk +¢n¹Àûãüœj ;øãƒÏ¹:ò A®ÏÀC„á8ºÝ~‘i“ÿ@6øGvø9 Ž>{ý7žë¿eõÎ")ÿ‡1d9R�CâyR`ôVT8Af ͉€yÍúoõqa"3Ž_ZõÛü⎮èýqC+4îgëº,ùµåµòT±ìEï›ÎÌÇðÞXþœgøk(¡£t/j†=ó#MBèæ5BDIDïí%\|ô*q{ø'„ÍïRÿí¨þ#—åÿžGRþ?H,‹YJ’Dñ£QjôO ° + Ï#$ö5ñï÷Ê`G¥Šs£¬Ú7½ñ@¿¹cç}-–ºðš¾ãp~ÕZ¾–ÄûÇ3sƒþ<yC8>âüàï^Œ°�F fþ‡GúÓ²‹ì8‘Õöûñhý™Œÿï,’òÿ(bh�)V¤9ŠÇ¦T–Õ(ZVU,Ë#¿nýgiå™a¬5E…ØJë~XíÖÛøZ1»n“/©ƒ²”/ä’|<3)¾ŒhQ×PJ籯�ºÄÜ0lìxV¬2ô?+»ø'FÙ{äÿp"wˆ6ãÿ;$øgV¦)U– ÅË<¦dÄG;YŠ¶ÿ€€}Õõ¿Ív�7ÅÎÍÝŒÆ\wº¼ŠŒºê´Ëw…¼ê®G¥vÓQ3Û‘cü“™¹CíkØ9Ì =ø“ +ÀOJBgà?%»ø'NÛ÷©ÿ|´þóYþßy$Á¿"I4‹!¢€ŠE…R…¦fM´�ÅWµÿÅ:5¿cÖë¨]7Y»ÏwÆÅ°ÒœÊùòí¼·” +Us,Wà2Yÿ㙹Q�Í00¢wû¨OH·òÿsp€ìÈpТ‚ºJS’3Up()þ]äÅ;¦÷8ÿgè£ø^ä3ûÿ,ò<NUú¾7¥Ì¦•ïݨšàâ=.–õ»}_Ô–ËÁdqØjáî þ/®ÿ˜TÖS"�,“x^úS4藤гë9ùþ6ŸG_nú?ó4Ozî—'LÊF7]\þóóßÿñ%X®?è~˜ºèúCôSÿÁ€Îƒ¿ÀØœ?@ÝxPAÔÑ|ÐLó-ÑðÝ_ÿëÒ …Ñš!áÞ| ì«Hg<ÄÁqñ7úõŸ——¤û$°ÈNäë_KÍboÔºŠ~ûšþE@ûík`&ú-zþ\à re'´µ¯—Iã×ˤ‹êh«¨;óÛNèÝW÷·ÞÅi‘È'Ç—ýN-÷·ßÉ£ý-·�~ÎŽºcÒ=íp‚‰;Oæ‘åþõÒO†½ŒæâÓô?uÅÕ2lj›9VPX:‹¼þsKªÿ=ÿŠ?þåùìQü“åGž×ÿ=óZj4f¼èNð2d¬n/t¦HîAÅïQ‰7•Û¶Ý6Kõ#ÌŠÏÜ@‹±7Gs,Îý²H\(`ÛÈL>|w/—ytÏ')þ‰“þÝâ¿xé(þ“c²úog‘çñ¿s%Iw€ªˆÚr¢±³Ö¸ù¹jwç½²8iòÎÐh^웃ú¯ $€´&… ÜR´@ÉÉ”UÁ´ Ê}JtãÏÍÝØd3bæzÑÖÇ°õ‹O$^,u�ýŽ–ÀrMô:Ö'ßtth‹Í“§¹ø=yŧ¯bÞç/¹Kâô½Œn1ìOI]ÚhÀ ÕMI^Úú„T�'„Q$ è)z›®ög¤±IñWéý¬›Ž +^?ôþöÿ¼DgëÿYäyüW¯g²·®²•z'а“G,{¦)·%½-ÖÐd+eajxÀÿ‚Á<2¾ì˜Î°PB¸ÛQ—s[ûlÐs|ŸI¯m½ú±¡gn^ùè‘’*± B/!™‹�L(c²6×€äÂÖ¸Ù»™F6`Êà–öØ<áæ}B)½7V¢"¥á|yù#¾÷?ôß”=ü¿Wþ—x˜ÿÉñÙùÏyäyü‹f[ú²òWj½-6Ö·S^Œ6£ågÍÑR+‘U”òƳÙAþ7YccŒlÑA~çÙÿ7xüé…°t|öQ@6[oupÿGùŸ"ŸåžENøifh¡JR§Ð¬rc0¬·|WveIW!Í5æVQеuË”&wù_[†‡Ð²¡ƒ‰l,Ÿ“ÃÿµweMã@ø_¡7v«pÊ9œë †ÙY$Ì$aŠJù'fÛÈNB¨ýñ«nÉŽc˜À Ìîªß,Ù–úk–ü‹ÌxJ®†Û¹úéYÿì‹þ?]ÿß„ÖÛÿùÐ=} gå~óöxÒ:ëÏîÝFð¹K›‡q·¯U-»rÙïv¯>_Æ…õ¿çŒÂÀ_¤“h/IÇŸ¡ÃÃÜœpÞ&UèpÖf‹§4_Ýý²eBûßêéÏgí¿Q7Šã¥QUóÿ7¡õötùÐuÎ/®*þçú÷ìSpräÝ ØøÛуuQù ¿œ‡×)Þÿ&þ¡€ÌØøÇSë–Úpóã¾<·!ÞñE”¦Üí$nÈÈW¼ôÑñâÈ7øoˆ™¯à¤nã#,½a›³MþÒpsù‰Oöv0g?c„²H²€óeéñ^SbQ‰éÐB9%ÁcNyî‚áüI\~ñÑ”ùšÅ<êÞ@̉í{öw>¯{´—Bxíì0Z@¢8$2ÑËI¼„x—¹Z,œã—¹š‰R5ÎÿF$w{ƒmûÄ+ͺ«’yb·˜Ñe±gùTÖhIDï#ј—Ï«A‰Ã« ’ñ¯Æ ÙÜó}ÞDQÄÈsQPÁ’‹åHfšFòFjNvxÕâyÈœgN“U|¡\M6ÞøKÐ'»°»] 8x(•| $x ù6«q® nHÕ°rš_ªŽkžÀ ËeEuð›B¥@Pê._„’ ÏÄ2SF1 ¸@“ $i›”ÈQ’AÃtÊ^†ŽÝ—Cü¤~² |ñŒÂ9B7¯¿8ÌÍ(ÞâdŠ’š{ 4ðxêjA«Ü ?.»ôŸ‡‚l)ô¬¾±‡#{^<DêäKNs)<$ƒºSð³ryáPQ +ÔWl‰ª£0'-¬ í½,û% ‡(g¦?’—±&uêЄO…âÍwAƒ±ÉµÍ¬SÉ «½‹BÓ¯Ž&uåEdÚ’Èo’«è‰HÊû÷mAŒA¾ÜÁr=‡=eŒÎ™`R¤é¼Ü()²h^sŒÚÎß™0RpMSXbàï8M/@˜æ|Ó +§œ|¦è½ÇÈÙCØ v²u_4Äõ%Æœw×6*:”òæJ/F*B®ñ¿D³'†ËŸ¬Bª¼µa~²ôÄh)P‘Êù?™1½gÇ&u¡½¦ƒ“ð²d€üFÀ%™ý4¶²…U[’ï:û—Õ«£MÕ'å¶ñ +¥Œ×Õh+ëôÿ°/yW,&átó»@ÏÆÁý?…û?êêþ7!¨UqZToRC3ËFK«µÜ²Ö4ʺV¡†n†a;–³Éó?·ÆÃÉiÏéÜ}ÐÓYßIÆÆ9µ¾G¬sÐü6ªüqõçÝØ:¡¼ÿ#Åfvp?MÁ¾pW†nÁá/–#¼t=G”M¼8æ ÑÈ.7FÇËŸƒ¿·Þ“rö?åƒMÀœnv3èYû/íŸCNùß„„ý7ì +†ô†fènU«5 ªµêåºV®ZŽUo•m×®oÒþŽ~R9ìöo»úÕÅõþ§xzquпÍÙy¯±æðHØ›Ë> ŸZèʪx¡ý¿süGãñÿ¿àueÿo@ëít^-×®£ÆAk1ÿ¢vLéõI·?"§ãÍ´ãùu¯ò±ìöûÇz!þ+žÛDŒÔt£0#ÏÝF&<c9W·‹–ÇüVöÒäGáBFº„‘†Ÿ¥gk,ã~è”ßz⣷y†Äi~›Ì<>§™ì˜²÷Òݲ MÆaáïæX—ÂfÊV¹á”7H³^Óõenœ0góoEU¤H‘"EŠ)R¤H‘"EŠ)R´ú¾vêØ�h� \ No newline at end of file diff --git a/core/themes/claro/config/optional/block.block.claro_breadcrumbs.yml b/core/themes/claro/config/optional/block.block.claro_breadcrumbs.yml index 5133f919e29b..ed483575ce08 100644 --- a/core/themes/claro/config/optional/block.block.claro_breadcrumbs.yml +++ b/core/themes/claro/config/optional/block.block.claro_breadcrumbs.yml @@ -14,6 +14,6 @@ plugin: system_breadcrumb_block settings: id: system_breadcrumb_block label: Breadcrumbs - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/themes/claro/config/optional/block.block.claro_content.yml b/core/themes/claro/config/optional/block.block.claro_content.yml index ae811dba69b8..195fc3ba83a5 100644 --- a/core/themes/claro/config/optional/block.block.claro_content.yml +++ b/core/themes/claro/config/optional/block.block.claro_content.yml @@ -14,6 +14,6 @@ plugin: system_main_block settings: id: system_main_block label: 'Main page content' - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/themes/claro/config/optional/block.block.claro_help.yml b/core/themes/claro/config/optional/block.block.claro_help.yml index 3a0ad990e550..3349fe4d5f5e 100644 --- a/core/themes/claro/config/optional/block.block.claro_help.yml +++ b/core/themes/claro/config/optional/block.block.claro_help.yml @@ -14,6 +14,6 @@ plugin: help_block settings: id: help_block label: Help - provider: help label_display: '0' + provider: help visibility: { } diff --git a/core/themes/claro/config/optional/block.block.claro_local_actions.yml b/core/themes/claro/config/optional/block.block.claro_local_actions.yml index 7e2a4e1d5342..389673087469 100644 --- a/core/themes/claro/config/optional/block.block.claro_local_actions.yml +++ b/core/themes/claro/config/optional/block.block.claro_local_actions.yml @@ -12,6 +12,6 @@ plugin: local_actions_block settings: id: local_actions_block label: 'Primary admin actions' - provider: core label_display: '0' + provider: core visibility: { } diff --git a/core/themes/claro/config/optional/block.block.claro_messages.yml b/core/themes/claro/config/optional/block.block.claro_messages.yml index d6874e560516..5f0d4ff05ab0 100644 --- a/core/themes/claro/config/optional/block.block.claro_messages.yml +++ b/core/themes/claro/config/optional/block.block.claro_messages.yml @@ -14,6 +14,6 @@ plugin: system_messages_block settings: id: system_messages_block label: 'Status messages' - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/themes/claro/config/optional/block.block.claro_page_title.yml b/core/themes/claro/config/optional/block.block.claro_page_title.yml index bf7268d59572..8ee18548b0a2 100644 --- a/core/themes/claro/config/optional/block.block.claro_page_title.yml +++ b/core/themes/claro/config/optional/block.block.claro_page_title.yml @@ -12,6 +12,6 @@ plugin: page_title_block settings: id: page_title_block label: 'Page title' - provider: core label_display: '0' + provider: core visibility: { } diff --git a/core/themes/claro/config/optional/block.block.claro_primary_local_tasks.yml b/core/themes/claro/config/optional/block.block.claro_primary_local_tasks.yml index 51af4c8e5c1b..1d7ded7ede3c 100644 --- a/core/themes/claro/config/optional/block.block.claro_primary_local_tasks.yml +++ b/core/themes/claro/config/optional/block.block.claro_primary_local_tasks.yml @@ -12,8 +12,8 @@ plugin: local_tasks_block settings: id: local_tasks_block label: 'Primary tabs' - provider: core label_display: '0' + provider: core primary: true secondary: false visibility: { } diff --git a/core/themes/claro/config/optional/block.block.claro_secondary_local_tasks.yml b/core/themes/claro/config/optional/block.block.claro_secondary_local_tasks.yml index e26e326b9c87..ce461634baf8 100644 --- a/core/themes/claro/config/optional/block.block.claro_secondary_local_tasks.yml +++ b/core/themes/claro/config/optional/block.block.claro_secondary_local_tasks.yml @@ -12,8 +12,8 @@ plugin: local_tasks_block settings: id: local_tasks_block label: 'Secondary tabs' - provider: core label_display: '0' + provider: core primary: false secondary: true visibility: { } diff --git a/core/themes/olivero/config/install/block.block.olivero_account_menu.yml b/core/themes/olivero/config/install/block.block.olivero_account_menu.yml index 9d89372c13ed..75e804a2a751 100644 --- a/core/themes/olivero/config/install/block.block.olivero_account_menu.yml +++ b/core/themes/olivero/config/install/block.block.olivero_account_menu.yml @@ -16,8 +16,8 @@ plugin: 'system_menu_block:account' settings: id: 'system_menu_block:account' label: 'User account menu' - provider: system label_display: '0' + provider: system level: 1 depth: 1 expand_all_items: false diff --git a/core/themes/olivero/config/install/block.block.olivero_breadcrumbs.yml b/core/themes/olivero/config/install/block.block.olivero_breadcrumbs.yml index b5ff7c7395cd..3a1959dda9ce 100644 --- a/core/themes/olivero/config/install/block.block.olivero_breadcrumbs.yml +++ b/core/themes/olivero/config/install/block.block.olivero_breadcrumbs.yml @@ -14,6 +14,6 @@ plugin: system_breadcrumb_block settings: id: system_breadcrumb_block label: Breadcrumbs - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/themes/olivero/config/install/block.block.olivero_content.yml b/core/themes/olivero/config/install/block.block.olivero_content.yml index 1c2bad4535c4..8f492136770c 100644 --- a/core/themes/olivero/config/install/block.block.olivero_content.yml +++ b/core/themes/olivero/config/install/block.block.olivero_content.yml @@ -14,6 +14,6 @@ plugin: system_main_block settings: id: system_main_block label: 'Main page content' - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/themes/olivero/config/install/block.block.olivero_main_menu.yml b/core/themes/olivero/config/install/block.block.olivero_main_menu.yml index 79fe3d2c817f..282e3887a69f 100644 --- a/core/themes/olivero/config/install/block.block.olivero_main_menu.yml +++ b/core/themes/olivero/config/install/block.block.olivero_main_menu.yml @@ -16,8 +16,8 @@ plugin: 'system_menu_block:main' settings: id: 'system_menu_block:main' label: 'Main navigation' - provider: system label_display: '0' + provider: system level: 1 depth: 2 expand_all_items: true diff --git a/core/themes/olivero/config/install/block.block.olivero_messages.yml b/core/themes/olivero/config/install/block.block.olivero_messages.yml index f23066aaac02..013a0479414a 100644 --- a/core/themes/olivero/config/install/block.block.olivero_messages.yml +++ b/core/themes/olivero/config/install/block.block.olivero_messages.yml @@ -14,6 +14,6 @@ plugin: system_messages_block settings: id: system_messages_block label: 'Status messages' - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/themes/olivero/config/install/block.block.olivero_page_title.yml b/core/themes/olivero/config/install/block.block.olivero_page_title.yml index 0a4c67a25a03..9caf4dba2e95 100644 --- a/core/themes/olivero/config/install/block.block.olivero_page_title.yml +++ b/core/themes/olivero/config/install/block.block.olivero_page_title.yml @@ -12,6 +12,6 @@ plugin: page_title_block settings: id: page_title_block label: 'Page title' - provider: core label_display: '0' + provider: core visibility: { } diff --git a/core/themes/olivero/config/install/block.block.olivero_powered.yml b/core/themes/olivero/config/install/block.block.olivero_powered.yml index 177f33f87f4b..b4d0bf94d721 100644 --- a/core/themes/olivero/config/install/block.block.olivero_powered.yml +++ b/core/themes/olivero/config/install/block.block.olivero_powered.yml @@ -14,6 +14,6 @@ plugin: system_powered_by_block settings: id: system_powered_by_block label: 'Powered by Drupal' - provider: system label_display: '0' + provider: system visibility: { } diff --git a/core/themes/olivero/config/install/block.block.olivero_primary_local_tasks.yml b/core/themes/olivero/config/install/block.block.olivero_primary_local_tasks.yml index efc24c4c759c..f8bff3f542bc 100644 --- a/core/themes/olivero/config/install/block.block.olivero_primary_local_tasks.yml +++ b/core/themes/olivero/config/install/block.block.olivero_primary_local_tasks.yml @@ -12,8 +12,8 @@ plugin: local_tasks_block settings: id: local_tasks_block label: 'Primary tabs' - provider: core label_display: '0' + provider: core primary: true secondary: false visibility: { } diff --git a/core/themes/olivero/config/install/block.block.olivero_secondary_local_tasks.yml b/core/themes/olivero/config/install/block.block.olivero_secondary_local_tasks.yml index 8c124da9970c..943fd9ba7e1b 100644 --- a/core/themes/olivero/config/install/block.block.olivero_secondary_local_tasks.yml +++ b/core/themes/olivero/config/install/block.block.olivero_secondary_local_tasks.yml @@ -12,8 +12,8 @@ plugin: local_tasks_block settings: id: local_tasks_block label: 'Secondary tabs' - provider: core label_display: '0' + provider: core primary: false secondary: true visibility: { } diff --git a/core/themes/olivero/config/install/block.block.olivero_site_branding.yml b/core/themes/olivero/config/install/block.block.olivero_site_branding.yml index 5b974e82f33a..0e343ad46b0b 100644 --- a/core/themes/olivero/config/install/block.block.olivero_site_branding.yml +++ b/core/themes/olivero/config/install/block.block.olivero_site_branding.yml @@ -14,8 +14,8 @@ plugin: system_branding_block settings: id: system_branding_block label: 'Site branding' - provider: system label_display: '0' + provider: system use_site_logo: true use_site_name: true use_site_slogan: false diff --git a/core/themes/olivero/config/install/block.block.primary_admin_actions.yml b/core/themes/olivero/config/install/block.block.primary_admin_actions.yml index 5fc8674cf8bf..5c7675961501 100644 --- a/core/themes/olivero/config/install/block.block.primary_admin_actions.yml +++ b/core/themes/olivero/config/install/block.block.primary_admin_actions.yml @@ -12,6 +12,6 @@ plugin: local_actions_block settings: id: local_actions_block label: 'Primary admin actions' - provider: core label_display: '0' + provider: core visibility: { } diff --git a/core/themes/olivero/config/install/olivero.settings.yml b/core/themes/olivero/config/install/olivero.settings.yml index 42c5a375b114..703b3465ef0b 100644 --- a/core/themes/olivero/config/install/olivero.settings.yml +++ b/core/themes/olivero/config/install/olivero.settings.yml @@ -1,14 +1,14 @@ -third_party_settings: - shortcut: - module_link: true +favicon: + use_default: true features: - node_user_picture: false comment_user_picture: true comment_user_verification: true favicon: true + node_user_picture: false logo: use_default: false -favicon: - use_default: true +third_party_settings: + shortcut: + module_link: true mobile_menu_all_widths: 0 site_branding_bg_color: default diff --git a/core/themes/olivero/config/optional/block.block.book_navigation.yml b/core/themes/olivero/config/optional/block.block.book_navigation.yml index e07d9ebba6ed..bc67ab71df69 100644 --- a/core/themes/olivero/config/optional/block.block.book_navigation.yml +++ b/core/themes/olivero/config/optional/block.block.book_navigation.yml @@ -14,7 +14,7 @@ plugin: book_navigation settings: id: book_navigation label: 'Book navigation' - provider: book label_display: visible + provider: book block_mode: 'book pages' visibility: { } diff --git a/core/themes/olivero/config/optional/block.block.olivero_help.yml b/core/themes/olivero/config/optional/block.block.olivero_help.yml index bb9bdde2a847..d8daa72888eb 100644 --- a/core/themes/olivero/config/optional/block.block.olivero_help.yml +++ b/core/themes/olivero/config/optional/block.block.olivero_help.yml @@ -14,6 +14,6 @@ plugin: help_block settings: id: help_block label: Help - provider: help label_display: '0' + provider: help visibility: { } diff --git a/core/themes/olivero/config/optional/block.block.olivero_search_form_narrow.yml b/core/themes/olivero/config/optional/block.block.olivero_search_form_narrow.yml index 9ae513e2c77e..165f942f884c 100644 --- a/core/themes/olivero/config/optional/block.block.olivero_search_form_narrow.yml +++ b/core/themes/olivero/config/optional/block.block.olivero_search_form_narrow.yml @@ -14,7 +14,7 @@ plugin: search_form_block settings: id: search_form_block label: 'Search form (narrow)' - provider: search label_display: '0' + provider: search page_id: '' visibility: { } diff --git a/core/themes/olivero/config/optional/block.block.olivero_search_form_wide.yml b/core/themes/olivero/config/optional/block.block.olivero_search_form_wide.yml index 2e938e8859b1..129f526da755 100644 --- a/core/themes/olivero/config/optional/block.block.olivero_search_form_wide.yml +++ b/core/themes/olivero/config/optional/block.block.olivero_search_form_wide.yml @@ -14,7 +14,7 @@ plugin: search_form_block settings: id: search_form_block label: 'Search form (wide)' - provider: search label_display: '0' + provider: search page_id: '' visibility: { } diff --git a/core/themes/olivero/config/optional/block.block.olivero_syndicate.yml b/core/themes/olivero/config/optional/block.block.olivero_syndicate.yml index 3f6bf35a7620..343b8d3256a5 100644 --- a/core/themes/olivero/config/optional/block.block.olivero_syndicate.yml +++ b/core/themes/olivero/config/optional/block.block.olivero_syndicate.yml @@ -14,7 +14,7 @@ plugin: node_syndicate_block settings: id: node_syndicate_block label: 'RSS feed' - provider: node label_display: '0' + provider: node block_count: 10 visibility: { } -- GitLab