fixed uploads

Author: yassilah

dist/js/field.js

@@ -0,0 +1,43 @@
+<script>
+import FileField from '@/components/Form/FileField'
+import { Errors } from 'laravel-nova'
+
+export default {
+  mixins: [FileField],
+
+  methods: {
+    /**
+     * Remove the linked file from storage
+     */
+    async removeFile() {
+      this.uploadErrors = new Errors()
+
+      const {
+        resourceName,
+        resourceId,
+        relatedResourceName,
+        relatedResourceId,
+        viaRelationship
+      } = this
+      const attribute = this.field.original_attribute
+
+      const uri = this.viaRelationship
+        ? `/nova-api/${resourceName}/${resourceId}/${relatedResourceName}/${relatedResourceId}/field/${attribute}?viaRelationship=${viaRelationship}`
+        : `/nova-api/${resourceName}/${resourceId}/field/${attribute}`
+
+      try {
+        await Nova.request().delete(uri)
+        this.closeRemoveModal()
+        this.deleted = true
+        this.$emit('file-deleted')
+      } catch (error) {
+        this.closeRemoveModal()
+
+        if (error.response.status == 422) {
+          this.uploadErrors = new Errors(error.response.data.errors)
+        }
+      }
+    }
+  }
+}
+</script>

resources/js/components/CustomNestedFields/FileField.vue

@@ -16,7 +16,8 @@
                          :index="index"
                          :field="field"
                          :child="child"
-                         :errors="errors" />
+                         :errors="errors"
+                         @file-deleted="$emit('file-deleted')" />
       <!-- ACTUAL FIELDS -->
     </template>
 

resources/js/components/FormField.vue

@@ -35,10 +35,14 @@
                  :field="subfield"
                  :key="subfield.attribute"
                  :errors="errors"
+                 :resource-id="child[field.ID]"
                  :resource-name="field.resourceName"
                  :via-resource="field.viaResource"
                  :via-resource-id="field.viaResourceId"
                  :via-relationship="field.viaRelationship"
+                 :related-resource-name="field.relatedResourceName"
+                 :related-resource-id="field.relatedResourceId"
+                 @file-deleted="$emit('file-deleted')"
                  :is="`form-${getComponent(subfield)}`" />
       <!-- ACTUAL FIELDS -->
 
@@ -56,11 +60,12 @@
 
 <script>
 import FormNestedBelongsToField from './CustomNestedFields/BelongsToField'
+import FormNestedFileField from './CustomNestedFields/FileField'
 import DeleteModal from './Modals/Delete'
 
 export default {
 
-  components: { FormNestedBelongsToField, DeleteModal },
+  components: { FormNestedBelongsToField, FormNestedFileField, DeleteModal },
 
 
   props: {
@@ -153,7 +158,7 @@ export default {
      */
     getComponent(field) {
 
-      if (field.component === 'belongs-to-field') {
+      if (['belongs-to-field', 'file-field'].includes(field.component)) {
         return 'nested-' + field.component
       }
 

resources/js/components/NestedFormField.vue

@@ -230,7 +230,6 @@ public function jsonSerialize()
             'component' => $this->component,
             'prefixComponent' => true,
             'resourceName' => $this->resourceName,
-            'viaRelationship' => $this->viaRelationship,
             'listable' => true,
             'singularLabel' => Str::singular($this->name),
             'pluralLabel' => Str::plural($this->name),

src/NestedForm.php

@@ -16,10 +16,10 @@
 use Laravel\Nova\Http\Requests\NovaRequest;
 use Laravel\Nova\Http\Requests\UpdateResourceRequest;
 use Laravel\Nova\Nova;
+use Symfony\Component\HttpFoundation\FileBag;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Yassi\NestedForm\Exceptions\NestedValidationException;
 use Yassi\NestedForm\NestedForm;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 trait FillsSubAttributes
 {
@@ -92,6 +92,8 @@ protected function newRequest(array $data, Model $model, string $attribute, int
             $request = CreateResourceRequest::createFrom($this->request);
         }
 
+        $request->files = new FileBag($this->request->file($attribute)[$index ?? 0] ?? []);
+
         $request->query = new ParameterBag($this->query($data, $attribute, $index));
 
         $request->replace($this->data($data, $model));
@@ -191,8 +193,6 @@ protected function attribute(string $attribute, int $index = null)
         return $attribute . ($this->isManyRelationship() ? '[' . $index . ']' : '');
     }
 
-    
-
     /**
      * This method loops through the request data
      * and runs the necessary controller with the right
@@ -214,10 +214,6 @@ protected function runNestedOperations(NovaRequest $request, string $attribute,
                     $index = null;
                 }
 
-                if ($this->containsFile($attribute, $index)) {
-                    $request->files->add($this->getFiles($attribute, $index));
-                }
-
                 $this->runNestedOperation($value, $model, $attribute, $index, $request);
 
                 if ($value instanceof Response) {
@@ -237,43 +233,6 @@ protected function runNestedOperations(NovaRequest $request, string $attribute,
         return $this;
     }
 
-    /**
-     * Check if the nested item contains a file.
-     *
-     * @param  string  $attribute
-     * @param  int  $index
-     * @return bool
-     */
-    protected function containsFile(string $attribute, int $index = null)
-    {
-        if (is_null($index)) {
-            return isset($_FILES[$attribute]);
-        }
-
-        return isset($_FILES[$attribute]) && isset($_FILES[$attribute]['name'][$index]);
-    }
-
-    /**
-     * Change the file attribute to handle the download properly.
-     *
-     * @param  string  $attribute
-     * @param  int  $index
-     * @return array
-     */
-    protected function getFiles(string $attribute, int $index = 0)
-    {
-        $attributes = array_keys($_FILES[$attribute]['name'][$index]);
-        $files = [];
-
-        foreach ($attributes as $newAttribute) {
-            $newName = $_FILES[$attribute]['tmp_name'][$index][$newAttribute];
-            $newPath = $_FILES[$attribute]['tmp_name'][$index][$newAttribute];
-            $files[] = [$newAttribute => new UploadedFile($newPath, $newName)];
-        }
-
-        return $files;
-    }
-
     /**
      * This method runs the necessary controller with the right
      * request.