Skip to content

Commit

Permalink
Merge pull request #645 from yalesites-org/v130
Browse files Browse the repository at this point in the history
Release v1.3.0
  • Loading branch information
vinmassaro authored May 15, 2024
2 parents 96275b6 + 9b1221e commit c682f54
Show file tree
Hide file tree
Showing 143 changed files with 3,650 additions and 254 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Install Node.js
uses: actions/setup-node@v4
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@
[
"@saithodev/semantic-release-backmerge",
{
"backmergeBranches": ["develop"]
"backmergeBranches": ["develop"],
"backmergeStrategy": "merge"
}
],
"@semantic-release/github"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
From 30bf569df2f6b17d5ea64da83bf3372165bfa98a Mon Sep 17 00:00:00 2001
From: Marc Berger <[email protected]>
Date: Wed, 20 Mar 2024 18:41:32 -0700
Subject: [PATCH] fix(3432551): If all exposed form elements are set to hide,
also hide the form.

---
.../filter/SelectiveFilterBase.php | 16 ++++++++++++++++
1 file changed, 16 insertions(+)

diff --git a/src/Plugin/better_exposed_filters/filter/SelectiveFilterBase.php b/src/Plugin/better_exposed_filters/filter/SelectiveFilterBase.php
index 9d064a2..c4440b9 100644
--- a/src/Plugin/better_exposed_filters/filter/SelectiveFilterBase.php
+++ b/src/Plugin/better_exposed_filters/filter/SelectiveFilterBase.php
@@ -269,6 +269,22 @@ abstract class SelectiveFilterBase {
)
) {
$element['#access'] = FALSE;
+
+ // Helps with check if all elements are hidden later.
+ $element['#sef_hidden'] = TRUE;
+
+ // If all exposed form elements are hidden, hide the form.
+ $i = 0;
+ foreach ($form['#info'] as $exposedFilter) {
+ if (isset($form[$exposedFilter['value']]['#sef_hidden']) && $form[$exposedFilter['value']]['#sef_hidden']) {
+ $i++;
+ }
+ }
+
+ if ($i == count($form['#info'])) {
+ $form['#access'] = FALSE;
+ }
+
}
}
}
--
GitLab
18 changes: 11 additions & 7 deletions web/profiles/custom/yalesites_profile/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"drupal/formdazzle": "3.0.0",
"drupal/gin": "3.0-rc6",
"drupal/gin_lb": "1.0.0-rc5",
"drupal/gin_moderation_sidebar": "1.0.0",
"drupal/google_analytics": "4.0.2",
"drupal/hide_revision_field": "2.3",
"drupal/honeypot": "2.1.3",
Expand All @@ -64,7 +65,7 @@
"drupal/layout_builder_restrictions": "2.19",
"drupal/layout_builder_restrictions_by_role": "1.0-alpha5",
"drupal/libraries": "4.0.4",
"drupal/linkit": "6.1.2",
"drupal/linkit": "6.1.3",
"drupal/mailchimp_transactional": "1.1.0",
"drupal/mailsystem": "4.4",
"drupal/markup": "2.0.0-beta6",
Expand All @@ -78,6 +79,7 @@
"drupal/metatag": "2.0.0",
"drupal/migrate_plus": "6.0.1",
"drupal/migrate_tools": "6.0.2",
"drupal/moderation_sidebar": "1.7",
"drupal/multiple_fields_remove_button": "2.2",
"drupal/multivalue_form_element": "1.0-beta6",
"drupal/node_revision_delete": "2.0.0-alpha2",
Expand All @@ -97,7 +99,7 @@
"drupal/search_api_exclude": "2.0.2",
"drupal/search_api_html_element_filter": "1.0.4",
"drupal/section_library": "1.1.1",
"drupal/selective_better_exposed_filters": "3.0.0-beta1",
"drupal/selective_better_exposed_filters": "3.0.2",
"drupal/simple_sitemap": "4.1.6",
"drupal/single_content_sync": "1.4.4",
"drupal/smart_date": "4.0.3",
Expand All @@ -106,11 +108,12 @@
"drupal/upgrade_status": "4.0.0",
"drupal/webform": "6.2.0-beta6",
"drupal/wingsuit_companion": "2.1",
"drupal/workflow_buttons": "1.0.0-beta6",
"jjj/chosen": "2.2.1",
"laminas/laminas-escaper": "2.12",
"northernco/ckeditor5-anchor-drupal": "0.4.0",
"yalesites-org/ai_engine": "1.1.4",
"yalesites-org/atomic": "1.28.0",
"yalesites-org/atomic": "1.31.0",
"yalesites-org/yale_cas": "1.0.4"
},
"minimum-stability": "dev",
Expand Down Expand Up @@ -167,22 +170,23 @@
},
"drupal/linkit": {
"Add phone number matcher https://www.drupal.org/project/linkit/issues/3273630": "https://git.drupalcode.org/project/linkit/-/merge_requests/36.diff",
"Fix linkit autocomplete alias selection https://www.drupal.org/project/linkit/issues/2877535": "https://www.drupal.org/files/issues/2023-10-05/linkit-2877535-64.patch"
"Fix linkit autocomplete alias selection https://www.drupal.org/project/linkit/issues/2877535": "https://www.drupal.org/files/issues/2023-10-05/linkit-2877535-64.patch",
"Decode file URLs https://www.drupal.org/project/linkit/issues/3436733": "https://www.drupal.org/files/issues/2024-03-28/3436733-linkit-link-field.patch"
},
"drupal/quick_node_clone": {
"Fix cloning of inline blocks and paragraphs: https://www.drupal.org/project/quick_node_clone/issues/3100117": "https://www.drupal.org/files/issues/2023-04-25/quick-node-clone--inline-blocks--3100117-32.patch"
},
"drupal/layout_builder_browser": {
"Add grouping of reusable blocks (3409153) and add fallback images (3408935) - can't use both patches from d.o would cause merge conflict, combined patch": "patches/layout_builder_browser/3408935-and-3409153-8.patch"
},
"drupal/section_library": {
"Fix access check issues on add_to_template link: https://www.drupal.org/project/section_library/issues/3241715": "https://www.drupal.org/files/issues/2022-09-21/3241715-6.patch"
},
"drupal/smart_date": {
"Fix deprecation:": "https://git.drupalcode.org/project/smart_date/-/merge_requests/63.diff"
},
"drupal/focal_point": {
"Limit image styles on preview page": "https://www.drupal.org/files/issues/2021-08-13/2830678-29.patch"
},
"drupal/selective_better_exposed_filters": {
"Hide form when no options are available:": "patches/selective_better_exposed_filters/selective_better_exposed_filters-3432551.patch"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
uuid: 3ff3d3c3-7213-4dba-85f0-db24528b1a0a
langcode: en
status: true
dependencies:
module:
- entity_redirect
third_party_settings:
entity_redirect:
redirect:
add:
active: 0
destination: default
url: ''
external: ''
edit:
active: 0
destination: default
url: ''
external: ''
delete:
active: 0
destination: default
url: ''
external: ''
anonymous:
active: 0
destination: default
url: ''
external: ''
id: reference_card
label: 'Reference card'
revision: 0
description: 'Select an existing Post, Event, or Profile to display a single card.'
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dependencies:
- field.field.block_content.cta_banner.field_heading_level
- field.field.block_content.cta_banner.field_instructions
- field.field.block_content.cta_banner.field_link
- field.field.block_content.cta_banner.field_link_two
- field.field.block_content.cta_banner.field_media
- field.field.block_content.cta_banner.field_style_color
- field.field.block_content.cta_banner.field_style_position
Expand Down Expand Up @@ -62,6 +63,16 @@ content:
linkit_profile: default
linkit_auto_link_text: false
third_party_settings: { }
field_link_two:
type: linkit
weight: 12
region: content
settings:
placeholder_url: ''
placeholder_title: ''
linkit_profile: default
linkit_auto_link_text: false
third_party_settings: { }
field_media:
type: media_library_widget
weight: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dependencies:
- field.field.block_content.grand_hero.field_heading_level
- field.field.block_content.grand_hero.field_instructions
- field.field.block_content.grand_hero.field_link
- field.field.block_content.grand_hero.field_link_two
- field.field.block_content.grand_hero.field_media
- field.field.block_content.grand_hero.field_style_position
- field.field.block_content.grand_hero.field_style_variation
Expand Down Expand Up @@ -42,7 +43,7 @@ content:
maxlength_js_enforce: false
field_heading_level:
type: options_select
weight: 8
weight: 9
region: content
settings: { }
third_party_settings: { }
Expand All @@ -53,6 +54,16 @@ content:
settings: { }
third_party_settings: { }
field_link:
type: linkit
weight: 6
region: content
settings:
placeholder_url: ''
placeholder_title: ''
linkit_profile: default
linkit_auto_link_text: false
third_party_settings: { }
field_link_two:
type: linkit
weight: 7
region: content
Expand All @@ -75,13 +86,13 @@ content:
show_edit: '1'
field_style_position:
type: options_select
weight: 7
weight: 8
region: content
settings: { }
third_party_settings: { }
field_style_variation:
type: options_select
weight: 6
weight: 5
region: content
settings: { }
third_party_settings: { }
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
uuid: b383cf75-8b98-4bc8-aa82-fee7ca036f80
langcode: en
status: true
dependencies:
config:
- block_content.type.reference_card
- field.field.block_content.reference_card.field_content_ref
- field.field.block_content.reference_card.field_style_variation
module:
- hide_revision_field
id: block_content.reference_card.default
targetEntityType: block_content
bundle: reference_card
mode: default
content:
field_content_ref:
type: entity_reference_autocomplete
weight: 2
region: content
settings:
match_operator: CONTAINS
match_limit: 10
size: 60
placeholder: ''
third_party_settings: { }
field_style_variation:
type: options_select
weight: 3
region: content
settings: { }
third_party_settings: { }
info:
type: string_textfield
weight: 0
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
revision_log:
type: hide_revision_field_log_widget
weight: 1
region: content
settings:
rows: 5
placeholder: ''
show: true
default: ''
permission_based: false
allow_user_settings: true
third_party_settings: { }
hidden: { }
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ status: true
dependencies:
config:
- field.field.media.background_video.field_media_video_file
- field.field.media.background_video.field_tags
- media.type.background_video
module:
- chosen_field
- file
id: media.background_video.default
targetEntityType: media
Expand All @@ -19,6 +21,12 @@ content:
settings:
progress_indicator: throbber
third_party_settings: { }
field_tags:
type: chosen_select
weight: 1
region: content
settings: { }
third_party_settings: { }
name:
type: string_textfield
weight: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,29 @@ dependencies:
config:
- core.entity_form_mode.media.media_library
- field.field.media.background_video.field_media_video_file
- field.field.media.background_video.field_tags
- media.type.background_video
module:
- chosen_field
- file
id: media.background_video.media_library
targetEntityType: media
bundle: background_video
mode: media_library
content:
field_media_video_file:
type: file_generic
weight: 1
region: content
settings:
progress_indicator: throbber
third_party_settings: { }
field_tags:
type: chosen_select
weight: 2
region: content
settings: { }
third_party_settings: { }
name:
type: string_textfield
weight: 0
Expand All @@ -21,7 +38,6 @@ content:
third_party_settings: { }
hidden:
created: true
field_media_video_file: true
path: true
revision_log_message: true
status: true
Expand Down
Loading

0 comments on commit c682f54

Please sign in to comment.