From 97eb09db6cf840c02386e7d55353648aa0ef3820 Mon Sep 17 00:00:00 2001
From: alloylab <trevor@alloylab.com>
Date: Thu, 19 Dec 2024 05:52:23 -0600
Subject: [PATCH] Summary Fixes

Fixes incorrect labels on footer blade, addresses issue in DataSourceBase with Summaries not displaying, and updates PowerGridComponent so summaries update with changes to the table
---
 resources/views/components/table-footer.blade.php | 6 +++---
 src/DataSource/Processors/DataSourceBase.php      | 7 +++++--
 src/PowerGridComponent.php                        | 5 +++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/resources/views/components/table-footer.blade.php b/resources/views/components/table-footer.blade.php
index 3480b35e..a496ce0f 100644
--- a/resources/views/components/table-footer.blade.php
+++ b/resources/views/components/table-footer.blade.php
@@ -1,6 +1,6 @@
 {{-- blade-formatter-enable --}}
 <tr
-    class="{{ theme_style($theme, 'table.header.tr') }}"
+    class="{{ theme_style($theme, 'table.footer.tr') }}"
 >
     @if (data_get($setUp, 'detail.showCollapseIcon'))
         <td
@@ -20,10 +20,10 @@ class="{{ theme_style($theme, 'table.body.tdSummarize') . ' ' . data_get($column
                 'labelSum' =>  data_get($column, 'properties.summarize.sum.label'),
 
                 'count' =>  data_get($column, 'properties.summarize.count.footer') ? data_get($column, 'properties.summarize_values.count') : null,
-                'labelCount' =>  data_get($column, 'properties.summarize.count.footer'),
+                'labelCount' =>  data_get($column, 'properties.summarize.count.label'),
 
                 'min' =>  data_get($column, 'properties.summarize.min.footer') ? data_get($column, 'properties.summarize_values.min') : null,
-                'labelMin' =>  data_get($column, 'properties.summarize.min.footer'),
+                'labelMin' =>  data_get($column, 'properties.summarize.min.label'),
 
                 'max' =>  data_get($column, 'properties.summarize.max.footer') ? data_get($column, 'properties.summarize_values.max') : null,
                 'labelMax' =>  data_get($column, 'properties.summarize.max.label'),
diff --git a/src/DataSource/Processors/DataSourceBase.php b/src/DataSource/Processors/DataSourceBase.php
index d8a4d349..77469a1e 100644
--- a/src/DataSource/Processors/DataSourceBase.php
+++ b/src/DataSource/Processors/DataSourceBase.php
@@ -229,13 +229,15 @@ protected function applySummaries(MorphToMany|EloquentBuilder|BaseCollection|Que
                             throw new \InvalidArgumentException('Summary Formatter expects a callable function, ' . gettype($formattingClosure) . ' given instead.');
                         }
 
-                        if (in_array($fieldName, [$column->field, $column->dataField])) {
+                        if (in_array($fieldName, [$column['field'], $column['dataField']])) {
                             $value = $formattingClosure($value);
                         }
 
                         data_set($column, 'properties.summarize_values.' . $summarizeMethod, $value);
                     }
                 }
+
+                return $column;
             }
         };
 
@@ -248,7 +250,8 @@ protected function applySummaries(MorphToMany|EloquentBuilder|BaseCollection|Que
                 foreach ($summaries as $summary) {
                     if (data_get($column, 'properties.summarize.' . $summary . '.header') || data_get($column, 'properties.summarize.' . $summary . '.footer')) {
                         $value = $results->{$summary}($field);
-                        rescue(fn () => $applySummaryFormat($summary, $column, $field, $value), report: false);
+                        $newColumn = rescue(fn () => $applySummaryFormat($summary, $column, $field, $value), report: false);
+                        $column = is_null($newColumn) ? $column : $newColumn;
                     }
                 }
 
diff --git a/src/PowerGridComponent.php b/src/PowerGridComponent.php
index 8ff215f5..398fac30 100644
--- a/src/PowerGridComponent.php
+++ b/src/PowerGridComponent.php
@@ -71,6 +71,11 @@ public function hydrate(): void
         DataSourceBase::$actionsHtml = [];
     }
 
+    public function dehydrate(): void
+    {
+        $this->columns = $this->columns();
+    }
+
     public function fetchDatasource(): void
     {
         $this->readyToLoad = true;