From 69fdfceb6d2408d1108c3fbed5c31571e3a8a2b6 Mon Sep 17 00:00:00 2001 From: Ramakant Date: Mon, 14 Mar 2022 12:10:30 +0530 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=E2=9C=A8=20Grouped=20buttons=20?= =?UTF-8?q?Handling=20password?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- config/voyager-import.php | 2 +- resources/views/bread/import.blade.php | 64 ++++++++++++++++--- .../views/bread/partials/actions.blade.php | 14 ++-- src/Actions/ImportAction.php | 5 +- src/Exports/DataTypeTemplateExport.php | 1 + src/Http/Traits/ImportTemplateAction.php | 5 +- src/Imports/DataTypeImport.php | 17 +++-- 8 files changed, 86 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 8f812ae..f6113d3 100644 --- a/README.md +++ b/README.md @@ -26,10 +26,10 @@ By 🐼 [Ramakant Gangwar](https://github.com/rxcod9). # 1. Require this Package in your fresh Laravel/Voyager project composer require joy/voyager-import -# 2. Publish +# 2. Publish everything php artisan vendor:publish --provider="Joy\VoyagerImport\VoyagerImportServiceProvider" --force -# 3. Publish Voyager overrided actions blade [MANDATORY STEP FOR IMPORT BULK BUTTON TO WORK] +# 3. OR Publish Voyager overrided actions blade [MANDATORY STEP FOR IMPORT BULK BUTTON TO WORK] php artisan vendor:publish --provider="Joy\VoyagerImport\VoyagerImportServiceProvider" --tag=voyager-actions-views --force ``` diff --git a/config/voyager-import.php b/config/voyager-import.php index 529b6ba..ec56186 100644 --- a/config/voyager-import.php +++ b/config/voyager-import.php @@ -61,7 +61,7 @@ /* | The default import readerType. | - | Supported: "Xlsx", "Csv", "Csv", "Ods", "Xls", + | Supported: "Xlsx", "Csv", "Ods", "Xls", | "Slk", "Xml", "Gnumeric", "Html" */ 'readerType' => env('VOYAGER_IMPORT_READER_TYPE', 'Xlsx'), diff --git a/resources/views/bread/import.blade.php b/resources/views/bread/import.blade.php index 4fbb3a5..db2012c 100644 --- a/resources/views/bread/import.blade.php +++ b/resources/views/bread/import.blade.php @@ -17,15 +17,61 @@
- - {{ __('joy-voyager-import::generic.bulk_import_template') }} - +
+
+ + +
+
diff --git a/resources/views/bread/partials/actions.blade.php b/resources/views/bread/partials/actions.blade.php index b51255c..a34eb6e 100644 --- a/resources/views/bread/partials/actions.blade.php +++ b/resources/views/bread/partials/actions.blade.php @@ -6,13 +6,17 @@ @endphp @can ($action->getPolicy(), $data) @if ($action->shouldActionDisplayOnRow($data)) - convertAttributesToHtml() !!}> - - + @if (method_exists($action, 'view')) + @include($action->view(), ['action' => $action, 'data' => $data, 'dataType' => $dataType]) + @else + convertAttributesToHtml() !!}> + + + @endif @endif @endcan -@elseif (method_exists($action, 'massAction') && method_exists($action, 'massView')) - @include($action->massView(), ['action' => $action, 'data' => null]) +@elseif (method_exists($action, 'massAction') && method_exists($action, 'view')) + @include($action->view(), ['action' => $action, 'data' => null, 'dataType' => $dataType]) @elseif (method_exists($action, 'massAction'))
{{ csrf_field() }} diff --git a/src/Actions/ImportAction.php b/src/Actions/ImportAction.php index 527cbf8..aac2c28 100644 --- a/src/Actions/ImportAction.php +++ b/src/Actions/ImportAction.php @@ -97,7 +97,8 @@ public function massAction($ids, $comingFrom) } $disk = $this->disk ?? config('joy-voyager-import.disk'); - $readerType = $this->readerType ?? config('joy-voyager-import.readerType', Excel::XLSX); + // @FIXME let me auto detect OR NOT?? + $readerType = null; //$this->readerType ?? config('joy-voyager-import.readerType', Excel::XLSX); $importClass = 'joy-voyager-import.import'; @@ -122,7 +123,7 @@ public function massAction($ids, $comingFrom) ]); } - public function massView() + public function view() { $view = 'joy-voyager-import::bread.import'; diff --git a/src/Exports/DataTypeTemplateExport.php b/src/Exports/DataTypeTemplateExport.php index 6f9de1d..c5e888e 100644 --- a/src/Exports/DataTypeTemplateExport.php +++ b/src/Exports/DataTypeTemplateExport.php @@ -185,6 +185,7 @@ public function map($data): array $columns = []; // $columns[] = $data->id; + foreach ($this->dataType->rows as $row) { $column = null; if ($data->{$row->field . '_export'}) { diff --git a/src/Http/Traits/ImportTemplateAction.php b/src/Http/Traits/ImportTemplateAction.php index 9352a0f..4bb2355 100644 --- a/src/Http/Traits/ImportTemplateAction.php +++ b/src/Http/Traits/ImportTemplateAction.php @@ -32,7 +32,7 @@ public function importTemplate(Request $request) // Check permission $this->authorize('browse', app($dataType->model_name)); - $writerType = $this->writerType ?? config('joy-voyager-import.writerType', Excel::XLSX); + $writerType = $request->get('writerType', $this->writerType ?? config('joy-voyager-import.writerType', Excel::XLSX)); $fileName = $this->fileName ?? ($dataType->slug . '.' . Str::lower($writerType)); $exportClass = 'joy-voyager-import.import-template'; @@ -42,9 +42,10 @@ public function importTemplate(Request $request) } $export = app($exportClass); - + return $export->set( $dataType, + [], $request->all(), )->download( $fileName, diff --git a/src/Imports/DataTypeImport.php b/src/Imports/DataTypeImport.php index 9a693a5..dbe4543 100644 --- a/src/Imports/DataTypeImport.php +++ b/src/Imports/DataTypeImport.php @@ -4,12 +4,11 @@ // use App\Models\User; -use TCG\Voyager\Http\Controllers\Traits\BreadRelationshipParser; -use TCG\Voyager\Models\DataType; -use Maatwebsite\Excel\Concerns\Importable; use Illuminate\Database\Eloquent\Model; use Illuminate\Http\UploadedFile; +use Illuminate\Support\Facades\Hash; use Joy\VoyagerImport\Events\BreadDataImported; +use Maatwebsite\Excel\Concerns\Importable; use Maatwebsite\Excel\Concerns\ToModel; use Maatwebsite\Excel\Concerns\WithEvents; use Maatwebsite\Excel\Concerns\WithHeadingRow; @@ -17,6 +16,8 @@ use Maatwebsite\Excel\Concerns\WithUpserts; use Maatwebsite\Excel\Concerns\WithValidation; use Maatwebsite\Excel\Events\AfterImport; +use TCG\Voyager\Http\Controllers\Traits\BreadRelationshipParser; +use TCG\Voyager\Models\DataType; class DataTypeImport implements ToModel, @@ -264,7 +265,7 @@ public function model(array $item) // If a column has a relationship associated with it, we do not want to show that field // $this->removeRelationshipField($this->dataType, 'browse'); - $data->id = $item['id']; + $data->id = $item['id'] ?? $item[''] ?? null; foreach ($this->dataType->rows as $row) { if ($data->hasSetMutator($row->field . '_import')) { @@ -342,7 +343,13 @@ public function model(array $item) // @TODO check if not hash then use bcrypt // Ignore if password is not set if (($item[$row->field] ?? null)) { - $data->{$row->field} = ($item[$row->field] ?? null); + $password = $item[$row->field] ?? null; + $passwordInfo = password_get_info($password); + if ($passwordInfo['algo']) { + $data->{$row->field} = ($item[$row->field] ?? null); + } else { + $data->{$row->field} = Hash::make($item[$row->field] ?? null); + } } } elseif ($row->type == 'text_area') { // view('voyager::multilingual.input-hidden-bread-browse');