Removed color filter from excluded filters and updated text to indica…

…te exclusion
microsoft · May 8, 2024 · cc1258e · cc1258e
1 parent 3419095
commit cc1258e
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 36 deletions.
diff --git a/src/EventLogExpert/Shared/Components/Filters/AdvancedFilterRow.razor b/src/EventLogExpert/Shared/Components/Filters/AdvancedFilterRow.razor
@@ -5,19 +5,29 @@
     <div class="flex-align-center">
         @if (Value.IsEditing)
         {
-            <ValueSelect CssClass="@($"input color-dropdown {Value.Color.ToString().ToLower()}")"
-                T="HighlightColor" @bind-Value="Value.Color">
-                @foreach (HighlightColor item in Enum.GetValues(typeof(HighlightColor)))
-                {
-                    <ValueSelectItem CssClass="@($"color-dropdown-item {item.ToString().ToLower()}")" T="HighlightColor" Value="item" />
-                }
-            </ValueSelect>
+            @if (!Value.IsExcluded)
+            {
+                <ValueSelect CssClass="@($"input color-dropdown {Value.Color.ToString().ToLower()}")"
+                    T="HighlightColor" @bind-Value="Value.Color">
+                    @foreach (HighlightColor item in Enum.GetValues(typeof(HighlightColor)))
+                    {
+                        <ValueSelectItem CssClass="@($"color-dropdown-item {item.ToString().ToLower()}")" T="HighlightColor" Value="item" />
+                    }
+                </ValueSelect>
+            }
 
             <span>
-                Expression:
-                <input class="input advanced-filter" type="text"
+                @if (Value.IsExcluded)
+                {
+                    <text>Exclude Expression: </text>
+                }
+                else
+                {
+                    <text>Expression: </text>
+                }
+                <input class="input advanced-filter" @oninput="OnInputChanged"
                     placeholder="(Id == 1000 || Id == 1001) && Description.Contains('Fault')"
-                    value="@Value.Comparison.Value" @oninput="OnInputChanged" />
+                    type="text" value="@Value.Comparison.Value" />
             </span>
         }
         else if (string.IsNullOrWhiteSpace(Value.Comparison.Value))

diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterCacheRow.razor b/src/EventLogExpert/Shared/Components/Filters/FilterCacheRow.razor
@@ -1,16 +1,18 @@
 @using EventLogExpert.UI
-@using EventLogExpert.UI.Models
 
 <div class="flex-space-between">
     <div class="flex-align-center">
         @if (Value.IsEditing)
         {
-            <ValueSelect CssClass="@($"input color-dropdown {Value.Color.ToString().ToLower()}")" T="HighlightColor" @bind-Value="Value.Color">
-                @foreach (HighlightColor item in Enum.GetValues(typeof(HighlightColor)))
-                {
-                    <ValueSelectItem CssClass="@($"color-dropdown-item {item.ToString().ToLower()}")" T="HighlightColor" Value="item" />
-                }
-            </ValueSelect>
+            if (!Value.IsExcluded)
+            {
+                <ValueSelect CssClass="@($"input color-dropdown {Value.Color.ToString().ToLower()}")" T="HighlightColor" @bind-Value="Value.Color">
+                    @foreach (HighlightColor item in Enum.GetValues(typeof(HighlightColor)))
+                    {
+                        <ValueSelectItem CssClass="@($"color-dropdown-item {item.ToString().ToLower()}")" T="HighlightColor" Value="item" />
+                    }
+                </ValueSelect>
+            }
 
             <span>Cache Type: </span>
             <ValueSelect CssClass="input filter-dropdown" T="CacheType" @bind-Value="_cacheType" ToStringFunc="x => x.ToFullString()">
@@ -20,7 +22,14 @@
                 }
             </ValueSelect>
 
-            <span>Value: </span>
+            if (Value.IsExcluded)
+            {
+                <span>Exclude Value: </span>
+            }
+            else
+            {
+                <span>Value: </span>
+            }
             <ValueSelect CssClass="input cache-dropdown" T="string" @bind-Value="_filterValue" IsInput>
                 @if (Items.Any())
                 {

diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterGroupRow.razor b/src/EventLogExpert/Shared/Components/Filters/FilterGroupRow.razor
@@ -5,19 +5,29 @@
         <div class="flex-align-center">
             @if (Value.IsEditing)
             {
-                <ValueSelect CssClass="@($"input color-dropdown {Value.Color.ToString().ToLower()}")"
-                             T="HighlightColor" @bind-Value="Value.Color">
-                    @foreach (HighlightColor item in Enum.GetValues(typeof(HighlightColor)))
-                    {
-                        <ValueSelectItem CssClass="@($"color-dropdown-item {item.ToString().ToLower()}")" T="HighlightColor" Value="item" />
-                    }
-                </ValueSelect>
+                if (!Value.IsExcluded)
+                {
+                    <ValueSelect CssClass="@($"input color-dropdown {Value.Color.ToString().ToLower()}")"
+                                 T="HighlightColor" @bind-Value="Value.Color">
+                        @foreach (HighlightColor item in Enum.GetValues(typeof(HighlightColor)))
+                        {
+                            <ValueSelectItem CssClass="@($"color-dropdown-item {item.ToString().ToLower()}")" T="HighlightColor" Value="item" />
+                        }
+                    </ValueSelect>
+                }
 
                 <span>
-                    Expression:
-                    <input class="input advanced-filter" type="text"
-                           placeholder="(Id == 1000 || Id == 1001) && Description.Contains('Fault')"
-                           value="@Value.Comparison.Value" @oninput="OnInputChanged" />
+                    @if (Value.IsExcluded)
+                    {
+                        <text>Exclude Expression: </text>
+                    }
+                    else
+                    {
+                        <text>Expression: </text>
+                    }
+                    <input class="input advanced-filter" @oninput="OnInputChanged"
+                        placeholder="(Id == 1000 || Id == 1001) && Description.Contains('Fault')"
+                        type="text" value="@Value.Comparison.Value" />
                 </span>
             }
             else if (string.IsNullOrWhiteSpace(Value.Comparison.Value))

diff --git a/src/EventLogExpert/Shared/Components/Filters/FilterRow.razor b/src/EventLogExpert/Shared/Components/Filters/FilterRow.razor
@@ -4,14 +4,24 @@
     <div class="flex-align-center">
         @if (Value.IsEditing)
         {
-            <ValueSelect CssClass="@($"input color-dropdown {Value.Color.ToString().ToLower()}")" T="HighlightColor" @bind-Value="Value.Color">
-                @foreach (HighlightColor item in Enum.GetValues(typeof(HighlightColor)))
-                {
-                    <ValueSelectItem CssClass="@($"color-dropdown-item {item.ToString().ToLower()}")" T="HighlightColor" Value="item" />
-                }
-            </ValueSelect>
+            if (!Value.IsExcluded)
+            {
+                <ValueSelect CssClass="@($"input color-dropdown {Value.Color.ToString().ToLower()}")" T="HighlightColor" @bind-Value="Value.Color">
+                    @foreach (HighlightColor item in Enum.GetValues(typeof(HighlightColor)))
+                    {
+                        <ValueSelectItem CssClass="@($"color-dropdown-item {item.ToString().ToLower()}")" T="HighlightColor" Value="item" />
+                    }
+                </ValueSelect>
+            }
 
-            <span>Filter On: </span>
+            if (Value.IsExcluded)
+            {
+                <span>Exclude On: </span>
+            }
+            else
+            {
+                <span>Filter On: </span>
+            }
             <ValueSelect CssClass="input filter-dropdown" T="FilterCategory" @bind-Value="Value.Data.Category" ToStringFunc="x => x.ToFullString()">
                 @foreach (FilterCategory item in Enum.GetValues(typeof(FilterCategory)))
                 {