Merge branch 'origin/2.x' into 3a441865-aa1e-43ff-be2c-56ef198d17b0

Resolved conflicts in:
- packages/core/tests/Feature/FileUploadWithMediaTest.php
- packages/media/src/MediaServiceProvider.php
- packages/media/src/Models/Media.php
- packages/media/src/Resources/MediaResource.php
- packages/uploadcare-field/src/Uploadcare.php
- packages/uploadcare-field/src/UploadcareFieldServiceProvider.php
- tests/Feature/FileUploadWithMediaTest.php
- tests/Feature/OriginalFileControllerTest.php

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: Baspa

database/migrations/2025_12_17_000001_repair_uploadcare_media_relationships.php

@@ -1,5 +1,6 @@
 <?php
 
+use Backstage\Media\Models\Media;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
@@ -19,9 +20,9 @@ public function up(): void
 
         $firstSiteUlid = DB::table('sites')->orderBy('ulid')->value('ulid');
 
-        $mediaModelClass = config('backstage.media.model', \Backstage\Media\Models\Media::class);
+        $mediaModelClass = config('backstage.media.model', Media::class);
         if (! is_string($mediaModelClass) || ! class_exists($mediaModelClass)) {
-            $mediaModelClass = \Backstage\Media\Models\Media::class;
+            $mediaModelClass = Media::class;
         }
 
         $mediaTable = app($mediaModelClass)->getTable();

src/Uploadcare.php

@@ -9,10 +9,12 @@
 use Backstage\Fields\Fields\Base;
 use Backstage\Fields\Models\Field;
 use Backstage\Media\Forms\Components\MediaGridPicker;
+use Backstage\Models\ContentFieldValue;
 use Backstage\Uploadcare\Enums\Style;
 use Backstage\Uploadcare\Forms\Components\Uploadcare as Input;
 use Filament\Actions\Action;
 use Filament\Facades\Filament;
+use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
@@ -22,6 +24,7 @@
 use Filament\Support\Icons\Heroicon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 
 class Uploadcare extends Base implements FieldContract, HydratesValues, HydratesValuesForFilament, HydratesValuesForFrontend
@@ -138,7 +141,7 @@ public static function make(string $name, Field $field): Input
                                     }
                                 }
 
-                                $fieldValue = \Backstage\Models\ContentFieldValue::where('content_ulid', $record->getKey())
+                                $fieldValue = ContentFieldValue::where('content_ulid', $record->getKey())
                                     ->where(function ($query) use ($fieldUlid) {
                                         $query->where('field_ulid', $fieldUlid)
                                             ->orWhere('ulid', $fieldUlid);
@@ -173,7 +176,7 @@ public static function make(string $name, Field $field): Input
                                     if ($m->relationLoaded('pivot') && $m->pivot) {
                                         $contextModel->setRelation('pivot', $m->pivot);
                                     } else {
-                                        $dummyPivot = new \Backstage\Models\ContentFieldValue;
+                                        $dummyPivot = new ContentFieldValue;
                                         $dummyPivot->setAttribute('meta', null);
                                         $contextModel->setRelation('pivot', $dummyPivot);
                                     }
@@ -300,7 +303,7 @@ public static function make(string $name, Field $field): Input
                         ->perPage(12)
                         ->multiple($isMultiple)
                         ->acceptedFileTypes($acceptedFileTypes),
-                    \Filament\Forms\Components\Hidden::make('selected_media_uuid')
+                    Hidden::make('selected_media_uuid')
                         ->default(null)
                         ->dehydrated()
                         ->live(),
@@ -457,15 +460,15 @@ public static function mutateFormDataCallback(Model $record, Field $field, array
         if (self::isMediaUlidArray($values)) {
             $mediaData = null;
 
-            if ($record->exists && class_exists(\Backstage\Models\ContentFieldValue::class)) {
+            if ($record->exists && class_exists(ContentFieldValue::class)) {
                 try {
-                    $cfv = \Backstage\Models\ContentFieldValue::where('content_ulid', $record->ulid)
+                    $cfv = ContentFieldValue::where('content_ulid', $record->ulid)
                         ->where('field_ulid', $field->ulid)
                         ->first();
 
                     if ($cfv) {
                         $models = self::hydrateFromModel($cfv, $values, true);
-                        if ($models && $models instanceof \Illuminate\Support\Collection) {
+                        if ($models && $models instanceof Collection) {
                             $mediaData = $models->map(fn ($m) => self::mapMediaToValue($m))->values()->all();
                         }
                     }

src/UploadcareFieldServiceProvider.php

@@ -2,8 +2,16 @@
 
 namespace Backstage\UploadcareField;
 
+use Backstage\Fields\Fields;
+use Backstage\Media\Events\MediaUploading;
+use Backstage\Media\Models\Media;
+use Backstage\Models\ContentFieldValue;
+use Backstage\UploadcareField\Listeners\CreateMediaFromUploadcare;
+use Backstage\UploadcareField\Livewire\MediaGridPicker;
+use Backstage\UploadcareField\Observers\ContentFieldValueObserver;
 use Filament\Support\Assets\Css;
 use Filament\Support\Facades\FilamentAsset;
+use Illuminate\Support\Facades\Event;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
 
@@ -28,22 +36,22 @@ public function packageBooted(): void
             Css::make('uploadcare-field', __DIR__ . '/../resources/dist/uploadcare-field.css'),
         ], 'backstage/uploadcare-field');
 
-        \Illuminate\Support\Facades\Event::listen(
-            \Backstage\Media\Events\MediaUploading::class,
-            \Backstage\UploadcareField\Listeners\CreateMediaFromUploadcare::class,
+        Event::listen(
+            MediaUploading::class,
+            CreateMediaFromUploadcare::class,
         );
 
-        \Backstage\Models\ContentFieldValue::observe(\Backstage\UploadcareField\Observers\ContentFieldValueObserver::class);
+        ContentFieldValue::observe(ContentFieldValueObserver::class);
 
-        \Backstage\Fields\Fields::registerField(\Backstage\UploadcareField\Uploadcare::class);
+        Fields::registerField(Uploadcare::class);
     }
 
     public function bootingPackage(): void
     {
         $this->loadViewsFrom(__DIR__ . '/../resources/views', 'backstage-uploadcare-field');
 
         // Register Media src resolver
-        \Backstage\Media\Models\Media::resolveSrcUsing(function ($media) {
+        Media::resolveSrcUsing(function ($media) {
             if ($media->metadata && isset($media->metadata['cdnUrl'])) {
                 $cdnUrl = $media->metadata['cdnUrl'];
                 if (filter_var($cdnUrl, FILTER_VALIDATE_URL)) {
@@ -53,5 +61,8 @@ public function bootingPackage(): void
 
             return null;
         });
+
+        // Register Livewire components
+        $this->app->make('livewire')->component('backstage-uploadcare-field::media-grid-picker', MediaGridPicker::class);
     }
 }