Refactor audit log deletion

README.md

@@ -315,7 +315,7 @@ Or add a group that should be able to delete the audit logs for all users.
 })
 ```
 
-Audit logs are stored in Dynamic Data Store (DSS), and when they are deleted from the UI (with the button «Clear all logs»), the entire DSS store is deleted.
+Audit logs are stored in Dynamic Data Store (DSS), and when they are deleted from the UI (with the button «Delete all logs»), the entire DSS store is deleted.
 
 By default audit logs are deleted automatically after a 30 day retention time, but this can be changed with this appsetting.
 

src/Gulla.Episerver.SqlStudio/Controllers/AuditLogController.cs

@@ -1,4 +1,5 @@
-using System.Net;
+using System.Linq;
+using System.Net;
 using Gulla.Episerver.SqlStudio.Configuration;
 using Gulla.Episerver.SqlStudio.Dds;
 using Gulla.Episerver.SqlStudio.ViewModels;
@@ -38,10 +39,27 @@ public ActionResult Index()
 
             var model = new AuditLogViewModel
             {
-                Logs = _configurationService.CanUserViewAllAuditLogs() ? _sqlStudioDdsRepository.ListAll() : _sqlStudioDdsRepository.ListAll(User.Identity.Name)
+                Logs = _configurationService.CanUserViewAllAuditLogs() ? _sqlStudioDdsRepository.ListAll() : _sqlStudioDdsRepository.ListAll(User.Identity.Name),
+                LogsCount = _configurationService.CanUserDeleteAuditLogs() ? _sqlStudioDdsRepository.ListAll().Count() : 0,
+                ShowDeleteButton = _configurationService.CanUserDeleteAuditLogs()
             };
 
             return View(model);
         }
+
+        [HttpPost]
+        public ActionResult Index(string delete)
+        {
+            if (!_configurationService.Enabled() || !_configurationService.CanUserDeleteAuditLogs())
+            {
+                return new ObjectResult("Unauthorized")
+                {
+                    StatusCode = (int?)HttpStatusCode.Unauthorized
+                };
+            }
+
+            _sqlStudioDdsRepository.DeleteAll();
+            return RedirectToAction("Index");
+        }
     }
 }

src/Gulla.Episerver.SqlStudio/Controllers/SqlStudioController.cs

@@ -243,14 +243,14 @@ private List<SelectListItem> GetConnectionStringList(DataAccessOptions dataAcces
         {
             if (!string.IsNullOrEmpty(configuration.ConnectionString))
             {
-                return new List<SelectListItem>
-                {
+                return
+                [
                     new SelectListItem
                     {
                         Text = "Default",
                         Value = configuration.ConnectionString
                     }
-                };
+                ];
             }
             else
             {
@@ -267,7 +267,7 @@ private static string AnonymizeConnectionString(string connectionString)
             try
             {
                 var connection = new SqlConnectionStringBuilder(connectionString);
-                output = connection.UserID + " @ " + connection.InitialCatalog;
+                output = connection.UserID + "@" + connection.InitialCatalog;
             }
             catch 
             {

src/Gulla.Episerver.SqlStudio/Gulla.Episerver.SqlStudio.csproj

@@ -6,10 +6,10 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Version>2.10.0</Version>
-    <PackageVersion>2.10.0</PackageVersion>
-    <AssemblyVersion>2.10.0</AssemblyVersion>
-    <FileVersion>2.10.0</FileVersion>	  
+    <Version>2.11.0</Version>
+    <PackageVersion>2.11.0</PackageVersion>
+    <AssemblyVersion>2.11.0</AssemblyVersion>
+    <FileVersion>2.11.0</FileVersion>	  
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <PackageId>Gulla.Episerver.SqlStudio</PackageId>
@@ -21,7 +21,7 @@
     <RepositoryUrl>https://github.com/tomahg/Gulla.Episerver.SqlStudio/</RepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>Update to .NET8</PackageReleaseNotes>
+    <PackageReleaseNotes>Refactor audit log deletion</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>

src/Gulla.Episerver.SqlStudio/Menu/MenuProvider.cs

@@ -18,8 +18,8 @@ public SqlStudioMenuProvider(ConfigurationService configurationService)
 
             public IEnumerable<MenuItem> GetMenuItems()
             {
-                return new MenuItem[]
-                {
+                return
+                [
                     new UrlMenuItem("SQL", MenuPaths.Global + "/cms/sqlstudio", "/SqlStudio")
                     {
                         IsAvailable = context => _configurationService.Enabled()
@@ -30,17 +30,11 @@ public IEnumerable<MenuItem> GetMenuItems()
                         IsAvailable = context => _configurationService.Enabled(),
                         SortIndex = 1
                     },
-                    new UrlMenuItem("Audit log", MenuPaths.Global + "/cms/sqlstudio/auditlog", "/SqlStudio/AuditLog")
+                    new UrlMenuItem("Audit Log", MenuPaths.Global + "/cms/sqlstudio/auditlog", "/SqlStudio/AuditLog")
                     {
                         IsAvailable = context => _configurationService.Enabled() && _configurationService.IsAuditLogEnabled(),
                         SortIndex = 2
                     },
-                    new UrlMenuItem("Admin", MenuPaths.Global + "/cms/sqlstudio/admin", "/SqlStudio/Admin")
-                    {
-                        IsAvailable = context => _configurationService.Enabled() && _configurationService.CanUserDeleteAuditLogs(),
-                        SortIndex = 3
-                    },
-                };
             }
         }
     }

src/Gulla.Episerver.SqlStudio/ViewModels/AuditLogViewModel.cs

@@ -8,5 +8,7 @@ public class AuditLogViewModel
     {
         public IEnumerable<SqlStudioDdsLogItem> Logs { get; set; }
         public bool HasResults => Logs?.Any() == true;
+        public bool ShowDeleteButton { get; set; }
+        public int LogsCount { get; set; }
     }
 }

src/Gulla.Episerver.SqlStudio/Views/AuditLog/Index.cshtml

@@ -9,7 +9,7 @@
 
 <html>
 <head>
-    <title>SqlStudio Log</title>
+    <title>SqlStudio Audit Log</title>
 
     <style>
         body {
@@ -64,6 +64,18 @@
                     </div>
                 }
             </div>
+            @if (Model.HasResults && Model.ShowDeleteButton)
+            {
+                <hr />
+                <div class="inputcontainer" style="margin-left: 30px; margin-bottom: 20px; margin-top: 20px">
+                    <h4 style="margin-bottom: 5px">Danger Zone</h4>
+                    <p>Number of logs in DDS: @Model.LogsCount</p>
+                    @using (Html.BeginForm())
+                    {
+                        <input type="submit" id="btnDelete" name="Delete" value="Delete all logs" class="epi-cmsButton-text epi-cmsButton-tools epi-cmsButton-Delete" style="color: #d1242f; font-weight: bold;" />
+                    }
+                </div>
+            }
         </div>
     </div>