fix: parent name bug category form. rename variable to

shopperlabs · Dec 5, 2024 · 35f3aed · 35f3aed
1 parent 5fb5d8a
commit 35f3aed
Show file tree

Hide file tree

Showing 5 changed files with 77,285 additions and 20 deletions.
diff --git a/packages/admin/public/shopper.css b/packages/admin/public/shopper.css
diff --git a/packages/admin/public/shopper.js b/packages/admin/public/shopper.js
diff --git a/packages/admin/src/Livewire/SlideOvers/CategoryForm.php b/packages/admin/src/Livewire/SlideOvers/CategoryForm.php
@@ -57,12 +57,13 @@ public function form(Form $form): Form
                         Components\Hidden::make('slug'),
                         Components\Select::make('parent_id')
                             ->label(__('shopper::forms.label.parent'))
-                            ->relationship('parent', 'name', fn (Builder $query) => $query->where('is_enabled', true))
-                            ->getOptionLabelFromRecordUsing(
-                                fn ($model) => $model->parent
-                                    ? "{$model->parent->name} / {$model->name}"
-                                    : $model->name
+                            ->relationship(
+                                name: 'parent',
+                                titleAttribute: 'name',
+                                modifyQueryUsing: fn (Builder $query) => $query->where('is_enabled', true)
                             )
+                            ->getOptionLabelFromRecordUsing(fn ($record) => $record->getLabelOptionName())
+                            ->preload()
                             ->searchable()
                             ->placeholder(__('shopper::pages/categories.empty_parent')),
                         Components\Toggle::make('is_enabled')

diff --git a/packages/core/src/Models/Category.php b/packages/core/src/Models/Category.php
@@ -73,6 +73,16 @@ public function updateStatus(bool $status = true): void
         $this->save();
     }
 
+    /**
+     * Use to display custom label into filament relationship select form component
+     */
+    public function getLabelOptionName(): string
+    {
+        return $this->parent
+            ? $this->parent->getLabelOptionName() . ' / ' . $this->name
+            : $this->name;
+    }
+
     public function scopeEnabled(Builder $query): Builder
     {
         return $query->where('is_enabled', true);

diff --git a/packages/core/src/Models/Collection.php b/packages/core/src/Models/Collection.php
@@ -4,12 +4,12 @@
 
 namespace Shopper\Core\Models;
 
-use Database\Factories\CollectionFactory;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
+use Shopper\Core\Database\Factories\CollectionFactory;
 use Shopper\Core\Enum\CollectionType;
 use Shopper\Core\Traits\HasMedia;
 use Shopper\Core\Traits\HasSlug;