Merge branch 'master' into pre-release

# Conflicts: # CHANGELOG.md # OpenBudgeteer.Blazor/Shared/NavMenu.razor
TheAxelander · Oct 16, 2023 · 3977cfa · 3977cfa
2 parents b1ce601 + 0a5491b
commit 3977cfa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@
 * [Changed] More responsive navigation bar [#175](https://github.com/TheAxelander/OpenBudgeteer/issues/175)
 * [Fixed] UI alignment for large numbers [#189](https://github.com/TheAxelander/OpenBudgeteer/issues/189)
 
+### 1.7.1 (2023-10-16)
+
+* [Fixed] Potentially fixed crashes on Rules page due to an unnecessary parallel initialization [#165](https://github.com/TheAxelander/OpenBudgeteer/issues/165)
+
 ### 1.7 (2023-10-03)
 
 * [Add] PostgreSQL support [#81](https://github.com/TheAxelander/OpenBudgeteer/issues/81) Thanks [csillaggyujto](https://github.com/csillaggyujto)

diff --git a/OpenBudgeteer.Core/ViewModels/ItemViewModels/RuleSetViewModelItem.cs b/OpenBudgeteer.Core/ViewModels/ItemViewModels/RuleSetViewModelItem.cs
@@ -91,19 +91,7 @@ public RuleSetViewModelItem(DbContextOptions<DatabaseContext> dbOptions)
             Name = "No Selection"
         });
         using var dbContext = new DatabaseContext(_dbOptions);
-        AvailableBuckets.Add(dbContext.Bucket.First(i =>
-            i.BucketId == Guid.Parse("00000000-0000-0000-0000-000000000001")));
-        AvailableBuckets.Add(dbContext.Bucket.First(i =>
-            i.BucketId == Guid.Parse("00000000-0000-0000-0000-000000000002")));
-
-        var query = dbContext.Bucket
-            .Where(i => 
-                i.BucketId != Guid.Parse("00000000-0000-0000-0000-000000000001") &&
-                i.BucketId != Guid.Parse("00000000-0000-0000-0000-000000000002") &&
-                !i.IsInactive)
-            .OrderBy(i => i.Name);
-
-        foreach (var availableBucket in query.ToList())
+        foreach (var availableBucket in dbContext.Bucket.Where(i => !i.IsInactive).ToList())
         {
             AvailableBuckets.Add(availableBucket);
         }

diff --git a/OpenBudgeteer.Core/ViewModels/RulesViewModel.cs b/OpenBudgeteer.Core/ViewModels/RulesViewModel.cs
@@ -42,7 +42,6 @@ public RulesViewModel(DbContextOptions<DatabaseContext> dbOptions)
     {
         _dbOptions = dbOptions;
         RuleSets = new ObservableCollection<RuleSetViewModelItem>();
-        ResetNewRuleSet();
     }
 
     /// <summary>