From b1199100a0d7fadb5caaaf2b27c2e3c5674df911 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 20 Sep 2023 17:22:12 -0700 Subject: [PATCH 1/3] Display error message if import file deleted before it can be selected --- app/Http/Livewire/Importer.php | 20 ++++++++++++++++++++ resources/lang/en/admin/hardware/message.php | 1 + resources/views/livewire/importer.blade.php | 1 + 3 files changed, 22 insertions(+) diff --git a/app/Http/Livewire/Importer.php b/app/Http/Livewire/Importer.php index 7899182a6..a0dda749c 100644 --- a/app/Http/Livewire/Importer.php +++ b/app/Http/Livewire/Importer.php @@ -3,6 +3,7 @@ namespace App\Http\Livewire; use App\Models\CustomField; +use Illuminate\Support\Facades\Session; use Livewire\Component; use App\Models\Import; @@ -161,6 +162,11 @@ class Importer extends Component public function mount() { + if (Session::has('error_message')) { + $this->message = Session::get('error_message'); + $this->message_type = 'danger'; + } + $this->authorize('import'); $this->progress = -1; // '-1' means 'don't show the progressbar' $this->progress_bar_class = 'progress-bar-warning'; @@ -484,8 +490,16 @@ class Importer extends Component public function selectFile($id) { + $this->clearMessage(); $this->activeFile = Import::find($id); + + if (!$this->activeFile) { + Session::flash('error_message', trans('admin/hardware/message.import.file_missing')); + + return redirect()->route('imports.index'); + } + $this->field_map = null; foreach($this->activeFile->header_row as $element) { if(isset($this->activeFile->field_map[$element])) { @@ -520,6 +534,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. diff --git a/resources/lang/en/admin/hardware/message.php b/resources/lang/en/admin/hardware/message.php index 18f3b3fa2..04be92a75 100644 --- a/resources/lang/en/admin/hardware/message.php +++ b/resources/lang/en/admin/hardware/message.php @@ -51,6 +51,7 @@ return [ 'success' => 'Your file has been imported', 'file_delete_success' => 'Your file has been been successfully deleted', 'file_delete_error' => 'The file was unable to be deleted', + 'file_missing' => 'The file selected is missing', 'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters', 'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters', ], diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php index 5646d0928..297dcc7b8 100644 --- a/resources/views/livewire/importer.blade.php +++ b/resources/views/livewire/importer.blade.php @@ -303,6 +303,7 @@ }; data.process().done( function () {data.submit();}); @this.progress = 0; + @this.clearMessage(); }, progress: function(e, data) { @this.progress = parseInt((data.loaded / data.total * 100, 10)); From 5a88a64ebd37aa7c9af099fa6f5a79b2571d1336 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 20 Sep 2023 17:35:34 -0700 Subject: [PATCH 2/3] Remove unnecessary redirect --- app/Http/Livewire/Importer.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/app/Http/Livewire/Importer.php b/app/Http/Livewire/Importer.php index a0dda749c..1663fac45 100644 --- a/app/Http/Livewire/Importer.php +++ b/app/Http/Livewire/Importer.php @@ -3,7 +3,6 @@ namespace App\Http\Livewire; use App\Models\CustomField; -use Illuminate\Support\Facades\Session; use Livewire\Component; use App\Models\Import; @@ -162,11 +161,6 @@ class Importer extends Component public function mount() { - if (Session::has('error_message')) { - $this->message = Session::get('error_message'); - $this->message_type = 'danger'; - } - $this->authorize('import'); $this->progress = -1; // '-1' means 'don't show the progressbar' $this->progress_bar_class = 'progress-bar-warning'; @@ -495,9 +489,10 @@ class Importer extends Component $this->activeFile = Import::find($id); if (!$this->activeFile) { - Session::flash('error_message', trans('admin/hardware/message.import.file_missing')); + $this->message = trans('admin/hardware/message.import.file_missing'); + $this->message_type = 'danger'; - return redirect()->route('imports.index'); + return; } $this->field_map = null; From 7bcb28d8fda43e80159f6a103c261b9c4a6e8231 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 26 Sep 2023 15:24:20 +0100 Subject: [PATCH 3/3] Commented out sortable columns Signed-off-by: snipe --- resources/views/partials/bootstrap-table.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 5c7f1ce21..78f3d152d 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -42,7 +42,7 @@ 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') } }, - reorderableColumns: true, + // reorderableColumns: true, stickyHeader: true, stickyHeaderOffsetLeft: parseInt($('body').css('padding-left'), 10), stickyHeaderOffsetRight: parseInt($('body').css('padding-right'), 10),