Compute export type based on filename if set.

Author: yajra

src/Livewire/ExportButtonComponent.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Facades\Bus;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 use Livewire\Component;
 
 class ExportButtonComponent extends Component
@@ -47,16 +48,31 @@ public function updateExportProgress()
 
     public function downloadExport()
     {
-        return Storage::download('exports/'.$this->batchJobId.'.'.$this->getType(), $this->filename);
+        return Storage::download('exports/'.$this->batchJobId.'.'.$this->getType(), $this->getFilename());
     }
 
     public function render()
     {
-        return view('datatables-export::export-button');
+        return view('datatables-export::export-button', [
+            'fileType' => $this->getType()
+        ]);
     }
 
     protected function getType(): string
     {
+        if (Str::endsWith($this->filename, ['csv', 'xlsx'])) {
+            return pathinfo($this->filename, PATHINFO_EXTENSION);
+        }
+
         return $this->type == 'csv' ? 'csv' : 'xlsx';
     }
+
+    protected function getFilename()
+    {
+        if (Str::endsWith($this->filename, ['csv', 'xlsx'])) {
+            return $this->filename;
+        }
+
+        return null;
+    }
 }

src/resources/views/export-button.blade.php

@@ -3,7 +3,7 @@
           x-on:submit.prevent="
                 $refs.exportBtn.disabled = true;
                 var url = window._buildUrl(LaravelDataTables['{{ $tableId }}'], 'exportQueue');
-                $.get(url + '&exportType={{$type}}').then(function(exportId) {
+                $.get(url + '&exportType={{$fileType}}').then(function(exportId) {
                     $wire.export(exportId)
                 }).catch(function(error) {
                     $wire.exportFinished = true;