Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: show area in applicationMonitor #147

Merged
merged 1 commit into from
Mar 16, 2025
Merged

feat: show area in applicationMonitor #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion sample/Atc.Wpf.Sample/SamplesWpfControls/Monitoring/ApplicationMonitorView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ public ApplicationMonitorView()
InitializeComponent();

DataContext = this;
ApplicationMonitorViewModel = new ApplicationMonitorViewModel();
ApplicationMonitorViewModel = new ApplicationMonitorViewModel
{
ShowColumnArea = true,
};

dispatcherTimer = new DispatcherTimer
{
Expand Down
13 changes: 13 additions & 0 deletions src/Atc.Wpf.Controls/Monitoring/ApplicationMonitorView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
mc:Ignorable="d">

<UserControl.Resources>
<atcValueConverters:BoolToWidthValueConverter x:Key="BoolToWidthValueConverter" />
<atcValueConverters:BoolToVisibilityVisibleValueConverter x:Key="BoolToVisibilityVisibleValueConverter" />
</UserControl.Resources>

Expand Down Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions src/Atc.Wpf.Controls/Monitoring/ApplicationMonitorView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public ApplicationMonitorView()
nameof(ShowToolbar),
typeof(bool),
typeof(ApplicationMonitorView),
new PropertyMetadata(defaultValue: false));
new PropertyMetadata(defaultValue: true));

public bool ShowToolbar
{
Expand All @@ -25,7 +25,7 @@ public bool ShowToolbar
nameof(ShowClearInToolbar),
typeof(bool),
typeof(ApplicationMonitorView),
new PropertyMetadata(defaultValue: false));
new PropertyMetadata(defaultValue: true));

public bool ShowClearInToolbar
{
Expand All @@ -37,7 +37,7 @@ public bool ShowClearInToolbar
nameof(ShowAutoScrollInToolbar),
typeof(bool),
typeof(ApplicationMonitorView),
new PropertyMetadata(defaultValue: false));
new PropertyMetadata(defaultValue: true));

public bool ShowAutoScrollInToolbar
{
Expand All @@ -49,7 +49,7 @@ public bool ShowAutoScrollInToolbar
nameof(ShowSearchInToolbar),
typeof(bool),
typeof(ApplicationMonitorView),
new PropertyMetadata(defaultValue: false));
new PropertyMetadata(defaultValue: true));

public bool ShowSearchInToolbar
{
Expand Down
23 changes: 23 additions & 0 deletions src/Atc.Wpf.Controls/Monitoring/ApplicationMonitorViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
};
Expand Down
9 changes: 9 additions & 0 deletions src/Atc.Wpf.Controls/Resources/Miscellaneous.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/Atc.Wpf.Controls/Resources/Miscellaneous.da-DK.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions src/Atc.Wpf.Controls/Resources/Miscellaneous.de-DE.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions src/Atc.Wpf.Controls/Resources/Miscellaneous.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading