Fix SEO Page bugs

+ add better look up for resource class

Author: sten

config/filament-flexible-content-block-pages.php

@@ -102,7 +102,7 @@
         'linkable_models' => [
             // Models that can be linked in menu items
             // These models must implement HasMenuLabel interface
-            // Resources are automatically discovered via Filament::getModelResource()
+            // Resources are automatically discovered via FilamentFlexibleContentBlockPages::getModelResource()
             \Statikbe\FilamentFlexibleContentBlockPages\Models\Page::class,
 
             // Add your own models here:

resources/views/tailwind/pages/tag_index.blade.php

@@ -1,3 +1,7 @@
+@php
+    /** @var \Statikbe\FilamentFlexibleContentBlockPages\Models\Tag $tag */
+@endphp
+
 <x-flexible-pages-base-layout wide="true">
     <header>
         <x-flexible-pages-language-switch/>
@@ -7,12 +11,12 @@
         <div class="container mx-auto px-6 py-8">
             <div class="mb-8">
                 <h1 class="text-3xl font-bold mb-4">
-                    {{ $tag->getTranslation('name', app()->getLocale()) }}
+                    {{ $tag->name }}
                 </h1>
 
                 @if($tag->seo_description)
                     <p class="text-lg text-gray-600 mb-6">
-                        {!! $tag->getTranslation('seo_description', app()->getLocale()) !!}
+                        {!! $tag->seo_description !!}
                     </p>
                 @endif
 

src/FilamentFlexibleContentBlockPages.php

@@ -2,6 +2,8 @@
 
 namespace Statikbe\FilamentFlexibleContentBlockPages;
 
+use Filament\Facades\Filament;
+use Filament\Panel;
 use Statikbe\FilamentFlexibleContentBlockPages\Models\Page;
 use Statikbe\FilamentFlexibleContentBlockPages\Models\Settings;
 
@@ -36,4 +38,31 @@ public function settings(): Settings
     {
         return $this->config()->getSettingsModel()::getSettings();
     }
+
+    /**
+     * Looks up the resource class of a model in ANY panel.
+     *
+     * @param  string<class-string>  $modelClass
+     * @return string<class-string>|null
+     */
+    public function getModelResource(string $modelClass): ?string
+    {
+        // 1. try the current panel:
+        $resourceClass = Filament::getModelResource($modelClass);
+        if ($resourceClass) {
+            return $resourceClass;
+        }
+
+        // 2. try all other panels:
+        foreach (Filament::getPanels() as $panel) {
+            /** @var Panel $panel */
+            $resourceClass = $panel->getModelResource($modelClass);
+
+            if ($resourceClass) {
+                return $resourceClass;
+            }
+        }
+
+        return null;
+    }
 }

src/Form/Forms/MenuItemForm.php

@@ -262,7 +262,7 @@ protected static function getTypeLabel(AbstractMenuItemType $type): string
 
     protected static function getModelLabelFromResource(string $modelClass): string
     {
-        $resourceClass = Filament::getModelResource($modelClass);
+        $resourceClass = FilamentFlexibleContentBlockPages::getModelResource($modelClass);
 
         if ($resourceClass) {
             try {

src/Http/Controllers/AbstractSeoPageController.php

@@ -99,7 +99,7 @@ protected function setBasicSEO(Page $page)
         SEOTools::setDescription(($page->seo_description ?? strip_tags($page->intro)));
         SEOTools::opengraph()->setUrl(url()->current());
 
-        if($page->seo_keywords){
+        if ($page->seo_keywords) {
             SEOMeta::setKeywords($page->seo_keywords);
         }
     }

src/Http/Controllers/SeoTagController.php

@@ -28,7 +28,7 @@ public function index(Tag $tag): View
         }
 
         // Return not found when the tag type does not have seo pages enabled
-        if ($tag->tagType->has_seo_pages) {
+        if (! $tag->tagType->has_seo_pages) {
             abort(404);
         }
 
@@ -118,7 +118,7 @@ private function createModelLabelsLookup(): array
         $enabledModels = FilamentFlexibleContentBlockPages::config()->getTagPageEnabledModels();
 
         foreach ($enabledModels as $modelClass) {
-            $resourceClass = Filament::getModelResource($modelClass);
+            $resourceClass = FilamentFlexibleContentBlockPages::getModelResource($modelClass);
             /** @var resource|null $resourceClass */
             $labels[$modelClass] = $resourceClass ? $resourceClass::getModelLabel() : class_basename($modelClass);
         }

src/Http/Middleware/RedirectsMissingPages.php

@@ -22,7 +22,7 @@ public function handle(Request $request, Closure $next)
         if ($request->query->count() > 0 && $this->shouldRedirect($response)) {
             // make sure we do not lose the query string:
             /** @var RedirectResponse $response */
-            if (! Str::contains($response->getTargetUrl(), '?')) {
+            if (method_exists($response, 'getTargetUrl') && ! Str::contains($response->getTargetUrl(), '?')) {
                 $response->setTargetUrl($response->getTargetUrl().'?'.$request->getQueryString());
             }
         }

src/Resources/MenuResource/Pages/ManageMenuItems.php

@@ -174,7 +174,7 @@ protected function getMenuItemTypeDescription(MenuItem $record): string
 
     protected function getModelLabelFromResource(string $modelClass): string
     {
-        $resourceClass = Filament::getModelResource($modelClass);
+        $resourceClass = FilamentFlexibleContentBlockPages::getModelResource($modelClass);
 
         if ($resourceClass) {
             try {
@@ -189,7 +189,7 @@ protected function getModelLabelFromResource(string $modelClass): string
 
     protected function getModelIconFromResource(string $modelClass): ?string
     {
-        $resourceClass = Filament::getModelResource($modelClass);
+        $resourceClass = FilamentFlexibleContentBlockPages::getModelResource($modelClass);
 
         if ($resourceClass) {
             try {

src/Services/TagPageService.php

@@ -2,7 +2,6 @@
 
 namespace Statikbe\FilamentFlexibleContentBlockPages\Services;
 
-use Filament\Facades\Filament;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
@@ -166,8 +165,8 @@ public function getContentCounts(Tag $tag): array
 
             if ($count > 0) {
                 /** @var class-string<\Filament\Resources\Resource>|null $resourceClass */
-                $resourceClass = Filament::getModelResource($modelClass);
-                $label = $resourceClass ? ($count === 1 ? $resourceClass::getModelLabel() : $resourceClass::getPluralLabel()) : class_basename($modelClass);
+                $resourceClass = FilamentFlexibleContentBlockPages::getModelResource($modelClass);
+                $label = $resourceClass ? ($count === 1 ? $resourceClass::getModelLabel() : $resourceClass::getPluralModelLabel()) : class_basename($modelClass);
                 $counts[$label] = $count;
             }
         }