+ (Finance) Fixed issue with Batch Detail page where the Transaction …

…List block was not updated to reflect the Batch status after an update. (Fixes #5601)
SparkDevNetwork · Nov 28, 2023 · e3e7a21 · e3e7a21
1 parent b6bd571
commit e3e7a21
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/Rock.Blocks/Finance/FinancialBatchDetail.cs b/Rock.Blocks/Finance/FinancialBatchDetail.cs
@@ -531,6 +531,7 @@ public BlockActionResult Save( DetailBlockBox<FinancialBatchBag, FinancialBatchD
                 }
 
                 var isNew = entity.Id == 0;
+                var isStatusChanged = box.Entity.Status != entity.Status;
 
                 var changes = new History.HistoryChangeList();
                 if ( isNew )
@@ -585,6 +586,22 @@ public BlockActionResult Save( DetailBlockBox<FinancialBatchBag, FinancialBatchD
                     } ) );
                 }
 
+                /**
+                 * 11/18/2023 - KA
+                 * If the status has been updated return current page url to trigger
+                 * a page refresh on the client. The Batch Detail block is typically
+                 * used with the Transaction List block and an update may be required
+                 * to reflect the change in the batch's status. This will required some
+                 * refactoring once Obsidian blocks can signal each other.
+                 */
+                if ( isStatusChanged )
+                {
+                    return ActionOk( this.GetCurrentPageUrl( new Dictionary<string, string>
+                    {
+                        [PageParameterKey.BatchId] = entity.IdKey
+                    } ) );
+                }
+
                 // Ensure navigation properties will work now.
                 entity = entityService.Get( entity.Id );
 

diff --git a/Rock.JavaScript.Obsidian.Blocks/src/Finance/financialBatchDetail.obs b/Rock.JavaScript.Obsidian.Blocks/src/Finance/financialBatchDetail.obs
@@ -286,7 +286,7 @@
 
                 return true;
             }
-            else if (result.statusCode === 201 && typeof result.data === "string") {
+            else if ((result.statusCode === 201 || result.statusCode === 200) && typeof result.data === "string") {
                 return result.data;
             }
         }