wip

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

@@ -0,0 +1,117 @@
+<?php
+
+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 Illuminate\Support\Arr;
+
+trait HasTableColumnToggleForm
+{
+    public array $toggledTableColumns = [];
+
+    public function mountHasTableColumnToggleForm(): void
+    {
+        if (! count($this->toggledTableColumns ?? [])) {
+            $this->getTableColumnToggleForm()->fill(session()->get(
+                $this->getTableColumnToggleFormStateSessionKey(),
+                $this->getDefaultTableColumnToggleState()
+            ));
+        }
+    }
+
+    protected function getDefaultTableColumnToggleState(): array
+    {
+        $state = [];
+
+        foreach ($this->getTable() as $column) {
+            if (! $column->isToggleable()) {
+                continue;
+            }
+
+            data_set($state, $column->getName(), ! $column->isToggledHiddenByDefault());
+        }
+
+        return $state;
+    }
+
+    public function updatedToggledTableColumns(): void
+    {
+        session()->put([
+            $this->getTableColumnToggleFormStateSessionKey() => $this->toggledTableColumns,
+        ]);
+    }
+
+    public function getTableColumnToggleForm(): Form
+    {
+        if ((! $this->isCachingForms) && $this->hasCachedForm('toggleTableColumnForm')) {
+            return $this->getForm('toggleTableColumnForm');
+        }
+
+        return $this->makeForm()
+            ->schema($this->getTableColumnToggleFormSchema())
+            ->statePath('toggledTableColumns')
+            ->live();
+    }
+
+    protected function hasToggleableColumns(): bool
+    {
+        return ! empty($this->getTableColumnToggleFormSchema());
+    }
+
+    /**
+     * @return array<Checkbox>
+     */
+    protected function getTableColumnToggleFormSchema(): array
+    {
+        $schema = [];
+
+        foreach ($this->getTable() as $column) {
+            if (! $column->isToggleable()) {
+                continue;
+            }
+
+            $schema[] = Checkbox::make($column->getName())
+                ->label($column->getLabel());
+        }
+
+        return $schema;
+    }
+
+    public function isTableColumnToggledHidden(string $name): bool
+    {
+        return Arr::has($this->toggledTableColumns, $name) && ! data_get($this->toggledTableColumns, $name);
+    }
+
+    public function getTableColumnToggleFormStateSessionKey(): string
+    {
+        $table = class_basename($this::class);
+
+        return "tables.{$table}_toggled_columns";
+    }
+
+    public function getToggleColumnsTriggerAction(): Action
+    {
+        return Action::make('toggleColumns')
+            ->label(__('filament-tables::table.actions.toggle_columns.label'))
+            ->iconButton()
+            ->size(ActionSize::Large)
+            ->icon(FilamentIcon::resolve('tables::actions.toggle-columns') ?? 'heroicon-m-view-columns')
+            ->color('gray')
+            ->livewireClickHandlerEnabled(false);
+    }
+
+    protected function getToggledColumns(): array
+    {
+        return array_values(
+            array_filter(
+                $this->getTable(),
+                fn (Column $column) => ! $column->isToggleable() || ($this->toggledTableColumns[$column->getName()] ?? false)
+            )
+        );
+    }
+}

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

@@ -1,106 +0,0 @@
-<?php
-
-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 [
-            'toggleTableColumnForm' => $this->getToggleTableColumnForm(),
-        ];
-    }
-
-    public function getToggleTableColumnForm(): Form
-    {
-        return $this->toggleTableColumnForm($this->makeForm()
-            ->statePath('toggledTableColumns'));
-    }
-
-    public function toggleTableColumnForm(Form $form): Form
-    {
-        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')
-            ->label(__('filament-tables::table.actions.toggle_columns.label'))
-            ->iconButton()
-            ->size(ActionSize::Large)
-            ->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

@@ -5,7 +5,7 @@ namespace App\Filament\Company\Pages\Reports;
 use App\Contracts\ExportableReport;
 use App\DTO\ReportDTO;
 use App\Filament\Company\Pages\Concerns\HasDeferredFiltersForm;
-use App\Filament\Company\Pages\Concerns\HasToggleTableColumnForm;
+use App\Filament\Company\Pages\Concerns\HasTableColumnToggleForm;
 use App\Filament\Forms\Components\DateRangeSelect;
 use App\Models\Company;
 use App\Services\DateRangeService;
@@ -14,7 +14,6 @@ use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Forms\Components\Component;
 use Filament\Forms\Components\DatePicker;
-use Filament\Forms\Form;
 use Filament\Forms\Set;
 use Filament\Pages\Page;
 use Filament\Support\Enums\IconPosition;
@@ -26,7 +25,7 @@ use Symfony\Component\HttpFoundation\StreamedResponse;
 abstract class BaseReportPage extends Page
 {
     use HasDeferredFiltersForm;
-    use HasToggleTableColumnForm;
+    use HasTableColumnToggleForm;
 
     public string $fiscalYearStartDate;
 
@@ -118,12 +117,6 @@ abstract class BaseReportPage extends Page
         return Carbon::parse($this->getFilterState('endDate'))->endOfDay()->toDateTimeString();
     }
 
-    public function toggleTableColumnForm(Form $form): Form
-    {
-        return $form
-            ->schema($this->getTableColumnToggleFormSchema());
-    }
-
     protected function getHeaderActions(): array
     {
         return [

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.321.7",
+            "version": "3.321.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "c64ee32d80ec2ab5d8d6a0b77297c2d69602ef3b"
+                "reference": "df456658bdc2ad84a00cf35a7b5af874fdcc7a53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c64ee32d80ec2ab5d8d6a0b77297c2d69602ef3b",
-                "reference": "c64ee32d80ec2ab5d8d6a0b77297c2d69602ef3b",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/df456658bdc2ad84a00cf35a7b5af874fdcc7a53",
+                "reference": "df456658bdc2ad84a00cf35a7b5af874fdcc7a53",
                 "shasum": ""
             },
             "require": {
@@ -589,9 +589,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.321.7"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.321.8"
             },
-            "time": "2024-09-09T18:09:23+00:00"
+            "time": "2024-09-10T18:18:03+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -2852,16 +2852,16 @@
         },
         {
             "name": "kirschbaum-development/eloquent-power-joins",
-            "version": "3.5.7",
+            "version": "3.5.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/kirschbaum-development/eloquent-power-joins.git",
-                "reference": "3f57b398117d97bae4dfd5c37ea0f8f48f296c97"
+                "reference": "397ef08f15ceff48111fd7f57d9f1fd41bf1a453"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kirschbaum-development/eloquent-power-joins/zipball/3f57b398117d97bae4dfd5c37ea0f8f48f296c97",
-                "reference": "3f57b398117d97bae4dfd5c37ea0f8f48f296c97",
+                "url": "https://api.github.com/repos/kirschbaum-development/eloquent-power-joins/zipball/397ef08f15ceff48111fd7f57d9f1fd41bf1a453",
+                "reference": "397ef08f15ceff48111fd7f57d9f1fd41bf1a453",
                 "shasum": ""
             },
             "require": {
@@ -2908,9 +2908,9 @@
             ],
             "support": {
                 "issues": "https://github.com/kirschbaum-development/eloquent-power-joins/issues",
-                "source": "https://github.com/kirschbaum-development/eloquent-power-joins/tree/3.5.7"
+                "source": "https://github.com/kirschbaum-development/eloquent-power-joins/tree/3.5.8"
             },
-            "time": "2024-06-26T13:09:29+00:00"
+            "time": "2024-09-10T10:28:05+00:00"
         },
         {
             "name": "knplabs/knp-snappy",
@@ -4365,16 +4365,16 @@
         },
         {
             "name": "matomo/device-detector",
-            "version": "6.3.2",
+            "version": "6.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/matomo-org/device-detector.git",
-                "reference": "fd4042cb6a7f3f985a81aedc075dd59e0b991a51"
+                "reference": "05dca429cfe7b6a59947a0d449dbeb60cddc02f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/fd4042cb6a7f3f985a81aedc075dd59e0b991a51",
-                "reference": "fd4042cb6a7f3f985a81aedc075dd59e0b991a51",
+                "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/05dca429cfe7b6a59947a0d449dbeb60cddc02f2",
+                "reference": "05dca429cfe7b6a59947a0d449dbeb60cddc02f2",
                 "shasum": ""
             },
             "require": {
@@ -4430,7 +4430,7 @@
                 "source": "https://github.com/matomo-org/matomo",
                 "wiki": "https://dev.matomo.org/"
             },
-            "time": "2024-05-28T10:16:19+00:00"
+            "time": "2024-09-10T08:27:24+00:00"
         },
         {
             "name": "monolog/monolog",

package-lock.json

@@ -998,9 +998,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001659",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001659.tgz",
-            "integrity": "sha512-Qxxyfv3RdHAfJcXelgf0hU4DFUVXBGTjqrBUZLUh8AtlGnsDo+CnncYtTd95+ZKfnANUOzxyIQCuU/UeBZBYoA==",
+            "version": "1.0.30001660",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz",
+            "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==",
             "dev": true,
             "funding": [
                 {
@@ -1159,9 +1159,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.18",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.18.tgz",
-            "integrity": "sha512-1OfuVACu+zKlmjsNdcJuVQuVE61sZOLbNM4JAQ1Rvh6EOj0/EUKhMJjRH73InPlXSh8HIJk1cVZ8pyOV/FMdUQ==",
+            "version": "1.5.19",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.19.tgz",
+            "integrity": "sha512-kpLJJi3zxTR1U828P+LIUDZ5ohixyo68/IcYOHLqnbTPr/wdgn4i1ECvmALN9E16JPA6cvCG5UG79gVwVdEK5w==",
             "dev": true,
             "license": "ISC"
         },

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

@@ -9,8 +9,8 @@
             <!-- Grouping Button and Column Toggle -->
             @if($this->hasToggleableColumns())
                 <x-filament-tables::column-toggle.dropdown
-                    :form="$this->toggleTableColumnForm"
-                    :trigger-action="$this->toggleColumnsAction"
+                    :form="$this->getTableColumnToggleForm()"
+                    :trigger-action="$this->getToggleColumnsTriggerAction()"
                 />
             @endif
 

resources/views/filament/company/pages/reports/income-statement.blade.php

@@ -9,8 +9,8 @@
             <!-- Grouping Button and Column Toggle -->
             @if($this->hasToggleableColumns())
                 <x-filament-tables::column-toggle.dropdown
-                    :form="$this->toggleTableColumnForm"
-                    :trigger-action="$this->toggleColumnsAction"
+                    :form="$this->getTableColumnToggleForm()"
+                    :trigger-action="$this->getToggleColumnsTriggerAction()"
                 />
             @endif