Skip to content

Commit

Permalink
fix(gui): random ts errors (#2316)
Browse files Browse the repository at this point in the history
  • Loading branch information
ellie authored Jul 26, 2024
1 parent a34efd6 commit 0b01d93
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 51 deletions.
8 changes: 4 additions & 4 deletions ui/src/components/runbooks/editor/blocks/Directory/index.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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) => {
Expand All @@ -21,8 +21,8 @@ const Directory = ({ path, onInputChange }: DirectoryProps) => {
directory: true,
});

setValue(path);
onInputChange(path);
setValue(path || "");
onInputChange(path || "");
};

return (
Expand Down
12 changes: 9 additions & 3 deletions ui/src/components/runbooks/editor/blocks/Run/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,15 @@ const RunBlock = ({
}

if (!isRunning) {
const cwd = findFirstParentOfType(editor, id, "directory");
console.log(cwd.props.path);
let pty = await invoke<string>("pty_open", { cwd: cwd.props.path });
let cwd = findFirstParentOfType(editor, id, "directory");

if (cwd) {
cwd = cwd.props.path;
} else {
cwd = "~";
}

let pty = await invoke<string>("pty_open", { cwd });
if (onRun) onRun(pty);

if (currentRunbook) incRunbookPty(currentRunbook);
Expand Down
42 changes: 0 additions & 42 deletions ui/src/pages/History.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<div className="md:flex md:items-center md:justify-between">
<div className="min-w-0 flex-1">
<h2 className="text-2xl font-bold leading-7 text-gray-900 sm:truncate sm:text-3xl sm:tracking-tight">
Shell History
</h2>
</div>
<div className="flex">
<Drawer
width="70%"
trigger={
<button
type="button"
className="inline-flex border-2 items-center hover:shadow-xl rounded-md text-sm font-semibold shadow-sm"
>
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
strokeWidth={1.5}
stroke="currentColor"
className="w-6 h-6"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
d="M3 13.125C3 12.504 3.504 12 4.125 12h2.25c.621 0 1.125.504 1.125 1.125v6.75C7.5 20.496 6.996 21 6.375 21h-2.25A1.125 1.125 0 0 1 3 19.875v-6.75ZM9.75 8.625c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125v11.25c0 .621-.504 1.125-1.125 1.125h-2.25a1.125 1.125 0 0 1-1.125-1.125V8.625ZM16.5 4.125c0-.621.504-1.125 1.125-1.125h2.25C20.496 3 21 3.504 21 4.125v15.75c0 .621-.504 1.125-1.125 1.125h-2.25a1.125 1.125 0 0 1-1.125-1.125V4.125Z"
/>
</svg>
</button>
}
>
<Stats />
</Drawer>
</div>
</div>
);
}

export default function Search() {
const history = useStore((state: AtuinState) => state.shellHistory);
const refreshHistory = useStore(
Expand Down
2 changes: 0 additions & 2 deletions ui/src/pages/Runbooks.tsx
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down

0 comments on commit 0b01d93

Please sign in to comment.