Merge pull request #45 from uchajk/master

feat: add ability to use s3 storage

Author: yajra

src/Jobs/DataTableExportJob.php

@@ -11,6 +11,7 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Http\File;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Arr;
@@ -179,6 +180,10 @@ public function handle()
         }
 
         $writer->close();
+
+        if($this->getS3Disk()) {
+            Storage::disk($this->getS3Disk())->putFileAs('', (new File($path)), $filename);
+        }
     }
 
     /**
@@ -189,6 +194,14 @@ protected function getDisk(): string
         return strval(config('datatables-export.disk', 'local'));
     }
 
+    /**
+     * @return string
+     */
+    protected function getS3Disk(): string
+    {
+        return strval(config('datatables-export.s3_disk', ''));
+    }
+
     /**
      * @param  \Yajra\DataTables\Services\DataTable  $dataTable
      * @return \Illuminate\Support\Collection<array-key, Column>

src/Livewire/ExportButtonComponent.php

@@ -74,8 +74,10 @@ public function updateExportProgress(): ?StreamedResponse
 
     public function downloadExport(): StreamedResponse
     {
-        return Storage::disk($this->getDisk())
-                      ->download($this->batchJobId.'.'.$this->getType(), $this->getFilename());
+        if($this->getS3Disk()) {
+            return Storage::disk($this->getS3Disk())->download($this->batchJobId.'.'.$this->getType(), $this->getFilename());
+        }
+        return Storage::disk($this->getDisk())->download($this->batchJobId.'.'.$this->getType(), $this->getFilename());
     }
 
     protected function getType(): string
@@ -110,4 +112,12 @@ protected function getDisk(): string
 
         return $disk;
     }
+
+    protected function getS3Disk(): string
+    {
+        /** @var string $disk */
+        $disk = config('datatables-export.s3_disk', '');
+
+        return $disk;
+    }
 }

src/config/datatables-export.php

@@ -38,6 +38,16 @@
     */
     'disk' => 'local',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Use S3 for final file destination
+    |--------------------------------------------------------------------------
+    |
+    | After generating the file locally, it can be uploaded to s3.
+    |
+    */
+    's3_disk' => '',
+
     /*
     |--------------------------------------------------------------------------
     | Default Date Format