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

Author: cabal95

Rock.Blocks/CheckIn/Manager/CheckInContextSetter.cs

@@ -191,7 +191,13 @@ private CheckInContextSetterOptionsBag GetConfigurationOptionsBag()
                 return _options;
             }
 
-            var options = new CheckInContextSetterOptionsBag();
+            var options = new CheckInContextSetterOptionsBag
+            {
+                // Temporary. This will be used to redirect to the same page
+                // for WebForms blocks. Once they have all been converted to
+                // Obsidian, this can be removed.
+                IsRedirectRequired = PageCache.Guid != new Guid( "ba04bf01-5244-4637-b12d-7a962d2a9e77" ),
+            };
 
             InitializeCampusOptions( options );
 
@@ -340,16 +346,21 @@ private Location GetContextLocation()
                 return location;
             }
 
-            if ( location == null || location.Id != locationId )
-            {
-                location = new LocationService( RockContext ).Get( locationId.Value );
+            location = new LocationService( RockContext ).Get( locationId.Value );
 
-                if ( location != null )
-                {
-                    RequestContext.SetContextEntity( location, pageSpecific: false );
-                }
+            if ( location != null )
+            {
+                RequestContext.SetContextEntity( location, pageSpecific: false );
             }
 
+            // We also need to redirect back to the current page without
+            // the LocationId query parameter so that everything on the
+            // page is in sync with the new location context.
+            var queryParams = RequestContext.QueryString.ToSimpleQueryStringDictionary();
+            queryParams.Remove( PageParameterKey.LocationId );
+
+            RequestContext.Response.RedirectToUrl( this.GetCurrentPageUrl( queryParams, skipExistingParameters: true ) );
+
             return location;
         }
 

Rock.JavaScript.Obsidian.Blocks/src/CheckIn/Manager/checkInContextSetter.obs

@@ -94,6 +94,8 @@
     function createLocationProvider(campusGuid: string | null | undefined): ITreeItemProvider {
         const provider = new LocationTreeItemProvider();
 
+        provider.includeInactive = true;
+
         if (campusGuid) {
             provider.rootLocationGuid = config.rootLocations?.[campusGuid];
         }
@@ -116,6 +118,13 @@
         }
     }
 
+    function maybeRedirect(): void {
+        if (config.isRedirectRequired) {
+            const url = window.location.href;
+            window.location.href = url;
+        }
+    }
+
     // #endregion
 
     // #region Event Handlers
@@ -127,6 +136,8 @@
      */
     async function onCampusSelected(campusValue: ListItemBag): Promise<void> {
         await contextEntities.set("Rock.Model.Campus", campusValue);
+
+        maybeRedirect();
     }
 
     /**
@@ -136,6 +147,8 @@
      */
     async function onLocationSelected(locationValue: ListItemBag | null): Promise<void> {
         await contextEntities.set("Rock.Model.Location", locationValue);
+
+        maybeRedirect();
     }
 
     /**
@@ -145,6 +158,8 @@
      */
     async function onScheduleSelected(scheduleValue: ListItemBag | null): Promise<void> {
         await contextEntities.set("Rock.Model.Schedule", scheduleValue);
+
+        maybeRedirect();
     }
 
     async function loadSchedules(): Promise<void> {

Rock.JavaScript.Obsidian/Framework/Utility/treeItemProviders.ts

@@ -187,6 +187,11 @@ export class LocationTreeItemProvider implements ITreeItemProvider {
      */
     public rootLocationGuid?: Guid | null;
 
+    /**
+     * Determines if inactive locations should be included in the results.
+     */
+    public includeInactive: boolean = false;
+
     /**
      * Gets the child items from the server.
      *
@@ -200,7 +205,8 @@ export class LocationTreeItemProvider implements ITreeItemProvider {
             guid: toGuidOrNull(parentGuid) ?? emptyGuid,
             rootLocationGuid: this.rootLocationGuid ?? emptyGuid,
             expandToValues: expandToValues,
-            securityGrantToken: this.securityGrantToken
+            securityGrantToken: this.securityGrantToken,
+            includeInactive: this.includeInactive,
         };
         const url = "/api/v2/Controls/LocationItemPickerGetActiveChildren";
         const response = await this.http.post<TreeItemBag[]>(url, undefined, options);

Rock.JavaScript.Obsidian/Framework/ViewModels/Blocks/CheckIn/Manager/CheckInContextSetter/checkInContextSetterOptionsBag.d.ts

@@ -29,6 +29,13 @@ export type CheckInContextSetterOptionsBag = {
     /** The list of campuses to display in the dropdown. */
     campuses?: ListItemBag[] | null;
 
+    /**
+     * When a context item changes, this will cause the page to redirect
+     * back to itself so that the new context can be applied to legacy
+     * WebForms blocks.
+     */
+    isRedirectRequired: boolean;
+
     /** The root locations to use for the location picker. */
     rootLocations?: Record<Guid, Guid> | null;
 

Rock.JavaScript.Obsidian/Framework/ViewModels/Rest/Controls/locationItemPickerGetActiveChildrenOptionsBag.d.ts

@@ -43,6 +43,9 @@ export type LocationItemPickerGetActiveChildrenOptionsBag = {
      */
     guid: Guid;
 
+    /** Determines if inactive locations should be included in the results. */
+    includeInactive: boolean;
+
     /**
      * Gets or sets the root location unique identifier. This is used if Rock.ViewModels.Rest.Controls.LocationItemPickerGetActiveChildrenOptionsBag.Guid
      * is empty to specify the root location to limit the tree to.

Rock.Rest/v2/ControlsController.cs

@@ -7740,7 +7740,8 @@ public IActionResult LocationItemPickerGetActiveChildren( [FromBody] LocationIte
                     grant,
                     locationService,
                     LocationItemPickerGetAutoExpandGuids( options.ExpandToValues ),
-                    0 );
+                    0,
+                    options.IncludeInactive );
 
                 return Ok( locationNameList );
             }
@@ -7792,8 +7793,9 @@ private List<Guid> LocationItemPickerGetAutoExpandGuids( List<string> selectedVa
         /// <param name="locationService">The service to use when accessing the database.</param>
         /// <param name="autoExpandGuids">The unique identifiers of the items to automatically expand.</param>
         /// <param name="depth">The current depth for recursion safety.</param>
+        /// <param name="includeInactive">Whether to include inactive locations.</param>
         /// <returns>A list of tree items.</returns>
-        private List<TreeItemBag> LocationItemPickerGetChildrenInternal( Guid parentLocationGuid, Guid rootLocationGuid, SecurityGrant grant, LocationService locationService, List<Guid> autoExpandGuids, int depth )
+        private List<TreeItemBag> LocationItemPickerGetChildrenInternal( Guid parentLocationGuid, Guid rootLocationGuid, SecurityGrant grant, LocationService locationService, List<Guid> autoExpandGuids, int depth, bool includeInactive )
         {
             if ( depth > 50 )
             {
@@ -7817,7 +7819,10 @@ private List<TreeItemBag> LocationItemPickerGetChildrenInternal( Guid parentLoca
             }
 
             // limit to only active locations.
-            qry = qry.Where( a => a.IsActive );
+            if ( !includeInactive )
+            {
+                qry = qry.Where( a => a.IsActive );
+            }
 
             // limit to only Named Locations (don't show home addresses, etc)
             qry = qry.Where( a => a.Name != null && a.Name != string.Empty );
@@ -7839,7 +7844,7 @@ private List<TreeItemBag> LocationItemPickerGetChildrenInternal( Guid parentLoca
 
                     if ( autoExpandGuids.Contains( location.Guid ) )
                     {
-                        treeViewItem.Children = LocationItemPickerGetChildrenInternal( location.Guid, Guid.Empty, grant, locationService, autoExpandGuids, depth + 1 );
+                        treeViewItem.Children = LocationItemPickerGetChildrenInternal( location.Guid, Guid.Empty, grant, locationService, autoExpandGuids, depth + 1, includeInactive );
                     }
                 }
             }

Rock.ViewModels/Blocks/CheckIn/Manager/CheckInContextSetter/CheckInContextSetterOptionsBag.cs

@@ -56,5 +56,12 @@ public class CheckInContextSetterOptionsBag
         /// The selected schedule when the block loaded.
         /// </summary>
         public ListItemBag SelectedSchedule { get; set; }
+
+        /// <summary>
+        /// When a context item changes, this will cause the page to redirect
+        /// back to itself so that the new context can be applied to legacy
+        /// WebForms blocks.
+        /// </summary>
+        public bool IsRedirectRequired { get; set; }
     }
 }

Rock.ViewModels/Rest/Controls/LocationItemPickerGetActiveChildrenOptionsBag.cs

@@ -56,5 +56,10 @@ public class LocationItemPickerGetActiveChildrenOptionsBag
         /// </summary>
 
         public List<string> ExpandToValues { get; set; }
+
+        /// <summary>
+        /// Determines if inactive locations should be included in the results.
+        /// </summary>
+        public bool IncludeInactive { get; set; }
     }
 }