wip

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

@@ -2,10 +2,131 @@
 
 namespace App\Filament\Company\Pages\Concerns;
 
+use Filament\Actions\Action;
+use Filament\Forms\Components\DatePicker;
+use Filament\Forms\Form;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
 
 trait HasDeferredFiltersForm
 {
+    /**
+     * @var array<string, mixed> | null
+     */
+    public ?array $filters = null;
+
+    /**
+     * @var array<string, mixed> | null
+     */
+    public ?array $deferredFilters = null;
+
+    public function mountHasDeferredFiltersForm(): void
+    {
+        $this->initializeDefaultFilters();
+
+        $this->initializeFilters();
+    }
+
+    protected function initializeDefaultFilters(): void
+    {
+        //
+    }
+
+    public function initializeFilters(): void
+    {
+        if (! count($this->filters ?? [])) {
+            $this->filters = null;
+        }
+
+        $this->getFiltersForm()->fill($this->filters);
+    }
+
+    protected function getHasDeferredFiltersFormForms(): array
+    {
+        return [
+            'filtersForm' => $this->getFiltersForm(),
+        ];
+    }
+
+    public function filtersForm(Form $form): Form
+    {
+        return $form;
+    }
+
+    public function getFiltersForm(): Form
+    {
+        return $this->filtersForm($this->makeForm()
+            ->statePath('deferredFilters'));
+    }
+
+    public function updatedFilters(): void
+    {
+        $this->deferredFilters = $this->filters;
+
+        $this->handleFilterUpdates();
+    }
+
+    protected function isValidDate($date): bool
+    {
+        return strtotime($date) !== false;
+    }
+
+    protected function handleFilterUpdates(): void
+    {
+        //
+    }
+
+    public function applyFilters(): void
+    {
+        $this->filters = $this->deferredFilters;
+
+        $this->handleFilterUpdates();
+
+        $this->loadReportData();
+    }
+
+    public function applyFiltersAction(): Action
+    {
+        return Action::make('applyFilters')
+            ->label('Update Report')
+            ->action('applyFilters')
+            ->keyBindings(['mod+s'])
+            ->button();
+    }
+
+    public function getFilterState(string $name): mixed
+    {
+        return Arr::get($this->filters, $name);
+    }
+
+    public function setFilterState(string $name, mixed $value): void
+    {
+        Arr::set($this->filters, $name, $value);
+    }
+
+    public function getDeferredFilterState(string $name): mixed
+    {
+        return Arr::get($this->deferredFilters, $name);
+    }
+
+    public function setDeferredFilterState(string $name, mixed $value): void
+    {
+        Arr::set($this->deferredFilters, $name, $value);
+    }
+
+    protected function convertDatesToDateTimeString(array $filters): array
+    {
+        if (isset($filters['startDate'])) {
+            $filters['startDate'] = Carbon::parse($filters['startDate'])->startOfDay()->toDateTimeString();
+        }
+
+        if (isset($filters['endDate'])) {
+            $filters['endDate'] = Carbon::parse($filters['endDate'])->endOfDay()->toDateTimeString();
+        }
+
+        return $filters;
+    }
+
     protected function queryStringHasDeferredFiltersForm(): array
     {
         // Get the filter keys dynamically from the filters form
@@ -49,14 +170,17 @@ trait HasDeferredFiltersForm
     protected function excludeQueryStrings(): array
     {
         return [
-            'dateRange', // Example: dateRange should not have 'as' and 'keep'
+            'dateRange',
         ];
     }
 
     public function dehydrateHasDeferredFiltersForm(): void
     {
+        $flatFields = $this->getFiltersForm()->getFlatFields();
+
         foreach ($this->filters as $key => $value) {
-            if ($this->isDateFilter($value)) {
+            if (isset($flatFields[$key]) && $flatFields[$key] instanceof DatePicker) {
+                // TODO: Submit a PR to Filament to address DatePicker being dehydrated as a datetime string in filters
                 $this->filters[$key] = Carbon::parse($value)->toDateString();
             }
         }

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

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Filament\Company\Pages\Concerns;
+
+use Filament\Actions\Action;
+use Filament\Forms\Form;
+use Filament\Support\Enums\ActionSize;
+use Filament\Support\Facades\FilamentIcon;
+
+trait HasToggleTableColumnForm
+{
+    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;
+    }
+
+    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');
+    }
+}

app/Filament/Company/Pages/Dashboard.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Filament\Company\Pages;
+
+use Filament\Forms\Components\DatePicker;
+use Filament\Forms\Components\Section;
+use Filament\Forms\Form;
+use Filament\Forms\Set;
+use Filament\Pages\Dashboard\Actions\FilterAction;
+use Filament\Pages\Dashboard\Concerns\HasFiltersAction;
+
+class Dashboard extends \Filament\Pages\Dashboard
+{
+    use HasFiltersAction;
+
+    //    public function filtersForm(Form $form): Form
+    //    {
+    //        return $form
+    //            ->schema([
+    //                Section::make()
+    //                    ->schema([
+    //                        DatePicker::make('startDate'),
+    //                        DatePicker::make('endDate'),
+    //                        // ...
+    //                    ])
+    //                    ->columns(3),
+    //            ]);
+    //    }
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            FilterAction::make()
+                ->form([
+                    DatePicker::make('startDate')
+                        ->live()
+                        ->afterStateUpdated(fn (Set $set) => $set('endDate', now()->toDateTimeString())),
+                    DatePicker::make('endDate'),
+                    // ...
+                ]),
+        ];
+    }
+}

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

@@ -5,6 +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\Forms\Components\DateRangeSelect;
 use App\Models\Company;
 use App\Services\DateRangeService;
@@ -17,11 +18,8 @@ use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Form;
 use Filament\Forms\Set;
 use Filament\Pages\Page;
-use Filament\Support\Enums\ActionSize;
 use Filament\Support\Enums\IconPosition;
 use Filament\Support\Enums\IconSize;
-use Filament\Support\Facades\FilamentIcon;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
 use Livewire\Attributes\Computed;
 use Livewire\Attributes\Session;
@@ -30,16 +28,7 @@ use Symfony\Component\HttpFoundation\StreamedResponse;
 abstract class BaseReportPage extends Page
 {
     use HasDeferredFiltersForm;
-
-    /**
-     * @var array<string, mixed> | null
-     */
-    public ?array $filters = null;
-
-    /**
-     * @var array<string, mixed> | null
-     */
-    public ?array $deferredFilters = null;
+    use HasToggleTableColumnForm;
 
     public string $fiscalYearStartDate;
 
@@ -71,114 +60,9 @@ abstract class BaseReportPage extends Page
 
         $this->loadDefaultDateRange();
 
-        $this->initializeDefaultFilters();
-
-        $this->initializeFilters();
-
         $this->loadDefaultTableColumnToggleState();
     }
 
-    protected function initializeDefaultFilters(): void
-    {
-        //
-    }
-
-    public function initializeFilters(): void
-    {
-        if (! count($this->filters ?? [])) {
-            $this->filters = null;
-        }
-
-        $this->getFiltersForm()->fill($this->filters);
-    }
-
-    protected function convertDatesToDateTimeString(array $filters): array
-    {
-        if (isset($filters['startDate'])) {
-            $filters['startDate'] = Carbon::parse($filters['startDate'])->startOfDay()->toDateTimeString();
-        }
-
-        if (isset($filters['endDate'])) {
-            $filters['endDate'] = Carbon::parse($filters['endDate'])->endOfDay()->toDateTimeString();
-        }
-
-        return $filters;
-    }
-
-    protected function getForms(): array
-    {
-        return [
-            'toggleTableColumnForm',
-            'filtersForm' => $this->getFiltersForm(),
-        ];
-    }
-
-    public function filtersForm(Form $form): Form
-    {
-        return $form;
-    }
-
-    public function getFiltersForm(): Form
-    {
-        return $this->filtersForm($this->makeForm()
-            ->statePath('deferredFilters'));
-    }
-
-    public function updatedFilters(): void
-    {
-        $this->deferredFilters = $this->filters;
-
-        $this->handleFilterUpdates();
-    }
-
-    protected function isValidDate($date): bool
-    {
-        return strtotime($date) !== false;
-    }
-
-    protected function handleFilterUpdates(): void
-    {
-        //
-    }
-
-    public function applyFilters(): void
-    {
-        $this->filters = $this->deferredFilters;
-
-        $this->handleFilterUpdates();
-
-        $this->loadReportData();
-    }
-
-    public function getFiltersApplyAction(): Action
-    {
-        return Action::make('applyFilters')
-            ->label('Update Report')
-            ->action('applyFilters')
-            ->keyBindings(['mod+s'])
-            ->button();
-    }
-
-    public function getFilterState(string $name): mixed
-    {
-        return Arr::get($this->filters, $name);
-    }
-
-    public function setFilterState(string $name, mixed $value): void
-    {
-        Arr::set($this->filters, $name, $value);
-    }
-
-    public function getDeferredFilterState(string $name): mixed
-    {
-        return Arr::get($this->deferredFilters, $name);
-    }
-
-    public function setDeferredFilterState(string $name, mixed $value): void
-    {
-        Arr::set($this->deferredFilters, $name, $value);
-    }
-
     protected function initializeProperties(): void
     {
         $this->company = auth()->user()->currentCompany;
@@ -275,21 +159,10 @@ abstract class BaseReportPage extends Page
         return Carbon::parse($this->getFilterState('endDate'))->endOfDay()->toDateTimeString();
     }
 
-    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');
-    }
-
     public function toggleTableColumnForm(Form $form): Form
     {
         return $form
-            ->schema($this->getTableColumnToggleFormSchema())
-            ->statePath('toggledTableColumns');
+            ->schema($this->getTableColumnToggleFormSchema());
     }
 
     protected function hasToggleableColumns(): bool

app/Listeners/ConfigureCompanyDefault.php

@@ -71,17 +71,21 @@ class ConfigureCompanyDefault
         Tab::configureUsing(static function (Tab $tab) {
             $label = $tab->getLabel();
 
-            $translatedLabel = translate($label);
+            if ($label) {
+                $translatedLabel = translate($label);
 
-            $tab->label(ucwords($translatedLabel));
+                $tab->label(ucwords($translatedLabel));
+            }
         }, isImportant: true);
 
         Section::configureUsing(static function (Section $section): void {
             $heading = $section->getHeading();
 
-            $translatedHeading = translate($heading);
+            if ($heading) {
+                $translatedHeading = translate($heading);
 
-            $section->heading(ucfirst($translatedHeading));
+                $section->heading(ucfirst($translatedHeading));
+            }
         }, isImportant: true);
 
         ResourcesTab::configureUsing(static function (ResourcesTab $tab): void {

app/Providers/FilamentCompaniesServiceProvider.php

@@ -42,7 +42,6 @@ use Filament\Http\Middleware\DisableBladeIconComponents;
 use Filament\Http\Middleware\DispatchServingFilamentEvent;
 use Filament\Navigation\NavigationBuilder;
 use Filament\Navigation\NavigationGroup;
-use Filament\Pages;
 use Filament\Pages\Dashboard;
 use Filament\Panel;
 use Filament\PanelProvider;
@@ -148,9 +147,7 @@ class FilamentCompaniesServiceProvider extends PanelProvider
             ->discoverResources(in: app_path('Filament/Company/Resources'), for: 'App\\Filament\\Company\\Resources')
             ->discoverPages(in: app_path('Filament/Company/Pages'), for: 'App\\Filament\\Company\\Pages')
             ->discoverClusters(in: app_path('Filament/Company/Clusters'), for: 'App\\Filament\\Company\\Clusters')
-            ->pages([
-                Pages\Dashboard::class,
-            ])
+            ->pages([])
             ->authGuard('web')
             ->discoverWidgets(in: app_path('Filament/Company/Widgets'), for: 'App\\Filament\\Company\\Widgets')
             ->widgets([

resources/views/filament/company/pages/reports/income-statement.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>