matt/opnform-host-nginx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Editable submission File input support (#120)

Browse Source
This commit is contained in:
Chirag Chhatrala
2023-04-26 20:35:02 +05:30
committed by GitHub
parent 3f2fe352e8
commit e165242e57
4 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Requests/AnswerFormRequest.php
View File

@@ -168,7 +168,7 @@ class AnswerFormRequest extends FormRequest
return ['boolean'];
case 'url':
if (isset($property['file_upload']) && $property['file_upload']) {
$this->requestRules[$property['id'].'.*'] = [new StorageFile($this->maxFileSize)];
$this->requestRules[$property['id'].'.*'] = [new StorageFile($this->maxFileSize, [], $this->form)];
return ['array'];
}
return ['url'];
@@ -177,7 +177,7 @@ class AnswerFormRequest extends FormRequest
if($this->form->is_pro && !empty($property['allowed_file_types'])){
$allowedFileTypes = explode(",", $property['allowed_file_types']);
}
$this->requestRules[$property['id'].'.*'] = [new StorageFile($this->maxFileSize, $allowedFileTypes)];
$this->requestRules[$property['id'].'.*'] = [new StorageFile($this->maxFileSize, $allowedFileTypes, $this->form)];
return ['array'];
case 'email':
return ['email:filter'];

11
app/Jobs/Form/StoreFormSubmissionJob.php
View File

@@ -136,6 +136,13 @@ class StoreFormSubmissionJob implements ShouldQueue
return $finalData;
}
// This is use when updating a record, and file uploads aren't changed.
private function isSkipForUpload($value)
{
$newPath = Str::of(PublicFormController::FILE_UPLOAD_PATH)->replace('?', $this->form->id);
return Storage::disk('s3')->exists($newPath.'/'.$value);
}
/**
* Custom Back-end Value formatting. Use case:
* - File uploads (move file from tmp storage to persistent)
@@ -150,6 +157,10 @@ class StoreFormSubmissionJob implements ShouldQueue
return null;
}
if($this->isSkipForUpload($value)) {
return $value;
}
$fileNameParser = StorageFileNameParser::parse($value);
// Make sure we retrieve the file in tmp storage, move it to persistent

11
app/Rules/StorageFile.php
View File

@@ -7,6 +7,7 @@ use App\Service\Storage\StorageFileNameParser;
use Illuminate\Contracts\Validation\Rule;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
use App\Models\Forms\Form;
class StorageFile implements Rule
{
@@ -21,7 +22,7 @@ class StorageFile implements Rule
* @param int $maxSize
* @param string[] $fileTypes
*/
public function __construct(int $maxSize, array $fileTypes = [])
public function __construct(int $maxSize, array $fileTypes = [], public ?Form $form = null)
{
$this->maxSize = $maxSize;
@@ -39,6 +40,14 @@ class StorageFile implements Rule
*/
public function passes($attribute, $value): bool
{
// This is use when updating a record, and file uploads aren't changed.
if($this->form){
$newPath = Str::of(PublicFormController::FILE_UPLOAD_PATH)->replace('?', $this->form->id);
if(Storage::disk('s3')->exists($newPath.'/'.$value)){
return true;
}
}
$fileNameParser = StorageFileNameParser::parse($value);
if (!$uuid = $fileNameParser->uuid) {
return false;