refactor: extract shared field management methods to trait

Author: ManukMinasyan

src/Livewire/Concerns/ManagesFields.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Relaticle\CustomFields\Livewire\Concerns;
+
+use Illuminate\Database\Eloquent\Collection;
+use Livewire\Attributes\Computed;
+use Livewire\Attributes\On;
+use Relaticle\CustomFields\CustomFields;
+
+/**
+ * Shared logic for managing custom fields in Livewire components.
+ */
+trait ManagesFields
+{
+    #[Computed]
+    public function fields(): Collection
+    {
+        return $this->section->fields()->withDeactivated()->orderBy('sort_order')->get();
+    }
+
+    #[On('field-width-updated')]
+    public function fieldWidthUpdated(int|string $fieldId, int $width): void
+    {
+        $model = CustomFields::newCustomFieldModel();
+        $model->where($model->getKeyName(), $fieldId)->update(['width' => $width]);
+
+        $this->section->refresh();
+    }
+
+    #[On('field-deleted')]
+    public function fieldDeleted(): void
+    {
+        $this->section->refresh();
+    }
+
+    #[On('fields-reordered')]
+    public function fieldsReordered(): void
+    {
+        unset($this->fields);
+    }
+}

src/Livewire/ManageCustomFieldSection.php

@@ -13,55 +13,25 @@
 use Filament\Support\Enums\Size;
 use Filament\Support\Enums\Width;
 use Illuminate\Contracts\View\View;
-use Illuminate\Database\Eloquent\Collection;
-use Livewire\Attributes\Computed;
-use Livewire\Attributes\On;
 use Livewire\Component;
 use Relaticle\CustomFields\CustomFields;
 use Relaticle\CustomFields\Filament\Management\Schemas\FieldForm;
 use Relaticle\CustomFields\Filament\Management\Schemas\SectionForm;
 use Relaticle\CustomFields\Livewire\Concerns\CreatesCustomFields;
+use Relaticle\CustomFields\Livewire\Concerns\ManagesFields;
 use Relaticle\CustomFields\Models\CustomFieldSection;
 
 final class ManageCustomFieldSection extends Component implements HasActions, HasForms
 {
     use CreatesCustomFields;
     use InteractsWithActions;
     use InteractsWithForms;
+    use ManagesFields;
 
     public string $entityType;
 
     public CustomFieldSection $section;
 
-    #[Computed]
-    public function fields(): Collection
-    {
-        return $this->section->fields()->withDeactivated()->orderBy('sort_order')->get();
-    }
-
-    #[On('field-width-updated')]
-    public function fieldWidthUpdated(int|string $fieldId, int $width): void
-    {
-        // Update the width
-        $model = CustomFields::newCustomFieldModel();
-        $model->where($model->getKeyName(), $fieldId)->update(['width' => $width]);
-
-        // Re-fetch the fields
-        $this->section->refresh();
-    }
-
-    #[On('field-deleted')]
-    public function fieldDeleted(): void
-    {
-        $this->section->refresh();
-    }
-
-    #[On('fields-reordered')]
-    public function fieldsReordered(): void
-    {
-        unset($this->fields);
-    }
-
     public function updateFieldsOrder(int|string $sectionId, array $fields): void
     {
         $model = CustomFields::newCustomFieldModel();

src/Livewire/ManageFieldsWithoutSections.php

@@ -12,13 +12,11 @@
 use Filament\Support\Enums\Size;
 use Filament\Support\Enums\Width;
 use Illuminate\Contracts\View\View;
-use Illuminate\Database\Eloquent\Collection;
-use Livewire\Attributes\Computed;
-use Livewire\Attributes\On;
 use Livewire\Component;
 use Relaticle\CustomFields\CustomFields;
 use Relaticle\CustomFields\Filament\Management\Schemas\FieldForm;
 use Relaticle\CustomFields\Livewire\Concerns\CreatesCustomFields;
+use Relaticle\CustomFields\Livewire\Concerns\ManagesFields;
 use Relaticle\CustomFields\Models\CustomFieldSection;
 
 /**
@@ -29,38 +27,12 @@ final class ManageFieldsWithoutSections extends Component implements HasActions,
     use CreatesCustomFields;
     use InteractsWithActions;
     use InteractsWithForms;
+    use ManagesFields;
 
     public string $entityType;
 
     public CustomFieldSection $section;
 
-    #[Computed]
-    public function fields(): Collection
-    {
-        return $this->section->fields()->withDeactivated()->orderBy('sort_order')->get();
-    }
-
-    #[On('field-width-updated')]
-    public function fieldWidthUpdated(int|string $fieldId, int $width): void
-    {
-        $model = CustomFields::newCustomFieldModel();
-        $model->where($model->getKeyName(), $fieldId)->update(['width' => $width]);
-
-        $this->section->refresh();
-    }
-
-    #[On('field-deleted')]
-    public function fieldDeleted(): void
-    {
-        $this->section->refresh();
-    }
-
-    #[On('fields-reordered')]
-    public function fieldsReordered(): void
-    {
-        unset($this->fields);
-    }
-
     public function updateFieldsOrder(array $fields): void
     {
         $model = CustomFields::newCustomFieldModel();