Merge branch 'hotfix-19.1' into develop

Author: kylehenning

Rock.Blocks/Core/McpServerList.cs

@@ -29,6 +29,12 @@
 using Rock.Web.Cache;
 using Rock.Web.Cache.Entities;
 
+#if WEBFORMS
+using System.Web.UI;
+
+using Rock.Web;
+#endif
+
 namespace Rock.Blocks.Core
 {
     /// <summary>
@@ -128,5 +134,61 @@ private List<McpServerListItemBag> GetMcpServers( bool appendApiKeyToUrl )
         }
 
         #endregion
+
+#if WEBFORMS
+        #region Custom Settings
+
+        /// <summary>
+        /// Widens Bootstrap tooltips inside the BlockProperties iframe so the verbose
+        /// "Append API Key to URL" help text wraps to fewer lines and fits within the
+        /// iframe's vertical space (the default 200px tooltip width forces the long
+        /// description to wrap into a tall tooltip that gets clipped at the iframe edge).
+        /// </summary>
+        /*
+            5/1/26 - JMH
+
+            This provider only loads when the McpServerList block is being edited, so the
+            injected CSS is naturally scoped to this block's settings dialog and doesn't
+            affect tooltips elsewhere in Rock.
+
+            Reason: Tooltips can't extend past an iframe's boundary; widening them keeps
+            the rendered tooltip short enough to fit.
+        */
+        [CustomSettingsBlockType( typeof( McpServerList ), Model.SiteType.Web )]
+        public class McpServerListCustomSettingsProvider : RockCustomSettingsProvider
+        {
+            private const string TooltipWidthScript = @"
+<script>
+    (function() {
+        var style = document.createElement( 'style' );
+        style.textContent = '.tooltip-inner { max-width: 500px; }';
+        document.head.appendChild( style );
+    })();
+</script>";
+
+            /// <inheritdoc />
+            public override string CustomSettingsTitle => "Basic Settings";
+
+            /// <inheritdoc />
+            public override Control GetCustomSettingsControl( IHasAttributes attributeEntity, Control parent )
+            {
+                return new LiteralControl( TooltipWidthScript );
+            }
+
+            /// <inheritdoc />
+            public override void ReadSettingsFromEntity( IHasAttributes attributeEntity, Control control )
+            {
+                // No persisted state — this provider only injects styling for tooltips.
+            }
+
+            /// <inheritdoc />
+            public override void WriteSettingsToEntity( IHasAttributes attributeEntity, Control control, RockContext rockContext )
+            {
+                // No persisted state — this provider only injects styling for tooltips.
+            }
+        }
+
+        #endregion
+#endif
     }
 }

Rock.Blocks/Engagement/ConnectionsHub.cs

@@ -1003,6 +1003,67 @@ private void LaunchWorkflowsInBackground( List<ConnectionRequest> eligibleReques
 
         #region Placement Group Methods
 
+        /// <summary>
+        /// Applies a default group member role and/or status to the Connection Request
+        /// when the assigned placement group's opportunity offers only a single option.
+        /// The Edit and Add UIs hide the role/status dropdown when there is only one
+        /// configured value, so the bag arrives without a selection. This fills the
+        /// gap so the request can still be fully placed.
+        /// </summary>
+        /// <param name="entity">The Connection Request whose role/status may need defaulting.</param>
+        private void ApplyDefaultGroupMemberRoleAndStatus( ConnectionRequest entity )
+        {
+            if ( !entity.AssignedGroupId.HasValue )
+            {
+                return;
+            }
+
+            if ( entity.AssignedGroupMemberRoleId.HasValue && entity.AssignedGroupMemberStatus.HasValue )
+            {
+                return;
+            }
+
+            var placementGroup = new GroupService( RockContext ).Get( entity.AssignedGroupId.Value );
+            if ( placementGroup == null )
+            {
+                return;
+            }
+
+            var configs = new ConnectionOpportunityGroupConfigService( RockContext ).Queryable()
+                .AsNoTracking()
+                .Where( c =>
+                    c.ConnectionOpportunityId == entity.ConnectionOpportunityId &&
+                    c.GroupTypeId == placementGroup.GroupTypeId )
+                .Select( c => new
+                {
+                    c.GroupMemberRoleId,
+                    c.GroupMemberStatus
+                } )
+                .ToList();
+
+            if ( !entity.AssignedGroupMemberRoleId.HasValue )
+            {
+                var distinctRoleIds = configs.Select( c => c.GroupMemberRoleId ).Distinct().ToList();
+                if ( distinctRoleIds.Count == 1 )
+                {
+                    entity.AssignedGroupMemberRoleId = distinctRoleIds[0];
+                }
+            }
+
+            if ( !entity.AssignedGroupMemberStatus.HasValue && entity.AssignedGroupMemberRoleId.HasValue )
+            {
+                var distinctStatuses = configs
+                    .Where( c => c.GroupMemberRoleId == entity.AssignedGroupMemberRoleId.Value )
+                    .Select( c => c.GroupMemberStatus )
+                    .Distinct()
+                    .ToList();
+                if ( distinctStatuses.Count == 1 )
+                {
+                    entity.AssignedGroupMemberStatus = distinctStatuses[0];
+                }
+            }
+        }
+
         /// <summary>
         /// Serializes the Placement Group Member Attribute values into a JSON string and returns it
         /// </summary>
@@ -1706,6 +1767,10 @@ private bool UpdateEntityFromBox( ConnectionRequest entity, ValidPropertiesBox<C
                 box.IfValidProperty( nameof( box.Bag.GroupMemberStatus ),
                     () => entity.AssignedGroupMemberStatus = box.Bag.GroupMemberStatus );
 
+                // If the opportunity only offers a single role or status, the UI hides the dropdown,
+                // so the bag arrives empty. Default it before serializing attribute values.
+                ApplyDefaultGroupMemberRoleAndStatus( entity );
+
                 box.IfValidProperty( nameof( box.Bag.PlacementGroupMemberAttributeValues ),
                     () => entity.AssignedGroupMemberAttributeValues = GetGroupMemberAttributeValuesFromBag( box.Bag.PlacementGroupMemberAttributeValues, entity.AssignedGroupId, entity.AssignedGroupMemberRoleId, entity.AssignedGroupMemberStatus ) );
             }

Rock.JavaScript.Obsidian.Blocks/src/Engagement/ConnectionsHub/addConnectionRequestModal.partial.obs

@@ -509,24 +509,6 @@
         pruneAndSeedPlacementGroupMemberAttributeValues();
     });
 
-    /**
-     * If there is only one group member role then we will hide the dropdown and set the value to that role by default.
-     */
-    watch(() => props.placementGroupDetails?.groupMemberRoles, () => {
-        if (props.placementGroupDetails?.groupMemberRoles && props.placementGroupDetails.groupMemberRoles.length === 1) {
-            groupMemberRoleGuid.value = props.placementGroupDetails.groupMemberRoles[0].value ?? "";
-        }
-    });
-
-    /**
-     * If there is only one group member status for the selected role then we will hide the dropdown and set the value to that status by default.
-     */
-    watch(groupMemberStatusItems, () => {
-        if (groupMemberStatusItems.value.length === 1) {
-            groupMemberStatus.value = groupMemberStatusItems.value[0].value ?? "";
-        }
-    });
-
     watch(() => props.modelValue.bag, () => {
         updateRefValue(comments, props.modelValue.bag?.comments ?? "");
         updateRefValue(connectionOpportunityGuid, props.modelValue.bag?.connectionOpportunityGuid ?? "");