Merge branch 'main' into feature/builder-field

Author: Baspa

README.md

@@ -164,6 +164,13 @@ class EditContent extends EditRecord
         return $form
             ->schema($this->resolveFormFields());
     }
+
+    public function mutateFormDataBeforeSave(array $data): array
+    {
+        $this->mutateBeforeSave($data);
+        
+        return $data;
+    }
 }
 ```
 

database/migrations/change_unique_column_in_fields.php.stub

@@ -0,0 +1,21 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up()
+    {
+        Schema::table('fields', function (Blueprint $table) {
+            $table->dropUnique(['model_type', 'model_key', 'slug']);
+
+            $table->string('model_type', 191)->change();
+            $table->string('model_key', 191)->change();
+            $table->string('slug', 191)->change();
+
+            $table->unique(['model_type', 'model_key', 'slug', 'parent_ulid'], 'fields_unique_parent');
+        });
+    }
+};

database/migrations/create_fields_table.php.stub

@@ -28,9 +28,9 @@ return new class extends Migration
             $table->unique(['model_type', 'model_key', 'slug']);
         });
 
-        if (config('fields.tenancy.is_tenant_aware')) {
-            $tenant = config('fields.tenancy.relationship');
-            $key = config('fields.tenancy.key');
+        if (config('backstage.fields.tenancy.is_tenant_aware')) {
+            $tenant = config('backstage.fields.tenancy.relationship');
+            $key = config('backstage.fields.tenancy.key');
 
             Schema::create('field_' . $tenant, function (Blueprint $table) use ($tenant, $key) {
                 $table->foreignUlid($tenant . '_' . $key)->constrained(table: $tenant, column: $key)->cascadeOnUpdate()->cascadeOnDelete();

src/Concerns/CanMapDynamicFields.php

@@ -70,7 +70,7 @@ protected function mutateFormDataBeforeFill(array $data): array
         });
     }
 
-    protected function mutateFormDataBeforeSave(array $data): array
+    protected function mutateBeforeSave(array $data): array
     {
         if (! isset($this->record)) {
             return $data;
@@ -85,15 +85,32 @@ protected function mutateFormDataBeforeSave(array $data): array
         });
     }
 
+    private function resolveFieldConfigAndInstance(Model $field): array
+    {
+        $fieldConfig = Field::tryFrom($field->field_type)
+            ? $this->fieldInspector->initializeDefaultField($field->field_type)
+            : $this->fieldInspector->initializeCustomField($field->field_type);
+
+        return [
+            'config' => $fieldConfig,
+            'instance' => new $fieldConfig['class'],
+        ];
+    }
+
     protected function mutateFormData(array $data, callable $mutationStrategy): array
     {
         foreach ($this->record->fields as $field) {
-            $fieldConfig = Field::tryFrom($field->field_type)
-                ? $this->fieldInspector->initializeDefaultField($field->field_type)
-                : $this->fieldInspector->initializeCustomField($field->field_type);
+            $field->load('children');
 
-            $fieldInstance = new $fieldConfig['class'];
+            ['config' => $fieldConfig, 'instance' => $fieldInstance] = $this->resolveFieldConfigAndInstance($field);
             $data = $mutationStrategy($field, $fieldConfig, $fieldInstance, $data);
+
+            if (! empty($field->children)) {
+                foreach ($field->children as $nestedField) {
+                    ['config' => $nestedFieldConfig, 'instance' => $nestedFieldInstance] = $this->resolveFieldConfigAndInstance($nestedField);
+                    $data = $mutationStrategy($nestedField, $nestedFieldConfig, $nestedFieldInstance, $data);
+                }
+            }
         }
 
         return $data;

src/Concerns/HasOptions.php

@@ -17,12 +17,16 @@ public static function addOptionsToInput(mixed $input, mixed $field): mixed
             $options = [];
 
             foreach ($field->config['relations'] as $relation) {
-                $resources = config('fields.selectable_resources');
+                $resources = config('backstage.fields.selectable_resources');
                 $resourceClass = collect($resources)->first(function ($resource) use ($relation) {
                     $res = new $resource;
                     $model = $res->getModel();
                     $model = new $model;
 
+                    if (! isset($relation['resource'])) {
+                        return false;
+                    }
+
                     return $model->getTable() === $relation['resource'];
                 });
 
@@ -121,7 +125,7 @@ public function optionFormFields(): Fieldset
                                             ->columnSpanFull()
                                             ->live(debounce: 250)
                                             ->afterStateUpdated(function (Forms\Set $set, ?string $state) {
-                                                $resources = config('fields.selectable_resources');
+                                                $resources = config('backstage.fields.selectable_resources');
                                                 $resourceClass = collect($resources)->first(function ($resource) use ($state) {
                                                     $res = new $resource;
                                                     $model = $res->getModel();
@@ -150,7 +154,7 @@ public function optionFormFields(): Fieldset
                                                 $set('relationValue_options', $columnOptions);
                                             })
                                             ->options(function () {
-                                                $resources = config('fields.selectable_resources');
+                                                $resources = config('backstage.fields.selectable_resources');
 
                                                 return collect($resources)->map(function ($resource) {
                                                     $res = new $resource;
@@ -204,7 +208,7 @@ public function optionFormFields(): Fieldset
                                                                     return [];
                                                                 }
 
-                                                                $resources = config('fields.selectable_resources');
+                                                                $resources = config('backstage.fields.selectable_resources');
                                                                 $resourceClass = collect($resources)->first(function ($r) use ($resource) {
                                                                     $res = new $r;
                                                                     $model = $res->getModel();

src/Fields/Repeater.php

@@ -159,7 +159,7 @@ public function getForm(): array
                                                 ->label(__('Name'))
                                                 ->required()
                                                 ->placeholder(__('Name'))
-                                                ->live(debounce: 250)
+                                                ->live(onBlur: true)
                                                 ->afterStateUpdated(fn (Set $set, ?string $state) => $set('slug', Str::slug($state))),
                                             TextInput::make('slug')
                                                 ->readonly(),
@@ -169,6 +169,7 @@ public function getForm(): array
                                                 ->label(__('Field Type'))
                                                 ->live(debounce: 250)
                                                 ->reactive()
+                                                ->default(FieldEnum::Text->value)
                                                 ->options(
                                                     function () {
                                                         $options = array_merge(
@@ -215,7 +216,7 @@ private static function generateSchemaFromChildren(Collection $children): array
                 continue;
             }
 
-            $schema[] = $field::make($child['name'], $child);
+            $schema[] = $field::make($child['slug'], $child);
         }
 
         return $schema;

src/FieldsServiceProvider.php

@@ -151,6 +151,7 @@ protected function getMigrations(): array
     {
         return [
             'create_fields_table',
+            'change_unique_column_in_fields',
         ];
     }
 }

src/Filament/RelationManagers/FieldsRelationManager.php

@@ -42,7 +42,7 @@ public function form(Form $form): Form
                                     ->label(__('Name'))
                                     ->required()
                                     ->placeholder(__('Name'))
-                                    ->live(debounce: 250)
+                                    ->live(onBlur: true)
                                     ->afterStateUpdated(fn (Set $set, ?string $state) => $set('slug', Str::slug($state))),
 
                                 TextInput::make('slug')
@@ -54,6 +54,7 @@ public function form(Form $form): Form
                                     ->label(__('Field Type'))
                                     ->live(debounce: 250)
                                     ->reactive()
+                                    ->default(FieldEnum::Text->value)
                                     ->options(function () {
                                         return collect([
                                             ...FieldEnum::array(),