Update the status of the export when the batch has been cancelled

src/Export/Jobs/CollateExportsAndUploadToDisk.php

@@ -15,6 +15,7 @@
 use Spatie\MediaLibrary\MediaCollections\Exceptions\FileIsTooBig;
 use Spatie\SimpleExcel\SimpleExcelReader;
 use Spatie\SimpleExcel\SimpleExcelWriter;
+use Throwable;
 
 class CollateExportsAndUploadToDisk implements ShouldQueue
 {
@@ -117,4 +118,11 @@ function getFilesSortedByIndex($uuid): array
 
         return $filteredFiles;
     }
-}
+
+    public function failed(?Throwable $exception): void
+    {
+        $this->export->update([
+            'status' => Status::FAILED->value
+        ]);
+    }
+}

src/Export/Jobs/ExportProcessor.php

@@ -102,6 +102,13 @@ public function handle(): void
                     "failedJobs" => $batch->failedJobs,
                 ]);
             })
+            ->finally(function (Batch $batch) use ($export) {
+                if ($batch->cancelled()) {
+                    $export->update([
+                        'status' => Status::FAILED->value
+                    ]);
+                }
+            })
             ->allowFailures($this->allowFailures())
             ->name($this->name())
             ->onQueue(self::queueName())
@@ -193,4 +200,4 @@ protected function getQueryCount(): int
     {
         return $this->query()->count();
     }
-}
+}

src/Export/Jobs/ExportToCsv.php

@@ -33,6 +33,10 @@ public function __construct(
      */
     public function handle(): void
     {
+        if ($this->batch()->cancelled()) {
+            return;
+        }
+
         $items = $this->processor->query()
             ->lazy()
             ->forPage($this->page, $this->perPage);
@@ -72,4 +76,4 @@ protected function storagePath($path = ''): string
 
         return storage_path('app/temp/' . trim($path, '/'));
     }
-}
+}