Merge pull request #59 from andrewdwallo/development-3.x

Defer report initial page load

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

@@ -41,6 +41,8 @@ abstract class BaseReportPage extends Page
 
     public Company $company;
 
+    public bool $reportLoaded = false;
+
     #[Session]
     public array $toggledTableColumns = [];
 
@@ -63,8 +65,6 @@ abstract class BaseReportPage extends Page
 
         $this->loadDefaultDateRange();
 
-        $this->loadReportData();
-
         $this->loadDefaultTableColumnToggleState();
     }
 
@@ -94,6 +94,7 @@ abstract class BaseReportPage extends Page
     public function loadReportData(): void
     {
         unset($this->report);
+        $this->reportLoaded = true;
     }
 
     protected function loadDefaultTableColumnToggleState(): void
@@ -142,8 +143,12 @@ abstract class BaseReportPage extends Page
     }
 
     #[Computed(persist: true)]
-    public function report(): ExportableReport
+    public function report(): ?ExportableReport
     {
+        if ($this->reportLoaded === false) {
+            return null;
+        }
+
         $columns = $this->getToggledColumns();
         $reportDTO = $this->buildReport($columns);
 

app/Services/ExportService.php

@@ -12,19 +12,24 @@ class ExportService
 {
     public function exportToCsv(Company $company, ExportableReport $report, string $startDate, string $endDate): StreamedResponse
     {
-        $filename = $company->name . ' ' . $report->getTitle() . ' ' . $startDate . ' to ' . $endDate . '.csv';
+        $formattedStartDate = Carbon::parse($startDate)->format('Y-m-d');
+        $formattedEndDate = Carbon::parse($endDate)->format('Y-m-d');
+
+        $timestamp = Carbon::now()->format('Y-m-d-H_i');
+
+        $filename = $company->name . ' ' . $report->getTitle() . ' ' . $formattedStartDate . ' to ' . $formattedEndDate . ' ' . $timestamp . '.csv';
 
         $headers = [
             'Content-Type' => 'text/csv',
             'Content-Disposition' => 'attachment; filename="' . $filename . '"',
         ];
 
-        $callback = function () use ($report, $company, $startDate, $endDate) {
+        $callback = function () use ($report, $company, $formattedStartDate, $formattedEndDate) {
             $file = fopen('php://output', 'wb');
 
             fputcsv($file, [$report->getTitle()]);
             fputcsv($file, [$company->name]);
-            fputcsv($file, ['Date Range: ' . $startDate . ' to ' . $endDate]);
+            fputcsv($file, ['Date Range: ' . $formattedStartDate . ' to ' . $formattedEndDate]);
             fputcsv($file, []);
 
             fputcsv($file, $report->getHeaders());
@@ -50,15 +55,22 @@ class ExportService
 
     public function exportToPdf(Company $company, ExportableReport $report, string $startDate, string $endDate): StreamedResponse
     {
+        $formattedStartDate = Carbon::parse($startDate)->format('Y-m-d');
+        $formattedEndDate = Carbon::parse($endDate)->format('Y-m-d');
+
+        $timestamp = Carbon::now()->format('Y-m-d-H_i');
+
+        $filename = $company->name . ' ' . $report->getTitle() . ' ' . $formattedStartDate . ' to ' . $formattedEndDate . ' ' . $timestamp . '.pdf';
+
         $pdf = Pdf::loadView('components.company.reports.report-pdf', [
             'company' => $company,
             'report' => $report,
             'startDate' => Carbon::parse($startDate)->format('M d, Y'),
             'endDate' => Carbon::parse($endDate)->format('M d, Y'),
-        ])->setPaper('a4');
+        ])->setPaper('letter');
 
         return response()->streamDownload(function () use ($pdf) {
             echo $pdf->stream();
-        }, strtolower(str_replace(' ', '-', $company->name . '-' . $report->getTitle())) . '.pdf');
+        }, $filename);
     }
 }

resources/views/components/company/reports/report-pdf.blade.php

@@ -6,8 +6,8 @@
     <title>{{ $report->getTitle() }}</title>
     <style>
         @page {
-            size: A4;
-            margin: 8.5mm 8.5mm 30mm 8.5mm;
+            size: auto;
+            margin: 10mm 7.5mm;
         }
 
         .header {
@@ -15,6 +15,10 @@
             margin-bottom: 1rem;
         }
 
+        .header > * + * {
+            margin-top: 0.5rem;
+        }
+
         .table-head {
             display: table-row-group;
         }
@@ -36,12 +40,6 @@
             color: #374151;
         }
 
-        .header .title,
-        .header .company-name,
-        .header .date-range {
-            margin-bottom: 0.125rem; /* Uniform space between header elements */
-        }
-
         .title {
             font-size: 1.5rem;
         }

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

@@ -17,14 +17,16 @@
                 </form>
             </div>
             <div class="divide-y divide-gray-200 overflow-x-auto overflow-y-hidden dark:divide-white/10 dark:border-t-white/10">
-                <div class="flex items-center justify-center">
+                <div wire:init="loadReportData" class="flex items-center justify-center">
                     <div wire:loading.delay wire:target="loadReportData">
                         <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300" />
                     </div>
                 </div>
 
                 <div wire:loading.remove wire:target="loadReportData">
-                    <x-company.tables.reports.detailed-report :report="$this->report" />
+                    @if($this->report)
+                        <x-company.tables.reports.detailed-report :report="$this->report" />
+                    @endif
                 </div>
             </div>
             <div class="es-table__footer-ctn border-t border-gray-200"></div>