Connections Typeahead Additional Fixes (#1457)

Author: oneirocosm

frontend/app/block/blockframe.tsx

@@ -637,7 +637,7 @@ const ChangeConnectionBlockModal = React.memo(
         const connStatusMap = new Map<string, ConnStatus>();
         const fullConfig = jotai.useAtomValue(atoms.fullConfigAtom);
         const connectionsConfig = fullConfig.connections;
-        let filterOutNowsh = util.useAtomValueSafe(viewModel.filterOutNowsh) || true;
+        let filterOutNowsh = util.useAtomValueSafe(viewModel.filterOutNowsh) ?? true;
 
         let maxActiveConnNum = 1;
         for (const conn of allConnStatus) {
@@ -706,30 +706,30 @@ const ChangeConnectionBlockModal = React.memo(
         }
         const filteredList: Array<string> = [];
         for (const conn of connList) {
-            if (conn === connSelected) {
-                createNew = false;
-            }
             if (
                 conn.includes(connSelected) &&
                 connectionsConfig?.[conn]?.["display:hidden"] != true &&
                 (connectionsConfig?.[conn]?.["conn:wshenabled"] != false || !filterOutNowsh)
                 // != false is necessary because of defaults
             ) {
                 filteredList.push(conn);
+                if (conn === connSelected) {
+                    createNew = false;
+                }
             }
         }
         const filteredWslList: Array<string> = [];
         for (const conn of wslList) {
-            if (conn === connSelected) {
-                createNew = false;
-            }
             if (
                 conn.includes(connSelected) &&
                 connectionsConfig?.[conn]?.["display:hidden"] != true &&
                 (connectionsConfig?.[conn]?.["conn:wshenabled"] != false || !filterOutNowsh)
                 // != false is necessary because of defaults
             ) {
                 filteredWslList.push(conn);
+                if (conn === connSelected) {
+                    createNew = false;
+                }
             }
         }
         // priority handles special suggestions when necessary

pkg/remote/conncontroller/conncontroller.go

@@ -733,6 +733,10 @@ func GetConnectionsFromInternalConfig() []string {
 	var internalNames []string
 	config := wconfig.ReadFullConfig()
 	for internalName := range config.Connections {
+		if strings.HasPrefix(internalName, "wsl://") {
+			// don't add wsl conns to this list
+			continue
+		}
 		internalNames = append(internalNames, internalName)
 	}
 	return internalNames