From 4fd395d72dd1e31de02eb0d6a7fed0bff8ebf4b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2024 11:05:50 +0000
Subject: [PATCH 1/2] Bump MudBlazor from 7.8.0 to 7.11.0

Bumps [MudBlazor](https://github.com/MudBlazor/MudBlazor) from 7.8.0 to 7.11.0.
- [Release notes](https://github.com/MudBlazor/MudBlazor/releases)
- [Changelog](https://github.com/MudBlazor/MudBlazor/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/MudBlazor/MudBlazor/compare/v7.8.0...v7.11.0)

---
updated-dependencies:
- dependency-name: MudBlazor
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 BLAZAM/BLAZAM.csproj                           | 2 +-
 BLAZAMEmailMessage/BLAZAMEmailMessage.csproj   | 2 +-
 BLAZAMGui/BLAZAMGui.csproj                     | 2 +-
 BLAZAMJobs/BLAZAMJobs.csproj                   | 2 +-
 BLAZAMNotifications/BLAZAMNotifications.csproj | 2 +-
 BLAZAMThemes/BLAZAMThemes.csproj               | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/BLAZAM/BLAZAM.csproj b/BLAZAM/BLAZAM.csproj
index fdac3349..1b249a82 100644
--- a/BLAZAM/BLAZAM.csproj
+++ b/BLAZAM/BLAZAM.csproj
@@ -74,7 +74,7 @@
 		<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.8" />
 		<PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="8.0.0" />
 		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.5" />
-		<PackageReference Include="MudBlazor" Version="7.8.0" />
+		<PackageReference Include="MudBlazor" Version="7.11.0" />
 		<PackageReference Include="MudBlazor.Markdown" Version="7.8.0" />
 		<PackageReference Include="MudBlazor.ThemeManager" Version="2.1.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
diff --git a/BLAZAMEmailMessage/BLAZAMEmailMessage.csproj b/BLAZAMEmailMessage/BLAZAMEmailMessage.csproj
index a53fff73..fd7ab62d 100644
--- a/BLAZAMEmailMessage/BLAZAMEmailMessage.csproj
+++ b/BLAZAMEmailMessage/BLAZAMEmailMessage.csproj
@@ -15,7 +15,7 @@
   <ItemGroup>
 	  <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
 	  <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.8" />
-    <PackageReference Include="MudBlazor" Version="7.8.0" />
+    <PackageReference Include="MudBlazor" Version="7.11.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/BLAZAMGui/BLAZAMGui.csproj b/BLAZAMGui/BLAZAMGui.csproj
index 6482c303..5eebae3d 100644
--- a/BLAZAMGui/BLAZAMGui.csproj
+++ b/BLAZAMGui/BLAZAMGui.csproj
@@ -26,7 +26,7 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
 		<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.8" />
-		<PackageReference Include="MudBlazor" Version="7.8.0" />
+		<PackageReference Include="MudBlazor" Version="7.11.0" />
 		<PackageReference Include="MudBlazor.Markdown" Version="7.8.0" />
 		<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
 		<PackageReference Include="System.Drawing.Common" Version="8.0.8" />
diff --git a/BLAZAMJobs/BLAZAMJobs.csproj b/BLAZAMJobs/BLAZAMJobs.csproj
index de7e12f3..3d39fbcc 100644
--- a/BLAZAMJobs/BLAZAMJobs.csproj
+++ b/BLAZAMJobs/BLAZAMJobs.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.8" />
-    <PackageReference Include="MudBlazor" Version="7.8.0" />
+    <PackageReference Include="MudBlazor" Version="7.11.0" />
     <PackageReference Include="PreMailer.Net" Version="2.6.0" />
   </ItemGroup>
 
diff --git a/BLAZAMNotifications/BLAZAMNotifications.csproj b/BLAZAMNotifications/BLAZAMNotifications.csproj
index 3a00c644..5dd68a72 100644
--- a/BLAZAMNotifications/BLAZAMNotifications.csproj
+++ b/BLAZAMNotifications/BLAZAMNotifications.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.8" />
-    <PackageReference Include="MudBlazor" Version="7.8.0" />
+    <PackageReference Include="MudBlazor" Version="7.11.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/BLAZAMThemes/BLAZAMThemes.csproj b/BLAZAMThemes/BLAZAMThemes.csproj
index f31003c4..8e5aa27d 100644
--- a/BLAZAMThemes/BLAZAMThemes.csproj
+++ b/BLAZAMThemes/BLAZAMThemes.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.8" />
-    <PackageReference Include="MudBlazor" Version="7.8.0" />
+    <PackageReference Include="MudBlazor" Version="7.11.0" />
     <PackageReference Include="MudBlazor.ThemeManager" Version="2.1.0" />
   </ItemGroup>
 

From ef6e2d1052b5d71700ba23d5cd1828d0b2965e6f Mon Sep 17 00:00:00 2001
From: Chris Jacobsen <jacobsen9026@gmail.com>
Date: Tue, 15 Oct 2024 17:31:43 -0400
Subject: [PATCH 2/2] Fixes for MudDataGrid changes

---
 BLAZAM/BLAZAM.csproj               |  2 +-
 BLAZAM/Pages/Configure/Audit.razor | 43 ++++++++++++++++++++++--------
 BLAZAMGui/Layouts/MainLayout.razor | 21 ++++++++++-----
 BLAZAMGui/UI/Dev/DevTools.razor    | 25 +++++++++++++----
 4 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/BLAZAM/BLAZAM.csproj b/BLAZAM/BLAZAM.csproj
index 1b249a82..e09e8f9a 100644
--- a/BLAZAM/BLAZAM.csproj
+++ b/BLAZAM/BLAZAM.csproj
@@ -6,7 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ServerGarbageCollection>false</ServerGarbageCollection>
 		<AssemblyVersion>1.0.4</AssemblyVersion>
-		<Version>2024.10.11.1647</Version>
+		<Version>2024.10.15.2129</Version>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<RootNamespace>BLAZAM</RootNamespace>
 		<GenerateDocumentationFile>False</GenerateDocumentationFile>
diff --git a/BLAZAM/Pages/Configure/Audit.razor b/BLAZAM/Pages/Configure/Audit.razor
index 9058ce30..a9b1c49b 100644
--- a/BLAZAM/Pages/Configure/Audit.razor
+++ b/BLAZAM/Pages/Configure/Audit.razor
@@ -29,8 +29,15 @@
                          SortMode="@SortMode.Multiple"
                          Groupable="false">
                 <Columns>
-                    <PropertyColumn Property="x => x.Timestamp.ToLocalTime()" Sortable="true" />
-                    <PropertyColumn Property="x => x.Username" Filterable="true"/>
+                    @* <PropertyColumn Property="x => x.Timestamp.ToLocalTime()"   Sortable="true" /> *@
+                    <TemplateColumn Title=@AppLocalization["Timestamp"] Sortable="true">
+                        <CellTemplate>
+                            <MudText>
+                                @context.Item.Timestamp.ToLocalTime()
+                            </MudText>
+                        </CellTemplate>
+                    </TemplateColumn>
+                    <PropertyColumn Property="x => x.Username" Filterable="true" />
                     <PropertyColumn Property="x => x.IpAddress" Filterable="true" />
                     <PropertyColumn Property="x => x.Action" Filterable="true" />
                     <TemplateColumn>
@@ -38,7 +45,7 @@
                             <MudLink Href="@("/view/"+context.Item.Target)">@context.Item.Target</MudLink>
                         </CellTemplate>
                     </TemplateColumn>
-                    <PropertyColumn Property="x => x.BeforeAction"  Filterable="true" />
+                    <PropertyColumn Property="x => x.BeforeAction" Filterable="true" />
                     <PropertyColumn Property="x => x.AfterAction" Filterable="true" />
 
                 </Columns>
@@ -55,7 +62,7 @@
     <MudTabPanel>
         <ChildContent>
             <LoginHistoryChart />
-           
+
 
             <MudDataGrid Virtualize=true
                          Height="600px"
@@ -67,7 +74,14 @@
                          SortMode="@SortMode.Multiple"
                          Groupable="false">
                 <Columns>
-                    <PropertyColumn Property="x => x.Timestamp.ToLocalTime()" />
+                    @* <PropertyColumn Property="x => x.Timestamp.ToLocalTime()" /> *@
+                    <TemplateColumn Title=@AppLocalization["Timestamp"] Sortable="true">
+                        <CellTemplate>
+                            <MudText>
+                                @context.Item.Timestamp.ToLocalTime()
+                            </MudText>
+                        </CellTemplate>
+                    </TemplateColumn>
                     <PropertyColumn Property="x => x.Username" />
                     <PropertyColumn Property="x => x.IpAddress" />
                     <PropertyColumn Property="x => x.Action" />
@@ -85,7 +99,7 @@
     </MudTabPanel>
     <MudTabPanel>
         <ChildContent>
-            @if(ApplicationInfo.InDemoMode && CurrentUser.Username == "Demo")
+            @if (ApplicationInfo.InDemoMode && CurrentUser.Username == "Demo")
             {
                 <MudText>Disabled in demo</MudText>
             }
@@ -101,7 +115,14 @@
                              SortMode="@SortMode.Multiple"
                              Groupable="false">
                     <Columns>
-                        <PropertyColumn Property="x => x.Timestamp.ToLocalTime()" />
+                        @* <PropertyColumn Property="x => x.Timestamp.ToLocalTime()" /> *@
+                        <TemplateColumn Title=@AppLocalization["Timestamp"] Sortable="true">
+                            <CellTemplate>
+                                <MudText>
+                                    @context.Item.Timestamp.ToLocalTime()
+                                </MudText>
+                            </CellTemplate>
+                        </TemplateColumn>
                         <PropertyColumn Property="x => x.Username" />
                         <PropertyColumn Property="x => x.IpAddress" />
                         <PropertyColumn Property="x => x.Target" />
@@ -113,7 +134,7 @@
                     </Columns>
                 </MudDataGrid>
             }
-         
+
 
 
 
@@ -128,7 +149,7 @@
 </MudTabs>
 
 
-            @code {
+@code {
     List<LogonAuditLog> logonEntries = new();
     List<DirectoryEntryAuditLog> auditEntries = new();
     List<SystemAuditLog> systemAuditEntries = new();
@@ -146,10 +167,10 @@
 
 
 
-           
+
         }
 
 
     }
-   
+
 }
diff --git a/BLAZAMGui/Layouts/MainLayout.razor b/BLAZAMGui/Layouts/MainLayout.razor
index a4f4dcf5..84bc3ef4 100644
--- a/BLAZAMGui/Layouts/MainLayout.razor
+++ b/BLAZAMGui/Layouts/MainLayout.razor
@@ -25,8 +25,13 @@
                 @if (ApplicationInfo.inDebugMode)
                 {
 
-                    <AuthorizeView Context="authorizedContext" Roles=@UserRoles.SuperAdmin>
-                        <MudDrawer Width="450px" @bind-Open=@_devDrawerOpen Anchor=Anchor.End Elevation="2" Class="mud-theme-dark">
+                    <AuthorizeView Context="authorizedContext"
+                                   Roles=@UserRoles.SuperAdmin>
+                        <MudDrawer Width="450px"
+                                   @bind-Open=@_devDrawerOpen
+                                   Anchor=Anchor.End
+                                   Elevation="2"
+                                   Class="mud-theme-dark">
                             <MudDrawerContainer>
                                 <DevTools />
                             </MudDrawerContainer>
@@ -71,7 +76,7 @@ await InvokeAsync(StateHasChanged);
                 <MudMainContent Class=" mud-height-full">
 
 
-                  
+
                     <MudContainer Style="@topMarginForContent"
                                   MaxWidth="MaxWidth.ExtraExtraLarge"
                                   Class="px-0 pb-10 mud-height-full">
@@ -165,7 +170,7 @@ await InvokeAsync(StateHasChanged);
 
             Header.OnRefreshRequested += (async () => { await InvokeAsync(StateHasChanged); });
 
-       
+
         InvokeAsync(StateHasChanged);
     }
     SetSubHeader? SubHeader;
@@ -225,7 +230,7 @@ await InvokeAsync(StateHasChanged);
         get
 
         {
-            if(BrowseExpanded == false)
+            if (BrowseExpanded == false)
             {
                 if (_mudBreakPoint?.Breakpoint == Breakpoint.Sm ||
                 _mudBreakPoint?.Breakpoint == Breakpoint.Xs)
@@ -236,9 +241,11 @@ await InvokeAsync(StateHasChanged);
                 {
                     return DrawerVariant.Responsive;
                 }
-            }else{
+            }
+            else
+            {
                 return DrawerVariant.Temporary;
-            } 
+            }
 
         }
     }
diff --git a/BLAZAMGui/UI/Dev/DevTools.razor b/BLAZAMGui/UI/Dev/DevTools.razor
index 3c30da53..c3c7630a 100644
--- a/BLAZAMGui/UI/Dev/DevTools.razor
+++ b/BLAZAMGui/UI/Dev/DevTools.razor
@@ -55,12 +55,27 @@
                 <PropertyColumn Title="Session Expiration Time" Property="x => x.Ticket==null?null:(DateTimeOffset.UtcNow-x.Ticket.Properties.ExpiresUtc)" />
 
 
-               
 
-                <PropertyColumn Title="Has User Priv" Property="x => x.HasUserPrivilege.ToString()" />
-                <PropertyColumn Title="Has Group Priv" Property="x => x.HasGroupPrivilege.ToString()" />
-                <PropertyColumn Title="Has OU Priv" Property="x => x.HasOUPrivilege.ToString()" />
-                <PropertyColumn Title="Has Computer Priv" Property="x => x.HasComputerPrivilege.ToString()" />
+                <TemplateColumn Title="Has User Priv">
+                    <CellTemplate>
+                        @context.Item.HasUserPrivilege
+                    </CellTemplate>
+                </TemplateColumn>
+                <TemplateColumn Title="Has Group Priv">
+                    <CellTemplate>
+                        @context.Item.HasGroupPrivilege
+                    </CellTemplate>
+                </TemplateColumn>
+                <TemplateColumn Title="Has OU Priv">
+                    <CellTemplate>
+                        @context.Item.HasOUPrivilege
+                    </CellTemplate>
+                </TemplateColumn>
+                <TemplateColumn Title="Has Computer Priv">
+                    <CellTemplate>
+                        @context.Item.HasComputerPrivilege
+                    </CellTemplate>
+                </TemplateColumn>
             </Columns>
         </MudDataGrid>