From 69729088c8a3569d2fda498203483f13f3debeb1 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Mon, 28 Oct 2024 19:14:37 +0000
Subject: [PATCH] Various fixes

---
 .../java/io/xpipe/app/comp/store/StoreCreationComp.java   | 7 ++++---
 .../java/io/xpipe/app/comp/store/StoreEntryListComp.java  | 8 ++++++--
 .../io/xpipe/app/comp/store/StoreProviderChoiceComp.java  | 5 +----
 lang/proc/strings/translations_en.properties              | 2 ++
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreCreationComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreCreationComp.java
index c266b2f93..a067158b0 100644
--- a/app/src/main/java/io/xpipe/app/comp/store/StoreCreationComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/StoreCreationComp.java
@@ -199,11 +199,12 @@ public class StoreCreationComp extends DialogComp {
     }
 
     public static void showCreation(DataStore base, DataStoreCreationCategory category) {
+        var prov = base != null ? DataStoreProviders.byStore(base) : null;
         show(
                 null,
-                base != null ? DataStoreProviders.byStore(base) : null,
+                prov,
                 base,
-                dataStoreProvider -> category.equals(dataStoreProvider.getCreationCategory()),
+                dataStoreProvider -> (category != null && category.equals(dataStoreProvider.getCreationCategory())) || dataStoreProvider.equals(prov),
                 (e, validated) -> {
                     try {
                         DataStorage.get().addStoreEntryIfNotPresent(e);
@@ -436,7 +437,7 @@ public class StoreCreationComp extends DialogComp {
     private Region createLayout() {
         var layout = new BorderPane();
         layout.getStyleClass().add("store-creator");
-        var providerChoice = new StoreProviderChoiceComp(filter, provider, staticDisplay);
+        var providerChoice = new StoreProviderChoiceComp(filter, provider);
         var showProviders = (!staticDisplay
                         && (providerChoice.getProviders().size() > 1
                                 || providerChoice.getProviders().getFirst().showProviderChoice()))
diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListComp.java
index 549f18d2a..fa6b6905f 100644
--- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListComp.java
@@ -36,12 +36,16 @@ public class StoreEntryListComp extends SimpleComp {
             StoreViewState.get().getActiveCategory().addListener((observable, oldValue, newValue) -> {
                 struc.get().setVvalue(0);
             });
-        });
-        content.apply(struc -> {
+
             // Reset scroll
             AppLayoutModel.get().getSelected().addListener((observable, oldValue, newValue) -> {
                 struc.get().setVvalue(0);
             });
+
+            // Reset scroll
+            StoreViewState.get().getFilterString().addListener((observable, oldValue, newValue) -> {
+                struc.get().setVvalue(0);
+            });
         });
         return content.styleClass("store-list-comp");
     }
diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreProviderChoiceComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreProviderChoiceComp.java
index 1833e589c..f72e2f184 100644
--- a/app/src/main/java/io/xpipe/app/comp/store/StoreProviderChoiceComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/StoreProviderChoiceComp.java
@@ -27,7 +27,6 @@ public class StoreProviderChoiceComp extends Comp<CompStructure<ComboBox<DataSto
 
     Predicate<DataStoreProvider> filter;
     Property<DataStoreProvider> provider;
-    boolean staticDisplay;
 
     public List<DataStoreProvider> getProviders() {
         return DataStoreProviders.getAll().stream()
@@ -65,9 +64,7 @@ public class StoreProviderChoiceComp extends Comp<CompStructure<ComboBox<DataSto
             return cellFactory.get();
         });
         cb.setButtonCell(cellFactory.get());
-        var l = getProviders().stream()
-                .filter(p -> p.getCreationCategory() != null || staticDisplay)
-                .toList();
+        var l = getProviders();
         l.forEach(dataStoreProvider -> cb.getItems().add(dataStoreProvider));
         if (provider.getValue() == null) {
             provider.setValue(l.getFirst());
diff --git a/lang/proc/strings/translations_en.properties b/lang/proc/strings/translations_en.properties
index 433becb51..75fa88859 100644
--- a/lang/proc/strings/translations_en.properties
+++ b/lang/proc/strings/translations_en.properties
@@ -400,3 +400,5 @@ virshHypervisor.displayDescription=Connect to a libvirt supported hypervisor dri
 virshInstall.displayName=libvirt command-line client
 virshInstall.displayDescription=Connect to all available libvirt hypervisors via virsh
 addHypervisor=Add hypervisor
+serialConsole=Serial console
+interactiveTerminal=Interactive terminal