Merge branch 'main' into feature/case-insensitive-search

readme.md

@@ -1,7 +1,6 @@
 <div class="filament-hidden">
 
 ![header](./.github/resources/pxlrbt-spotlight.png)
-pxlrbt-translate-action.png
 </div>
 
 # Filament Spotlight
@@ -77,7 +76,7 @@ CMD + /
 
 ### Setup
 
-This plugin relies on the same properties and methods used for Filament's global search. For records showing up with the correct name in "Edit/View" you need to set `$recordTitleAttribute`. [Check the docs for more information](https://filamentphp.com/docs/2.x/admin/resources/global-search)
+This plugin relies on the same properties and methods used for Filament's global search. For records showing up with the correct name in "Edit/View" you need to set `$recordTitleAttribute`. [Check the docs for more information](https://filamentphp.com/docs/3.x/panels/resources/global-search)
 
 #### Excluding pages
 

resources/lang/de/spotlight.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'placeholder' => 'Nach :Record suchen',
+    'account' => 'Dein Konto',
+];

resources/lang/en/spotlight.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'placeholder' => 'Search for a :record',
+    'account' => 'Your account',
+];

src/Actions/RegisterPages.php

@@ -20,6 +20,10 @@ public static function boot(Panel $panel)
              */
             $page = new $pageClass;
 
+            if (self::hasParameters($page::getSlug())) {
+                continue;
+            }
+
             if (method_exists($page, 'shouldRegisterSpotlight') && $page::shouldRegisterSpotlight() === false) {
                 continue;
             }
@@ -43,4 +47,9 @@ public static function boot(Panel $panel)
             Spotlight::$commands[$command->getId()] = $command;
         }
     }
+
+    private static function hasParameters(string $slug): bool
+    {
+        return preg_match('/{[^}]+}/', $slug) === 1;
+    }
 }

src/Actions/RegisterUserMenu.php

@@ -38,13 +38,13 @@ public static function boot(Panel $panel)
     protected function getName(string $key, MenuItem $item): ?string
     {
         return match ($key) {
-            'account' => $item->getLabel() ?? __('Your Account'),
-            'logout' => $item->getLabel() ?? __('filament::layout.buttons.logout.label'),
+            'account' => $item->getLabel() ?? __('filament-spotlight::spotlight.account'),
+            'logout' => $item->getLabel() ?? __('filament-panels::layout.actions.logout.label'),
             default => $item->getLabel()
         };
     }
 
-    protected function getUrl(string $key, MenuItem $item): string
+    protected function getUrl(string $key, MenuItem $item): ?string
     {
         return match ($key) {
             'logout' => $item->getUrl() ?? Filament::getLogoutUrl(),

src/Commands/ResourceCommand.php

@@ -87,7 +87,9 @@ public function dependencies(): ?SpotlightCommandDependencies
         }
 
         return SpotlightCommandDependencies::collection()->add(
-            SpotlightCommandDependency::make('record')->setPlaceholder(__('Search for a :record', ['record' => $this->resource::getModelLabel()]))
+            SpotlightCommandDependency::make('record')->setPlaceholder(
+                __('filament-spotlight::spotlight.placeholder', ['record' => $this->resource::getModelLabel()])
+            )
         );
     }
 
@@ -111,7 +113,7 @@ public function searchRecord($query): EloquentCollection|Collection|array
             ->limit(50)
             ->get()
             ->map(fn (Model $record) => new SpotlightSearchResult(
-                $record->getKey(),
+                $record->getRouteKey(),
                 $resource::getGlobalSearchResultTitle($record),
                 collect($resource::getGlobalSearchResultDetails($record))
                     ->map(fn ($value, $key) => $key.': '.$value)

src/SpotlightPlugin.php

@@ -38,6 +38,7 @@ public function boot(Panel $panel): void
     {
         Filament::serving(function () use ($panel) {
             config()->set('livewire-ui-spotlight.include_js', false);
+
             if (Filament::hasTenancy()) {
                 Event::listen(TenantSet::class, function () use ($panel) {
                     self::registerNavigation($panel);

src/SpotlightServiceProvider.php

@@ -11,6 +11,8 @@ class SpotlightServiceProvider extends ServiceProvider
 {
     public function boot()
     {
+        $this->loadTranslationsFrom(__DIR__.'/../resources/lang', 'filament-spotlight');
+
         config()->set('livewire-ui-spotlight.commands', []);
 
         FilamentAsset::register([