wip

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

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Filament\Company\Pages\Concerns;
+
+use Illuminate\Support\Carbon;
+
+trait HasDeferredFiltersForm
+{
+    protected function queryStringHasDeferredFiltersForm(): array
+    {
+        // Get the filter keys dynamically from the filters form
+        $filterKeys = collect($this->getFiltersForm()->getFlatFields())->keys()->toArray();
+
+        return array_merge(
+            $this->generateQueryStrings($filterKeys),
+            $this->generateExcludedQueryStrings(),
+        );
+    }
+
+    protected function generateQueryStrings(array $filterKeys): array
+    {
+        $generatedQueryStrings = [];
+
+        $excludedKeys = $this->excludeQueryStrings();
+
+        foreach ($filterKeys as $key) {
+            if (! in_array($key, $excludedKeys)) {
+                $generatedQueryStrings["filters.{$key}"] = [
+                    'as' => $key,
+                    'keep' => true,
+                ];
+            }
+        }
+
+        return $generatedQueryStrings;
+    }
+
+    protected function generateExcludedQueryStrings(): array
+    {
+        $excludedQueryStrings = [];
+
+        foreach ($this->excludeQueryStrings() as $key) {
+            $excludedQueryStrings["filters.{$key}.value"] = null;
+        }
+
+        return $excludedQueryStrings;
+    }
+
+    protected function excludeQueryStrings(): array
+    {
+        return [
+            'dateRange', // Example: dateRange should not have 'as' and 'keep'
+        ];
+    }
+
+    public function dehydrateHasDeferredFiltersForm(): void
+    {
+        foreach ($this->filters as $key => $value) {
+            if ($this->isDateFilter($value)) {
+                $this->filters[$key] = Carbon::parse($value)->toDateString();
+            }
+        }
+    }
+
+    protected function isDateFilter($value): bool
+    {
+        return $value instanceof Carbon || strtotime($value) !== false;
+    }
+}

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

@@ -45,6 +45,11 @@ class AccountTransactions extends BaseReportPage
         }
     }
 
+    protected function extraQueryStrings(): array
+    {
+        return ['selectedAccount'];
+    }
+
     /**
      * @return array<Column>
      */

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

@@ -4,6 +4,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\Forms\Components\DateRangeSelect;
 use App\Models\Company;
 use App\Services\DateRangeService;
@@ -24,15 +25,15 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
 use Livewire\Attributes\Computed;
 use Livewire\Attributes\Session;
-use Livewire\Attributes\Url;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 abstract class BaseReportPage extends Page
 {
+    use HasDeferredFiltersForm;
+
     /**
      * @var array<string, mixed> | null
      */
-    #[Url]
     public ?array $filters = null;
 
     /**
@@ -88,17 +89,7 @@ abstract class BaseReportPage extends Page
             $this->filters = null;
         }
 
-        $filtersForForm = $this->filters !== null
-            ? $this->convertDatesToDateTimeString($this->filters)
-            : [];
-
-        $this->getFiltersForm()->fill($filtersForForm);
-
-        if ($this->filters !== null) {
-            $this->filters = $this->normalizeFilters($this->filters);
-        }
-
-        ray($this->filters);
+        $this->getFiltersForm()->fill($this->filters);
     }
 
     protected function convertDatesToDateTimeString(array $filters): array
@@ -152,26 +143,13 @@ abstract class BaseReportPage extends Page
 
     public function applyFilters(): void
     {
-        $this->filters = $this->normalizeFilters($this->deferredFilters);
+        $this->filters = $this->deferredFilters;
 
         $this->handleFilterUpdates();
 
         $this->loadReportData();
     }
 
-    protected function normalizeFilters(array $filters): array
-    {
-        foreach ($filters as $name => &$value) {
-            if ($name === 'dateRange') {
-                unset($filters[$name]);
-            } elseif ($this->isValidDate($value)) {
-                $value = Carbon::parse($value)->toDateString();
-            }
-        }
-
-        return $filters;
-    }
-
     public function getFiltersApplyAction(): Action
     {
         return Action::make('applyFilters')

app/Filament/Forms/Components/DateRangeSelect.php

@@ -116,7 +116,7 @@ class DateRangeSelect extends Select
 
     public function setDateRange(Carbon $start, Carbon $end, Set $set): void
     {
-        $set($this->startDateField, $start->startOfDay()->toDateString());
+        $set($this->startDateField, $start->startOfDay()->toDateTimeString());
         $set($this->endDateField, $end->isFuture() ? now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString());
     }
 }

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.321.4",
+            "version": "3.321.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "986326efde1d0598ec9fc1b185716550be8ef522"
+                "reference": "3dc53a79677dd1f0e682dfc05f9815901ec7bf58"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/986326efde1d0598ec9fc1b185716550be8ef522",
-                "reference": "986326efde1d0598ec9fc1b185716550be8ef522",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3dc53a79677dd1f0e682dfc05f9815901ec7bf58",
+                "reference": "3dc53a79677dd1f0e682dfc05f9815901ec7bf58",
                 "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.4"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.321.6"
             },
-            "time": "2024-09-04T18:09:31+00:00"
+            "time": "2024-09-06T18:06:38+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -4967,16 +4967,16 @@
         },
         {
             "name": "nunomaduro/termwind",
-            "version": "v2.0.1",
+            "version": "v2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/termwind.git",
-                "reference": "58c4c58cf23df7f498daeb97092e34f5259feb6a"
+                "reference": "e5f21eade88689536c0cdad4c3cd75f3ed26e01a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/58c4c58cf23df7f498daeb97092e34f5259feb6a",
-                "reference": "58c4c58cf23df7f498daeb97092e34f5259feb6a",
+                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/e5f21eade88689536c0cdad4c3cd75f3ed26e01a",
+                "reference": "e5f21eade88689536c0cdad4c3cd75f3ed26e01a",
                 "shasum": ""
             },
             "require": {
@@ -4986,11 +4986,11 @@
             },
             "require-dev": {
                 "ergebnis/phpstan-rules": "^2.2.0",
-                "illuminate/console": "^11.0.0",
-                "laravel/pint": "^1.14.0",
-                "mockery/mockery": "^1.6.7",
-                "pestphp/pest": "^2.34.1",
-                "phpstan/phpstan": "^1.10.59",
+                "illuminate/console": "^11.1.1",
+                "laravel/pint": "^1.15.0",
+                "mockery/mockery": "^1.6.11",
+                "pestphp/pest": "^2.34.6",
+                "phpstan/phpstan": "^1.10.66",
                 "phpstan/phpstan-strict-rules": "^1.5.2",
                 "symfony/var-dumper": "^7.0.4",
                 "thecodingmachine/phpstan-strict-rules": "^1.0.0"
@@ -5035,7 +5035,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nunomaduro/termwind/issues",
-                "source": "https://github.com/nunomaduro/termwind/tree/v2.0.1"
+                "source": "https://github.com/nunomaduro/termwind/tree/v2.1.0"
             },
             "funding": [
                 {
@@ -5051,7 +5051,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-06T16:17:14+00:00"
+            "time": "2024-09-05T15:25:50+00:00"
         },
         {
             "name": "openspout/openspout",
@@ -10103,16 +10103,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.12.1",
+            "version": "1.12.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "d8ed7fffa66de1db0d2972267d8ed1d8fa0fe5a2"
+                "reference": "0ca1c7bb55fca8fe6448f16fff0f311ccec960a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d8ed7fffa66de1db0d2972267d8ed1d8fa0fe5a2",
-                "reference": "d8ed7fffa66de1db0d2972267d8ed1d8fa0fe5a2",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0ca1c7bb55fca8fe6448f16fff0f311ccec960a1",
+                "reference": "0ca1c7bb55fca8fe6448f16fff0f311ccec960a1",
                 "shasum": ""
             },
             "require": {
@@ -10157,7 +10157,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-09-03T19:55:22+00:00"
+            "time": "2024-09-05T16:09:28+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",

package-lock.json

@@ -765,9 +765,9 @@
             ]
         },
         "node_modules/@tailwindcss/forms": {
-            "version": "0.5.8",
-            "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.8.tgz",
-            "integrity": "sha512-DJs7B7NPD0JH7BVvdHWNviWmunlFhuEkz7FyFxE4japOWYMLl9b1D6+Z9mivJJPWr6AEbmlPqgiFRyLwFB1SgQ==",
+            "version": "0.5.9",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.9.tgz",
+            "integrity": "sha512-tM4XVr2+UVTxXJzey9Twx48c1gcxFStqn1pQz0tRsX8o3DvxhN5oY5pvyAbUx7VTaZxpej4Zzvc6h+1RJBzpIg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -998,9 +998,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001655",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz",
-            "integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==",
+            "version": "1.0.30001658",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001658.tgz",
+            "integrity": "sha512-N2YVqWbJELVdrnsW5p+apoQyYt51aBMSsBZki1XZEfeBCexcM/sf4xiAHcXQBkuOwJBXtWF7aW1sYX6tKebPHw==",
             "dev": true,
             "funding": [
                 {
@@ -1159,9 +1159,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.13",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz",
-            "integrity": "sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==",
+            "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==",
             "dev": true,
             "license": "ISC"
         },
@@ -1275,9 +1275,9 @@
             }
         },
         "node_modules/follow-redirects": {
-            "version": "1.15.8",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.8.tgz",
-            "integrity": "sha512-xgrmBhBToVKay1q2Tao5LI26B83UhrB/vM1avwVSDzt8rx3rO6AizBAaF46EgksTVr+rFTQaqZZ9MVBfUe4nig==",
+            "version": "1.15.9",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+            "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
             "dev": true,
             "funding": [
                 {

resources/views/components/company/tables/reports/detailed-report.blade.php

@@ -35,9 +35,9 @@
                                         :icon-position="\Filament\Support\Enums\IconPosition::After"
                                         :icon-size="\Filament\Support\Enums\IconSize::Small"
                                         href="{{ \App\Filament\Company\Pages\Reports\AccountTransactions::getUrl([
-                                            'filters[startDate]' => $cell['start_date'],
-                                            'filters[endDate]' => $cell['end_date'],
-                                            'filters[selectedAccount]' => $cell['id']
+                                            'startDate' => $cell['start_date'],
+                                            'endDate' => $cell['end_date'],
+                                            'selectedAccount' => $cell['id']
                                         ]) }}"
                                     >
                                         {{ $cell['name'] }}