Updated basic filtering to use dynamic inputs and improved sub filtering

src/EventLogExpert.Library/Helpers/Enums.cs

@@ -7,15 +7,14 @@ namespace EventLogExpert.Library.Helpers;
 
 public enum SeverityLevel
 {
-    All = -1,
     Error = 2,
     Warning = 3,
     Information = 4
 }
 
 public enum FilterType
 {
-    EventId,
+    [EnumMember(Value = "Event ID")] EventId,
     Level,
     Source,
     Task,

src/EventLogExpert.Library/Models/FilterModel.cs

@@ -1,20 +1,13 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.Library.EventArgs;
 using EventLogExpert.Library.Helpers;
 
 namespace EventLogExpert.Library.Models;
 
-public class FilterModel
+public record FilterModel(Guid Id)
 {
-    public FilterModel(Guid id)
-    {
-        Id = id;
-        FilterType = FilterType.EventId;
-    }
-
-    public Guid Id { get; init; }
+    private FilterType _filterType;
 
     public List<Func<DisplayEventModel, bool>> Comparison { get; set; } = new();
 
@@ -24,30 +17,19 @@ public FilterModel(Guid id)
 
     public bool IsEnabled { get; set; } = true;
 
-    public FilterType FilterType { get => _filterType; set => UpdateFilterType(value); }
+    public FilterType FilterType
+    {
+        get => _filterType;
+        set
+        {
+            _filterType = value;
+            FilterValue = string.Empty;
+        }
+    }
 
     public FilterComparison FilterComparison { get; set; }
 
-    public dynamic? FilterValue { get; private set; }
+    public string FilterValue { get; set; } = string.Empty;
 
     public List<SubFilterModel> SubFilters { get; set; } = new();
-
-    private FilterType _filterType;
-
-    private void UpdateFilterType(FilterType filterType)
-    {
-        FilterValue = filterType switch
-        {
-            FilterType.EventId => default(int),
-            FilterType.Level => SeverityLevel.All,
-            FilterType.Source => string.Empty,
-            FilterType.Task => string.Empty,
-            FilterType.Description => string.Empty,
-            _ => throw new Exception("Invalid Filter Type")
-        };
-
-        _filterType = filterType;
-    }
-
-    public void UpdateFilterValue(ValueChangedEventArgs args) => FilterValue = args.Value;
 }

src/EventLogExpert.Library/Models/SubFilterModel.cs

@@ -1,31 +1,27 @@
 // // Copyright (c) Microsoft Corporation.
 // // Licensed under the MIT License.
 
-using EventLogExpert.Library.EventArgs;
 using EventLogExpert.Library.Helpers;
 
 namespace EventLogExpert.Library.Models;
 
-public class SubFilterModel
+public record SubFilterModel
 {
-    public SubFilterModel(FilterType filterType)
+    private FilterType _filterType;
+
+    public Guid Id { get; set; } = Guid.NewGuid();
+
+    public FilterType FilterType
     {
-        FilterValue = filterType switch
+        get => _filterType;
+        set
         {
-            FilterType.EventId => default(int),
-            FilterType.Level => SeverityLevel.All,
-            FilterType.Source => string.Empty,
-            FilterType.Task => string.Empty,
-            FilterType.Description => string.Empty,
-            _ => throw new Exception("Invalid Filter Type")
-        };
+            _filterType = value;
+            FilterValue = string.Empty;
+        }
     }
 
-    public Guid Id { get; set; } = Guid.NewGuid();
-
     public FilterComparison FilterComparison { get; set; }
 
-    public dynamic? FilterValue { get; private set; }
-
-    public void UpdateFilterValue(ValueChangedEventArgs args) => FilterValue = args.Value;
+    public string FilterValue { get; set; } = string.Empty;
 }

src/EventLogExpert/Components/FilterPane.razor

@@ -6,8 +6,7 @@
 @inject IState<SettingsState> SettingsState
 
 <div class="filter-pane">
-
-    <div class="filter-row">
+    <div class="filter-header">
         <div>
             <button class="button-primary" @onclick="AddFilter">
                 <i class="bi bi-plus-circle"></i> Add Filter
@@ -27,7 +26,7 @@
                 </button>
             }
         </div>
-        
+
         @if (FilterPaneState.Value.CurrentFilters.Any() || _isDateFilterVisible || _isAdvancedFilterVisible)
         {
             <div class="header-center">
@@ -43,17 +42,17 @@
         }
     </div>
 
-    <div class="filter-content" data-toggle="@MenuState">
+    <div class="filter-group" data-toggle="@MenuState">
         @if (_isDateFilterVisible)
         {
             <EditForm id="filter-form" Model="_model">
                 <span>
-                    After: <InputDate class="input-filter-datetime" Type="InputDateType.DateTimeLocal" 
-                               @bind-Value="_model.After" disabled="@(!_canEditDate)" />
+                    After: <InputDate class="input-filter-datetime" Type="InputDateType.DateTimeLocal"
+                        @bind-Value="_model.After" disabled="@(!_canEditDate)" />
                 </span>
                 <span>
-                    Before: <InputDate class="input-filter-datetime" Type="InputDateType.DateTimeLocal" 
-                                @bind-Value="_model.Before" disabled="@(!_canEditDate)" />
+                    Before: <InputDate class="input-filter-datetime" Type="InputDateType.DateTimeLocal"
+                        @bind-Value="_model.Before" disabled="@(!_canEditDate)" />
                 </span>
 
                 @if (_canEditDate)
@@ -98,8 +97,8 @@
             <div>
                 <span>
                     Expression: <input class="input-advanced-filter" type="text"
-                                       placeholder="(Id == 1000 || Id == 1001) && Description.Contains('Fault')"
-                                       @oninput="AdvancedFilterChanged" disabled="@(!_canEditAdvancedFilter)" />
+                        placeholder="(Id == 1000 || Id == 1001) && Description.Contains('Fault')"
+                        @oninput="AdvancedFilterChanged" disabled="@(!_canEditAdvancedFilter)" />
                 </span>
                 @if (_canEditAdvancedFilter)
                 {
@@ -133,7 +132,7 @@
                         </button>
                     }
                 }
-                
+
                 @if (!_isAdvancedFilterValid)
                 {
                     <div hidden="@(string.IsNullOrWhiteSpace(_advancedFilterErrorMessage))">
@@ -143,5 +142,4 @@
             </div>
         }
     </div>
-
 </div>

src/EventLogExpert/Components/FilterPane.razor.css

@@ -1,27 +1,25 @@
 .filter-pane {
+    display: flex;
+    flex-direction: column;
+
     margin: 5px;
 
-    max-height: 25%;
+    /* max-height: 25%; */
 }
 
-.filter-row {
+.filter-header {
     display: grid;
     grid-template-columns: repeat(3, 1fr);
 }
 
-.filter-content {
-    display: flex;
-    flex-direction: column;
-
-    max-height: calc(100% - 20px);
-    overflow: auto;
+.filter-group {
+    /* overflow: auto; */
 
     border-bottom: solid var(--background-darkgray);
-
     transition: all 1s;
 }
 
-.filter-content[data-toggle="false"] {
+.filter-group[data-toggle="false"] {
     display: none;
 
     border: none;

src/EventLogExpert/Shared/Components/FilterInput.razor.cs

@@ -2,7 +2,6 @@
 // // Licensed under the MIT License.
 
 using Microsoft.AspNetCore.Components;
-using ValueChangedEventArgs = EventLogExpert.Library.EventArgs.ValueChangedEventArgs;
 
 namespace EventLogExpert.Shared.Components;
 
@@ -12,11 +11,11 @@ public partial class FilterInput
     public string Value { get; set; } = string.Empty;
 
     [Parameter]
-    public EventCallback<ValueChangedEventArgs> OnValueChangedEvent { get; set; }
+    public EventCallback<string> ValueChanged { get; set; }
 
     private async Task UpdateValue(ChangeEventArgs args)
     {
-        Value = (string)Convert.ChangeType(args.Value?.ToString(), typeof(string))!;
-        await OnValueChangedEvent.InvokeAsync(new ValueChangedEventArgs(Value));
+        Value = args.Value?.ToString() ?? string.Empty;
+        await ValueChanged.InvokeAsync(Value);
     }
 }

src/EventLogExpert/Shared/Components/FilterRow.razor

@@ -1,54 +1,24 @@
-@inject IState<EventLogState> EventLogState
-
-<div class="filter-row">
+<div class="filter-row">
     @if (Value.IsEditing)
     {
-        <div>
-
+        <div class="filter-content">
             <span>Filter On: </span>
-            <select class="input-filter-select" @bind="@Value.FilterType" disabled="@(Value.SubFilters.Count > 0)">
-                @foreach (FilterType type in Enum.GetValues(typeof(FilterType)))
-                {
-                    <option value="@type">@type.ToString()</option>
-                }
-            </select>
+            <FilterSelect @bind-Value="Value.FilterType" InputType="FilterType" />
 
             <span>Comparison: </span>
-            <select class="input-filter-select" @bind="@Value.FilterComparison">
-                @foreach (FilterComparison type in Enum.GetValues(typeof(FilterComparison)))
-                {
-                    <option value="@type">@type.ToFullString()</option>
-                }
-            </select>
+            <FilterSelect @bind-Value="Value.FilterComparison" InputType="FilterComparison" />
 
             <span>Value: </span>
-            @switch (Value.FilterType)
-            {
-                case FilterType.EventId :
-                    <FilterSelect CssClass="input-filter-id" TInput="int"
-                        Value="@Value.FilterValue" OnValueChangedEvent="@Value.UpdateFilterValue"
-                        Items="EventLogState.Value.EventIds.OrderBy(id => id)" />
-                    break;
-                case FilterType.Level :
-                    <FilterSelect CssClass="input-filter-severity" TInput="SeverityLevel"
-                        Value="@Value.FilterValue" OnValueChangedEvent="@Value.UpdateFilterValue" />
-                    break;
-                case FilterType.Source :
-                    <FilterSelect CssClass="input-filter-dropdown" TInput="string"
-                        Value="@Value.FilterValue" OnValueChangedEvent="@Value.UpdateFilterValue"
-                        Items="EventLogState.Value.EventProviderNames.OrderBy(n => n)" />
-                    break;
-                case FilterType.Task :
-                    <FilterSelect CssClass="input-filter-dropdown" TInput="string"
-                        Value="@Value.FilterValue" OnValueChangedEvent="@Value.UpdateFilterValue"
-                        Items="EventLogState.Value.TaskNames.OrderBy(n => n)" />
-                    break;
-                case FilterType.Description :
-                default :
-                    <FilterInput Value="@Value.FilterValue" OnValueChangedEvent="@Value.UpdateFilterValue" />
-                    break;
-            }
-
+            <div>
+                @if (Value.FilterType is FilterType.Description)
+                {
+                    <FilterInput @bind-Value="@Value.FilterValue" />
+                }
+                else
+                {
+                    <FilterValueSelect @bind-Value="@Value.FilterValue" Type="Value.FilterType" />
+                }
+            </div>
         </div>
     }
     else if (string.IsNullOrWhiteSpace(Value.ComparisonString))
@@ -94,17 +64,15 @@
                 </button>
             }
         }
-
     </div>
-
 </div>
 
-<div class="sub-filter-row">
-    @if (Value.SubFilters.Any() && Value.IsEditing)
-    {
+@if (Value.SubFilters.Any() && Value.IsEditing)
+{
+    <div class="sub-filter-row">
         @foreach (var item in Value.SubFilters)
         {
-            <SubFilterRow ParentId="@Value.Id" FilterType="@Value.FilterType" Value="@item" />
+            <SubFilterRow ParentId="@Value.Id" FilterType="Value.FilterType" Value="@item" />
         }
-    }
-</div>
+    </div>
+}