Merge branch 'develop'

cklei-carly · cklei-carly · commit c90158a7ddae · 2025-03-17T17:35:57.000+08:00
* develop:
  Fix styling
  update exporter, export templates+fields+content for DocumentType
  Bugfix: have error onrender if content have ogImage
  add config to allow skip authorizstion for super admin
  Bugfix: only can select all permission while creating new role
diff --git a/config/inspirecms.php b/config/inspirecms.php
@@ -33,6 +33,13 @@
          * The number of minutes to lock the user out for after the maximum number of failed login attempts is reached.
          */
         'lockout_duration' => 120,
+
+        /**
+         * Skip authentication for super admin users.
+         *
+         * Allowed values: before, after, none
+         */
+        'skip_super_admin_check' => 'before',
     ],
 
     'avatar' => [
diff --git a/src/Base/TemplateManager.php b/src/Base/TemplateManager.php
@@ -77,7 +77,7 @@ public function getComponentPathWithTheme(?string $componentName = null, ?string
         }
 
         if (filled($componentName)) {
-            $path .= '/' . $this->ensureViewFileName($componentName);
+            $path .= '/' . TemplateHelper::ensureViewFileNameForTemplate($componentName);
         }
 
         return $path;
@@ -173,25 +173,6 @@ public function exportTemplate($template, ?string $theme = null): void
         }
     }
 
-    private static function ensureTemplateFileBaseName(string $slug): string
-    {
-        return str($slug)
-            ->trim()->trim('.')->trim('/')
-            ->snake()
-            ->replace(['-', ' '], '-')
-            ->toString();
-    }
-
-    private static function ensureViewFileName(string $name)
-    {
-        return str($name)
-            ->trim()
-            ->replace('.', '/')
-            ->trim('/')
-            ->finish('.blade.php')
-            ->toString();
-    }
-
     private function loadCurrentTheme()
     {
         if ($this->theme) {
diff --git a/src/CmsPanelProvider.php b/src/CmsPanelProvider.php
@@ -96,13 +96,20 @@ public function panel(Panel $panel): Panel
             ])
             ->bootUsing(function () {
 
-                // Gate for super admin
-                Gate::before(function ($user, $ability) {
-                    if ($user && is_inspirecms_user($user) && $user->isSuperAdmin()) {
-                        return true;
-                    }
-                });
-
+                $skipSuperAdminCheck = InspireCmsConfig::get('auth.skip_super_admin_check');
+                if ($skipSuperAdminCheck == 'before') {
+                    Gate::before(function ($user, $ability) {
+                        if ($user && is_inspirecms_user($user) && $user->isSuperAdmin()) {
+                            return true;
+                        }
+                    });
+                } elseif ($skipSuperAdminCheck == 'after') {
+                    Gate::after(function ($user, $ability) {
+                        if ($user && is_inspirecms_user($user) && $user->isSuperAdmin()) {
+                            return true;
+                        }
+                    });
+                }
             });
 
         $this->configurePlugins($panel);
diff --git a/src/Dtos/SeoDto.php b/src/Dtos/SeoDto.php
@@ -273,7 +273,7 @@ public function __toString(): string
             $html .= "<meta property=\"og:description\" content=\"{$this->ogDescription}\">\n";
         }
 
-        if ($this->ogImage && ($mediaAssetUrl = inspirecms_asset()->getAssetUrl($this->ogImage))) {
+        if ($this->ogImage && ($mediaAssetUrl = inspirecms_asset()->findByKey($this->ogImage)?->getUrl())) {
             $html .= "<meta property=\"og:image\" content=\"{$mediaAssetUrl}\">\n";
         }
 
diff --git a/src/Exports/Exporters/BaseExporter.php b/src/Exports/Exporters/BaseExporter.php
@@ -6,7 +6,9 @@
 use Illuminate\Support\Str;
 use SolutionForest\InspireCms\Exports\ExportResult;
 use SolutionForest\InspireCms\Helpers\FileHelper;
+use SolutionForest\InspireCms\Helpers\TemplateHelper;
 use SolutionForest\InspireCms\ImportData\Entities as ImportDataEntities;
+use SolutionForest\InspireCms\Models\Contracts\Content;
 use SolutionForest\InspireCms\Models\Contracts\DocumentType;
 use SolutionForest\InspireCms\Models\Contracts\Export;
 use SolutionForest\InspireCms\Models\Contracts\FieldGroup;
@@ -101,34 +103,44 @@ protected function ensureTempFolderForExport(string $folderPrefix, array $subFol
         return array_merge([$folderName], $tmpFolderData);
     }
 
+    /**
+     * @return string | array
+     */
     protected function generateImportFileName(Model $record)
     {
         switch (true) {
+
             case $record instanceof DocumentType:
+            case $record instanceof Content:
                 return $record->slug . '.json';
 
             case $record instanceof FieldGroup:
                 return Str::replace('_', '-', $record->name) . '.json';
 
-                // case $record instanceof Template:
-                //     if (is_array($record->content)) {
-                //         $themes = array_keys($record->content);
-                //     } else {
-                //         $themes = [inspirecms_templates()->getCurrentTheme()];
-                //     }
-                //     return collect($themes)
-                //         ->filter()
-                //         ->unique()
-                //         ->map(fn ($theme) => $record->slug . '/' . "$theme.blade.php")
-                //         ->toArray();
+            case $record instanceof Template:
+                if (is_array($record->content)) {
+                    $themes = array_keys($record->content);
+                } else {
+                    $themes = [inspirecms_templates()->getCurrentTheme()];
+                }
+
+                return collect($themes)
+                    ->filter()
+                    ->unique()
+                    ->mapWithKeys(fn ($theme) => [$theme => $record->slug . '/' . TemplateHelper::ensureViewFileNameForTemplate($theme)])
+                    ->toArray();
         }
 
         return $record->getKey() . '.json';
     }
 
+    /**
+     * @return array|bool|string
+     */
     protected function prepareImportContentFromModel(Model $record)
     {
         switch (true) {
+
             case $record instanceof DocumentType:
                 $array = ImportDataEntities\DocumentType::fromRecord($record)->toExportArray();
 
@@ -145,6 +157,11 @@ protected function prepareImportContentFromModel(Model $record)
                 //         $themeContent = [inspirecms_templates()->getCurrentTheme() => $themeContent];
                 //     }
                 //     return $themeContent;
+
+            case $record instanceof Content:
+                $array = ImportDataEntities\Content::fromRecord($record)->toExportArray();
+
+                return json_encode($array, JSON_PRETTY_PRINT);
         }
 
         return '';
@@ -182,15 +199,39 @@ protected function handleExportCompletion(string $folderName, $processingErrors)
     protected function processRecordForImportUsed(Model $record, $fs, ?string $dir, array &$errors)
     {
         try {
-            $content = $this->prepareImportContentFromModel($record);
+
             $filename = $this->generateImportFileName($record);
-            $path = $dir . '/' . $filename;
 
-            $fs->put($path, $content);
+            if ($record instanceof Template && is_array($filename)) {
+
+                foreach ($filename as $theme => $templateFilePath) {
+
+                    $templateContent = $record->getContent($theme);
+
+                    $path = $dir . '/' . trim($templateFilePath, '/');
+
+                    $fs->put($path, $templateContent);
+                }
+
+            } elseif (! is_string($filename)) {
+                $errors[] = [
+                    'record' => $record->getKey(),
+                    'model' => get_class($record),
+                    'message' => 'Invalid filename',
+                ];
+            } else {
+
+                $content = $this->prepareImportContentFromModel($record);
+
+                $path = $dir . '/' . $filename;
+                $fs->put($path, $content);
+
+            }
 
         } catch (\Throwable $th) {
             $errors[] = [
                 'record' => $record->getKey(),
+                'model' => get_class($record),
                 'message' => $th->getMessage(),
             ];
         }
diff --git a/src/Exports/Exporters/DocumentTypeExporter.php b/src/Exports/Exporters/DocumentTypeExporter.php
@@ -3,6 +3,7 @@
 namespace SolutionForest\InspireCms\Exports\Exporters;
 
 use Filament\Forms\Components\CheckboxList;
+use Filament\Forms\Components\Toggle;
 use Illuminate\Support\Arr;
 use SolutionForest\InspireCms\Exports\ExportResult;
 use SolutionForest\InspireCms\Helpers\ImportDataHelper;
@@ -17,6 +18,10 @@ public static function getArgsFormFields(): array
         $descriptions = $records->map(fn ($record) => $record->slug)->all();
 
         return [
+            Toggle::make('with_content')
+                ->label('With Content')
+                ->hint('Export content records along with document types')
+                ->default(true),
             CheckboxList::make('filter_record')
                 ->label('Filter Records')
                 ->hint('Keep empty to export all records.')
@@ -32,6 +37,9 @@ public function export()
     {
         [$folderName, $fs, $fullPath, $subFolders] = $this->ensureTempFolderForExport('export-document-types', [
             ImportDataHelper::FOLDER_IDENTIFIER_DOCUMENTTYPE,
+            ImportDataHelper::FOLDER_IDENTIFIER_FIELDGROUP,
+            ImportDataHelper::FOLDER_IDENTIFIER_TEMPLATE,
+            ImportDataHelper::FOLDER_IDENTIFIER_CONTENT,
         ]);
 
         [$records, $perPage, $page] = $this->getDocumentTypeRecords();
@@ -42,9 +50,40 @@ public function export()
             $this->processRecordForImportUsed(
                 $record,
                 $fs,
-                (Arr::first($subFolders) ?? $folderName),
+                (Arr::get($subFolders, ImportDataHelper::FOLDER_IDENTIFIER_DOCUMENTTYPE) ?? $folderName),
                 $errors,
             );
+
+            foreach ($record->fieldGroups as $fieldGroup) {
+
+                $this->processRecordForImportUsed(
+                    $fieldGroup,
+                    $fs,
+                    (Arr::get($subFolders, ImportDataHelper::FOLDER_IDENTIFIER_FIELDGROUP) ?? $folderName),
+                    $errors,
+                );
+            }
+
+            foreach ($record->templates as $template) {
+
+                $this->processRecordForImportUsed(
+                    $template,
+                    $fs,
+                    (Arr::get($subFolders, ImportDataHelper::FOLDER_IDENTIFIER_TEMPLATE) ?? $folderName),
+                    $errors,
+                );
+            }
+
+            foreach ($record->content as $content) {
+
+                $this->processRecordForImportUsed(
+                    $content,
+                    $fs,
+                    (Arr::get($subFolders, ImportDataHelper::FOLDER_IDENTIFIER_CONTENT) ?? $folderName),
+                    $errors,
+                );
+            }
+
         }
 
         $processingErrors = array_merge(
@@ -72,7 +111,21 @@ private function getDocumentTypeRecords()
 
         $args = $this->record->getArgsForExporter();
 
-        $query = static::getModel()::query()->with(['fieldGroups', 'templates', 'allowedDocumentTypes']);
+        $relations = [
+            'fieldGroups',
+            'templates',
+            'allowedDocumentTypes',
+            'content',
+        ];
+
+        if ($args['with_content'] ?? false) {
+            $relations[] = 'content.parent.path';
+            $relations[] = 'content.sitemap';
+            $relations[] = 'content.webSetting';
+            $relations[] = 'content.documentType';
+        }
+
+        $query = static::getModel()::query()->with($relations);
 
         if (! empty($args['filter_record'])) {
             $query->whereKey($args['filter_record']);
diff --git a/src/Exports/Exporters/TemplateExporter.php b/src/Exports/Exporters/TemplateExporter.php
@@ -2,7 +2,6 @@
 
 namespace SolutionForest\InspireCms\Exports\Exporters;
 
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
 use SolutionForest\InspireCms\Exports\ExportResult;
 use SolutionForest\InspireCms\Helpers\ImportDataHelper;
@@ -65,47 +64,4 @@ private static function getModel()
     {
         return InspireCmsConfig::getTemplateModelClass();
     }
-
-    private function getFilePathAndContent($record)
-    {
-        $slug = $record->slug;
-
-        $themeContent = $record->content;
-        if (! is_array($themeContent)) {
-            $themeContent = [inspirecms_templates()->getCurrentTheme() => $themeContent];
-        }
-
-        $result = [];
-
-        foreach ($themeContent as $theme => $content) {
-
-            $path = $slug . '/' . "$theme.blade.php";
-
-            $result[$path] = $content;
-        }
-
-        return $result;
-    }
-
-    protected function processRecordForImportUsed(Model $record, $fs, ?string $dir, array &$errors)
-    {
-        $pathAndContent = $this->getFilePathAndContent($record);
-
-        foreach ($pathAndContent as $filePath => $content) {
-
-            try {
-
-                $path = $dir . '/' . $filePath;
-
-                $fs->put($path, $content);
-
-            } catch (\Throwable $th) {
-                $errors[] = [
-                    'record' => $record->getKey(),
-                    'path' => $filePath,
-                    'message' => $th->getMessage(),
-                ];
-            }
-        }
-    }
 }
diff --git a/src/Filament/Resources/RoleResource.php b/src/Filament/Resources/RoleResource.php
@@ -81,13 +81,8 @@ public static function form(Form $form): Form
                             ->schema(static::getFormComponentForTieredPermissionsSection()),
                     ])
                     ->afterStateHydrated(function (null | Role | RoleContract $record, Forms\Components\Group $component) {
-                        if (is_null($record)) {
-                            $component->state([]);
 
-                            return;
-                        }
-
-                        $permissionNames = $record->permissions->pluck('name');
+                        $permissionNames = $record ? $record->permissions->pluck('name') : [];
                         $state = [];
 
                         $resourcePermissions = PermissionManifest::getResourcePermissions();
diff --git a/src/Helpers/TemplateHelper.php b/src/Helpers/TemplateHelper.php
@@ -111,6 +111,25 @@ public static function getDefaultThemedLayoutComponentName(): string
         return 'page';
     }
 
+    public static function ensureFileBaseNameForTemplate(string $slug): string
+    {
+        return str($slug)
+            ->trim()->trim('.')->trim('/')
+            ->snake()
+            ->replace(['_', ' '], '-')
+            ->toString();
+    }
+
+    public static function ensureViewFileNameForTemplate(string $name)
+    {
+        return str($name)
+            ->trim()
+            ->replace('.', '/')
+            ->trim('/')
+            ->finish('.blade.php')
+            ->toString();
+    }
+
     /**
      * Splits a Blade expression to extract a property.
      *
diff --git a/src/ImportData/Entities/Content.php b/src/ImportData/Entities/Content.php

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ public function __toString(): string`
`273`	`273`	`$html .= "<meta property=\"og:description\" content=\"{$this->ogDescription}\">\n";`
`274`	`274`	`}`
`275`	`275`
`276`		`- if ($this->ogImage && ($mediaAssetUrl = inspirecms_asset()->getAssetUrl($this->ogImage))) {`
	`276`	`+ if ($this->ogImage && ($mediaAssetUrl = inspirecms_asset()->findByKey($this->ogImage)?->getUrl())) {`
`277`	`277`	`$html .= "<meta property=\"og:image\" content=\"{$mediaAssetUrl}\">\n";`
`278`	`278`	`}`
`279`	`279`