Add log count select options.

Author: mo-esmp

src/Serilog.Ui.Web/Controllers/LogsController.cs

@@ -1,18 +1,35 @@
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
 using Serilog.Ui.Core;
 using Serilog.Ui.Web.ViewModel;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace Serilog.Ui.Web.Controllers
 {
     public class LogsController : Controller
     {
-        private static string _scripts;
-        private static string _styles;
+        private static readonly string Scripts;
+        private static readonly string Styles;
+        private static readonly IEnumerable<SelectListItem> SelectListItems;
         private readonly IDataProvider _dataProvider;
 
+        static LogsController()
+        {
+            Styles = SetResource("Serilog.Ui.Web.wwwroot.css.main.css");
+            Scripts = SetResource("Serilog.Ui.Web.wwwroot.js.main.js");
+            SelectListItems = new List<SelectListItem>
+            {
+                new SelectListItem {Text = "10", Value = "10"},
+                new SelectListItem {Text = "25", Value = "25"},
+                new SelectListItem {Text = "50", Value = "50"},
+                new SelectListItem {Text = "100", Value = "100"}
+            };
+        }
+
         public LogsController(IDataProvider dataProvider)
         {
             _dataProvider = dataProvider;
@@ -26,39 +43,31 @@ public async Task<IActionResult> Index(int page = 1, int count = 10)
             if (count > 100)
                 count = 100;
 
+            var x = SelectListItems.FirstOrDefault(i => i.Value == count.ToString());
+            if (x != null)
+                x.Selected = true;
+            else
+                SelectListItems.First().Selected = true;
+
             var (logs, logCount) = await _dataProvider.FetchDataAsync(page, count);
             var viewModel = new LogViewModel
             {
                 LogCount = logCount,
                 Logs = logs,
                 Page = page,
-                Count = count
+                Count = count,
+                CountSelectListItems = SelectListItems
             };
 
-            GetResources();
+            ViewData["Styles"] = Styles;
+            ViewData["Scripts"] = Scripts;
 
             return View(viewModel);
         }
 
-        private void GetResources()
-        {
-            if (_styles != null)
-            {
-                ViewData["Styles"] = _styles;
-                ViewData["Scripts"] = _scripts;
-                return;
-            }
-
-            _styles = SetResource("Serilog.Ui.Web.wwwroot.css.main.css");
-            ViewData["Styles"] = _styles;
-
-            _scripts = SetResource("Serilog.Ui.Web.wwwroot.js.main.js");
-            ViewData["Scripts"] = _scripts;
-        }
-
-        private string SetResource(string resourceName)
+        private static string SetResource(string resourceName)
         {
-            var resourceStream = GetType().Assembly.GetManifestResourceStream(resourceName);
+            var resourceStream = typeof(LogsController).Assembly.GetManifestResourceStream(resourceName);
             var resource = string.Empty;
 
             using var reader = new StreamReader(resourceStream, Encoding.UTF8);

src/Serilog.Ui.Web/ViewModel/LogViewModel.cs

@@ -1,4 +1,5 @@
-using Serilog.Ui.Core;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Serilog.Ui.Core;
 using System.Collections.Generic;
 
 namespace Serilog.Ui.Web.ViewModel
@@ -12,5 +13,7 @@ public class LogViewModel
         public int Page { get; set; }
 
         public int Count { get; set; }
+
+        public IEnumerable<SelectListItem> CountSelectListItems { get; set; }
     }
 }

src/Serilog.Ui.Web/Views/Logs/Index.cshtml

@@ -11,11 +11,7 @@
             <div class="table-select">
                 <label>
                     Show
-                    <select name="count" class="form-control form-control-sm">
-                        <option value="10">10</option>
-                        <option value="25">25</option>
-                        <option value="50">50</option>
-                        <option value="100">100</option>
+                    <select asp-items="@Model.CountSelectListItems" name="count" class="form-control form-control-sm">
                     </select>
                     entries
                 </label>
@@ -42,33 +38,33 @@
         <tbody>
             @foreach (var log in Model.Logs)
             {
-            switch (log.Level)
-            {
-            case "Verbose":
-            case "Debug":
-            levelClass = "bg-success";
-            break;
-            case "Information":
-            levelClass = "bg-primary";
-            break;
-            case "Warning":
-            levelClass = "bg-warning";
-            break;
-            case "Error":
-            levelClass = "bg-danger";
-            break;
-            }
+                switch (log.Level)
+                {
+                    case "Verbose":
+                    case "Debug":
+                        levelClass = "bg-success";
+                        break;
+                    case "Information":
+                        levelClass = "bg-primary";
+                        break;
+                    case "Warning":
+                        levelClass = "bg-warning";
+                        break;
+                    case "Error":
+                        levelClass = "bg-danger";
+                        break;
+                }
 
-            <tr>
-                <th scope="row">@log.Id</th>
-                <td class="text-center"><span style="padding: 5px;" class="@levelClass text-white">@log.Level</span></td>
-                <td class="text-center">@log.Timestamp</td>
-                <td>
-                    <span class="overflow-auto"> @log.Message</span>
-                </td>
-                <td class="text-center">@log.Exception</td>
-                <td class="text-center"><a href="#" title="Click to view">View</a></td>
-            </tr>
+                <tr>
+                    <th scope="row">@log.Id</th>
+                    <td class="text-center"><span style="padding: 5px;" class="@levelClass text-white">@log.Level</span></td>
+                    <td class="text-center">@log.Timestamp</td>
+                    <td>
+                        <span class="overflow-auto"> @log.Message</span>
+                    </td>
+                    <td class="text-center">@log.Exception</td>
+                    <td class="text-center"><a href="#" title="Click to view">View</a></td>
+                </tr>
             }
         </tbody>
     </table>

src/Serilog.Ui.Web/Views/Logs/_Paging.cshtml

@@ -11,7 +11,6 @@
         {
             hasMore = true;
         }
-
     }
 }