From 55b17ce78ea8a893a58042abf569c8ef1c6a14e2 Mon Sep 17 00:00:00 2001
From: Tim Mulholland <timulhol@microsoft.com>
Date: Fri, 6 Oct 2023 15:05:19 -0700
Subject: [PATCH] Add Menu Grouping for Logs

---
 .../Components/Layout/MainLayout.razor        | 19 +++++++++++++++----
 .../Components/Pages/SemanticLogs.razor       |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/Aspire.Dashboard/Components/Layout/MainLayout.razor b/src/Aspire.Dashboard/Components/Layout/MainLayout.razor
index d9425312c3..528661d04b 100644
--- a/src/Aspire.Dashboard/Components/Layout/MainLayout.razor
+++ b/src/Aspire.Dashboard/Components/Layout/MainLayout.razor
@@ -8,10 +8,13 @@
             <FluentNavMenuLink Icon="@(new Icons.Regular.Size24.AppGeneric())" Text="Projects" Href="/" />
             <FluentNavMenuLink Icon="@(new Icons.Regular.Size24.BinFull())" Text="Containers" Href="/Containers" />
             <FluentNavMenuLink Icon="@(new Icons.Regular.Size24.AppGeneric())" Text="Executables" Href="/Executables" />
-            <FluentNavMenuLink Icon="@(new Icons.Regular.Size24.SlideText())" Text="Project logs" Href="/ProjectLogs" />
-            <FluentNavMenuLink Icon="@(new Icons.Regular.Size24.SlideText())" Text="Container Logs" Href="/ContainerLogs" />
-            <FluentNavMenuLink Icon="@(new Icons.Regular.Size24.SlideText())" Text="Executable Logs" Href="/ExecutableLogs" />
-            <FluentNavMenuLink Icon="@(new Icons.Regular.Size24.SlideTextSparkle())" Text="Semantic Logs" Href="/SemanticLogs" />
+            <FluentNavMenuGroup Icon="@(new Icons.Regular.Size24.SlideText())" Text="Logs" Expanded="true" OnAction="OnMenuGroupClicked">
+                <FluentNavMenuLink Icon="@(new Icons.Regular.Size24.SlideText())" Text="Project" Href="/ProjectLogs" />
+                <FluentNavMenuLink Icon="@(new Icons.Regular.Size24.SlideText())" Text="Container" Href="/ContainerLogs" />
+                <FluentNavMenuLink Icon="@(new Icons.Regular.Size24.SlideText())" Text="Executable" Href="/ExecutableLogs" />
+                <FluentNavMenuLink Icon="@(new Icons.Regular.Size24.SlideTextSparkle())" Text="Structured" Href="/SemanticLogs" />
+            </FluentNavMenuGroup>
+            
             <FluentNavMenuLink Icon="@(new Icons.Regular.Size24.GanttChart())" Text="Traces" Href="/Traces" />
         </FluentNavMenu>
 
@@ -29,3 +32,11 @@
     <a href="" class="reload">Reload</a>
     <a class="dismiss">🗙</a>
 </div>
+
+@code {
+    // Workaround for bug in current NavMenu when clicking on menu groups
+    private void OnMenuGroupClicked(NavMenuActionArgs args)
+    {
+        args.SetHandled();
+    }
+}
diff --git a/src/Aspire.Dashboard/Components/Pages/SemanticLogs.razor b/src/Aspire.Dashboard/Components/Pages/SemanticLogs.razor
index 3b210cf6fc..206eb49f89 100644
--- a/src/Aspire.Dashboard/Components/Pages/SemanticLogs.razor
+++ b/src/Aspire.Dashboard/Components/Pages/SemanticLogs.razor
@@ -10,7 +10,7 @@
 @inject IJSRuntime JS
 @implements IDisposable
 
-<h1>Semantic Logs</h1>
+<h1>Structured Logs</h1>
 <div>
     <FluentStack Orientation="Orientation.Vertical">
         <FluentToolbar Orientation="Orientation.Horizontal">