Merge remote-tracking branch 'origin/develop'

* origin/develop:
  Fix styling
  update composer version
  remove using for aceEditor
  Fix styling
  try fix morph map error
  Fix styling

Author: cklei-carly

composer.json

@@ -22,12 +22,11 @@
         }
     ],
     "require": {
-        "php": "^8.2",
-        "laravel/framework": "^11.0",
+        "php": ">=8.2",
+        "laravel/framework": "^11.0|^12.0",
         "filament/spatie-laravel-translatable-plugin": "^3.2",
         "guava/filament-icon-picker": "^2.0",
         "pboivin/filament-peek": "^2.0",
-        "riodwanto/filament-ace-editor": "^1.0",
         "solution-forest/filament-field-group": "^1.0.10",
         "solution-forest/filament-tree": "^2.1.0",
         "solution-forest/inspirecms-support": "self.version",
@@ -37,10 +36,10 @@
     "require-dev": {
         "laravel/pint": "^1.0",
         "nunomaduro/collision": "^8.0",
-        "orchestra/testbench": "^9.0",
-        "pestphp/pest": "^2.0",
-        "pestphp/pest-plugin-arch": "^2.0",
-        "pestphp/pest-plugin-laravel": "^2.0",
+        "orchestra/testbench": "^9.0|^10.0",
+        "pestphp/pest": "^2.0|^3.0",
+        "pestphp/pest-plugin-arch": "^2.0|^3.0",
+        "pestphp/pest-plugin-laravel": "^2.0|^3.0",
         "spatie/laravel-ray": "^1.26"
     },
     "autoload": {

resources/views/filament/infolists/entries/json-entry.blade.php

@@ -118,20 +118,43 @@ public static function infolist(Infolist $infolist): Infolist
                             ->label(__('inspirecms::resources/export.exporter.label'))
                             ->inlineLabel(),
 
-                        \SolutionForest\InspireCms\Filament\Infolists\Components\JsonEntry::make('payload')
+                        Infolists\Components\TextEntry::make('process_message')
                             ->label(__('inspirecms::resources/export.message.label'))
                             ->columnSpanFull()
-                            ->darkTheme('tomorrow_night_eighties')
+                            ->size('xs')->color('gray')
+                            ->extraAttributes([
+                                'class' => 'bg-gray-100 dark:bg-gray-800 rounded-md p-2 overflow-x-auto',
+                            ])
                             ->getStateUsing(function ($record) {
                                 $payload = $record->payload;
+                                if (! is_array($payload)) {
+                                    return '';
+                                }
+                                $arr = Arr::except($payload, ['result']);
 
-                                return collect($payload)->except('result')->all();
+                                return str(json_encode($arr, JSON_PRETTY_PRINT))->wrap('<code>', '</code>')->wrap('<pre>', '</pre>')->toHtmlString();
                             }),
 
-                        \SolutionForest\InspireCms\Filament\Infolists\Components\JsonEntry::make('payload.result')
+                        Infolists\Components\TextEntry::make('result')
                             ->label(__('inspirecms::resources/export.result.label'))
                             ->columnSpanFull()
-                            ->darkTheme('tomorrow_night_eighties'),
+                            ->size('xs')->color('gray')
+                            ->extraAttributes([
+                                'class' => 'bg-gray-100 dark:bg-gray-800 rounded-md p-2 overflow-x-auto',
+                            ])
+                            ->html()
+                            ->getStateUsing(function ($record) {
+                                $payload = $record->payload;
+                                if (! is_array($payload)) {
+                                    return '';
+                                }
+                                $arr = $payload['result'] ?? [];
+                                if (! is_array($arr)) {
+                                    $arr = [$arr];
+                                }
+
+                                return str(json_encode($arr, JSON_PRETTY_PRINT))->wrap('<code>', '</code>')->wrap('<pre>', '</pre>')->toHtmlString();
+                            }),
                     ]),
             ]);
     }

src/Filament/Infolists/Components/JsonEntry.php

@@ -5,7 +5,6 @@
 use Filament\Forms;
 use Filament\Support\Facades\FilamentIcon;
 use Illuminate\Support\Str;
-use Riodwanto\FilamentAceEditor\AceEditor;
 use SolutionForest\InspireCms\InspireCmsConfig;
 
 class TemplateResourceHelper
@@ -34,15 +33,11 @@ public static function getThemeFormComponent()
 
     /**
      * @param  string  $name
-     * @return Forms\Components\Field|Forms\Components\Component|AceEditor
+     * @return Forms\Components\Field|Forms\Components\Component
      */
     public static function getContentFormComponent($name = 'content')
     {
-        return AceEditor::make($name)
-            ->label(__('inspirecms::resources/template.content.label'))
-            ->mode('php')
-            ->darkTheme('tomorrow_night_eighties')
-            ->height('48rem');
+        return \Dotswan\FilamentCodeEditor\Fields\CodeEditor::make($name);
     }
 
     /** @return Forms\Components\Field|Forms\Components\Component */

src/Filament/Resources/ExportResource.php

@@ -116,10 +116,21 @@ public static function infolist(Infolist $infolist): Infolist
                     ))
                     ->copyable()->copyableState(fn ($record) => $record->author?->email),
 
-                \SolutionForest\InspireCms\Filament\Infolists\Components\JsonEntry::make('payload')
+                Infolists\Components\TextEntry::make('payload')
                     ->label(__('inspirecms::resources/import.payload.label'))
                     ->columnSpanFull()
-                    ->darkTheme('tomorrow_night_eighties'),
+                    ->size('xs')->color('gray')
+                    ->extraAttributes([
+                        'class' => 'bg-gray-100 dark:bg-gray-800 rounded-md p-2 overflow-x-auto',
+                    ])
+                    ->getStateUsing(function ($record) {
+                        $payload = $record->payload;
+                        if (! is_array($payload)) {
+                            return '';
+                        }
+
+                        return str(json_encode($payload, JSON_PRETTY_PRINT))->wrap('<code>', '</code>')->wrap('<pre>', '</pre>')->toHtmlString();
+                    }),
             ]);
     }
 

src/Filament/Resources/Helpers/TemplateResourceHelper.php

@@ -61,7 +61,7 @@ public function table(Table $table): Table
                     })
                     ->form([
                         TemplateResourceHelper::getThemeFormComponent()->disabled(),
-                        TemplateResourceHelper::getContentFormComponent(),
+                        TemplateResourceHelper::getContentFormComponent()->isReadOnly(true),
                     ])
                     ->mutateRecordDataUsing(fn (Template $record) => [
                         'theme' => $this->theme,

src/Filament/Resources/ImportResource.php

@@ -9,7 +9,6 @@
 use Filament\Support\Facades\FilamentAsset;
 use Filament\Support\Facades\FilamentIcon;
 use Illuminate\Auth\Events as AuthEvents;
-use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Foundation\Console\AboutCommand;
 use Illuminate\Support\Arr;
@@ -102,8 +101,6 @@ public function registeringPackage(): void
 
     public function packageRegistered(): void
     {
-        $this->registerPolymorphism();
-
         $this->app->singleton(BaseManifests\ModelManifestInterface::class, fn () => $this->app->make(BaseManifests\ModelManifest::class));
         $this->app->singleton(BaseManifests\ContentStatusManifestInterface::class, fn () => $this->app->make(BaseManifests\ContentStatusManifest::class));
         $this->app->singleton(BaseManifests\PermissionManifestInterface::class, fn () => $this->app->make(BaseManifests\PermissionManifest::class));
@@ -299,18 +296,6 @@ protected function getMigrations(): array
         ];
     }
 
-    /**
-     * Register Polymorphic Types
-     */
-    protected function registerPolymorphism(): void
-    {
-        $map = Arr::pluck(InspireCmsConfig::get('models'), 'fqcn', 'polymorphic_type');
-
-        if (! empty($map)) {
-            Relation::enforceMorphMap($map);
-        }
-    }
-
     protected function registerModels(): void
     {
         Facades\ModelManifest::register();