Test results

src/Tql.Abstractions/ICache.cs

@@ -27,4 +27,15 @@ public interface ICache<T>
     /// </summary>
     /// <returns>Current version of the cache.</returns>
     Task<T> Get();
+
+    /// <summary>
+    /// Raises the <see cref="Updated"/> event.
+    /// </summary>
+    /// <remarks>
+    /// This can be used to simulate a cache update without actually
+    /// updating the cache. The primary use case for this is to reload
+    /// cached matches if the <c>IconCacheManager</c> completes loading
+    /// an image.
+    /// </remarks>
+    void RaiseUpdated();
 }

src/Tql.App/MainWindow.xaml.cs

@@ -297,7 +297,7 @@ private void CacheManagerManager_CacheChanged(object? sender, EventArgs e)
         void Invoke()
         {
             if (IsVisible)
-                SearchManager?.DoSearch();
+                SearchManager?.DoSearch(true);
         }
     }
 
@@ -443,7 +443,7 @@ private void _searchManager_SearchCompleted(object? sender, SearchResultsEventAr
 
         _results.ItemsSource = e.Results;
 
-        if (_results.Items.Count > 0)
+        if (!e.IsUpdated && _results.Items.Count > 0)
         {
             SetSelectedIndex(0);
 

src/Tql.App/QuickStart/Playbook.md

@@ -288,7 +288,7 @@ window.
 Search results are identified by the ![](Person+Running.svg?color=true) icon,
 and categories by the ![](Apps+List.svg?color=true) icon.
 
-![](Keyboard.svg?color=true) Press ::Tab:: to enter the lighlighted category.
+![](Keyboard.svg?color=true) Press ::Tab:: to enter the highlighted category.
 
 ---
 id: search-hint-jira

src/Tql.App/Search/SearchManager.cs

@@ -195,7 +195,7 @@ public void ReloadHistory()
         LoadHistory();
     }
 
-    public async void DoSearch()
+    public async void DoSearch(bool isUpdate = false)
     {
         if (_suspendSearch > 0)
             return;
@@ -230,7 +230,7 @@ public async void DoSearch()
 
             results ??= ImmutableArray<SearchResult>.Empty;
 
-            OnSearchCompleted(new SearchResultsEventArgs(results.Value, false));
+            OnSearchCompleted(new SearchResultsEventArgs(results.Value, false, isUpdate));
 
             telemetry.AddProperty("Results", results.Value.Length.ToString());
             telemetry.IsSuccess = true;
@@ -425,7 +425,7 @@ private async Task ShowPreliminaryResults()
     {
         var results = await GetPreliminaryResults();
         if (results != null)
-            OnSearchCompleted(new SearchResultsEventArgs(results.Value, true));
+            OnSearchCompleted(new SearchResultsEventArgs(results.Value, true, false));
     }
 
     private async Task<ImmutableArray<SearchResult>?> GetPreliminaryResults()

src/Tql.App/Search/SearchResultsEventArgs.cs

@@ -1,8 +1,12 @@
 namespace Tql.App.Search;
 
-internal class SearchResultsEventArgs(ImmutableArray<SearchResult> results, bool isPreliminary)
-    : EventArgs
+internal class SearchResultsEventArgs(
+    ImmutableArray<SearchResult> results,
+    bool isPreliminary,
+    bool isUpdate
+) : EventArgs
 {
     public ImmutableArray<SearchResult> Results { get; } = results;
     public bool IsPreliminary { get; } = isPreliminary;
+    public bool IsUpdated { get; } = isUpdate;
 }

src/Tql.App/Services/Cache.cs

@@ -172,19 +172,16 @@ private void Create(bool initialLoad)
                     raiseCacheChanged = true;
                 }
 
-                ThreadPool.QueueUserWorkItem(_ =>
-                {
-                    _logger.LogInformation("Raising cache updated");
+                _logger.LogInformation("Raising cache updated");
 
-                    try
-                    {
-                        OnUpdated(new CacheEventArgs<T>(data));
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Raising cache updated failed");
-                    }
-                });
+                try
+                {
+                    OnUpdated(new CacheEventArgs<T>(data));
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Raising cache updated failed");
+                }
 
                 telemetry.IsSuccess = true;
             }
@@ -261,4 +258,26 @@ public Task<T> Get()
     }
 
     protected virtual void OnUpdated(CacheEventArgs<T> e) => Updated?.Invoke(this, e);
+
+    public void RaiseUpdated()
+    {
+        // We don't raise the events if the cache isn't available.
+
+        var task = _tcs.Task;
+        if (!task.IsCompleted)
+            return;
+
+        _logger.LogInformation("Raising cache updated");
+
+        try
+        {
+            OnUpdated(new CacheEventArgs<T>(task.Result));
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Raising cache updated failed");
+        }
+
+        _cacheManagerManager.RaiseCacheChanged();
+    }
 }

src/Tql.Plugins.Confluence/Services/IconCacheManager.cs

@@ -1,12 +1,14 @@
 using Microsoft.Extensions.Logging;
 using Tql.Abstractions;
+using Tql.Plugins.Confluence.Data;
 using Tql.Utilities;
 
 namespace Tql.Plugins.Confluence.Services;
 
 internal class IconCacheManager(
     IStore store,
     ILogger<IconCacheManager> logger,
+    ICache<ConfluenceData> cache,
     ConfigurationManager configurationManager
 )
     : IconCacheManager<IconKey>(
@@ -32,6 +34,13 @@ protected override Task<IconData> LoadIcon(IconKey key)
             }
         );
     }
+
+    protected override void OnIconLoaded()
+    {
+        base.OnIconLoaded();
+
+        cache.RaiseUpdated();
+    }
 }
 
 internal record IconKey(string ConnectionUrl, string Url);

src/Tql.Plugins.Jira/Services/IconCacheManager.cs

@@ -1,12 +1,14 @@
 using Microsoft.Extensions.Logging;
 using Tql.Abstractions;
+using Tql.Plugins.Jira.Data;
 using Tql.Utilities;
 
 namespace Tql.Plugins.Jira.Services;
 
 internal class IconCacheManager(
     IStore store,
     ILogger<IconCacheManager> logger,
+    ICache<JiraData> cache,
     ConfigurationManager configurationManager
 )
     : IconCacheManager<IconKey>(
@@ -32,6 +34,13 @@ protected override Task<IconData> LoadIcon(IconKey key)
             }
         );
     }
+
+    protected override void OnIconLoaded()
+    {
+        base.OnIconLoaded();
+
+        cache.RaiseUpdated();
+    }
 }
 
 internal record IconKey(string ConnectionUrl, string Url);

tests/Tql.PluginTestSupport/Services/TestCache.cs

@@ -73,5 +73,10 @@ private void Create()
 
     public Task<T> Get() => Task.FromResult(_data);
 
+    public void RaiseUpdated()
+    {
+        OnUpdated(new CacheEventArgs<T>(_data));
+    }
+
     protected virtual void OnUpdated(CacheEventArgs<T> e) => Updated?.Invoke(this, e);
 }