diff --git a/composer.json b/composer.json index f25533d75..87553ee5d 100644 --- a/composer.json +++ b/composer.json @@ -27,9 +27,9 @@ "require": { "composer/installers": "^1.9", "cweagans/composer-patches": "^1.7", - "drupal/core-composer-scaffold": "10.3.6", - "drupal/core-project-message": "10.3.6", - "drupal/core-recommended": "10.3.6", + "drupal/core-composer-scaffold": "10.3.8", + "drupal/core-project-message": "10.3.8", + "drupal/core-recommended": "10.3.8", "drush/drush": "^11 || ^12", "oomphinc/composer-installers-extender": "^2.0", "pantheon-systems/drupal-integrations": "^10", diff --git a/pantheon.yml b/pantheon.yml index ec794359b..dac8707ca 100644 --- a/pantheon.yml +++ b/pantheon.yml @@ -1,5 +1,6 @@ api_version: 1 # Downstream sites should not change the workflow. + # Specifying Quicksilver workflows in pantheon.upstream.yml is not supported. workflows: clone_database: diff --git a/patches/layout_builder_browser/3408935-and-3409153-9.patch b/patches/layout_builder_browser/3408935-and-3409153-9.patch index 6710f7cca..ef9a235a7 100644 --- a/patches/layout_builder_browser/3408935-and-3409153-9.patch +++ b/patches/layout_builder_browser/3408935-and-3409153-9.patch @@ -103,7 +103,7 @@ index 34310e2..fa855a6 100644 + if ($config->get('group_reusable_blocks_together')) { + + foreach ($block_links as $key => $block_link) { -+ $changed = date('m/d/Y - H:i', $block_link['#changed']); ++ $changed = date('m/d/Y - H:i', $block_link['link']['#changed']); + $block_links[$key]['link']['#title']['label']['#markup'] = " + {$block_link['link']['#title']['label']['#markup']} +
diff --git a/web/profiles/custom/yalesites_profile/composer.json b/web/profiles/custom/yalesites_profile/composer.json index 875e39404..5dadb91fd 100644 --- a/web/profiles/custom/yalesites_profile/composer.json +++ b/web/profiles/custom/yalesites_profile/composer.json @@ -90,7 +90,7 @@ "drupal/paragraphs_features": "2.0.0", "drupal/pathauto": "1.13.0", "drupal/publishcontent": "1.6", - "drupal/quick_node_clone": "1.18.0", + "drupal/quick_node_clone": "1.19.0", "drupal/recaptcha": "3.4.0", "drupal/recaptcha_v3": "2.0.3", "drupal/redirect": "1.10.0", @@ -111,8 +111,8 @@ "jjj/chosen": "2.2.1", "laminas/laminas-escaper": "2.13.0", "northernco/ckeditor5-anchor-drupal": "0.4.0", - "yalesites-org/ai_engine": "1.2.5", - "yalesites-org/atomic": "1.39.0", + "yalesites-org/ai_engine": "1.2.6", + "yalesites-org/atomic": "1.39.1", "yalesites-org/yale_cas": "v1.0.5" }, "minimum-stability": "dev", diff --git a/web/profiles/custom/yalesites_profile/config/sync/editor.editor.webform_default.yml b/web/profiles/custom/yalesites_profile/config/sync/editor.editor.webform_default.yml index 155a200d9..bb56e74e1 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/editor.editor.webform_default.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/editor.editor.webform_default.yml @@ -1,4 +1,4 @@ -uuid: null +uuid: 56ddbda0-c014-4865-8529-616d20969e4a langcode: en status: true dependencies: diff --git a/web/profiles/custom/yalesites_profile/config/sync/filter.format.heading_html.yml b/web/profiles/custom/yalesites_profile/config/sync/filter.format.heading_html.yml index 9be1ab265..8275315e7 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/filter.format.heading_html.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/filter.format.heading_html.yml @@ -24,24 +24,24 @@ filters: status: false weight: 50 settings: - remove_empty_paragraphs: '0' + remove_empty_paragraphs: false typogrify: id: typogrify provider: typogrify status: true weight: 10 settings: - smartypants_enabled: '1' - smartypants_hyphens: '2' - space_hyphens: '0' - widont_enabled: '0' - hyphenate_shy: '0' - space_to_nbsp: '1' - wrap_caps: '0' - wrap_ampersand: '0' - wrap_abbr: '0' - wrap_numbers: '0' - wrap_initial_quotes: '1' + smartypants_enabled: 1 + smartypants_hyphens: 2 + space_hyphens: 0 + wrap_ampersand: 0 + widont_enabled: 0 + space_to_nbsp: 1 + hyphenate_shy: 0 + wrap_abbr: 0 + wrap_caps: 0 + wrap_initial_quotes: 1 + wrap_numbers: 0 ligatures: 'a:0:{}' arrows: 'a:0:{}' fractions: 'a:0:{}' diff --git a/web/profiles/custom/yalesites_profile/config/sync/filter.format.plain_text.yml b/web/profiles/custom/yalesites_profile/config/sync/filter.format.plain_text.yml index 611e01bd7..c918bb1c1 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/filter.format.plain_text.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/filter.format.plain_text.yml @@ -22,4 +22,4 @@ filters: status: false weight: 50 settings: - remove_empty_paragraphs: '0' + remove_empty_paragraphs: false diff --git a/web/profiles/custom/yalesites_profile/config/sync/filter.format.restricted_html.yml b/web/profiles/custom/yalesites_profile/config/sync/filter.format.restricted_html.yml index 892709f13..4734aab4a 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/filter.format.restricted_html.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/filter.format.restricted_html.yml @@ -43,24 +43,24 @@ filters: status: true weight: 50 settings: - remove_empty_paragraphs: '1' + remove_empty_paragraphs: true typogrify: id: typogrify provider: typogrify status: true weight: 10 settings: - smartypants_enabled: '1' - smartypants_hyphens: '2' - space_hyphens: '0' - wrap_ampersand: '0' - widont_enabled: '0' - space_to_nbsp: '1' - hyphenate_shy: '0' - wrap_abbr: '0' - wrap_caps: '0' - wrap_initial_quotes: '1' - wrap_numbers: '0' + smartypants_enabled: 1 + smartypants_hyphens: 2 + space_hyphens: 0 + wrap_ampersand: 0 + widont_enabled: 0 + space_to_nbsp: 1 + hyphenate_shy: 0 + wrap_abbr: 0 + wrap_caps: 0 + wrap_initial_quotes: 1 + wrap_numbers: 0 ligatures: 'a:0:{}' arrows: 'a:0:{}' fractions: 'a:0:{}' diff --git a/web/profiles/custom/yalesites_profile/config/sync/filter.format.webform_default.yml b/web/profiles/custom/yalesites_profile/config/sync/filter.format.webform_default.yml index ed1194753..96fec0ec3 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/filter.format.webform_default.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/filter.format.webform_default.yml @@ -1,3 +1,4 @@ +uuid: 263588a0-329b-4b3a-a970-b41e61c401ae langcode: en status: true dependencies: @@ -7,6 +8,4 @@ dependencies: name: 'Webform (Default) - DO NOT EDIT' format: webform_default weight: 100 -roles: - - authenticated filters: { } diff --git a/web/profiles/custom/yalesites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.advanced.yml b/web/profiles/custom/yalesites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.advanced.yml index 2ebf55441..e38d74ca7 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.advanced.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.advanced.yml @@ -6,3 +6,5 @@ id: advanced label: Advanced weight: -7 opened: true +image_path: null +image_alt: null diff --git a/web/profiles/custom/yalesites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.all_blocks.yml b/web/profiles/custom/yalesites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.all_blocks.yml index 4762eb7a9..dacba9233 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.all_blocks.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.all_blocks.yml @@ -6,3 +6,5 @@ id: all_blocks label: 'All Blocks' weight: -10 opened: true +image_path: null +image_alt: null diff --git a/web/profiles/custom/yalesites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.basic.yml b/web/profiles/custom/yalesites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.basic.yml index 5c05c661f..7060c29de 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.basic.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.basic.yml @@ -6,3 +6,5 @@ id: basic label: Basic weight: -9 opened: true +image_path: null +image_alt: null diff --git a/web/profiles/custom/yalesites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.media.yml b/web/profiles/custom/yalesites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.media.yml index cac0d0d77..5834d33ca 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.media.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.media.yml @@ -6,3 +6,5 @@ id: media label: Media weight: -8 opened: true +image_path: null +image_alt: null diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.archive.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.archive.yml index 4d7e0e5be..b415d9874 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.archive.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.archive.yml @@ -29,6 +29,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: 0 id: 0 @@ -43,7 +44,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.block_content.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.block_content.yml index 9a0c92e5e..dd910c276 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.block_content.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.block_content.yml @@ -273,6 +273,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -287,7 +288,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.editoria11y_dismissals.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.editoria11y_dismissals.yml index 141433860..7bb81ba11 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.editoria11y_dismissals.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.editoria11y_dismissals.yml @@ -1,4 +1,4 @@ -uuid: null +uuid: e102d13e-68ee-4f7f-94de-c8b8a6769f7a langcode: en status: true dependencies: @@ -647,11 +647,11 @@ display: element_wrapper_type: '' element_wrapper_class: '' element_default_classes: true - separator: '' empty: '' hide_empty: false empty_zero: false hide_alter_empty: true + separator: '' nothing: id: nothing table: views @@ -705,6 +705,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -722,7 +723,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 sorts: created: id: created diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.editoria11y_results.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.editoria11y_results.yml index 59838842a..3bb036ac3 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.editoria11y_results.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.editoria11y_results.yml @@ -1,4 +1,4 @@ -uuid: null +uuid: 842dbcfb-3f53-4011-9f35-30e6d13e8757 langcode: en status: true dependencies: @@ -1072,6 +1072,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -1089,7 +1090,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 sorts: result_name_count: id: result_name_count @@ -1453,6 +1453,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -1470,7 +1471,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 sorts: result_name_count: id: result_name_count @@ -1939,6 +1939,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -1953,7 +1954,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 sorts: page_result_count: id: page_result_count @@ -2451,6 +2451,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -2465,7 +2466,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 sorts: result_name_count: id: result_name_count @@ -2994,6 +2994,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -3008,7 +3009,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 sorts: created: id: created diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.export_media.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.export_media.yml index 67615a173..3db8f7c28 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.export_media.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.export_media.yml @@ -401,6 +401,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -418,7 +419,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.export_nodes.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.export_nodes.yml index 978b4b6e6..102cd6a6f 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.export_nodes.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.export_nodes.yml @@ -479,6 +479,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -496,7 +497,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.export_taxonomy.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.export_taxonomy.yml index 7dacf96b8..8702c6354 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.export_taxonomy.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.export_taxonomy.yml @@ -401,6 +401,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -418,7 +419,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.files.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.files.yml index 3eaf2672a..7e957be7f 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.files.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.files.yml @@ -470,6 +470,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: 0 id: 0 @@ -484,7 +485,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: @@ -1011,6 +1011,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: 0 id: 0 @@ -1025,7 +1026,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 empty: { } arguments: fid: diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.frontpage.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.frontpage.yml index ac4375500..9df98045f 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.frontpage.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.frontpage.yml @@ -30,6 +30,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: 0 id: 0 @@ -47,7 +48,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.glossary.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.glossary.yml index 3c9dee0ba..6257f71d2 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.glossary.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.glossary.yml @@ -196,6 +196,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 36 total_pages: 0 id: 0 @@ -210,7 +211,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.media.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.media.yml index be261709d..7fade73d2 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.media.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.media.yml @@ -519,6 +519,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -536,7 +537,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.media_library.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.media_library.yml index 6e6899c38..9906a29a2 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.media_library.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.media_library.yml @@ -139,6 +139,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 24 total_pages: null id: 0 @@ -153,7 +154,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.moderated_content.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.moderated_content.yml index 3cb9252c9..d03832f5d 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.moderated_content.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.moderated_content.yml @@ -418,6 +418,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -435,7 +436,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.redirect.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.redirect.yml index fe4099aad..555a036d0 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.redirect.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.redirect.yml @@ -226,6 +226,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -243,7 +244,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.redirect_404.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.redirect_404.yml index 3e1bf91a9..a356780da 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.redirect_404.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.redirect_404.yml @@ -330,6 +330,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: null id: 0 @@ -344,7 +345,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.section_library.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.section_library.yml index 5f350002c..331591087 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.section_library.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.section_library.yml @@ -620,6 +620,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -637,7 +638,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.taxonomy_lookup.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.taxonomy_lookup.yml index f4edffcdc..c0f39ac0d 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.taxonomy_lookup.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.taxonomy_lookup.yml @@ -204,6 +204,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: null id: 0 @@ -218,7 +219,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.user_admin_people.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.user_admin_people.yml index 4c96159dc..acf075b5a 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.user_admin_people.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.user_admin_people.yml @@ -641,6 +641,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: 0 id: 0 @@ -658,7 +659,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.watchdog.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.watchdog.yml index 850a3f179..4b2cad87b 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.watchdog.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.watchdog.yml @@ -440,6 +440,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -454,7 +455,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.webform_submissions.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.webform_submissions.yml index ee1ed0d0f..a09182374 100644 --- a/web/profiles/custom/yalesites_profile/config/sync/views.view.webform_submissions.yml +++ b/web/profiles/custom/yalesites_profile/config/sync/views.view.webform_submissions.yml @@ -357,6 +357,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 25 total_pages: null id: 0 @@ -374,7 +375,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/web/profiles/custom/yalesites_profile/modules/custom/ys_views_basic/src/Plugin/Field/FieldWidget/ViewsBasicDefaultWidget.php b/web/profiles/custom/yalesites_profile/modules/custom/ys_views_basic/src/Plugin/Field/FieldWidget/ViewsBasicDefaultWidget.php index 7680c5f2d..7e16cb70d 100644 --- a/web/profiles/custom/yalesites_profile/modules/custom/ys_views_basic/src/Plugin/Field/FieldWidget/ViewsBasicDefaultWidget.php +++ b/web/profiles/custom/yalesites_profile/modules/custom/ys_views_basic/src/Plugin/Field/FieldWidget/ViewsBasicDefaultWidget.php @@ -106,6 +106,7 @@ public function formElement( $formSelectors = $this->viewsBasicManager->getFormSelectors($formState, NULL, $entityValue); $form['#form_selectors'] = $formSelectors; + $selectedEntityType = $formSelectors['entity_types']; $element['group_params'] = [ '#type' => 'container', @@ -227,14 +228,22 @@ public function formElement( $fieldOptionValue = ($items[$delta]->params) ? $this->viewsBasicManager->getDefaultParamValue('field_options', $items[$delta]->params) : []; $fieldOptionDefaultValue = $fieldOptionValue ?? ['show_thumbnail' => 'show_thumbnail']; $isNewForm = str_contains($formState->getCompleteForm()['#id'], 'layout-builder-add-block'); + + // To be consistent in the output render, we name categories affiliation in + // the views form if they select profiles. + $showCategoriesLabel = $this->t("Show Categories"); + if ($selectedEntityType === "profile") { + $showCategoriesLabel = $this->t("Show Affiliations"); + } + // Set the default value for 'field_options' to 'show_thumbnail' // when creating a new block. $form['group_user_selection']['entity_and_view_mode']['field_options'] = [ '#type' => 'checkboxes', '#options' => [ - 'show_categories' => $this->t('Show Categories'), + 'show_categories' => $showCategoriesLabel, 'show_tags' => $this->t('Show Tags'), - 'show_thumbnail' => $this->t('Show Thumbnail'), + 'show_thumbnail' => $this->t('Show Teaser Image'), ], '#title' => $this->t('Field Display Options'), '#tree' => TRUE, @@ -255,9 +264,9 @@ public function formElement( $form['group_user_selection']['entity_and_view_mode']['exposed_filter_options'] = [ '#type' => 'checkboxes', '#options' => [ - 'show_search_filter' => $this->t('Show Search Filter'), - 'show_year_filter' => $this->t('Show Year Filter'), - 'show_category_filter' => $this->t('Show Category Filter'), + 'show_search_filter' => $this->t('Show Search'), + 'show_year_filter' => $this->t('Show Year'), + 'show_category_filter' => $this->t('Show Category'), ], '#title' => $this->t('Exposed Filter Options'), '#tree' => TRUE, @@ -279,7 +288,7 @@ public function formElement( ], ]; - $vocabulary_id = $formSelectors['entity_types'] === 'profile' + $vocabulary_id = $selectedEntityType === 'profile' ? 'affiliation' : $formSelectors['entity_types'] . '_category'; $form['group_user_selection']['entity_and_view_mode']['category_included_terms'] = [ @@ -361,6 +370,10 @@ public function formElement( 'past' => $this->t('Past Events') . 'Past Events icon showing a calendar with a past-pointing arrow to the left.', 'all' => $this->t('All Events') . 'All Events icon showing a calendar.', ], + '#states' => [ + 'visible' => [$formSelectors['entity_types_ajax'] => ['value' => 'event']], + 'invisible' => $calendarViewInvisibleState, + ], '#default_value' => ($items[$delta]->params) ? $this->viewsBasicManager->getDefaultParamValue('event_time_period', $items[$delta]->params) : 'future', '#prefix' => '
', '#suffix' => '
', diff --git a/web/profiles/custom/yalesites_profile/yalesites_profile.info.yml b/web/profiles/custom/yalesites_profile/yalesites_profile.info.yml index 632d175c1..b762675be 100644 --- a/web/profiles/custom/yalesites_profile/yalesites_profile.info.yml +++ b/web/profiles/custom/yalesites_profile/yalesites_profile.info.yml @@ -1,6 +1,6 @@ name: YaleSites Profile type: profile -version: 1.9.0 +version: 1.10.0 description: 'Install profile for managing YaleSites platform sites.' core_version_requirement: '^9 || ^10'