[5.x] Ability to use files fieldtype in forms for attaching temporary files

composer.json

@@ -14,7 +14,7 @@
         "composer/composer": "^2.2.22",
         "guzzlehttp/guzzle": "^6.3 || ^7.0",
         "james-heinrich/getid3": "^1.9.21",
-        "laravel/framework": "^10.0 || ^11.0",
+        "laravel/framework": "^10.33 || ^11.0",
         "laravel/helpers": "^1.1",
         "league/commonmark": "^2.2",
         "league/csv": "^9.0",

resources/views/extend/forms/fields/files.antlers.html

@@ -0,0 +1,7 @@
+<input
+    type="file"
+    name="{{ handle }}{{ if max_files !== 1 }}[]{{ /if }}"
+    {{ if js_driver }}{{ js_attributes }}{{ /if }}
+    {{ if max_files !== 1 }}multiple{{ /if }}
+    {{ if validate|contains:required }}required{{ /if }}
+>

src/Fieldtypes/Files.php

@@ -8,6 +8,8 @@ class Files extends Fieldtype
 {
     protected $defaultValue = [];
     protected $selectable = false;
+    protected $selectableInForms = true;
+    protected $categories = ['media'];
 
     protected function configFieldItems(): array
     {

src/Forms/DeleteTemporaryAttachments.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Statamic\Forms;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Storage;
+use Statamic\Contracts\Forms\Submission;
+use Statamic\Fields\Field;
+
+class DeleteTemporaryAttachments implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public function __construct(public Submission $submission)
+    {
+    }
+
+    public function handle()
+    {
+        $this->submission->form()->blueprint()->fields()->all()
+            ->filter(fn (Field $field) => $field->type() === 'files')
+            ->each(function (Field $field) {
+                Collection::wrap($this->submission->get($field->handle(), []))
+                    ->each(fn ($path) => Storage::disk('local')->delete('statamic/file-uploads/'.$path));
+
+                $this->submission->remove($field->handle());
+            });
+
+        $this->submission->saveQuietly();
+    }
+}

src/Forms/Email.php

@@ -111,31 +111,53 @@ protected function addAttachments()
         }
 
         $this->getRenderableFieldData(Arr::except($this->submissionData, ['id', 'date', 'form']))
-            ->filter(function ($field) {
-                return $field['fieldtype'] === 'assets';
-            })
+            ->filter(fn ($field) => in_array($field['fieldtype'], ['assets', 'files']))
             ->each(function ($field) {
-                $value = $field['value']->value();
-
-                $value = array_get($field, 'config.max_files') === 1
-                    ? collect([$value])->filter()
-                    : $value->get();
-
-                foreach ($value as $file) {
-                    $this->attachFromStorageDisk($file->container()->diskHandle(), $file->path());
-                }
+                $field['value'] = $field['value']->value();
+                $field['fieldtype'] === 'assets' ? $this->attachAssets($field) : $this->attachFiles($field);
             });
 
         return $this;
     }
 
+    private function attachAssets($field)
+    {
+        $value = $field['value'];
+
+        $value = array_get($field, 'config.max_files') === 1
+            ? collect([$value])->filter()
+            : $value->get();
+
+        foreach ($value as $asset) {
+            $this->attachFromStorageDisk($asset->container()->diskHandle(), $asset->path());
+        }
+    }
+
+    private function attachFiles($field)
+    {
+        $value = $field['value'];
+
+        $value = array_get($field, 'config.max_files') === 1
+            ? collect([$value])->filter()
+            : $value;
+
+        foreach ($value as $file) {
+            $this->attachFromStorageDisk('local', 'statamic/file-uploads/'.$file);
+        }
+    }
+
     protected function addData()
     {
         $augmented = $this->submission->toAugmentedArray();
+        $fields = $this->getRenderableFieldData(Arr::except($augmented, ['id', 'date', 'form']));
+
+        if (array_has($this->config, 'attachments')) {
+            $fields = $fields->reject(fn ($field) => in_array($field['fieldtype'], ['assets', 'files']));
+        }
 
         $data = array_merge($augmented, $this->getGlobalsData(), [
             'config' => config()->all(),
-            'fields' => $this->getRenderableFieldData(Arr::except($augmented, ['id', 'date', 'form'])),
+            'fields' => $fields,
             'site_url' => Config::getSiteUrl(),
             'date' => now(),
             'now' => now(),

src/Forms/Form.php

@@ -381,7 +381,7 @@ public function dateFormat()
     public function hasFiles()
     {
         return $this->fields()->filter(function ($field) {
-            return $field->fieldtype()->handle() === 'assets';
+            return in_array($field->fieldtype()->handle(), ['assets', 'files']);
         })->isNotEmpty();
     }
 

src/Forms/SendEmails.php

@@ -4,8 +4,10 @@
 
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Bus;
 use Statamic\Contracts\Forms\Submission;
+use Statamic\Fields\Field;
 use Statamic\Sites\Site;
 
 class SendEmails
@@ -21,18 +23,26 @@ public function __construct(Submission $submission, Site $site)
         $this->site = $site;
     }
 
-    public function handle()
+    public function handle(): void
     {
-        $this->jobs()->each(fn ($job) => Bus::dispatch($job));
+        $jobs = $this->jobs();
+
+        if ($jobs->isNotEmpty()) {
+            Bus::chain($jobs)->dispatch();
+        }
     }
 
-    private function jobs()
+    private function jobs(): Collection
     {
-        return $this->emailConfigs($this->submission)->map(function ($config) {
-            $class = config('statamic.forms.send_email_job');
+        return $this->emailConfigs($this->submission)
+            ->map(function ($config) {
+                $class = config('statamic.forms.send_email_job');
 
-            return new $class($this->submission, $this->site, $config);
-        });
+                return new $class($this->submission, $this->site, $config);
+            })
+            ->when($this->shouldDeleteTemporaryAttachments(), function ($jobs) {
+                $jobs->push(new DeleteTemporaryAttachments($this->submission));
+            });
     }
 
     private function emailConfigs($submission)
@@ -43,4 +53,12 @@ private function emailConfigs($submission)
 
         return collect($config);
     }
+
+    protected function shouldDeleteTemporaryAttachments(): bool
+    {
+        return $this->submission->form()->blueprint()->fields()->all()
+            ->filter(fn (Field $field) => $field->fieldtype()->handle() === 'files')
+            ->filter()
+            ->count() > 0;
+    }
 }

src/Forms/Submission.php

@@ -12,9 +12,11 @@
 use Statamic\Events\SubmissionDeleted;
 use Statamic\Events\SubmissionSaved;
 use Statamic\Events\SubmissionSaving;
+use Statamic\Facades\Asset;
 use Statamic\Facades\File;
 use Statamic\Facades\YAML;
 use Statamic\Forms\Uploaders\AssetsUploader;
+use Statamic\Forms\Uploaders\FilesUploader;
 use Statamic\Support\Arr;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
@@ -120,7 +122,11 @@ public function formattedDate()
     public function uploadFiles($uploadedFiles)
     {
         return collect($uploadedFiles)->map(function ($files, $handle) {
-            return AssetsUploader::field($this->fields()->get($handle))->upload($files);
+            $field = $this->fields()->get($handle);
+
+            return $field['type'] === 'files'
+                ? FilesUploader::field($field)->upload($files)
+                : AssetsUploader::field($field)->upload($files);
         })->all();
     }
 

src/Forms/Uploaders/FilesUploader.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace Statamic\Forms\Uploaders;
+
+use Statamic\Assets\FileUploader;
+use Statamic\Support\Arr;
+
+class FilesUploader
+{
+    protected $config;
+
+    /**
+     * Instantiate files uploader.
+     *
+     * @param  array  $config
+     */
+    public function __construct($config)
+    {
+        $this->config = collect($config);
+    }
+
+    /**
+     * Instantiate files uploader.
+     *
+     * @param  array  $config
+     * @return static
+     */
+    public static function field($config)
+    {
+        return new static($config);
+    }
+
+    /**
+     * Upload the files and return their IDs.
+     *
+     * @param  mixed  $files
+     * @return array|string
+     */
+    public function upload($files)
+    {
+        $ids = $this->getUploadableFiles($files)->map(function ($file) {
+            return FileUploader::container()->upload($file);
+        });
+
+        return $this->isSingleFile()
+            ? $ids->first()
+            : $ids->all();
+    }
+
+    /**
+     * Get uploadable files.
+     *
+     * @param  mixed  $files
+     * @return \Illuminate\Support\Collection
+     */
+    protected function getUploadableFiles($files)
+    {
+        $files = collect(Arr::wrap($files))->filter();
+
+        // If multiple uploads is not enabled for this field, we will
+        // simply take the first uploaded file and ignore the rest.
+        return $this->isSingleFile()
+            ? $files->take(1)
+            : $files;
+    }
+
+    /**
+     * Determine if uploader should only upload a single file.
+     *
+     * @return bool
+     */
+    protected function isSingleFile()
+    {
+        return $this->config->get('max_files') === 1;
+    }
+}

src/Http/Requests/FrontendFormRequest.php

@@ -110,7 +110,7 @@ private function normalizeAssetsValues($fields)
     {
         // The assets fieldtype is expecting an array, even for `max_files: 1`, but we don't want to force that on the front end.
         return $fields->all()
-            ->filter(fn ($field) => $field->fieldtype()->handle() === 'assets' && $this->hasFile($field->handle()))
+            ->filter(fn ($field) => in_array($field->fieldtype()->handle(), ['assets', 'files']) && $this->hasFile($field->handle()))
             ->map(fn ($field) => Arr::wrap($this->file($field->handle())))
             ->all();
     }