From 0b01d9308316d73b5683c319099860611c7a6559 Mon Sep 17 00:00:00 2001 From: Ellie Huxtable Date: Fri, 26 Jul 2024 19:08:49 +0100 Subject: [PATCH] fix(gui): random ts errors (#2316) --- .../editor/blocks/Directory/index.tsx | 8 ++-- .../runbooks/editor/blocks/Run/index.tsx | 12 ++++-- ui/src/pages/History.tsx | 42 ------------------- ui/src/pages/Runbooks.tsx | 2 - 4 files changed, 13 insertions(+), 51 deletions(-) diff --git a/ui/src/components/runbooks/editor/blocks/Directory/index.tsx b/ui/src/components/runbooks/editor/blocks/Directory/index.tsx index a1eccd92..3e4f93d9 100644 --- a/ui/src/components/runbooks/editor/blocks/Directory/index.tsx +++ b/ui/src/components/runbooks/editor/blocks/Directory/index.tsx @@ -1,6 +1,6 @@ import { useState } from "react"; import { Input, Tooltip, Button } from "@nextui-org/react"; -import { FolderInputIcon, HelpCircleIcon } from "lucide-react"; +import { FolderInputIcon } from "lucide-react"; // @ts-ignore import { createReactBlockSpec } from "@blocknote/react"; @@ -9,7 +9,7 @@ import { open } from "@tauri-apps/plugin-dialog"; interface DirectoryProps { path: string; - onInputChange: (string) => void; + onInputChange: (val: string) => void; } const Directory = ({ path, onInputChange }: DirectoryProps) => { @@ -21,8 +21,8 @@ const Directory = ({ path, onInputChange }: DirectoryProps) => { directory: true, }); - setValue(path); - onInputChange(path); + setValue(path || ""); + onInputChange(path || ""); }; return ( diff --git a/ui/src/components/runbooks/editor/blocks/Run/index.tsx b/ui/src/components/runbooks/editor/blocks/Run/index.tsx index e0989f47..bef083ba 100644 --- a/ui/src/components/runbooks/editor/blocks/Run/index.tsx +++ b/ui/src/components/runbooks/editor/blocks/Run/index.tsx @@ -87,9 +87,15 @@ const RunBlock = ({ } if (!isRunning) { - const cwd = findFirstParentOfType(editor, id, "directory"); - console.log(cwd.props.path); - let pty = await invoke("pty_open", { cwd: cwd.props.path }); + let cwd = findFirstParentOfType(editor, id, "directory"); + + if (cwd) { + cwd = cwd.props.path; + } else { + cwd = "~"; + } + + let pty = await invoke("pty_open", { cwd }); if (onRun) onRun(pty); if (currentRunbook) incRunbookPty(currentRunbook); diff --git a/ui/src/pages/History.tsx b/ui/src/pages/History.tsx index 7002f3c4..32f5217e 100644 --- a/ui/src/pages/History.tsx +++ b/ui/src/pages/History.tsx @@ -3,51 +3,9 @@ import { useVirtualizer } from "@tanstack/react-virtual"; import HistoryList from "@/components/HistoryList.tsx"; import HistorySearch from "@/components/HistorySearch.tsx"; -import Stats from "@/components/history/Stats.tsx"; -import Drawer from "@/components/Drawer.tsx"; import { AtuinState, useStore } from "@/state/store"; -function Header() { - return ( -
-
-

- Shell History -

-
-
- - - - - - } - > - - -
-
- ); -} - export default function Search() { const history = useStore((state: AtuinState) => state.shellHistory); const refreshHistory = useStore( diff --git a/ui/src/pages/Runbooks.tsx b/ui/src/pages/Runbooks.tsx index d0efbc1c..a0b844a6 100644 --- a/ui/src/pages/Runbooks.tsx +++ b/ui/src/pages/Runbooks.tsx @@ -1,8 +1,6 @@ import Editor from "@/components/runbooks/editor/Editor"; import List from "@/components/runbooks/List"; -import { Checkbox } from "@nextui-org/react"; - import { useStore } from "@/state/store"; export default function Runbooks() {