feat: show area in applicationMonitor

Author: davidkallesen

Diff for: sample/Atc.Wpf.Sample/SamplesWpfControls/Monitoring/ApplicationMonitorView.xaml.cs

@@ -9,7 +9,10 @@ public ApplicationMonitorView()
         InitializeComponent();
 
         DataContext = this;
-        ApplicationMonitorViewModel = new ApplicationMonitorViewModel();
+        ApplicationMonitorViewModel = new ApplicationMonitorViewModel
+        {
+            ShowColumnArea = true,
+        };
 
         dispatcherTimer = new DispatcherTimer
         {

Diff for: src/Atc.Wpf.Controls/Monitoring/ApplicationMonitorView.xaml

@@ -15,6 +15,7 @@
     mc:Ignorable="d">
 
     <UserControl.Resources>
+        <atcValueConverters:BoolToWidthValueConverter x:Key="BoolToWidthValueConverter" />
         <atcValueConverters:BoolToVisibilityVisibleValueConverter x:Key="BoolToVisibilityVisibleValueConverter" />
     </UserControl.Resources>
 
@@ -118,6 +119,18 @@
                             </GridViewColumn.CellTemplate>
                         </GridViewColumn>
 
+                        <GridViewColumn
+                            x:Name="GvcArea"
+                            Width="{Binding Path=ShowColumnArea, Converter={StaticResource BoolToWidthValueConverter}, ConverterParameter=150}"
+                            Header="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous,
+                                                         Key=Area}">
+                            <GridViewColumn.CellTemplate>
+                                <DataTemplate DataType="local:ApplicationEventEntry">
+                                    <TextBlock Text="{Binding Path=Area}" />
+                                </DataTemplate>
+                            </GridViewColumn.CellTemplate>
+                        </GridViewColumn>
+
                         <GridViewColumn
                             x:Name="GvcMessage"
                             Width="400px"

Diff for: src/Atc.Wpf.Controls/Monitoring/ApplicationMonitorView.xaml.cs

@@ -13,7 +13,7 @@ public ApplicationMonitorView()
         nameof(ShowToolbar),
         typeof(bool),
         typeof(ApplicationMonitorView),
-        new PropertyMetadata(defaultValue: false));
+        new PropertyMetadata(defaultValue: true));
 
     public bool ShowToolbar
     {
@@ -25,7 +25,7 @@ public bool ShowToolbar
         nameof(ShowClearInToolbar),
         typeof(bool),
         typeof(ApplicationMonitorView),
-        new PropertyMetadata(defaultValue: false));
+        new PropertyMetadata(defaultValue: true));
 
     public bool ShowClearInToolbar
     {
@@ -37,7 +37,7 @@ public bool ShowClearInToolbar
         nameof(ShowAutoScrollInToolbar),
         typeof(bool),
         typeof(ApplicationMonitorView),
-        new PropertyMetadata(defaultValue: false));
+        new PropertyMetadata(defaultValue: true));
 
     public bool ShowAutoScrollInToolbar
     {
@@ -49,7 +49,7 @@ public bool ShowAutoScrollInToolbar
         nameof(ShowSearchInToolbar),
         typeof(bool),
         typeof(ApplicationMonitorView),
-        new PropertyMetadata(defaultValue: false));
+        new PropertyMetadata(defaultValue: true));
 
     public bool ShowSearchInToolbar
     {

Diff for: src/Atc.Wpf.Controls/Monitoring/ApplicationMonitorViewModel.cs

@@ -8,6 +8,7 @@ public sealed class ApplicationMonitorViewModel : ViewModelBase
     private ApplicationFilterViewModel filter;
     private bool autoScroll;
     private ApplicationEventEntry? selectedEntry;
+    private bool showColumnArea;
     private ListSortDirection sortDirection;
     private bool listenOnToastNotificationMessage;
 
@@ -82,6 +83,21 @@ public ApplicationEventEntry? SelectedEntry
 
     public ObservableCollectionEx<ApplicationEventEntry> Entries { get; }
 
+    public bool ShowColumnArea
+    {
+        get => showColumnArea;
+        set
+        {
+            if (value == showColumnArea)
+            {
+                return;
+            }
+
+            showColumnArea = value;
+            RaisePropertyChanged();
+        }
+    }
+
     public ListSortDirection SortDirection
     {
         get => sortDirection;
@@ -226,6 +242,13 @@ LogCategoryType.Error or
                 return false;
             }
 
+            if (ShowColumnArea)
+            {
+                return string.IsNullOrEmpty(filter.MatchOnTextInData) ||
+                       entry.Area.Contains(filter.MatchOnTextInData, StringComparison.OrdinalIgnoreCase) ||
+                       entry.Message.Contains(filter.MatchOnTextInData, StringComparison.OrdinalIgnoreCase);
+            }
+
             return string.IsNullOrEmpty(filter.MatchOnTextInData) ||
                    entry.Message.Contains(filter.MatchOnTextInData, StringComparison.OrdinalIgnoreCase);
         };

Diff for: src/Atc.Wpf.Controls/Resources/Miscellaneous.Designer.cs

@@ -120,6 +120,9 @@
   <data name="ApplicationSettings" xml:space="preserve">
     <value>Applikationsindstillinger</value>
   </data>
+  <data name="Area" xml:space="preserve">
+    <value>Område</value>
+  </data>
   <data name="Auto" xml:space="preserve">
     <value>Auto</value>
   </data>

Diff for: src/Atc.Wpf.Controls/Resources/Miscellaneous.da-DK.resx

@@ -120,6 +120,9 @@
   <data name="ApplicationSettings" xml:space="preserve">
     <value>Anwendungseinstellungen</value>
   </data>
+  <data name="Area" xml:space="preserve">
+    <value>Bereich</value>
+  </data>
   <data name="Auto" xml:space="preserve">
     <value>Auto</value>
   </data>

Diff for: src/Atc.Wpf.Controls/Resources/Miscellaneous.de-DE.resx

@@ -120,6 +120,9 @@
   <data name="ApplicationSettings" xml:space="preserve">
     <value>Application Settings</value>
   </data>
+  <data name="Area" xml:space="preserve">
+    <value>Area</value>
+  </data>
   <data name="Auto" xml:space="preserve">
     <value>Auto</value>
   </data>