Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Improve editing [WIP]

Tomas Valenta32fa34c07da1
diff --git a/components/ProjectBoard/RouteEditor/PromptEditor.tsx b/components/ProjectBoard/RouteEditor/PromptEditor.tsx
index 97993cb55..ff2bc54f0 100644
--- a/components/ProjectBoard/RouteEditor/PromptEditor.tsx
+++ b/components/ProjectBoard/RouteEditor/PromptEditor.tsx
@@ -1,17 +1,26 @@
-import { useEditor, EditorContent } from '@tiptap/react'
-import StarterKit from '@tiptap/starter-kit'
+import { EditorContent } from '@tiptap/react'
-const Tiptap = () => {
- const editor = useEditor({
- extensions: [
- StarterKit,
- ],
- content: '<p>Hello World! 🌎️</p>',
+import useDocEditor from 'hooks/useDocEditor'
+
+export interface Props {
+ initialContent: string
+ onContentChange: (content: string) => void
+}
+
+function PromptEditor({ initialContent, onContentChange }: Props) {
+ const editor = useDocEditor({
+ initialContent,
+ onContentChange,
})
return (
- <EditorContent editor={editor} />
+ <div className="
+ flex
+ flex-1
+ ">
+ <EditorContent editor={editor || null} />
+ </div>
)
}
-export default Tiptap
+export default PromptEditor
diff --git a/components/ProjectBoard/RouteEditor/RequestBodyEditor.tsx b/components/ProjectBoard/RouteEditor/RequestBodyEditor.tsx
index c73dd90d5..19b5a20eb 100644
--- a/components/ProjectBoard/RouteEditor/RequestBodyEditor.tsx
+++ b/components/ProjectBoard/RouteEditor/RequestBodyEditor.tsx
@@ -1,8 +1,4 @@
import clsx from 'clsx'
-import {
- useEffect,
- useRef,
-} from 'react'
import TextareaAutosize from 'react-textarea-autosize'
import { Block } from 'state/store'
@@ -10,32 +6,19 @@ import { Block } from 'state/store'
export interface Props {
onChange: (block: Block) => void
block: Block
- index: number,
- focus: { index: number }
- onFocus: () => void
}
function RequestBodyEditor({
onChange,
block,
- index,
- focus,
- onFocus,
}: Props) {
- const ref = useRef<HTMLTextAreaElement>(null)
-
- useEffect(function autofocus() {
- if (focus.index === index) {
- ref.current?.focus()
- }
- }, [focus, index])
-
return (
<div className="
flex
flex-col
items-start
- w-[65ch]
+ max-w-[65ch]
+ flex-1
border
border-green-800/40
rounded-lg
@@ -61,8 +44,6 @@ function RequestBodyEditor({
placeholder="fieldName: Type,"
value={block.prompt}
onChange={e => onChange({ ...block, prompt: e.target.value })}
- onFocus={onFocus}
- ref={ref}
className={clsx(
'w-full',
'pl-8',
diff --git a/components/ProjectBoard/RouteEditor/index.tsx b/components/ProjectBoard/RouteEditor/index.tsx
index b8b81ebfd..e59247f2d 100644
--- a/components/ProjectBoard/RouteEditor/index.tsx
+++ b/components/ProjectBoard/RouteEditor/index.tsx
@@ -1,106 +1,81 @@
-import Select from 'components/Select'
-import { Link } from 'lucide-react'
import { Fragment } from 'react'
-import { methods, Method } from 'state/store'
-import ConnectionLine from '../Sidebar/Logs/ConnectionLine'
-import Tiptap from './PromptEditor'
+
+import Select from 'components/Select'
+import { methods, Method, Route } from 'state/store'
+
+import PromptEditor from './PromptEditor'
import RequestBodyEditor from './RequestBodyEditor'
-import Text from 'components/Text'
+import { useStateStore } from 'state/StoreProvider'
export interface Props {
-
+ route?: Route
}
-function RouteEditor() {
-
+function RouteEditor({ route }: Props) {
+ const store = useStateStore()
- useEffect(function selectDefaultRoute() {
- if (selectedRoute?.id || routes.length === 0) return
- setSelectedRouteID(routes[0].id)
- }, [routes, selectedRoute?.id])
+ const changeRoute = store.use.changeRoute()
+ const changeBlock = store.use.changeBlock()
- function handleDeleteRoute(id: string) {
- deleteRoute(id)
- setSelectedRouteID(r => {
- if (r === id) {
- return routes.length > 0 ? routes[0].id : undefined
- }
- })
- }
-
- // <Routes
- // routes={routes}
- // selectRoute={setSelectedRouteID}
- // selectedRouteID={selectedRoute?.id}
- // deleteRoute={handleDeleteRoute}
- // addRoute={addRoute}
- // />
return (
<div className="
+ py-2
+ px-4
+ flex
+ flex-1
+ items-start
+ ">
+ {!route &&
+ <div>No route selected</div>
+ }
+ {route &&
+ <>
+ <div className="flex items-center space-x-2">
+ <Select
+ direction="left"
+ selectedValue={{ key: route?.method, title: route.method.toUpperCase() }}
+ values={methods.map(m => ({ key: m, title: m.toUpperCase() }))}
+ onChange={m => changeRoute(route.id, { method: m.key as Method })}
+ />
+ </div>
+ <div className="
flex
flex-1
- p-8
flex-col
items-center
overflow-auto
scroller
+ bg-white
relative
">
- <div className="flex items-center space-x-2">
- <Text
- text="Incoming"
- className='font-bold'
- />
- <Select
- direction="left"
- selectedValue={{ key: selectedRoute.method, title: selectedRoute.method.toUpperCase() }}
- values={methods.map(m => ({ key: m, title: m.toUpperCase() }))}
- onChange={m => changeRoute(selectedRoute.id, { method: m.key as Method })}
- />
- <Text
- text="Request"
- className='font-bold'
- />
- </div>
- <div className="
+ <div className="
flex
flex-col
items-center
transition-all
+ flex-1
">
- {selectedRoute.blocks.map((b, i) =>
- <Fragment
- key={b.id}
- >
- <ConnectionLine className='h-4' />
- <RequestBodyEditor
- block={b}
- onChange={(b) => {
- changeBlock(selectedRoute.id, i, b)
- }}
- index={i}
- focus={focusedBlock}
- onFocus={() => { setFocusedBlock({ index: i }) }}
- />
- </Fragment>
- )}
- <Tiptap />
- </div>
- <ConnectionLine className='min-h-[16px]' />
- {deploymentURL &&
- <Link
- href={deploymentURL}
- className="
- mt-6
- underline
- "
- target="_blank" rel="noopener noreferrer"
- >
- <Text
- text={deploymentURL.substring('https://'.length)}
- size={Text.size.S3}
- />
- </Link>
+ {route.blocks.map((b, i) =>
+ <Fragment
+ key={b.id}
+ >
+ {b.type === 'RequestBody' &&
+ <RequestBodyEditor
+ block={b}
+ onChange={b => changeBlock(route.id, i, b)}
+ />
+ }
+ {b.type === 'StructuredProse' &&
+ <PromptEditor
+ initialContent={b.prompt}
+ onContentChange={c => changeBlock(route.id, i, { ...b, prompt: c })}
+ />
+ }
+ </Fragment>
+ )}
+ </div>
+ </div>
+ </>
}
</div>
)
diff --git a/components/ProjectBoard/RouteEditor/Routes.tsx b/components/ProjectBoard/Routes.tsx
similarity index 55%
rename from components/ProjectBoard/RouteEditor/Routes.tsx
rename to components/ProjectBoard/Routes.tsx
index 0d1e230c7..d183f9899 100644
--- a/components/ProjectBoard/RouteEditor/Routes.tsx
+++ b/components/ProjectBoard/Routes.tsx
@@ -3,7 +3,6 @@ import { Plus } from 'lucide-react'
import { Route } from 'state/store'
import Button from 'components/Button'
-import Sidebar from 'components/Sidebar'
import Text from 'components/Text'
import DeleteButton from 'components/DeleteButton'
@@ -23,28 +22,23 @@ function Routes({
selectRoute,
}: Props) {
return (
- <Sidebar
- side={Sidebar.side.Left}
- className="
- flex-col
- min-h-0
+ <div>
+ <div
+ className="
flex
- "
- >
- <div className="
- flex
- justify-between
- py-2
- px-4
border-b
- ">
+ space-x-4
+ items-center
+ px-4
+ "
+ >
<Text
text="Routes"
className="
- font-semibold
- uppercase
- text-slate-400
- "
+ font-semibold
+ uppercase
+ text-slate-400
+ "
size={Text.size.S2}
/>
<Button
@@ -53,47 +47,48 @@ function Routes({
variant={Button.variant.Outline}
icon={<Plus size="16px" />}
/>
- </div>
- <div className="
+ <div className="
flex
flex-col
overflow-y-auto
leading-4
- px-4
- py-2
+ p-2
break-words
whitespace-normal
space-y-0.5
">
- {routes.map(r =>
- <div
- key={r.id}
- className={clsx(`
+ {routes.map(r =>
+ <div
+ key={r.id}
+ className={clsx(`
flex
items-center
justify-between
hover:text-green-800
+ rounded
+ px-2
`,
- {
- 'text-green-800': selectedRouteID === r.id,
- }
- )}
- >
- <button
- onClick={() => selectRoute(r.id)}
+ {
+ 'text-green-800': selectedRouteID === r.id,
+ }
+ )}
>
- <Text
- className="font-mono"
- text={r.method.toUpperCase() + ' ' + r.route}
+ <button
+ onClick={() => selectRoute(r.id)}
+ >
+ <Text
+ className="font-mono"
+ text={r.method.toUpperCase() + ' ' + r.route}
+ />
+ </button>
+ <DeleteButton
+ onDelete={() => deleteRoute(r.id)}
/>
- </button>
- <DeleteButton
- onDelete={() => deleteRoute(r.id)}
- />
- </div>
- )}
+ </div>
+ )}
+ </div>
</div>
- </Sidebar>
+ </div>
)
}
diff --git a/components/ProjectBoard/Sidebar/Envs.tsx b/components/ProjectBoard/Sidebar/Envs.tsx
index b98bb2e1d..65fccc595 100644
--- a/components/ProjectBoard/Sidebar/Envs.tsx
+++ b/components/ProjectBoard/Sidebar/Envs.tsx
@@ -4,11 +4,7 @@ import Button from 'components/Button'
import Text from 'components/Text'
import { useStateStore } from 'state/StoreProvider'
-export interface Props {
-
-}
-
-function Envs({ }: Props) {
+function Envs() {
const store = useStateStore()
const envs = store.use.envs()
@@ -32,7 +28,6 @@ function Envs({ }: Props) {
setEnvs(newEnvs)
}, [envs, setEnvs])
-
return (
<div className="
max-w-full
@@ -70,8 +65,13 @@ function Envs({ }: Props) {
rounded
border
outline-none
- focus:border-green-600
- "
+ focus:border-green-800
+ "
+ type="text"
+ autoCapitalize="off"
+ autoCorrect="off"
+ autoComplete="off"
+ spellCheck="false"
placeholder="KEY"
value={env.key}
onChange={event => handleEnvKeyChange(event, idx)}
@@ -85,10 +85,14 @@ function Envs({ }: Props) {
rounded
border
outline-none
- focus:border-green-600
+ focus:border-green-800
"
placeholder="VALUE"
- type="password"
+ type="text"
+ autoCapitalize="off"
+ autoCorrect="off"
+ autoComplete="off"
+ spellCheck="false"
value={env.value}
onChange={event => handleEnvValueChange(event, idx)}
/>
diff --git a/components/ProjectBoard/Sidebar/index.tsx b/components/ProjectBoard/Sidebar/index.tsx
index dc5288bd0..663d7cecf 100644
--- a/components/ProjectBoard/Sidebar/index.tsx
+++ b/components/ProjectBoard/Sidebar/index.tsx
@@ -2,20 +2,18 @@ import { projects } from '@prisma/client'
import Link from 'next/link'
import { useEffect, useState } from 'react'
import clsx from 'clsx'
+import useSWRMutation from 'swr/mutation'
import Text from 'components/Text'
import { Route } from 'state/store'
import { useLatestDeployment } from 'hooks/useLatestDeployment'
+import { useStateStore } from 'state/StoreProvider'
import DeployButton from './DeployButton'
import Logs from './Logs'
import Envs from './Envs'
export interface Props {
- deploy: () => void
- isDeployRequestRunning?: boolean
- setDeployURL: (url: string | undefined) => void
-
project: projects
route?: Route
}
@@ -24,35 +22,32 @@ const apiHost = process.env.NODE_ENV === 'development'
? 'http://0.0.0.0:5000'
: 'https://ai-api-service-7d2cl2hooq-uc.a.run.app'
- async function handlePostGenerate(url: string, { arg }: {
- arg: {
- projectID: string,
- route: Route,
- envs: { key: string, value: string }[],
- }
- }) {
- return await fetch(url, {
- method: 'POST',
- body: JSON.stringify({
- projectID: arg.projectID,
- routeID: arg.route.id,
- blocks: arg.route.blocks,
- method: arg.route.method.toLowerCase(),
- route: arg.route.route,
- envs: arg.envs,
- }),
- headers: {
- 'Content-Type': 'application/json',
- },
- }).then(r => r.json())
+async function handlePostGenerate(url: string, { arg }: {
+ arg: {
+ projectID: string,
+ route: Route,
+ envs: { key: string, value: string }[],
}
-
+}) {
+ return await fetch(url, {
+ method: 'POST',
+ body: JSON.stringify({
+ projectID: arg.projectID,
+ routeID: arg.route.id,
+ blocks: arg.route.blocks,
+ method: arg.route.method.toLowerCase(),
+ route: arg.route.route,
+ envs: arg.envs,
+ }),
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ }).then(r => r.json())
+}
function Sidebar({
- isDeployRequestRunning,
project,
route,
- setDeployURL,
}: Props) {
const deployment = useLatestDeployment(project, route)
@@ -64,20 +59,15 @@ function Sidebar({
const store = useStateStore()
const envs = store.use.envs()
-
async function deploy() {
- if (!selectedRoute) return
+ if (!route) return
await generate({
projectID: project.id,
- route: selectedRoute,
+ route,
envs,
})
}
- useEffect(function updateURL() {
- setDeployURL(deployment?.url ? deployment.url : undefined)
- }, [deployment?.url, setDeployURL])
-
const [isInitializingDeploy, setIsInitializingDeploy] = useState(false)
useEffect(function handleDeployState() {
@@ -92,13 +82,11 @@ function Sidebar({
return (
<div
- className={clsx(
- `
+ className={clsx(`
flex
- border-slate-200
bg-white
- border-l
flex
+ flex-1
flex-col
min-h-0
`,
diff --git a/components/ProjectBoard/index.tsx b/components/ProjectBoard/index.tsx
index 87df69e9f..c22e8541a 100644
--- a/components/ProjectBoard/index.tsx
+++ b/components/ProjectBoard/index.tsx
@@ -1,35 +1,47 @@
-import useSWRMutation from 'swr/mutation'
-import { Fragment, useEffect, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
import { projects } from '@prisma/client'
-import Link from 'next/link'
-import Splitter, { SplitDirection, GutterTheme } from '@devbookhq/splitter'
+import Splitter, { GutterTheme } from '@devbookhq/splitter'
+import { useLocalStorage } from 'usehooks-ts'
-import { Route, methods, Method } from 'state/store'
import { useStateStore } from 'state/StoreProvider'
-import Select from 'components/Select'
-import Text from 'components/Text'
-import ConnectionLine from './Sidebar/Logs/ConnectionLine'
+import Routes from './Routes'
import Sidebar from './Sidebar'
-import Routes from './RouteEditor/Routes'
-import RequestBodyEditor from './RouteEditor/RequestBodyEditor'
-import Tiptap from './RouteEditor/PromptEditor'
-
+import RouteEditor from './RouteEditor'
export interface Props {
project: projects
}
-
function Editor({ project }: Props) {
const store = useStateStore()
+ // TODO: Handle editor state differently so we don't rerender this component on each editor edit.
const routes = store.use.routes()
- const envs = store.use.envs()
+ const addRoute = store.use.addRoute()
+ const deleteRoute = store.use.deleteRoute()
const [selectedRouteID, setSelectedRouteID] = useState(() => routes.length > 0 ? routes[0].id : undefined)
const selectedRoute = routes.find(s => s.id === selectedRouteID)
+ useEffect(function selectDefaultRoute() {
+ if (selectedRoute?.id || routes.length === 0) return
+ setSelectedRouteID(routes[0].id)
+ }, [routes, selectedRoute?.id])
+
+ function handleDeleteRoute(id: string) {
+ deleteRoute(id)
+ setSelectedRouteID(r => {
+ if (r === id) {
+ return routes.length > 0 ? routes[0].id : undefined
+ }
+ })
+ }
+
+ const [sizes, setSizes] = useLocalStorage('project-board-splitter-sizes', [60, 40])
+ const handleResize = useCallback((_: number, newSizes: number[]) => {
+ setSizes(newSizes)
+ }, [setSizes])
return (
<div className="
@@ -39,17 +51,33 @@ function Editor({ project }: Props) {
flex-1
">
<Splitter
+ minWidths={[400, 380]}
gutterTheme={GutterTheme.Light}
-
+ initialSizes={sizes}
+ classes={['flex', 'flex']}
+ onResizeFinished={handleResize}
+ gutterClassName='bg-slate-200'
+ draggerClassName='bg-slate-400'
>
- <div>EDITOR</div>
- {/* <RouteEditor /> */}
+ <div className="
+ flex
+ flex-col
+ flex-1
+ ">
+ <Routes
+ routes={routes}
+ selectRoute={setSelectedRouteID}
+ selectedRouteID={selectedRoute?.id}
+ deleteRoute={handleDeleteRoute}
+ addRoute={addRoute}
+ />
+ <RouteEditor
+ route={selectedRoute}
+ />
+ </div>
<Sidebar
project={project}
route={selectedRoute}
- isDeployRequestRunning={isDeployRequestRunning}
- deploy={deploy}
- setDeployURL={setDeploymentURL}
/>
</Splitter>
</div>
diff --git a/components/Select/index.tsx b/components/Select/index.tsx
index 4cc2209a4..be914b8fe 100644
--- a/components/Select/index.tsx
+++ b/components/Select/index.tsx
@@ -56,15 +56,13 @@ function Select({
`transition-all
cursor-pointer
flex
- hover:border-green-600
hover:text-green-600
- border-b-4
items-center
justify-between
space-x-1`,
{
- 'text-green-600 border-green-600': isOpened,
- 'text-green-500 border-green-500': !isOpened,
+ 'text-green-600': isOpened,
+ 'text-green-500': !isOpened,
}
)}
onClick={() => setIsOpened(val => !val)}
diff --git a/components/Tabs/index.tsx b/components/Tabs/index.tsx
index 1c1b18595..f43e51f62 100644
--- a/components/Tabs/index.tsx
+++ b/components/Tabs/index.tsx
@@ -119,7 +119,6 @@ function Tab({
z-20
bg-transparent
text-sm
- font-medium
cursor-pointer
select-none
transition-colors
diff --git a/hooks/useDocEditor.tsx b/hooks/useDocEditor.tsx
index 1544a1c43..727acf146 100644
--- a/hooks/useDocEditor.tsx
+++ b/hooks/useDocEditor.tsx
@@ -3,13 +3,13 @@ import {
useState,
} from 'react'
import { Editor } from '@tiptap/react'
+import { StarterKit } from '@tiptap/starter-kit'
import Placeholder from '@tiptap/extension-placeholder'
import { keymap } from 'prosemirror-keymap'
+// import SlashCommand from 'src/editor/extensions/slashCommand'
-import SlashCommand from 'src/editor/extensions/slashCommand'
-
-function useDocumentEditor({
+function useDocEditor({
initialContent,
onContentChange,
}: {
@@ -20,19 +20,29 @@ function useDocumentEditor({
useEffect(function initialize() {
const extensions = [
- Document,
- Paragraph,
- Text,
+ StarterKit.configure({
+ blockquote: false,
+ bold: false,
+ bulletList: false,
+ code: false,
+ codeBlock: false,
+ dropcursor: false,
+ hardBreak: false,
+ heading: false,
+ horizontalRule: false,
+ italic: false,
+ listItem: false,
+ strike: false,
+ orderedList: false,
+ }),
Placeholder.configure({
placeholder: "Type '/' for commands",
}),
- SlashCommand,
+ // SlashCommand,
]
- // Transform content
-
const instance = new Editor({
- content,
+ content: initialContent,
parseOptions: {
preserveWhitespace: 'full',
},
@@ -40,7 +50,7 @@ function useDocumentEditor({
editorProps: {
attributes: {
'data-gramm': 'false',
- 'spellcheck': 'false',
+ // 'spellcheck': 'false',
},
},
extensions,
@@ -55,9 +65,7 @@ function useDocumentEditor({
instance.on('update', u => {
if (u.transaction.docChanged) {
- // TODO: Handle prompt extraction
- const prompt = u.transaction.doc.text
- onContentChange(prompt)
+ onContentChange(u.transaction.doc.toJSON())
}
})
@@ -68,11 +76,10 @@ function useDocumentEditor({
setEditor(undefined)
}
}, [
- initialContent,
onContentChange,
])
return editor
}
-export default useDocumentEditor
+export default useDocEditor
diff --git a/state/store.ts b/state/store.ts
index 694443a92..cfadcbee3 100644
--- a/state/store.ts
+++ b/state/store.ts
@@ -8,7 +8,7 @@ import { projects, Prisma } from '@prisma/client'
import { Database } from 'db/supabase'
import { projectsTable } from 'db/tables'
-export type BlockType = 'Basic' | 'RequestBody'
+export type BlockType = 'Basic' | 'RequestBody' | 'StructuredProse'
export interface Block {
id: string
@@ -43,8 +43,6 @@ export interface SerializedState {
export interface State extends SerializedState {
changeBlock: (routeID: string, index: number, block: Partial<Omit<Block, 'id'>>) => void
- deleteBlock: (routeID: string, index: number) => void
- addBlock: (routeID: string, type: BlockType) => void
changeRoute: (id: string, route: Partial<Omit<Route, 'id'>>) => void
deleteRoute: (id: string) => void
addRoute: () => void
@@ -62,7 +60,7 @@ function createBlock(type: BlockType): Block {
function getDefaultRoute(): Route {
return {
- blocks: [createBlock('RequestBody')],
+ blocks: [createBlock('RequestBody'), createBlock('StructuredProse')],
method: Method.POST,
route: '/',
id: nanoid(),
@@ -123,18 +121,6 @@ export function createStore(project: projects, client?: SupabaseClient<Database>
}
}
}),
- deleteBlock: (routeID, index) => set(state => {
- const idx = state.routes.findIndex(r => r.id === routeID)
- if (idx !== -1) {
- state.routes[idx].blocks.splice(index, 1)
- }
- }),
- addBlock: (routeID) => set(state => {
- const idx = state.routes.findIndex(r => r.id === routeID)
- if (idx !== -1) {
- state.routes[idx].blocks.push(createBlock('Basic'))
- }
- }),
setEnvs: (envs) => set(state => {
state.envs = envs
}),
@@ -144,7 +130,7 @@ export function createStore(project: projects, client?: SupabaseClient<Database>
}))
const persistent = persist(immerStore, {
- name: 'supabase-storage',
+ name: 'supabase-persistence',
partialize: (state) => state,
storage: client ? {
getItem: async (name) => {