From b4d1855bf7633279c1222bf370ca328d36da933d Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Mon, 8 Aug 2022 18:19:38 +0000
Subject: [PATCH] Merge pull request #381 from
 hydephp/add-a-default-category-property-value-for-documentation-pages

Add a default category property value for documentation pages https://github.com/hydephp/develop/commit/6948a3977f1d187b21fa7f384f9097496d36155f
---
 .../components/docs/grouped-sidebar.blade.php   |  2 +-
 .../Schemas/DocumentationPageSchema.php         |  7 +++++--
 src/Models/DocumentationSidebar.php             |  4 +---
 .../Services/DocumentationSidebarTest.php       | 17 +++++++++++++++++
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/resources/views/components/docs/grouped-sidebar.blade.php b/resources/views/components/docs/grouped-sidebar.blade.php
index 6d96d6c0..55a475fe 100644
--- a/resources/views/components/docs/grouped-sidebar.blade.php
+++ b/resources/views/components/docs/grouped-sidebar.blade.php
@@ -1,7 +1,7 @@
 <ul id="sidebar" role="list">
 	@foreach ($sidebar->getGroups() as $group)
 	<li class="sidebar-category mb-4 mt-4 first:mt-0" role="listitem">
-		<h4 class="sidebar-category-heading text-base font-semibold mb-2 -ml-1">{{ Hyde::makeTitle($group ?? 'Other') }}</h4>
+		<h4 class="sidebar-category-heading text-base font-semibold mb-2 -ml-1">{{ Hyde::makeTitle($group) }}</h4>
 		<ul class="sidebar-category-list ml-4" role="list">
 			@foreach ($sidebar->getItemsInGroup($group) as $item)
 				<x-hyde::docs.grouped-sidebar-item :item="$item" :active="$item->route->getRouteKey() === $currentRoute->getRouteKey()" />
diff --git a/src/Concerns/FrontMatter/Schemas/DocumentationPageSchema.php b/src/Concerns/FrontMatter/Schemas/DocumentationPageSchema.php
index 53d8285c..ebc4df21 100644
--- a/src/Concerns/FrontMatter/Schemas/DocumentationPageSchema.php
+++ b/src/Concerns/FrontMatter/Schemas/DocumentationPageSchema.php
@@ -8,13 +8,16 @@ trait DocumentationPageSchema
 {
     /**
      * The sidebar category group, if any.
+     *
+     * Can be overridden in front matter, or by putting the
+     * source file in a subdirectory of the same category name.
      */
     public ?string $category = null;
 
     /**
      * The label for the page shown in the sidebar.
      */
-    public ?string $label;
+    public ?string $label = null;
 
     /**
      * Hides the page from the sidebar.
@@ -42,7 +45,7 @@ protected function getDocumentationPageCategory(): ?string
 
         return str_contains($this->identifier, '/')
             ? Str::before($this->identifier, '/')
-            : $this->matter('category');
+            : $this->matter('category', 'other');
     }
 
     protected function findPriorityInConfig(): int
diff --git a/src/Models/DocumentationSidebar.php b/src/Models/DocumentationSidebar.php
index a4eafe55..7831c0b4 100644
--- a/src/Models/DocumentationSidebar.php
+++ b/src/Models/DocumentationSidebar.php
@@ -23,9 +23,7 @@ public function generate(): static
 
     public function hasGroups(): bool
     {
-        return $this->items->map(function (NavItem $item) {
-            return $item->getGroup() !== null;
-        })->contains(true);
+        return count($this->getGroups()) >= 1 && $this->getGroups() !== [0 => 'other'];
     }
 
     public function getGroups(): array
diff --git a/tests/Feature/Services/DocumentationSidebarTest.php b/tests/Feature/Services/DocumentationSidebarTest.php
index d7d69bf1..876c4b61 100644
--- a/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/tests/Feature/Services/DocumentationSidebarTest.php
@@ -161,6 +161,23 @@ public function test_has_groups_returns_true_when_there_are_groups()
         $this->assertTrue(DocumentationSidebar::create()->hasGroups());
     }
 
+    public function test_has_groups_returns_true_when_there_are_multiple_groups()
+    {
+        $this->makePage('foo', ['category' => 'bar']);
+        $this->makePage('bar', ['category' => 'baz']);
+
+        $this->assertTrue(DocumentationSidebar::create()->hasGroups());
+    }
+
+    public function test_has_groups_returns_true_when_there_are_multiple_groups_mixed_with_defaults()
+    {
+        $this->makePage('foo', ['category' => 'bar']);
+        $this->makePage('bar', ['category' => 'baz']);
+        $this->makePage('baz');
+
+        $this->assertTrue(DocumentationSidebar::create()->hasGroups());
+    }
+
     public function test_get_groups_returns_empty_array_when_there_are_no_groups()
     {
         $this->assertEquals([], DocumentationSidebar::create()->getGroups());