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

Author: nairdo

Rock.Migrations/Migrations/Version 19.0/Version 19.0/202602101924214_RemoveLegacySystemEmailPagesBlocksEtc.cs

@@ -121,9 +121,9 @@ in legacy migrations.
             Sql( @"
 DECLARE @SystemEmailGuid UNIQUEIDENTIFIER = '75CB0A4A-B1C5-4958-ADEB-8621BD231520';
 
--- Remove any other legacy records
-DELETE FROM [SystemEmail]
-WHERE [Guid] <> @SystemEmailGuid;
+-- Remove any other legacy records (We are commenting this out due to potential plugins that are still referencing records in this table)
+-- DELETE FROM [SystemEmail]
+-- WHERE [Guid] <> @SystemEmailGuid;
 
 -- Update the retained compatibility record
 UPDATE [SystemEmail]
@@ -136,7 +136,7 @@ UPDATE [SystemEmail]
 Some RockShop plugins include legacy migrations that still reference this table. Dropping it could cause those plugins to fail during installation or upgrade. For that reason, the table has been intentionally retained out of an abundance of caution.
 
 This table should be considered deprecated and will be removed in a future major version once compatibility concerns have been resolved.'
-WHERE [Guid] = @SystemEmailGuid;
+-- WHERE [Guid] = @SystemEmailGuid;  NOTE: We are doing this for all remaining SystemEmail records.
 " );
 
             // Remove the legacy EntityType and any associated Categories

Rock/Reporting/DataFilter/Person/InRegistrationInstanceFilter.cs

@@ -128,11 +128,6 @@ public override string GetSelectionFromObsidianComponentData( Type entityType, D
                 var template = new RegistrationTemplateService( rockContext ).Get( templateGuid.Value );
                 selectionConfig.RegistrationTemplateId = template.Id;
             }
-            else
-            {
-                var template = new RegistrationTemplateService( rockContext ).Queryable().FirstOrDefault();
-                selectionConfig.RegistrationTemplateId = template.Id;
-            }
 
             var instanceGuid = data.GetValueOrNull( "instance" )?.FromJsonOrNull<ListItemBag>()?.Value?.AsGuidOrNull();
             selectionConfig.RegistrationInstanceGuid = instanceGuid;
@@ -212,10 +207,14 @@ public override string FormatSelection( Type entityType, string selection )
             {
                 return string.Format( "{0} in registration instance '{1}' {2}", filterOptions, registrationInstance.Name, waitlistFilterStatus );
             }
+            else if ( registrationInstance == null && selectionConfig.RegistrationInstanceGuid.HasValue )
+            {
+                return string.Format( "{0} in registration instance '{1}' {2}", filterOptions, "[MISSING]", waitlistFilterStatus );
+            }
             else
             {
                 var registrationTemplate = new RegistrationTemplateService( new RockContext() ).Queryable().Where( t => t.Id == selectionConfig.RegistrationTemplateId ).FirstOrDefault();
-                return string.Format( "{0} in any registration instance of template '{1}' {2}", filterOptions, registrationTemplate.Name, waitlistFilterStatus );
+                return string.Format( "{0} in any registration instance of template '{1}' {2}", filterOptions, registrationTemplate?.Name ?? selectionConfig.RegistrationTemplateId + " [MISSING]", waitlistFilterStatus );
             }
         }
 
@@ -244,6 +243,7 @@ public override Control[] CreateChildControls( Type entityType, FilterField filt
                 } )
             .ToList();
             _ddlRegistrationTemplate.DataBind();
+            _ddlRegistrationTemplate.Items.Insert( 0, new ListItem( string.Empty, string.Empty ) );
             _ddlRegistrationTemplate.SelectedIndexChanged += ddlRegistrationTemplate_SelectedIndexChanged;
             _ddlRegistrationTemplate.AutoPostBack = true;
             filterControl.Controls.Add( _ddlRegistrationTemplate );
@@ -373,6 +373,11 @@ public override void SetSelection( Type entityType, Control[] controls, string s
             {
                 ddlRegistrationTemplate.SetValue( selectionConfig.RegistrationTemplateId );
             }
+            else
+            {
+                ddlRegistrationTemplate.ClearSelection();
+                ddlRegistrationTemplate.SelectedIndex = -1;
+            }
 
             ddlRegistrationTemplate_SelectedIndexChanged( ddlRegistrationTemplate, new EventArgs() );