wip

app/Filament/Company/Pages/Concerns/HasToggleTableColumnForm.php

@@ -2,13 +2,24 @@
 
 namespace App\Filament\Company\Pages\Concerns;
 
+use App\Support\Column;
 use Filament\Actions\Action;
+use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Form;
 use Filament\Support\Enums\ActionSize;
 use Filament\Support\Facades\FilamentIcon;
+use Livewire\Attributes\Session;
 
 trait HasToggleTableColumnForm
 {
+    #[Session]
+    public array $toggledTableColumns = [];
+
+    public function mountHasToggleTableColumnForm(): void
+    {
+        $this->loadDefaultTableColumnToggleState();
+    }
+
     protected function getHasToggleTableColumnFormForms(): array
     {
         return [
@@ -27,6 +38,28 @@ trait HasToggleTableColumnForm
         return $form;
     }
 
+    protected function hasToggleableColumns(): bool
+    {
+        return ! empty($this->getTableColumnToggleFormSchema());
+    }
+
+    /**
+     * @return array<Checkbox>
+     */
+    protected function getTableColumnToggleFormSchema(): array
+    {
+        $schema = [];
+
+        foreach ($this->getTable() as $column) {
+            if ($column->isToggleable()) {
+                $schema[] = Checkbox::make($column->getName())
+                    ->label($column->getLabel());
+            }
+        }
+
+        return $schema;
+    }
+
     public function toggleColumnsAction(): Action
     {
         return Action::make('toggleColumns')
@@ -36,4 +69,38 @@ trait HasToggleTableColumnForm
             ->icon(FilamentIcon::resolve('tables::actions.toggle-columns') ?? 'heroicon-m-view-columns')
             ->color('gray');
     }
+
+    protected function loadDefaultTableColumnToggleState(): void
+    {
+        $tableColumns = $this->getTable();
+
+        foreach ($tableColumns as $column) {
+            $columnName = $column->getName();
+
+            if (empty($this->toggledTableColumns)) {
+                if ($column->isToggleable()) {
+                    $this->toggledTableColumns[$columnName] = ! $column->isToggledHiddenByDefault();
+                } else {
+                    $this->toggledTableColumns[$columnName] = true;
+                }
+            }
+
+            // Handle cases where the toggle state needs to be reset
+            if (! $column->isToggleable()) {
+                $this->toggledTableColumns[$columnName] = true;
+            } elseif ($column->isToggleable() && $column->isToggledHiddenByDefault() && isset($this->toggledTableColumns[$columnName]) && $this->toggledTableColumns[$columnName]) {
+                $this->toggledTableColumns[$columnName] = false;
+            }
+        }
+    }
+
+    protected function getToggledColumns(): array
+    {
+        return array_values(
+            array_filter(
+                $this->getTable(),
+                fn (Column $column) => $this->toggledTableColumns[$column->getName()] ?? false,
+            )
+        );
+    }
 }

app/Filament/Company/Pages/Reports/BaseReportPage.php

@@ -12,7 +12,6 @@ use App\Services\DateRangeService;
 use App\Support\Column;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
-use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\Component;
 use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Form;
@@ -22,7 +21,6 @@ use Filament\Support\Enums\IconPosition;
 use Filament\Support\Enums\IconSize;
 use Illuminate\Support\Carbon;
 use Livewire\Attributes\Computed;
-use Livewire\Attributes\Session;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 abstract class BaseReportPage extends Page
@@ -38,9 +36,6 @@ abstract class BaseReportPage extends Page
 
     public bool $reportLoaded = false;
 
-    #[Session]
-    public array $toggledTableColumns = [];
-
     abstract protected function buildReport(array $columns): ReportDTO;
 
     abstract public function exportCSV(): StreamedResponse;
@@ -59,8 +54,6 @@ abstract class BaseReportPage extends Page
         $this->initializeProperties();
 
         $this->loadDefaultDateRange();
-
-        $this->loadDefaultTableColumnToggleState();
     }
 
     protected function initializeProperties(): void
@@ -91,45 +84,11 @@ abstract class BaseReportPage extends Page
         $this->reportLoaded = true;
     }
 
-    protected function loadDefaultTableColumnToggleState(): void
-    {
-        $tableColumns = $this->getTable();
-
-        foreach ($tableColumns as $column) {
-            $columnName = $column->getName();
-
-            if (empty($this->toggledTableColumns)) {
-                if ($column->isToggleable()) {
-                    $this->toggledTableColumns[$columnName] = ! $column->isToggledHiddenByDefault();
-                } else {
-                    $this->toggledTableColumns[$columnName] = true;
-                }
-            }
-
-            // Handle cases where the toggle state needs to be reset
-            if (! $column->isToggleable()) {
-                $this->toggledTableColumns[$columnName] = true;
-            } elseif ($column->isToggleable() && $column->isToggledHiddenByDefault() && isset($this->toggledTableColumns[$columnName]) && $this->toggledTableColumns[$columnName]) {
-                $this->toggledTableColumns[$columnName] = false;
-            }
-        }
-    }
-
     public function getDefaultDateRange(): string
     {
         return 'FY-' . now()->year;
     }
 
-    protected function getToggledColumns(): array
-    {
-        return array_values(
-            array_filter(
-                $this->getTable(),
-                fn (Column $column) => $this->toggledTableColumns[$column->getName()] ?? false,
-            )
-        );
-    }
-
     #[Computed(persist: true)]
     public function report(): ?ExportableReport
     {
@@ -165,28 +124,6 @@ abstract class BaseReportPage extends Page
             ->schema($this->getTableColumnToggleFormSchema());
     }
 
-    protected function hasToggleableColumns(): bool
-    {
-        return ! empty($this->getTableColumnToggleFormSchema());
-    }
-
-    /**
-     * @return array<Checkbox>
-     */
-    protected function getTableColumnToggleFormSchema(): array
-    {
-        $schema = [];
-
-        foreach ($this->getTable() as $column) {
-            if ($column->isToggleable()) {
-                $schema[] = Checkbox::make($column->getName())
-                    ->label($column->getLabel());
-            }
-        }
-
-        return $schema;
-    }
-
     protected function getHeaderActions(): array
     {
         return [

resources/views/filament/company/pages/reports/account-transactions.blade.php

@@ -1,6 +1,8 @@
 <x-filament-panels::page>
     <x-filament::section>
-        {{ $this->getFiltersForm() }}
+        @if(method_exists($this, 'filtersForm'))
+            {{ $this->filtersForm }}
+        @endif
     </x-filament::section>
 
     <x-filament-tables::container>

resources/views/filament/company/pages/reports/detailed-report.blade.php

@@ -2,9 +2,9 @@
     <x-filament::section>
         <div class="flex flex-col md:flex-row items-start md:items-center justify-between gap-4 md:gap-8">
             <!-- Form Container -->
-            <div class="flex-grow">
-                {{ $this->getFiltersForm() }}
-            </div>
+            @if(method_exists($this, 'filtersForm'))
+                {{ $this->filtersForm }}
+            @endif
 
             <!-- Grouping Button and Column Toggle -->
             <div class="flex flex-col md:flex-row items-start md:items-center gap-4 md:gap-8 flex-shrink-0">
@@ -14,7 +14,10 @@
                         :trigger-action="$this->toggleColumnsAction"
                     />
                 @endif
-                {{ $this->getFiltersApplyAction() }}
+            </div>
+
+            <div class="inline-flex items-center flex-shrink-0 min-w-[8.5rem] justify-end">
+                {{ $this->applyFiltersAction }}
             </div>
         </div>
     </x-filament::section>