updated export action

josh48202 · Nov 20, 2024 · 5192a83 · 5192a83
1 parent 46e56be
commit 5192a83
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -29,6 +29,7 @@
     "require": {
         "php" : "^8.0",
         "spatie/laravel-package-tools": "^1.0|^1.13",
-        "maatwebsite/excel": "^3.1"
+        "maatwebsite/excel": "^3.1",
+        "filament/filament": "^3.2"
     }
 }
diff --git a/src/Actions/ReportExportAction.php b/src/Actions/ReportExportAction.php
@@ -44,9 +44,15 @@ protected function setUp(): void
 
             $query = $exporter::modifyQuery($query);
 
+            $options = array_merge(
+                $action->getOptions(),
+                Arr::except($data, ['columnMap']),
+            );
+
             if ($this->modifyQueryUsing) {
                 $query = $this->evaluate($this->modifyQueryUsing, [
                     'query' => $query,
+                    'options' => $options,
                 ]) ?? $query;
             }
 
@@ -69,11 +75,6 @@ protected function setUp(): void
 
             $user = auth()->user();
 
-            $options = array_merge(
-                $action->getOptions(),
-                Arr::except($data, ['columnMap']),
-            );
-
             if ($action->hasColumnMapping()) {
                 $columnMap = collect($data['columnMap'])
                     ->dot()
@@ -132,14 +133,14 @@ protected function setUp(): void
             ]);
 
             Bus::chain([
-                Bus::batch([new $job(
-                    $export,
-                    query: $serializedQuery,
-                    columnMap: $columnMap,
-                    options: $options,
-                    chunkSize: $action->getChunkSize(),
-                    records: $action instanceof ExportTableBulkAction ? $action->getRecords()->all() : null,
-                )])
+                Bus::batch([app($job, [
+                    'export' => $export,
+                    'query' => $serializedQuery,
+                    'columnMap' => $columnMap,
+                    'options' => $options,
+                    'chunkSize' => $action->getChunkSize(),
+                    'records' => $action instanceof ExportTableBulkAction ? $action->getRecords()->all() : null,
+                ])])
                     ->when(
                         filled($jobQueue),
                         fn (PendingBatch $batch) => $batch->onQueue($jobQueue),
@@ -177,7 +178,6 @@ protected function setUp(): void
                 ->body(trans_choice('filament-actions::export.notifications.started.body', $export->total_rows, [
                     'count' => Number::format($export->total_rows),
                 ]))
-                ->duration(2000)
                 ->success()
                 ->send();
         });

diff --git a/src/Resources/ReportResource/Pages/ViewReport.php b/src/Resources/ReportResource/Pages/ViewReport.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Support\Str;
 use Wjbecker\FilamentReportBuilder\Actions\ReportExportAction;
-use Wjbecker\FilamentReportBuilder\Exports\Jobs\PrepareCsvExport;
 use Wjbecker\FilamentReportBuilder\Exports\ReportExporter;
 use Wjbecker\FilamentReportBuilder\Resources\ReportResource;
 use Wjbecker\FilamentReportBuilder\Models\Report;
@@ -40,6 +39,7 @@ protected function getHeaderActions(): array
         return [
             ReportExportAction::make()->label('Export')
                 ->exporter(ReportExporter::class)
+                ->chunkSize(1000)
                 ->record($this->record)
                 ->columnMapping(false)
                 ->fileName(function() {