From ac8a2331b405a0453e158c30579b009bca5c30d8 Mon Sep 17 00:00:00 2001
From: Justin Yoo <justin.yoojh@gmail.com>
Date: Thu, 22 Aug 2024 17:39:50 +0900
Subject: [PATCH 1/7] Update main layout to show/hide the sidebar

---
 .../Components/Layout/MainLayout.razor        | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/AzureOpenAIProxy.PlaygroundApp/Components/Layout/MainLayout.razor b/src/AzureOpenAIProxy.PlaygroundApp/Components/Layout/MainLayout.razor
index 4836891f..440a53d9 100644
--- a/src/AzureOpenAIProxy.PlaygroundApp/Components/Layout/MainLayout.razor
+++ b/src/AzureOpenAIProxy.PlaygroundApp/Components/Layout/MainLayout.razor
@@ -1,15 +1,15 @@
 @inherits LayoutComponentBase
+@inject NavigationManager NavMan
 
 <div class="page">
-    <div class="sidebar">
-        <NavMenu />
-    </div>
-
-    <main>
-        <div class="top-row px-4">
-            <a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
+    @if (this._isAdmin == true)
+    {
+        <div class="sidebar">
+            <NavMenu />
         </div>
+    }
 
+    <main>
         <article class="content px-4">
             @Body
         </article>
@@ -26,3 +26,16 @@
 <FluentDialogProvider />
 <FluentTooltipProvider />
 <FluentMessageBarProvider />
+
+@code
+{
+    private bool _isAdmin;
+
+    protected override async Task OnInitializedAsync()
+    {
+        var path = new Uri(this.NavMan.Uri).AbsolutePath;
+        this._isAdmin = path.StartsWith("/admin", StringComparison.CurrentCultureIgnoreCase);
+
+        await Task.CompletedTask;
+    }
+}
\ No newline at end of file

From 2e545bca610d7a13e5c1eb0d523d130c99b32c3b Mon Sep 17 00:00:00 2001
From: Justin Yoo <justin.yoojh@gmail.com>
Date: Thu, 22 Aug 2024 18:05:19 +0900
Subject: [PATCH 2/7] Refactor the codebase from UI

---
 .../Components/Layout/MainLayout.razor        | 14 ----------
 .../Components/Layout/MainLayout.razor.cs     | 26 +++++++++++++++++++
 2 files changed, 26 insertions(+), 14 deletions(-)
 create mode 100644 src/AzureOpenAIProxy.PlaygroundApp/Components/Layout/MainLayout.razor.cs

diff --git a/src/AzureOpenAIProxy.PlaygroundApp/Components/Layout/MainLayout.razor b/src/AzureOpenAIProxy.PlaygroundApp/Components/Layout/MainLayout.razor
index 440a53d9..1bad0f45 100644
--- a/src/AzureOpenAIProxy.PlaygroundApp/Components/Layout/MainLayout.razor
+++ b/src/AzureOpenAIProxy.PlaygroundApp/Components/Layout/MainLayout.razor
@@ -1,5 +1,4 @@
 @inherits LayoutComponentBase
-@inject NavigationManager NavMan
 
 <div class="page">
     @if (this._isAdmin == true)
@@ -26,16 +25,3 @@
 <FluentDialogProvider />
 <FluentTooltipProvider />
 <FluentMessageBarProvider />
-
-@code
-{
-    private bool _isAdmin;
-
-    protected override async Task OnInitializedAsync()
-    {
-        var path = new Uri(this.NavMan.Uri).AbsolutePath;
-        this._isAdmin = path.StartsWith("/admin", StringComparison.CurrentCultureIgnoreCase);
-
-        await Task.CompletedTask;
-    }
-}
\ No newline at end of file
diff --git a/src/AzureOpenAIProxy.PlaygroundApp/Components/Layout/MainLayout.razor.cs b/src/AzureOpenAIProxy.PlaygroundApp/Components/Layout/MainLayout.razor.cs
new file mode 100644
index 00000000..4e40a58a
--- /dev/null
+++ b/src/AzureOpenAIProxy.PlaygroundApp/Components/Layout/MainLayout.razor.cs
@@ -0,0 +1,26 @@
+using Microsoft.AspNetCore.Components;
+
+namespace AzureOpenAIProxy.PlaygroundApp.Components.Layout;
+
+/// <summary>
+/// This represents the layout component for the main layout.
+/// </summary>
+public partial class MainLayout : LayoutComponentBase
+{
+    private bool _isAdmin;
+
+    /// <summary>
+    /// Injects the <see cref="NavigationManager"/> instance.
+    /// </summary>
+    [Inject]
+    private NavigationManager? NavMan { get; set; }
+
+    /// <inheritdoc />
+    protected override async Task OnInitializedAsync()
+    {
+        var path = new Uri(this.NavMan!.Uri).AbsolutePath;
+        this._isAdmin = path.StartsWith("/admin", StringComparison.CurrentCultureIgnoreCase);
+
+        await Task.CompletedTask;
+    }
+}

From f1bb081cf3c7cbffe104da22622c4f9201acb2d6 Mon Sep 17 00:00:00 2001
From: Justin Yoo <justin.yoojh@gmail.com>
Date: Thu, 22 Aug 2024 19:05:54 +0900
Subject: [PATCH 3/7] Add UI test for sidebar

---
 .../UnitTest1.cs                              |  9 --------
 ...zureOpenAIProxy.PlaygroundApp.Tests.csproj | 13 ++++++-----
 .../Pages/HomePageTests.cs                    | 22 +++++++++++++++++++
 .../UnitTest1.cs                              |  9 --------
 4 files changed, 29 insertions(+), 24 deletions(-)
 delete mode 100644 test/AzureOpenAIProxy.ApiApp.Tests/UnitTest1.cs
 create mode 100644 test/AzureOpenAIProxy.PlaygroundApp.Tests/Pages/HomePageTests.cs
 delete mode 100644 test/AzureOpenAIProxy.PlaygroundApp.Tests/UnitTest1.cs

diff --git a/test/AzureOpenAIProxy.ApiApp.Tests/UnitTest1.cs b/test/AzureOpenAIProxy.ApiApp.Tests/UnitTest1.cs
deleted file mode 100644
index 924359ec..00000000
--- a/test/AzureOpenAIProxy.ApiApp.Tests/UnitTest1.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace AzureOpenAIProxy.ApiApp.Tests;
-
-public class UnitTest1
-{
-    [Fact]
-    public void Test1()
-    {
-    }
-}
diff --git a/test/AzureOpenAIProxy.PlaygroundApp.Tests/AzureOpenAIProxy.PlaygroundApp.Tests.csproj b/test/AzureOpenAIProxy.PlaygroundApp.Tests/AzureOpenAIProxy.PlaygroundApp.Tests.csproj
index 1a9f53fe..de2aabd0 100644
--- a/test/AzureOpenAIProxy.PlaygroundApp.Tests/AzureOpenAIProxy.PlaygroundApp.Tests.csproj
+++ b/test/AzureOpenAIProxy.PlaygroundApp.Tests/AzureOpenAIProxy.PlaygroundApp.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
@@ -15,19 +15,20 @@
     </PackageReference>
     <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSdkVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)">
+    <PackageReference Include="Microsoft.Playwright.NUnit" Version="1.46.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>
 
-  <ItemGroup>
+  <!--<ItemGroup>
     <ProjectReference Include="..\..\src\AzureOpenAIProxy.PlaygroundApp\AzureOpenAIProxy.PlaygroundApp.csproj" />
-  </ItemGroup>
+  </ItemGroup>-->
 
   <ItemGroup>
-    <Using Include="Xunit" />
+    <Using Include="NUnit.Framework" />
   </ItemGroup>
 
 </Project>
diff --git a/test/AzureOpenAIProxy.PlaygroundApp.Tests/Pages/HomePageTests.cs b/test/AzureOpenAIProxy.PlaygroundApp.Tests/Pages/HomePageTests.cs
new file mode 100644
index 00000000..f10216ad
--- /dev/null
+++ b/test/AzureOpenAIProxy.PlaygroundApp.Tests/Pages/HomePageTests.cs
@@ -0,0 +1,22 @@
+using Microsoft.Playwright.NUnit;
+
+namespace AzureOpenAIProxy.PlaygroundApp.Tests.Pages;
+
+[Parallelizable(ParallelScope.Self)]
+[TestFixture]
+[Property("Category", "Integration")]
+public class HomePageTests : PageTest
+{
+    [Test]
+    public async Task Given_Root_Page_When_Navigated_Then_It_Should_No_Sidebar()
+    {
+        // Arrange
+        await this.Page.GotoAsync("https://localhost:5001");
+
+        // Act
+        var sidebar = this.Page.Locator("div.sidebar");
+
+        // Assert
+        Expect(sidebar).Equals(null);
+    }
+}
diff --git a/test/AzureOpenAIProxy.PlaygroundApp.Tests/UnitTest1.cs b/test/AzureOpenAIProxy.PlaygroundApp.Tests/UnitTest1.cs
deleted file mode 100644
index 63e32861..00000000
--- a/test/AzureOpenAIProxy.PlaygroundApp.Tests/UnitTest1.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace AzureOpenAIProxy.PlaygroundApp.Tests;
-
-public class UnitTest1
-{
-    [Fact]
-    public void Test1()
-    {
-    }
-}

From 4579103c5e155f1306ff5a1696e835382618dbfb Mon Sep 17 00:00:00 2001
From: Justin Yoo <justin.yoojh@gmail.com>
Date: Thu, 22 Aug 2024 19:09:08 +0900
Subject: [PATCH 4/7] Update build props

---
 Directory.Build.props                                       | 4 +++-
 .../AzureOpenAIProxy.PlaygroundApp.Tests.csproj             | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index a3531f4c..e3377330 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -15,13 +15,15 @@
     <OpenTelemetryExtensionsVersion>1.*</OpenTelemetryExtensionsVersion>
     <OpenTelemetryInstrumentationVersion>1.*</OpenTelemetryInstrumentationVersion>
     <SwashbuckleVersion>6.*</SwashbuckleVersion>
+    <SystemTextJsonVersion>8.*</SystemTextJsonVersion>
     <FluentUIVersion>4.*</FluentUIVersion>
 
     <CoverletVersion>6.*</CoverletVersion>
     <FluentAssertionsVersion>6.*</FluentAssertionsVersion>
     <MicrosoftTestSdkVersion>17.*</MicrosoftTestSdkVersion>
     <NSubstituteVersion>5.*</NSubstituteVersion>
-    <SystemTextJsonVersion>8.*</SystemTextJsonVersion>
+    <NUnitVersion>4.*</NUnitVersion>
+    <PlaywrightVersion>1.*</PlaywrightVersion>
     <XunitVersion>2.*</XunitVersion>
   </PropertyGroup>
 </Project>
diff --git a/test/AzureOpenAIProxy.PlaygroundApp.Tests/AzureOpenAIProxy.PlaygroundApp.Tests.csproj b/test/AzureOpenAIProxy.PlaygroundApp.Tests/AzureOpenAIProxy.PlaygroundApp.Tests.csproj
index de2aabd0..0b9dccf2 100644
--- a/test/AzureOpenAIProxy.PlaygroundApp.Tests/AzureOpenAIProxy.PlaygroundApp.Tests.csproj
+++ b/test/AzureOpenAIProxy.PlaygroundApp.Tests/AzureOpenAIProxy.PlaygroundApp.Tests.csproj
@@ -15,12 +15,12 @@
     </PackageReference>
     <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSdkVersion)" />
-    <PackageReference Include="Microsoft.Playwright.NUnit" Version="1.46.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
+    <PackageReference Include="Microsoft.Playwright.NUnit" Version="$(PlaywrightVersion)" />
+    <PackageReference Include="NUnit.Analyzers" Version="$(NUnitVersion)">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitVersion)" />
   </ItemGroup>
 
   <!--<ItemGroup>

From cdc913d798711262340d43e53b978c538871c46e Mon Sep 17 00:00:00 2001
From: Justin Yoo <justin.yoojh@gmail.com>
Date: Thu, 22 Aug 2024 19:13:18 +0900
Subject: [PATCH 5/7] Update GHA workflows

---
 .github/workflows/azure-dev-build-only.yml | 7 +++++++
 .github/workflows/azure-dev.yml            | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/.github/workflows/azure-dev-build-only.yml b/.github/workflows/azure-dev-build-only.yml
index b0048536..3edde9d6 100644
--- a/.github/workflows/azure-dev-build-only.yml
+++ b/.github/workflows/azure-dev-build-only.yml
@@ -53,6 +53,13 @@ jobs:
       run: |
         dotnet build
 
+    - name: Install playwright
+      shell: pwsh
+      run: |
+        $playwright = Get-ChildItem -File Microsoft.Playwright.dll -Path . -Recurse
+        $installer = "$($playwright[0].Directory.FullName)/playwright.ps1"
+        & "$installer" install
+
     - name: Run unit tests
       shell: bash
       run: |
diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml
index 2217c6aa..fa69fb8b 100644
--- a/.github/workflows/azure-dev.yml
+++ b/.github/workflows/azure-dev.yml
@@ -67,6 +67,13 @@ jobs:
       run: |
         dotnet build
 
+    - name: Install playwright
+      shell: pwsh
+      run: |
+        $playwright = Get-ChildItem -File Microsoft.Playwright.dll -Path . -Recurse
+        $installer = "$($playwright[0].Directory.FullName)/playwright.ps1"
+        & "$installer" install
+
     - name: Run unit tests
       shell: bash
       run: |

From a40c787b77dcfae7d59536183c1729d2b5037b3e Mon Sep 17 00:00:00 2001
From: Justin Yoo <justin.yoojh@gmail.com>
Date: Thu, 22 Aug 2024 19:27:06 +0900
Subject: [PATCH 6/7] Fix tests

---
 .../Pages/HomePageTests.cs                                | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/AzureOpenAIProxy.PlaygroundApp.Tests/Pages/HomePageTests.cs b/test/AzureOpenAIProxy.PlaygroundApp.Tests/Pages/HomePageTests.cs
index f10216ad..aad307da 100644
--- a/test/AzureOpenAIProxy.PlaygroundApp.Tests/Pages/HomePageTests.cs
+++ b/test/AzureOpenAIProxy.PlaygroundApp.Tests/Pages/HomePageTests.cs
@@ -1,4 +1,5 @@
-using Microsoft.Playwright.NUnit;
+using Microsoft.Playwright;
+using Microsoft.Playwright.NUnit;
 
 namespace AzureOpenAIProxy.PlaygroundApp.Tests.Pages;
 
@@ -7,6 +8,11 @@ namespace AzureOpenAIProxy.PlaygroundApp.Tests.Pages;
 [Property("Category", "Integration")]
 public class HomePageTests : PageTest
 {
+    public override BrowserNewContextOptions ContextOptions() => new()
+    {
+        IgnoreHTTPSErrors = true,
+    };
+
     [Test]
     public async Task Given_Root_Page_When_Navigated_Then_It_Should_No_Sidebar()
     {

From 0627f77a4fc332fa35c85527138606f0cb9b614c Mon Sep 17 00:00:00 2001
From: Justin Yoo <justin.yoojh@gmail.com>
Date: Thu, 22 Aug 2024 19:30:44 +0900
Subject: [PATCH 7/7] Update GHA workflows

---
 .github/workflows/azure-dev-build-only.yml | 6 +++---
 .github/workflows/azure-dev.yml            | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/azure-dev-build-only.yml b/.github/workflows/azure-dev-build-only.yml
index 3edde9d6..fd15aa7f 100644
--- a/.github/workflows/azure-dev-build-only.yml
+++ b/.github/workflows/azure-dev-build-only.yml
@@ -63,8 +63,8 @@ jobs:
     - name: Run unit tests
       shell: bash
       run: |
-        dotnet test ./test/AzureOpenAIProxy.AppHost.Tests --logger "trx" --collect:"XPlat Code Coverage"
-        dotnet test ./test/AzureOpenAIProxy.ApiApp.Tests --logger "trx" --collect:"XPlat Code Coverage"
+        dotnet test ./test/AzureOpenAIProxy.AppHost.Tests --no-build --logger "trx" --collect:"XPlat Code Coverage"
+        dotnet test ./test/AzureOpenAIProxy.ApiApp.Tests --no-build --logger "trx" --collect:"XPlat Code Coverage"
 
     - name: Run integration tests
       shell: bash
@@ -75,7 +75,7 @@ jobs:
 
         sleep 30
 
-        dotnet test ./test/AzureOpenAIProxy.PlaygroundApp.Tests --logger "trx" --collect:"XPlat Code Coverage"
+        dotnet test ./test/AzureOpenAIProxy.PlaygroundApp.Tests --no-build --logger "trx" --collect:"XPlat Code Coverage"
 
         kill $DOTNET_PID
 
diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml
index fa69fb8b..25683217 100644
--- a/.github/workflows/azure-dev.yml
+++ b/.github/workflows/azure-dev.yml
@@ -65,7 +65,7 @@ jobs:
     - name: Build solution
       shell: bash
       run: |
-        dotnet build
+        dotnet build -c Release
 
     - name: Install playwright
       shell: pwsh
@@ -77,8 +77,8 @@ jobs:
     - name: Run unit tests
       shell: bash
       run: |
-        dotnet test ./test/AzureOpenAIProxy.AppHost.Tests --logger "trx" --collect:"XPlat Code Coverage"
-        dotnet test ./test/AzureOpenAIProxy.ApiApp.Tests --logger "trx" --collect:"XPlat Code Coverage"
+        dotnet test ./test/AzureOpenAIProxy.AppHost.Tests -c Release --no-build --logger "trx" --collect:"XPlat Code Coverage"
+        dotnet test ./test/AzureOpenAIProxy.ApiApp.Tests -c Release --no-build --logger "trx" --collect:"XPlat Code Coverage"
 
     - name: Run integration tests
       shell: bash
@@ -89,7 +89,7 @@ jobs:
 
         sleep 30
 
-        dotnet test ./test/AzureOpenAIProxy.PlaygroundApp.Tests --logger "trx" --collect:"XPlat Code Coverage"
+        dotnet test ./test/AzureOpenAIProxy.PlaygroundApp.Tests -c Release --no-build --logger "trx" --collect:"XPlat Code Coverage"
 
         kill $DOTNET_PID