diff --git a/patches/layout_builder/1330eff91b1234979cf697a66a48e34eb116b441-1.patch b/patches/layout_builder/1330eff91b1234979cf697a66a48e34eb116b441-1.patch new file mode 100644 index 0000000000..df0636c9e9 --- /dev/null +++ b/patches/layout_builder/1330eff91b1234979cf697a66a48e34eb116b441-1.patch @@ -0,0 +1,33 @@ +From f046b109bdaa308f3063980026c0b63227469012 Mon Sep 17 00:00:00 2001 +From: David Blankenship +Date: Mon, 29 Jul 2024 11:15:16 -0400 +Subject: [PATCH] apply saved + +--- + .../layout_builder/src/Form/ConfigureBlockFormBase.php | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/core/modules/layout_builder/src/Form/ConfigureBlockFormBase.php b/core/modules/layout_builder/src/Form/ConfigureBlockFormBase.php +index 8dd6333269..16b0a8cd70 100644 +--- a/core/modules/layout_builder/src/Form/ConfigureBlockFormBase.php ++++ b/core/modules/layout_builder/src/Form/ConfigureBlockFormBase.php +@@ -365,7 +365,15 @@ public function submitForm(array &$form, FormStateInterface $form_state) { + $block_content = $form['settings']['block_form']['#block']; + $block_content->setReusable(); + $block_content->setInfo($block_info); +- $block_content->save(); ++ $saved = $block_content->save(); ++ ++ // If it didn't save, it's probably because we're using the same cloned ++ // item somewhere else with different revisions. So, we'll create a new ++ // block_content item to make sure it's fresh and won't interfere. ++ if (!$saved) { ++ $block_content = $block_content->createDuplicate(); ++ $block_content->save(); ++ } + + $block_label_display = $form_state->getValue('settings')['label_display']; + $this->block = $this->blockManager->createInstance('block_content:' . $block_content->uuid(), [ +-- +2.45.2 + diff --git a/patches/smart_date/107.patch b/patches/smart_date/107.patch deleted file mode 100644 index 864ad21772..0000000000 --- a/patches/smart_date/107.patch +++ /dev/null @@ -1,64 +0,0 @@ -From e18f75aba6227456af86b71ae9c5e8d97749c6c9 Mon Sep 17 00:00:00 2001 -From: Martin Anderson-Clutz -Date: Mon, 22 Apr 2024 18:23:43 -0400 -Subject: [PATCH 1/2] Disable Smart Date format validation if deduplication is - off - ---- - src/SmartDateTrait.php | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/SmartDateTrait.php b/src/SmartDateTrait.php -index 3e00852..c3496be 100644 ---- a/src/SmartDateTrait.php -+++ b/src/SmartDateTrait.php -@@ -589,16 +589,16 @@ trait SmartDateTrait { - */ - protected static function rangeDateReduce(array $range, mixed $settings, $start_ts, $end_ts, $timezone = NULL) { - $settings = static::normalizeSettings($settings); -+ // If an empty date format or no deduplication, nothing to do. -+ if (empty($settings['date_format']) || $settings['ampm_reduce'] === '0') { -+ return $range; -+ } - // First attempt has the following limitations, to reduce complexity: - // * Day ranges only work either d or j, and no other day tokens. - // * Not able to handle S token unless adjacent to day. - // * Month, day ranges only work if year at start or end. - $start = getdate($start_ts); - $end = getdate($end_ts); -- // If an empty date format, nothing to do. -- if (empty($settings['date_format'])) { -- return $range; -- } - $range['start']['date']['#format'] = $settings['date_format']; - $range['end']['date']['#format'] = $settings['date_format']; - // If the years are different, no deduplication necessary. --- -GitLab - - -From 21590c3537c54cde88463a48819c02635ed09aea Mon Sep 17 00:00:00 2001 -From: Martin Anderson-Clutz <46883-mandclu@users.noreply.drupalcode.org> -Date: Wed, 24 Apr 2024 22:36:24 +0000 -Subject: [PATCH 2/2] Additional error check - ---- - src/SmartDateTrait.php | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/SmartDateTrait.php b/src/SmartDateTrait.php -index c3496be..7f98751 100644 ---- a/src/SmartDateTrait.php -+++ b/src/SmartDateTrait.php -@@ -647,7 +647,7 @@ trait SmartDateTrait { - $valid_tokens = []; - // Check for workable day or month tokens. - preg_match_all('/(?@remaining' + maxlength_js_enforce: false + field_link: + type: linkit + weight: 6 + region: content + settings: + placeholder_url: '' + placeholder_title: '' + linkit_profile: default + linkit_auto_link_text: false + third_party_settings: + maxlength: + maxlength_js: null + maxlength_js_label: 'Content limited to @limit characters, remaining: @remaining' + maxlength_js_enforce: false + field_style_color: + type: options_select + weight: 3 + region: content + settings: { } + third_party_settings: { } + field_text: + type: text_textarea + weight: 4 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: + allowed_formats: + hide_help: '1' + hide_guidelines: '1' + maxlength: + maxlength_js: 500 + maxlength_js_label: 'Content limited to @limit characters, remaining: @remaining' + maxlength_js_enforce: true + info: + type: string_textfield + weight: -5 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + revision_log: + type: hide_revision_field_log_widget + weight: 80 + region: content + settings: + rows: 5 + placeholder: '' + show: true + default: '' + permission_based: false + allow_user_settings: true + third_party_settings: { } +hidden: { } diff --git a/web/profiles/custom/yalesites_profile/config/sync/core.entity_view_display.block_content.inline_message.default.yml b/web/profiles/custom/yalesites_profile/config/sync/core.entity_view_display.block_content.inline_message.default.yml new file mode 100644 index 0000000000..69b71c9c3b --- /dev/null +++ b/web/profiles/custom/yalesites_profile/config/sync/core.entity_view_display.block_content.inline_message.default.yml @@ -0,0 +1,54 @@ +uuid: 69ecb1b1-12f7-4a55-b10e-1cbd689243f2 +langcode: en +status: true +dependencies: + config: + - block_content.type.inline_message + - field.field.block_content.inline_message.field_heading + - field.field.block_content.inline_message.field_link + - field.field.block_content.inline_message.field_style_color + - field.field.block_content.inline_message.field_text + module: + - link + - options + - text +id: block_content.inline_message.default +targetEntityType: block_content +bundle: inline_message +mode: default +content: + field_heading: + type: text_default + label: hidden + settings: { } + third_party_settings: { } + weight: 0 + region: content + field_link: + type: link_separate + label: hidden + settings: + trim_length: null + url_only: false + url_plain: false + rel: '0' + target: '0' + third_party_settings: { } + weight: 4 + region: content + field_style_color: + type: list_key + label: hidden + settings: { } + third_party_settings: { } + weight: 1 + region: content + field_text: + type: text_default + label: hidden + settings: { } + third_party_settings: { } + weight: 3 + region: content +hidden: + search_api_excerpt: true diff --git a/web/profiles/custom/yalesites_profile/config/sync/editor.editor.basic_html.yml b/web/profiles/custom/yalesites_profile/config/sync/editor.editor.basic_html.yml index 05ab7bea82..9a0f065017 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/editor.editor.basic_html.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/editor.editor.basic_html.yml @@ -17,6 +17,8 @@ settings: - heading - '|' - link + - subscript + - superscript - '|' - anchor - '|' diff --git a/web/profiles/custom/yalesites_profile/config/sync/field.field.block_content.inline_message.field_heading.yml b/web/profiles/custom/yalesites_profile/config/sync/field.field.block_content.inline_message.field_heading.yml new file mode 100644 index 0000000000..3f1a44af89 --- /dev/null +++ b/web/profiles/custom/yalesites_profile/config/sync/field.field.block_content.inline_message.field_heading.yml @@ -0,0 +1,24 @@ +uuid: e0182b01-e1be-4396-be2b-573e171a1c45 +langcode: en +status: true +dependencies: + config: + - block_content.type.inline_message + - field.storage.block_content.field_heading + - filter.format.heading_html + module: + - text +id: block_content.inline_message.field_heading +field_name: field_heading +entity_type: block_content +bundle: inline_message +label: Heading +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + allowed_formats: + - heading_html +field_type: text diff --git a/web/profiles/custom/yalesites_profile/config/sync/field.field.block_content.inline_message.field_link.yml b/web/profiles/custom/yalesites_profile/config/sync/field.field.block_content.inline_message.field_link.yml new file mode 100644 index 0000000000..90164fb419 --- /dev/null +++ b/web/profiles/custom/yalesites_profile/config/sync/field.field.block_content.inline_message.field_link.yml @@ -0,0 +1,23 @@ +uuid: 0512509f-d16a-4d0c-b210-583c4ef81115 +langcode: en +status: true +dependencies: + config: + - block_content.type.inline_message + - field.storage.block_content.field_link + module: + - link +id: block_content.inline_message.field_link +field_name: field_link +entity_type: block_content +bundle: inline_message +label: Link +description: 'For more information about linking content, view our resource Linking Content on YaleSites.' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + title: 2 + link_type: 17 +field_type: link diff --git a/web/profiles/custom/yalesites_profile/config/sync/field.field.block_content.inline_message.field_style_color.yml b/web/profiles/custom/yalesites_profile/config/sync/field.field.block_content.inline_message.field_style_color.yml new file mode 100644 index 0000000000..e88c998ed0 --- /dev/null +++ b/web/profiles/custom/yalesites_profile/config/sync/field.field.block_content.inline_message.field_style_color.yml @@ -0,0 +1,21 @@ +uuid: 1ca64dda-9397-4c21-800a-4f3732021700 +langcode: en +status: true +dependencies: + config: + - block_content.type.inline_message + - field.storage.block_content.field_style_color + module: + - options +id: block_content.inline_message.field_style_color +field_name: field_style_color +entity_type: block_content +bundle: inline_message +label: Theme +description: '' +required: true +translatable: false +default_value: { } +default_value_callback: ys_themes_default_value_function +settings: { } +field_type: list_string diff --git a/web/profiles/custom/yalesites_profile/config/sync/field.field.block_content.inline_message.field_text.yml b/web/profiles/custom/yalesites_profile/config/sync/field.field.block_content.inline_message.field_text.yml new file mode 100644 index 0000000000..4043e402dd --- /dev/null +++ b/web/profiles/custom/yalesites_profile/config/sync/field.field.block_content.inline_message.field_text.yml @@ -0,0 +1,24 @@ +uuid: cb7cf9de-7a14-40e0-8c67-9fc6d50cba49 +langcode: en +status: true +dependencies: + config: + - block_content.type.inline_message + - field.storage.block_content.field_text + - filter.format.basic_html + module: + - text +id: block_content.inline_message.field_text +field_name: field_text +entity_type: block_content +bundle: inline_message +label: Content +description: '' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: + allowed_formats: + - basic_html +field_type: text_long diff --git a/web/profiles/custom/yalesites_profile/config/sync/filter.format.basic_html.yml b/web/profiles/custom/yalesites_profile/config/sync/filter.format.basic_html.yml index c9ade20f9b..a17a58af6a 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/filter.format.basic_html.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/filter.format.basic_html.yml @@ -17,7 +17,7 @@ filters: status: true weight: -10 settings: - allowed_html: '