Merge remote-tracking branch 'upstream/main'

Author: Jalileh

ROADMAP.md

@@ -0,0 +1,38 @@
+# Wave Terminal Roadmap
+
+This roadmap outlines major upcoming features and improvements for Wave Terminal. As with any roadmap, priorities and timelines may shift as development progresses.
+
+Want input on the roadmap? Join the discussion on [Discord](https://discord.gg/XfvZ334gwU).
+
+## v0.11
+
+Targeting a release during the week of Jan 13th 2024, betas possible at the end of the prior week.
+
+Legend: ✅ Done | 🔧 In Progress | 🔷 Planned | 🤞 Stretch Goal
+
+- 🔷 File/Directory Preview improvements
+  - 🔷 Remote S3 bucket browsing (directory + files)
+  - 🔷 Drag & drop between preview blocks
+  - 🔷 Drag into a preview directory from the native file browser or desktop to copy a file
+  - 🔷 EC-TIME timeout when transferring large files
+  - 🤞 log viewer
+  - 🤞 binary viewer
+- 🔷 Wave Apps (Go SDK)
+- 🔷 Fixes for reducing 2FA requests on connect
+- 🔷 Frontend Only Widgets, React + Babel Transpiling in an iframe/webview
+- 🔧 WebLinks in the terminal working again
+- 🔧 Search in Web Views
+- 🔷 Search in the Terminal
+- 🔷 Custom init files for widgets and terminal blocks
+- 🔷 Multi-Input between terminal blocks on the same tab
+- 🔧 Gemini AI support
+- 🔷 Monaco Theming
+- 🤞 Log Viewer (stretch)
+- 🤞 Blockcontroller fixes for terminal escape sequences
+- 🤞 Explore VSCode Extension Compatibility with standalone Monaco Editor (language servers)
+- 🔷 Various Connection Bugs + Improvements
+- 🔧 More Connection Config Options
+
+## Future Releases
+
+Check back soon for longer-term roadmap items.

docs/docs/config.mdx

@@ -50,6 +50,7 @@ wsh editconfig
 | editor:minimapenabled                | bool     | set to false to disable editor minimap                                                                                                                                                                                                                        |
 | editor:stickyscrollenabled           | bool     | enables monaco editor's stickyScroll feature (pinning headers of current context, e.g. class names, method names, etc.), defaults to false                                                                                                                    |
 | editor:wordwrap                      | bool     | set to true to enable word wrapping in the editor (defaults to false)                                                                                                                                                                                         |
+| preview:showhiddenfiles              | bool     | set to false to disable showing hidden files in the directory preview (defaults to true)                                                                                                                                                                      |
 | markdown:fontsize                    | float64  | font size for the normal text when rendering markdown in preview. headers are scaled up from this size, (default 14px)                                                                                                                                        |
 | markdown:fixedfontsize               | float64  | font size for the code blocks when rendering markdown in preview (default is 12px)                                                                                                                                                                            |
 | web:openlinksinternally              | bool     | set to false to open web links in external browser                                                                                                                                                                                                            |

frontend/app/view/term/term.scss

@@ -36,23 +36,23 @@
         overflow: hidden;
     }
 
-	.term-cmd-toolbar {
-		display: flex;
-		flex-direction: row;
-		height: 24px;
-		border-bottom: 1px solid var(--border-color);
-		overflow: hidden;
-		align-items: center;
-
-		.term-cmd-toolbar-text {
-			font: var(--fixed-font);
-			flex-grow: 1;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			white-space: nowrap;
-			padding: 0 5px;
-		}
-	}
+    .term-cmd-toolbar {
+        display: flex;
+        flex-direction: row;
+        height: 24px;
+        border-bottom: 1px solid var(--border-color);
+        overflow: hidden;
+        align-items: center;
+
+        .term-cmd-toolbar-text {
+            font: var(--fixed-font);
+            flex-grow: 1;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            padding: 0 5px;
+        }
+    }
 
     .term-connectelem {
         flex-grow: 1;
@@ -126,10 +126,27 @@
         }
     }
 
+    .term-scrollbar-show-observer {
+        z-index: calc(var(--zindex-xterm-viewport-overlay) - 1);
+        position: absolute;
+        top: 0;
+        right: 0;
+        height: 100%;
+        width: 12px;
+    }
+
+    .term-scrollbar-hide-observer {
+        z-index: calc(var(--zindex-xterm-viewport-overlay) + 1);
+        display: none;
+        position: absolute;
+        top: 0;
+        left: 0;
+        height: 100%;
+        width: calc(100% - 12px);
+    }
+
     .terminal {
         .xterm-viewport {
-            z-index: var(--zindex-xterm-viewport-overlay);
-
             &::-webkit-scrollbar {
                 width: 6px;
                 height: 6px;

frontend/app/view/term/term.tsx

@@ -848,7 +848,19 @@ const TerminalView = ({ blockId, model }: TerminalViewProps) => {
         termModeRef.current = termMode;
     }, [termMode]);
 
-    let stickerConfig = {
+    const scrollbarHideObserverRef = React.useRef<HTMLDivElement>(null);
+    const onScrollbarShowObserver = React.useCallback(() => {
+        const termViewport = viewRef.current.getElementsByClassName("xterm-viewport")[0] as HTMLDivElement;
+        termViewport.style.zIndex = "var(--zindex-xterm-viewport-overlay)";
+        scrollbarHideObserverRef.current.style.display = "block";
+    }, []);
+    const onScrollbarHideObserver = React.useCallback(() => {
+        const termViewport = viewRef.current.getElementsByClassName("xterm-viewport")[0] as HTMLDivElement;
+        termViewport.style.zIndex = "auto";
+        scrollbarHideObserverRef.current.style.display = "none";
+    }, []);
+
+    const stickerConfig = {
         charWidth: 8,
         charHeight: 16,
         rows: model.termRef.current?.terminal.rows ?? 24,
@@ -862,7 +874,14 @@ const TerminalView = ({ blockId, model }: TerminalViewProps) => {
             <TermStickers config={stickerConfig} />
             <TermToolbarVDomNode key="vdom-toolbar" blockId={blockId} model={model} />
             <TermVDomNode key="vdom" blockId={blockId} model={model} />
-            <div key="conntectElem" className="term-connectelem" ref={connectElemRef}></div>
+            <div key="conntectElem" className="term-connectelem" ref={connectElemRef}>
+                <div className="term-scrollbar-show-observer" onPointerOver={onScrollbarShowObserver} />
+                <div
+                    ref={scrollbarHideObserverRef}
+                    className="term-scrollbar-hide-observer"
+                    onPointerOver={onScrollbarHideObserver}
+                />
+            </div>
         </div>
     );
 };

frontend/types/gotypes.d.ts

@@ -290,6 +290,7 @@ declare global {
     type ConnKeywords = {
         "conn:wshenabled"?: boolean;
         "conn:askbeforewshinstall"?: boolean;
+        "conn:overrideconfig"?: boolean;
         "display:hidden"?: boolean;
         "display:order"?: number;
         "term:*"?: boolean;

pkg/remote/connutil.go

@@ -13,7 +13,6 @@ import (
 	"os/user"
 	"path/filepath"
 	"regexp"
-	"strconv"
 	"strings"
 
 	"github.com/wavetermdev/waveterm/pkg/panichandler"
@@ -27,16 +26,8 @@ func ParseOpts(input string) (*SSHOpts, error) {
 	if m == nil {
 		return nil, fmt.Errorf("invalid format of user@host argument")
 	}
-	remoteUser, remoteHost, remotePortStr := m[1], m[2], m[3]
+	remoteUser, remoteHost, remotePort := m[1], m[2], m[3]
 	remoteUser = strings.Trim(remoteUser, "@")
-	var remotePort int
-	if remotePortStr != "" {
-		var err error
-		remotePort, err = strconv.Atoi(remotePortStr)
-		if err != nil {
-			return nil, fmt.Errorf("invalid port specified on user@host argument")
-		}
-	}
 
 	return &SSHOpts{SSHHost: remoteHost, SSHUser: remoteUser, SSHPort: remotePort}, nil
 }
@@ -341,7 +332,7 @@ func IsPowershell(shellPath string) bool {
 
 func NormalizeConfigPattern(pattern string) string {
 	userName, err := WaveSshConfigUserSettings().GetStrict(pattern, "User")
-	if err != nil {
+	if err != nil || userName == "" {
 		log.Printf("warning: error parsing username of %s for conn dropdown: %v", pattern, err)
 		localUser, err := user.Current()
 		if err == nil {