Merge branch 'main' into enhance/configurable-models

datlechin · Aug 20, 2024 · c7b2acb · c7b2acb
2 parents 484117f + 7793796
commit c7b2acb
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 15 deletions.
diff --git a/resources/lang/en/menu-builder.php b/resources/lang/en/menu-builder.php
@@ -37,6 +37,9 @@
                     'label' => 'Assigned Menu',
                 ],
             ],
+            'empty' => [
+                'heading' => 'No locations registered',
+            ],
         ],
     ],
     'items' => [

diff --git a/resources/lang/vi/menu-builder.php b/resources/lang/vi/menu-builder.php
@@ -37,6 +37,9 @@
                     'label' => 'Menu đã gán',
                 ],
             ],
+            'empty' => [
+                'heading' => 'Không có vị trí nào được đăng ký',
+            ],
         ],
     ],
     'items' => [

diff --git a/resources/views/components/empty-state.blade.php b/resources/views/components/empty-state.blade.php
diff --git a/src/Concerns/HasLocationAction.php b/src/Concerns/HasLocationAction.php
@@ -21,6 +21,7 @@ public function getLocationAction(): Action
             ->modalDescription(__('filament-menu-builder::menu-builder.actions.locations.description'))
             ->modalSubmitActionLabel(__('filament-menu-builder::menu-builder.actions.locations.submit'))
             ->modalWidth(MaxWidth::Large)
+            ->modalSubmitAction($this->getRegisteredLocations()->isEmpty() ? false : null)
             ->color('gray')
             ->fillForm(fn () => $this->getRegisteredLocations()->map(fn ($location, $key) => [
                 'location' => $location,
@@ -54,7 +55,7 @@ public function getLocationAction(): Action
                     ->success()
                     ->send();
             })
-            ->form(fn () => $this->getRegisteredLocations()->map(
+            ->form($this->getRegisteredLocations()->map(
                 fn ($location, $key) => Components\Grid::make(2)
                     ->statePath($key)
                     ->schema([
@@ -69,7 +70,13 @@ public function getLocationAction(): Action
                             ->hiddenLabel($key !== $this->getRegisteredLocations()->keys()->first())
                             ->options($this->getModel()::all()->pluck('name', 'id')->all()),
                     ])
-            )->all());
+            )->all() ?: [
+                Components\View::make('filament-tables::components.empty-state.index')
+                    ->viewData([
+                        'heading' => __('filament-menu-builder::menu-builder.actions.locations.empty.heading'),
+                        'icon' => 'heroicon-o-x-mark',
+                    ]),
+            ]);
     }
 
     protected function getMenuLocations(): Collection

diff --git a/src/Livewire/MenuPanel.php b/src/Livewire/MenuPanel.php
@@ -106,7 +106,12 @@ public function form(Form $form): Form
 
         return $form
             ->schema([
-                Components\View::make('filament-menu-builder::components.empty-state')
+                Components\View::make('filament-tables::components.empty-state.index')
+                    ->viewData([
+                        'heading' => __('filament-menu-builder::menu-builder.panel.empty.heading'),
+                        'description' => __('filament-menu-builder::menu-builder.panel.empty.description'),
+                        'icon' => 'heroicon-o-link-slash',
+                    ])
                     ->visible($items->isEmpty()),
 
                 Components\CheckboxList::make('data')

diff --git a/src/Models/Menu.php b/src/Models/Menu.php
@@ -5,6 +5,7 @@
 namespace Datlechin\FilamentMenuBuilder\Models;
 
 use Datlechin\FilamentMenuBuilder\FilamentMenuBuilderPlugin;
+use Illuminate\Contracts\Database\Query\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
@@ -41,7 +42,7 @@ public function menuItems(): HasMany
     public static function location(string $location): ?self
     {
         return FilamentMenuBuilderPlugin::get()
-            ->getMenuLocationModel()::with('menu')
+            ->getMenuLocationModel()::with(['menu' => fn (Builder $query) => $query->where('is_visible', true)])
             ->where('location', $location)
             ->first()?->menu;
     }