Initial start date and date filter.

Author: mo-esmp

src/Serilog.Ui.Core/IDataProvider.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Serilog.Ui.Core
@@ -9,7 +10,9 @@ public interface IDataProvider
             int page,
             int count,
             string level = null,
-            string searchCriteria = null
+            string searchCriteria = null,
+            DateTime? startDate = null,
+            DateTime? endDate = null
         );
     }
 }

src/Serilog.Ui.ElasticSearchProvider/ElasticSearchDbDataProvider.cs

@@ -23,7 +23,9 @@ public ElasticSearchDbDataProvider(IElasticClient client, ElasticSearchDbOptions
             int page,
             int count,
             string level = null,
-            string searchCriteria = null)
+            string searchCriteria = null,
+            DateTime? startDate = null,
+            DateTime? endDate = null)
         {
             return GetLogsAsync(page - 1, count, level, searchCriteria);
         }

src/Serilog.Ui.MongoDbProvider/MongoDbDataProvider.cs

@@ -1,28 +1,31 @@
-using System;
+using MongoDB.Driver;
+using Serilog.Ui.Core;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using MongoDB.Driver;
-using Serilog.Ui.Core;
 
 namespace Serilog.Ui.MongoDbProvider
 {
     public class MongoDbDataProvider : IDataProvider
     {
-        private readonly IMongoClient _client;
         private readonly IMongoCollection<MongoDbLogModel> _collection;
 
         public MongoDbDataProvider(IMongoClient client, MongoDbOptions options)
         {
-            _client = client;
+            if (client is null) throw new ArgumentNullException(nameof(client));
+            if (options is null) throw new ArgumentNullException(nameof(options));
+
             _collection = client.GetDatabase(options.DatabaseName).GetCollection<MongoDbLogModel>(options.CollectionName);
         }
 
         public async Task<(IEnumerable<LogModel>, int)> FetchDataAsync(
             int page,
             int count,
             string level = null,
-            string searchCriteria = null)
+            string searchCriteria = null,
+            DateTime? startDate = null,
+            DateTime? endDate = null)
         {
             var logsTask = GetLogsAsync(page - 1, count, level, searchCriteria);
             var logCountTask = CountLogsAsync(level, searchCriteria);

src/Serilog.Ui.MsSqlServerProvider/SqlServerDataProvider.cs

@@ -1,6 +1,7 @@
 using Dapper;
 using Microsoft.Data.SqlClient;
 using Serilog.Ui.Core;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Text;
@@ -14,14 +15,16 @@ public class SqlServerDataProvider : IDataProvider
 
         public SqlServerDataProvider(RelationalDbOptions options)
         {
-            _options = options;
+            _options = options ?? throw new ArgumentNullException(nameof(options));
         }
 
         public async Task<(IEnumerable<LogModel>, int)> FetchDataAsync(
             int page,
             int count,
             string logLevel = null,
-            string searchCriteria = null
+            string searchCriteria = null,
+            DateTime? startDate = null,
+            DateTime? endDate = null
         )
         {
             var logsTask = GetLogsAsync(page - 1, count, logLevel, searchCriteria);

src/Serilog.Ui.PostgreSqlProvider/PostgreDataProvider.cs

@@ -1,6 +1,7 @@
 using Dapper;
 using Npgsql;
 using Serilog.Ui.Core;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Text;
@@ -14,14 +15,16 @@ public class PostgresDataProvider : IDataProvider
 
         public PostgresDataProvider(RelationalDbOptions options)
         {
-            _options = options;
+            _options = options ?? throw new ArgumentNullException(nameof(options));
         }
 
         public async Task<(IEnumerable<LogModel>, int)> FetchDataAsync(
             int page,
             int count,
             string logLevel = null,
-            string searchCriteria = null
+            string searchCriteria = null,
+            DateTime? startDate = null,
+            DateTime? endDate = null
         )
         {
             var logsTask = GetLogsAsync(page - 1, count, logLevel, searchCriteria);

src/Serilog.Ui.Web/SerilogUiMiddleware.cs

@@ -142,15 +142,20 @@ private async Task<string> FetchLogsAsync(HttpContext httpContext)
             httpContext.Request.Query.TryGetValue("count", out var countStr);
             httpContext.Request.Query.TryGetValue("level", out var levelStr);
             httpContext.Request.Query.TryGetValue("search", out var searchStr);
+            httpContext.Request.Query.TryGetValue("startDate", out var startDateStar);
+            httpContext.Request.Query.TryGetValue("endDate", out var endDateStar);
 
             int.TryParse(pageStr, out var currentPage);
             int.TryParse(countStr, out var count);
+            DateTime.TryParse(startDateStar, out var startDate);
+            DateTime.TryParse(endDateStar, out var endDate);
+
             currentPage = currentPage == default ? 1 : currentPage;
             count = count == default ? 10 : count;
 
             var provider = httpContext.RequestServices.GetService<IDataProvider>();
-            var (logs, total) = await provider.FetchDataAsync(currentPage, count, levelStr, searchStr);
-
+            var (logs, total) = await provider.FetchDataAsync(currentPage, count, levelStr, searchStr,
+                startDate == default ? (DateTime?)null : startDate, endDate == default ? (DateTime?)null : endDate);
             //var result = JsonSerializer.Serialize(logs, _jsonSerializerOptions);
             var result = JsonConvert.SerializeObject(new { logs, total, count, currentPage }, _jsonSerializerOptions);
             return result;

src/Serilog.Ui.Web/wwwroot/index.html

@@ -73,7 +73,7 @@ <h5 class="modal-title" id="loginModalLabel">JWT Authorizations</h5>
             </div>
 
             <div class="row">
-                <div class="col-sm-12 col-md-4">
+                <div class="col col-auto">
                     <div class="table-select" id="logCount">
                         <label>
                             Show
@@ -87,7 +87,7 @@ <h5 class="modal-title" id="loginModalLabel">JWT Authorizations</h5>
                         </label>
                     </div>
                 </div>
-                <div class="col-sm-12 col-md-4">
+                <div class="col col-auto">
                     <div class="table-select" id="logFilter">
                         <label>
                             Level
@@ -102,7 +102,25 @@ <h5 class="modal-title" id="loginModalLabel">JWT Authorizations</h5>
                         </label>
                     </div>
                 </div>
-                <div class="col-sm-12 col-md-4">
+                <div class="col col-auto">
+                    <div class="table-filter">
+                        <label>
+                            Start date:
+                            <input type="date" name="startDate" id="startDate" class="form-control form-control-sm">
+                            <button onclick="javascript:startDate.value='';">X</button>
+                        </label>
+                    </div>
+                </div>
+                <div class="col col-auto">
+                    <div class="table-filter">
+                        <label>
+                            End date:
+                            <input type="date" name="endDate" id="endDate" class="form-control form-control-sm">
+                            <button onclick="javascript:endDate.value='';">X</button>
+                        </label>
+                    </div>
+                </div>
+                <div class="col col-auto">
                     <div class="table-filter">
                         <label>
                             Search message: