Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into feature/DIGITAL-143-topics…
Browse files Browse the repository at this point in the history
…-field-update
  • Loading branch information
clmedders committed Jan 2, 2025
2 parents c0b9883 + 972f5f9 commit 1eaff80
Show file tree
Hide file tree
Showing 155 changed files with 7,354 additions and 173 deletions.
1 change: 1 addition & 0 deletions RoboFile.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public function exportContent(
'redirect',
'user',
'config_pages',
'taxonomy_term',
],
]
): ResultData
Expand Down
7 changes: 4 additions & 3 deletions composer.patches.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
"Disable drupal/core from scaffolding without being in composer.extra.drupal-scaffold.allowed-packages in that way one has more control of when new scaffolding is added.": "./patches/drupal.core-composer-scaffold.implicit-drupal-core-disable.patch"
},
"drupal/default_content": {
"/project/default_content/issues/2698425:: Do not reimport existing entities (patch download b/c of it being from an MR)": "patches/deafult_content_2698425.patch",
"/project/default_content/issues/3203014: BaseFieldOverride cause inconsistencies during export": "https://www.drupal.org/files/issues/2022-12-13/base_field_override_inconsistencies-3203014-9.patch",
"/project/default_content/issues/3200212: Import should overwrite files": "https://www.drupal.org/files/issues/2024-08-27/default_content-3200212-25.patch",
"/project/default_content/issues/2943458: Exporting passwords": "https://www.drupal.org/files/issues/2022-02-18/default_content-2943458-9.patch"
"/project/default_content/issues/2943458: Exporting passwords": "https://www.drupal.org/files/issues/2022-02-18/default_content-2943458-9.patch",
"/project/default_content/issues/3180348: Profile entities have circular dependencies": "https://www.drupal.org/files/issues/2025-01-01/default_content-profile-entities-have-circular-dependencies-3180348-7.patch",
"/project/default_content/issues/3200212: Import should overwrite files": "patches/default_content-3200212-25.patch",
"Created hook to exclude content from being exported": "patches/default_content-hook-exclude-content.patch"
},
"drupal/embedded_content": {
"Convert html to valid xml": "patches/embedded_content-convert-html-valid-xml.patch"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
uuid: a1068024-c5f1-416f-8bc9-28048fbcd2e2
langcode: en
status: true
dependencies:
config:
- node.type.guide_navigation
id: node.guide_navigation.promote
field_name: promote
entity_type: node
bundle: guide_navigation
label: 'Promoted to front page'
description: ''
required: false
translatable: true
default_value:
-
value: 0
default_value_callback: ''
settings:
on_label: 'On'
off_label: 'Off'
field_type: boolean
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
uuid: d930a71d-81af-45a1-99f4-18db2af2d1d4
langcode: en
status: true
dependencies:
config:
- node.type.guide_navigation
id: node.guide_navigation.status
field_name: status
entity_type: node
bundle: guide_navigation
label: Published
description: ''
required: false
translatable: true
default_value:
-
value: 0
default_value_callback: ''
settings:
on_label: 'On'
off_label: 'Off'
field_type: boolean
139 changes: 139 additions & 0 deletions config/sync/core.entity_form_display.node.guide_navigation.default.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
uuid: 31864a7f-f8df-4e04-bd14-f8b75be8f6fe
langcode: en
status: true
dependencies:
config:
- field.field.node.guide_navigation.field_guide_navigation
- field.field.node.guide_navigation.field_guide_start_page
- field.field.node.guide_navigation.field_parent_guide
- field.field.node.guide_navigation.field_show_in_page_nav
- field.field.node.guide_navigation.field_show_next_previous
- field.field.node.guide_navigation.field_show_read_time
- node.type.guide_navigation
module:
- content_moderation
- field_group
- paragraphs
third_party_settings:
field_group:
group_settings:
children:
- field_guide_start_page
- field_show_next_previous
- field_show_read_time
- field_show_in_page_nav
- field_parent_guide
label: Settings
region: content
parent_name: ''
weight: 2
format_type: fieldset
format_settings:
classes: ''
show_empty_fields: false
id: ''
label_as_html: false
description: ''
required_fields: true
id: node.guide_navigation.default
targetEntityType: node
bundle: guide_navigation
mode: default
content:
created:
type: datetime_timestamp
weight: 5
region: content
settings: { }
third_party_settings: { }
field_guide_navigation:
type: paragraphs
weight: 3
region: content
settings:
title: Paragraph
title_plural: Paragraphs
edit_mode: open
closed_mode: summary
autocollapse: none
closed_mode_threshold: 0
add_mode: dropdown
form_display_mode: default
default_paragraph_type: ''
features:
collapse_edit_all: collapse_edit_all
duplicate: duplicate
third_party_settings: { }
field_guide_start_page:
type: options_select
weight: 1
region: content
settings: { }
third_party_settings: { }
field_parent_guide:
type: options_select
weight: 5
region: content
settings: { }
third_party_settings: { }
field_show_in_page_nav:
type: boolean_checkbox
weight: 4
region: content
settings:
display_label: true
third_party_settings: { }
field_show_next_previous:
type: boolean_checkbox
weight: 2
region: content
settings:
display_label: true
third_party_settings: { }
field_show_read_time:
type: boolean_checkbox
weight: 3
region: content
settings:
display_label: true
third_party_settings: { }
moderation_state:
type: moderation_state_default
weight: 6
region: content
settings: { }
third_party_settings: { }
status:
type: boolean_checkbox
weight: 7
region: content
settings:
display_label: true
third_party_settings: { }
title:
type: string_textfield
weight: 0
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
uid:
type: entity_reference_autocomplete
weight: 4
region: content
settings:
match_operator: CONTAINS
match_limit: 10
size: 60
placeholder: ''
third_party_settings: { }
hidden:
path: true
promote: true
publish_on: true
publish_state: true
sticky: true
unpublish_on: true
unpublish_state: true
url_redirects: true
70 changes: 56 additions & 14 deletions config/sync/core.entity_form_display.node.guides.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ dependencies:
- field.field.node.guides.body
- field.field.node.guides.field_deck
- field.field.node.guides.field_featured_image
- field.field.node.guides.field_glossary
- field.field.node.guides.field_guide_nav_ref
- field.field.node.guides.field_guide_nav_title
- field.field.node.guides.field_guide_weight
- field.field.node.guides.field_kicker
- field.field.node.guides.field_page_weight
Expand All @@ -18,19 +21,38 @@ dependencies:
module:
- autocomplete_deluxe
- content_moderation
- field_group
- inline_entity_form
- maxlength
- media_library
- path
- text
third_party_settings:
field_group:
group_guide_navigation:
children:
- field_guide_nav_title
- field_guide_nav_ref
label: 'Guide Navigation'
region: content
parent_name: ''
weight: 14
format_type: fieldset
format_settings:
classes: ''
show_empty_fields: false
id: ''
label_as_html: false
description: ''
required_fields: true
id: node.guides.default
targetEntityType: node
bundle: guides
mode: default
content:
body:
type: text_textarea_with_summary
weight: 3
weight: 4
region: content
settings:
rows: 9
Expand All @@ -40,7 +62,7 @@ content:
third_party_settings: { }
created:
type: datetime_timestamp
weight: 6
weight: 7
region: content
settings: { }
third_party_settings: { }
Expand All @@ -58,43 +80,63 @@ content:
maxlength_js_enforce: true
field_featured_image:
type: media_library_widget
weight: 12
weight: 13
region: content
settings:
media_types: { }
third_party_settings: { }
field_glossary:
type: options_select
weight: 52
region: content
settings: { }
third_party_settings: { }
field_guide_nav_ref:
type: options_select
weight: 26
region: content
settings: { }
third_party_settings: { }
field_guide_nav_title:
type: string_textfield
weight: 18
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
field_guide_weight:
type: number
weight: 10
weight: 11
region: content
settings:
placeholder: ''
third_party_settings: { }
field_kicker:
type: string_textfield
weight: 1
weight: 2
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
field_page_weight:
type: number
weight: 9
weight: 10
region: content
settings:
placeholder: ''
third_party_settings: { }
field_primary_image:
type: media_library_widget
weight: 11
weight: 12
region: content
settings:
media_types: { }
third_party_settings: { }
field_summary:
type: text_textarea
weight: 2
weight: 3
region: content
settings:
rows: 1
Expand All @@ -106,7 +148,7 @@ content:
maxlength_js_enforce: true
field_summary_box:
type: boolean_checkbox
weight: 4
weight: 5
region: content
settings:
display_label: true
Expand All @@ -130,19 +172,19 @@ content:
third_party_settings: { }
moderation_state:
type: moderation_state_default
weight: 7
weight: 8
region: content
settings: { }
third_party_settings: { }
path:
type: path
weight: 30
weight: 16
region: content
settings: { }
third_party_settings: { }
status:
type: boolean_checkbox
weight: 8
weight: 9
region: content
settings:
display_label: true
Expand All @@ -157,7 +199,7 @@ content:
third_party_settings: { }
uid:
type: inline_entity_form_complex
weight: 5
weight: 6
region: content
settings:
form_mode: default
Expand All @@ -174,7 +216,7 @@ content:
removed_reference: optional
third_party_settings: { }
url_redirects:
weight: 50
weight: 17
region: content
settings: { }
third_party_settings: { }
Expand Down
Loading

0 comments on commit 1eaff80

Please sign in to comment.