Merge pull request #6 from HeikoStudt/SearchEnter

Search enter

Author: dabeku

Backend/Model/LogLevel.cs

@@ -28,6 +28,15 @@ public static LoggingLevel FromName(string name) {
             return Levels.FirstOrDefault(m => m.Name == name);
         }
 
+        public static IEnumerable<LoggingLevel> GetAllLoggingLevels() {
+            yield return LoggingLevel.TRACE;
+            yield return LoggingLevel.DEBUG;
+            yield return LoggingLevel.INFO;
+            yield return LoggingLevel.WARN;
+            yield return LoggingLevel.ERROR;
+            yield return LoggingLevel.FATAL;
+        }
+
         public static bool IsLogLevelAboveMin(LoggingLevel level, LoggingLevel minLevel) {
             if (level == null || minLevel == null) {
                 return false;

Loginator/MainWindow.xaml

@@ -19,17 +19,23 @@
             <StackPanel Orientation="Vertical">
                 <DockPanel>
                     <CheckBox Content="Is active" IsChecked="{Binding IsActive}"></CheckBox>
-                    <TextBox Text="{Binding NumberOfLogsPerLevel}" ToolTip="Enter limit per application per log level" Width="100" Margin="16,0,0,0"></TextBox>
-                    <Button Content="Limit" Width="80" Margin="2,0,0,0" Command="{Binding UpdateNumberOfLogsPerLevelCommand}"></Button>
-                    <TextBox Text="{Binding SearchCriteria}" ToolTip="Enter search query" Width="100" Margin="16,0,0,0"></TextBox>
-                    <Button Content="Search" Width="80" Margin="2,0,0,0" Command="{Binding UpdateSearchCriteriaCommand}"></Button>
+                    <TextBox Text="{Binding NumberOfLogsPerLevel}" ToolTip="Enter limit per application per log level" Width="100" Margin="16,0,0,0">
+                        <TextBox.InputBindings>
+                            <KeyBinding Key="Enter" Command="{Binding UpdateNumberOfLogsPerLevelCommand}"/>
+                        </TextBox.InputBindings>
+                    </TextBox>
+                    <Button Content="Limit" Width="60" Margin="2,0,0,0" Command="{Binding UpdateNumberOfLogsPerLevelCommand}"></Button>
+                    <TextBox Text="{Binding SearchCriteria, UpdateSourceTrigger=PropertyChanged}" ToolTip="Enter search query" Width="100" Margin="16,0,0,0"></TextBox>
+                    <Button Content="Search" Width="60" Margin="2,0,0,0" Command="{Binding UpdateSearchCriteriaCommand}"></Button>
                     <CheckBox Content="Invert" IsChecked="{Binding IsInverted}" Margin="2,2,0,0"></CheckBox>
                     <Grid>
-                        <Button Content="Configure..." Width="80" Margin="0,0,164,0" Command="{Binding OpenConfigurationCommand}" HorizontalAlignment="Right"></Button>
-                        <Button Content="Clear Logs" Width="80" Margin="0,0,82,0" Command="{Binding ClearLogsCommand}" HorizontalAlignment="Right"></Button>
-                        <Button Content="Clear All" Width="80" Margin="16,0,0,0" Command="{Binding ClearAllCommand}" HorizontalAlignment="Right"></Button>
+                        <Button Content="Configure..." Width="80" Margin="0,0,249,0" Command="{Binding OpenConfigurationCommand}" HorizontalAlignment="Right"></Button>
+                        <Button Content="Clear Logs" Width="80" Margin="0,0,166,0" Command="{Binding ClearLogsCommand}" HorizontalAlignment="Right"></Button>
+                        <Button Content="Clear All" Width="80" Margin="0,0,83,0" Command="{Binding ClearAllCommand}" HorizontalAlignment="Right"></Button>
+                        <ComboBox ItemsSource="{Binding Path=LogLevels}" DisplayMemberPath="Name" SelectedValue="{Binding SelectedInitialLogLevel}" Width="70" Margin="2,0,2,0" HorizontalAlignment="Right"/>
                     </Grid>
 
+                    
                 </DockPanel>
             </StackPanel>
         </Grid>

Loginator/ViewModels/ApplicationViewModel.cs

@@ -22,7 +22,7 @@ namespace LogApplication.ViewModels {
     public class ApplicationViewModel : INotifyPropertyChanged {
 
         public string Name { get; set; }
-        public IList<LoggingLevel> LogLevels { get; set; }
+        public IList<LoggingLevel> LogLevels { get; } = LoggingLevel.GetAllLoggingLevels().OrderBy(x => x.Id).ToList();
 
         private int MaxNumberOfLogsPerLevel { get; set; }
         private string SearchCriteria { get; set; }
@@ -65,17 +65,14 @@ public bool IsActive {
             }
         }
 
-        public ApplicationViewModel(string name, OrderedObservableCollection logs, ObservableCollection<NamespaceViewModel> namespaces) {
+        public ApplicationViewModel(string name, OrderedObservableCollection logs, ObservableCollection<NamespaceViewModel> namespaces, 
+            LoggingLevel initialLogLevel) 
+        {
             Name = name;
             IsActive = true;
-            LogLevels = new List<LoggingLevel>();
-            LogLevels.Add(LoggingLevel.TRACE);
-            LogLevels.Add(LoggingLevel.DEBUG);
-            LogLevels.Add(LoggingLevel.INFO);
-            LogLevels.Add(LoggingLevel.WARN);
-            LogLevels.Add(LoggingLevel.ERROR);
-            LogLevels.Add(LoggingLevel.FATAL);
-            SelectedMinLogLevel = LogLevels.ElementAt(0);
+            
+            //SelectedMinLogLevel = LogLevels.ElementAt(0);
+            SelectedMinLogLevel = initialLogLevel;
             Logs = logs;
             LogsTrace = new List<LogViewModel>();
             LogsDebug = new List<LogViewModel>();

Loginator/ViewModels/LoginatorViewModel.cs

@@ -64,6 +64,7 @@ public string SearchCriteria {
             set {
                 searchCriteria = value;
                 OnPropertyChanged(nameof(SearchCriteria));
+                UpdateSearchCriteria(this);
             }
         }
 
@@ -76,6 +77,18 @@ public bool IsInverted {
             }
         }
 
+        public IList<LoggingLevel> LogLevels { get; } = LoggingLevel.GetAllLoggingLevels().OrderBy(x => x.Id).ToList();
+
+        private LoggingLevel selectedInitialLogLevel;
+
+        public LoggingLevel SelectedInitialLogLevel {
+            get { return selectedInitialLogLevel; }
+            set {
+                selectedInitialLogLevel = value;
+                OnPropertyChanged(nameof(SelectedInitialLogLevel));
+            }
+        }
+
         private LogViewModel selectedLog;
         public LogViewModel SelectedLog {
             get { return selectedLog; }
@@ -111,6 +124,7 @@ public LoginatorViewModel(IApplicationConfiguration applicationConfiguration, IC
             ApplicationConfiguration = applicationConfiguration;
             ConfigurationDao = configurationDao;
             IsActive = true;
+            SelectedInitialLogLevel = LoggingLevel.TRACE;
             NumberOfLogsPerLevel = Constants.DEFAULT_MAX_NUMBER_OF_LOGS_PER_LEVEL;
             Logger = LogManager.GetCurrentClassLogger();
             Logs = new OrderedObservableCollection();
@@ -259,7 +273,7 @@ private void UpdateApplications(IEnumerable<LogViewModel> logsToInsert) {
                 foreach (var log in logsToInsert) {
                     var application = Applications.FirstOrDefault(m => m.Name == log.Application);
                     if (application == null) {
-                        application = new ApplicationViewModel(log.Application, Logs, Namespaces);
+                        application = new ApplicationViewModel(log.Application, Logs, Namespaces, SelectedInitialLogLevel);
                         Applications.Add(application);
                     }
                 }