Merge pull request #27 from Log1x/enhance/dont-save-model-menu-urls-i…

…n-db 🧑‍💻 Ensure model menu item URLs do not get saved to the database
datlechin · Aug 20, 2024 · 902b90d · 902b90d
2 parents a76aeb2 + 4c39899
commit 902b90d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/resources/lang/en/menu-builder.php b/resources/lang/en/menu-builder.php
@@ -6,6 +6,8 @@
     'form' => [
         'title' => 'Title',
         'url' => 'URL',
+        'linkable_type' => 'Type',
+        'linkable_id' => 'ID',
     ],
     'resource' => [
         'name' => [
@@ -47,6 +49,7 @@
         ],
     ],
     'items' => [
+        'expand' => 'Expand',
         'empty' => [
             'heading' => 'There are no items in this menu.',
         ],

diff --git a/resources/lang/vi/menu-builder.php b/resources/lang/vi/menu-builder.php
@@ -6,6 +6,8 @@
     'form' => [
         'title' => 'Tiêu đề',
         'url' => 'URL',
+        'linkable_type' => 'Loại',
+        'linkable_id' => 'ID',
     ],
     'resource' => [
         'name' => [
@@ -47,6 +49,7 @@
         ],
     ],
     'items' => [
+        'expand' => 'Mở rộng',
         'empty' => [
             'heading' => 'Không có mục nào trong menu này.',
         ],

diff --git a/resources/views/components/menu-item.blade.php b/resources/views/components/menu-item.blade.php
@@ -21,7 +21,7 @@ class="flex justify-between px-3 py-2 bg-white shadow-sm rounded-xl ring-1 ring-
                 <x-filament::icon-button
                     icon="heroicon-o-chevron-right"
                     x-on:click="open = !open"
-                    title="Mở rộng"
+                    :tooltip="trans('filament-menu-builder::menu-builder.items.expand')"
                     color="gray"
                     class="transition duration-200 ease-in-out"
                     x-bind:class="{ 'rotate-90': open }"

diff --git a/src/Livewire/MenuItems.php b/src/Livewire/MenuItems.php
@@ -17,6 +17,7 @@
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Concerns\InteractsWithForms;
 use Filament\Forms\Contracts\HasForms;
+use Filament\Forms\Get;
 use Filament\Support\Enums\ActionSize;
 use Filament\Support\Enums\MaxWidth;
 use Filament\Support\Facades\FilamentIcon;
@@ -89,14 +90,16 @@ public function editAction(): Action
                     ->label(__('filament-menu-builder::menu-builder.form.title'))
                     ->required(),
                 TextInput::make('url')
-                    ->hidden(fn (?string $state): bool => empty($state))
+                    ->hidden(fn (?string $state, Get $get): bool => blank($state) || filled($get('linkable_type')))
                     ->label(__('filament-menu-builder::menu-builder.form.url'))
                     ->required(),
                 Placeholder::make('linkable_type')
-                    ->hidden(fn (?string $state): bool => empty($state))
+                    ->label(__('filament-menu-builder::menu-builder.form.linkable_type'))
+                    ->hidden(fn (?string $state): bool => blank($state))
                     ->content(fn (string $state) => $state),
                 Placeholder::make('linkable_id')
-                    ->hidden(fn (?string $state): bool => empty($state))
+                    ->label(__('filament-menu-builder::menu-builder.form.linkable_id'))
+                    ->hidden(fn (?string $state): bool => blank($state))
                     ->content(fn (string $state) => $state),
                 Select::make('target')
                     ->label(__('filament-menu-builder::menu-builder.open_in.label'))