Fix exports

riasvdv · Nov 30, 2023 · 0046ed3 · 0046ed3
1 parent 8114d42
commit 0046ed3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/src/Controllers/ExportController.php b/src/Controllers/ExportController.php
@@ -27,12 +27,12 @@ public function __invoke($type)
 
         if (request()->has('download')) {
             $path = storage_path('statamic/tmp/redirect/'.time().'.'.$type);
+
             File::put($path, $content);
-            $response = response()->download($path)->deleteFileAfterSend(true);
-        } else {
-            $response = response($content)->header('Content-Type', $exporter->contentType());
+
+            return response()->download($path)->deleteFileAfterSend();
         }
 
-        return $response;
+        return response($content)->header('Content-Type', $exporter->contentType());
     }
 }
diff --git a/src/Exporters/CsvExporter.php b/src/Exporters/CsvExporter.php
@@ -5,10 +5,12 @@
 use League\Csv\Writer;
 use Rias\StatamicRedirect\Facades\Redirect;
 use SplTempFileObject;
-use Statamic\Forms\Exporters\AbstractExporter;
+use Statamic\Forms\Exporters\Exporter;
 
-class CsvExporter extends AbstractExporter
+class CsvExporter extends Exporter
 {
+    protected static string $title = 'Redirects';
+
     /**
      * @var Writer
      */
@@ -27,7 +29,7 @@ public function __construct()
      *
      * @return string
      */
-    public function export()
+    public function export(): string
     {
         $this->insertHeaders();
 
@@ -65,4 +67,9 @@ private function insertData()
 
         $this->writer->insertAll($data);
     }
+
+    public function contentType(): string
+    {
+        return 'text/csv';
+    }
 }
diff --git a/src/Exporters/JsonExporter.php b/src/Exporters/JsonExporter.php
@@ -3,16 +3,18 @@
 namespace Rias\StatamicRedirect\Exporters;
 
 use Rias\StatamicRedirect\Facades\Redirect;
-use Statamic\Forms\Exporters\AbstractExporter;
+use Statamic\Forms\Exporters\Exporter;
 
-class JsonExporter extends AbstractExporter
+class JsonExporter extends Exporter
 {
+    protected static string $title = 'Redirects';
+
     /**
      * Perform the export.
      *
      * @return string
      */
-    public function export()
+    public function export(): string
     {
         $submissions = Redirect::all()->map(function (Redirect $redirect) {
             $redirectData = $redirect->fileData();
@@ -31,7 +33,7 @@ public function export()
      *
      * @return string
      */
-    public function contentType()
+    public function contentType(): string
     {
         return 'application/json';
     }