From 7d606462e434c83f36f899f21ffe79d0ea6fbe59 Mon Sep 17 00:00:00 2001 From: Vladimir Selivanov Date: Sun, 26 May 2019 13:02:26 +0300 Subject: [PATCH] Update field_group module and configs to fix notice --- composer.json | 2 +- composer.lock | 50 +++++---- ...form_display.node.landing_page.default.yml | 100 ++++++++++++++---- ...form_display.node.presentation.default.yml | 11 +- ...isplay.paragraph.presentations.default.yml | 5 + ...play.paragraph.sponsor_wrapper.default.yml | 5 + ...y_view_display.paragraph.attendee.mail.yml | 1 + ...aragraph.wrapper_webform.field_webform.yml | 4 - 8 files changed, 123 insertions(+), 55 deletions(-) diff --git a/composer.json b/composer.json index 3bdee575..0fa7524b 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "drupal/email_registration": "^1.0@RC", "drupal/entity_browser": "^2.0", "drupal/field_defaults": "^1.0", - "drupal/field_group": "^1.0", + "drupal/field_group": "^3.0", "drupal/geolocation": "^1.11", "drupal/google_analytics": "^3.0", "drupal/link_attributes": "^1.5", diff --git a/composer.lock b/composer.lock index 2cc6e7b2..db050590 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "13d7ae8fa3a77393d332998eec3d4ca8", + "content-hash": "2f7416109c8cf75d67e8f5427f129892", "packages": [ { "name": "alchemy/zippy", @@ -3788,17 +3788,17 @@ }, { "name": "drupal/field_defaults", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/field_defaults.git", - "reference": "8.x-1.0" + "reference": "8.x-1.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/field_defaults-8.x-1.0.zip", - "reference": "8.x-1.0", - "shasum": "65b42082217a8a36320f399e37f0892c5b8d6228" + "url": "https://ftp.drupal.org/files/projects/field_defaults-8.x-1.1.zip", + "reference": "8.x-1.1", + "shasum": "f4bb903d3e83cb69d73d9c2aa5734d6b9e7e0ee4" }, "require": { "drupal/core": "*" @@ -3809,16 +3809,14 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.0", - "datestamp": "1551483184", + "version": "8.x-1.1", + "datestamp": "1558628584", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" } }, - "patches_applied": { - "3040924 - Undefined property $batch_field_defaults": "https://www.drupal.org/files/issues/2019-03-18/notice-undefined-property-batch-field-defaults-2.patch" - } + "patches_applied": [] }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ @@ -3838,17 +3836,17 @@ }, { "name": "drupal/field_group", - "version": "1.0.0", + "version": "3.0.0-rc1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/field_group.git", - "reference": "8.x-1.0" + "reference": "8.x-3.0-rc1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/field_group-8.x-1.0.zip", - "reference": "8.x-1.0", - "shasum": "e8aa3fae5c3c5dec84644bb577996938d638a611" + "url": "https://ftp.drupal.org/files/projects/field_group-8.x-3.0-rc1.zip", + "reference": "8.x-3.0-rc1", + "shasum": "e291b5468c834a344e9aa6cafd3a76171d473a22" }, "require": { "drupal/core": "*" @@ -3856,14 +3854,14 @@ "type": "drupal-module", "extra": { "branch-alias": { - "dev-1.x": "1.x-dev" + "dev-3.x": "3.x-dev" }, "drupal": { - "version": "8.x-1.0", - "datestamp": "1510352885", + "version": "8.x-3.0-rc1", + "datestamp": "1558647185", "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" + "status": "not-covered", + "message": "RC releases are not covered by Drupal security advisories." } } }, @@ -7033,16 +7031,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.2.1", + "version": "v4.2.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "5221f49a608808c1e4d436df32884cbc1b821ac0" + "reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/5221f49a608808c1e4d436df32884cbc1b821ac0", - "reference": "5221f49a608808c1e4d436df32884cbc1b821ac0", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bd73cc04c3843ad8d6b0bfc0956026a151fc420", + "reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420", "shasum": "" }, "require": { @@ -7080,7 +7078,7 @@ "parser", "php" ], - "time": "2019-02-16T20:54:15+00:00" + "time": "2019-05-25T20:07:01+00:00" }, { "name": "oomphinc/composer-installers-extender", diff --git a/config/sync/core.entity_form_display.node.landing_page.default.yml b/config/sync/core.entity_form_display.node.landing_page.default.yml index 531c798e..ea0d9418 100644 --- a/config/sync/core.entity_form_display.node.landing_page.default.yml +++ b/config/sync/core.entity_form_display.node.landing_page.default.yml @@ -17,27 +17,87 @@ dependencies: - metatag - paragraphs - path + - scheduler - yoast_seo third_party_settings: field_group: group_header: children: - field_header + - field_transparent_header parent_name: '' - weight: 3 + weight: 1 format_type: html_element format_settings: - label: Header element: div show_label: false label_element: h3 + label_element_classes: '' attributes: '' - effect: collapsible + effect: none speed: fast id: '' classes: '' required_fields: false label: Header + region: content + group_page_content: + children: + - field_page_content + parent_name: '' + weight: 3 + format_type: html_element + format_settings: + element: div + show_label: false + label_element: h3 + label_element_classes: '' + attributes: '' + effect: none + speed: fast + id: '' + classes: '' + required_fields: false + label: 'Page content' + region: content + group_right_sidebar: + children: + - field_right_sidebar + parent_name: '' + weight: 4 + format_type: html_element + format_settings: + id: '' + classes: '' + element: div + show_label: false + label_element: h3 + label_element_classes: '' + required_fields: false + attributes: '' + effect: none + speed: fast + label: 'Right Sidebar' + region: content + group_footer: + children: + - field_footer + parent_name: '' + weight: 5 + format_type: html_element + format_settings: + id: '' + classes: '' + element: div + show_label: false + label_element: h3 + label_element_classes: '' + required_fields: false + attributes: '' + effect: none + speed: fast + label: Footer + region: content id: node.landing_page.default targetEntityType: node bundle: landing_page @@ -45,7 +105,7 @@ mode: default content: created: type: datetime_timestamp - weight: 8 + weight: 9 region: content settings: { } third_party_settings: { } @@ -57,7 +117,7 @@ content: region: content field_footer: type: paragraphs - weight: 5 + weight: 6 settings: title: Paragraph title_plural: Paragraphs @@ -76,7 +136,7 @@ content: region: content field_header: type: paragraphs - weight: 3 + weight: 0 settings: title: Paragraph title_plural: Paragraphs @@ -94,14 +154,14 @@ content: third_party_settings: { } region: content field_meta_tags: - weight: 26 + weight: 16 settings: { } third_party_settings: { } type: metatag_firehose region: content field_page_content: type: paragraphs - weight: 3 + weight: 4 settings: title: Paragraph title_plural: Paragraphs @@ -120,7 +180,7 @@ content: region: content field_right_sidebar: type: paragraphs - weight: 4 + weight: 5 settings: title: Paragraph title_plural: Paragraphs @@ -144,7 +204,7 @@ content: type: boolean_checkbox region: content field_yoast_seo: - weight: 27 + weight: 17 settings: body: body third_party_settings: { } @@ -152,20 +212,20 @@ content: region: content langcode: type: language_select - weight: 6 + weight: 7 region: content settings: include_locked: true third_party_settings: { } moderation_state: type: moderation_state_default - weight: 12 + weight: 14 settings: { } region: content third_party_settings: { } path: type: path - weight: 11 + weight: 13 region: content settings: { } third_party_settings: { } @@ -173,12 +233,12 @@ content: type: boolean_checkbox settings: display_label: true - weight: 9 + weight: 10 region: content third_party_settings: { } publish_on: type: datetime_timestamp_no_default - weight: 30 + weight: 19 region: content settings: { } third_party_settings: { } @@ -186,14 +246,14 @@ content: type: boolean_checkbox settings: display_label: true - weight: 13 + weight: 15 region: content third_party_settings: { } sticky: type: boolean_checkbox settings: display_label: true - weight: 10 + weight: 11 region: content third_party_settings: { } title: @@ -205,13 +265,13 @@ content: placeholder: '' third_party_settings: { } translation: - weight: 10 + weight: 12 region: content settings: { } third_party_settings: { } uid: type: entity_reference_autocomplete - weight: 7 + weight: 8 settings: match_operator: CONTAINS size: 60 @@ -220,7 +280,7 @@ content: third_party_settings: { } unpublish_on: type: datetime_timestamp_no_default - weight: 30 + weight: 18 region: content settings: { } third_party_settings: { } diff --git a/config/sync/core.entity_form_display.node.presentation.default.yml b/config/sync/core.entity_form_display.node.presentation.default.yml index add20062..1859bdad 100644 --- a/config/sync/core.entity_form_display.node.presentation.default.yml +++ b/config/sync/core.entity_form_display.node.presentation.default.yml @@ -19,6 +19,7 @@ dependencies: - field.field.node.presentation.field_yoast_seo - image.style.thumbnail - node.type.presentation + - workflows.workflow.presentation module: - content_moderation - field_group @@ -44,6 +45,7 @@ third_party_settings: description: '' required_fields: true label: 'Presentation Info' + region: content group_author_information: children: - field_name @@ -63,6 +65,7 @@ third_party_settings: description: '' required_fields: true label: 'Author Information' + region: content id: node.presentation.default targetEntityType: node bundle: presentation @@ -99,7 +102,7 @@ content: type: link_default region: content field_image: - weight: 31 + weight: 13 settings: progress_indicator: throbber preview_image_style: thumbnail @@ -195,7 +198,7 @@ content: third_party_settings: { } publish_on: type: datetime_timestamp_no_default - weight: 30 + weight: 11 region: content settings: { } third_party_settings: { } @@ -223,9 +226,9 @@ content: third_party_settings: { } translation: weight: 10 + region: content settings: { } third_party_settings: { } - region: content uid: type: entity_reference_autocomplete weight: 4 @@ -237,7 +240,7 @@ content: third_party_settings: { } unpublish_on: type: datetime_timestamp_no_default - weight: 30 + weight: 12 region: content settings: { } third_party_settings: { } diff --git a/config/sync/core.entity_form_display.paragraph.presentations.default.yml b/config/sync/core.entity_form_display.paragraph.presentations.default.yml index 169b87c6..8ba57cb8 100644 --- a/config/sync/core.entity_form_display.paragraph.presentations.default.yml +++ b/config/sync/core.entity_form_display.paragraph.presentations.default.yml @@ -54,6 +54,11 @@ content: third_party_settings: { } type: string_textfield region: content + translation: + weight: 10 + settings: { } + third_party_settings: { } + region: content hidden: created: true status: true diff --git a/config/sync/core.entity_form_display.paragraph.sponsor_wrapper.default.yml b/config/sync/core.entity_form_display.paragraph.sponsor_wrapper.default.yml index 156cd862..22ba3be5 100644 --- a/config/sync/core.entity_form_display.paragraph.sponsor_wrapper.default.yml +++ b/config/sync/core.entity_form_display.paragraph.sponsor_wrapper.default.yml @@ -33,6 +33,11 @@ content: third_party_settings: { } type: string_textfield region: content + translation: + weight: 10 + settings: { } + third_party_settings: { } + region: content hidden: created: true status: true diff --git a/config/sync/core.entity_view_display.paragraph.attendee.mail.yml b/config/sync/core.entity_view_display.paragraph.attendee.mail.yml index 59e9c573..8dcd48a5 100644 --- a/config/sync/core.entity_view_display.paragraph.attendee.mail.yml +++ b/config/sync/core.entity_view_display.paragraph.attendee.mail.yml @@ -47,4 +47,5 @@ content: type: entity_reference_label region: content hidden: + field_attended: true field_attendee_status: true diff --git a/config/sync/field.field.paragraph.wrapper_webform.field_webform.yml b/config/sync/field.field.paragraph.wrapper_webform.field_webform.yml index 2d552627..8f5d4093 100644 --- a/config/sync/field.field.paragraph.wrapper_webform.field_webform.yml +++ b/config/sync/field.field.paragraph.wrapper_webform.field_webform.yml @@ -29,8 +29,4 @@ settings: handler_settings: target_bundles: null auto_create: false - default_data: '' - status: open - open: '' - close: '' field_type: webform