feat: integrate Mediapicker with CMS models and update attachment handling

Author: Farish278

src/CmsServiceProvider.php

@@ -15,6 +15,13 @@
 use Javaabu\Cms\Policies\PostPolicy;
 use Javaabu\Cms\Policies\PostTypePolicy;
 use Javaabu\Cms\Console\Commands\SetupCmsCommand;
+use Javaabu\Cms\Http\Controllers\Admin\MediaController;
+use Javaabu\Cms\Media\Media as CmsMedia;
+use Javaabu\Mediapicker\Http\Controllers\MediaController as MediapickerMediaController;
+use Javaabu\Mediapicker\MediapickerServiceProvider;
+use Javaabu\Mediapicker\Models\Media as MediapickerMedia;
+use ReflectionClass;
+use Spatie\MediaLibrary\MediaCollections\Models\Media as SpatieMedia;
 
 class CmsServiceProvider extends ServiceProvider
 {
@@ -46,11 +53,12 @@ public function boot()
             'category'       => config('cms.models.category', Category::class),
             'category_type'  => config('cms.models.category_type', CategoryType::class),
             'tag'            => config('cms.models.tag', Tag::class),
-            'media'          => \Javaabu\Cms\Media\Media::class,
+            'media'          => CmsMedia::class,
         ]);
 
         // Load migrations
         $this->loadMigrationsFrom(__DIR__ . '/../database/migrations');
+        $this->loadMediapickerMigrations();
 
         // Load views
         $this->loadViewsFrom(__DIR__ . '/../resources/views', 'cms');
@@ -88,7 +96,7 @@ public function boot()
     protected function registerPolicies()
     {
         foreach ($this->policies as $key => $policy) {
-            $model = $key == 'media' ? \Javaabu\Cms\Media\Media::class : config("cms.models.$key");
+            $model = $key == 'media' ? CmsMedia::class : config("cms.models.$key");
 
             if ($model) {
                 Gate::policy($model, $policy);
@@ -107,6 +115,8 @@ public function register()
 
         // Merge package config with user defined config
         $this->mergeConfigFrom(__DIR__ . '/../config/cms.php', 'cms');
+        $this->app->register(MediapickerServiceProvider::class);
+        $this->configureMediapickerDefaults();
 
         if ($this->app->runningInConsole()) {
             // Register commands
@@ -118,6 +128,32 @@ public function register()
         // Register facades or singletons if needed
         $this->app->register(\Javaabu\Cms\Enums\RootSlugs\RootSlugsServiceProvider::class);
     }
+
+    protected function configureMediapickerDefaults(): void
+    {
+        $this->setConfigDefault('mediapicker.media_model', CmsMedia::class, MediapickerMedia::class);
+        $this->setConfigDefault('mediapicker.media_controller', MediaController::class, MediapickerMediaController::class);
+        $this->setConfigDefault('media-library.media_model', CmsMedia::class, SpatieMedia::class);
+    }
+
+    protected function setConfigDefault(string $key, mixed $value, mixed $packageDefault = null): void
+    {
+        $current = config($key);
+
+        if (is_null($current) || $current === $packageDefault) {
+            config([$key => $value]);
+        }
+    }
+
+    protected function loadMediapickerMigrations(): void
+    {
+        $provider = new ReflectionClass(MediapickerServiceProvider::class);
+        $migrations = dirname($provider->getFileName(), 2) . '/database/migrations';
+
+        if (is_dir($migrations)) {
+            $this->loadMigrationsFrom($migrations);
+        }
+    }
 }
 
 

src/Http/Controllers/Admin/MediaController.php

@@ -234,7 +234,7 @@ public function store(MediaRequest $request)
      * @param Media $media
      * @return Response
      */
-    public function show($locale, Media $media)
+    public function show(Media $media)
     {
         return redirect()->to($media->url('edit'));
     }
@@ -245,7 +245,7 @@ public function show($locale, Media $media)
      * @param Media $media
      * @return Response
      */
-    public function edit($locale, Media $media)
+    public function edit(Media $media)
     {
         if (method_exists($media, 'dontShowTranslationFallbacks')) {
             $media->dontShowTranslationFallbacks();
@@ -260,7 +260,7 @@ public function edit($locale, Media $media)
      * @param Media $media
      * @return JsonResponse|RedirectResponse
      */
-    public function update(MediaRequest $request, $locale, Media $media)
+    public function update(MediaRequest $request, Media $media)
     {
         // If this is not a translation, set lang
         if ((! $request->input('is_translation')) && $request->input('lang')) {
@@ -305,7 +305,7 @@ public function update(MediaRequest $request, $locale, Media $media)
      * @return Response
      * @throws Exception
      */
-    public function destroy($locale, Media $media, Request $request)
+    public function destroy(Media $media, Request $request)
     {
         if (! $media->delete()) {
             if ($request->expectsJson()) {
@@ -318,7 +318,7 @@ public function destroy($locale, Media $media, Request $request)
             return response()->json(true);
         }
 
-        return redirect()->action('Admin\\MediaController@index');
+        return redirect()->to(translate_route('admin.media.index'));
     }
 
     /**
@@ -328,7 +328,7 @@ public function destroy($locale, Media $media, Request $request)
      * @return Response
      * @internal param Inquiry $inquiry
      */
-    public function bulk($locale, Request $request)
+    public function bulk(Request $request)
     {
         $this->authorize('create', Media::class);