(#613) Fix settings to show all result when showing search box

jibedoubleve · Jan 19, 2025 · b360cd1 · b360cd1
1 parent 371ad8f
commit b360cd1
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 16 deletions.
diff --git a/src/Infra/Lanceur.Infra.SQLite/DbActions/GetAllAliasDbAction.cs b/src/Infra/Lanceur.Infra.SQLite/DbActions/GetAllAliasDbAction.cs
@@ -46,7 +46,7 @@ alias a
                                 inner join data_alias_synonyms_v s on s.id_alias = a.id
                             where a.hidden = 0
                             order by
-                                e.exec_count desc,
+                                a.exec_count desc,
                                 an.name
                             """;
 

diff --git a/src/Infra/Lanceur.Infra.SQLite/Repositories/SQLiteDatabaseConfigurationService.cs b/src/Infra/Lanceur.Infra.SQLite/Repositories/SQLiteDatabaseConfigurationService.cs
@@ -68,18 +68,15 @@ public void Save()
         Db.WithinTransaction(
             tx =>
             {
-                const string sqlExists = "select count(*) from settings where s_key = 'json'";
-                var exists = tx.Connection!.ExecuteScalar<long>(sqlExists) > 0;
-
-                if (!exists)
-                {
-                    const string sqlInsert = "insert into settings(s_key) values ('json')";
-                    tx.Connection.Execute(sqlInsert);
-                }
-
-                const string sql = "update settings set s_value = @value where s_key = 'json'";
+                const string sql = """
+                                   insert into settings(s_key, s_value) values ('json', @json)
+                                   on conflict (s_key) do update 
+                                   set 
+                                   	s_value = @json
+                                   where s_key = 'json'
+                                   """;
                 var json = JsonConvert.SerializeObject(Current);
-                tx.Connection.Execute(sql, new { value = json });
+                tx.Connection!.Execute(sql, new { json });
             }
         );
     }

diff --git a/src/Infra/Lanceur.Infra/Services/SearchService.cs b/src/Infra/Lanceur.Infra/Services/SearchService.cs
@@ -74,7 +74,7 @@ public async Task<IEnumerable<QueryResult>> SearchAsync(Cmdline query, bool does
     {
         using var measurement = _logger.MeasureExecutionTime(this);
 
-        if (doesReturnAllIfEmpty && query is null) return await GetAllAsync();
+        if (doesReturnAllIfEmpty && (query is null || query.IsEmpty)) return await GetAllAsync();
         if (query is null || query.IsEmpty) return new List<QueryResult>();
 
         //Get the alive stores

diff --git a/src/UI/Lanceur.Ui.Core/ViewModels/MainViewModel.cs b/src/UI/Lanceur.Ui.Core/ViewModels/MainViewModel.cs
@@ -160,6 +160,15 @@ private void SetQuery()
         WeakReferenceMessenger.Default.Send<SetQueryMessage>(new(cmd));
     }
 
+    public void DisplayResultsIfAllowed()
+    {
+        if (_settingsFacade.Application.ShowResult)
+            _ = Task.Run(() => _searchService.SearchAsync(Cmdline.Empty, true))
+                    .ContinueWith(r => Results = new(r.Result), TaskScheduler.FromCurrentSynchronizationContext());
+
+        _logger.LogTrace("When showing search, display all results: {ShowAtStartup}", _settingsFacade.Application.ShowAtStartup);
+    }
+
     public void RefreshSettings()
     {
         _settingsFacade.Reload();

diff --git a/src/UI/Lanceur.Ui.Core/ViewModels/Pages/ApplicationSettingsViewModel.cs b/src/UI/Lanceur.Ui.Core/ViewModels/Pages/ApplicationSettingsViewModel.cs
@@ -30,7 +30,7 @@ public partial class ApplicationSettingsViewModel : ObservableObject
     private readonly IAppRestartService _appRestartService;
     [ObservableProperty] private ISettingsFacade _settings;
     private readonly IUserInteractionService _userInteraction;
-    [ObservableProperty] private bool _showResults;
+    [ObservableProperty] private bool _showResult;
     [ObservableProperty] private  bool _isTraceEnabled;
 
     #endregion
@@ -68,7 +68,7 @@ IUserInteractionService userInteraction
         DbPath = _settings.Local.DbPath;
         WindowBackdropStyle = _settings.Application.Window.BackdropStyle;
         SearchDelay = _settings.Application.SearchDelay;
-        ShowResults = _settings.Application.ShowResult;
+        ShowResult = _settings.Application.ShowResult;
         ShowAtStartup = _settings.Application.ShowAtStartup;
         ShowLastQuery = _settings.Application.ShowLastQuery;
 
@@ -116,7 +116,7 @@ private void MapSettings()
         Settings.Local.DbPath = DbPath;
         Settings.Application.Window.BackdropStyle = WindowBackdropStyle;
         Settings.Application.SearchDelay = SearchDelay;
-        Settings.Application.ShowResult = ShowResults;
+        Settings.Application.ShowResult = ShowResult;
         Settings.Application.ShowAtStartup = ShowAtStartup;
         Settings.Application.ShowLastQuery = ShowLastQuery;
     }

diff --git a/src/UI/Lanceur.Ui.WPF/Views/MainView.xaml.cs b/src/UI/Lanceur.Ui.WPF/Views/MainView.xaml.cs
@@ -217,6 +217,7 @@ private void ShowWindow()
         _logger.LogTrace("Current window is at {Coordinate}", this.ToCoordinate());
 
         ViewModel.RefreshSettings();
+        ViewModel.DisplayResultsIfAllowed();
         Visibility = Visibility.Visible;
         QueryTextBox.Focus();