#480 - Ensure that all templates are loaded at least once

maraf · Jun 14, 2023 · 53339ff · 53339ff
1 parent 470d088
commit 53339ff
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/Money.Blazor.Host/Services/ExpenseTemplateMiddleware.cs b/src/Money.Blazor.Host/Services/ExpenseTemplateMiddleware.cs
@@ -23,6 +23,7 @@ internal class ExpenseTemplateMiddleware : HttpQueryDispatcher.IMiddleware,
         private readonly ExpenseTemplateStorage localStorage;
         private readonly ILog log;
 
+        private bool areModelsLoadedAtLeastOnce;
         private readonly List<ExpenseTemplateModel> models = new List<ExpenseTemplateModel>();
         private Task listAllTask;
 
@@ -49,14 +50,15 @@ public async Task<object> ExecuteAsync(object query, HttpQueryDispatcher dispatc
 
         private async Task EnsureListAsync(HttpQueryDispatcher dispatcher, HttpQueryDispatcher.Next next, ListAllExpenseTemplate listAll)
         {
-            if (models.Count == 0)
+            if (models.Count == 0 || !areModelsLoadedAtLeastOnce)
             {
                 if (listAllTask == null)
                     listAllTask = LoadAllAsync(dispatcher, next, listAll);
 
                 try
                 {
                     await listAllTask;
+                    areModelsLoadedAtLeastOnce = true;
                 }
                 finally
                 {