fix: regresssion in remove

Zeugwerk · Dec 14, 2023 · e91cc92 · e91cc92
1 parent 869c6ce
commit e91cc92
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/TwinpackVsixShared/Dialogs/CatalogWindow.xaml.cs b/TwinpackVsixShared/Dialogs/CatalogWindow.xaml.cs
@@ -465,6 +465,8 @@ private async void Dialog_Loaded(object sender, RoutedEventArgs e)
 
             try
             {
+                _installedPackages.Clear();
+                _availablePackages.Clear();
                 IsCatalogLoading = true;
                 cmbTwinpackServer.Items.Clear();
                 cmbTwinpackServer.Items.Add(_twinpackServer.TwinpackUrlBase);
@@ -568,10 +570,11 @@ public async void EditPackageButton_Click(object sender, RoutedEventArgs e)
             var packagePublish = new PackageVersionWindow(false, _context, _plc, packageId, packageVersionId);
             packagePublish.ShowDialog();
 
-            _twinpackServer.InvalidateCache();
-
             try
             {
+                _twinpackServer.InvalidateCache();
+                _installedPackages.Clear();
+                _availablePackages.Clear();
                 await LoadInstalledPackagesAsync(Token);
                 await LoadAvailablePackagesAsync(SearchTextBox.Text, Token);
                 UpdateCatalog();
@@ -934,6 +937,7 @@ public async Task UninstallPackageAsync(CancellationToken cancellationToken)
                 p.Installed = null;
             }
 
+            _installedPackages.RemoveAll(x => x.PackageId == PackageVersion.PackageId);
             cancellationToken.ThrowIfCancellationRequested();
         }
 
@@ -1137,6 +1141,7 @@ public async void LoginButton_Click(object sender, RoutedEventArgs e)
 
             try
             {
+                _availablePackages.Clear();
                 _twinpackServer.InvalidateCache();
                 await LoadAvailablePackagesAsync("", Token);
             }
@@ -1494,11 +1499,14 @@ public async void ReloadButton_Click(object sender, RoutedEventArgs e)
                 PackageVersion = new PackageVersionGetResponse();
 
                 _twinpackServer.InvalidateCache();
+                _installedPackages.Clear();
+                _availablePackages.Clear();
                 _context.Dte.ExecuteCommand("File.SaveAll");
 
                 if(!IsConfigured)
                     await LoadPlcConfigAsync(Token);
 
+
                 await LoadInstalledPackagesAsync(Token);
                 await LoadAvailablePackagesAsync(SearchTextBox.Text, Token);
                 UpdateCatalog();