bugfix: invalid depth if the content depth > 1

Author: cklei-carly

database/seeders/SampleSeeder.php

@@ -299,7 +299,7 @@ protected function getSampleDocumentTypes()
         $items[] = new ImportDataEntities\DocumentType(
             slug: 'post-page',
             showAsTable: false,
-            showAtRoot: true,
+            showAtRoot: false,
             category: 'web',
             fieldGroups: [],
             templates: [
@@ -401,10 +401,10 @@ protected function getSampleDocumentTypes()
                         ->merge($allSlugs)
                         ->unique()
                         ->filter()
-                        ->where(fn ($slug) => ! in_array($slug, [
+                        ->reject(fn ($slug) => in_array($slug, [
                             'homepage', // self
-                            'case-study',   // children under case-study index page
-                            'post', // data-type
+                            'case-study-detail-page',   // children under case-study index page
+                            'blog-data', // data-type
                         ]))
                         ->values()
                         ->toArray();
@@ -504,6 +504,31 @@ protected function getSampleContent()
             publishState: 'publish',
             parent: 'home',
         );
+
+        $items[] = new ImportDataEntities\Content(
+            slug: 'post',
+            title: ['en' => 'Post', 'fr' => 'Post'],
+            documentType: 'post-page',
+            publishState: 'publish',
+            parent: 'home/blog',
+            routes: [
+                [
+                    'locale' => null,
+                    'uri' => 'blog/post/{slug}',
+                    'is_default_pattern' => false,
+                ],
+                [
+                    'locale' => 'en',
+                    'uri' => '{locale}/blog/post/{slug}',
+                    'is_default_pattern' => false,
+                ],
+                [
+                    'locale' => 'fr',
+                    'uri' => 'fr/blog/post/{slug}',
+                    'is_default_pattern' => false,
+                ],
+            ],
+        );
         foreach (range(1, 10) as $i) {
 
             $sampleCatOrTags = [
@@ -601,37 +626,6 @@ protected function getSampleContent()
             parent: 'home',
         );
 
-        $items[] = new ImportDataEntities\Content(
-            slug: 'dynamic-post-page',
-            title: ['en' => 'Dynamic Post Page', 'fr' => 'Dynamic Post Page'],
-            documentType: 'post-page',
-            publishState: 'publish',
-            parent: 'home',
-            routes: [
-                [
-                    'locale' => null,
-                    'uri' => 'blog/post/{slug}',
-                    'is_default_pattern' => false,
-                ],
-                [
-                    'locale' => 'en',
-                    'uri' => 'en/blog/post/{slug}',
-                    'is_default_pattern' => false,
-                ],
-                [
-                    'locale' => 'fr',
-                    'uri' => 'fr/blog/post/{slug}',
-                    'is_default_pattern' => false,
-                ],
-            ],
-            webSetting: [
-                'seo' => [
-                    'meta_title' => 'Post',
-                    'og_title' => 'Post',
-                ],
-            ],
-        );
-
         $items[] = new ImportDataEntities\Content(
             slug: 'case-studies',
             title: ['en' => 'Works', 'fr' => 'Travaux'],

src/Livewire/BaseContentTreeNode.php

@@ -53,11 +53,11 @@ public function modelExplorer(ModelExplorer $modelExplorer): ModelExplorer
                     return 0;
                 }
 
-                $parentDepth = collect($this->cachedModelExplorerItems)
-                    ->flatten(1)
-                    ->firstWhere('key', $parentKey)['depth'] ?? -1;
+                if ($record->ancestorsAndSelf != null) {
+                    return count($record->ancestorsAndSelf);
+                }
 
-                return $parentDepth + 1;
+                return 0;
             })
             ->determineItemTitleUsing(fn (Model | Content $record) => $record->title)
             ->determineItemHasChildrenUsing(fn (Model | Content $record) => $record->children_count > 0);

src/Livewire/ContentSidebar.php

@@ -37,11 +37,15 @@ public function mount()
     {
         $this->cacheModelExplorerNodesOn(parentKey: $this->getModelRootLevelParentId());
 
+        // Init selected model item
         if (! empty($this->selectedModelItemKeys)) {
             $record = $this->resolveSelectedModelItems($this->selectedModelItemKeys)->first();
+            // Do not show seleccted record if it is a table node
             if ($this->isDisplayChildrenAsTable($record?->parent)) {
                 $this->setSelectedModelItem([$record->parent->getKey()], merge: false, replace: true);
-            } else {
+            } 
+            // Expand ancestors nodes
+            else {
                 $this->expandParentModelItemIfSelected($this->selectedModelItemKeys);
             }
         }