Merge remote-tracking branch 'origin/hotfix-18.2' into develop

Author: jasonhendee

Rock.Blocks/Communication/CommunicationEntryWizard.cs

@@ -3030,39 +3030,8 @@ private void ProcessCommunicationSend( CommunicationEntryWizardCommunicationBag
                         }
                     }
 
-                    /*
-                        1/2/2024 - JPH
-
-                        Rather than leveraging the default EF behavior of inserting each new recipient one-by-one,
-                        let's remove them from change tracking and perform a BULK INSERT operation instead, after
-                        saving the parent Communication record.
-
-                        We can get away with this because none of the downstream processes further reference the
-                        Communication.Recipients collection. If this changes, we will need to rethink this strategy.
-
-                        Reason: Communications with a large number of recipients time out and don't send.
-                        https://github.com/SparkDevNetwork/Rock/issues/5651
-                    */
-                    var newRecipients = new List<CommunicationRecipient>( communication.Recipients.Where( r => r.Id == 0 ) );
-
-                    // Stop tracking these entities.
-                    communication.Recipients.RemoveAll( newRecipients );
-
-                    // Save the communication entity and any updated/deleted recipients.
+                    // Save the communication entity.
                     rockContext.SaveChanges();
-
-                    if ( newRecipients.Any() )
-                    {
-                        using ( var bulkInsertActivity = ObservabilityHelper.StartActivity( "COMMUNICATION: Entry Wizard > Send Communication > Bulk-Insert New Communication Recipients" ) )
-                        {
-                            foreach ( var recipient in newRecipients )
-                            {
-                                recipient.CommunicationId = communication.Id;
-                            }
-
-                            rockContext.BulkInsert<CommunicationRecipient>( newRecipients );
-                        }
-                    }
                 }
 
                 // send approval email if needed (now that we have a communication id)

Rock/Model/Communication/Communication/Communication.Logic.cs

@@ -563,6 +563,20 @@ public void RefreshCommunicationRecipientList( RockContext rockContext )
                 return;
             }
 
+            if ( ( rockContext.Database.CommandTimeout ?? 0 ) < 90 )
+            {
+                /*
+                    12/1/2025 - JPH
+
+                    We're increasing this timeout from the default of 30 seconds to give the following
+                    pre-send task more time to complete.
+
+                    Reason: Communications with a large number of recipients time out and don't send.
+                    https://github.com/SparkDevNetwork/Rock/issues/5651
+                */
+                rockContext.Database.SetCommandTimeout( 90 );
+            }
+
             using ( var activity = ObservabilityHelper.StartActivity( "COMMUNICATION: Prepare Recipient List > Refresh Communication Recipient List" ) )
             {
                 /*

RockWeb/Blocks/Reporting/DataViewDetail.ascx.cs

@@ -85,7 +85,7 @@ namespace RockWeb.Blocks.Reporting
         "Use Obsidian Components",
         Key = AttributeKey.UseObsidianComponents,
         Description = "Switches the filter components to use Obsidian if supported.",
-        DefaultBooleanValue = true,
+        DefaultBooleanValue = false,
         Category = "Advanced" )]
 
     [Rock.SystemGuid.BlockTypeGuid( "EB279DF9-D817-4905-B6AC-D9883F0DA2E4" )]

RockWeb/Blocks/Reporting/DynamicReport.ascx.cs

@@ -59,7 +59,7 @@ namespace RockWeb.Blocks.Reporting
         "Use Obsidian Components",
         Key = AttributeKey.UseObsidianComponents,
         Description = "Switches the filter components to use Obsidian if supported.",
-        DefaultBooleanValue = true,
+        DefaultBooleanValue = false,
         Category = "Advanced" )]
 
     [Rock.SystemGuid.BlockTypeGuid( "C7C069DB-9EEE-4245-9DF2-34E3A1FF4CCB" )]

RockWeb/Blocks/Reporting/ReportDetail.ascx.cs

@@ -76,7 +76,7 @@ namespace RockWeb.Blocks.Reporting
         "Use Obsidian Components",
         Key = AttributeKey.UseObsidianComponents,
         Description = "Switches the filter components to use Obsidian if supported.",
-        DefaultBooleanValue = true,
+        DefaultBooleanValue = false,
         Category = "Advanced" )]
 
     [Rock.SystemGuid.BlockTypeGuid( "E431DBDF-5C65-45DC-ADC5-157A02045CCD" )]