feat: add config based fields

IBEC-BOX · Apr 3, 2024 · 88aac48 · 88aac48
1 parent 0fb62a9
commit 88aac48
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 62 deletions.
diff --git a/config/admin-kit-feedbacks.php b/config/admin-kit-feedbacks.php
@@ -1,6 +1,15 @@
 <?php
 
-// config for AdminKit/Feedbacks
+// The label can be a translation key
 return [
-    //
+    'fields' => [
+        'name' => [
+            'rules' => 'required|string|max:255',
+            'label' => 'Name',
+        ],
+        'phone' => [
+            'rules' => 'required|string|min:18|max:18',
+            'label' => 'Phone',
+        ],
+    ],
 ];
diff --git a/database/migrations/replace_name_phone_with_fields_in_admin_kit_feedbacks_table.php.stub b/database/migrations/replace_name_phone_with_fields_in_admin_kit_feedbacks_table.php.stub
@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration {
+    public function up()
+    {
+        Schema::table('admin_kit_feedbacks', function (Blueprint $table) {
+            $table->dropColumn('name');
+            $table->dropColumn('phone');
+            $table->jsonb('fields');
+        });
+    }
+
+    public function down()
+    {
+        Schema::table('admin_kit_feedbacks', function (Blueprint $table) {
+            $table->dropColumn('fields');
+            $table->string('name');
+            $table->string('phone');
+        });
+    }
+};
diff --git a/resources/lang/en/feedbacks.php b/resources/lang/en/feedbacks.php
@@ -6,18 +6,12 @@
         'plural_label' => 'Feedback',
 
         'id' => 'ID',
-        'name' => 'Name',
-        'phone' => 'Phone',
         'locale' => 'Preferred language',
 
         'created_at' => 'Created At',
         'updated_at' => 'Updated At',
     ],
     'api' => [
-        'attributes' => [
-            'name' => 'name',
-            'phone' => 'phone',
-        ],
         'messages' => [
             'required' => 'The :attribute field is required.',
             'max' => [

diff --git a/resources/lang/ru/feedbacks.php b/resources/lang/ru/feedbacks.php
@@ -6,18 +6,12 @@
         'plural_label' => 'Обратная связь',
 
         'id' => 'ID',
-        'name' => 'Имя',
-        'phone' => 'Телефон',
         'locale' => 'Предпочитаемый язык',
 
         'created_at' => 'Создан',
         'updated_at' => 'Обновлен',
     ],
     'api' => [
-        'attributes' => [
-            'name' => 'имя',
-            'phone' => 'номер телефона',
-        ],
         'messages' => [
             'required' => 'Поле :attribute обязательно для заполнения.',
             'max' => [

diff --git a/src/Models/Feedback.php b/src/Models/Feedback.php
@@ -13,11 +13,14 @@ class Feedback extends AbstractModel
     protected $table = 'admin_kit_feedbacks';
 
     protected $fillable = [
-        'name',
-        'phone',
+        'fields',
         'locale',
     ];
 
+    protected $casts = [
+        'fields' => 'array'
+    ];
+
     protected static function newFactory(): FeedbackFactory
     {
         return new FeedbackFactory();

diff --git a/src/UI/API/Controllers/FeedbackController.php b/src/UI/API/Controllers/FeedbackController.php
@@ -4,19 +4,19 @@
 
 namespace AdminKit\Feedbacks\UI\API\Controllers;
 
+use Illuminate\Http\Response;
 use AdminKit\Feedbacks\Models\Feedback;
 use AdminKit\Feedbacks\UI\API\Requests\FeedbackStoreRequest;
-use Illuminate\Http\Response;
 
 class FeedbackController extends Controller
 {
     public function store(FeedbackStoreRequest $request): Response
     {
         Feedback::query()
             ->create(
-                $request->merge([
-                    'locale' => app()->getLocale(),
-                ])->toArray()
+                collect(['fields' => $request->validated()])
+                    ->merge(['locale' => app()->getLocale()])
+                    ->toArray()
             );
 
         return response('OK');

diff --git a/src/UI/API/Requests/FeedbackStoreRequest.php b/src/UI/API/Requests/FeedbackStoreRequest.php
@@ -2,17 +2,34 @@
 
 namespace AdminKit\Feedbacks\UI\API\Requests;
 
+use Illuminate\Support\Collection;
 use Illuminate\Foundation\Http\FormRequest;
 
 class FeedbackStoreRequest extends FormRequest
 {
     public function rules(): array
     {
-        return [
-            'name' => 'required|string|max:255',
-            'phone' => 'required|string|min:18|max:18',
-            recaptchaFieldName() => recaptchaRuleName(),
-        ];
+        return collect(config('admin-kit-feedbacks.fields'))
+            ->mapWithKeys(fn (array $item, string $key) => [
+                $key => __($item['rules']),
+            ])
+            ->when(
+                app()->environment('production'),
+                fn (Collection $rules) => $rules->merge([
+                    recaptchaFieldName() => recaptchaRuleName(),
+                ])
+            )
+            ->toArray();
+    }
+
+    public function attributes(): array
+    {
+        return collect(config('admin-kit-feedbacks.fields'))
+            ->filter(fn (array $item) => isset($item['label']))
+            ->mapWithKeys(fn (array $item, string $key) => [
+                $key => __($item['label']),
+            ])
+            ->toArray();
     }
 
     public function messages(): array
@@ -25,12 +42,4 @@ public function messages(): array
             'recaptcha' => __('admin-kit-feedbacks::feedbacks.api.messages.recaptcha'),
         ];
     }
-
-    public function attributes(): array
-    {
-        return [
-            'name' => __('admin-kit-feedbacks::feedbacks.api.attributes.name'),
-            'phone' => __('admin-kit-feedbacks::feedbacks.api.attributes.phone'),
-        ];
-    }
 }
diff --git a/src/UI/Filament/Resources/FeedbackResource.php b/src/UI/Filament/Resources/FeedbackResource.php
@@ -2,10 +2,10 @@
 
 namespace AdminKit\Feedbacks\UI\Filament\Resources;
 
+use Filament\Tables;
+use Filament\Resources\Resource;
 use AdminKit\Feedbacks\Models\Feedback;
 use AdminKit\Feedbacks\UI\Filament\Resources\FeedbackResource\Pages;
-use Filament\Resources\Resource;
-use Filament\Tables;
 
 class FeedbackResource extends Resource
 {
@@ -16,27 +16,21 @@ class FeedbackResource extends Resource
     public static function table(Tables\Table $table): Tables\Table
     {
         return $table
-            ->columns([
-                Tables\Columns\TextColumn::make('name')
-                    ->label(__('admin-kit-feedbacks::feedbacks.resource.name')),
-                Tables\Columns\TextColumn::make('phone')
-                    ->label(__('admin-kit-feedbacks::feedbacks.resource.phone')),
-                Tables\Columns\TextColumn::make('locale')
-                    ->label(__('admin-kit-feedbacks::feedbacks.resource.locale')),
-                Tables\Columns\TextColumn::make('created_at')
-                    ->label(__('admin-kit-feedbacks::feedbacks.resource.created_at')),
-            ])
-            ->defaultSort('id', 'desc')
-            ->filters([
-                //
-            ]);
-    }
-
-    public static function getRelations(): array
-    {
-        return [
-            //
-        ];
+            ->columns(
+                collect(config('admin-kit-feedbacks.fields'))
+                    ->map(
+                        fn (array $item, string $key) => Tables\Columns\TextColumn::make("fields.$key")
+                            ->label(__($item['label'] ?? $key))
+                    )
+                    ->merge([
+                        Tables\Columns\TextColumn::make('locale')
+                            ->label(__('admin-kit-feedbacks::feedbacks.resource.locale')),
+                        Tables\Columns\TextColumn::make('created_at')
+                            ->label(__('admin-kit-feedbacks::feedbacks.resource.created_at')),
+                    ])
+                    ->toArray()
+            )
+            ->defaultSort('id', 'desc');
     }
 
     public static function getPages(): array

diff --git a/src/UI/Filament/Resources/FeedbackResource/Pages/ListFeedback.php b/src/UI/Filament/Resources/FeedbackResource/Pages/ListFeedback.php
@@ -2,15 +2,10 @@
 
 namespace AdminKit\Feedbacks\UI\Filament\Resources\FeedbackResource\Pages;
 
-use AdminKit\Feedbacks\UI\Filament\Resources\FeedbackResource;
 use Filament\Resources\Pages\ListRecords;
+use AdminKit\Feedbacks\UI\Filament\Resources\FeedbackResource;
 
 class ListFeedback extends ListRecords
 {
     protected static string $resource = FeedbackResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [];
-    }
 }