From 8044dfc9af4aaccf8da8e18871ea21e0414031fe Mon Sep 17 00:00:00 2001 From: David Date: Thu, 24 Apr 2025 10:30:01 +0200 Subject: [PATCH 1/4] Added renderer column to custom fields table --- ...27_add_renderer_to_custom_fields_table.php | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 migrations/2025_04_24_103227_add_renderer_to_custom_fields_table.php diff --git a/migrations/2025_04_24_103227_add_renderer_to_custom_fields_table.php b/migrations/2025_04_24_103227_add_renderer_to_custom_fields_table.php new file mode 100644 index 0000000..2b370d3 --- /dev/null +++ b/migrations/2025_04_24_103227_add_renderer_to_custom_fields_table.php @@ -0,0 +1,32 @@ +text('renderer'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('custom_fields', function (Blueprint $table) { + $table->dropColumn('renderer'); + }); + } +} From 09e21662cfba2de00aa9c80b4de8153159e4bccd Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Thu, 24 Apr 2025 08:30:20 +0000 Subject: [PATCH 2/4] Apply fixes from StyleCI --- src/App/Http/Controllers/PlainCustomFieldController.php | 2 +- src/App/Models/CustomField.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/App/Http/Controllers/PlainCustomFieldController.php b/src/App/Http/Controllers/PlainCustomFieldController.php index ff00a2d..3b00868 100644 --- a/src/App/Http/Controllers/PlainCustomFieldController.php +++ b/src/App/Http/Controllers/PlainCustomFieldController.php @@ -33,7 +33,7 @@ public function __construct(CustomField $customField) * @param string|null $type * @return JsonResponse */ - public function index(string $type = null): JsonResponse + public function index(?string $type = null): JsonResponse { return response()->json($this->customField::plain($type)->get()); } diff --git a/src/App/Models/CustomField.php b/src/App/Models/CustomField.php index ff5eb59..7137389 100644 --- a/src/App/Models/CustomField.php +++ b/src/App/Models/CustomField.php @@ -80,7 +80,7 @@ public function selectable(): MorphTo return $this->morphTo(); } - public function scopePlain(Builder $query, string $subType = null): Builder + public function scopePlain(Builder $query, ?string $subType = null): Builder { /** @var PlainType $plainType */ $plainType = app(PlainType::class); From 685e52249b973c0b3df02b26041a22e42548c686 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 24 Apr 2025 10:46:24 +0200 Subject: [PATCH 3/4] Added render to request files --- .../2025_04_24_103227_add_renderer_to_custom_fields_table.php | 2 +- src/App/Http/Requests/CustomFieldCreateRequest.php | 1 + src/App/Http/Requests/CustomFieldUpdateRequest.php | 1 + src/App/Http/Requests/PlainCustomFieldRequest.php | 1 + src/App/Http/Requests/RemoteCustomFieldRequest.php | 1 + src/App/Http/Requests/SelectionCustomFieldRequest.php | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/migrations/2025_04_24_103227_add_renderer_to_custom_fields_table.php b/migrations/2025_04_24_103227_add_renderer_to_custom_fields_table.php index 2b370d3..68455d5 100644 --- a/migrations/2025_04_24_103227_add_renderer_to_custom_fields_table.php +++ b/migrations/2025_04_24_103227_add_renderer_to_custom_fields_table.php @@ -14,7 +14,7 @@ class AddRendererToCustomFieldsTable extends Migration public function up() { Schema::table('custom_fields', function (Blueprint $table) { - $table->text('renderer'); + $table->text('renderer')->nullable(); }); } diff --git a/src/App/Http/Requests/CustomFieldCreateRequest.php b/src/App/Http/Requests/CustomFieldCreateRequest.php index 9305546..fb73a91 100644 --- a/src/App/Http/Requests/CustomFieldCreateRequest.php +++ b/src/App/Http/Requests/CustomFieldCreateRequest.php @@ -47,6 +47,7 @@ public function rules() 'validation_id' => 'nullable|exists:custom_field_validations,id', 'group' => 'nullable|string', 'order' => 'nullable|integer', + 'renderer' => 'nullable|string' ]; } diff --git a/src/App/Http/Requests/CustomFieldUpdateRequest.php b/src/App/Http/Requests/CustomFieldUpdateRequest.php index a86f329..d4ecab4 100644 --- a/src/App/Http/Requests/CustomFieldUpdateRequest.php +++ b/src/App/Http/Requests/CustomFieldUpdateRequest.php @@ -50,6 +50,7 @@ public function rules() 'validation_id' => 'nullable|exists:custom_field_validations,id', 'group' => 'nullable|string', 'order' => 'nullable|integer', + 'renderer' => 'nullable|string' ]; return Arr::except($rules, self::LOCKED_FOR_EDITING); diff --git a/src/App/Http/Requests/PlainCustomFieldRequest.php b/src/App/Http/Requests/PlainCustomFieldRequest.php index a8e3b22..a865bd1 100644 --- a/src/App/Http/Requests/PlainCustomFieldRequest.php +++ b/src/App/Http/Requests/PlainCustomFieldRequest.php @@ -44,6 +44,7 @@ public function rules() 'validation_id' => 'nullable|exists:custom_field_validations', 'group' => 'nullable|string', 'order' => 'nullable|integer', + 'renderer' => 'nullable|string' ]; } diff --git a/src/App/Http/Requests/RemoteCustomFieldRequest.php b/src/App/Http/Requests/RemoteCustomFieldRequest.php index aa090f4..a5986b2 100644 --- a/src/App/Http/Requests/RemoteCustomFieldRequest.php +++ b/src/App/Http/Requests/RemoteCustomFieldRequest.php @@ -44,6 +44,7 @@ public function rules() 'validation_id' => 'nullable|exists:custom_field_validations', 'group' => 'nullable|string', 'order' => 'nullable|integer', + 'renderer' => 'nullable|string', 'remote' => 'required|array', 'remote.url' => 'required|url', 'remote.method' => 'required|in:GET,POST,PUT', diff --git a/src/App/Http/Requests/SelectionCustomFieldRequest.php b/src/App/Http/Requests/SelectionCustomFieldRequest.php index 95c90ff..c0a2491 100644 --- a/src/App/Http/Requests/SelectionCustomFieldRequest.php +++ b/src/App/Http/Requests/SelectionCustomFieldRequest.php @@ -44,6 +44,7 @@ public function rules() 'validation_id' => 'nullable|exists:custom_field_validations', 'group' => 'nullable|string', 'order' => 'nullable|integer', + 'renderer' => 'nullable|string', 'selection' => 'array', 'selection.multiselect' => 'boolean', 'values' => 'array', From caef0f208a9217ff86d9e1f2faddf4298a31bef9 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Thu, 24 Apr 2025 08:46:45 +0000 Subject: [PATCH 4/4] Apply fixes from StyleCI --- src/App/Http/Requests/CustomFieldCreateRequest.php | 2 +- src/App/Http/Requests/CustomFieldUpdateRequest.php | 2 +- src/App/Http/Requests/PlainCustomFieldRequest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/App/Http/Requests/CustomFieldCreateRequest.php b/src/App/Http/Requests/CustomFieldCreateRequest.php index fb73a91..46fa297 100644 --- a/src/App/Http/Requests/CustomFieldCreateRequest.php +++ b/src/App/Http/Requests/CustomFieldCreateRequest.php @@ -47,7 +47,7 @@ public function rules() 'validation_id' => 'nullable|exists:custom_field_validations,id', 'group' => 'nullable|string', 'order' => 'nullable|integer', - 'renderer' => 'nullable|string' + 'renderer' => 'nullable|string', ]; } diff --git a/src/App/Http/Requests/CustomFieldUpdateRequest.php b/src/App/Http/Requests/CustomFieldUpdateRequest.php index d4ecab4..8ea3fed 100644 --- a/src/App/Http/Requests/CustomFieldUpdateRequest.php +++ b/src/App/Http/Requests/CustomFieldUpdateRequest.php @@ -50,7 +50,7 @@ public function rules() 'validation_id' => 'nullable|exists:custom_field_validations,id', 'group' => 'nullable|string', 'order' => 'nullable|integer', - 'renderer' => 'nullable|string' + 'renderer' => 'nullable|string', ]; return Arr::except($rules, self::LOCKED_FOR_EDITING); diff --git a/src/App/Http/Requests/PlainCustomFieldRequest.php b/src/App/Http/Requests/PlainCustomFieldRequest.php index a865bd1..b8bdfb4 100644 --- a/src/App/Http/Requests/PlainCustomFieldRequest.php +++ b/src/App/Http/Requests/PlainCustomFieldRequest.php @@ -44,7 +44,7 @@ public function rules() 'validation_id' => 'nullable|exists:custom_field_validations', 'group' => 'nullable|string', 'order' => 'nullable|integer', - 'renderer' => 'nullable|string' + 'renderer' => 'nullable|string', ]; }