Merge branch 'develop'

* develop:
  add health check for content path
  bugfix: path haven't update after parentId is changed for content
  update content side bar layout

Author: cklei-carly

resources/dist/inspirecms.css

@@ -54,7 +54,7 @@ class="fi-layout flex min-h-screen w-full flex-row-reverse overflow-x-clip"
                 <main
                     @class([
                         'fi-main mx-auto h-full w-full px-4 md:px-6 lg:px-8',
-                        'lg:pl-72',
+                        'lg:pl-80',
                         match ($maxContentWidth ??= (filament()->getMaxContentWidth() ?? MaxWidth::SevenExtraLarge)) {
                             MaxWidth::ExtraSmall, 'xs' => 'max-w-xs',
                             MaxWidth::Small, 'sm' => 'max-w-sm',

resources/views/components/layout/content-page.blade.php

@@ -10,7 +10,9 @@
 use Filament\Notifications\Notification;
 use Filament\Pages\Page;
 use Illuminate\Contracts\Support\Htmlable;
+use Illuminate\Database\Eloquent\Model;
 use SolutionForest\InspireCms\Facades\PermissionManifest;
+use SolutionForest\InspireCms\Factories\ContentSegmentFactory;
 use SolutionForest\InspireCms\Factories\SitemapGeneratorFactory;
 use SolutionForest\InspireCms\Filament\Clusters\Settings;
 use SolutionForest\InspireCms\Filament\Concerns\ClusterSectionPageTrait;
@@ -19,6 +21,9 @@
 use SolutionForest\InspireCms\Helpers\AuthHelper;
 use SolutionForest\InspireCms\Helpers\PermissionHelper;
 use SolutionForest\InspireCms\InspireCmsConfig;
+use SolutionForest\InspireCms\Models\Contracts\Content;
+use SolutionForest\InspireCms\Support\Helpers\KeyHelper;
+use SolutionForest\InspireCms\Support\Models\Contracts\NestableTree;
 
 // todo: need redo the layout
 class Health extends Page implements ClusterSectionPage, GuardPage, HasActions, HasForms
@@ -65,6 +70,7 @@ public function getStatusInfo(): array
     {
         $permissions = $this->getPermissionsStatusData();
         $sitemap = $this->getSiteMapStatusData();
+        $contentHierarchy = $this->getContentHierarchyStatusData();
 
         return [
             'permissions' => [
@@ -77,6 +83,12 @@ public function getStatusInfo(): array
                 ...$sitemap,
                 'action' => 'fix',
             ],
+            'content_hierarchy' => [
+                // 'title' => __('inspirecms::pages/health.content_hierarchy.label'),
+                'title' => 'Content Hierarchy',
+                ...$contentHierarchy,
+                'action' => 'fix',
+            ],
         ];
     }
 
@@ -101,6 +113,10 @@ public function fixAction(): Action
 
                         break;
 
+                    case 'content_hierarchy':
+                        $needRefresh = $this->fixContentHierarchy();
+                        break;
+
                 }
 
                 if ($needRefresh) {
@@ -145,6 +161,55 @@ protected function getSiteMapStatusData(): array
         ];
     }
 
+    protected function getContentHierarchyStatusData(): array
+    {
+        $records = InspireCmsConfig::getNestableTreeModelClass()::scoped([
+            'nestable_type' => app(InspireCmsConfig::getContentModelClass())->getMorphClass(),
+        ])->with([
+            'nestable.path', 
+            'nestable.ancestorsAndSelf',
+        ])->get();
+
+        $segmentProvider = ContentSegmentFactory::create();
+
+        $data = $records
+            ->reject(fn (NestableTree | Model $record) => is_null($record->nestable))
+            ->map(fn (NestableTree | Model $record) => [
+                'id' => $record->nestable->getKey(),
+                'slug' => $record->nestable->slug,
+                'parent_id_from_tree' => $record->parent?->nestable_id ?? KeyHelper::generateMinUuid(),
+                'parent_id_from_content' => $record->nestable->getParentId(),
+                'current_path' => $record->nestable->path?->value,
+                'expected_path' => $segmentProvider->getPath($record->nestable),
+            ])
+            ->keyBy('id')
+            ->all();
+
+        $valids = collect($data)->filter(function ($item) {
+            return $item['current_path'] === $item['expected_path'] && 
+                $item['parent_id_from_tree'] === $item['parent_id_from_content'];
+        })->all();
+
+        $invalids =  collect($data)
+            ->where(fn ($item, $key) => array_key_exists($key, $valids) === false)
+            ->all();
+
+        return [
+            'status' => $this->formateStatusData(count($data), count($invalids), count($valids)),
+            'data' => $this->formateStatusContent(collect($invalids)
+                ->mapWithKeys(function ($item) {
+                    return [
+                        'Content ID: '. $item['id'] => [
+                            'Current path: ' . $item['current_path'],
+                            'Expected path: ' . $item['expected_path'],
+                        ],
+                    ];
+                })
+                ->all()
+            ),
+        ];
+    }
+
     protected function fixPermissions(): bool
     {
         $missing = $this->getMissingPermissions($this->getAllPermissions());
@@ -178,6 +243,24 @@ protected function fixSiteMap(): bool
         return true;
     }
 
+    protected function fixContentHierarchy(): bool
+    {
+        $records = InspireCmsConfig::getContentModelClass()::with(['path', 'ancestorsAndSelf'])->get();
+        $segmentProvider = ContentSegmentFactory::create();
+
+        $records->each(function (Content | Model $record) use ($segmentProvider) {
+            $expectedPath = $segmentProvider->getPath($record);
+
+            if ($record->path?->value !== $expectedPath) {
+                $record->path?->update([
+                    'value' => $expectedPath,
+                ]);
+            }
+        });
+
+        return true;
+    }
+
     protected function formateStatusData($total, $invalid, $valid): array
     {
         return [

src/Filament/Pages/Health.php

@@ -32,13 +32,12 @@ public function creating($model)
      */
     public function created($model)
     {
-        $provider = ContentSegmentFactory::create();
-
+        $segmentProvider = ContentSegmentFactory::create();
         $model->path()->updateOrCreate([], [
-            'value' => $provider->getPath($model),
+            'value' => $segmentProvider->getPath($model),
         ]);
 
-        $this->createDefaultRoute($model, $provider);
+        $this->createDefaultRoute($model, $segmentProvider);
     }
 
     /**
@@ -71,6 +70,13 @@ public function saved($model)
             $this->updateCurrentRouteInDefaultPattern($model, $provider);
         }
 
+        // Update the path if the content's parent is changed
+        if ($model->isDirty([$model->getParentKeyName()])) {
+            $segmentProvider = ContentSegmentFactory::create();
+            $model->path()->updateOrCreate([], [
+                'value' => $segmentProvider->getPath($model),
+            ]);
+        }
     }
 
     /**