Merge pull request #13638 from marcusmoore/bug/sc-20704

Fixed exception being thrown when selected import was deleted
2023-09-26 15:00:35 +01:00
parent 1509339b68 5a88a64ebd
commit 660abeca9e
3 changed files with 17 additions and 0 deletions
@@ -484,8 +484,17 @@ class Importer extends Component

    public function selectFile($id)
    {
+        $this->clearMessage();

        $this->activeFile = Import::find($id);
+
+        if (!$this->activeFile) {
+            $this->message = trans('admin/hardware/message.import.file_missing');
+            $this->message_type = 'danger';
+
+            return;
+        }
+
        $this->field_map = null;
        foreach($this->activeFile->header_row as $element) {
            if(isset($this->activeFile->field_map[$element])) {
@@ -520,6 +529,12 @@ class Importer extends Component
        }
    }

+    public function clearMessage()
+    {
+        $this->message = null;
+        $this->message_type = null;
+    }
+
    public function render()
    {
        $this->files = Import::orderBy('id','desc')->get(); //HACK - slows down renders.