Merge pull request #33 from grrr-amsterdam/interface-improvements

Interface improvements

Author: simonhamp

dist/js/tool.js

@@ -3,14 +3,19 @@
         <heading class="mb-6">CSV Import</heading>
 
         <card class="flex flex-col items-center justify-center" style="min-height: 300px">
-            <input type="file" name="file" ref="file" @change="handleFile">
-            <button type="submit" class="btn btn-default btn-primary" @click="upload">Import</button>
+            <input type="file" name="file" ref="file" @change="handleFile" class="mb-3">
+            <button type="submit" class="btn btn-default btn-primary" v-bind:disabled="!file" @click="upload">Import</button>
         </card>
     </div>
 </template>
 
 <script>
 export default {
+    metaInfo() {
+        return {
+          title: "Import data",
+        };
+    },
     mounted() {
         //
     },

resources/js/components/Main.vue

@@ -55,6 +55,11 @@
 
 <script>
 export default {
+    metaInfo() {
+        return {
+          title: "Preview your imported data",
+        };
+    },
     mounted() {
         const self = this;
 

resources/js/components/Preview.vue

@@ -12,6 +12,11 @@
 
 <script>
 export default {
+    metaInfo() {
+        return {
+          title: "All your data was successfully imported",
+        };
+    },
     mounted() {
 
     },

resources/js/components/Review.vue

@@ -54,8 +54,8 @@ public function getAvailableFieldsForImport(String $resource, $request)
         $novaResource = new $resource(new $resource::$model);
         $fieldsCollection = collect($novaResource->creationFields($request));
 
-            if (method_exists($novaResource, 'excludeAttributesFromImport')) {
-                $fieldsCollection = $fieldsCollection->filter(function(Field $field) use ($novaResource, $request) {
+        if (method_exists($novaResource, 'excludeAttributesFromImport')) {
+            $fieldsCollection = $fieldsCollection->filter(function(Field $field) use ($novaResource, $request) {
                 return !in_array($field->attribute, $novaResource::excludeAttributesFromImport($request));
             });
         }
@@ -67,7 +67,9 @@ public function getAvailableFieldsForImport(String $resource, $request)
                     ];
                 });
 
-       return [$novaResource->uriKey() => $fields];
+        // Note: ->values() is used here to avoid this array being turned into an object due to 
+        // non-sequential keys (which might happen due to the filtering above.
+        return [$novaResource->uriKey() => $fields->values()];
     }
 
     public function getAvailableResourcesForImport(NovaRequest $request) {

src/Http/Controllers/ImportController.php

@@ -13,8 +13,9 @@
 use Maatwebsite\Excel\Concerns\WithValidation;
 use Maatwebsite\Excel\Concerns\WithBatchInserts;
 use Maatwebsite\Excel\Concerns\WithChunkReading;
+use Maatwebsite\Excel\Concerns\WithMapping;
 
-class Importer implements ToModel, WithValidation, WithHeadingRow, WithBatchInserts, WithChunkReading, SkipsOnFailure, SkipsOnError
+class Importer implements ToModel, WithValidation, WithHeadingRow, WithMapping, WithBatchInserts, WithChunkReading, SkipsOnFailure, SkipsOnError
 {
     use Importable, SkipsFailures, SkipsErrors;
 
@@ -25,12 +26,14 @@ class Importer implements ToModel, WithValidation, WithHeadingRow, WithBatchInse
     protected $rules;
     protected $model_class;
 
+    public function map($row): array { 
+        return $this->mapRowDataToAttributes($row);
+    }
+
     public function model(array $row)
     {
-        [$model, $callbacks] = $this->resource::fill(
-            new ImportRequest($this->mapRowDataToAttributes($row)),
-            $this->resource::newModel()
-        );
+        $model = $this->resource::newModel();
+        $model->fill($row);
 
         return $model;
     }