Merge pull request #10 from botble/dat/add-filter

Apply more filters to import form

Author: sangnguyenplus

public/js/data-synchronize.js

@@ -27,12 +27,17 @@ $(() => {
     const $form = $(document).find('[data-bb-toggle="import-form"]')
 
     if ($form.length > 0) {
+        const formData = new FormData($form.get(0))
         const $button = $form.find('button[type="submit"]')
         const $errors = $form.find('[data-bb-toggle="import-errors"]')
         const $output = $form.find('.data-synchronize-import-output')
         let errors = []
         let total = null
 
+        $form.on('change', (e) => {
+            formData.set(e.target.name, e.target.value)
+        })
+
         const output = (message, type) => {
             if (type) {
                 $output.append(`<p class="text-${type}">${message}</p>`)
@@ -67,14 +72,14 @@ $(() => {
         }
 
         const importData = (fileName, offset, limit = $form.data('chunk-size'), total = 0) => {
+            formData.set('file_name', fileName)
+            formData.set('offset', offset)
+            formData.set('limit', limit)
+            formData.set('total', total)
+
             $httpClient
                 .make()
-                .post($form.data('import-url'), {
-                    file_name: fileName,
-                    offset,
-                    limit,
-                    total,
-                })
+                .post($form.data('import-url'), formData)
                 .then(({ data }) => {
                     if (data.data.count > 0) {
                         output(data.message)
@@ -88,13 +93,13 @@ $(() => {
         }
 
         const validate = (fileName, offset, limit = $form.data('chunk-size')) => {
+            formData.set('file_name', fileName)
+            formData.set('offset', offset)
+            formData.set('limit', limit)
+
             $httpClient
                 .make()
-                .post($form.data('validate-url'), {
-                    file_name: fileName,
-                    offset,
-                    limit,
-                })
+                .post($form.data('validate-url'), formData)
                 .then(({ data }) => {
                     if (data.data.errors.length > 0) {
                         errors = errors.concat(data.data.errors)

resources/js/data-synchronize.js

@@ -55,6 +55,8 @@ class="data-synchronize-import-form"
                     </x-core::alert>
                 @endif
 
+                {!! apply_filters('data_synchronize_import_form_before', null, $importer) !!}
+
                 <div>
                     <div class="dropzone">
                         <div class="dz-message">
@@ -67,6 +69,8 @@ class="data-synchronize-import-form"
                     </x-core::form.helper-text>
                 </div>
 
+                {!! apply_filters('data_synchronize_import_form_after', null, $importer) !!}
+
                 <pre class="mt-3 data-synchronize-import-output" style="display: none"></pre>
             </x-core::card.body>
             <x-core::card.footer>

resources/views/import.blade.php

@@ -9,6 +9,7 @@
 use Botble\DataSynchronize\Http\Requests\ImportRequest;
 use Botble\DataSynchronize\Importer\Importer;
 use Exception;
+use Illuminate\Http\Request;
 
 abstract class ImportController extends BaseController
 {
@@ -31,7 +32,7 @@ public function index()
     public function validateData(ImportRequest $request)
     {
         try {
-            $response = $this->getImporter()->validate(
+            $response = $this->prepareImporter($request)->validate(
                 $request->input('file_name'),
                 $request->input('offset'),
                 $request->input('limit'),
@@ -76,7 +77,7 @@ public function import(ImportRequest $request)
         }
 
         try {
-            $response = $this->getImporter()->import(
+            $response = $this->prepareImporter($request)->import(
                 $request->input('file_name'),
                 $request->input('offset'),
                 $request->input('limit'),
@@ -126,4 +127,9 @@ public function downloadExample(DownloadTemplateRequest $request)
 
         return $this->getImporter()->downloadExample($request->input('format'));
     }
+
+    protected function prepareImporter(Request $request): Importer
+    {
+        return $this->getImporter();
+    }
 }