🎨 ✨ Grouped buttons

Handling password
rxcod9 · Mar 14, 2022 · 69fdfce · 69fdfce
1 parent 2e91061
commit 69fdfce
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 26 deletions.
diff --git 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
@@ -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
@@ -17,15 +17,61 @@
                 <input type="file" name="file">
             </div>
             <div class="modal-footer">
-                <a
-                    class="btn btn-info pull-left"
-                    id="bulk_import_template_btn"
-                    href="{{ route('voyager.'.$dataType->slug.'.import-template') }}"
-                    title="{{ __('joy-voyager-import::generic.bulk_import_template') }}"
-                    target="_blank"
-                >
-                    <i class="voyager-download"></i> <span>{{ __('joy-voyager-import::generic.bulk_import_template') }}</span>
-                </a>
+                <div class="btn-group pull-left" role="group">
+                    <div class="btn-group" role="group">
+                        <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <i class="voyager-download"></i> <span>{{ __('joy-voyager-import::generic.bulk_import_template') }}</span>
+                            <span class="caret"></span>
+                        </button>
+                        <ul class="dropdown-menu">
+                            <li>
+                                <a
+                                    class='export-template-by-writer'
+                                    data-writer-type="Xls"
+                                    href="{{ route('voyager.'.$dataType->slug.'.import-template') }}?writerType=Xls"
+                                    title="{{ __('joy-voyager-import::generic.bulk_import_template') }}"
+                                    target="_blank"
+                                >Xls</a>
+                            </li>
+                            <li>
+                                <a
+                                    class='export-template-by-writer'
+                                    data-writer-type="Xlsx"
+                                    href="{{ route('voyager.'.$dataType->slug.'.import-template') }}?writerType=Xlsx"
+                                    title="{{ __('joy-voyager-import::generic.bulk_import_template') }}"
+                                    target="_blank"
+                                >Xlsx</a>
+                            </li>
+                            <li>
+                                <a
+                                    class='export-template-by-writer'
+                                    data-writer-type="Ods"
+                                    href="{{ route('voyager.'.$dataType->slug.'.import-template') }}?writerType=Ods"
+                                    title="{{ __('joy-voyager-import::generic.bulk_import_template') }}"
+                                    target="_blank"
+                                >Ods</a>
+                            </li>
+                            <li>
+                                <a
+                                    class='export-template-by-writer'
+                                    data-writer-type="Csv"
+                                    href="{{ route('voyager.'.$dataType->slug.'.import-template') }}?writerType=Csv"
+                                    title="{{ __('joy-voyager-import::generic.bulk_import_template') }}"
+                                    target="_blank"
+                                >Csv</a>
+                            </li>
+                            <li>
+                                <a
+                                    class='export-template-by-writer'
+                                    data-writer-type="Html"
+                                    href="{{ route('voyager.'.$dataType->slug.'.import-template') }}?writerType=Html"
+                                    title="{{ __('joy-voyager-import::generic.bulk_import_template') }}"
+                                    target="_blank"
+                                >Html</a>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
                 <!-- <button type="submit" {!! $action->convertAttributesToHtml() !!}><i class="{{ $action->getIcon() }}"></i> {{ $action->getTitle() }}</button> -->
                 <input type="hidden" name="action" value="{{ get_class($action) }}">
                 <!-- <input type="hidden" name="ids" value="" class="selected_ids"> -->

diff --git 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))
-            <a href="{{ $action->getRoute($dataType->name) }}" title="{{ $action->getTitle() }}" {!! $action->convertAttributesToHtml() !!}>
-                <i class="{{ $action->getIcon() }}"></i> <span class="hidden-xs hidden-sm">{{ $action->getTitle() }}</span>
-            </a>
+            @if (method_exists($action, 'view'))
+                @include($action->view(), ['action' => $action, 'data' => $data, 'dataType' => $dataType])
+            @else
+                <a href="{{ $action->getRoute($dataType->name) }}" title="{{ $action->getTitle() }}" {!! $action->convertAttributesToHtml() !!}>
+                    <i class="{{ $action->getIcon() }}"></i> <span class="hidden-xs hidden-sm">{{ $action->getTitle() }}</span>
+                </a>
+            @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'))
     <form method="post" action="{{ route('voyager.'.$dataType->slug.'.action') }}" style="display:inline">
         {{ csrf_field() }}

diff --git 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
@@ -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
@@ -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
@@ -4,19 +4,20 @@
 
 // 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;
 use Maatwebsite\Excel\Concerns\WithProgressBar;
 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');