Merge remote-tracking branch 'upstream/main' into export-config

Author: weilirs

BUILD.md

@@ -112,15 +112,15 @@ All the methods below will install Node and Go dependencies when they run the fi
 Run the following command to build the app and run it via Vite's development server (this enables Hot Module Reloading):
 
 ```sh
-task electron:dev
+task dev
 ```
 
 ### Standalone
 
 Run the following command to build the app and run it standalone, without the development server. This will not reload on change:
 
 ```sh
-task electron:start
+task start
 ```
 
 ### Packaged

ROADMAP.md

@@ -20,12 +20,12 @@ Legend: ✅ Done | 🔧 In Progress | 🔷 Planned | 🤞 Stretch Goal
 - 🔷 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
+- ✅ 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
+- ✅ Gemini AI support
 - 🔷 Monaco Theming
 - 🤞 Blockcontroller fixes for terminal escape sequences
 - 🤞 Explore VSCode Extension Compatibility with standalone Monaco Editor (language servers)

Taskfile.yml

@@ -19,6 +19,8 @@ tasks:
     electron:dev:
         desc: Run the Electron application via the Vite dev server (enables hot reloading).
         cmd: yarn dev
+        aliases:
+            - dev
         deps:
             - yarn
             - docsite:build:embedded
@@ -30,6 +32,8 @@ tasks:
     electron:start:
         desc: Run the Electron application directly.
         cmd: yarn start
+        aliases:
+            - start
         deps:
             - yarn
             - docsite:build:embedded
@@ -56,6 +60,8 @@ tasks:
         desc: Start the docsite dev server.
         cmd: yarn start
         dir: docs
+        aliases:
+            - docsite
         deps:
             - yarn
 

docs/README.md

@@ -13,15 +13,15 @@ yarn
 ### Local Development
 
 ```sh
-yarn start
+task docsite
 ```
 
 This command starts a local development server and opens up a browser window. Most changes are reflected live without having to restart the server.
 
 ### Build
 
 ```sh
-yarn build
+task docsite:build:<embedded,public>
 ```
 
 This command generates static content into the `build` directory and can be served using any static contents hosting service.

emain/emain-window.ts

@@ -18,6 +18,7 @@ import { delay, ensureBoundsAreVisible, waveKeyToElectronKey } from "./emain-uti
 import { log } from "./log";
 import { getElectronAppBasePath, unamePlatform } from "./platform";
 import { updater } from "./updater";
+
 export type WindowOpts = {
     unamePlatform: string;
 };
@@ -303,7 +304,8 @@ export class WaveBrowserWindow extends BaseWindow {
         const workspaceList = await WorkspaceService.ListWorkspaces();
         if (!workspaceList?.find((wse) => wse.workspaceid === workspaceId)?.windowid) {
             const curWorkspace = await WorkspaceService.GetWorkspace(this.workspaceId);
-            if (isNonEmptyUnsavedWorkspace(curWorkspace)) {
+
+            if (curWorkspace && isNonEmptyUnsavedWorkspace(curWorkspace)) {
                 console.log(
                     `existing unsaved workspace ${this.workspaceId} has content, opening workspace ${workspaceId} in new window`
                 );
@@ -693,17 +695,22 @@ ipcMain.on("delete-workspace", (event, workspaceId) => {
             type: "question",
             buttons: ["Cancel", "Delete Workspace"],
             title: "Confirm",
-            message: `Deleting workspace will also delete its contents.${workspaceHasWindow ? "\nWorkspace is open in a window, which will be closed." : ""}\n\nContinue?`,
+            message: `Deleting workspace will also delete its contents.\n\nContinue?`,
         });
         if (choice === 0) {
             console.log("user cancelled workspace delete", workspaceId, ww?.waveWindowId);
             return;
         }
-        await WorkspaceService.DeleteWorkspace(workspaceId);
+
+        const newWorkspaceId = await WorkspaceService.DeleteWorkspace(workspaceId);
         console.log("delete-workspace done", workspaceId, ww?.waveWindowId);
         if (ww?.workspaceId == workspaceId) {
-            console.log("delete-workspace closing window", workspaceId, ww?.waveWindowId);
-            ww.destroy();
+            if (newWorkspaceId) {
+                await ww.switchWorkspace(newWorkspaceId);
+            } else {
+                console.log("delete-workspace closing window", workspaceId, ww?.waveWindowId);
+                ww.destroy();
+            }
         }
     });
 });

frontend/app/element/search.tsx

@@ -1,19 +1,18 @@
 import { autoUpdate, FloatingPortal, Middleware, offset, useDismiss, useFloating } from "@floating-ui/react";
 import clsx from "clsx";
-import { atom, PrimitiveAtom, useAtom, useAtomValue } from "jotai";
-import { memo, useCallback, useRef, useState } from "react";
+import { atom, useAtom } from "jotai";
+import { memo, useCallback, useEffect, useMemo, useRef } from "react";
 import { IconButton } from "./iconbutton";
 import { Input } from "./input";
 import "./search.scss";
 
-type SearchProps = {
-    searchAtom: PrimitiveAtom<string>;
-    indexAtom: PrimitiveAtom<number>;
-    numResultsAtom: PrimitiveAtom<number>;
-    isOpenAtom: PrimitiveAtom<boolean>;
+type SearchProps = SearchAtoms & {
     anchorRef?: React.RefObject<HTMLElement>;
     offsetX?: number;
     offsetY?: number;
+    onSearch?: (search: string) => void;
+    onNext?: () => void;
+    onPrev?: () => void;
 };
 
 const SearchComponent = ({
@@ -24,23 +23,54 @@ const SearchComponent = ({
     anchorRef,
     offsetX = 10,
     offsetY = 10,
+    onSearch,
+    onNext,
+    onPrev,
 }: SearchProps) => {
-    const [isOpen, setIsOpen] = useAtom(isOpenAtom);
-    const [search, setSearch] = useAtom(searchAtom);
-    const [index, setIndex] = useAtom(indexAtom);
-    const numResults = useAtomValue(numResultsAtom);
+    const [isOpen, setIsOpen] = useAtom<boolean>(isOpenAtom);
+    const [search, setSearch] = useAtom<string>(searchAtom);
+    const [index, setIndex] = useAtom<number>(indexAtom);
+    const [numResults, setNumResults] = useAtom<number>(numResultsAtom);
 
     const handleOpenChange = useCallback((open: boolean) => {
         setIsOpen(open);
     }, []);
 
+    useEffect(() => {
+        setSearch("");
+        setIndex(0);
+        setNumResults(0);
+    }, [isOpen]);
+
+    useEffect(() => {
+        setIndex(0);
+        setNumResults(0);
+        onSearch?.(search);
+    }, [search]);
+
     const middleware: Middleware[] = [];
-    middleware.push(
-        offset(({ rects }) => ({
-            mainAxis: -rects.floating.height - offsetY,
-            crossAxis: -offsetX,
-        }))
+    const offsetCallback = useCallback(
+        ({ rects }) => {
+            const docRect = document.documentElement.getBoundingClientRect();
+            let yOffsetCalc = -rects.floating.height - offsetY;
+            let xOffsetCalc = -offsetX;
+            const floatingBottom = rects.reference.y + rects.floating.height + offsetY;
+            const floatingLeft = rects.reference.x + rects.reference.width - (rects.floating.width + offsetX);
+            if (floatingBottom > docRect.bottom) {
+                yOffsetCalc -= docRect.bottom - floatingBottom;
+            }
+            if (floatingLeft < 5) {
+                xOffsetCalc += 5 - floatingLeft;
+            }
+            console.log("offsetCalc", yOffsetCalc, xOffsetCalc);
+            return {
+                mainAxis: yOffsetCalc,
+                crossAxis: xOffsetCalc,
+            };
+        },
+        [offsetX, offsetY]
     );
+    middleware.push(offset(offsetCallback));
 
     const { refs, floatingStyles, context } = useFloating({
         placement: "top-end",
@@ -55,26 +85,47 @@ const SearchComponent = ({
 
     const dismiss = useDismiss(context);
 
+    const onPrevWrapper = useCallback(
+        () => (onPrev ? onPrev() : setIndex((index - 1) % numResults)),
+        [onPrev, index, numResults]
+    );
+    const onNextWrapper = useCallback(
+        () => (onNext ? onNext() : setIndex((index + 1) % numResults)),
+        [onNext, index, numResults]
+    );
+
+    const onKeyDown = useCallback(
+        (e: React.KeyboardEvent) => {
+            if (e.key === "Enter") {
+                if (e.shiftKey) {
+                    onPrevWrapper();
+                } else {
+                    onNextWrapper();
+                }
+                e.preventDefault();
+            }
+        },
+        [onPrevWrapper, onNextWrapper, setIsOpen]
+    );
+
     const prevDecl: IconButtonDecl = {
         elemtype: "iconbutton",
         icon: "chevron-up",
-        title: "Previous Result",
-        disabled: index === 0,
-        click: () => setIndex(index - 1),
+        title: "Previous Result (Shift+Enter)",
+        click: onPrevWrapper,
     };
 
     const nextDecl: IconButtonDecl = {
         elemtype: "iconbutton",
         icon: "chevron-down",
-        title: "Next Result",
-        disabled: !numResults || index === numResults - 1,
-        click: () => setIndex(index + 1),
+        title: "Next Result (Enter)",
+        click: onNextWrapper,
     };
 
     const closeDecl: IconButtonDecl = {
         elemtype: "iconbutton",
         icon: "xmark-large",
-        title: "Close",
+        title: "Close (Esc)",
         click: () => setIsOpen(false),
     };
 
@@ -83,7 +134,13 @@ const SearchComponent = ({
             {isOpen && (
                 <FloatingPortal>
                     <div className="search-container" style={{ ...floatingStyles }} {...dismiss} ref={refs.setFloating}>
-                        <Input placeholder="Search" value={search} onChange={setSearch} />
+                        <Input
+                            placeholder="Search"
+                            value={search}
+                            onChange={setSearch}
+                            onKeyDown={onKeyDown}
+                            autoFocus
+                        />
                         <div
                             className={clsx("search-results", { hidden: numResults === 0 })}
                             aria-live="polite"
@@ -105,11 +162,16 @@ const SearchComponent = ({
 
 export const Search = memo(SearchComponent) as typeof SearchComponent;
 
-export function useSearch(anchorRef?: React.RefObject<HTMLElement>): SearchProps {
-    const [searchAtom] = useState(atom(""));
-    const [indexAtom] = useState(atom(0));
-    const [numResultsAtom] = useState(atom(0));
-    const [isOpenAtom] = useState(atom(false));
+export function useSearch(anchorRef?: React.RefObject<HTMLElement>, viewModel?: ViewModel): SearchProps {
+    const searchAtoms: SearchAtoms = useMemo(
+        () => ({ searchAtom: atom(""), indexAtom: atom(0), numResultsAtom: atom(0), isOpenAtom: atom(false) }),
+        []
+    );
     anchorRef ??= useRef(null);
-    return { searchAtom, indexAtom, numResultsAtom, isOpenAtom, anchorRef };
+    useEffect(() => {
+        if (viewModel) {
+            viewModel.searchAtoms = searchAtoms;
+        }
+    }, [viewModel]);
+    return { ...searchAtoms, anchorRef };
 }

frontend/app/store/keymodel.ts

@@ -321,6 +321,28 @@ function registerGlobalKeys() {
             return true;
         });
     }
+    function activateSearch(): boolean {
+        console.log("activateSearch");
+        const bcm = getBlockComponentModel(getFocusedBlockInStaticTab());
+        if (bcm.viewModel.searchAtoms) {
+            console.log("activateSearch2");
+            globalStore.set(bcm.viewModel.searchAtoms.isOpenAtom, true);
+            return true;
+        }
+        return false;
+    }
+    function deactivateSearch(): boolean {
+        console.log("deactivateSearch");
+        const bcm = getBlockComponentModel(getFocusedBlockInStaticTab());
+        if (bcm.viewModel.searchAtoms && globalStore.get(bcm.viewModel.searchAtoms.isOpenAtom)) {
+            globalStore.set(bcm.viewModel.searchAtoms.isOpenAtom, false);
+            return true;
+        }
+        return false;
+    }
+    globalKeyMap.set("Cmd:f", activateSearch);
+    globalKeyMap.set("Ctrl:f", activateSearch);
+    globalKeyMap.set("Escape", deactivateSearch);
     const allKeys = Array.from(globalKeyMap.keys());
     // special case keys, handled by web view
     allKeys.push("Cmd:l", "Cmd:r", "Cmd:ArrowRight", "Cmd:ArrowLeft");

frontend/app/store/services.ts

@@ -189,7 +189,7 @@ class WorkspaceServiceType {
     }
 
     // @returns object updates
-    DeleteWorkspace(workspaceId: string): Promise<void> {
+    DeleteWorkspace(workspaceId: string): Promise<string> {
         return WOS.callBackendService("workspace", "DeleteWorkspace", Array.from(arguments))
     }
 

frontend/app/view/webview/webview.scss

@@ -1,7 +1,8 @@
 // Copyright 2024, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-.webview {
+.webview,
+.webview-container {
     height: 100%;
     width: 100%;
     border: none !important;