Fix translatable asset controller: make sure the locale is properly p…

…assed
statikbe · Nov 18, 2024 · 8d1b494 · 8d1b494
1 parent 5d4c2ac
commit 8d1b494
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 6 deletions.
diff --git a/resources/lang/en/filament-flexible-blocks-asset-manager.php b/resources/lang/en/filament-flexible-blocks-asset-manager.php
@@ -7,4 +7,7 @@
     'form_component.name_lbl' => 'Name',
     'form_component.asset_media_lbl' => 'File',
     'navigation_group' => 'Settings',
+    'error' => [
+        'asset_media_not_found' => 'The asset media was not found',
+    ],
 ];
diff --git a/resources/lang/fr/filament-flexible-blocks-asset-manager.php b/resources/lang/fr/filament-flexible-blocks-asset-manager.php
@@ -7,4 +7,7 @@
     'form_component.name_lbl' => 'Nom',
     'form_component.asset_media_lbl' => 'Fichier',
     'navigation_group' => 'Preferences',
+    'error' => [
+        'asset_media_not_found' => 'Le média de la ressource n\'a pas été trouvé.',
+    ],
 ];
diff --git a/resources/lang/nl/filament-flexible-blocks-asset-manager.php b/resources/lang/nl/filament-flexible-blocks-asset-manager.php
@@ -7,4 +7,7 @@
     'form_component.name_lbl' => 'Naam',
     'form_component.asset_media_lbl' => 'Bestand',
     'navigation_group' => 'Instellingen',
+    'error' => [
+        'asset_media_not_found' => 'Het bestand werd niet gevonden',
+    ],
 ];
diff --git a/src/Http/Controllers/AssetController.php b/src/Http/Controllers/AssetController.php
@@ -4,6 +4,8 @@
 
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Gate;
+use Spatie\MediaLibrary\InteractsWithMedia;
+use Spatie\MediaLibrary\MediaCollections\Models\Media;
 use Statikbe\FilamentFlexibleBlocksAssetManager\FilamentFlexibleBlocksAssetManagerConfig;
 
 class AssetController
@@ -20,16 +22,32 @@ public function index(string $assetId, ?string $locale = null)
             }
         }
 
-        //TODO conversions
-        $filters = [];
-        if ($locale) {
-            $filters = ['locale' => $locale];
+        $assetMedia = $this->getAssetMedia($asset, $locale);
+
+        if (! $assetMedia) {
+            abort(Response::HTTP_NOT_FOUND, trans('filament-flexible-blocks-asset-manager::filament-flexible-blocks-asset-manager.error.asset_media_not_found'));
         }
 
-        return $asset
-            ->getFirstMedia($asset->getAssetCollection(), $filters)
+        return $assetMedia
             ->setCustomHeaders([
                 'X-Robots-Tag' => 'none', //equivalent to noindex, nofollow.
             ]);
     }
+
+    private function getAssetMedia(InteractsWithMedia $asset, ?string $locale = null): ?Media
+    {
+        //TODO conversions
+        $assetMedia = null;
+        if (! $locale && FilamentFlexibleBlocksAssetManagerConfig::hasTranslatableAssets()) {
+            $locale = app()->getLocale();
+            $filters = ['locale' => $locale];
+            $assetMedia = $asset->getFirstMedia($asset->getAssetCollection(), $filters);
+        }
+
+        if (! $assetMedia) {
+            $assetMedia = $asset->getFirstMedia($asset->getAssetCollection());
+        }
+
+        return $assetMedia;
+    }
 }
diff --git a/src/Models/Asset.php b/src/Models/Asset.php
@@ -8,6 +8,7 @@
 use Spatie\MediaLibrary\InteractsWithMedia;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
 use Spatie\Translatable\HasTranslations;
+use Statikbe\FilamentFlexibleBlocksAssetManager\FilamentFlexibleBlocksAssetManagerConfig;
 use Statikbe\FilamentFlexibleContentBlocks\Models\Concerns\HasTranslatedMediaTrait;
 use Statikbe\FilamentFlexibleContentBlocks\Models\Contracts\HasTranslatableMedia;
 use Statikbe\FilamentFlexibleContentBlocks\Models\Contracts\Linkable;
@@ -48,6 +49,11 @@ public function getAssetCollection(): string
 
     public function getViewUrl(?string $locale = null): string
     {
+        //add current locale if not passed, the asset controller will use the default locale if none is passed.
+        if (! $locale && FilamentFlexibleBlocksAssetManagerConfig::hasTranslatableAssets()) {
+            $locale = app()->getLocale();
+        }
+
         return route('filament-flexible-blocks-asset-manager.asset_index', [
             'assetId' => $this,
             'locale' => $locale,