Merge pull request #1 from yajra/develop

0.1.0 Initial version.

Author: yajra

README.md

@@ -48,7 +48,7 @@ php artisan migrate
 1. Add the export-button livewire component on your view file that uses dataTable class.
 
 ```phpt
-<livewire:export-button :table-id="$dataTable->getTableAttribute('id')" />
+<livewire:export-button :table-id="$dataTable->getTableId()" />
 ```
 
 2. On your `DataTable` class instance, use `WithExportQueue`
@@ -66,6 +66,27 @@ class PermissionsDataTable extends DataTable
 
 3. Run your queue worker via `php artisan queue:work`.
 
+## Export Filename
+
+You can set the export filename by setting the property.
+
+```phpt
+<livewire:export-button :table-id="$dataTable->getTableId()" filename="my-table.xlsx" />
+<livewire:export-button :table-id="$dataTable->getTableId()" filename="my-table.csv" />
+
+<livewire:export-button :table-id="$dataTable->getTableId()" :filename="$filename" />
+```
+
+## Export Type
+
+You can set the export type by setting the property to `csv` or `xlsx`. Default value is `csv`.
+
+```phpt
+<livewire:export-button :table-id="$dataTable->getTableId()" type="xlsx" />
+<livewire:export-button :table-id="$dataTable->getTableId()" type="csv" />
+```
+
+
 ## Contributing
 
 Please see [CONTRIBUTING](https://github.com/yajra/laravel-datatables-export/blob/master/.github/CONTRIBUTING.md) for details.

composer.json

@@ -5,7 +5,9 @@
     "laravel",
     "datatables",
     "export",
-    "jquery"
+    "excel",
+    "livewire",
+    "queue"
   ],
   "license": "MIT",
   "authors": [
@@ -17,9 +19,8 @@
   "require": {
     "php": ">=7.4|8.*",
     "yajra/laravel-datatables-buttons": "4.*",
-    "maatwebsite/excel": "^3.0",
-    "livewire/livewire": "^2.6",
-    "laravel/framework": "^8.61"
+    "yajra/laravel-datatables-html": "^4.40",
+    "livewire/livewire": "2.*"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.5.9"

src/Exports/DataTableQueuedExport.php

@@ -31,7 +31,7 @@ public function map($row): array
     {
         return $this->columns
             ->map(function (Column $column) use ($row) {
-                return $row[$column['name']];
+                return $row[$column['data']];
             })
             ->toArray();
     }

src/Livewire/ExportButtonComponent.php

@@ -4,10 +4,12 @@
 
 use Illuminate\Support\Facades\Bus;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 use Livewire\Component;
 
 class ExportButtonComponent extends Component
 {
+    public $class = 'btn btn-primary';
     public $tableId;
     public $type = 'csv';
     public $filename = null;
@@ -46,19 +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()
+        ]);
     }
 
-    /**
-     * @return string
-     */
     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/WithExportQueue.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Support\Facades\Bus;
 use Yajra\DataTables\Jobs\DataTableExportJob;
-use Yajra\DataTables\Services\DataTable;
 
 trait WithExportQueue
 {
@@ -18,19 +17,11 @@ trait WithExportQueue
      */
     public function render($view, $data = [], $mergeData = [])
     {
-        if ($this->request()->ajax() && $this->request()->wantsJson()) {
-            return app()->call([$this, 'ajax']);
+        if (! $this->request()->wantsJson() && $this->request()->get('action') == 'exportQueue') {
+            return $this->exportQueue();
         }
 
-        if ($action = $this->request()->get('action') and in_array($action, array_merge($this->actions, ['exportQueue']))) {
-            if ($action == 'print') {
-                return app()->call([$this, 'printPreview']);
-            }
-
-            return app()->call([$this, $action]);
-        }
-
-        return view($view, $data, $mergeData)->with($this->dataTableVariable, $this->getHtmlBuilder());
+        return parent::render($view, $data, $mergeData);
     }
 
     /**

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

@@ -3,15 +3,19 @@
           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;
+                    $wire.exporting = false;
+                    $wire.exportFailed = true;
                 });
               "
     >
         <button type="submit"
                 x-ref="exportBtn"
                 :disabled="$wire.exporting"
-                class="btn btn-primary"
+                class="{{ $class }}"
         >Export</button>
     </form>