From dd32341502c94f5dbcac64196a4e3acdc7e95462 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 16 Jul 2024 17:21:18 -0700
Subject: [PATCH] Display message if attempting to delete non-existent file

---
 app/Livewire/Importer.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/Livewire/Importer.php b/app/Livewire/Importer.php
index 826d1ef7d9..84041f4428 100644
--- a/app/Livewire/Importer.php
+++ b/app/Livewire/Importer.php
@@ -525,7 +525,16 @@ class Importer extends Component
     {
         $this->authorize('import');
 
-        $import = Import::findOrFail($id);
+        $import = Import::find($id);
+
+        // Check that the import wasn't deleted after while page was already loaded...
+        if (!$import) {
+            // @todo: improve error message
+            $this->message = trans('admin/hardware/message.import.file_delete_error');
+            $this->message_type = 'danger';
+
+            return;
+        }
 
         if (Storage::delete('private_uploads/imports/' . $import->file_path)) {
             $import->delete();