Canvas: Prettier
Change-Id: I620dde109df0f29f0c85c6fe150e347d2c32a03e
diff --git a/apps/canvas/front/src/App.css b/apps/canvas/front/src/App.css
index 39cbabd..31745d5 100644
--- a/apps/canvas/front/src/App.css
+++ b/apps/canvas/front/src/App.css
@@ -1,7 +1,7 @@
.react-flow__handle.connectingto {
- background: #ff6060;
+ background: #ff6060;
}
.react-flow__handle.valid {
- background: #55dd99;
-}
\ No newline at end of file
+ background: #55dd99;
+}
diff --git a/apps/canvas/front/src/App.tsx b/apps/canvas/front/src/App.tsx
index 2970cc0..ffdb119 100644
--- a/apps/canvas/front/src/App.tsx
+++ b/apps/canvas/front/src/App.tsx
@@ -1,39 +1,39 @@
-import { ReactFlowProvider } from '@xyflow/react';
-import './App.css';
-import { CanvasBuilder } from './Canvas';
-import { Tabs, TabsTrigger, TabsContent, TabsList } from './components/ui/tabs';
-import { Config } from './Config';
-import { Integrations } from './Integrations';
-import { Toaster } from './components/ui/toaster';
-import { Header } from './Header';
+import { ReactFlowProvider } from "@xyflow/react";
+import "./App.css";
+import { CanvasBuilder } from "./Canvas";
+import { Tabs, TabsTrigger, TabsContent, TabsList } from "./components/ui/tabs";
+import { Config } from "./Config";
+import { Integrations } from "./Integrations";
+import { Toaster } from "./components/ui/toaster";
+import { Header } from "./Header";
export default function App() {
- return (
- <ReactFlowProvider>
- <Header />
- <AppImpl />
- <Toaster />
- </ReactFlowProvider>
- )
+ return (
+ <ReactFlowProvider>
+ <Header />
+ <AppImpl />
+ <Toaster />
+ </ReactFlowProvider>
+ );
}
function AppImpl() {
- return (
- <Tabs defaultValue="canvas">
- <TabsList>
- <TabsTrigger value="canvas">Canvas</TabsTrigger>
- <TabsTrigger value="config">Config</TabsTrigger>
- <TabsTrigger value="integrations">Integrations</TabsTrigger>
- </TabsList>
- <TabsContent value="canvas">
- <CanvasBuilder />
- </TabsContent>
- <TabsContent value="config">
- <Config />
- </TabsContent>
- <TabsContent value="integrations">
- <Integrations />
- </TabsContent>
- </Tabs>
- );
+ return (
+ <Tabs defaultValue="canvas">
+ <TabsList>
+ <TabsTrigger value="canvas">Canvas</TabsTrigger>
+ <TabsTrigger value="config">Config</TabsTrigger>
+ <TabsTrigger value="integrations">Integrations</TabsTrigger>
+ </TabsList>
+ <TabsContent value="canvas">
+ <CanvasBuilder />
+ </TabsContent>
+ <TabsContent value="config">
+ <Config />
+ </TabsContent>
+ <TabsContent value="integrations">
+ <Integrations />
+ </TabsContent>
+ </Tabs>
+ );
}
diff --git a/apps/canvas/front/src/Canvas.tsx b/apps/canvas/front/src/Canvas.tsx
index effdac3..0b22a36 100644
--- a/apps/canvas/front/src/Canvas.tsx
+++ b/apps/canvas/front/src/Canvas.tsx
@@ -1,38 +1,35 @@
import { Resources } from "@/components/resources";
import { Canvas } from "@/components/canvas";
import { Details } from "@/components/details";
-import { ResizableHandle, ResizablePanel, ResizablePanelGroup } from './components/ui/resizable';
+import { ResizableHandle, ResizablePanel, ResizablePanelGroup } from "./components/ui/resizable";
import { Tools } from "./Tootls";
export function CanvasBuilder() {
- return (
- <ResizablePanelGroup
- direction="horizontal"
- style={{ width: "100vw", height: "calc(100vh - 100px)" }}
- >
- <ResizablePanel defaultSize={80}>
- <ResizablePanelGroup direction="vertical">
- <ResizablePanel defaultSize={80}>
- <ResizablePanelGroup direction="horizontal">
- <ResizablePanel defaultSize={15}>
- <Resources />
- </ResizablePanel>
- <ResizableHandle withHandle />
- <ResizablePanel defaultSize={85}>
- <Canvas />
- </ResizablePanel>
- </ResizablePanelGroup>
- </ResizablePanel>
- <ResizableHandle withHandle />
- <ResizablePanel defaultSize={20}>
- <Tools />
- </ResizablePanel>
- </ResizablePanelGroup>
- </ResizablePanel>
- <ResizableHandle withHandle />
- <ResizablePanel defaultSize={20}>
- <Details />
- </ResizablePanel>
- </ResizablePanelGroup>
- )
+ return (
+ <ResizablePanelGroup direction="horizontal" style={{ width: "100vw", height: "calc(100vh - 100px)" }}>
+ <ResizablePanel defaultSize={80}>
+ <ResizablePanelGroup direction="vertical">
+ <ResizablePanel defaultSize={80}>
+ <ResizablePanelGroup direction="horizontal">
+ <ResizablePanel defaultSize={15}>
+ <Resources />
+ </ResizablePanel>
+ <ResizableHandle withHandle />
+ <ResizablePanel defaultSize={85}>
+ <Canvas />
+ </ResizablePanel>
+ </ResizablePanelGroup>
+ </ResizablePanel>
+ <ResizableHandle withHandle />
+ <ResizablePanel defaultSize={20}>
+ <Tools />
+ </ResizablePanel>
+ </ResizablePanelGroup>
+ </ResizablePanel>
+ <ResizableHandle withHandle />
+ <ResizablePanel defaultSize={20}>
+ <Details />
+ </ResizablePanel>
+ </ResizablePanelGroup>
+ );
}
diff --git a/apps/canvas/front/src/Config.tsx b/apps/canvas/front/src/Config.tsx
index 23a3254..d2f1aed 100644
--- a/apps/canvas/front/src/Config.tsx
+++ b/apps/canvas/front/src/Config.tsx
@@ -4,20 +4,20 @@
import { useEffect, useMemo, useState } from "react";
export function Config() {
- const env = useEnv();
- const [nodes, setNodes] = useState<AppNode[]>([]);
- const n = useNodes<AppNode>();
- useEffect(() => {
- console.log(n);
- if (n && n.length > 0) {
- setNodes(n);
- }
- }, [n, setNodes]);
- const config = useMemo(() => generateDodoConfig(nodes, env), [nodes, env]);
- const configS = useMemo(() => JSON.stringify(config, undefined, 4), [config]);
- return (
- <div className="px-5">
- <pre>{configS}</pre>
- </div>
- )
-}
\ No newline at end of file
+ const env = useEnv();
+ const [nodes, setNodes] = useState<AppNode[]>([]);
+ const n = useNodes<AppNode>();
+ useEffect(() => {
+ console.log(n);
+ if (n && n.length > 0) {
+ setNodes(n);
+ }
+ }, [n, setNodes]);
+ const config = useMemo(() => generateDodoConfig(nodes, env), [nodes, env]);
+ const configS = useMemo(() => JSON.stringify(config, undefined, 4), [config]);
+ return (
+ <div className="px-5">
+ <pre>{configS}</pre>
+ </div>
+ );
+}
diff --git a/apps/canvas/front/src/Deployment.tsx b/apps/canvas/front/src/Deployment.tsx
index 2864a2a..62eccf6 100644
--- a/apps/canvas/front/src/Deployment.tsx
+++ b/apps/canvas/front/src/Deployment.tsx
@@ -4,52 +4,59 @@
import { Table, TableBody, TableCaption, TableCell, TableHead, TableHeader, TableRow } from "./components/ui/table";
function ingress(nodes: AppNode[]) {
- const nm = new Map(nodes.map((n) => [n.id, n]));
- return nodes.filter((n) => n.type === "gateway-https").map((i) => {
- console.log(i.data);
- if (!i.data || !i.data.network || !i.data.subdomain) {
- return null;
- }
- if (!i.data.https || !i.data.https.serviceId || !i.data.https.portId) {
- return null;
- }
- console.log("1231");
- const svc = nm.get(i.data.https.serviceId)! as ServiceNode;
- const port = svc.data.ports.find((p) => p.id === i.data.https!.portId)!;
- console.log({svc, port});
- return {
- id: `${i.id} - ${port.id}`,
- service: svc,
- port: port,
- endpoint: `https://${i.data.subdomain}.${i.data.network}`,
- };
- }).filter((i) => i != null);
+ const nm = new Map(nodes.map((n) => [n.id, n]));
+ return nodes
+ .filter((n) => n.type === "gateway-https")
+ .map((i) => {
+ console.log(i.data);
+ if (!i.data || !i.data.network || !i.data.subdomain) {
+ return null;
+ }
+ if (!i.data.https || !i.data.https.serviceId || !i.data.https.portId) {
+ return null;
+ }
+ console.log("1231");
+ const svc = nm.get(i.data.https.serviceId)! as ServiceNode;
+ const port = svc.data.ports.find((p) => p.id === i.data.https!.portId)!;
+ console.log({ svc, port });
+ return {
+ id: `${i.id} - ${port.id}`,
+ service: svc,
+ port: port,
+ endpoint: `https://${i.data.subdomain}.${i.data.network}`,
+ };
+ })
+ .filter((i) => i != null);
}
export function Deployment() {
- const nodes = useNodes<AppNode>();
- const ing = useMemo(() => ingress(nodes), [nodes]);
- return (
- <>
- <Table>
- <TableCaption>HTTPS Gateways</TableCaption>
- <TableHeader>
- <TableRow>
- <TableHead>Service</TableHead>
- <TableHead>Port</TableHead>
- <TableHead>Endpoint</TableHead>
- </TableRow>
- </TableHeader>
- <TableBody>
- {ing.map((i) => (
- <TableRow>
- <TableCell>{nodeLabel(i.service)}</TableCell>
- <TableCell>{i.port.name}</TableCell>
- <TableCell><a href={i.endpoint} target="_blank">{i.endpoint}</a></TableCell>
- </TableRow>
- ))}
- </TableBody>
- </Table>
- </>
- );
-}
\ No newline at end of file
+ const nodes = useNodes<AppNode>();
+ const ing = useMemo(() => ingress(nodes), [nodes]);
+ return (
+ <>
+ <Table>
+ <TableCaption>HTTPS Gateways</TableCaption>
+ <TableHeader>
+ <TableRow>
+ <TableHead>Service</TableHead>
+ <TableHead>Port</TableHead>
+ <TableHead>Endpoint</TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {ing.map((i) => (
+ <TableRow>
+ <TableCell>{nodeLabel(i.service)}</TableCell>
+ <TableCell>{i.port.name}</TableCell>
+ <TableCell>
+ <a href={i.endpoint} target="_blank">
+ {i.endpoint}
+ </a>
+ </TableCell>
+ </TableRow>
+ ))}
+ </TableBody>
+ </Table>
+ </>
+ );
+}
diff --git a/apps/canvas/front/src/Header.tsx b/apps/canvas/front/src/Header.tsx
index 83c658c..979d85c 100644
--- a/apps/canvas/front/src/Header.tsx
+++ b/apps/canvas/front/src/Header.tsx
@@ -8,104 +8,114 @@
import { useToast } from "@/hooks/use-toast";
export function Header() {
- const { toast } = useToast();
- const store = useStateStore();
- const [projects, setProjects] = useState<Project[]>([]);
- const refreshProjects = useCallback(async () => {
- try {
- const resp = await fetch("/api/project");
- setProjects(await resp.json());
- } catch (e) {
- console.log(e);
- }
- }, [setProjects]);
- useEffect(() => {
- refreshProjects();
- }, [refreshProjects]);
- const project = useProjectId();
- const [createNewOpen, setCreateNewOpen] = useState(false);
- const onSelect = useCallback((projectId: string) => {
- if (projectId === "create-new") {
- setCreateNewOpen(true);
- } else {
- store.setProject(projectId);
- }
- }, [store]);
- const instance = useReactFlow();
- const restoreSaved = useCallback(async (projectId: string) => {
- const resp = await fetch(`/api/project/${projectId}/saved`, {
- method: "GET",
- });
- const inst = await resp.json();
- const { x = 0, y = 0, zoom = 1 } = inst.viewport;
- instance.setNodes(inst.nodes || []);
- instance.setEdges(inst.edges || []);
- instance.setViewport({ x, y, zoom });
- }, [instance]);
- useEffect(() => {
- if (project == null) {
- return;
- }
- restoreSaved(project)
- }, [project, restoreSaved]);
- const [name, setName] = useState<string | undefined>(undefined);
- const updateName = useCallback((e: ChangeEvent<HTMLInputElement>) => {
- setName(e.target.value);
- }, [setName]);
- const createNew = useCallback(() => {
- console.log(name);
- if (!name) {
- return;
- }
- fetch("/api/project", {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- body: JSON.stringify({
- name: name,
- }),
- }).then(async (resp) => {
- if (!resp.ok) {
- return;
- }
- const { id } = await resp.json();
- await refreshProjects();
- store.setProject(id as string);
- setCreateNewOpen(false);
- toast({
- title: `Created project: ${name}`,
- });
- }).catch((e) => {
- console.log(e);
- toast({
- variant: "destructive",
- title: `Failed to create project: ${name}`,
- });
- });
- }, [name, setCreateNewOpen, toast, store, refreshProjects]);
- return (
- <div className="flex flex-row h-9">
- <Select onValueChange={onSelect} value={project}>
- <SelectTrigger>
- <SelectValue placeholder="Choose Project" defaultValue={project} />
- </SelectTrigger>
- <SelectContent>
- {projects.map((p) => (
- <SelectItem value={p.id}>{p.name}</SelectItem>
- ))}
- <SelectItem value={"create-new"}>
- <Dialog open={createNewOpen} onOpenChange={setCreateNewOpen}>
- <DialogTrigger>Create New</DialogTrigger>
- <DialogContent>
- <Input type="text" placeholder="Name" onChange={updateName} />
- <Button onClick={createNew}>Create New</Button>
- </DialogContent>
- </Dialog>
- </SelectItem>
- </SelectContent>
- </Select>
-
- </div>
- );
-}
\ No newline at end of file
+ const { toast } = useToast();
+ const store = useStateStore();
+ const [projects, setProjects] = useState<Project[]>([]);
+ const refreshProjects = useCallback(async () => {
+ try {
+ const resp = await fetch("/api/project");
+ setProjects(await resp.json());
+ } catch (e) {
+ console.log(e);
+ }
+ }, [setProjects]);
+ useEffect(() => {
+ refreshProjects();
+ }, [refreshProjects]);
+ const project = useProjectId();
+ const [createNewOpen, setCreateNewOpen] = useState(false);
+ const onSelect = useCallback(
+ (projectId: string) => {
+ if (projectId === "create-new") {
+ setCreateNewOpen(true);
+ } else {
+ store.setProject(projectId);
+ }
+ },
+ [store],
+ );
+ const instance = useReactFlow();
+ const restoreSaved = useCallback(
+ async (projectId: string) => {
+ const resp = await fetch(`/api/project/${projectId}/saved`, {
+ method: "GET",
+ });
+ const inst = await resp.json();
+ const { x = 0, y = 0, zoom = 1 } = inst.viewport;
+ instance.setNodes(inst.nodes || []);
+ instance.setEdges(inst.edges || []);
+ instance.setViewport({ x, y, zoom });
+ },
+ [instance],
+ );
+ useEffect(() => {
+ if (project == null) {
+ return;
+ }
+ restoreSaved(project);
+ }, [project, restoreSaved]);
+ const [name, setName] = useState<string | undefined>(undefined);
+ const updateName = useCallback(
+ (e: ChangeEvent<HTMLInputElement>) => {
+ setName(e.target.value);
+ },
+ [setName],
+ );
+ const createNew = useCallback(() => {
+ console.log(name);
+ if (!name) {
+ return;
+ }
+ fetch("/api/project", {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({
+ name: name,
+ }),
+ })
+ .then(async (resp) => {
+ if (!resp.ok) {
+ return;
+ }
+ const { id } = await resp.json();
+ await refreshProjects();
+ store.setProject(id as string);
+ setCreateNewOpen(false);
+ toast({
+ title: `Created project: ${name}`,
+ });
+ })
+ .catch((e) => {
+ console.log(e);
+ toast({
+ variant: "destructive",
+ title: `Failed to create project: ${name}`,
+ });
+ });
+ }, [name, setCreateNewOpen, toast, store, refreshProjects]);
+ return (
+ <div className="flex flex-row h-9">
+ <Select onValueChange={onSelect} value={project}>
+ <SelectTrigger>
+ <SelectValue placeholder="Choose Project" defaultValue={project} />
+ </SelectTrigger>
+ <SelectContent>
+ {projects.map((p) => (
+ <SelectItem value={p.id}>{p.name}</SelectItem>
+ ))}
+ <SelectItem value={"create-new"}>
+ <Dialog open={createNewOpen} onOpenChange={setCreateNewOpen}>
+ <DialogTrigger>Create New</DialogTrigger>
+ <DialogContent>
+ <Input type="text" placeholder="Name" onChange={updateName} />
+ <Button onClick={createNew}>Create New</Button>
+ </DialogContent>
+ </Dialog>
+ </SelectItem>
+ </SelectContent>
+ </Select>
+ </div>
+ );
+}
diff --git a/apps/canvas/front/src/Integrations.tsx b/apps/canvas/front/src/Integrations.tsx
index ab3e6c9..931e7b5 100644
--- a/apps/canvas/front/src/Integrations.tsx
+++ b/apps/canvas/front/src/Integrations.tsx
@@ -1,132 +1,132 @@
-import { useProjectId, useGithubService, useStateStore } from '@/lib/state';
-import { Form, FormControl, FormField, FormItem, FormMessage } from './components/ui/form';
-import { Input } from './components/ui/input';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { Button } from './components/ui/button';
-import { useToast } from '@/hooks/use-toast';
-import { Checkbox } from './components/ui/checkbox';
-import { useState, useCallback } from 'react';
+import { useProjectId, useGithubService, useStateStore } from "@/lib/state";
+import { Form, FormControl, FormField, FormItem, FormMessage } from "./components/ui/form";
+import { Input } from "./components/ui/input";
+import { useForm } from "react-hook-form";
+import { z } from "zod";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Button } from "./components/ui/button";
+import { useToast } from "@/hooks/use-toast";
+import { Checkbox } from "./components/ui/checkbox";
+import { useState, useCallback } from "react";
const schema = z.object({
- githubToken: z.string().min(1, "GitHub token is required"),
+ githubToken: z.string().min(1, "GitHub token is required"),
});
export function Integrations() {
- const { toast } = useToast();
- const store = useStateStore();
- const projectId = useProjectId();
- const [isEditing, setIsEditing] = useState(false);
- const githubService = useGithubService();
- const [isSaving, setIsSaving] = useState(false);
+ const { toast } = useToast();
+ const store = useStateStore();
+ const projectId = useProjectId();
+ const [isEditing, setIsEditing] = useState(false);
+ const githubService = useGithubService();
+ const [isSaving, setIsSaving] = useState(false);
- const form = useForm<z.infer<typeof schema>>({
- resolver: zodResolver(schema),
- mode: "onChange",
- });
+ const form = useForm<z.infer<typeof schema>>({
+ resolver: zodResolver(schema),
+ mode: "onChange",
+ });
- const onSubmit = useCallback(async (data: z.infer<typeof schema>) => {
- if (!projectId) return;
+ const onSubmit = useCallback(
+ async (data: z.infer<typeof schema>) => {
+ if (!projectId) return;
- setIsSaving(true);
+ setIsSaving(true);
- try {
- const response = await fetch(`/api/project/${projectId}/github-token`, {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- body: JSON.stringify({ githubToken: data.githubToken }),
- });
+ try {
+ const response = await fetch(`/api/project/${projectId}/github-token`, {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({ githubToken: data.githubToken }),
+ });
- if (!response.ok) {
- throw new Error("Failed to save GitHub token");
- }
+ if (!response.ok) {
+ throw new Error("Failed to save GitHub token");
+ }
- await store.refreshEnv();
- setIsEditing(false);
- form.reset();
- toast({
- title: "GitHub token saved successfully",
- });
- } catch (error) {
- toast({
- variant: "destructive",
- title: "Failed to save GitHub token",
- description: error instanceof Error ? error.message : "Unknown error",
- });
- } finally {
- setIsSaving(false);
- }
- }, [projectId, store, form, toast, setIsEditing, setIsSaving]);
+ await store.refreshEnv();
+ setIsEditing(false);
+ form.reset();
+ toast({
+ title: "GitHub token saved successfully",
+ });
+ } catch (error) {
+ toast({
+ variant: "destructive",
+ title: "Failed to save GitHub token",
+ description: error instanceof Error ? error.message : "Unknown error",
+ });
+ } finally {
+ setIsSaving(false);
+ }
+ },
+ [projectId, store, form, toast, setIsEditing, setIsSaving],
+ );
- const handleCancel = () => {
- setIsEditing(false);
- form.reset();
- };
+ const handleCancel = () => {
+ setIsEditing(false);
+ form.reset();
+ };
- return (
- <div className="px-5 space-y-6">
- <div>
- <h3 className="text-md font-medium mb-2">GitHub</h3>
- <div className="space-y-4">
- <div className="flex items-center space-x-2">
- <Checkbox checked={!!githubService} disabled />
- <label className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70">
- GitHub Access Token
- </label>
- </div>
+ return (
+ <div className="px-5 space-y-6">
+ <div>
+ <h3 className="text-md font-medium mb-2">GitHub</h3>
+ <div className="space-y-4">
+ <div className="flex items-center space-x-2">
+ <Checkbox checked={!!githubService} disabled />
+ <label className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70">
+ GitHub Access Token
+ </label>
+ </div>
- {!!githubService && !isEditing && (
- <Button
- variant="outline"
- onClick={() => setIsEditing(true)}
- >
- Update Access Token
- </Button>
- )}
+ {!!githubService && !isEditing && (
+ <Button variant="outline" onClick={() => setIsEditing(true)}>
+ Update Access Token
+ </Button>
+ )}
- {(!githubService || isEditing) && (
- <Form {...form}>
- <form className="space-y-4" onSubmit={form.handleSubmit(onSubmit)}>
- <FormField
- control={form.control}
- name="githubToken"
- render={({ field }) => (
- <FormItem>
- <FormControl>
- <Input
- type="password"
- placeholder="GitHub Personal Access Token"
- className="border border-black"
- {...field}
- />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- <div className="flex space-x-2">
- <Button type="submit" disabled={isSaving}>
- {isSaving ? "Saving..." : "Save"}
- </Button>
- {!!githubService && (
- <Button
- type="button"
- variant="outline"
- onClick={handleCancel}
- disabled={isSaving}
- >
- Cancel
- </Button>
- )}
- </div>
- </form>
- </Form>
- )}
- </div>
- </div>
- </div>
- );
-}
\ No newline at end of file
+ {(!githubService || isEditing) && (
+ <Form {...form}>
+ <form className="space-y-4" onSubmit={form.handleSubmit(onSubmit)}>
+ <FormField
+ control={form.control}
+ name="githubToken"
+ render={({ field }) => (
+ <FormItem>
+ <FormControl>
+ <Input
+ type="password"
+ placeholder="GitHub Personal Access Token"
+ className="border border-black"
+ {...field}
+ />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <div className="flex space-x-2">
+ <Button type="submit" disabled={isSaving}>
+ {isSaving ? "Saving..." : "Save"}
+ </Button>
+ {!!githubService && (
+ <Button
+ type="button"
+ variant="outline"
+ onClick={handleCancel}
+ disabled={isSaving}
+ >
+ Cancel
+ </Button>
+ )}
+ </div>
+ </form>
+ </Form>
+ )}
+ </div>
+ </div>
+ </div>
+ );
+}
diff --git a/apps/canvas/front/src/Messages.tsx b/apps/canvas/front/src/Messages.tsx
index ecf7777..e756047 100644
--- a/apps/canvas/front/src/Messages.tsx
+++ b/apps/canvas/front/src/Messages.tsx
@@ -6,53 +6,65 @@
import { Badge } from "./components/ui/badge";
export function Messages() {
- const store = useStateStore();
- const nodes = useNodes<AppNode>();
- const [nodeMap, setNodeMap] = useState<Map<string, AppNode>>(new Map());
- useEffect(() => {
- setNodeMap(new Map(nodes.map((n) => [n.id, n])));
- }, [nodes, setNodeMap]);
- const onClick = useCallback((fn?: (state: AppState) => void) => {
- return () => {
- if (fn) {
- fn(store);
- }
- };
- }, [store]);
- const messages = useMessages();
- const [grouped, setGrouped] = useState<Map<string, Message[]>>(new Map());
- useEffect(() => {
- const g = new Map<string, Message[]>();
- messages.forEach((m) => {
- const id = m.nodeId || "global";
- const existing: Message[] = g.get(id) || [];
- existing.push(m);
- g.set(id, existing);
- });
- setGrouped(g);
- }, [messages, setGrouped]);
- const [open, setOpen] = useState<string[]>([...grouped.keys()]);
- useEffect(() => {
- // TODO(gio): do not reopen closed ones
- setOpen([...grouped.keys()]);
- }, [grouped, setOpen]);
- return (
- <Accordion type="multiple" value={open} onValueChange={(v) => setOpen(v)}>
- {[...grouped.entries()].map(([id, messages]) => (
- <AccordionItem key={id} value={id}>
- <AccordionTrigger className="flex flex-row-reverse !space-x-4 !justify-end">
- <Badge>{messages.length}</Badge>
- <div>{id === "global" ? "Global" : nodeLabel(nodeMap.get(id)!)}</div>
- </AccordionTrigger>
- <AccordionContent>
- <div className="flex flex-col space-y-1">
- {messages.map((m) => (
- <Button key={m.id} variant="ghost" style={{ justifyContent: "flex-start" }} onMouseOver={onClick(m.onHighlight)} onMouseLeave={onClick(m.onLooseHighlight)} onClick={onClick(m.onClick)}>{m.message}</Button>
- ))}
- </div>
- </AccordionContent>
- </AccordionItem>
- ))}
- </Accordion>
- )
-}
\ No newline at end of file
+ const store = useStateStore();
+ const nodes = useNodes<AppNode>();
+ const [nodeMap, setNodeMap] = useState<Map<string, AppNode>>(new Map());
+ useEffect(() => {
+ setNodeMap(new Map(nodes.map((n) => [n.id, n])));
+ }, [nodes, setNodeMap]);
+ const onClick = useCallback(
+ (fn?: (state: AppState) => void) => {
+ return () => {
+ if (fn) {
+ fn(store);
+ }
+ };
+ },
+ [store],
+ );
+ const messages = useMessages();
+ const [grouped, setGrouped] = useState<Map<string, Message[]>>(new Map());
+ useEffect(() => {
+ const g = new Map<string, Message[]>();
+ messages.forEach((m) => {
+ const id = m.nodeId || "global";
+ const existing: Message[] = g.get(id) || [];
+ existing.push(m);
+ g.set(id, existing);
+ });
+ setGrouped(g);
+ }, [messages, setGrouped]);
+ const [open, setOpen] = useState<string[]>([...grouped.keys()]);
+ useEffect(() => {
+ // TODO(gio): do not reopen closed ones
+ setOpen([...grouped.keys()]);
+ }, [grouped, setOpen]);
+ return (
+ <Accordion type="multiple" value={open} onValueChange={(v) => setOpen(v)}>
+ {[...grouped.entries()].map(([id, messages]) => (
+ <AccordionItem key={id} value={id}>
+ <AccordionTrigger className="flex flex-row-reverse !space-x-4 !justify-end">
+ <Badge>{messages.length}</Badge>
+ <div>{id === "global" ? "Global" : nodeLabel(nodeMap.get(id)!)}</div>
+ </AccordionTrigger>
+ <AccordionContent>
+ <div className="flex flex-col space-y-1">
+ {messages.map((m) => (
+ <Button
+ key={m.id}
+ variant="ghost"
+ style={{ justifyContent: "flex-start" }}
+ onMouseOver={onClick(m.onHighlight)}
+ onMouseLeave={onClick(m.onLooseHighlight)}
+ onClick={onClick(m.onClick)}
+ >
+ {m.message}
+ </Button>
+ ))}
+ </div>
+ </AccordionContent>
+ </AccordionItem>
+ ))}
+ </Accordion>
+ );
+}
diff --git a/apps/canvas/front/src/Tootls.tsx b/apps/canvas/front/src/Tootls.tsx
index 77b6fdb..2cf5d58 100644
--- a/apps/canvas/front/src/Tootls.tsx
+++ b/apps/canvas/front/src/Tootls.tsx
@@ -5,27 +5,25 @@
import { Messages } from "./Messages";
export function Tools() {
- const messages = useMessages();
- const env = useEnv();
- return (
- <Tabs defaultValue="messages" className="w-[400px] px-5 w-full h-full">
- <TabsList>
- <TabsTrigger value="messages" className="space-x-2">
- <div>Messages</div>
- <Badge>{messages.length}</Badge>
- </TabsTrigger>
- <TabsTrigger value="deployment">Deployment</TabsTrigger>
- <TabsTrigger value="deployKeys">Deploy keys</TabsTrigger>
- </TabsList>
- <TabsContent value="messages">
- <Messages />
- </TabsContent>
- <TabsContent value="deployment">
- <Deployment />
- </TabsContent>
- <TabsContent value="deployKeys">
- {env && (<>{env.deployKey}</>)}
- </TabsContent>
- </Tabs>
- );
-}
\ No newline at end of file
+ const messages = useMessages();
+ const env = useEnv();
+ return (
+ <Tabs defaultValue="messages" className="w-[400px] px-5 w-full h-full">
+ <TabsList>
+ <TabsTrigger value="messages" className="space-x-2">
+ <div>Messages</div>
+ <Badge>{messages.length}</Badge>
+ </TabsTrigger>
+ <TabsTrigger value="deployment">Deployment</TabsTrigger>
+ <TabsTrigger value="deployKeys">Deploy keys</TabsTrigger>
+ </TabsList>
+ <TabsContent value="messages">
+ <Messages />
+ </TabsContent>
+ <TabsContent value="deployment">
+ <Deployment />
+ </TabsContent>
+ <TabsContent value="deployKeys">{env && <>{env.deployKey}</>}</TabsContent>
+ </Tabs>
+ );
+}
diff --git a/apps/canvas/front/src/components/actions.tsx b/apps/canvas/front/src/components/actions.tsx
index 54449c4..eb89b8a 100644
--- a/apps/canvas/front/src/components/actions.tsx
+++ b/apps/canvas/front/src/components/actions.tsx
@@ -6,180 +6,186 @@
import { useToast } from "@/hooks/use-toast";
function toNodeType(t: string): string {
- if (t === "ingress") {
- return "gateway-https";
- } else if (t === "service") {
- return "app";
- } else {
- return t;
- }
+ if (t === "ingress") {
+ return "gateway-https";
+ } else if (t === "service") {
+ return "app";
+ } else {
+ return t;
+ }
}
export function Actions() {
- const { toast } = useToast();
- const store = useStateStore();
- const projectId = useProjectId();
- const nodes = useNodes<AppNode>();
- const env = useEnv();
- const messages = useMessages();
- const instance = useReactFlow();
- const [ok, setOk] = useState(false);
- const [loading, setLoading] = useState(false);
- useEffect(() => {
- setOk(!messages.some((m) => m.type === "FATAL"));
- }, [messages, setOk]);
- const monitor = useCallback(async () => {
- const m = async function () {
- const resp = await fetch(`/api/project/${projectId}/status`, {
- method: "GET",
- headers: {
- "Content-Type": "application/json",
- },
- })
- if (resp.status !== 200) {
- return;
- }
- const data: { type: string, name: string, status: string }[] = await resp.json();
- console.log(data);
- for (const n of nodes) {
- if (n.type === "network") {
- continue;
- }
- const d = data.find((d) => n.type === toNodeType(d.type) && nodeLabel(n) === d.name);
- if (d !== undefined) {
- store.updateNodeData(n.id, {
- state: d?.status,
- });
- }
- }
- if (data.find((d) => d.status !== "success" && d.status != "failure") !== undefined) {
- setTimeout(m, 1000);
- }
- };
- setTimeout(m, 100);
- }, [projectId, nodes, store]);
- const deploy = useCallback(async () => {
- if (projectId == null) {
- return;
- }
- setLoading(true);
- try {
- const config = generateDodoConfig(nodes, env);
- if (config == null) {
- throw new Error("MUST NOT REACH!");
- }
- const resp = await fetch(`/api/project/${projectId}/deploy`, {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- body: JSON.stringify({
- state: JSON.stringify(instance.toObject()),
- config,
- }),
- });
- if (resp.ok) {
- toast({
- title: "Deployment succeeded",
- });
- monitor();
- } else {
- toast({
- variant: "destructive",
- title: "Deployment failed",
- description: await resp.text(),
- });
- }
- } catch (e) {
- console.log(e);
- toast({
- variant: "destructive",
- title: "Deployment failed",
- });
- } finally {
- setLoading(false);
- }
- }, [projectId, instance, nodes, env, setLoading, toast, monitor]);
- const save = useCallback(async () => {
- if (projectId == null) {
- return;
- }
- const resp = await fetch(`/api/project/${projectId}/saved`, {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- body: JSON.stringify(instance.toObject()),
- });
- if (resp.ok) {
- toast({
- title: "Save succeeded",
- });
- } else {
- toast({
- variant: "destructive",
- title: "Save failed",
- description: await resp.text(),
- });
- }
- }, [projectId, instance, toast]);
- const restoreSaved = useCallback(async () => {
- if (projectId == null) {
- return;
- }
- const resp = await fetch(`/api/project/${projectId}/saved`, {
- method: "GET",
- });
- const inst = await resp.json();
- const { x = 0, y = 0, zoom = 1 } = inst.viewport;
- store.setNodes(inst.nodes || []);
- store.setEdges(inst.edges || []);
- instance.setViewport({ x, y, zoom });
- }, [projectId, instance, store]);
- const clear = useCallback(() => {
- store.setEdges([]);
- store.setNodes([]);
- instance.setViewport({ x: 0, y: 0, zoom: 1 });
- }, [store, instance]);
- // TODO(gio): Update store
- const deleteProject = useCallback(async () => {
- if (projectId == null) {
- return;
- }
- const resp = await fetch(`/api/project/${projectId}`, {
- method: "DELETE",
- });
- if (resp.ok) {
- clear();
- store.setProject(undefined);
- toast({
- title: "Save succeeded",
- });
- } else {
- toast({
- variant: "destructive",
- title: "Save failed",
- description: await resp.text(),
- });
- }
- }, [store, clear, projectId, toast]);
- const [props, setProps] = useState({});
- useEffect(() => {
- if (loading) {
- setProps({ loading: true });
- } else if (ok) {
- setProps({ disabled: false });
- } else {
- setProps({ disabled: true });
- }
- }, [ok, loading, setProps]);
- return (
- <>
- <Button onClick={deploy} {...props}>Deploy</Button>
- <Button onClick={save}>Save</Button>
- <Button onClick={restoreSaved}>Restore</Button>
- <Button onClick={clear} variant="destructive">Clear</Button>
- <Button onClick={deleteProject} variant="destructive" disabled={projectId === undefined}>Delete</Button>
- </>
- )
+ const { toast } = useToast();
+ const store = useStateStore();
+ const projectId = useProjectId();
+ const nodes = useNodes<AppNode>();
+ const env = useEnv();
+ const messages = useMessages();
+ const instance = useReactFlow();
+ const [ok, setOk] = useState(false);
+ const [loading, setLoading] = useState(false);
+ useEffect(() => {
+ setOk(!messages.some((m) => m.type === "FATAL"));
+ }, [messages, setOk]);
+ const monitor = useCallback(async () => {
+ const m = async function () {
+ const resp = await fetch(`/api/project/${projectId}/status`, {
+ method: "GET",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ });
+ if (resp.status !== 200) {
+ return;
+ }
+ const data: { type: string; name: string; status: string }[] = await resp.json();
+ console.log(data);
+ for (const n of nodes) {
+ if (n.type === "network") {
+ continue;
+ }
+ const d = data.find((d) => n.type === toNodeType(d.type) && nodeLabel(n) === d.name);
+ if (d !== undefined) {
+ store.updateNodeData(n.id, {
+ state: d?.status,
+ });
+ }
+ }
+ if (data.find((d) => d.status !== "success" && d.status != "failure") !== undefined) {
+ setTimeout(m, 1000);
+ }
+ };
+ setTimeout(m, 100);
+ }, [projectId, nodes, store]);
+ const deploy = useCallback(async () => {
+ if (projectId == null) {
+ return;
+ }
+ setLoading(true);
+ try {
+ const config = generateDodoConfig(nodes, env);
+ if (config == null) {
+ throw new Error("MUST NOT REACH!");
+ }
+ const resp = await fetch(`/api/project/${projectId}/deploy`, {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({
+ state: JSON.stringify(instance.toObject()),
+ config,
+ }),
+ });
+ if (resp.ok) {
+ toast({
+ title: "Deployment succeeded",
+ });
+ monitor();
+ } else {
+ toast({
+ variant: "destructive",
+ title: "Deployment failed",
+ description: await resp.text(),
+ });
+ }
+ } catch (e) {
+ console.log(e);
+ toast({
+ variant: "destructive",
+ title: "Deployment failed",
+ });
+ } finally {
+ setLoading(false);
+ }
+ }, [projectId, instance, nodes, env, setLoading, toast, monitor]);
+ const save = useCallback(async () => {
+ if (projectId == null) {
+ return;
+ }
+ const resp = await fetch(`/api/project/${projectId}/saved`, {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify(instance.toObject()),
+ });
+ if (resp.ok) {
+ toast({
+ title: "Save succeeded",
+ });
+ } else {
+ toast({
+ variant: "destructive",
+ title: "Save failed",
+ description: await resp.text(),
+ });
+ }
+ }, [projectId, instance, toast]);
+ const restoreSaved = useCallback(async () => {
+ if (projectId == null) {
+ return;
+ }
+ const resp = await fetch(`/api/project/${projectId}/saved`, {
+ method: "GET",
+ });
+ const inst = await resp.json();
+ const { x = 0, y = 0, zoom = 1 } = inst.viewport;
+ store.setNodes(inst.nodes || []);
+ store.setEdges(inst.edges || []);
+ instance.setViewport({ x, y, zoom });
+ }, [projectId, instance, store]);
+ const clear = useCallback(() => {
+ store.setEdges([]);
+ store.setNodes([]);
+ instance.setViewport({ x: 0, y: 0, zoom: 1 });
+ }, [store, instance]);
+ // TODO(gio): Update store
+ const deleteProject = useCallback(async () => {
+ if (projectId == null) {
+ return;
+ }
+ const resp = await fetch(`/api/project/${projectId}`, {
+ method: "DELETE",
+ });
+ if (resp.ok) {
+ clear();
+ store.setProject(undefined);
+ toast({
+ title: "Save succeeded",
+ });
+ } else {
+ toast({
+ variant: "destructive",
+ title: "Save failed",
+ description: await resp.text(),
+ });
+ }
+ }, [store, clear, projectId, toast]);
+ const [props, setProps] = useState({});
+ useEffect(() => {
+ if (loading) {
+ setProps({ loading: true });
+ } else if (ok) {
+ setProps({ disabled: false });
+ } else {
+ setProps({ disabled: true });
+ }
+ }, [ok, loading, setProps]);
+ return (
+ <>
+ <Button onClick={deploy} {...props}>
+ Deploy
+ </Button>
+ <Button onClick={save}>Save</Button>
+ <Button onClick={restoreSaved}>Restore</Button>
+ <Button onClick={clear} variant="destructive">
+ Clear
+ </Button>
+ <Button onClick={deleteProject} variant="destructive" disabled={projectId === undefined}>
+ Delete
+ </Button>
+ </>
+ );
}
diff --git a/apps/canvas/front/src/components/canvas.tsx b/apps/canvas/front/src/components/canvas.tsx
index 8898b58..122de3f 100644
--- a/apps/canvas/front/src/components/canvas.tsx
+++ b/apps/canvas/front/src/components/canvas.tsx
@@ -1,123 +1,136 @@
-import '@xyflow/react/dist/style.css';
-import { ReactFlow, Background, Controls, Connection, BackgroundVariant, Edge, useReactFlow, Panel } from '@xyflow/react';
-import { useStateStore, AppState, AppNode, useEnv } from '@/lib/state';
+import "@xyflow/react/dist/style.css";
+import {
+ ReactFlow,
+ Background,
+ Controls,
+ Connection,
+ BackgroundVariant,
+ Edge,
+ useReactFlow,
+ Panel,
+} from "@xyflow/react";
+import { useStateStore, AppState, AppNode, useEnv } from "@/lib/state";
import { useShallow } from "zustand/react/shallow";
-import { useCallback, useEffect, useMemo } from 'react';
+import { useCallback, useEffect, useMemo } from "react";
import { NodeGatewayHttps } from "@/components/node-gateway-https";
-import { NodeApp } from '@/components/node-app';
-import { NodeVolume } from './node-volume';
-import { NodePostgreSQL } from './node-postgresql';
-import { NodeMongoDB } from './node-mongodb';
-import { NodeGithub } from './node-github';
-import { Actions } from './actions';
-import { NodeGatewayTCP } from './node-gateway-tcp';
-import { NodeNetwork } from './node-network';
+import { NodeApp } from "@/components/node-app";
+import { NodeVolume } from "./node-volume";
+import { NodePostgreSQL } from "./node-postgresql";
+import { NodeMongoDB } from "./node-mongodb";
+import { NodeGithub } from "./node-github";
+import { Actions } from "./actions";
+import { NodeGatewayTCP } from "./node-gateway-tcp";
+import { NodeNetwork } from "./node-network";
const selector = (state: AppState) => ({
- nodes: state.nodes,
- edges: state.edges,
- onNodesChange: state.onNodesChange,
- onEdgesChange: state.onEdgesChange,
- onConnect: state.onConnect,
+ nodes: state.nodes,
+ edges: state.edges,
+ onNodesChange: state.onNodesChange,
+ onEdgesChange: state.onEdgesChange,
+ onConnect: state.onConnect,
});
export function Canvas() {
- const { nodes, edges, onNodesChange, onEdgesChange, onConnect } = useStateStore(
- useShallow(selector),
- );
- const store = useStateStore();
- const flow = useReactFlow();
- const nodeTypes = useMemo(() => ({
- "network": NodeNetwork,
- "app": NodeApp,
- "gateway-https": NodeGatewayHttps,
- "gateway-tcp": NodeGatewayTCP,
- "volume": NodeVolume,
- "postgresql": NodePostgreSQL,
- "mongodb": NodeMongoDB,
- "github": NodeGithub,
- }), []);
- const isValidConnection = useCallback((c: Edge | Connection) => {
- if (c.source === c.target) {
- return false;
- }
- const sn = flow.getNode(c.source)! as AppNode;
- const tn = flow.getNode(c.target)! as AppNode;
- if (sn.type === "github") {
- return c.targetHandle === "repository";
- }
- if (sn.type === "app") {
- if (c.sourceHandle === "ports" && (!sn.data.ports || sn.data.ports.length === 0)) {
- return false;
- }
- }
- if (tn.type === "gateway-https") {
- if (c.targetHandle === "https" && tn.data.https !== undefined) {
- return false;
- }
- }
- if (sn.type === "volume") {
- if (c.targetHandle !== "volume") {
- return false;
- }
- return true;
- }
- if (tn.type === "network") {
- if (c.sourceHandle !== "subdomain") {
- return false;
- }
- if (sn.type !== "gateway-https" && sn.type !== "gateway-tcp") {
- return false;
- }
- }
- return true;
- }, [flow]);
- const env = useEnv();
- useEffect(() => {
- const networkNodes: AppNode[] = env.networks.map((n) => ({
- id: n.domain,
- type: "network",
- position: {
- x: 0,
- y: 0,
- },
- isConnectable: true,
- data: {
- domain: n.domain,
- label: n.domain,
- envVars: [],
- ports: [],
- state: "success", // TODO(gio): monitor network health
- },
- }));
- const prevNodes = store.nodes;
- const newNodes = networkNodes.concat(prevNodes.filter((n) => n.type !== "network"));
- // TODO(gio): actually compare
- if (prevNodes.length !== newNodes.length) {
- store.setNodes(newNodes);
- }
- }, [env, store]);
- return (
- <div style={{ width: '100%', height: '100%' }}>
- <ReactFlow
- nodeTypes={nodeTypes}
- nodes={nodes}
- edges={edges}
- onNodesChange={onNodesChange}
- onEdgesChange={onEdgesChange}
- onConnect={onConnect}
- isValidConnection={isValidConnection}
- fitView
- proOptions={{ hideAttribution: true }}
- >
- <Controls />
- <Background variant={BackgroundVariant.Dots} gap={12} size={1} />
- <Panel position="bottom-right">
- <Actions />
- </Panel>
- </ReactFlow>
- </div>
- );
+ const { nodes, edges, onNodesChange, onEdgesChange, onConnect } = useStateStore(useShallow(selector));
+ const store = useStateStore();
+ const flow = useReactFlow();
+ const nodeTypes = useMemo(
+ () => ({
+ network: NodeNetwork,
+ app: NodeApp,
+ "gateway-https": NodeGatewayHttps,
+ "gateway-tcp": NodeGatewayTCP,
+ volume: NodeVolume,
+ postgresql: NodePostgreSQL,
+ mongodb: NodeMongoDB,
+ github: NodeGithub,
+ }),
+ [],
+ );
+ const isValidConnection = useCallback(
+ (c: Edge | Connection) => {
+ if (c.source === c.target) {
+ return false;
+ }
+ const sn = flow.getNode(c.source)! as AppNode;
+ const tn = flow.getNode(c.target)! as AppNode;
+ if (sn.type === "github") {
+ return c.targetHandle === "repository";
+ }
+ if (sn.type === "app") {
+ if (c.sourceHandle === "ports" && (!sn.data.ports || sn.data.ports.length === 0)) {
+ return false;
+ }
+ }
+ if (tn.type === "gateway-https") {
+ if (c.targetHandle === "https" && tn.data.https !== undefined) {
+ return false;
+ }
+ }
+ if (sn.type === "volume") {
+ if (c.targetHandle !== "volume") {
+ return false;
+ }
+ return true;
+ }
+ if (tn.type === "network") {
+ if (c.sourceHandle !== "subdomain") {
+ return false;
+ }
+ if (sn.type !== "gateway-https" && sn.type !== "gateway-tcp") {
+ return false;
+ }
+ }
+ return true;
+ },
+ [flow],
+ );
+ const env = useEnv();
+ useEffect(() => {
+ const networkNodes: AppNode[] = env.networks.map((n) => ({
+ id: n.domain,
+ type: "network",
+ position: {
+ x: 0,
+ y: 0,
+ },
+ isConnectable: true,
+ data: {
+ domain: n.domain,
+ label: n.domain,
+ envVars: [],
+ ports: [],
+ state: "success", // TODO(gio): monitor network health
+ },
+ }));
+ const prevNodes = store.nodes;
+ const newNodes = networkNodes.concat(prevNodes.filter((n) => n.type !== "network"));
+ // TODO(gio): actually compare
+ if (prevNodes.length !== newNodes.length) {
+ store.setNodes(newNodes);
+ }
+ }, [env, store]);
+ return (
+ <div style={{ width: "100%", height: "100%" }}>
+ <ReactFlow
+ nodeTypes={nodeTypes}
+ nodes={nodes}
+ edges={edges}
+ onNodesChange={onNodesChange}
+ onEdgesChange={onEdgesChange}
+ onConnect={onConnect}
+ isValidConnection={isValidConnection}
+ fitView
+ proOptions={{ hideAttribution: true }}
+ >
+ <Controls />
+ <Background variant={BackgroundVariant.Dots} gap={12} size={1} />
+ <Panel position="bottom-right">
+ <Actions />
+ </Panel>
+ </ReactFlow>
+ </div>
+ );
}
export default Canvas;
diff --git a/apps/canvas/front/src/components/details.tsx b/apps/canvas/front/src/components/details.tsx
index d498771..252952d 100644
--- a/apps/canvas/front/src/components/details.tsx
+++ b/apps/canvas/front/src/components/details.tsx
@@ -7,54 +7,54 @@
import { Icon } from "./icon";
function unique<T>(v: T, i: number, a: T[]) {
- return a.indexOf(v) === i;
+ return a.indexOf(v) === i;
}
const nodeTypeIndex = new Map<NodeType, number>([
- ["github", 1],
- // ["gitlab", 2],
- ["volume", 3],
- ["postgresql", 4],
- ["mongodb", 5],
- ["app", 6],
- ["gateway-tcp", 7],
- ["gateway-https", 8],
+ ["github", 1],
+ // ["gitlab", 2],
+ ["volume", 3],
+ ["postgresql", 4],
+ ["mongodb", 5],
+ ["app", 6],
+ ["gateway-tcp", 7],
+ ["gateway-https", 8],
]);
function cmpNodes(x: AppNode, y: AppNode): number {
- if (x.type === y.type) {
- if (nodeLabel(x) < nodeLabel(y)) {
- return -1;
- } else if (nodeLabel(x) > nodeLabel(y)) {
- return 1;
- }
- return 0;
- }
- // TODO(gio): why !
- return (nodeTypeIndex.get(x.type!) || 0) - (nodeTypeIndex.get(y.type!) || 0);
+ if (x.type === y.type) {
+ if (nodeLabel(x) < nodeLabel(y)) {
+ return -1;
+ } else if (nodeLabel(x) > nodeLabel(y)) {
+ return 1;
+ }
+ return 0;
+ }
+ // TODO(gio): why !
+ return (nodeTypeIndex.get(x.type!) || 0) - (nodeTypeIndex.get(y.type!) || 0);
}
export function Details() {
- const nodes = useNodes<AppNode>();
- const sorted = useMemo(() => nodes.filter((n) => n.type !== "network").sort(cmpNodes), [nodes]);
- const [open, setOpen] = useState<string[]>([]);
- const selected = useMemo(() => nodes.filter((n) => n.selected).map((n) => n.id), [nodes]);
- const all = useMemo(() => open.concat(selected).filter(unique), [open, selected]);
- return (
- <Accordion type="multiple" value={all} onValueChange={(v) => setOpen(v)}>
- {sorted.map((n) => (
- <AccordionItem key={n.id} value={n.id} className="px-3">
- <AccordionTrigger>
- <div className="flex flex-row space-x-2">
- {Icon(n.type)}
- <span>{nodeLabel(n)}</span>
- </div>
- </AccordionTrigger>
- <AccordionContent>
- <NodeDetails {...n} />
- </AccordionContent>
- </AccordionItem>
- ))}
- </Accordion>
- );
+ const nodes = useNodes<AppNode>();
+ const sorted = useMemo(() => nodes.filter((n) => n.type !== "network").sort(cmpNodes), [nodes]);
+ const [open, setOpen] = useState<string[]>([]);
+ const selected = useMemo(() => nodes.filter((n) => n.selected).map((n) => n.id), [nodes]);
+ const all = useMemo(() => open.concat(selected).filter(unique), [open, selected]);
+ return (
+ <Accordion type="multiple" value={all} onValueChange={(v) => setOpen(v)}>
+ {sorted.map((n) => (
+ <AccordionItem key={n.id} value={n.id} className="px-3">
+ <AccordionTrigger>
+ <div className="flex flex-row space-x-2">
+ {Icon(n.type)}
+ <span>{nodeLabel(n)}</span>
+ </div>
+ </AccordionTrigger>
+ <AccordionContent>
+ <NodeDetails {...n} />
+ </AccordionContent>
+ </AccordionItem>
+ ))}
+ </Accordion>
+ );
}
diff --git a/apps/canvas/front/src/components/handle-port-out.tsx b/apps/canvas/front/src/components/handle-port-out.tsx
index c8cbd7a..0e7307d 100644
--- a/apps/canvas/front/src/components/handle-port-out.tsx
+++ b/apps/canvas/front/src/components/handle-port-out.tsx
@@ -3,24 +3,17 @@
import { v4 as uuidv4 } from "uuid";
export class PortOut {
- public readonly id: string;
- // private name: string;
- // private value: number;
+ public readonly id: string;
+ // private name: string;
+ // private value: number;
- constructor() {
- this.id = uuidv4();
- // this.name = "";
- // this.value = 0;
- }
+ constructor() {
+ this.id = uuidv4();
+ // this.name = "";
+ // this.value = 0;
+ }
- public handle(): ReactElement {
- return (
- <Handle
- id={this.id}
- type={"source"}
- position={Position.Top}
- />
- )
- }
+ public handle(): ReactElement {
+ return <Handle id={this.id} type={"source"} position={Position.Top} />;
+ }
}
-
diff --git a/apps/canvas/front/src/components/icon.tsx b/apps/canvas/front/src/components/icon.tsx
index c99e4f5..a615d79 100644
--- a/apps/canvas/front/src/components/icon.tsx
+++ b/apps/canvas/front/src/components/icon.tsx
@@ -8,15 +8,24 @@
import { AiOutlineGlobal } from "react-icons/ai";
export function Icon(type: NodeType | undefined): ReactElement {
- switch (type) {
- case "app": return (<GrServices />);
- case "github": return (<SiGithub />);
- case "gateway-https": return (<TbWorldWww />);
- case "gateway-tcp": return (<PiNetwork />);
- case "mongodb": return (<SiMongodb />);
- case "postgresql": return (<SiPostgresql />);
- case "volume": return (<GoFileDirectoryFill />);
- case "network": return (<AiOutlineGlobal />);
- default: throw new Error(`MUST NOT REACH! ${type}`);
- }
-}
\ No newline at end of file
+ switch (type) {
+ case "app":
+ return <GrServices />;
+ case "github":
+ return <SiGithub />;
+ case "gateway-https":
+ return <TbWorldWww />;
+ case "gateway-tcp":
+ return <PiNetwork />;
+ case "mongodb":
+ return <SiMongodb />;
+ case "postgresql":
+ return <SiPostgresql />;
+ case "volume":
+ return <GoFileDirectoryFill />;
+ case "network":
+ return <AiOutlineGlobal />;
+ default:
+ throw new Error(`MUST NOT REACH! ${type}`);
+ }
+}
diff --git a/apps/canvas/front/src/components/node-app.tsx b/apps/canvas/front/src/components/node-app.tsx
index 3027f27..cfbbbde 100644
--- a/apps/canvas/front/src/components/node-app.tsx
+++ b/apps/canvas/front/src/components/node-app.tsx
@@ -1,13 +1,24 @@
import { v4 as uuidv4 } from "uuid";
-import { NodeRect } from './node-rect';
-import { useStateStore, ServiceNode, ServiceTypes, nodeLabel, BoundEnvVar, AppState, nodeIsConnectable, GatewayTCPNode, GatewayHttpsNode, AppNode } from '@/lib/state';
-import { KeyboardEvent, FocusEvent, useCallback, useEffect, useMemo, useState } from 'react';
+import { NodeRect } from "./node-rect";
+import {
+ useStateStore,
+ ServiceNode,
+ ServiceTypes,
+ nodeLabel,
+ BoundEnvVar,
+ AppState,
+ nodeIsConnectable,
+ GatewayTCPNode,
+ GatewayHttpsNode,
+ AppNode,
+} from "@/lib/state";
+import { KeyboardEvent, FocusEvent, useCallback, useEffect, useMemo, useState } from "react";
import { z } from "zod";
-import { DeepPartial, EventType, useForm, ControllerRenderProps, FieldPath } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { Form, FormControl, FormField, FormItem, FormMessage } from './ui/form';
-import { Input } from './ui/input';
-import { Button } from './ui/button';
+import { DeepPartial, EventType, useForm, ControllerRenderProps, FieldPath } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Form, FormControl, FormField, FormItem, FormMessage } from "./ui/form";
+import { Input } from "./ui/input";
+import { Button } from "./ui/button";
import { Handle, Position, useNodes } from "@xyflow/react";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "./ui/select";
import { PencilIcon, XIcon } from "lucide-react";
@@ -15,480 +26,577 @@
import { Textarea } from "./ui/textarea";
export function NodeApp(node: ServiceNode) {
- const { id, selected } = node;
- const isConnectablePorts = useMemo(() => nodeIsConnectable(node, "ports"), [node]);
- const isConnectableRepository = useMemo(() => nodeIsConnectable(node, "repository"), [node]);
- return (
- <NodeRect id={id} selected={selected} type={node.type} state={node.data.state}>
- <div style={{ padding: '10px 20px' }}>
- {nodeLabel(node)}
- <Handle
- id="repository"
- type={"target"}
- position={Position.Left}
- isConnectableStart={isConnectableRepository}
- isConnectableEnd={isConnectableRepository}
- isConnectable={isConnectableRepository}
- />
- <Handle
- id="ports"
- type={"source"}
- position={Position.Top}
- isConnectableStart={isConnectablePorts}
- isConnectableEnd={isConnectablePorts}
- isConnectable={isConnectablePorts}
- />
- <Handle
- id="env_var"
- type={"target"}
- position={Position.Bottom}
- isConnectableStart={true}
- isConnectableEnd={true}
- isConnectable={true}
- />
- </div>
- </NodeRect>
- );
+ const { id, selected } = node;
+ const isConnectablePorts = useMemo(() => nodeIsConnectable(node, "ports"), [node]);
+ const isConnectableRepository = useMemo(() => nodeIsConnectable(node, "repository"), [node]);
+ return (
+ <NodeRect id={id} selected={selected} type={node.type} state={node.data.state}>
+ <div style={{ padding: "10px 20px" }}>
+ {nodeLabel(node)}
+ <Handle
+ id="repository"
+ type={"target"}
+ position={Position.Left}
+ isConnectableStart={isConnectableRepository}
+ isConnectableEnd={isConnectableRepository}
+ isConnectable={isConnectableRepository}
+ />
+ <Handle
+ id="ports"
+ type={"source"}
+ position={Position.Top}
+ isConnectableStart={isConnectablePorts}
+ isConnectableEnd={isConnectablePorts}
+ isConnectable={isConnectablePorts}
+ />
+ <Handle
+ id="env_var"
+ type={"target"}
+ position={Position.Bottom}
+ isConnectableStart={true}
+ isConnectableEnd={true}
+ isConnectable={true}
+ />
+ </div>
+ </NodeRect>
+ );
}
const schema = z.object({
- name: z.string().min(1, "requried"),
- type: z.enum(ServiceTypes),
+ name: z.string().min(1, "requried"),
+ type: z.enum(ServiceTypes),
});
const portSchema = z.object({
- name: z.string().min(1, "required"),
- value: z.coerce.number().gt(0, "can not be negative"),
+ name: z.string().min(1, "required"),
+ value: z.coerce.number().gt(0, "can not be negative"),
});
const sourceSchema = z.object({
- id: z.string().min(1, "required"),
- branch: z.string(),
- rootDir: z.string(),
+ id: z.string().min(1, "required"),
+ branch: z.string(),
+ rootDir: z.string(),
});
export function NodeAppDetails({ id, data }: ServiceNode) {
- const store = useStateStore();
- const nodes = useNodes<AppNode>();
- const form = useForm<z.infer<typeof schema>>({
- resolver: zodResolver(schema),
- mode: "onChange",
- defaultValues: {
- name: data.label,
- type: data.type,
- }
- });
- const portForm = useForm<z.infer<typeof portSchema>>({
- resolver: zodResolver(portSchema),
- mode: "onSubmit",
- defaultValues: {
- name: "",
- value: 0,
- }
- });
- const onSubmit = useCallback((values: z.infer<typeof portSchema>) => {
- const portId = uuidv4();
- store.updateNodeData<"app">(id, {
- ports: (data.ports || []).concat({
- id: portId,
- name: values.name,
- value: values.value,
- }),
- envVars: (data.envVars || []).concat({
- id: uuidv4(),
- source: null,
- portId,
- name: `DODO_PORT_${values.name.toUpperCase()}`,
- }),
- });
- portForm.reset();
- }, [id, data, portForm, store]);
- useEffect(() => {
- const sub = form.watch((value: DeepPartial<z.infer<typeof schema>>, { name, type }: { name?: keyof z.infer<typeof schema> | undefined, type?: EventType | undefined }) => {
- console.log({ name, type });
- if (type !== "change") {
- return;
- }
- switch (name) {
- case "name":
- if (!value.name) {
- break;
- }
- store.updateNodeData<"app">(id, {
- label: value.name,
- });
- break;
- case "type":
- if (!value.type) {
- break;
- }
- store.updateNodeData<"app">(id, {
- type: value.type,
- })
- break;
- }
- });
- return () => sub.unsubscribe();
- }, [id, form, store]);
- const focus = useCallback((field: ControllerRenderProps<z.infer<typeof schema>, FieldPath<z.infer<typeof schema>>>, name: string) => {
- return (e: HTMLElement | null) => {
- field.ref(e);
- if (e != null && name === data.activeField) {
- console.log(e);
- e.focus();
- store.updateNodeData(id, {
- activeField: undefined,
- });
- }
- }
- }, [id, data, store]);
- const [typeProps, setTypeProps] = useState({});
- useEffect(() => {
- if (data.activeField === "type") {
- setTypeProps({
- open: true,
- onOpenChange: () => store.updateNodeData(id, { activeField: undefined }),
- });
- } else {
- setTypeProps({});
- }
- }, [id, data, store, setTypeProps]);
- const editAlias = useCallback((e: BoundEnvVar) => {
- return () => {
- store.updateNodeData(id, {
- ...data,
- envVars: data.envVars!.map((o) => {
- if (o.id !== e.id) {
- return o;
- } else return {
- ...o,
- isEditting: true,
- }
- }),
- });
- };
- }, [id, data, store]);
- const saveAlias = useCallback((e: BoundEnvVar, value: string, store: AppState) => {
- store.updateNodeData(id, {
- ...data,
- envVars: data.envVars!.map((o) => {
- if (o.id !== e.id) {
- return o;
- }
- if (value) {
- return {
- ...o,
- isEditting: false,
- alias: value.toUpperCase(),
- }
- }
- console.log(o);
- if ("alias" in o) {
- const { alias: _, ...rest } = o;
- console.log(rest);
- return {
- ...rest,
- isEditting: false,
- };
- }
- return {
- ...o,
- isEditting: false,
- };
- }),
- });
- }, [id, data]);
- const saveAliasOnEnter = useCallback((e: BoundEnvVar) => {
- return (event: KeyboardEvent<HTMLInputElement>) => {
- if (event.key === "Enter") {
- event.preventDefault();
- saveAlias(e, event.currentTarget.value, store);
- }
- }
- }, [store, saveAlias]);
- const saveAliasOnBlur = useCallback((e: BoundEnvVar) => {
- return (event: FocusEvent<HTMLInputElement>) => {
- saveAlias(e, event.currentTarget.value, store);
- }
- }, [store, saveAlias]);
- const removePort = useCallback((portId: string) => {
- // TODO(gio): this is ugly
- const tcpRemoved = new Set<string>();
- console.log(store.edges);
- store.setEdges(store.edges.filter((e) => {
- if (e.source !== id || e.sourceHandle !== "ports") {
- return true;
- }
- const tn = store.nodes.find((n) => n.id == e.target)!;
- if (e.targetHandle === "https") {
- const t = tn as GatewayHttpsNode;
- if (t.data.https?.serviceId === id && t.data.https.portId === portId) {
- return false;
- }
- }
- if (e.targetHandle === "tcp") {
- const t = tn as GatewayTCPNode;
- if (tcpRemoved.has(t.id)) {
- return true;
- }
- if (t.data.exposed.find((e) => e.serviceId === id && e.portId === portId)) {
- tcpRemoved.add(t.id);
- return false;
- }
- }
- if (e.targetHandle === "env_var") {
- if (tn && (tn.data.envVars || []).find((ev) => ev.source === id && "portId" in ev && ev.portId === portId)) {
- return false;
- }
- }
- return true;
- }));
- store.nodes.filter((n) => n.type === "gateway-https" && n.data.https && n.data.https.serviceId === id && n.data.https.portId === portId).forEach((n) => {
- store.updateNodeData<"gateway-https">(n.id, {
- https: undefined,
- });
- });
- store.nodes.filter((n) => n.type === "gateway-tcp").forEach((n) => {
- const filtered = n.data.exposed.filter((e) => {
- if (e.serviceId === id && e.portId === portId) {
- return false;
- } else {
- return true;
- }
- })
- if (filtered.length != n.data.exposed.length) {
- store.updateNodeData<"gateway-tcp">(n.id, {
- exposed: filtered,
- });
- }
- });
- store.nodes.filter((n) => n.type === "app" && n.data.envVars).forEach((n) => {
- store.updateNodeData<"app">(n.id, {
- envVars: n.data.envVars.filter((ev) => {
- if (ev.source === id && "portId" in ev && ev.portId === portId) {
- return false;
- }
- return true;
- })
- });
- });
- store.updateNodeData<"app">(id, {
- ports: (data.ports || []).filter((p) => p.id !== portId),
- envVars: (data.envVars || []).filter((ev) => !(ev.source === null && "portId" in ev && ev.portId === portId)),
- });
- }, [id, data, store]);
- const setPreBuildCommands = useCallback((e: React.ChangeEvent<HTMLTextAreaElement>) => {
- store.updateNodeData<"app">(id, {
- preBuildCommands: e.currentTarget.value,
- });
- }, [id, store]);
+ const store = useStateStore();
+ const nodes = useNodes<AppNode>();
+ const form = useForm<z.infer<typeof schema>>({
+ resolver: zodResolver(schema),
+ mode: "onChange",
+ defaultValues: {
+ name: data.label,
+ type: data.type,
+ },
+ });
+ const portForm = useForm<z.infer<typeof portSchema>>({
+ resolver: zodResolver(portSchema),
+ mode: "onSubmit",
+ defaultValues: {
+ name: "",
+ value: 0,
+ },
+ });
+ const onSubmit = useCallback(
+ (values: z.infer<typeof portSchema>) => {
+ const portId = uuidv4();
+ store.updateNodeData<"app">(id, {
+ ports: (data.ports || []).concat({
+ id: portId,
+ name: values.name,
+ value: values.value,
+ }),
+ envVars: (data.envVars || []).concat({
+ id: uuidv4(),
+ source: null,
+ portId,
+ name: `DODO_PORT_${values.name.toUpperCase()}`,
+ }),
+ });
+ portForm.reset();
+ },
+ [id, data, portForm, store],
+ );
+ useEffect(() => {
+ const sub = form.watch(
+ (
+ value: DeepPartial<z.infer<typeof schema>>,
+ { name, type }: { name?: keyof z.infer<typeof schema> | undefined; type?: EventType | undefined },
+ ) => {
+ console.log({ name, type });
+ if (type !== "change") {
+ return;
+ }
+ switch (name) {
+ case "name":
+ if (!value.name) {
+ break;
+ }
+ store.updateNodeData<"app">(id, {
+ label: value.name,
+ });
+ break;
+ case "type":
+ if (!value.type) {
+ break;
+ }
+ store.updateNodeData<"app">(id, {
+ type: value.type,
+ });
+ break;
+ }
+ },
+ );
+ return () => sub.unsubscribe();
+ }, [id, form, store]);
+ const focus = useCallback(
+ (field: ControllerRenderProps<z.infer<typeof schema>, FieldPath<z.infer<typeof schema>>>, name: string) => {
+ return (e: HTMLElement | null) => {
+ field.ref(e);
+ if (e != null && name === data.activeField) {
+ console.log(e);
+ e.focus();
+ store.updateNodeData(id, {
+ activeField: undefined,
+ });
+ }
+ };
+ },
+ [id, data, store],
+ );
+ const [typeProps, setTypeProps] = useState({});
+ useEffect(() => {
+ if (data.activeField === "type") {
+ setTypeProps({
+ open: true,
+ onOpenChange: () => store.updateNodeData(id, { activeField: undefined }),
+ });
+ } else {
+ setTypeProps({});
+ }
+ }, [id, data, store, setTypeProps]);
+ const editAlias = useCallback(
+ (e: BoundEnvVar) => {
+ return () => {
+ store.updateNodeData(id, {
+ ...data,
+ envVars: data.envVars!.map((o) => {
+ if (o.id !== e.id) {
+ return o;
+ } else
+ return {
+ ...o,
+ isEditting: true,
+ };
+ }),
+ });
+ };
+ },
+ [id, data, store],
+ );
+ const saveAlias = useCallback(
+ (e: BoundEnvVar, value: string, store: AppState) => {
+ store.updateNodeData(id, {
+ ...data,
+ envVars: data.envVars!.map((o) => {
+ if (o.id !== e.id) {
+ return o;
+ }
+ if (value) {
+ return {
+ ...o,
+ isEditting: false,
+ alias: value.toUpperCase(),
+ };
+ }
+ console.log(o);
+ if ("alias" in o) {
+ const { alias: _, ...rest } = o;
+ console.log(rest);
+ return {
+ ...rest,
+ isEditting: false,
+ };
+ }
+ return {
+ ...o,
+ isEditting: false,
+ };
+ }),
+ });
+ },
+ [id, data],
+ );
+ const saveAliasOnEnter = useCallback(
+ (e: BoundEnvVar) => {
+ return (event: KeyboardEvent<HTMLInputElement>) => {
+ if (event.key === "Enter") {
+ event.preventDefault();
+ saveAlias(e, event.currentTarget.value, store);
+ }
+ };
+ },
+ [store, saveAlias],
+ );
+ const saveAliasOnBlur = useCallback(
+ (e: BoundEnvVar) => {
+ return (event: FocusEvent<HTMLInputElement>) => {
+ saveAlias(e, event.currentTarget.value, store);
+ };
+ },
+ [store, saveAlias],
+ );
+ const removePort = useCallback(
+ (portId: string) => {
+ // TODO(gio): this is ugly
+ const tcpRemoved = new Set<string>();
+ console.log(store.edges);
+ store.setEdges(
+ store.edges.filter((e) => {
+ if (e.source !== id || e.sourceHandle !== "ports") {
+ return true;
+ }
+ const tn = store.nodes.find((n) => n.id == e.target)!;
+ if (e.targetHandle === "https") {
+ const t = tn as GatewayHttpsNode;
+ if (t.data.https?.serviceId === id && t.data.https.portId === portId) {
+ return false;
+ }
+ }
+ if (e.targetHandle === "tcp") {
+ const t = tn as GatewayTCPNode;
+ if (tcpRemoved.has(t.id)) {
+ return true;
+ }
+ if (t.data.exposed.find((e) => e.serviceId === id && e.portId === portId)) {
+ tcpRemoved.add(t.id);
+ return false;
+ }
+ }
+ if (e.targetHandle === "env_var") {
+ if (
+ tn &&
+ (tn.data.envVars || []).find(
+ (ev) => ev.source === id && "portId" in ev && ev.portId === portId,
+ )
+ ) {
+ return false;
+ }
+ }
+ return true;
+ }),
+ );
+ store.nodes
+ .filter(
+ (n) =>
+ n.type === "gateway-https" &&
+ n.data.https &&
+ n.data.https.serviceId === id &&
+ n.data.https.portId === portId,
+ )
+ .forEach((n) => {
+ store.updateNodeData<"gateway-https">(n.id, {
+ https: undefined,
+ });
+ });
+ store.nodes
+ .filter((n) => n.type === "gateway-tcp")
+ .forEach((n) => {
+ const filtered = n.data.exposed.filter((e) => {
+ if (e.serviceId === id && e.portId === portId) {
+ return false;
+ } else {
+ return true;
+ }
+ });
+ if (filtered.length != n.data.exposed.length) {
+ store.updateNodeData<"gateway-tcp">(n.id, {
+ exposed: filtered,
+ });
+ }
+ });
+ store.nodes
+ .filter((n) => n.type === "app" && n.data.envVars)
+ .forEach((n) => {
+ store.updateNodeData<"app">(n.id, {
+ envVars: n.data.envVars.filter((ev) => {
+ if (ev.source === id && "portId" in ev && ev.portId === portId) {
+ return false;
+ }
+ return true;
+ }),
+ });
+ });
+ store.updateNodeData<"app">(id, {
+ ports: (data.ports || []).filter((p) => p.id !== portId),
+ envVars: (data.envVars || []).filter(
+ (ev) => !(ev.source === null && "portId" in ev && ev.portId === portId),
+ ),
+ });
+ },
+ [id, data, store],
+ );
+ const setPreBuildCommands = useCallback(
+ (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+ store.updateNodeData<"app">(id, {
+ preBuildCommands: e.currentTarget.value,
+ });
+ },
+ [id, store],
+ );
- const sourceForm = useForm<z.infer<typeof sourceSchema>>({
- resolver: zodResolver(sourceSchema),
- mode: "onChange",
- defaultValues: {
- id: data?.repository?.id,
- branch: data.repository && "branch" in data.repository ? data.repository.branch : undefined,
- rootDir: data.repository && "rootDir" in data.repository ? data.repository.rootDir : undefined,
- },
- });
- useEffect(() => {
- const sub = sourceForm.watch((value: DeepPartial<z.infer<typeof sourceSchema>>, { name }: { name?: keyof z.infer<typeof sourceSchema> | undefined, type?: EventType | undefined }) => {
- console.log(value);
- if (name === "id") {
- let edges = store.edges;
- if (data?.repository?.id !== undefined) {
- edges = edges.filter((e) => {
- if (e.target === id && e.targetHandle === "repository" && e.source === data.repository.id) {
- return false;
- } else {
- return true;
- }
- });
- }
- if (value.id !== undefined) {
- edges = edges.concat({
- id: uuidv4(),
- source: value.id,
- sourceHandle: "repository",
- target: id,
- targetHandle: "repository",
- });
- }
- store.setEdges(edges);
- store.updateNodeData<"app">(id, {
- repository: {
- id: value.id,
- },
- });
- } else if (name === "branch") {
- store.updateNodeData<"app">(id, {
- repository: {
- ...data?.repository,
- branch: value.branch,
- },
- });
- } else if (name === "rootDir") {
- store.updateNodeData<"app">(id, {
- repository: {
- ...data?.repository,
- rootDir: value.rootDir,
- },
- });
- }
- });
- return () => sub.unsubscribe();
- }, [id, data, sourceForm, store]);
+ const sourceForm = useForm<z.infer<typeof sourceSchema>>({
+ resolver: zodResolver(sourceSchema),
+ mode: "onChange",
+ defaultValues: {
+ id: data?.repository?.id,
+ branch: data.repository && "branch" in data.repository ? data.repository.branch : undefined,
+ rootDir: data.repository && "rootDir" in data.repository ? data.repository.rootDir : undefined,
+ },
+ });
+ useEffect(() => {
+ const sub = sourceForm.watch(
+ (
+ value: DeepPartial<z.infer<typeof sourceSchema>>,
+ { name }: { name?: keyof z.infer<typeof sourceSchema> | undefined; type?: EventType | undefined },
+ ) => {
+ console.log(value);
+ if (name === "id") {
+ let edges = store.edges;
+ if (data?.repository?.id !== undefined) {
+ edges = edges.filter((e) => {
+ if (e.target === id && e.targetHandle === "repository" && e.source === data.repository.id) {
+ return false;
+ } else {
+ return true;
+ }
+ });
+ }
+ if (value.id !== undefined) {
+ edges = edges.concat({
+ id: uuidv4(),
+ source: value.id,
+ sourceHandle: "repository",
+ target: id,
+ targetHandle: "repository",
+ });
+ }
+ store.setEdges(edges);
+ store.updateNodeData<"app">(id, {
+ repository: {
+ id: value.id,
+ },
+ });
+ } else if (name === "branch") {
+ store.updateNodeData<"app">(id, {
+ repository: {
+ ...data?.repository,
+ branch: value.branch,
+ },
+ });
+ } else if (name === "rootDir") {
+ store.updateNodeData<"app">(id, {
+ repository: {
+ ...data?.repository,
+ rootDir: value.rootDir,
+ },
+ });
+ }
+ },
+ );
+ return () => sub.unsubscribe();
+ }, [id, data, sourceForm, store]);
- return (
- <>
- <Form {...form}>
- <form>
- <FormField
- control={form.control}
- name="name"
- render={({ field }) => (
- <FormItem>
- <FormControl>
- <Input placeholder="name" className="border border-black" {...field} ref={focus(field, "name")} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- <FormField
- control={form.control}
- name="type"
- render={({ field }) => (
- <FormItem>
- <Select onValueChange={field.onChange} defaultValue={field.value} {...typeProps}>
- <FormControl>
- <SelectTrigger>
- <SelectValue placeholder="Runtime" />
- </SelectTrigger>
- </FormControl>
- <SelectContent>
- {ServiceTypes.map((t) => (
- <SelectItem key={t} value={t}>{t}</SelectItem>
- ))}
- </SelectContent>
- </Select>
- <FormMessage />
- </FormItem>
- )}
- />
- </form>
- </Form>
- Source
- <Form {...sourceForm}>
- <form className="space-y-2">
- <FormField
- control={sourceForm.control}
- name="id"
- render={({ field }) => (
- <FormItem>
- <Select onValueChange={field.onChange} defaultValue={field.value}>
- <FormControl>
- <SelectTrigger>
- <SelectValue placeholder="Repository" />
- </SelectTrigger>
- </FormControl>
- <SelectContent>
- {(nodes.filter((n) => n.type === "github" && n.data.repository?.id !== undefined) as GithubNode[]).map((n) => (
- <SelectItem key={n.id} value={n.id}>{`${n.data.repository?.sshURL}`}</SelectItem>
- ))}
- </SelectContent>
- </Select>
- <FormMessage />
- </FormItem>
- )}
- />
- <FormField
- control={sourceForm.control}
- name="branch"
- render={({ field }) => (
- <FormItem>
- <FormControl>
- <Input placeholder="master" className="border border-black" {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- <FormField
- control={sourceForm.control}
- name="rootDir"
- render={({ field }) => (
- <FormItem>
- <FormControl>
- <Input placeholder="/" className="border border-black" {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- </form>
- </Form>
- Ports
- <ul>
- {data && data.ports && data.ports.map((p) => (<li key={p.id}><Button size={"icon"} variant={"ghost"} onClick={() => removePort(p.id)}><XIcon /></Button> {p.name} - {p.value}</li>))}
- </ul>
- <Form {...portForm}>
- <form className="flex flex-row space-x-1" onSubmit={portForm.handleSubmit(onSubmit)}>
- <FormField
- control={portForm.control}
- name="name"
- render={({ field }) => (
- <FormItem>
- <FormControl>
- <Input placeholder="name" className="border border-black" {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- <FormField
- control={portForm.control}
- name="value"
- render={({ field }) => (
- <FormItem>
- <FormControl>
- <Input placeholder="value" className="border border-black" {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- <Button type="submit">Add Port</Button>
- </form>
- </Form>
- Env Vars
- <ul>
- {data && data.envVars && data.envVars.map((v) => {
- if ("name" in v) {
- const value = "alias" in v ? v.alias : v.name;
- if (v.isEditting) {
- return (<li key={v.id}><Input type="text" className="border border-black" defaultValue={value} onKeyUp={saveAliasOnEnter(v)} onBlur={saveAliasOnBlur(v)} autoFocus={true} /></li>);
- }
- return (
- <li key={v.id} onClick={editAlias(v)}>
- <TooltipProvider>
- <Tooltip>
- <TooltipTrigger>
- <Button size={"icon"} variant={"ghost"}><PencilIcon /></Button>
- {value}
- </TooltipTrigger>
- <TooltipContent>
- {v.name}
- </TooltipContent>
- </Tooltip>
- </TooltipProvider>
- </li>
- );
- }
- })}
- </ul>
- Pre-Build Commands
- <Textarea placeholder="new line separated list of commands to run before running the service" value={data.preBuildCommands} onChange={setPreBuildCommands} />
- </>);
-}
\ No newline at end of file
+ return (
+ <>
+ <Form {...form}>
+ <form>
+ <FormField
+ control={form.control}
+ name="name"
+ render={({ field }) => (
+ <FormItem>
+ <FormControl>
+ <Input
+ placeholder="name"
+ className="border border-black"
+ {...field}
+ ref={focus(field, "name")}
+ />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={form.control}
+ name="type"
+ render={({ field }) => (
+ <FormItem>
+ <Select onValueChange={field.onChange} defaultValue={field.value} {...typeProps}>
+ <FormControl>
+ <SelectTrigger>
+ <SelectValue placeholder="Runtime" />
+ </SelectTrigger>
+ </FormControl>
+ <SelectContent>
+ {ServiceTypes.map((t) => (
+ <SelectItem key={t} value={t}>
+ {t}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </form>
+ </Form>
+ Source
+ <Form {...sourceForm}>
+ <form className="space-y-2">
+ <FormField
+ control={sourceForm.control}
+ name="id"
+ render={({ field }) => (
+ <FormItem>
+ <Select onValueChange={field.onChange} defaultValue={field.value}>
+ <FormControl>
+ <SelectTrigger>
+ <SelectValue placeholder="Repository" />
+ </SelectTrigger>
+ </FormControl>
+ <SelectContent>
+ {(
+ nodes.filter(
+ (n) => n.type === "github" && n.data.repository?.id !== undefined,
+ ) as GithubNode[]
+ ).map((n) => (
+ <SelectItem
+ key={n.id}
+ value={n.id}
+ >{`${n.data.repository?.sshURL}`}</SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={sourceForm.control}
+ name="branch"
+ render={({ field }) => (
+ <FormItem>
+ <FormControl>
+ <Input placeholder="master" className="border border-black" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={sourceForm.control}
+ name="rootDir"
+ render={({ field }) => (
+ <FormItem>
+ <FormControl>
+ <Input placeholder="/" className="border border-black" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </form>
+ </Form>
+ Ports
+ <ul>
+ {data &&
+ data.ports &&
+ data.ports.map((p) => (
+ <li key={p.id}>
+ <Button size={"icon"} variant={"ghost"} onClick={() => removePort(p.id)}>
+ <XIcon />
+ </Button>{" "}
+ {p.name} - {p.value}
+ </li>
+ ))}
+ </ul>
+ <Form {...portForm}>
+ <form className="flex flex-row space-x-1" onSubmit={portForm.handleSubmit(onSubmit)}>
+ <FormField
+ control={portForm.control}
+ name="name"
+ render={({ field }) => (
+ <FormItem>
+ <FormControl>
+ <Input placeholder="name" className="border border-black" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={portForm.control}
+ name="value"
+ render={({ field }) => (
+ <FormItem>
+ <FormControl>
+ <Input placeholder="value" className="border border-black" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <Button type="submit">Add Port</Button>
+ </form>
+ </Form>
+ Env Vars
+ <ul>
+ {data &&
+ data.envVars &&
+ data.envVars.map((v) => {
+ if ("name" in v) {
+ const value = "alias" in v ? v.alias : v.name;
+ if (v.isEditting) {
+ return (
+ <li key={v.id}>
+ <Input
+ type="text"
+ className="border border-black"
+ defaultValue={value}
+ onKeyUp={saveAliasOnEnter(v)}
+ onBlur={saveAliasOnBlur(v)}
+ autoFocus={true}
+ />
+ </li>
+ );
+ }
+ return (
+ <li key={v.id} onClick={editAlias(v)}>
+ <TooltipProvider>
+ <Tooltip>
+ <TooltipTrigger>
+ <Button size={"icon"} variant={"ghost"}>
+ <PencilIcon />
+ </Button>
+ {value}
+ </TooltipTrigger>
+ <TooltipContent>{v.name}</TooltipContent>
+ </Tooltip>
+ </TooltipProvider>
+ </li>
+ );
+ }
+ })}
+ </ul>
+ Pre-Build Commands
+ <Textarea
+ placeholder="new line separated list of commands to run before running the service"
+ value={data.preBuildCommands}
+ onChange={setPreBuildCommands}
+ />
+ </>
+ );
+}
diff --git a/apps/canvas/front/src/components/node-details.tsx b/apps/canvas/front/src/components/node-details.tsx
index ba629c5..2cbc317 100644
--- a/apps/canvas/front/src/components/node-details.tsx
+++ b/apps/canvas/front/src/components/node-details.tsx
@@ -7,15 +7,23 @@
import { NodeGithubDetails } from "./node-github";
import { NodeGatewayTCPDetails } from "./node-gateway-tcp";
-export function NodeDetails(props : AppNode) {
- switch (props.type) {
- case "app": return (<NodeAppDetails {...props} />);
- case "gateway-https": return (<NodeGatewayHttpsDetails {...props} />);
- case "gateway-tcp": return (<NodeGatewayTCPDetails {...props} />);
- case "volume": return (<NodeVolumeDetails {...props} />);
- case "postgresql": return (<NodePostgreSQLDetails {...props} />);
- case "mongodb": return (<NodeMongoDBDetails {...props} />);
- case "github": return (<NodeGithubDetails {...props} />)
- default: return (<>nooo</>);
- }
-}
\ No newline at end of file
+export function NodeDetails(props: AppNode) {
+ switch (props.type) {
+ case "app":
+ return <NodeAppDetails {...props} />;
+ case "gateway-https":
+ return <NodeGatewayHttpsDetails {...props} />;
+ case "gateway-tcp":
+ return <NodeGatewayTCPDetails {...props} />;
+ case "volume":
+ return <NodeVolumeDetails {...props} />;
+ case "postgresql":
+ return <NodePostgreSQLDetails {...props} />;
+ case "mongodb":
+ return <NodeMongoDBDetails {...props} />;
+ case "github":
+ return <NodeGithubDetails {...props} />;
+ default:
+ return <>nooo</>;
+ }
+}
diff --git a/apps/canvas/front/src/components/node-gateway-https.tsx b/apps/canvas/front/src/components/node-gateway-https.tsx
index 6effb26..e3f2c42 100644
--- a/apps/canvas/front/src/components/node-gateway-https.tsx
+++ b/apps/canvas/front/src/components/node-gateway-https.tsx
@@ -1,399 +1,468 @@
import { v4 as uuidv4 } from "uuid";
-import { useStateStore, AppNode, GatewayHttpsNode, ServiceNode, nodeLabel, useEnv, nodeIsConnectable } from '@/lib/state';
-import { Handle, Position, useNodes } from '@xyflow/react';
-import { NodeRect } from './node-rect';
-import { useCallback, useEffect, useMemo } from 'react';
+import {
+ useStateStore,
+ AppNode,
+ GatewayHttpsNode,
+ ServiceNode,
+ nodeLabel,
+ useEnv,
+ nodeIsConnectable,
+} from "@/lib/state";
+import { Handle, Position, useNodes } from "@xyflow/react";
+import { NodeRect } from "./node-rect";
+import { useCallback, useEffect, useMemo } from "react";
import { z } from "zod";
import { zodResolver } from "@hookform/resolvers/zod";
-import { useForm, EventType, DeepPartial } from 'react-hook-form';
-import { Form, FormControl, FormField, FormItem, FormMessage } from './ui/form';
-import { Input } from './ui/input';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from './ui/select';
+import { useForm, EventType, DeepPartial } from "react-hook-form";
+import { Form, FormControl, FormField, FormItem, FormMessage } from "./ui/form";
+import { Input } from "./ui/input";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "./ui/select";
import { Checkbox } from "./ui/checkbox";
import { Label } from "./ui/label";
import { Button } from "./ui/button";
import { XIcon } from "lucide-react";
const schema = z.object({
- network: z.string().min(1, "reqired"),
- subdomain: z.string().min(1, "required"),
+ network: z.string().min(1, "reqired"),
+ subdomain: z.string().min(1, "required"),
});
const connectedToSchema = z.object({
- id: z.string(),
- portId: z.string(),
+ id: z.string(),
+ portId: z.string(),
});
const authEnabledSchema = z.object({
- enabled: z.boolean(),
+ enabled: z.boolean(),
});
const authGroupSchema = z.object({
- group: z.string(),
+ group: z.string(),
});
const authNoAuthPatternSchema = z.object({
- noAuthPathPattern: z.string(),
+ noAuthPathPattern: z.string(),
});
export function NodeGatewayHttps(node: GatewayHttpsNode) {
- const { id, selected } = node;
- const isConnectableNetwork = useMemo(() => nodeIsConnectable(node, "subdomain"), [node]);
- const isConnectable = useMemo(() => nodeIsConnectable(node, "https"), [node]);
- return (
- <NodeRect id={id} selected={selected} type={node.type} state={node.data.state}>
- {nodeLabel(node)}
- <Handle
- type={"source"}
- id="subdomain"
- position={Position.Top}
- isConnectable={isConnectableNetwork}
- isConnectableStart={isConnectableNetwork}
- isConnectableEnd={isConnectableNetwork}
- />
- <Handle
- type={"target"}
- id="https"
- position={Position.Bottom}
- isConnectable={isConnectable}
- isConnectableStart={isConnectable}
- isConnectableEnd={isConnectable}
- />
- </NodeRect>
- );
+ const { id, selected } = node;
+ const isConnectableNetwork = useMemo(() => nodeIsConnectable(node, "subdomain"), [node]);
+ const isConnectable = useMemo(() => nodeIsConnectable(node, "https"), [node]);
+ return (
+ <NodeRect id={id} selected={selected} type={node.type} state={node.data.state}>
+ {nodeLabel(node)}
+ <Handle
+ type={"source"}
+ id="subdomain"
+ position={Position.Top}
+ isConnectable={isConnectableNetwork}
+ isConnectableStart={isConnectableNetwork}
+ isConnectableEnd={isConnectableNetwork}
+ />
+ <Handle
+ type={"target"}
+ id="https"
+ position={Position.Bottom}
+ isConnectable={isConnectable}
+ isConnectableStart={isConnectable}
+ isConnectableEnd={isConnectable}
+ />
+ </NodeRect>
+ );
}
export function NodeGatewayHttpsDetails({ id, data }: GatewayHttpsNode) {
- const store = useStateStore();
- const env = useEnv();
- const form = useForm<z.infer<typeof schema>>({
- resolver: zodResolver(schema),
- mode: "onChange",
- defaultValues: {
- network: data.network,
- subdomain: data.subdomain,
- },
- });
- useEffect(() => {
- const sub = form.watch((value: DeepPartial<z.infer<typeof schema>>, { name }: { name?: keyof z.infer<typeof schema> | undefined, type?: EventType | undefined }) => {
- if (name === "network") {
- let edges = store.edges;
- if (data.network !== undefined) {
- edges = edges.filter((e) => {
- if (e.source === id && e.sourceHandle === "subdomain" && e.target === data.network && e.targetHandle === "subdomain") {
- return false;
- } else {
- return true;
- }
- });
- }
- if (value.network !== undefined) {
- edges = edges.concat({
- id: uuidv4(),
- source: id,
- sourceHandle: "subdomain",
- target: value.network,
- targetHandle: "subdomain",
- });
- }
- store.setEdges(edges);
- store.updateNodeData<"gateway-https">(id, { network: value.network });
- } else if (name === "subdomain") {
- store.updateNodeData<"gateway-https">(id, { subdomain: value.subdomain });
- }
- });
- return () => sub.unsubscribe();
- }, [id, data, form, store]);
- const connectedToForm = useForm<z.infer<typeof connectedToSchema>>({
- resolver: zodResolver(connectedToSchema),
- mode: "onChange",
- defaultValues: {
- id: data.https?.serviceId,
- portId: data.https?.portId,
- },
- });
- useEffect(() => {
- connectedToForm.reset({
- id: data.https?.serviceId,
- portId: data.https?.portId,
- });
- }, [connectedToForm, data]);
- const nodes = useNodes<AppNode>();
- const selected = useMemo(() => {
- if (data !== undefined && data.https !== undefined) {
- const https = data.https;
- return nodes.find((n) => n.id === https.serviceId)! as ServiceNode;
- }
- return null;
- }, [data, nodes]);
- const selectable = useMemo(() => {
- return nodes.filter((n) => {
- if (n.id === id) {
- return false;
- }
- if (selected !== null && selected.id === id) {
- return true;
- }
- if (n.type !== "app") {
- return false;
- }
- return n.data && n.data.ports && n.data.ports.length > 0;
- })
- }, [id, nodes, selected]);
- useEffect(() => {
- const sub = connectedToForm.watch((value: DeepPartial<z.infer<typeof connectedToSchema>>, { name, type }: { name?: keyof z.infer<typeof connectedToSchema> | undefined, type?: EventType | undefined }) => {
- if (type !== "change") {
- return;
- }
- switch (name) {
- case "id": {
- if (!value.id) {
- break;
- }
- const current = store.edges.filter((e) => e.target === id);
- const cid = current[0] ? current[0].id : undefined;
- store.replaceEdge({
- source: value.id,
- sourceHandle: "ports",
- target: id,
- targetHandle: "https",
- }, cid);
- break;
- }
- case "portId":
- store.updateNodeData<"gateway-https">(id, {
- https: {
- serviceId: value.id,
- portId: value.portId,
- }
- });
- break;
- }
- });
- return () => sub.unsubscribe();
- }, [id, connectedToForm, store, selectable]);
- const authEnabledForm = useForm<z.infer<typeof authEnabledSchema>>({
- resolver: zodResolver(authEnabledSchema),
- mode: "onChange",
- defaultValues: {
- enabled: data.auth ? data.auth.enabled : false,
- },
- });
- const authGroupForm = useForm<z.infer<typeof authGroupSchema>>({
- resolver: zodResolver(authGroupSchema),
- mode: "onSubmit",
- defaultValues: {
- group: "",
- },
- }); const authNoAuthPatternFrom = useForm<z.infer<typeof authNoAuthPatternSchema>>({
- resolver: zodResolver(authNoAuthPatternSchema),
- mode: "onChange",
- defaultValues: {
- noAuthPathPattern: "",
- },
- });
- useEffect(() => {
- const sub = authEnabledForm.watch((value, { name }) => {
- if (name === "enabled") {
- store.updateNodeData<"gateway-https">(id, {
- auth: {
- ...data.auth,
- enabled: value.enabled,
- }
- })
- }
- });
- return () => sub.unsubscribe();
- }, [id, data, authEnabledForm, store]);
- const removeGroup = useCallback((group: string) => {
- const groups = data?.auth?.groups || [];
- store.updateNodeData<"gateway-https">(id, {
- auth: {
- ...data.auth,
- groups: groups.filter((g) => g !== group),
- },
- });
- return true;
- }, [id, data, store]);
- const onGroupSubmit = useCallback((values: z.infer<typeof authGroupSchema>) => {
- const groups = data.auth?.groups || [];
- groups.push(values.group)
- store.updateNodeData<"gateway-https">(id, {
- auth: {
- ...data.auth,
- groups,
- },
- });
- authGroupForm.reset();
- }, [id, data, store, authGroupForm]);
- const removeNoAuthPathPattern = useCallback((path: string) => {
- const noAuthPathPatterns = data?.auth?.noAuthPathPatterns || [];
- store.updateNodeData<"gateway-https">(id, {
- auth: {
- ...data.auth,
- noAuthPathPatterns: noAuthPathPatterns.filter((p) => p !== path),
- },
- });
- return true;
- }, [id, data, store]);
- const onNoAuthPathPatternSubmit = useCallback((values: z.infer<typeof authNoAuthPatternSchema>) => {
- const noAuthPathPatterns = data.auth?.noAuthPathPatterns || [];
- noAuthPathPatterns.push(values.noAuthPathPattern)
- store.updateNodeData<"gateway-https">(id, {
- auth: {
- ...data.auth,
- noAuthPathPatterns,
- },
- });
- authNoAuthPatternFrom.reset();
- }, [id, data, store, authNoAuthPatternFrom]);
- return (
- <>
- <Form {...form}>
- <form className="space-y-2">
- <FormField
- control={form.control}
- name="network"
- render={({ field }) => (
- <FormItem>
- <Select onValueChange={field.onChange} defaultValue={field.value}>
- <FormControl>
- <SelectTrigger>
- <SelectValue placeholder="Network" />
- </SelectTrigger>
- </FormControl>
- <SelectContent>
- {env.networks.map((n) => (
- <SelectItem key={n.name} value={n.domain}>{`${n.name} - ${n.domain}`}</SelectItem>
- ))}
- </SelectContent>
- </Select>
- <FormMessage />
- </FormItem>
- )}
- />
- <FormField
- control={form.control}
- name="subdomain"
- render={({ field }) => (
- <FormItem>
- <FormControl>
- <Input placeholder="subdomain" className="border border-black" {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- </form>
- </Form>
- <Form {...connectedToForm}>
- <form className="space-y-2">
- <FormField
- control={connectedToForm.control}
- name="id"
- render={({ field }) => (
- <FormItem>
- <Select onValueChange={field.onChange} defaultValue={field.value}>
- <FormControl>
- <SelectTrigger>
- <SelectValue placeholder="Service" />
- </SelectTrigger>
- </FormControl>
- <SelectContent>
- {selectable.map((n) => (
- <SelectItem key={n.id} value={n.id}>{nodeLabel(n)}</SelectItem>
- ))}
- </SelectContent>
- </Select>
- <FormMessage />
- </FormItem>
- )}
- />
- <FormField
- control={connectedToForm.control}
- name="portId"
- render={({ field }) => (
- <FormItem>
- <Select onValueChange={field.onChange} defaultValue={field.value}>
- <FormControl>
- <SelectTrigger>
- <SelectValue placeholder="Port" />
- </SelectTrigger>
- </FormControl>
- <SelectContent>
- {selected && selected.data.ports.map((p) => (
- <SelectItem key={p.id} value={p.id}>{p.name} - {p.value}</SelectItem>
- ))}
- </SelectContent>
- </Select>
- <FormMessage />
- </FormItem>
- )}
- />
- </form>
- </Form>
- Auth
- <Form {...authEnabledForm}>
- <form className="space-y-2">
- <FormField
- control={authEnabledForm.control}
- name="enabled"
- render={({ field }) => (
- <FormItem>
- <Checkbox id="authEnabled" onCheckedChange={field.onChange} checked={field.value} />
- <Label htmlFor="authEnabled">Enabled</Label>
- <FormMessage />
- </FormItem>
- )}
- />
- </form>
- </Form>
- {data && data.auth && data.auth.enabled ? (
- <>
- Authorized Groups
- <ul>
- {(data.auth.groups || []).map((p) => (<li key={p}><Button size={"icon"} variant={"ghost"} onClick={() => removeGroup(p)}><XIcon /></Button> {p}</li>))}
- </ul>
- <Form {...authGroupForm}>
- <form className="flex flex-row space-x-1" onSubmit={authGroupForm.handleSubmit(onGroupSubmit)}>
- <FormField
- control={authGroupForm.control}
- name="group"
- render={({ field }) => (
- <FormItem>
- <FormControl>
- <Input placeholder="group" className="border border-black" {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- <Button type="submit">Add Group</Button>
- </form>
- </Form>
- Auth optional path patterns
- <ul>
- {(data.auth.noAuthPathPatterns || []).map((p) => (<li key={p}><Button size={"icon"} variant={"ghost"} onClick={() => removeNoAuthPathPattern(p)}><XIcon /></Button> {p}</li>))}
- </ul>
- <Form {...authNoAuthPatternFrom}>
- <form className="flex flex-row space-x-1" onSubmit={authNoAuthPatternFrom.handleSubmit(onNoAuthPathPatternSubmit)}>
- <FormField
- control={authNoAuthPatternFrom.control}
- name="noAuthPathPattern"
- render={({ field }) => (
- <FormItem>
- <FormControl>
- <Input placeholder="group" className="border border-black" {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- <Button type="submit">Add</Button>
- </form>
- </Form>
- </>
- ) : (<></>)}
- </>
- );
-}
\ No newline at end of file
+ const store = useStateStore();
+ const env = useEnv();
+ const form = useForm<z.infer<typeof schema>>({
+ resolver: zodResolver(schema),
+ mode: "onChange",
+ defaultValues: {
+ network: data.network,
+ subdomain: data.subdomain,
+ },
+ });
+ useEffect(() => {
+ const sub = form.watch(
+ (
+ value: DeepPartial<z.infer<typeof schema>>,
+ { name }: { name?: keyof z.infer<typeof schema> | undefined; type?: EventType | undefined },
+ ) => {
+ if (name === "network") {
+ let edges = store.edges;
+ if (data.network !== undefined) {
+ edges = edges.filter((e) => {
+ if (
+ e.source === id &&
+ e.sourceHandle === "subdomain" &&
+ e.target === data.network &&
+ e.targetHandle === "subdomain"
+ ) {
+ return false;
+ } else {
+ return true;
+ }
+ });
+ }
+ if (value.network !== undefined) {
+ edges = edges.concat({
+ id: uuidv4(),
+ source: id,
+ sourceHandle: "subdomain",
+ target: value.network,
+ targetHandle: "subdomain",
+ });
+ }
+ store.setEdges(edges);
+ store.updateNodeData<"gateway-https">(id, { network: value.network });
+ } else if (name === "subdomain") {
+ store.updateNodeData<"gateway-https">(id, { subdomain: value.subdomain });
+ }
+ },
+ );
+ return () => sub.unsubscribe();
+ }, [id, data, form, store]);
+ const connectedToForm = useForm<z.infer<typeof connectedToSchema>>({
+ resolver: zodResolver(connectedToSchema),
+ mode: "onChange",
+ defaultValues: {
+ id: data.https?.serviceId,
+ portId: data.https?.portId,
+ },
+ });
+ useEffect(() => {
+ connectedToForm.reset({
+ id: data.https?.serviceId,
+ portId: data.https?.portId,
+ });
+ }, [connectedToForm, data]);
+ const nodes = useNodes<AppNode>();
+ const selected = useMemo(() => {
+ if (data !== undefined && data.https !== undefined) {
+ const https = data.https;
+ return nodes.find((n) => n.id === https.serviceId)! as ServiceNode;
+ }
+ return null;
+ }, [data, nodes]);
+ const selectable = useMemo(() => {
+ return nodes.filter((n) => {
+ if (n.id === id) {
+ return false;
+ }
+ if (selected !== null && selected.id === id) {
+ return true;
+ }
+ if (n.type !== "app") {
+ return false;
+ }
+ return n.data && n.data.ports && n.data.ports.length > 0;
+ });
+ }, [id, nodes, selected]);
+ useEffect(() => {
+ const sub = connectedToForm.watch(
+ (
+ value: DeepPartial<z.infer<typeof connectedToSchema>>,
+ {
+ name,
+ type,
+ }: { name?: keyof z.infer<typeof connectedToSchema> | undefined; type?: EventType | undefined },
+ ) => {
+ if (type !== "change") {
+ return;
+ }
+ switch (name) {
+ case "id": {
+ if (!value.id) {
+ break;
+ }
+ const current = store.edges.filter((e) => e.target === id);
+ const cid = current[0] ? current[0].id : undefined;
+ store.replaceEdge(
+ {
+ source: value.id,
+ sourceHandle: "ports",
+ target: id,
+ targetHandle: "https",
+ },
+ cid,
+ );
+ break;
+ }
+ case "portId":
+ store.updateNodeData<"gateway-https">(id, {
+ https: {
+ serviceId: value.id,
+ portId: value.portId,
+ },
+ });
+ break;
+ }
+ },
+ );
+ return () => sub.unsubscribe();
+ }, [id, connectedToForm, store, selectable]);
+ const authEnabledForm = useForm<z.infer<typeof authEnabledSchema>>({
+ resolver: zodResolver(authEnabledSchema),
+ mode: "onChange",
+ defaultValues: {
+ enabled: data.auth ? data.auth.enabled : false,
+ },
+ });
+ const authGroupForm = useForm<z.infer<typeof authGroupSchema>>({
+ resolver: zodResolver(authGroupSchema),
+ mode: "onSubmit",
+ defaultValues: {
+ group: "",
+ },
+ });
+ const authNoAuthPatternFrom = useForm<z.infer<typeof authNoAuthPatternSchema>>({
+ resolver: zodResolver(authNoAuthPatternSchema),
+ mode: "onChange",
+ defaultValues: {
+ noAuthPathPattern: "",
+ },
+ });
+ useEffect(() => {
+ const sub = authEnabledForm.watch((value, { name }) => {
+ if (name === "enabled") {
+ store.updateNodeData<"gateway-https">(id, {
+ auth: {
+ ...data.auth,
+ enabled: value.enabled,
+ },
+ });
+ }
+ });
+ return () => sub.unsubscribe();
+ }, [id, data, authEnabledForm, store]);
+ const removeGroup = useCallback(
+ (group: string) => {
+ const groups = data?.auth?.groups || [];
+ store.updateNodeData<"gateway-https">(id, {
+ auth: {
+ ...data.auth,
+ groups: groups.filter((g) => g !== group),
+ },
+ });
+ return true;
+ },
+ [id, data, store],
+ );
+ const onGroupSubmit = useCallback(
+ (values: z.infer<typeof authGroupSchema>) => {
+ const groups = data.auth?.groups || [];
+ groups.push(values.group);
+ store.updateNodeData<"gateway-https">(id, {
+ auth: {
+ ...data.auth,
+ groups,
+ },
+ });
+ authGroupForm.reset();
+ },
+ [id, data, store, authGroupForm],
+ );
+ const removeNoAuthPathPattern = useCallback(
+ (path: string) => {
+ const noAuthPathPatterns = data?.auth?.noAuthPathPatterns || [];
+ store.updateNodeData<"gateway-https">(id, {
+ auth: {
+ ...data.auth,
+ noAuthPathPatterns: noAuthPathPatterns.filter((p) => p !== path),
+ },
+ });
+ return true;
+ },
+ [id, data, store],
+ );
+ const onNoAuthPathPatternSubmit = useCallback(
+ (values: z.infer<typeof authNoAuthPatternSchema>) => {
+ const noAuthPathPatterns = data.auth?.noAuthPathPatterns || [];
+ noAuthPathPatterns.push(values.noAuthPathPattern);
+ store.updateNodeData<"gateway-https">(id, {
+ auth: {
+ ...data.auth,
+ noAuthPathPatterns,
+ },
+ });
+ authNoAuthPatternFrom.reset();
+ },
+ [id, data, store, authNoAuthPatternFrom],
+ );
+ return (
+ <>
+ <Form {...form}>
+ <form className="space-y-2">
+ <FormField
+ control={form.control}
+ name="network"
+ render={({ field }) => (
+ <FormItem>
+ <Select onValueChange={field.onChange} defaultValue={field.value}>
+ <FormControl>
+ <SelectTrigger>
+ <SelectValue placeholder="Network" />
+ </SelectTrigger>
+ </FormControl>
+ <SelectContent>
+ {env.networks.map((n) => (
+ <SelectItem
+ key={n.name}
+ value={n.domain}
+ >{`${n.name} - ${n.domain}`}</SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={form.control}
+ name="subdomain"
+ render={({ field }) => (
+ <FormItem>
+ <FormControl>
+ <Input placeholder="subdomain" className="border border-black" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </form>
+ </Form>
+ <Form {...connectedToForm}>
+ <form className="space-y-2">
+ <FormField
+ control={connectedToForm.control}
+ name="id"
+ render={({ field }) => (
+ <FormItem>
+ <Select onValueChange={field.onChange} defaultValue={field.value}>
+ <FormControl>
+ <SelectTrigger>
+ <SelectValue placeholder="Service" />
+ </SelectTrigger>
+ </FormControl>
+ <SelectContent>
+ {selectable.map((n) => (
+ <SelectItem key={n.id} value={n.id}>
+ {nodeLabel(n)}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={connectedToForm.control}
+ name="portId"
+ render={({ field }) => (
+ <FormItem>
+ <Select onValueChange={field.onChange} defaultValue={field.value}>
+ <FormControl>
+ <SelectTrigger>
+ <SelectValue placeholder="Port" />
+ </SelectTrigger>
+ </FormControl>
+ <SelectContent>
+ {selected &&
+ selected.data.ports.map((p) => (
+ <SelectItem key={p.id} value={p.id}>
+ {p.name} - {p.value}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </form>
+ </Form>
+ Auth
+ <Form {...authEnabledForm}>
+ <form className="space-y-2">
+ <FormField
+ control={authEnabledForm.control}
+ name="enabled"
+ render={({ field }) => (
+ <FormItem>
+ <Checkbox id="authEnabled" onCheckedChange={field.onChange} checked={field.value} />
+ <Label htmlFor="authEnabled">Enabled</Label>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </form>
+ </Form>
+ {data && data.auth && data.auth.enabled ? (
+ <>
+ Authorized Groups
+ <ul>
+ {(data.auth.groups || []).map((p) => (
+ <li key={p}>
+ <Button size={"icon"} variant={"ghost"} onClick={() => removeGroup(p)}>
+ <XIcon />
+ </Button>{" "}
+ {p}
+ </li>
+ ))}
+ </ul>
+ <Form {...authGroupForm}>
+ <form className="flex flex-row space-x-1" onSubmit={authGroupForm.handleSubmit(onGroupSubmit)}>
+ <FormField
+ control={authGroupForm.control}
+ name="group"
+ render={({ field }) => (
+ <FormItem>
+ <FormControl>
+ <Input placeholder="group" className="border border-black" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <Button type="submit">Add Group</Button>
+ </form>
+ </Form>
+ Auth optional path patterns
+ <ul>
+ {(data.auth.noAuthPathPatterns || []).map((p) => (
+ <li key={p}>
+ <Button size={"icon"} variant={"ghost"} onClick={() => removeNoAuthPathPattern(p)}>
+ <XIcon />
+ </Button>{" "}
+ {p}
+ </li>
+ ))}
+ </ul>
+ <Form {...authNoAuthPatternFrom}>
+ <form
+ className="flex flex-row space-x-1"
+ onSubmit={authNoAuthPatternFrom.handleSubmit(onNoAuthPathPatternSubmit)}
+ >
+ <FormField
+ control={authNoAuthPatternFrom.control}
+ name="noAuthPathPattern"
+ render={({ field }) => (
+ <FormItem>
+ <FormControl>
+ <Input placeholder="group" className="border border-black" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <Button type="submit">Add</Button>
+ </form>
+ </Form>
+ </>
+ ) : (
+ <></>
+ )}
+ </>
+ );
+}
diff --git a/apps/canvas/front/src/components/node-gateway-tcp.tsx b/apps/canvas/front/src/components/node-gateway-tcp.tsx
index e16fdd2..ada5ef9 100644
--- a/apps/canvas/front/src/components/node-gateway-tcp.tsx
+++ b/apps/canvas/front/src/components/node-gateway-tcp.tsx
@@ -1,284 +1,328 @@
import { v4 as uuidv4 } from "uuid";
-import { useStateStore, AppNode, nodeLabel, useEnv, GatewayTCPNode, nodeIsConnectable } from '@/lib/state';
-import { Edge, Handle, Position, useNodes } from '@xyflow/react';
-import { NodeRect } from './node-rect';
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useStateStore, AppNode, nodeLabel, useEnv, GatewayTCPNode, nodeIsConnectable } from "@/lib/state";
+import { Edge, Handle, Position, useNodes } from "@xyflow/react";
+import { NodeRect } from "./node-rect";
+import { useCallback, useEffect, useMemo, useState } from "react";
import { z } from "zod";
import { zodResolver } from "@hookform/resolvers/zod";
-import { useForm, EventType, DeepPartial } from 'react-hook-form';
-import { Form, FormControl, FormField, FormItem, FormMessage } from './ui/form';
-import { Input } from './ui/input';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from './ui/select';
+import { useForm, EventType, DeepPartial } from "react-hook-form";
+import { Form, FormControl, FormField, FormItem, FormMessage } from "./ui/form";
+import { Input } from "./ui/input";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "./ui/select";
import { Button } from "./ui/button";
const schema = z.object({
- network: z.string().min(1, "reqired"),
- subdomain: z.string().min(1, "required"),
+ network: z.string().min(1, "reqired"),
+ subdomain: z.string().min(1, "required"),
});
const connectedToSchema = z.object({
- serviceId: z.string(),
- portId: z.string(),
+ serviceId: z.string(),
+ portId: z.string(),
});
export function NodeGatewayTCP(node: GatewayTCPNode) {
- const { id, selected } = node;
- const isConnectableNetwork = useMemo(() => nodeIsConnectable(node, "subdomain"), [node]);
- const isConnectable = useMemo(() => nodeIsConnectable(node, "tcp"), [node]);
- return (
- <NodeRect id={id} selected={selected} type={node.type} state={node.data.state}>
- {nodeLabel(node)}
- <Handle
- type={"source"}
- id="subdomain"
- position={Position.Top}
- isConnectable={isConnectableNetwork}
- isConnectableStart={isConnectableNetwork}
- isConnectableEnd={isConnectableNetwork}
- />
- <Handle
- type={"target"}
- id="tcp"
- position={Position.Bottom}
- isConnectable={isConnectable}
- isConnectableStart={isConnectable}
- isConnectableEnd={isConnectable}
- />
- </NodeRect>
- );
+ const { id, selected } = node;
+ const isConnectableNetwork = useMemo(() => nodeIsConnectable(node, "subdomain"), [node]);
+ const isConnectable = useMemo(() => nodeIsConnectable(node, "tcp"), [node]);
+ return (
+ <NodeRect id={id} selected={selected} type={node.type} state={node.data.state}>
+ {nodeLabel(node)}
+ <Handle
+ type={"source"}
+ id="subdomain"
+ position={Position.Top}
+ isConnectable={isConnectableNetwork}
+ isConnectableStart={isConnectableNetwork}
+ isConnectableEnd={isConnectableNetwork}
+ />
+ <Handle
+ type={"target"}
+ id="tcp"
+ position={Position.Bottom}
+ isConnectable={isConnectable}
+ isConnectableStart={isConnectable}
+ isConnectableEnd={isConnectable}
+ />
+ </NodeRect>
+ );
}
export function NodeGatewayTCPDetails({ id, data }: GatewayTCPNode) {
- const store = useStateStore();
- const env = useEnv();
- const form = useForm<z.infer<typeof schema>>({
- resolver: zodResolver(schema),
- mode: "onChange",
- defaultValues: {
- network: data.network,
- subdomain: data.subdomain,
- },
- });
- useEffect(() => {
- const sub = form.watch((value: DeepPartial<z.infer<typeof schema>>, { name }: { name?: keyof z.infer<typeof schema> | undefined, type?: EventType | undefined }) => {
- if (name === "network") {
- let edges = store.edges;
- if (data.network !== undefined) {
- edges = edges.filter((e) => {
- console.log(e);
- if (e.source === id && e.sourceHandle === "subdomain" && e.target === data.network && e.targetHandle === "subdomain") {
- return false;
- } else {
- return true;
- }
- });
- }
- if (value.network !== undefined) {
- edges = edges.concat({
- id: uuidv4(),
- source: id,
- sourceHandle: "subdomain",
- target: value.network,
- targetHandle: "subdomain",
- });
- }
- store.setEdges(edges);
- store.updateNodeData<"gateway-tcp">(id, { network: value.network });
- } else if (name === "subdomain") {
- store.updateNodeData<"gateway-tcp">(id, { subdomain: value.subdomain });
- }
- });
- return () => sub.unsubscribe();
- }, [id, data, form, store]);
- const connectedToForm = useForm<z.infer<typeof connectedToSchema>>({
- resolver: zodResolver(connectedToSchema),
- mode: "onSubmit",
- defaultValues: {
- serviceId: data.selected?.serviceId,
- portId: data.selected?.portId,
- },
- });
- useEffect(() => {
- connectedToForm.reset({
- serviceId: data.selected?.serviceId,
- portId: data.selected?.portId,
- });
- console.log(connectedToForm.getValues());
- }, [id, connectedToForm, data]);
- const nodes = useNodes<AppNode>();
- const [selected, setSelected] = useState<AppNode | undefined>(undefined);
- useEffect(() => {
- if (data.selected?.serviceId == null) {
- setSelected(undefined);
- } else {
- const serviceId = data.selected.serviceId;
- setSelected(nodes.find((n) => n.id === serviceId));
- }
- }, [id, data, setSelected, nodes]);
- const selectable = useMemo(() => {
- console.log(selected);
- return nodes.filter((n) => {
- if (n.id === id) {
- return false;
- }
- if (selected != null && selected.id === id) {
- return true;
- }
- if ("ports" in n.data && (n.data.ports || []).length > 0) {
- return true;
- }
- return false;
- })
- }, [id, nodes, selected]);
- useEffect(() => {
- const sub = connectedToForm.watch((value: DeepPartial<z.infer<typeof connectedToSchema>>, { name, type }: { name?: keyof z.infer<typeof connectedToSchema> | undefined, type?: EventType | undefined }) => {
- if (type !== "change") {
- return;
- }
- switch (name) {
- case "serviceId":
- if (!value.serviceId) {
- break;
- }
- store.updateNodeData<"gateway-tcp">(id, {
- selected: {
- serviceId: value.serviceId,
- },
- });
- break;
- case "portId":
- if (!value.portId) {
- break;
- }
- store.updateNodeData<"gateway-tcp">(id, {
- selected: {
- serviceId: value.serviceId,
- portId: value.portId,
- },
- });
- break;
- }
- });
- return () => sub.unsubscribe();
- }, [id, connectedToForm, store]);
- const [nodeLabels, setNodeLabels] = useState(new Map<string, string>());
- const [portLabels, setPortLabels] = useState(new Map<string, string>());
- useEffect(() => {
- setNodeLabels(new Map((data.exposed || []).map((e) => [e.serviceId, nodeLabel(nodes.find((n) => n.id === e.serviceId)!)])));
- setPortLabels(new Map((data.exposed || []).map((e) => [`${e.serviceId} - ${e.portId}`, (nodes.find((n) => n.id === e.serviceId)!.data.ports || []).find((p) => p.id === e.portId)!.name])));
- }, [nodes, data, setNodeLabels, setPortLabels]);
- const onSubmit = useCallback((values: z.infer<typeof connectedToSchema>) => {
- const edges = store.edges.filter((e) => e.target !== id);
- const exp = (data.exposed || []).concat({
- serviceId: values.serviceId,
- portId: values.portId,
- });
- store.updateNodeData<"gateway-tcp">(id, {
- exposed: exp,
- selected: undefined,
- });
- store.setEdges(edges.concat(exp.map((e): Edge => ({
- id: uuidv4(),
- source: e.serviceId,
- sourceHandle: "ports",
- target: id,
- targetHandle: "tcp",
- }))));
- }, [id, data, store]);
- return (
- <>
- <Form {...form}>
- <form className="space-y-2">
- <FormField
- control={form.control}
- name="network"
- render={({ field }) => (
- <FormItem>
- <Select onValueChange={field.onChange} defaultValue={field.value}>
- <FormControl>
- <SelectTrigger>
- <SelectValue placeholder="Network" />
- </SelectTrigger>
- </FormControl>
- <SelectContent>
- {env.networks.map((n) => (
- <SelectItem key={n.name} value={n.domain}>{`${n.name} - ${n.domain}`}</SelectItem>
- ))}
- </SelectContent>
- </Select>
- <FormMessage />
- </FormItem>
- )}
- />
- <FormField
- control={form.control}
- name="subdomain"
- render={({ field }) => (
- <FormItem>
- <FormControl>
- <Input placeholder="subdomain" className="border border-black" {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- </form>
- </Form>
- Exposed Services
- <ul>
- {(data.exposed || []).map((e, i) => (
- <li key={i}>
- {nodeLabels.get(e.serviceId)} - {portLabels.get(`${e.serviceId} - ${e.portId}`)}
- </li>
- ))}
- </ul>
- <Form {...connectedToForm}>
- <form className="space-y-2" onSubmit={connectedToForm.handleSubmit(onSubmit)}>
- <FormField
- control={connectedToForm.control}
- name="serviceId"
- render={({ field }) => (
- <FormItem>
- <Select onValueChange={field.onChange} defaultValue={field.value}>
- <FormControl>
- <SelectTrigger>
- <SelectValue placeholder="Service" />
- </SelectTrigger>
- </FormControl>
- <SelectContent>
- {selectable.map((n) => (
- <SelectItem value={n.id}>{nodeLabel(n)}</SelectItem>
- ))}
- </SelectContent>
- </Select>
- <FormMessage />
- </FormItem>
- )}
- />
- <FormField
- control={connectedToForm.control}
- name="portId"
- render={({ field }) => (
- <FormItem>
- <Select onValueChange={field.onChange} defaultValue={field.value}>
- <FormControl>
- <SelectTrigger>
- <SelectValue placeholder="Port" />
- </SelectTrigger>
- </FormControl>
- <SelectContent>
- {selected && (selected.data.ports || []).map((p) => (
- <SelectItem key={p.id} value={p.id}>{p.name} - {p.value}</SelectItem>
- ))}
- </SelectContent>
- </Select>
- <FormMessage />
- </FormItem>
- )}
- />
- <Button type="submit">Expose</Button>
- </form>
- </Form>
- </>
- );
-}
\ No newline at end of file
+ const store = useStateStore();
+ const env = useEnv();
+ const form = useForm<z.infer<typeof schema>>({
+ resolver: zodResolver(schema),
+ mode: "onChange",
+ defaultValues: {
+ network: data.network,
+ subdomain: data.subdomain,
+ },
+ });
+ useEffect(() => {
+ const sub = form.watch(
+ (
+ value: DeepPartial<z.infer<typeof schema>>,
+ { name }: { name?: keyof z.infer<typeof schema> | undefined; type?: EventType | undefined },
+ ) => {
+ if (name === "network") {
+ let edges = store.edges;
+ if (data.network !== undefined) {
+ edges = edges.filter((e) => {
+ console.log(e);
+ if (
+ e.source === id &&
+ e.sourceHandle === "subdomain" &&
+ e.target === data.network &&
+ e.targetHandle === "subdomain"
+ ) {
+ return false;
+ } else {
+ return true;
+ }
+ });
+ }
+ if (value.network !== undefined) {
+ edges = edges.concat({
+ id: uuidv4(),
+ source: id,
+ sourceHandle: "subdomain",
+ target: value.network,
+ targetHandle: "subdomain",
+ });
+ }
+ store.setEdges(edges);
+ store.updateNodeData<"gateway-tcp">(id, { network: value.network });
+ } else if (name === "subdomain") {
+ store.updateNodeData<"gateway-tcp">(id, { subdomain: value.subdomain });
+ }
+ },
+ );
+ return () => sub.unsubscribe();
+ }, [id, data, form, store]);
+ const connectedToForm = useForm<z.infer<typeof connectedToSchema>>({
+ resolver: zodResolver(connectedToSchema),
+ mode: "onSubmit",
+ defaultValues: {
+ serviceId: data.selected?.serviceId,
+ portId: data.selected?.portId,
+ },
+ });
+ useEffect(() => {
+ connectedToForm.reset({
+ serviceId: data.selected?.serviceId,
+ portId: data.selected?.portId,
+ });
+ console.log(connectedToForm.getValues());
+ }, [id, connectedToForm, data]);
+ const nodes = useNodes<AppNode>();
+ const [selected, setSelected] = useState<AppNode | undefined>(undefined);
+ useEffect(() => {
+ if (data.selected?.serviceId == null) {
+ setSelected(undefined);
+ } else {
+ const serviceId = data.selected.serviceId;
+ setSelected(nodes.find((n) => n.id === serviceId));
+ }
+ }, [id, data, setSelected, nodes]);
+ const selectable = useMemo(() => {
+ console.log(selected);
+ return nodes.filter((n) => {
+ if (n.id === id) {
+ return false;
+ }
+ if (selected != null && selected.id === id) {
+ return true;
+ }
+ if ("ports" in n.data && (n.data.ports || []).length > 0) {
+ return true;
+ }
+ return false;
+ });
+ }, [id, nodes, selected]);
+ useEffect(() => {
+ const sub = connectedToForm.watch(
+ (
+ value: DeepPartial<z.infer<typeof connectedToSchema>>,
+ {
+ name,
+ type,
+ }: { name?: keyof z.infer<typeof connectedToSchema> | undefined; type?: EventType | undefined },
+ ) => {
+ if (type !== "change") {
+ return;
+ }
+ switch (name) {
+ case "serviceId":
+ if (!value.serviceId) {
+ break;
+ }
+ store.updateNodeData<"gateway-tcp">(id, {
+ selected: {
+ serviceId: value.serviceId,
+ },
+ });
+ break;
+ case "portId":
+ if (!value.portId) {
+ break;
+ }
+ store.updateNodeData<"gateway-tcp">(id, {
+ selected: {
+ serviceId: value.serviceId,
+ portId: value.portId,
+ },
+ });
+ break;
+ }
+ },
+ );
+ return () => sub.unsubscribe();
+ }, [id, connectedToForm, store]);
+ const [nodeLabels, setNodeLabels] = useState(new Map<string, string>());
+ const [portLabels, setPortLabels] = useState(new Map<string, string>());
+ useEffect(() => {
+ setNodeLabels(
+ new Map(
+ (data.exposed || []).map((e) => [e.serviceId, nodeLabel(nodes.find((n) => n.id === e.serviceId)!)]),
+ ),
+ );
+ setPortLabels(
+ new Map(
+ (data.exposed || []).map((e) => [
+ `${e.serviceId} - ${e.portId}`,
+ (nodes.find((n) => n.id === e.serviceId)!.data.ports || []).find((p) => p.id === e.portId)!.name,
+ ]),
+ ),
+ );
+ }, [nodes, data, setNodeLabels, setPortLabels]);
+ const onSubmit = useCallback(
+ (values: z.infer<typeof connectedToSchema>) => {
+ const edges = store.edges.filter((e) => e.target !== id);
+ const exp = (data.exposed || []).concat({
+ serviceId: values.serviceId,
+ portId: values.portId,
+ });
+ store.updateNodeData<"gateway-tcp">(id, {
+ exposed: exp,
+ selected: undefined,
+ });
+ store.setEdges(
+ edges.concat(
+ exp.map(
+ (e): Edge => ({
+ id: uuidv4(),
+ source: e.serviceId,
+ sourceHandle: "ports",
+ target: id,
+ targetHandle: "tcp",
+ }),
+ ),
+ ),
+ );
+ },
+ [id, data, store],
+ );
+ return (
+ <>
+ <Form {...form}>
+ <form className="space-y-2">
+ <FormField
+ control={form.control}
+ name="network"
+ render={({ field }) => (
+ <FormItem>
+ <Select onValueChange={field.onChange} defaultValue={field.value}>
+ <FormControl>
+ <SelectTrigger>
+ <SelectValue placeholder="Network" />
+ </SelectTrigger>
+ </FormControl>
+ <SelectContent>
+ {env.networks.map((n) => (
+ <SelectItem
+ key={n.name}
+ value={n.domain}
+ >{`${n.name} - ${n.domain}`}</SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={form.control}
+ name="subdomain"
+ render={({ field }) => (
+ <FormItem>
+ <FormControl>
+ <Input placeholder="subdomain" className="border border-black" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </form>
+ </Form>
+ Exposed Services
+ <ul>
+ {(data.exposed || []).map((e, i) => (
+ <li key={i}>
+ {nodeLabels.get(e.serviceId)} - {portLabels.get(`${e.serviceId} - ${e.portId}`)}
+ </li>
+ ))}
+ </ul>
+ <Form {...connectedToForm}>
+ <form className="space-y-2" onSubmit={connectedToForm.handleSubmit(onSubmit)}>
+ <FormField
+ control={connectedToForm.control}
+ name="serviceId"
+ render={({ field }) => (
+ <FormItem>
+ <Select onValueChange={field.onChange} defaultValue={field.value}>
+ <FormControl>
+ <SelectTrigger>
+ <SelectValue placeholder="Service" />
+ </SelectTrigger>
+ </FormControl>
+ <SelectContent>
+ {selectable.map((n) => (
+ <SelectItem value={n.id}>{nodeLabel(n)}</SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={connectedToForm.control}
+ name="portId"
+ render={({ field }) => (
+ <FormItem>
+ <Select onValueChange={field.onChange} defaultValue={field.value}>
+ <FormControl>
+ <SelectTrigger>
+ <SelectValue placeholder="Port" />
+ </SelectTrigger>
+ </FormControl>
+ <SelectContent>
+ {selected &&
+ (selected.data.ports || []).map((p) => (
+ <SelectItem key={p.id} value={p.id}>
+ {p.name} - {p.value}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <Button type="submit">Expose</Button>
+ </form>
+ </Form>
+ </>
+ );
+}
diff --git a/apps/canvas/front/src/components/node-github.tsx b/apps/canvas/front/src/components/node-github.tsx
index 6ece1b0..37213b8 100644
--- a/apps/canvas/front/src/components/node-github.tsx
+++ b/apps/canvas/front/src/components/node-github.tsx
@@ -1,165 +1,179 @@
-import { NodeRect } from './node-rect';
-import { GithubNode, nodeIsConnectable, nodeLabel, useStateStore, useGithubService } from '@/lib/state';
-import { useEffect, useMemo, useState } from 'react';
+import { NodeRect } from "./node-rect";
+import { GithubNode, nodeIsConnectable, nodeLabel, useStateStore, useGithubService } from "@/lib/state";
+import { useEffect, useMemo, useState } from "react";
import { z } from "zod";
-import { DeepPartial, EventType, useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { Form, FormControl, FormField, FormItem, FormMessage } from './ui/form';
+import { DeepPartial, EventType, useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Form, FormControl, FormField, FormItem, FormMessage } from "./ui/form";
import { Handle, Position } from "@xyflow/react";
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from './ui/select';
-import { GitHubRepository } from '../lib/github';
-import { useProjectId } from '@/lib/state';
-import { Alert, AlertDescription } from './ui/alert';
-import { AlertCircle } from 'lucide-react';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "./ui/select";
+import { GitHubRepository } from "../lib/github";
+import { useProjectId } from "@/lib/state";
+import { Alert, AlertDescription } from "./ui/alert";
+import { AlertCircle } from "lucide-react";
export function NodeGithub(node: GithubNode) {
- const { id, selected } = node;
- const isConnectable = useMemo(() => nodeIsConnectable(node, "repository"), [node]);
- return (
- <NodeRect id={id} selected={selected} type={node.type} state={node.data.state}>
- <div style={{ padding: '10px 20px' }}>
- {nodeLabel(node)}
- <Handle
- id="repository"
- type={"source"}
- position={Position.Right}
- isConnectableStart={isConnectable}
- isConnectableEnd={isConnectable}
- isConnectable={isConnectable}
- />
- </div>
- </NodeRect>
- );
+ const { id, selected } = node;
+ const isConnectable = useMemo(() => nodeIsConnectable(node, "repository"), [node]);
+ return (
+ <NodeRect id={id} selected={selected} type={node.type} state={node.data.state}>
+ <div style={{ padding: "10px 20px" }}>
+ {nodeLabel(node)}
+ <Handle
+ id="repository"
+ type={"source"}
+ position={Position.Right}
+ isConnectableStart={isConnectable}
+ isConnectableEnd={isConnectable}
+ isConnectable={isConnectable}
+ />
+ </div>
+ </NodeRect>
+ );
}
const schema = z.object({
- repositoryId: z.number().optional(),
+ repositoryId: z.number().optional(),
});
export function NodeGithubDetails(node: GithubNode) {
- const { id, data } = node;
- const store = useStateStore();
- const projectId = useProjectId();
- const [repos, setRepos] = useState<GitHubRepository[]>([]);
- const [loading, setLoading] = useState(false);
- const [error, setError] = useState<string | null>(null);
- const githubService = useGithubService();
+ const { id, data } = node;
+ const store = useStateStore();
+ const projectId = useProjectId();
+ const [repos, setRepos] = useState<GitHubRepository[]>([]);
+ const [loading, setLoading] = useState(false);
+ const [error, setError] = useState<string | null>(null);
+ const githubService = useGithubService();
- useEffect(() => {
- if (data.repository) {
- const { id, sshURL } = data.repository;
- setRepos(prevRepos => {
- if (!prevRepos.some(r => r.id === id)) {
- return [...prevRepos, {
- id,
- name: sshURL.split('/').pop() || '',
- full_name: sshURL.split('/').slice(-2).join('/'),
- html_url: '',
- ssh_url: sshURL,
- description: null,
- private: false,
- default_branch: 'main'
- }];
- }
- return prevRepos;
- });
- }
- }, [data.repository]);
+ useEffect(() => {
+ if (data.repository) {
+ const { id, sshURL } = data.repository;
+ setRepos((prevRepos) => {
+ if (!prevRepos.some((r) => r.id === id)) {
+ return [
+ ...prevRepos,
+ {
+ id,
+ name: sshURL.split("/").pop() || "",
+ full_name: sshURL.split("/").slice(-2).join("/"),
+ html_url: "",
+ ssh_url: sshURL,
+ description: null,
+ private: false,
+ default_branch: "main",
+ },
+ ];
+ }
+ return prevRepos;
+ });
+ }
+ }, [data.repository]);
- const form = useForm<z.infer<typeof schema>>({
- resolver: zodResolver(schema),
- mode: "onChange",
- defaultValues: {
- repositoryId: data.repository?.id,
- }
- });
+ const form = useForm<z.infer<typeof schema>>({
+ resolver: zodResolver(schema),
+ mode: "onChange",
+ defaultValues: {
+ repositoryId: data.repository?.id,
+ },
+ });
- useEffect(() => {
- const sub = form.watch((value: DeepPartial<z.infer<typeof schema>>, { name, type }: { name?: keyof z.infer<typeof schema> | undefined, type?: EventType | undefined }) => {
- if (type !== "change") {
- return;
- }
- switch (name) {
- case "repositoryId":
- if (value.repositoryId) {
- const repo = repos.find(r => r.id === value.repositoryId);
- if (repo) {
- store.updateNodeData<"github">(id, {
- repository: {
- id: repo.id,
- sshURL: repo.ssh_url,
- },
- });
- }
- }
- break;
- }
- });
- return () => sub.unsubscribe();
- }, [form, store, id, repos]);
+ useEffect(() => {
+ const sub = form.watch(
+ (
+ value: DeepPartial<z.infer<typeof schema>>,
+ { name, type }: { name?: keyof z.infer<typeof schema> | undefined; type?: EventType | undefined },
+ ) => {
+ if (type !== "change") {
+ return;
+ }
+ switch (name) {
+ case "repositoryId":
+ if (value.repositoryId) {
+ const repo = repos.find((r) => r.id === value.repositoryId);
+ if (repo) {
+ store.updateNodeData<"github">(id, {
+ repository: {
+ id: repo.id,
+ sshURL: repo.ssh_url,
+ },
+ });
+ }
+ }
+ break;
+ }
+ },
+ );
+ return () => sub.unsubscribe();
+ }, [form, store, id, repos]);
- useEffect(() => {
- const fetchRepositories = async () => {
- if (!githubService) return;
+ useEffect(() => {
+ const fetchRepositories = async () => {
+ if (!githubService) return;
- setLoading(true);
- setError(null);
- try {
- const repositories = await githubService.getRepositories();
- setRepos(repositories);
- } catch (err) {
- setError(err instanceof Error ? err.message : "Failed to fetch repositories");
- } finally {
- setLoading(false);
- }
- };
+ setLoading(true);
+ setError(null);
+ try {
+ const repositories = await githubService.getRepositories();
+ setRepos(repositories);
+ } catch (err) {
+ setError(err instanceof Error ? err.message : "Failed to fetch repositories");
+ } finally {
+ setLoading(false);
+ }
+ };
- fetchRepositories();
- }, [githubService]);
+ fetchRepositories();
+ }, [githubService]);
- return (
- <>
- <Form {...form}>
- <form className="space-y-2">
- <FormField
- control={form.control}
- name="repositoryId"
- render={({ field }) => (
- <FormItem>
- <Select
- onValueChange={(value) => field.onChange(Number(value))}
- value={field.value?.toString()}
- disabled={loading || !projectId || !githubService}
- >
- <FormControl>
- <SelectTrigger>
- <SelectValue placeholder={githubService ? "Select a repository" : "GitHub not configured"} />
- </SelectTrigger>
- </FormControl>
- <SelectContent>
- {repos.map((repo) => (
- <SelectItem key={repo.id} value={repo.id.toString()}>
- {repo.full_name}
- {repo.description && ` - ${repo.description}`}
- </SelectItem>
- ))}
- </SelectContent>
- </Select>
- <FormMessage />
- {error && <p className="text-sm text-red-500">{error}</p>}
- {loading && <p className="text-sm text-gray-500">Loading repositories...</p>}
- {!githubService && (
- <Alert variant="destructive" className="mt-2">
- <AlertCircle className="h-4 w-4" />
- <AlertDescription>
- GitHub access token is not configured. Please configure it in the Integrations tab.
- </AlertDescription>
- </Alert>
- )}
- </FormItem>
- )}
- />
- </form>
- </Form>
- </>);
-}
\ No newline at end of file
+ return (
+ <>
+ <Form {...form}>
+ <form className="space-y-2">
+ <FormField
+ control={form.control}
+ name="repositoryId"
+ render={({ field }) => (
+ <FormItem>
+ <Select
+ onValueChange={(value) => field.onChange(Number(value))}
+ value={field.value?.toString()}
+ disabled={loading || !projectId || !githubService}
+ >
+ <FormControl>
+ <SelectTrigger>
+ <SelectValue
+ placeholder={
+ githubService ? "Select a repository" : "GitHub not configured"
+ }
+ />
+ </SelectTrigger>
+ </FormControl>
+ <SelectContent>
+ {repos.map((repo) => (
+ <SelectItem key={repo.id} value={repo.id.toString()}>
+ {repo.full_name}
+ {repo.description && ` - ${repo.description}`}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ <FormMessage />
+ {error && <p className="text-sm text-red-500">{error}</p>}
+ {loading && <p className="text-sm text-gray-500">Loading repositories...</p>}
+ {!githubService && (
+ <Alert variant="destructive" className="mt-2">
+ <AlertCircle className="h-4 w-4" />
+ <AlertDescription>
+ GitHub access token is not configured. Please configure it in the
+ Integrations tab.
+ </AlertDescription>
+ </Alert>
+ )}
+ </FormItem>
+ )}
+ />
+ </form>
+ </Form>
+ </>
+ );
+}
diff --git a/apps/canvas/front/src/components/node-mongodb.tsx b/apps/canvas/front/src/components/node-mongodb.tsx
index 9ead671..1d41adb 100644
--- a/apps/canvas/front/src/components/node-mongodb.tsx
+++ b/apps/canvas/front/src/components/node-mongodb.tsx
@@ -1,73 +1,79 @@
-import { NodeRect } from './node-rect';
-import { nodeLabel, MongoDBNode, useStateStore } from '@/lib/state';
-import { useEffect } from 'react';
+import { NodeRect } from "./node-rect";
+import { nodeLabel, MongoDBNode, useStateStore } from "@/lib/state";
+import { useEffect } from "react";
import { Handle, Position } from "@xyflow/react";
import { z } from "zod";
-import { DeepPartial, EventType, useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { Form, FormControl, FormField, FormItem, FormMessage } from './ui/form';
-import { Input } from './ui/input';
+import { DeepPartial, EventType, useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Form, FormControl, FormField, FormItem, FormMessage } from "./ui/form";
+import { Input } from "./ui/input";
export function NodeMongoDB(node: MongoDBNode) {
- const { id, selected } = node;
- return (
- <NodeRect id={id} selected={selected} type={node.type} state={node.data.state}>
- <div style={{ padding: '10px 20px' }}>
- {nodeLabel(node)}
- <Handle
- id="env_var"
- type={"source"}
- position={Position.Top}
- isConnectableStart={true}
- isConnectableEnd={true}
- isConnectable={true}
- />
- </div>
- </NodeRect>
- );
+ const { id, selected } = node;
+ return (
+ <NodeRect id={id} selected={selected} type={node.type} state={node.data.state}>
+ <div style={{ padding: "10px 20px" }}>
+ {nodeLabel(node)}
+ <Handle
+ id="env_var"
+ type={"source"}
+ position={Position.Top}
+ isConnectableStart={true}
+ isConnectableEnd={true}
+ isConnectable={true}
+ />
+ </div>
+ </NodeRect>
+ );
}
const schema = z.object({
- name: z.string().min(1, "required"),
+ name: z.string().min(1, "required"),
});
export function NodeMongoDBDetails({ id, data }: MongoDBNode) {
- const store = useStateStore();
- const form = useForm<z.infer<typeof schema>>({
- resolver: zodResolver(schema),
- mode: "onChange",
- defaultValues: {
- name: data.label,
- }
- });
- useEffect(() => {
- const sub = form.watch((value: DeepPartial<z.infer<typeof schema>>, { type }: { name?: keyof z.infer<typeof schema> | undefined, type?: EventType | undefined }) => {
- if (type !== "change") {
- return;
- }
- store.updateNodeData<"mongodb">(id, {
- label: value.name,
- });
- });
- return () => sub.unsubscribe();
- }, [id, form, store]);
- return (
- <>
- <Form {...form}>
- <form className="space-y-2">
- <FormField
- control={form.control}
- name="name"
- render={({ field }) => (
- <FormItem>
- <FormControl>
- <Input placeholder="name" className="border border-black" {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- </form>
- </Form>
- </>);
-}
\ No newline at end of file
+ const store = useStateStore();
+ const form = useForm<z.infer<typeof schema>>({
+ resolver: zodResolver(schema),
+ mode: "onChange",
+ defaultValues: {
+ name: data.label,
+ },
+ });
+ useEffect(() => {
+ const sub = form.watch(
+ (
+ value: DeepPartial<z.infer<typeof schema>>,
+ { type }: { name?: keyof z.infer<typeof schema> | undefined; type?: EventType | undefined },
+ ) => {
+ if (type !== "change") {
+ return;
+ }
+ store.updateNodeData<"mongodb">(id, {
+ label: value.name,
+ });
+ },
+ );
+ return () => sub.unsubscribe();
+ }, [id, form, store]);
+ return (
+ <>
+ <Form {...form}>
+ <form className="space-y-2">
+ <FormField
+ control={form.control}
+ name="name"
+ render={({ field }) => (
+ <FormItem>
+ <FormControl>
+ <Input placeholder="name" className="border border-black" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </form>
+ </Form>
+ </>
+ );
+}
diff --git a/apps/canvas/front/src/components/node-network.tsx b/apps/canvas/front/src/components/node-network.tsx
index 9a241fa..8fa62f2 100644
--- a/apps/canvas/front/src/components/node-network.tsx
+++ b/apps/canvas/front/src/components/node-network.tsx
@@ -1,22 +1,22 @@
-import { NodeRect } from './node-rect';
-import { nodeLabel, NetworkNode } from '@/lib/state';
+import { NodeRect } from "./node-rect";
+import { nodeLabel, NetworkNode } from "@/lib/state";
import { Handle, Position } from "@xyflow/react";
export function NodeNetwork(node: NetworkNode) {
- const { id, selected } = node;
- return (
- <NodeRect id={id} selected={selected} type={node.type} state={node.data.state}>
- <div style={{ padding: '10px 20px' }}>
- {nodeLabel(node)}
- <Handle
- id="subdomain"
- type={"target"}
- position={Position.Bottom}
- isConnectableStart={true}
- isConnectableEnd={true}
- isConnectable={true}
- />
- </div>
- </NodeRect>
- );
+ const { id, selected } = node;
+ return (
+ <NodeRect id={id} selected={selected} type={node.type} state={node.data.state}>
+ <div style={{ padding: "10px 20px" }}>
+ {nodeLabel(node)}
+ <Handle
+ id="subdomain"
+ type={"target"}
+ position={Position.Bottom}
+ isConnectableStart={true}
+ isConnectableEnd={true}
+ isConnectable={true}
+ />
+ </div>
+ </NodeRect>
+ );
}
diff --git a/apps/canvas/front/src/components/node-postgresql.tsx b/apps/canvas/front/src/components/node-postgresql.tsx
index a0bd558..f856c17 100644
--- a/apps/canvas/front/src/components/node-postgresql.tsx
+++ b/apps/canvas/front/src/components/node-postgresql.tsx
@@ -1,73 +1,79 @@
-import { NodeRect } from './node-rect';
-import { nodeLabel, PostgreSQLNode, useStateStore } from '@/lib/state';
-import { useEffect } from 'react';
+import { NodeRect } from "./node-rect";
+import { nodeLabel, PostgreSQLNode, useStateStore } from "@/lib/state";
+import { useEffect } from "react";
import { Handle, Position } from "@xyflow/react";
import { z } from "zod";
-import { DeepPartial, EventType, useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { Form, FormControl, FormField, FormItem, FormMessage } from './ui/form';
-import { Input } from './ui/input';
+import { DeepPartial, EventType, useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Form, FormControl, FormField, FormItem, FormMessage } from "./ui/form";
+import { Input } from "./ui/input";
export function NodePostgreSQL(node: PostgreSQLNode) {
- const { id, selected } = node;
- return (
- <NodeRect id={id} selected={selected} type={node.type} state={node.data.state}>
- <div style={{ padding: '10px 20px' }}>
- {nodeLabel(node)}
- <Handle
- id="env_var"
- type={"source"}
- position={Position.Top}
- isConnectableStart={true}
- isConnectableEnd={true}
- isConnectable={true}
- />
- </div>
- </NodeRect>
- );
+ const { id, selected } = node;
+ return (
+ <NodeRect id={id} selected={selected} type={node.type} state={node.data.state}>
+ <div style={{ padding: "10px 20px" }}>
+ {nodeLabel(node)}
+ <Handle
+ id="env_var"
+ type={"source"}
+ position={Position.Top}
+ isConnectableStart={true}
+ isConnectableEnd={true}
+ isConnectable={true}
+ />
+ </div>
+ </NodeRect>
+ );
}
const schema = z.object({
- name: z.string().min(1, "required"),
+ name: z.string().min(1, "required"),
});
export function NodePostgreSQLDetails({ id, data }: PostgreSQLNode) {
- const store = useStateStore();
- const form = useForm<z.infer<typeof schema>>({
- resolver: zodResolver(schema),
- mode: "onChange",
- defaultValues: {
- name: data.label,
- }
- });
- useEffect(() => {
- const sub = form.watch((value: DeepPartial<z.infer<typeof schema>>, { type }: { name?: keyof z.infer<typeof schema> | undefined, type?: EventType | undefined }) => {
- if (type !== "change") {
- return;
- }
- store.updateNodeData<"postgresql">(id, {
- label: value.name,
- });
- });
- return () => sub.unsubscribe();
- }, [id, form, store]);
- return (
- <>
- <Form {...form}>
- <form className="space-y-2">
- <FormField
- control={form.control}
- name="name"
- render={({ field }) => (
- <FormItem>
- <FormControl>
- <Input placeholder="name" className="border border-black" {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- </form>
- </Form>
- </>);
-}
\ No newline at end of file
+ const store = useStateStore();
+ const form = useForm<z.infer<typeof schema>>({
+ resolver: zodResolver(schema),
+ mode: "onChange",
+ defaultValues: {
+ name: data.label,
+ },
+ });
+ useEffect(() => {
+ const sub = form.watch(
+ (
+ value: DeepPartial<z.infer<typeof schema>>,
+ { type }: { name?: keyof z.infer<typeof schema> | undefined; type?: EventType | undefined },
+ ) => {
+ if (type !== "change") {
+ return;
+ }
+ store.updateNodeData<"postgresql">(id, {
+ label: value.name,
+ });
+ },
+ );
+ return () => sub.unsubscribe();
+ }, [id, form, store]);
+ return (
+ <>
+ <Form {...form}>
+ <form className="space-y-2">
+ <FormField
+ control={form.control}
+ name="name"
+ render={({ field }) => (
+ <FormItem>
+ <FormControl>
+ <Input placeholder="name" className="border border-black" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </form>
+ </Form>
+ </>
+ );
+}
diff --git a/apps/canvas/front/src/components/node-rect.tsx b/apps/canvas/front/src/components/node-rect.tsx
index 615f7a1..257353e 100644
--- a/apps/canvas/front/src/components/node-rect.tsx
+++ b/apps/canvas/front/src/components/node-rect.tsx
@@ -3,57 +3,63 @@
import { useEffect, useState } from "react";
export type Props = {
- id: string;
- selected?: boolean;
- children: React.ReactNode;
- type: NodeType;
- state: string | null;
+ id: string;
+ selected?: boolean;
+ children: React.ReactNode;
+ type: NodeType;
+ state: string | null;
};
export function NodeRect(p: Props) {
- const { id, selected, children, state } = p;
- const messages = useNodeMessages(id);
- const hasFatal = messages.some((m) => m.type === "FATAL");
- const hasWarning = messages.some((m) => m.type === "WARNING");
- const [classes, setClasses] = useState<string[]>([]);
- const [stateClasses, setStateClasses] = useState<string[]>([]);
- useEffect(() => {
- const classes = ["px-4", "py-2", "rounded-md", "bg-white"];
- if (hasFatal) {
- classes.push("border-red-500");
- } else if (hasWarning) {
- classes.push("border-yellow-500");
- } else {
- classes.push("border-black");
- }
- if (selected) {
- classes.push("border-2");
- } else {
- classes.push("border");
- }
- setClasses(classes);
- const stateClasses: string[] = [];
- if (state === "processing") {
- stateClasses.push("bg-yellow-500");
- stateClasses.push("animate-pulse");
- } else if (state === "success") {
- stateClasses.push("bg-green-500");
- } else if (state === "failure") {
- stateClasses.push("bg-red-500");
- } else {
- stateClasses.push("bg-black");
- }
- setStateClasses(stateClasses);
- }, [selected, hasFatal, hasWarning, state, setClasses, setStateClasses]);
- return (
- <div className={classes.join(" ")}>
- <div style={{ position: "absolute", top: "5px", left: "5px" }}>
- {Icon(p.type)}
- </div>
- <div style={{ position: "absolute", top: "5px", right: "5px", borderRadius: "50%", width: "5px", height: "5px" }} className={stateClasses.join(" ")}>
- </div>
- {children}
- </div>
- )
-
+ const { id, selected, children, state } = p;
+ const messages = useNodeMessages(id);
+ const hasFatal = messages.some((m) => m.type === "FATAL");
+ const hasWarning = messages.some((m) => m.type === "WARNING");
+ const [classes, setClasses] = useState<string[]>([]);
+ const [stateClasses, setStateClasses] = useState<string[]>([]);
+ useEffect(() => {
+ const classes = ["px-4", "py-2", "rounded-md", "bg-white"];
+ if (hasFatal) {
+ classes.push("border-red-500");
+ } else if (hasWarning) {
+ classes.push("border-yellow-500");
+ } else {
+ classes.push("border-black");
+ }
+ if (selected) {
+ classes.push("border-2");
+ } else {
+ classes.push("border");
+ }
+ setClasses(classes);
+ const stateClasses: string[] = [];
+ if (state === "processing") {
+ stateClasses.push("bg-yellow-500");
+ stateClasses.push("animate-pulse");
+ } else if (state === "success") {
+ stateClasses.push("bg-green-500");
+ } else if (state === "failure") {
+ stateClasses.push("bg-red-500");
+ } else {
+ stateClasses.push("bg-black");
+ }
+ setStateClasses(stateClasses);
+ }, [selected, hasFatal, hasWarning, state, setClasses, setStateClasses]);
+ return (
+ <div className={classes.join(" ")}>
+ <div style={{ position: "absolute", top: "5px", left: "5px" }}>{Icon(p.type)}</div>
+ <div
+ style={{
+ position: "absolute",
+ top: "5px",
+ right: "5px",
+ borderRadius: "50%",
+ width: "5px",
+ height: "5px",
+ }}
+ className={stateClasses.join(" ")}
+ ></div>
+ {children}
+ </div>
+ );
}
diff --git a/apps/canvas/front/src/components/node-volume.tsx b/apps/canvas/front/src/components/node-volume.tsx
index cb42241..14d5b4c 100644
--- a/apps/canvas/front/src/components/node-volume.tsx
+++ b/apps/canvas/front/src/components/node-volume.tsx
@@ -1,126 +1,134 @@
-import { NodeRect } from './node-rect';
-import { nodeIsConnectable, nodeLabel, useStateStore, VolumeNode } from '@/lib/state';
-import { useEffect, useMemo } from 'react';
+import { NodeRect } from "./node-rect";
+import { nodeIsConnectable, nodeLabel, useStateStore, VolumeNode } from "@/lib/state";
+import { useEffect, useMemo } from "react";
import { z } from "zod";
-import { DeepPartial, EventType, useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { Form, FormControl, FormField, FormItem, FormMessage } from './ui/form';
-import { Input } from './ui/input';
+import { DeepPartial, EventType, useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Form, FormControl, FormField, FormItem, FormMessage } from "./ui/form";
+import { Input } from "./ui/input";
import { Handle, Position } from "@xyflow/react";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "./ui/select";
export function NodeVolume(node: VolumeNode) {
- const { id, data, selected } = node;
- const isConnectable = useMemo(() => nodeIsConnectable(node, "volume"), [node]);
- return (
- <NodeRect id={id} selected={selected} type={node.type} state={node.data.state}>
- <div style={{ padding: '10px 20px' }}>
- <div>{nodeLabel(node)}</div>
- <div>{data.type && `${data.type}`}</div>
- <div>{data.size && `${data.size}`}</div>
- <Handle
- id="volume"
- type={"source"}
- position={Position.Top}
- isConnectableStart={isConnectable}
- isConnectableEnd={isConnectable}
- isConnectable={isConnectable}
- />
- </div>
- </NodeRect>
- );
+ const { id, data, selected } = node;
+ const isConnectable = useMemo(() => nodeIsConnectable(node, "volume"), [node]);
+ return (
+ <NodeRect id={id} selected={selected} type={node.type} state={node.data.state}>
+ <div style={{ padding: "10px 20px" }}>
+ <div>{nodeLabel(node)}</div>
+ <div>{data.type && `${data.type}`}</div>
+ <div>{data.size && `${data.size}`}</div>
+ <Handle
+ id="volume"
+ type={"source"}
+ position={Position.Top}
+ isConnectableStart={isConnectable}
+ isConnectableEnd={isConnectable}
+ isConnectable={isConnectable}
+ />
+ </div>
+ </NodeRect>
+ );
}
const volumeTypes = ["ReadWriteOnce", "ReadOnlyMany", "ReadWriteMany", "ReadWriteOncePod"] as const;
const schema = z.object({
- name: z.string().min(1),
- type: z.enum(volumeTypes),
- size: z.string().min(1).default("1Gi"),
+ name: z.string().min(1),
+ type: z.enum(volumeTypes),
+ size: z.string().min(1).default("1Gi"),
});
export function NodeVolumeDetails({ id, data }: VolumeNode) {
- const store = useStateStore();
- const form = useForm<z.infer<typeof schema>>({
- resolver: zodResolver(schema),
- mode: "onChange",
- defaultValues: {
- name: "",
- type: undefined,
- size: "",
- }
- });
- useEffect(() => {
- const sub = form.watch((value: DeepPartial<z.infer<typeof schema>>, { name, type }: { name?: keyof z.infer<typeof schema> | undefined, type?: EventType | undefined }) => {
- if (type !== "change") {
- return
- }
- console.log({ name, type, value });
- store.updateNodeData<"volume">(id, {
- label: value.name,
- type: value.type,
- size: value.size,
- });
- });
- return () => sub.unsubscribe();
- }, [id, form, store]);
- useEffect(() => {
- form.reset({
- name: data.label,
- type: data.type,
- size: data.size,
- });
- }, [form, data])
- return (
- <>
- <Form {...form}>
- <form className="space-y-2">
- <FormField
- control={form.control}
- name="name"
- render={({ field }) => (
- <FormItem>
- <FormControl>
- <Input placeholder="name" className="border border-black" {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- <FormField
- control={form.control}
- name="type"
- render={({ field }) => (
- <FormItem>
- <Select onValueChange={field.onChange} defaultValue={field.value}>
- <FormControl>
- <SelectTrigger>
- <SelectValue placeholder="Volume Type" />
- </SelectTrigger>
- </FormControl>
- <SelectContent>
- {volumeTypes.map((t) => (
- <SelectItem key={t} value={t}>{t}</SelectItem>
- ))}
- </SelectContent>
- </Select>
- <FormMessage />
- </FormItem>
- )}
- />
- <FormField
- control={form.control}
- name="size"
- render={({ field }) => (
- <FormItem>
- <FormControl>
- <Input placeholder="size" className="border border-black" {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- </form>
- </Form>
- </>);
-}
\ No newline at end of file
+ const store = useStateStore();
+ const form = useForm<z.infer<typeof schema>>({
+ resolver: zodResolver(schema),
+ mode: "onChange",
+ defaultValues: {
+ name: "",
+ type: undefined,
+ size: "",
+ },
+ });
+ useEffect(() => {
+ const sub = form.watch(
+ (
+ value: DeepPartial<z.infer<typeof schema>>,
+ { name, type }: { name?: keyof z.infer<typeof schema> | undefined; type?: EventType | undefined },
+ ) => {
+ if (type !== "change") {
+ return;
+ }
+ console.log({ name, type, value });
+ store.updateNodeData<"volume">(id, {
+ label: value.name,
+ type: value.type,
+ size: value.size,
+ });
+ },
+ );
+ return () => sub.unsubscribe();
+ }, [id, form, store]);
+ useEffect(() => {
+ form.reset({
+ name: data.label,
+ type: data.type,
+ size: data.size,
+ });
+ }, [form, data]);
+ return (
+ <>
+ <Form {...form}>
+ <form className="space-y-2">
+ <FormField
+ control={form.control}
+ name="name"
+ render={({ field }) => (
+ <FormItem>
+ <FormControl>
+ <Input placeholder="name" className="border border-black" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={form.control}
+ name="type"
+ render={({ field }) => (
+ <FormItem>
+ <Select onValueChange={field.onChange} defaultValue={field.value}>
+ <FormControl>
+ <SelectTrigger>
+ <SelectValue placeholder="Volume Type" />
+ </SelectTrigger>
+ </FormControl>
+ <SelectContent>
+ {volumeTypes.map((t) => (
+ <SelectItem key={t} value={t}>
+ {t}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={form.control}
+ name="size"
+ render={({ field }) => (
+ <FormItem>
+ <FormControl>
+ <Input placeholder="size" className="border border-black" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </form>
+ </Form>
+ </>
+ );
+}
diff --git a/apps/canvas/front/src/components/resources.tsx b/apps/canvas/front/src/components/resources.tsx
index 36118db..a07eb86 100644
--- a/apps/canvas/front/src/components/resources.tsx
+++ b/apps/canvas/front/src/components/resources.tsx
@@ -9,43 +9,51 @@
import { Icon } from "./icon";
function addResource(i: CategoryItem<NodeType>, flow: ReactFlowInstance) {
- flow.addNodes({
- id: uuidv4(),
- position: {
- x: 0,
- y: 0,
- },
- type: i.type,
- connectable: true,
- data: i.init,
- });
+ flow.addNodes({
+ id: uuidv4(),
+ position: {
+ x: 0,
+ y: 0,
+ },
+ type: i.type,
+ connectable: true,
+ data: i.init,
+ });
}
export function Resources() {
- const flow = useReactFlow();
- const categories = useCategories();
- const onResourceAdd = useCallback((item: CategoryItem<NodeType>) => {
- return () => addResource(item, flow);
- }, [flow]);
- const [open, setOpen] = useState<string[]>(categories.map((c) => c.title));
- return (
- <>
- <Accordion type="multiple" value={open} onValueChange={(v) => setOpen(v)}>
- {categories.map((c) => (
- <AccordionItem key={c.title} value={c.title} className={"px-3" + (c.active ? " bg-amber-100" : "")}>
- <AccordionTrigger>
- {c.title}
- </AccordionTrigger>
- <AccordionContent>
- <div className="flex flex-col space-y-1">
- {c.items.map((item) => (
- <Button key={item.title} onClick={onResourceAdd(item)} style={{ justifyContent: "flex-start" }}>{Icon(item.type)}{item.title}</Button>
- ))}
- </div>
- </AccordionContent>
- </AccordionItem>
- ))}
- </Accordion>
- </>
- );
+ const flow = useReactFlow();
+ const categories = useCategories();
+ const onResourceAdd = useCallback(
+ (item: CategoryItem<NodeType>) => {
+ return () => addResource(item, flow);
+ },
+ [flow],
+ );
+ const [open, setOpen] = useState<string[]>(categories.map((c) => c.title));
+ return (
+ <>
+ <Accordion type="multiple" value={open} onValueChange={(v) => setOpen(v)}>
+ {categories.map((c) => (
+ <AccordionItem key={c.title} value={c.title} className={"px-3" + (c.active ? " bg-amber-100" : "")}>
+ <AccordionTrigger>{c.title}</AccordionTrigger>
+ <AccordionContent>
+ <div className="flex flex-col space-y-1">
+ {c.items.map((item) => (
+ <Button
+ key={item.title}
+ onClick={onResourceAdd(item)}
+ style={{ justifyContent: "flex-start" }}
+ >
+ {Icon(item.type)}
+ {item.title}
+ </Button>
+ ))}
+ </div>
+ </AccordionContent>
+ </AccordionItem>
+ ))}
+ </Accordion>
+ </>
+ );
}
diff --git a/apps/canvas/front/src/components/ui/accordion.tsx b/apps/canvas/front/src/components/ui/accordion.tsx
index 0a8f565..9365442 100644
--- a/apps/canvas/front/src/components/ui/accordion.tsx
+++ b/apps/canvas/front/src/components/ui/accordion.tsx
@@ -1,54 +1,50 @@
-import * as React from "react"
-import * as AccordionPrimitive from "@radix-ui/react-accordion"
-import { cn } from "@/lib/utils"
-import { ChevronDownIcon } from "@radix-ui/react-icons"
+import * as React from "react";
+import * as AccordionPrimitive from "@radix-ui/react-accordion";
+import { cn } from "@/lib/utils";
+import { ChevronDownIcon } from "@radix-ui/react-icons";
-const Accordion = AccordionPrimitive.Root
+const Accordion = AccordionPrimitive.Root;
const AccordionItem = React.forwardRef<
- React.ElementRef<typeof AccordionPrimitive.Item>,
- React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Item>
+ React.ElementRef<typeof AccordionPrimitive.Item>,
+ React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Item>
>(({ className, ...props }, ref) => (
- <AccordionPrimitive.Item
- ref={ref}
- className={cn("border-b", className)}
- {...props}
- />
-))
-AccordionItem.displayName = "AccordionItem"
+ <AccordionPrimitive.Item ref={ref} className={cn("border-b", className)} {...props} />
+));
+AccordionItem.displayName = "AccordionItem";
const AccordionTrigger = React.forwardRef<
- React.ElementRef<typeof AccordionPrimitive.Trigger>,
- React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Trigger>
+ React.ElementRef<typeof AccordionPrimitive.Trigger>,
+ React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Trigger>
>(({ className, children, ...props }, ref) => (
- <AccordionPrimitive.Header className="flex">
- <AccordionPrimitive.Trigger
- ref={ref}
- className={cn(
- "flex flex-1 items-center justify-between py-4 text-sm font-medium transition-all hover:underline text-left [&[data-state=open]>svg]:rotate-180",
- className
- )}
- {...props}
- >
- {children}
- <ChevronDownIcon className="h-4 w-4 shrink-0 text-muted-foreground transition-transform duration-200" />
- </AccordionPrimitive.Trigger>
- </AccordionPrimitive.Header>
-))
-AccordionTrigger.displayName = AccordionPrimitive.Trigger.displayName
+ <AccordionPrimitive.Header className="flex">
+ <AccordionPrimitive.Trigger
+ ref={ref}
+ className={cn(
+ "flex flex-1 items-center justify-between py-4 text-sm font-medium transition-all hover:underline text-left [&[data-state=open]>svg]:rotate-180",
+ className,
+ )}
+ {...props}
+ >
+ {children}
+ <ChevronDownIcon className="h-4 w-4 shrink-0 text-muted-foreground transition-transform duration-200" />
+ </AccordionPrimitive.Trigger>
+ </AccordionPrimitive.Header>
+));
+AccordionTrigger.displayName = AccordionPrimitive.Trigger.displayName;
const AccordionContent = React.forwardRef<
- React.ElementRef<typeof AccordionPrimitive.Content>,
- React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Content>
+ React.ElementRef<typeof AccordionPrimitive.Content>,
+ React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Content>
>(({ className, children, ...props }, ref) => (
- <AccordionPrimitive.Content
- ref={ref}
- className="overflow-hidden text-sm data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down"
- {...props}
- >
- <div className={cn("pb-4 pt-0", className)}>{children}</div>
- </AccordionPrimitive.Content>
-))
-AccordionContent.displayName = AccordionPrimitive.Content.displayName
+ <AccordionPrimitive.Content
+ ref={ref}
+ className="overflow-hidden text-sm data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down"
+ {...props}
+ >
+ <div className={cn("pb-4 pt-0", className)}>{children}</div>
+ </AccordionPrimitive.Content>
+));
+AccordionContent.displayName = AccordionPrimitive.Content.displayName;
-export { Accordion, AccordionItem, AccordionTrigger, AccordionContent }
+export { Accordion, AccordionItem, AccordionTrigger, AccordionContent };
diff --git a/apps/canvas/front/src/components/ui/alert.tsx b/apps/canvas/front/src/components/ui/alert.tsx
index 350d1cd..ee9db6a 100644
--- a/apps/canvas/front/src/components/ui/alert.tsx
+++ b/apps/canvas/front/src/components/ui/alert.tsx
@@ -1,58 +1,42 @@
-import * as React from "react"
-import { cva, type VariantProps } from "class-variance-authority"
-import { cn } from "@/lib/utils"
+import * as React from "react";
+import { cva, type VariantProps } from "class-variance-authority";
+import { cn } from "@/lib/utils";
const alertVariants = cva(
- "relative w-full rounded-lg border p-4 [&>svg~*]:pl-7 [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-foreground",
- {
- variants: {
- variant: {
- default: "bg-background text-foreground",
- destructive:
- "border-destructive/50 text-destructive dark:border-destructive [&>svg]:text-destructive",
- },
- },
- defaultVariants: {
- variant: "default",
- },
- }
-)
+ "relative w-full rounded-lg border p-4 [&>svg~*]:pl-7 [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-foreground",
+ {
+ variants: {
+ variant: {
+ default: "bg-background text-foreground",
+ destructive: "border-destructive/50 text-destructive dark:border-destructive [&>svg]:text-destructive",
+ },
+ },
+ defaultVariants: {
+ variant: "default",
+ },
+ },
+);
const Alert = React.forwardRef<
- HTMLDivElement,
- React.HTMLAttributes<HTMLDivElement> & VariantProps<typeof alertVariants>
+ HTMLDivElement,
+ React.HTMLAttributes<HTMLDivElement> & VariantProps<typeof alertVariants>
>(({ className, variant, ...props }, ref) => (
- <div
- ref={ref}
- role="alert"
- className={cn(alertVariants({ variant }), className)}
- {...props}
- />
-))
-Alert.displayName = "Alert"
+ <div ref={ref} role="alert" className={cn(alertVariants({ variant }), className)} {...props} />
+));
+Alert.displayName = "Alert";
-const AlertTitle = React.forwardRef<
- HTMLParagraphElement,
- React.HTMLAttributes<HTMLHeadingElement>
->(({ className, ...props }, ref) => (
- <h5
- ref={ref}
- className={cn("mb-1 font-medium leading-none tracking-tight", className)}
- {...props}
- />
-))
-AlertTitle.displayName = "AlertTitle"
+const AlertTitle = React.forwardRef<HTMLParagraphElement, React.HTMLAttributes<HTMLHeadingElement>>(
+ ({ className, ...props }, ref) => (
+ <h5 ref={ref} className={cn("mb-1 font-medium leading-none tracking-tight", className)} {...props} />
+ ),
+);
+AlertTitle.displayName = "AlertTitle";
-const AlertDescription = React.forwardRef<
- HTMLParagraphElement,
- React.HTMLAttributes<HTMLParagraphElement>
->(({ className, ...props }, ref) => (
- <div
- ref={ref}
- className={cn("text-sm [&_p]:leading-relaxed", className)}
- {...props}
- />
-))
-AlertDescription.displayName = "AlertDescription"
+const AlertDescription = React.forwardRef<HTMLParagraphElement, React.HTMLAttributes<HTMLParagraphElement>>(
+ ({ className, ...props }, ref) => (
+ <div ref={ref} className={cn("text-sm [&_p]:leading-relaxed", className)} {...props} />
+ ),
+);
+AlertDescription.displayName = "AlertDescription";
-export { Alert, AlertTitle, AlertDescription }
\ No newline at end of file
+export { Alert, AlertTitle, AlertDescription };
diff --git a/apps/canvas/front/src/components/ui/badge.tsx b/apps/canvas/front/src/components/ui/badge.tsx
index e87d62b..51245fe 100644
--- a/apps/canvas/front/src/components/ui/badge.tsx
+++ b/apps/canvas/front/src/components/ui/badge.tsx
@@ -1,36 +1,30 @@
-import * as React from "react"
-import { cva, type VariantProps } from "class-variance-authority"
+import * as React from "react";
+import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
const badgeVariants = cva(
- "inline-flex items-center rounded-md border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
- {
- variants: {
- variant: {
- default:
- "border-transparent bg-primary text-primary-foreground shadow hover:bg-primary/80",
- secondary:
- "border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80",
- destructive:
- "border-transparent bg-destructive text-destructive-foreground shadow hover:bg-destructive/80",
- outline: "text-foreground",
- },
- },
- defaultVariants: {
- variant: "default",
- },
- }
-)
+ "inline-flex items-center rounded-md border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
+ {
+ variants: {
+ variant: {
+ default: "border-transparent bg-primary text-primary-foreground shadow hover:bg-primary/80",
+ secondary: "border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80",
+ destructive:
+ "border-transparent bg-destructive text-destructive-foreground shadow hover:bg-destructive/80",
+ outline: "text-foreground",
+ },
+ },
+ defaultVariants: {
+ variant: "default",
+ },
+ },
+);
-export interface BadgeProps
- extends React.HTMLAttributes<HTMLDivElement>,
- VariantProps<typeof badgeVariants> {}
+export interface BadgeProps extends React.HTMLAttributes<HTMLDivElement>, VariantProps<typeof badgeVariants> {}
function Badge({ className, variant, ...props }: BadgeProps) {
- return (
- <div className={cn(badgeVariants({ variant }), className)} {...props} />
- )
+ return <div className={cn(badgeVariants({ variant }), className)} {...props} />;
}
-export { Badge, badgeVariants }
+export { Badge, badgeVariants };
diff --git a/apps/canvas/front/src/components/ui/button.tsx b/apps/canvas/front/src/components/ui/button.tsx
index 65d4fcd..f44eeb1 100644
--- a/apps/canvas/front/src/components/ui/button.tsx
+++ b/apps/canvas/front/src/components/ui/button.tsx
@@ -1,57 +1,47 @@
-import * as React from "react"
-import { Slot } from "@radix-ui/react-slot"
-import { cva, type VariantProps } from "class-variance-authority"
+import * as React from "react";
+import { Slot } from "@radix-ui/react-slot";
+import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
const buttonVariants = cva(
- "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
- {
- variants: {
- variant: {
- default:
- "bg-primary text-primary-foreground shadow hover:bg-primary/90",
- destructive:
- "bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90",
- outline:
- "border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground",
- secondary:
- "bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80",
- ghost: "hover:bg-accent hover:text-accent-foreground",
- link: "text-primary underline-offset-4 hover:underline",
- },
- size: {
- default: "h-9 px-4 py-2",
- sm: "h-8 rounded-md px-3 text-xs",
- lg: "h-10 rounded-md px-8",
- icon: "h-9 w-9",
- },
- },
- defaultVariants: {
- variant: "default",
- size: "default",
- },
- }
-)
+ "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
+ {
+ variants: {
+ variant: {
+ default: "bg-primary text-primary-foreground shadow hover:bg-primary/90",
+ destructive: "bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90",
+ outline: "border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground",
+ secondary: "bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80",
+ ghost: "hover:bg-accent hover:text-accent-foreground",
+ link: "text-primary underline-offset-4 hover:underline",
+ },
+ size: {
+ default: "h-9 px-4 py-2",
+ sm: "h-8 rounded-md px-3 text-xs",
+ lg: "h-10 rounded-md px-8",
+ icon: "h-9 w-9",
+ },
+ },
+ defaultVariants: {
+ variant: "default",
+ size: "default",
+ },
+ },
+);
export interface ButtonProps
- extends React.ButtonHTMLAttributes<HTMLButtonElement>,
- VariantProps<typeof buttonVariants> {
- asChild?: boolean
+ extends React.ButtonHTMLAttributes<HTMLButtonElement>,
+ VariantProps<typeof buttonVariants> {
+ asChild?: boolean;
}
const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
- ({ className, variant, size, asChild = false, ...props }, ref) => {
- const Comp = asChild ? Slot : "button"
- return (
- <Comp
- className={cn(buttonVariants({ variant, size, className }))}
- ref={ref}
- {...props}
- />
- )
- }
-)
-Button.displayName = "Button"
+ ({ className, variant, size, asChild = false, ...props }, ref) => {
+ const Comp = asChild ? Slot : "button";
+ return <Comp className={cn(buttonVariants({ variant, size, className }))} ref={ref} {...props} />;
+ },
+);
+Button.displayName = "Button";
-export { Button, buttonVariants }
+export { Button, buttonVariants };
diff --git a/apps/canvas/front/src/components/ui/checkbox.tsx b/apps/canvas/front/src/components/ui/checkbox.tsx
index 8d02b28..84526ff 100644
--- a/apps/canvas/front/src/components/ui/checkbox.tsx
+++ b/apps/canvas/front/src/components/ui/checkbox.tsx
@@ -1,27 +1,25 @@
-import * as React from "react"
-import * as CheckboxPrimitive from "@radix-ui/react-checkbox"
-import { cn } from "@/lib/utils"
-import { CheckIcon } from "@radix-ui/react-icons"
+import * as React from "react";
+import * as CheckboxPrimitive from "@radix-ui/react-checkbox";
+import { cn } from "@/lib/utils";
+import { CheckIcon } from "@radix-ui/react-icons";
const Checkbox = React.forwardRef<
- React.ElementRef<typeof CheckboxPrimitive.Root>,
- React.ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root>
+ React.ElementRef<typeof CheckboxPrimitive.Root>,
+ React.ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root>
>(({ className, ...props }, ref) => (
- <CheckboxPrimitive.Root
- ref={ref}
- className={cn(
- "peer h-4 w-4 shrink-0 rounded-sm border border-primary shadow focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground",
- className
- )}
- {...props}
- >
- <CheckboxPrimitive.Indicator
- className={cn("flex items-center justify-center text-current")}
- >
- <CheckIcon className="h-4 w-4" />
- </CheckboxPrimitive.Indicator>
- </CheckboxPrimitive.Root>
-))
-Checkbox.displayName = CheckboxPrimitive.Root.displayName
+ <CheckboxPrimitive.Root
+ ref={ref}
+ className={cn(
+ "peer h-4 w-4 shrink-0 rounded-sm border border-primary shadow focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground",
+ className,
+ )}
+ {...props}
+ >
+ <CheckboxPrimitive.Indicator className={cn("flex items-center justify-center text-current")}>
+ <CheckIcon className="h-4 w-4" />
+ </CheckboxPrimitive.Indicator>
+ </CheckboxPrimitive.Root>
+));
+Checkbox.displayName = CheckboxPrimitive.Root.displayName;
-export { Checkbox }
+export { Checkbox };
diff --git a/apps/canvas/front/src/components/ui/collapsible.tsx b/apps/canvas/front/src/components/ui/collapsible.tsx
index a23e7a2..5c28cbc 100644
--- a/apps/canvas/front/src/components/ui/collapsible.tsx
+++ b/apps/canvas/front/src/components/ui/collapsible.tsx
@@ -1,9 +1,9 @@
-import * as CollapsiblePrimitive from "@radix-ui/react-collapsible"
+import * as CollapsiblePrimitive from "@radix-ui/react-collapsible";
-const Collapsible = CollapsiblePrimitive.Root
+const Collapsible = CollapsiblePrimitive.Root;
-const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger
+const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger;
-const CollapsibleContent = CollapsiblePrimitive.CollapsibleContent
+const CollapsibleContent = CollapsiblePrimitive.CollapsibleContent;
-export { Collapsible, CollapsibleTrigger, CollapsibleContent }
+export { Collapsible, CollapsibleTrigger, CollapsibleContent };
diff --git a/apps/canvas/front/src/components/ui/dialog.tsx b/apps/canvas/front/src/components/ui/dialog.tsx
index d40c864..ced2462 100644
--- a/apps/canvas/front/src/components/ui/dialog.tsx
+++ b/apps/canvas/front/src/components/ui/dialog.tsx
@@ -1,119 +1,94 @@
-import * as React from "react"
-import * as DialogPrimitive from "@radix-ui/react-dialog"
-import { cn } from "@/lib/utils"
-import { Cross2Icon } from "@radix-ui/react-icons"
+import * as React from "react";
+import * as DialogPrimitive from "@radix-ui/react-dialog";
+import { cn } from "@/lib/utils";
+import { Cross2Icon } from "@radix-ui/react-icons";
-const Dialog = DialogPrimitive.Root
+const Dialog = DialogPrimitive.Root;
-const DialogTrigger = DialogPrimitive.Trigger
+const DialogTrigger = DialogPrimitive.Trigger;
-const DialogPortal = DialogPrimitive.Portal
+const DialogPortal = DialogPrimitive.Portal;
-const DialogClose = DialogPrimitive.Close
+const DialogClose = DialogPrimitive.Close;
const DialogOverlay = React.forwardRef<
- React.ElementRef<typeof DialogPrimitive.Overlay>,
- React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
+ React.ElementRef<typeof DialogPrimitive.Overlay>,
+ React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
>(({ className, ...props }, ref) => (
- <DialogPrimitive.Overlay
- ref={ref}
- className={cn(
- "fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
- className
- )}
- {...props}
- />
-))
-DialogOverlay.displayName = DialogPrimitive.Overlay.displayName
+ <DialogPrimitive.Overlay
+ ref={ref}
+ className={cn(
+ "fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+ className,
+ )}
+ {...props}
+ />
+));
+DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;
const DialogContent = React.forwardRef<
- React.ElementRef<typeof DialogPrimitive.Content>,
- React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
+ React.ElementRef<typeof DialogPrimitive.Content>,
+ React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
>(({ className, children, ...props }, ref) => (
- <DialogPortal>
- <DialogOverlay />
- <DialogPrimitive.Content
- ref={ref}
- className={cn(
- "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
- className
- )}
- {...props}
- >
- {children}
- <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
- <Cross2Icon className="h-4 w-4" />
- <span className="sr-only">Close</span>
- </DialogPrimitive.Close>
- </DialogPrimitive.Content>
- </DialogPortal>
-))
-DialogContent.displayName = DialogPrimitive.Content.displayName
+ <DialogPortal>
+ <DialogOverlay />
+ <DialogPrimitive.Content
+ ref={ref}
+ className={cn(
+ "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
+ className,
+ )}
+ {...props}
+ >
+ {children}
+ <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
+ <Cross2Icon className="h-4 w-4" />
+ <span className="sr-only">Close</span>
+ </DialogPrimitive.Close>
+ </DialogPrimitive.Content>
+ </DialogPortal>
+));
+DialogContent.displayName = DialogPrimitive.Content.displayName;
-const DialogHeader = ({
- className,
- ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
- <div
- className={cn(
- "flex flex-col space-y-1.5 text-center sm:text-left",
- className
- )}
- {...props}
- />
-)
-DialogHeader.displayName = "DialogHeader"
+const DialogHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+ <div className={cn("flex flex-col space-y-1.5 text-center sm:text-left", className)} {...props} />
+);
+DialogHeader.displayName = "DialogHeader";
-const DialogFooter = ({
- className,
- ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
- <div
- className={cn(
- "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
- className
- )}
- {...props}
- />
-)
-DialogFooter.displayName = "DialogFooter"
+const DialogFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+ <div className={cn("flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2", className)} {...props} />
+);
+DialogFooter.displayName = "DialogFooter";
const DialogTitle = React.forwardRef<
- React.ElementRef<typeof DialogPrimitive.Title>,
- React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
+ React.ElementRef<typeof DialogPrimitive.Title>,
+ React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
>(({ className, ...props }, ref) => (
- <DialogPrimitive.Title
- ref={ref}
- className={cn(
- "text-lg font-semibold leading-none tracking-tight",
- className
- )}
- {...props}
- />
-))
-DialogTitle.displayName = DialogPrimitive.Title.displayName
+ <DialogPrimitive.Title
+ ref={ref}
+ className={cn("text-lg font-semibold leading-none tracking-tight", className)}
+ {...props}
+ />
+));
+DialogTitle.displayName = DialogPrimitive.Title.displayName;
const DialogDescription = React.forwardRef<
- React.ElementRef<typeof DialogPrimitive.Description>,
- React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
+ React.ElementRef<typeof DialogPrimitive.Description>,
+ React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
>(({ className, ...props }, ref) => (
- <DialogPrimitive.Description
- ref={ref}
- className={cn("text-sm text-muted-foreground", className)}
- {...props}
- />
-))
-DialogDescription.displayName = DialogPrimitive.Description.displayName
+ <DialogPrimitive.Description ref={ref} className={cn("text-sm text-muted-foreground", className)} {...props} />
+));
+DialogDescription.displayName = DialogPrimitive.Description.displayName;
export {
- Dialog,
- DialogPortal,
- DialogOverlay,
- DialogTrigger,
- DialogClose,
- DialogContent,
- DialogHeader,
- DialogFooter,
- DialogTitle,
- DialogDescription,
-}
+ Dialog,
+ DialogPortal,
+ DialogOverlay,
+ DialogTrigger,
+ DialogClose,
+ DialogContent,
+ DialogHeader,
+ DialogFooter,
+ DialogTitle,
+ DialogDescription,
+};
diff --git a/apps/canvas/front/src/components/ui/form.tsx b/apps/canvas/front/src/components/ui/form.tsx
index f6afdaf..c6a08f6 100644
--- a/apps/canvas/front/src/components/ui/form.tsx
+++ b/apps/canvas/front/src/components/ui/form.tsx
@@ -1,176 +1,141 @@
-import * as React from "react"
-import * as LabelPrimitive from "@radix-ui/react-label"
-import { Slot } from "@radix-ui/react-slot"
-import {
- Controller,
- ControllerProps,
- FieldPath,
- FieldValues,
- FormProvider,
- useFormContext,
-} from "react-hook-form"
+import * as React from "react";
+import * as LabelPrimitive from "@radix-ui/react-label";
+import { Slot } from "@radix-ui/react-slot";
+import { Controller, ControllerProps, FieldPath, FieldValues, FormProvider, useFormContext } from "react-hook-form";
-import { cn } from "@/lib/utils"
-import { Label } from "@/components/ui/label"
+import { cn } from "@/lib/utils";
+import { Label } from "@/components/ui/label";
-const Form = FormProvider
+const Form = FormProvider;
type FormFieldContextValue<
- TFieldValues extends FieldValues = FieldValues,
- TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>
+ TFieldValues extends FieldValues = FieldValues,
+ TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
> = {
- name: TName
-}
+ name: TName;
+};
-const FormFieldContext = React.createContext<FormFieldContextValue>(
- {} as FormFieldContextValue
-)
+const FormFieldContext = React.createContext<FormFieldContextValue>({} as FormFieldContextValue);
const FormField = <
- TFieldValues extends FieldValues = FieldValues,
- TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>
+ TFieldValues extends FieldValues = FieldValues,
+ TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
>({
- ...props
+ ...props
}: ControllerProps<TFieldValues, TName>) => {
- return (
- <FormFieldContext.Provider value={{ name: props.name }}>
- <Controller {...props} />
- </FormFieldContext.Provider>
- )
-}
+ return (
+ <FormFieldContext.Provider value={{ name: props.name }}>
+ <Controller {...props} />
+ </FormFieldContext.Provider>
+ );
+};
const useFormField = () => {
- const fieldContext = React.useContext(FormFieldContext)
- const itemContext = React.useContext(FormItemContext)
- const { getFieldState, formState } = useFormContext()
+ const fieldContext = React.useContext(FormFieldContext);
+ const itemContext = React.useContext(FormItemContext);
+ const { getFieldState, formState } = useFormContext();
- const fieldState = getFieldState(fieldContext.name, formState)
+ const fieldState = getFieldState(fieldContext.name, formState);
- if (!fieldContext) {
- throw new Error("useFormField should be used within <FormField>")
- }
+ if (!fieldContext) {
+ throw new Error("useFormField should be used within <FormField>");
+ }
- const { id } = itemContext
+ const { id } = itemContext;
- return {
- id,
- name: fieldContext.name,
- formItemId: `${id}-form-item`,
- formDescriptionId: `${id}-form-item-description`,
- formMessageId: `${id}-form-item-message`,
- ...fieldState,
- }
-}
+ return {
+ id,
+ name: fieldContext.name,
+ formItemId: `${id}-form-item`,
+ formDescriptionId: `${id}-form-item-description`,
+ formMessageId: `${id}-form-item-message`,
+ ...fieldState,
+ };
+};
type FormItemContextValue = {
- id: string
-}
+ id: string;
+};
-const FormItemContext = React.createContext<FormItemContextValue>(
- {} as FormItemContextValue
-)
+const FormItemContext = React.createContext<FormItemContextValue>({} as FormItemContextValue);
-const FormItem = React.forwardRef<
- HTMLDivElement,
- React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => {
- const id = React.useId()
+const FormItem = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
+ ({ className, ...props }, ref) => {
+ const id = React.useId();
- return (
- <FormItemContext.Provider value={{ id }}>
- <div ref={ref} className={cn("space-y-2", className)} {...props} />
- </FormItemContext.Provider>
- )
-})
-FormItem.displayName = "FormItem"
+ return (
+ <FormItemContext.Provider value={{ id }}>
+ <div ref={ref} className={cn("space-y-2", className)} {...props} />
+ </FormItemContext.Provider>
+ );
+ },
+);
+FormItem.displayName = "FormItem";
const FormLabel = React.forwardRef<
- React.ElementRef<typeof LabelPrimitive.Root>,
- React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root>
+ React.ElementRef<typeof LabelPrimitive.Root>,
+ React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root>
>(({ className, ...props }, ref) => {
- const { error, formItemId } = useFormField()
+ const { error, formItemId } = useFormField();
- return (
- <Label
- ref={ref}
- className={cn(error && "text-destructive", className)}
- htmlFor={formItemId}
- {...props}
- />
- )
-})
-FormLabel.displayName = "FormLabel"
+ return <Label ref={ref} className={cn(error && "text-destructive", className)} htmlFor={formItemId} {...props} />;
+});
+FormLabel.displayName = "FormLabel";
-const FormControl = React.forwardRef<
- React.ElementRef<typeof Slot>,
- React.ComponentPropsWithoutRef<typeof Slot>
->(({ ...props }, ref) => {
- const { error, formItemId, formDescriptionId, formMessageId } = useFormField()
+const FormControl = React.forwardRef<React.ElementRef<typeof Slot>, React.ComponentPropsWithoutRef<typeof Slot>>(
+ ({ ...props }, ref) => {
+ const { error, formItemId, formDescriptionId, formMessageId } = useFormField();
- return (
- <Slot
- ref={ref}
- id={formItemId}
- aria-describedby={
- !error
- ? `${formDescriptionId}`
- : `${formDescriptionId} ${formMessageId}`
- }
- aria-invalid={!!error}
- {...props}
- />
- )
-})
-FormControl.displayName = "FormControl"
+ return (
+ <Slot
+ ref={ref}
+ id={formItemId}
+ aria-describedby={!error ? `${formDescriptionId}` : `${formDescriptionId} ${formMessageId}`}
+ aria-invalid={!!error}
+ {...props}
+ />
+ );
+ },
+);
+FormControl.displayName = "FormControl";
-const FormDescription = React.forwardRef<
- HTMLParagraphElement,
- React.HTMLAttributes<HTMLParagraphElement>
->(({ className, ...props }, ref) => {
- const { formDescriptionId } = useFormField()
+const FormDescription = React.forwardRef<HTMLParagraphElement, React.HTMLAttributes<HTMLParagraphElement>>(
+ ({ className, ...props }, ref) => {
+ const { formDescriptionId } = useFormField();
- return (
- <p
- ref={ref}
- id={formDescriptionId}
- className={cn("text-[0.8rem] text-muted-foreground", className)}
- {...props}
- />
- )
-})
-FormDescription.displayName = "FormDescription"
+ return (
+ <p
+ ref={ref}
+ id={formDescriptionId}
+ className={cn("text-[0.8rem] text-muted-foreground", className)}
+ {...props}
+ />
+ );
+ },
+);
+FormDescription.displayName = "FormDescription";
-const FormMessage = React.forwardRef<
- HTMLParagraphElement,
- React.HTMLAttributes<HTMLParagraphElement>
->(({ className, children, ...props }, ref) => {
- const { error, formMessageId } = useFormField()
- const body = error ? String(error?.message) : children
+const FormMessage = React.forwardRef<HTMLParagraphElement, React.HTMLAttributes<HTMLParagraphElement>>(
+ ({ className, children, ...props }, ref) => {
+ const { error, formMessageId } = useFormField();
+ const body = error ? String(error?.message) : children;
- if (!body) {
- return null
- }
+ if (!body) {
+ return null;
+ }
- return (
- <p
- ref={ref}
- id={formMessageId}
- className={cn("text-[0.8rem] font-medium text-destructive", className)}
- {...props}
- >
- {body}
- </p>
- )
-})
-FormMessage.displayName = "FormMessage"
+ return (
+ <p
+ ref={ref}
+ id={formMessageId}
+ className={cn("text-[0.8rem] font-medium text-destructive", className)}
+ {...props}
+ >
+ {body}
+ </p>
+ );
+ },
+);
+FormMessage.displayName = "FormMessage";
-export {
- useFormField,
- Form,
- FormItem,
- FormLabel,
- FormControl,
- FormDescription,
- FormMessage,
- FormField,
-}
+export { useFormField, Form, FormItem, FormLabel, FormControl, FormDescription, FormMessage, FormField };
diff --git a/apps/canvas/front/src/components/ui/input.tsx b/apps/canvas/front/src/components/ui/input.tsx
index 5af26b2..b84e489 100644
--- a/apps/canvas/front/src/components/ui/input.tsx
+++ b/apps/canvas/front/src/components/ui/input.tsx
@@ -1,25 +1,22 @@
-import * as React from "react"
+import * as React from "react";
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
-export interface InputProps
- extends React.InputHTMLAttributes<HTMLInputElement> {}
+export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {}
-const Input = React.forwardRef<HTMLInputElement, InputProps>(
- ({ className, type, ...props }, ref) => {
- return (
- <input
- type={type}
- className={cn(
- "flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
- className
- )}
- ref={ref}
- {...props}
- />
- )
- }
-)
-Input.displayName = "Input"
+const Input = React.forwardRef<HTMLInputElement, InputProps>(({ className, type, ...props }, ref) => {
+ return (
+ <input
+ type={type}
+ className={cn(
+ "flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
+ className,
+ )}
+ ref={ref}
+ {...props}
+ />
+ );
+});
+Input.displayName = "Input";
-export { Input }
+export { Input };
diff --git a/apps/canvas/front/src/components/ui/label.tsx b/apps/canvas/front/src/components/ui/label.tsx
index 683faa7..18c025f 100644
--- a/apps/canvas/front/src/components/ui/label.tsx
+++ b/apps/canvas/front/src/components/ui/label.tsx
@@ -1,24 +1,17 @@
-import * as React from "react"
-import * as LabelPrimitive from "@radix-ui/react-label"
-import { cva, type VariantProps } from "class-variance-authority"
+import * as React from "react";
+import * as LabelPrimitive from "@radix-ui/react-label";
+import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
-const labelVariants = cva(
- "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-)
+const labelVariants = cva("text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70");
const Label = React.forwardRef<
- React.ElementRef<typeof LabelPrimitive.Root>,
- React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root> &
- VariantProps<typeof labelVariants>
+ React.ElementRef<typeof LabelPrimitive.Root>,
+ React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root> & VariantProps<typeof labelVariants>
>(({ className, ...props }, ref) => (
- <LabelPrimitive.Root
- ref={ref}
- className={cn(labelVariants(), className)}
- {...props}
- />
-))
-Label.displayName = LabelPrimitive.Root.displayName
+ <LabelPrimitive.Root ref={ref} className={cn(labelVariants(), className)} {...props} />
+));
+Label.displayName = LabelPrimitive.Root.displayName;
-export { Label }
+export { Label };
diff --git a/apps/canvas/front/src/components/ui/popover.tsx b/apps/canvas/front/src/components/ui/popover.tsx
index d82e714..7e8b5e3 100644
--- a/apps/canvas/front/src/components/ui/popover.tsx
+++ b/apps/canvas/front/src/components/ui/popover.tsx
@@ -1,31 +1,31 @@
-import * as React from "react"
-import * as PopoverPrimitive from "@radix-ui/react-popover"
+import * as React from "react";
+import * as PopoverPrimitive from "@radix-ui/react-popover";
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
-const Popover = PopoverPrimitive.Root
+const Popover = PopoverPrimitive.Root;
-const PopoverTrigger = PopoverPrimitive.Trigger
+const PopoverTrigger = PopoverPrimitive.Trigger;
-const PopoverAnchor = PopoverPrimitive.Anchor
+const PopoverAnchor = PopoverPrimitive.Anchor;
const PopoverContent = React.forwardRef<
- React.ElementRef<typeof PopoverPrimitive.Content>,
- React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>
+ React.ElementRef<typeof PopoverPrimitive.Content>,
+ React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>
>(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
- <PopoverPrimitive.Portal>
- <PopoverPrimitive.Content
- ref={ref}
- align={align}
- sideOffset={sideOffset}
- className={cn(
- "z-50 w-72 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
- className
- )}
- {...props}
- />
- </PopoverPrimitive.Portal>
-))
-PopoverContent.displayName = PopoverPrimitive.Content.displayName
+ <PopoverPrimitive.Portal>
+ <PopoverPrimitive.Content
+ ref={ref}
+ align={align}
+ sideOffset={sideOffset}
+ className={cn(
+ "z-50 w-72 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+ className,
+ )}
+ {...props}
+ />
+ </PopoverPrimitive.Portal>
+));
+PopoverContent.displayName = PopoverPrimitive.Content.displayName;
-export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor }
+export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor };
diff --git a/apps/canvas/front/src/components/ui/resizable.tsx b/apps/canvas/front/src/components/ui/resizable.tsx
index 0e600f8..938a518 100644
--- a/apps/canvas/front/src/components/ui/resizable.tsx
+++ b/apps/canvas/front/src/components/ui/resizable.tsx
@@ -1,43 +1,37 @@
-import * as ResizablePrimitive from "react-resizable-panels"
+import * as ResizablePrimitive from "react-resizable-panels";
-import { cn } from "@/lib/utils"
-import { DragHandleDots2Icon } from "@radix-ui/react-icons"
+import { cn } from "@/lib/utils";
+import { DragHandleDots2Icon } from "@radix-ui/react-icons";
-const ResizablePanelGroup = ({
- className,
- ...props
-}: React.ComponentProps<typeof ResizablePrimitive.PanelGroup>) => (
- <ResizablePrimitive.PanelGroup
- className={cn(
- "flex h-full w-full data-[panel-group-direction=vertical]:flex-col",
- className
- )}
- {...props}
- />
-)
+const ResizablePanelGroup = ({ className, ...props }: React.ComponentProps<typeof ResizablePrimitive.PanelGroup>) => (
+ <ResizablePrimitive.PanelGroup
+ className={cn("flex h-full w-full data-[panel-group-direction=vertical]:flex-col", className)}
+ {...props}
+ />
+);
-const ResizablePanel = ResizablePrimitive.Panel
+const ResizablePanel = ResizablePrimitive.Panel;
const ResizableHandle = ({
- withHandle,
- className,
- ...props
+ withHandle,
+ className,
+ ...props
}: React.ComponentProps<typeof ResizablePrimitive.PanelResizeHandle> & {
- withHandle?: boolean
+ withHandle?: boolean;
}) => (
- <ResizablePrimitive.PanelResizeHandle
- className={cn(
- "relative flex w-px items-center justify-center bg-border after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-1 data-[panel-group-direction=vertical]:h-px data-[panel-group-direction=vertical]:w-full data-[panel-group-direction=vertical]:after:left-0 data-[panel-group-direction=vertical]:after:h-1 data-[panel-group-direction=vertical]:after:w-full data-[panel-group-direction=vertical]:after:-translate-y-1/2 data-[panel-group-direction=vertical]:after:translate-x-0 [&[data-panel-group-direction=vertical]>div]:rotate-90",
- className
- )}
- {...props}
- >
- {withHandle && (
- <div className="z-10 flex h-4 w-3 items-center justify-center rounded-sm border bg-border">
- <DragHandleDots2Icon className="h-2.5 w-2.5" />
- </div>
- )}
- </ResizablePrimitive.PanelResizeHandle>
-)
+ <ResizablePrimitive.PanelResizeHandle
+ className={cn(
+ "relative flex w-px items-center justify-center bg-border after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-1 data-[panel-group-direction=vertical]:h-px data-[panel-group-direction=vertical]:w-full data-[panel-group-direction=vertical]:after:left-0 data-[panel-group-direction=vertical]:after:h-1 data-[panel-group-direction=vertical]:after:w-full data-[panel-group-direction=vertical]:after:-translate-y-1/2 data-[panel-group-direction=vertical]:after:translate-x-0 [&[data-panel-group-direction=vertical]>div]:rotate-90",
+ className,
+ )}
+ {...props}
+ >
+ {withHandle && (
+ <div className="z-10 flex h-4 w-3 items-center justify-center rounded-sm border bg-border">
+ <DragHandleDots2Icon className="h-2.5 w-2.5" />
+ </div>
+ )}
+ </ResizablePrimitive.PanelResizeHandle>
+);
-export { ResizablePanelGroup, ResizablePanel, ResizableHandle }
+export { ResizablePanelGroup, ResizablePanel, ResizableHandle };
diff --git a/apps/canvas/front/src/components/ui/scroll-area.tsx b/apps/canvas/front/src/components/ui/scroll-area.tsx
index cf253cf..2f54db2 100644
--- a/apps/canvas/front/src/components/ui/scroll-area.tsx
+++ b/apps/canvas/front/src/components/ui/scroll-area.tsx
@@ -1,46 +1,40 @@
-import * as React from "react"
-import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area"
+import * as React from "react";
+import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area";
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
const ScrollArea = React.forwardRef<
- React.ElementRef<typeof ScrollAreaPrimitive.Root>,
- React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.Root>
+ React.ElementRef<typeof ScrollAreaPrimitive.Root>,
+ React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.Root>
>(({ className, children, ...props }, ref) => (
- <ScrollAreaPrimitive.Root
- ref={ref}
- className={cn("relative overflow-hidden", className)}
- {...props}
- >
- <ScrollAreaPrimitive.Viewport className="h-full w-full rounded-[inherit]">
- {children}
- </ScrollAreaPrimitive.Viewport>
- <ScrollBar />
- <ScrollAreaPrimitive.Corner />
- </ScrollAreaPrimitive.Root>
-))
-ScrollArea.displayName = ScrollAreaPrimitive.Root.displayName
+ <ScrollAreaPrimitive.Root ref={ref} className={cn("relative overflow-hidden", className)} {...props}>
+ <ScrollAreaPrimitive.Viewport className="h-full w-full rounded-[inherit]">
+ {children}
+ </ScrollAreaPrimitive.Viewport>
+ <ScrollBar />
+ <ScrollAreaPrimitive.Corner />
+ </ScrollAreaPrimitive.Root>
+));
+ScrollArea.displayName = ScrollAreaPrimitive.Root.displayName;
const ScrollBar = React.forwardRef<
- React.ElementRef<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>,
- React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>
+ React.ElementRef<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>,
+ React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>
>(({ className, orientation = "vertical", ...props }, ref) => (
- <ScrollAreaPrimitive.ScrollAreaScrollbar
- ref={ref}
- orientation={orientation}
- className={cn(
- "flex touch-none select-none transition-colors",
- orientation === "vertical" &&
- "h-full w-2.5 border-l border-l-transparent p-[1px]",
- orientation === "horizontal" &&
- "h-2.5 flex-col border-t border-t-transparent p-[1px]",
- className
- )}
- {...props}
- >
- <ScrollAreaPrimitive.ScrollAreaThumb className="relative flex-1 rounded-full bg-border" />
- </ScrollAreaPrimitive.ScrollAreaScrollbar>
-))
-ScrollBar.displayName = ScrollAreaPrimitive.ScrollAreaScrollbar.displayName
+ <ScrollAreaPrimitive.ScrollAreaScrollbar
+ ref={ref}
+ orientation={orientation}
+ className={cn(
+ "flex touch-none select-none transition-colors",
+ orientation === "vertical" && "h-full w-2.5 border-l border-l-transparent p-[1px]",
+ orientation === "horizontal" && "h-2.5 flex-col border-t border-t-transparent p-[1px]",
+ className,
+ )}
+ {...props}
+ >
+ <ScrollAreaPrimitive.ScrollAreaThumb className="relative flex-1 rounded-full bg-border" />
+ </ScrollAreaPrimitive.ScrollAreaScrollbar>
+));
+ScrollBar.displayName = ScrollAreaPrimitive.ScrollAreaScrollbar.displayName;
-export { ScrollArea, ScrollBar }
+export { ScrollArea, ScrollBar };
diff --git a/apps/canvas/front/src/components/ui/select.tsx b/apps/canvas/front/src/components/ui/select.tsx
index cdfb8ce..c808126 100644
--- a/apps/canvas/front/src/components/ui/select.tsx
+++ b/apps/canvas/front/src/components/ui/select.tsx
@@ -1,162 +1,142 @@
-import * as React from "react"
-import {
- CaretSortIcon,
- CheckIcon,
- ChevronDownIcon,
- ChevronUpIcon,
-} from "@radix-ui/react-icons"
-import * as SelectPrimitive from "@radix-ui/react-select"
+import * as React from "react";
+import { CaretSortIcon, CheckIcon, ChevronDownIcon, ChevronUpIcon } from "@radix-ui/react-icons";
+import * as SelectPrimitive from "@radix-ui/react-select";
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
-const Select = SelectPrimitive.Root
+const Select = SelectPrimitive.Root;
-const SelectGroup = SelectPrimitive.Group
+const SelectGroup = SelectPrimitive.Group;
-const SelectValue = SelectPrimitive.Value
+const SelectValue = SelectPrimitive.Value;
const SelectTrigger = React.forwardRef<
- React.ElementRef<typeof SelectPrimitive.Trigger>,
- React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger>
+ React.ElementRef<typeof SelectPrimitive.Trigger>,
+ React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger>
>(({ className, children, ...props }, ref) => (
- <SelectPrimitive.Trigger
- ref={ref}
- className={cn(
- "flex h-9 w-full items-center justify-between whitespace-nowrap rounded-md border border-input bg-transparent px-3 py-2 text-sm shadow-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1",
- className
- )}
- {...props}
- >
- {children}
- <SelectPrimitive.Icon asChild>
- <CaretSortIcon className="h-4 w-4 opacity-50" />
- </SelectPrimitive.Icon>
- </SelectPrimitive.Trigger>
-))
-SelectTrigger.displayName = SelectPrimitive.Trigger.displayName
+ <SelectPrimitive.Trigger
+ ref={ref}
+ className={cn(
+ "flex h-9 w-full items-center justify-between whitespace-nowrap rounded-md border border-input bg-transparent px-3 py-2 text-sm shadow-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1",
+ className,
+ )}
+ {...props}
+ >
+ {children}
+ <SelectPrimitive.Icon asChild>
+ <CaretSortIcon className="h-4 w-4 opacity-50" />
+ </SelectPrimitive.Icon>
+ </SelectPrimitive.Trigger>
+));
+SelectTrigger.displayName = SelectPrimitive.Trigger.displayName;
const SelectScrollUpButton = React.forwardRef<
- React.ElementRef<typeof SelectPrimitive.ScrollUpButton>,
- React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollUpButton>
+ React.ElementRef<typeof SelectPrimitive.ScrollUpButton>,
+ React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollUpButton>
>(({ className, ...props }, ref) => (
- <SelectPrimitive.ScrollUpButton
- ref={ref}
- className={cn(
- "flex cursor-default items-center justify-center py-1",
- className
- )}
- {...props}
- >
- <ChevronUpIcon />
- </SelectPrimitive.ScrollUpButton>
-))
-SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName
+ <SelectPrimitive.ScrollUpButton
+ ref={ref}
+ className={cn("flex cursor-default items-center justify-center py-1", className)}
+ {...props}
+ >
+ <ChevronUpIcon />
+ </SelectPrimitive.ScrollUpButton>
+));
+SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName;
const SelectScrollDownButton = React.forwardRef<
- React.ElementRef<typeof SelectPrimitive.ScrollDownButton>,
- React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollDownButton>
+ React.ElementRef<typeof SelectPrimitive.ScrollDownButton>,
+ React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollDownButton>
>(({ className, ...props }, ref) => (
- <SelectPrimitive.ScrollDownButton
- ref={ref}
- className={cn(
- "flex cursor-default items-center justify-center py-1",
- className
- )}
- {...props}
- >
- <ChevronDownIcon />
- </SelectPrimitive.ScrollDownButton>
-))
-SelectScrollDownButton.displayName =
- SelectPrimitive.ScrollDownButton.displayName
+ <SelectPrimitive.ScrollDownButton
+ ref={ref}
+ className={cn("flex cursor-default items-center justify-center py-1", className)}
+ {...props}
+ >
+ <ChevronDownIcon />
+ </SelectPrimitive.ScrollDownButton>
+));
+SelectScrollDownButton.displayName = SelectPrimitive.ScrollDownButton.displayName;
const SelectContent = React.forwardRef<
- React.ElementRef<typeof SelectPrimitive.Content>,
- React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content>
+ React.ElementRef<typeof SelectPrimitive.Content>,
+ React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content>
>(({ className, children, position = "popper", ...props }, ref) => (
- <SelectPrimitive.Portal>
- <SelectPrimitive.Content
- ref={ref}
- className={cn(
- "relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border bg-popover text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
- position === "popper" &&
- "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
- className
- )}
- position={position}
- {...props}
- >
- <SelectScrollUpButton />
- <SelectPrimitive.Viewport
- className={cn(
- "p-1",
- position === "popper" &&
- "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]"
- )}
- >
- {children}
- </SelectPrimitive.Viewport>
- <SelectScrollDownButton />
- </SelectPrimitive.Content>
- </SelectPrimitive.Portal>
-))
-SelectContent.displayName = SelectPrimitive.Content.displayName
+ <SelectPrimitive.Portal>
+ <SelectPrimitive.Content
+ ref={ref}
+ className={cn(
+ "relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border bg-popover text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+ position === "popper" &&
+ "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
+ className,
+ )}
+ position={position}
+ {...props}
+ >
+ <SelectScrollUpButton />
+ <SelectPrimitive.Viewport
+ className={cn(
+ "p-1",
+ position === "popper" &&
+ "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]",
+ )}
+ >
+ {children}
+ </SelectPrimitive.Viewport>
+ <SelectScrollDownButton />
+ </SelectPrimitive.Content>
+ </SelectPrimitive.Portal>
+));
+SelectContent.displayName = SelectPrimitive.Content.displayName;
const SelectLabel = React.forwardRef<
- React.ElementRef<typeof SelectPrimitive.Label>,
- React.ComponentPropsWithoutRef<typeof SelectPrimitive.Label>
+ React.ElementRef<typeof SelectPrimitive.Label>,
+ React.ComponentPropsWithoutRef<typeof SelectPrimitive.Label>
>(({ className, ...props }, ref) => (
- <SelectPrimitive.Label
- ref={ref}
- className={cn("px-2 py-1.5 text-sm font-semibold", className)}
- {...props}
- />
-))
-SelectLabel.displayName = SelectPrimitive.Label.displayName
+ <SelectPrimitive.Label ref={ref} className={cn("px-2 py-1.5 text-sm font-semibold", className)} {...props} />
+));
+SelectLabel.displayName = SelectPrimitive.Label.displayName;
const SelectItem = React.forwardRef<
- React.ElementRef<typeof SelectPrimitive.Item>,
- React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>
+ React.ElementRef<typeof SelectPrimitive.Item>,
+ React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>
>(({ className, children, ...props }, ref) => (
- <SelectPrimitive.Item
- ref={ref}
- className={cn(
- "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
- className
- )}
- {...props}
- >
- <span className="absolute right-2 flex h-3.5 w-3.5 items-center justify-center">
- <SelectPrimitive.ItemIndicator>
- <CheckIcon className="h-4 w-4" />
- </SelectPrimitive.ItemIndicator>
- </span>
- <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
- </SelectPrimitive.Item>
-))
-SelectItem.displayName = SelectPrimitive.Item.displayName
+ <SelectPrimitive.Item
+ ref={ref}
+ className={cn(
+ "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+ className,
+ )}
+ {...props}
+ >
+ <span className="absolute right-2 flex h-3.5 w-3.5 items-center justify-center">
+ <SelectPrimitive.ItemIndicator>
+ <CheckIcon className="h-4 w-4" />
+ </SelectPrimitive.ItemIndicator>
+ </span>
+ <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
+ </SelectPrimitive.Item>
+));
+SelectItem.displayName = SelectPrimitive.Item.displayName;
const SelectSeparator = React.forwardRef<
- React.ElementRef<typeof SelectPrimitive.Separator>,
- React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>
+ React.ElementRef<typeof SelectPrimitive.Separator>,
+ React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>
>(({ className, ...props }, ref) => (
- <SelectPrimitive.Separator
- ref={ref}
- className={cn("-mx-1 my-1 h-px bg-muted", className)}
- {...props}
- />
-))
-SelectSeparator.displayName = SelectPrimitive.Separator.displayName
+ <SelectPrimitive.Separator ref={ref} className={cn("-mx-1 my-1 h-px bg-muted", className)} {...props} />
+));
+SelectSeparator.displayName = SelectPrimitive.Separator.displayName;
export {
- Select,
- SelectGroup,
- SelectValue,
- SelectTrigger,
- SelectContent,
- SelectLabel,
- SelectItem,
- SelectSeparator,
- SelectScrollUpButton,
- SelectScrollDownButton,
-}
+ Select,
+ SelectGroup,
+ SelectValue,
+ SelectTrigger,
+ SelectContent,
+ SelectLabel,
+ SelectItem,
+ SelectSeparator,
+ SelectScrollUpButton,
+ SelectScrollDownButton,
+};
diff --git a/apps/canvas/front/src/components/ui/separator.tsx b/apps/canvas/front/src/components/ui/separator.tsx
index 6d7f122..929a9e2 100644
--- a/apps/canvas/front/src/components/ui/separator.tsx
+++ b/apps/canvas/front/src/components/ui/separator.tsx
@@ -1,29 +1,24 @@
-import * as React from "react"
-import * as SeparatorPrimitive from "@radix-ui/react-separator"
+import * as React from "react";
+import * as SeparatorPrimitive from "@radix-ui/react-separator";
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
const Separator = React.forwardRef<
- React.ElementRef<typeof SeparatorPrimitive.Root>,
- React.ComponentPropsWithoutRef<typeof SeparatorPrimitive.Root>
->(
- (
- { className, orientation = "horizontal", decorative = true, ...props },
- ref
- ) => (
- <SeparatorPrimitive.Root
- ref={ref}
- decorative={decorative}
- orientation={orientation}
- className={cn(
- "shrink-0 bg-border",
- orientation === "horizontal" ? "h-[1px] w-full" : "h-full w-[1px]",
- className
- )}
- {...props}
- />
- )
-)
-Separator.displayName = SeparatorPrimitive.Root.displayName
+ React.ElementRef<typeof SeparatorPrimitive.Root>,
+ React.ComponentPropsWithoutRef<typeof SeparatorPrimitive.Root>
+>(({ className, orientation = "horizontal", decorative = true, ...props }, ref) => (
+ <SeparatorPrimitive.Root
+ ref={ref}
+ decorative={decorative}
+ orientation={orientation}
+ className={cn(
+ "shrink-0 bg-border",
+ orientation === "horizontal" ? "h-[1px] w-full" : "h-full w-[1px]",
+ className,
+ )}
+ {...props}
+ />
+));
+Separator.displayName = SeparatorPrimitive.Root.displayName;
-export { Separator }
+export { Separator };
diff --git a/apps/canvas/front/src/components/ui/sheet.tsx b/apps/canvas/front/src/components/ui/sheet.tsx
index 417e7e1..e9967e6 100644
--- a/apps/canvas/front/src/components/ui/sheet.tsx
+++ b/apps/canvas/front/src/components/ui/sheet.tsx
@@ -1,140 +1,107 @@
-"use client"
+"use client";
-import * as React from "react"
-import * as SheetPrimitive from "@radix-ui/react-dialog"
-import { Cross2Icon } from "@radix-ui/react-icons"
-import { cva, type VariantProps } from "class-variance-authority"
+import * as React from "react";
+import * as SheetPrimitive from "@radix-ui/react-dialog";
+import { Cross2Icon } from "@radix-ui/react-icons";
+import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
-const Sheet = SheetPrimitive.Root
+const Sheet = SheetPrimitive.Root;
-const SheetTrigger = SheetPrimitive.Trigger
+const SheetTrigger = SheetPrimitive.Trigger;
-const SheetClose = SheetPrimitive.Close
+const SheetClose = SheetPrimitive.Close;
-const SheetPortal = SheetPrimitive.Portal
+const SheetPortal = SheetPrimitive.Portal;
const SheetOverlay = React.forwardRef<
- React.ElementRef<typeof SheetPrimitive.Overlay>,
- React.ComponentPropsWithoutRef<typeof SheetPrimitive.Overlay>
+ React.ElementRef<typeof SheetPrimitive.Overlay>,
+ React.ComponentPropsWithoutRef<typeof SheetPrimitive.Overlay>
>(({ className, ...props }, ref) => (
- <SheetPrimitive.Overlay
- className={cn(
- "fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
- className
- )}
- {...props}
- ref={ref}
- />
-))
-SheetOverlay.displayName = SheetPrimitive.Overlay.displayName
+ <SheetPrimitive.Overlay
+ className={cn(
+ "fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+ className,
+ )}
+ {...props}
+ ref={ref}
+ />
+));
+SheetOverlay.displayName = SheetPrimitive.Overlay.displayName;
const sheetVariants = cva(
- "fixed z-50 gap-4 bg-background p-6 shadow-lg transition ease-in-out data-[state=closed]:duration-300 data-[state=open]:duration-500 data-[state=open]:animate-in data-[state=closed]:animate-out",
- {
- variants: {
- side: {
- top: "inset-x-0 top-0 border-b data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top",
- bottom:
- "inset-x-0 bottom-0 border-t data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom",
- left: "inset-y-0 left-0 h-full w-3/4 border-r data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left sm:max-w-sm",
- right:
- "inset-y-0 right-0 h-full w-3/4 border-l data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right sm:max-w-sm",
- },
- },
- defaultVariants: {
- side: "right",
- },
- }
-)
+ "fixed z-50 gap-4 bg-background p-6 shadow-lg transition ease-in-out data-[state=closed]:duration-300 data-[state=open]:duration-500 data-[state=open]:animate-in data-[state=closed]:animate-out",
+ {
+ variants: {
+ side: {
+ top: "inset-x-0 top-0 border-b data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top",
+ bottom: "inset-x-0 bottom-0 border-t data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom",
+ left: "inset-y-0 left-0 h-full w-3/4 border-r data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left sm:max-w-sm",
+ right: "inset-y-0 right-0 h-full w-3/4 border-l data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right sm:max-w-sm",
+ },
+ },
+ defaultVariants: {
+ side: "right",
+ },
+ },
+);
interface SheetContentProps
- extends React.ComponentPropsWithoutRef<typeof SheetPrimitive.Content>,
- VariantProps<typeof sheetVariants> {}
+ extends React.ComponentPropsWithoutRef<typeof SheetPrimitive.Content>,
+ VariantProps<typeof sheetVariants> {}
-const SheetContent = React.forwardRef<
- React.ElementRef<typeof SheetPrimitive.Content>,
- SheetContentProps
->(({ side = "right", className, children, ...props }, ref) => (
- <SheetPortal>
- <SheetOverlay />
- <SheetPrimitive.Content
- ref={ref}
- className={cn(sheetVariants({ side }), className)}
- {...props}
- >
- <SheetPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-secondary">
- <Cross2Icon className="h-4 w-4" />
- <span className="sr-only">Close</span>
- </SheetPrimitive.Close>
- {children}
- </SheetPrimitive.Content>
- </SheetPortal>
-))
-SheetContent.displayName = SheetPrimitive.Content.displayName
+const SheetContent = React.forwardRef<React.ElementRef<typeof SheetPrimitive.Content>, SheetContentProps>(
+ ({ side = "right", className, children, ...props }, ref) => (
+ <SheetPortal>
+ <SheetOverlay />
+ <SheetPrimitive.Content ref={ref} className={cn(sheetVariants({ side }), className)} {...props}>
+ <SheetPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-secondary">
+ <Cross2Icon className="h-4 w-4" />
+ <span className="sr-only">Close</span>
+ </SheetPrimitive.Close>
+ {children}
+ </SheetPrimitive.Content>
+ </SheetPortal>
+ ),
+);
+SheetContent.displayName = SheetPrimitive.Content.displayName;
-const SheetHeader = ({
- className,
- ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
- <div
- className={cn(
- "flex flex-col space-y-2 text-center sm:text-left",
- className
- )}
- {...props}
- />
-)
-SheetHeader.displayName = "SheetHeader"
+const SheetHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+ <div className={cn("flex flex-col space-y-2 text-center sm:text-left", className)} {...props} />
+);
+SheetHeader.displayName = "SheetHeader";
-const SheetFooter = ({
- className,
- ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
- <div
- className={cn(
- "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
- className
- )}
- {...props}
- />
-)
-SheetFooter.displayName = "SheetFooter"
+const SheetFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+ <div className={cn("flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2", className)} {...props} />
+);
+SheetFooter.displayName = "SheetFooter";
const SheetTitle = React.forwardRef<
- React.ElementRef<typeof SheetPrimitive.Title>,
- React.ComponentPropsWithoutRef<typeof SheetPrimitive.Title>
+ React.ElementRef<typeof SheetPrimitive.Title>,
+ React.ComponentPropsWithoutRef<typeof SheetPrimitive.Title>
>(({ className, ...props }, ref) => (
- <SheetPrimitive.Title
- ref={ref}
- className={cn("text-lg font-semibold text-foreground", className)}
- {...props}
- />
-))
-SheetTitle.displayName = SheetPrimitive.Title.displayName
+ <SheetPrimitive.Title ref={ref} className={cn("text-lg font-semibold text-foreground", className)} {...props} />
+));
+SheetTitle.displayName = SheetPrimitive.Title.displayName;
const SheetDescription = React.forwardRef<
- React.ElementRef<typeof SheetPrimitive.Description>,
- React.ComponentPropsWithoutRef<typeof SheetPrimitive.Description>
+ React.ElementRef<typeof SheetPrimitive.Description>,
+ React.ComponentPropsWithoutRef<typeof SheetPrimitive.Description>
>(({ className, ...props }, ref) => (
- <SheetPrimitive.Description
- ref={ref}
- className={cn("text-sm text-muted-foreground", className)}
- {...props}
- />
-))
-SheetDescription.displayName = SheetPrimitive.Description.displayName
+ <SheetPrimitive.Description ref={ref} className={cn("text-sm text-muted-foreground", className)} {...props} />
+));
+SheetDescription.displayName = SheetPrimitive.Description.displayName;
export {
- Sheet,
- SheetPortal,
- SheetOverlay,
- SheetTrigger,
- SheetClose,
- SheetContent,
- SheetHeader,
- SheetFooter,
- SheetTitle,
- SheetDescription,
-}
+ Sheet,
+ SheetPortal,
+ SheetOverlay,
+ SheetTrigger,
+ SheetClose,
+ SheetContent,
+ SheetHeader,
+ SheetFooter,
+ SheetTitle,
+ SheetDescription,
+};
diff --git a/apps/canvas/front/src/components/ui/sidebar.tsx b/apps/canvas/front/src/components/ui/sidebar.tsx
index 1a566bf..48fc8c8 100644
--- a/apps/canvas/front/src/components/ui/sidebar.tsx
+++ b/apps/canvas/front/src/components/ui/sidebar.tsx
@@ -1,761 +1,640 @@
-import * as React from "react"
-import { Slot } from "@radix-ui/react-slot"
-import { VariantProps, cva } from "class-variance-authority"
-import { PanelLeft } from "lucide-react"
+import * as React from "react";
+import { Slot } from "@radix-ui/react-slot";
+import { VariantProps, cva } from "class-variance-authority";
+import { PanelLeft } from "lucide-react";
-import { useIsMobile } from "@/hooks/use-mobile"
-import { cn } from "@/lib/utils"
-import { Button } from "@/components/ui/button"
-import { Input } from "@/components/ui/input"
-import { Separator } from "@/components/ui/separator"
-import { Sheet, SheetContent } from "@/components/ui/sheet"
-import { Skeleton } from "@/components/ui/skeleton"
-import {
- Tooltip,
- TooltipContent,
- TooltipProvider,
- TooltipTrigger,
-} from "@/components/ui/tooltip"
+import { useIsMobile } from "@/hooks/use-mobile";
+import { cn } from "@/lib/utils";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Separator } from "@/components/ui/separator";
+import { Sheet, SheetContent } from "@/components/ui/sheet";
+import { Skeleton } from "@/components/ui/skeleton";
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
-const SIDEBAR_COOKIE_NAME = "sidebar:state"
-const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7
-const SIDEBAR_WIDTH = "16rem"
-const SIDEBAR_WIDTH_MOBILE = "18rem"
-const SIDEBAR_WIDTH_ICON = "3rem"
-const SIDEBAR_KEYBOARD_SHORTCUT = "b"
+const SIDEBAR_COOKIE_NAME = "sidebar:state";
+const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
+const SIDEBAR_WIDTH = "16rem";
+const SIDEBAR_WIDTH_MOBILE = "18rem";
+const SIDEBAR_WIDTH_ICON = "3rem";
+const SIDEBAR_KEYBOARD_SHORTCUT = "b";
type SidebarContext = {
- state: "expanded" | "collapsed"
- open: boolean
- setOpen: (open: boolean) => void
- openMobile: boolean
- setOpenMobile: (open: boolean) => void
- isMobile: boolean
- toggleSidebar: () => void
-}
+ state: "expanded" | "collapsed";
+ open: boolean;
+ setOpen: (open: boolean) => void;
+ openMobile: boolean;
+ setOpenMobile: (open: boolean) => void;
+ isMobile: boolean;
+ toggleSidebar: () => void;
+};
-const SidebarContext = React.createContext<SidebarContext | null>(null)
+const SidebarContext = React.createContext<SidebarContext | null>(null);
function useSidebar() {
- const context = React.useContext(SidebarContext)
- if (!context) {
- throw new Error("useSidebar must be used within a SidebarProvider.")
- }
+ const context = React.useContext(SidebarContext);
+ if (!context) {
+ throw new Error("useSidebar must be used within a SidebarProvider.");
+ }
- return context
+ return context;
}
const SidebarProvider = React.forwardRef<
- HTMLDivElement,
- React.ComponentProps<"div"> & {
- defaultOpen?: boolean
- open?: boolean
- onOpenChange?: (open: boolean) => void
- }
->(
- (
- {
- defaultOpen = true,
- open: openProp,
- onOpenChange: setOpenProp,
- className,
- style,
- children,
- ...props
- },
- ref
- ) => {
- const isMobile = useIsMobile()
- const [openMobile, setOpenMobile] = React.useState(false)
+ HTMLDivElement,
+ React.ComponentProps<"div"> & {
+ defaultOpen?: boolean;
+ open?: boolean;
+ onOpenChange?: (open: boolean) => void;
+ }
+>(({ defaultOpen = true, open: openProp, onOpenChange: setOpenProp, className, style, children, ...props }, ref) => {
+ const isMobile = useIsMobile();
+ const [openMobile, setOpenMobile] = React.useState(false);
- // This is the internal state of the sidebar.
- // We use openProp and setOpenProp for control from outside the component.
- const [_open, _setOpen] = React.useState(defaultOpen)
- const open = openProp ?? _open
- const setOpen = React.useCallback(
- (value: boolean | ((value: boolean) => boolean)) => {
- const openState = typeof value === "function" ? value(open) : value
- if (setOpenProp) {
- setOpenProp(openState)
- } else {
- _setOpen(openState)
- }
+ // This is the internal state of the sidebar.
+ // We use openProp and setOpenProp for control from outside the component.
+ const [_open, _setOpen] = React.useState(defaultOpen);
+ const open = openProp ?? _open;
+ const setOpen = React.useCallback(
+ (value: boolean | ((value: boolean) => boolean)) => {
+ const openState = typeof value === "function" ? value(open) : value;
+ if (setOpenProp) {
+ setOpenProp(openState);
+ } else {
+ _setOpen(openState);
+ }
- // This sets the cookie to keep the sidebar state.
- document.cookie = `${SIDEBAR_COOKIE_NAME}=${openState}; path=/; max-age=${SIDEBAR_COOKIE_MAX_AGE}`
- },
- [setOpenProp, open]
- )
+ // This sets the cookie to keep the sidebar state.
+ document.cookie = `${SIDEBAR_COOKIE_NAME}=${openState}; path=/; max-age=${SIDEBAR_COOKIE_MAX_AGE}`;
+ },
+ [setOpenProp, open],
+ );
- // Helper to toggle the sidebar.
- const toggleSidebar = React.useCallback(() => {
- return isMobile
- ? setOpenMobile((open) => !open)
- : setOpen((open) => !open)
- }, [isMobile, setOpen, setOpenMobile])
+ // Helper to toggle the sidebar.
+ const toggleSidebar = React.useCallback(() => {
+ return isMobile ? setOpenMobile((open) => !open) : setOpen((open) => !open);
+ }, [isMobile, setOpen, setOpenMobile]);
- // Adds a keyboard shortcut to toggle the sidebar.
- React.useEffect(() => {
- const handleKeyDown = (event: KeyboardEvent) => {
- if (
- event.key === SIDEBAR_KEYBOARD_SHORTCUT &&
- (event.metaKey || event.ctrlKey)
- ) {
- event.preventDefault()
- toggleSidebar()
- }
- }
+ // Adds a keyboard shortcut to toggle the sidebar.
+ React.useEffect(() => {
+ const handleKeyDown = (event: KeyboardEvent) => {
+ if (event.key === SIDEBAR_KEYBOARD_SHORTCUT && (event.metaKey || event.ctrlKey)) {
+ event.preventDefault();
+ toggleSidebar();
+ }
+ };
- window.addEventListener("keydown", handleKeyDown)
- return () => window.removeEventListener("keydown", handleKeyDown)
- }, [toggleSidebar])
+ window.addEventListener("keydown", handleKeyDown);
+ return () => window.removeEventListener("keydown", handleKeyDown);
+ }, [toggleSidebar]);
- // We add a state so that we can do data-state="expanded" or "collapsed".
- // This makes it easier to style the sidebar with Tailwind classes.
- const state = open ? "expanded" : "collapsed"
+ // We add a state so that we can do data-state="expanded" or "collapsed".
+ // This makes it easier to style the sidebar with Tailwind classes.
+ const state = open ? "expanded" : "collapsed";
- const contextValue = React.useMemo<SidebarContext>(
- () => ({
- state,
- open,
- setOpen,
- isMobile,
- openMobile,
- setOpenMobile,
- toggleSidebar,
- }),
- [state, open, setOpen, isMobile, openMobile, setOpenMobile, toggleSidebar]
- )
+ const contextValue = React.useMemo<SidebarContext>(
+ () => ({
+ state,
+ open,
+ setOpen,
+ isMobile,
+ openMobile,
+ setOpenMobile,
+ toggleSidebar,
+ }),
+ [state, open, setOpen, isMobile, openMobile, setOpenMobile, toggleSidebar],
+ );
- return (
- <SidebarContext.Provider value={contextValue}>
- <TooltipProvider delayDuration={0}>
- <div
- style={
- {
- "--sidebar-width": SIDEBAR_WIDTH,
- "--sidebar-width-icon": SIDEBAR_WIDTH_ICON,
- ...style,
- } as React.CSSProperties
- }
- className={cn(
- "group/sidebar-wrapper flex min-h-svh w-full has-[[data-variant=inset]]:bg-sidebar",
- className
- )}
- ref={ref}
- {...props}
- >
- {children}
- </div>
- </TooltipProvider>
- </SidebarContext.Provider>
- )
- }
-)
-SidebarProvider.displayName = "SidebarProvider"
+ return (
+ <SidebarContext.Provider value={contextValue}>
+ <TooltipProvider delayDuration={0}>
+ <div
+ style={
+ {
+ "--sidebar-width": SIDEBAR_WIDTH,
+ "--sidebar-width-icon": SIDEBAR_WIDTH_ICON,
+ ...style,
+ } as React.CSSProperties
+ }
+ className={cn(
+ "group/sidebar-wrapper flex min-h-svh w-full has-[[data-variant=inset]]:bg-sidebar",
+ className,
+ )}
+ ref={ref}
+ {...props}
+ >
+ {children}
+ </div>
+ </TooltipProvider>
+ </SidebarContext.Provider>
+ );
+});
+SidebarProvider.displayName = "SidebarProvider";
const Sidebar = React.forwardRef<
- HTMLDivElement,
- React.ComponentProps<"div"> & {
- side?: "left" | "right"
- variant?: "sidebar" | "floating" | "inset"
- collapsible?: "offcanvas" | "icon" | "none"
- }
->(
- (
- {
- side = "left",
- variant = "sidebar",
- collapsible = "offcanvas",
- className,
- children,
- ...props
- },
- ref
- ) => {
- const { isMobile, state, openMobile, setOpenMobile } = useSidebar()
+ HTMLDivElement,
+ React.ComponentProps<"div"> & {
+ side?: "left" | "right";
+ variant?: "sidebar" | "floating" | "inset";
+ collapsible?: "offcanvas" | "icon" | "none";
+ }
+>(({ side = "left", variant = "sidebar", collapsible = "offcanvas", className, children, ...props }, ref) => {
+ const { isMobile, state, openMobile, setOpenMobile } = useSidebar();
- if (collapsible === "none") {
- return (
- <div
- className={cn(
- "flex h-full w-[--sidebar-width] flex-col bg-sidebar text-sidebar-foreground",
- className
- )}
- ref={ref}
- {...props}
- >
- {children}
- </div>
- )
- }
+ if (collapsible === "none") {
+ return (
+ <div
+ className={cn("flex h-full w-[--sidebar-width] flex-col bg-sidebar text-sidebar-foreground", className)}
+ ref={ref}
+ {...props}
+ >
+ {children}
+ </div>
+ );
+ }
- if (isMobile) {
- return (
- <Sheet open={openMobile} onOpenChange={setOpenMobile} {...props}>
- <SheetContent
- data-sidebar="sidebar"
- data-mobile="true"
- className="w-[--sidebar-width] bg-sidebar p-0 text-sidebar-foreground [&>button]:hidden"
- style={
- {
- "--sidebar-width": SIDEBAR_WIDTH_MOBILE,
- } as React.CSSProperties
- }
- side={side}
- >
- <div className="flex h-full w-full flex-col">{children}</div>
- </SheetContent>
- </Sheet>
- )
- }
+ if (isMobile) {
+ return (
+ <Sheet open={openMobile} onOpenChange={setOpenMobile} {...props}>
+ <SheetContent
+ data-sidebar="sidebar"
+ data-mobile="true"
+ className="w-[--sidebar-width] bg-sidebar p-0 text-sidebar-foreground [&>button]:hidden"
+ style={
+ {
+ "--sidebar-width": SIDEBAR_WIDTH_MOBILE,
+ } as React.CSSProperties
+ }
+ side={side}
+ >
+ <div className="flex h-full w-full flex-col">{children}</div>
+ </SheetContent>
+ </Sheet>
+ );
+ }
- return (
- <div
- ref={ref}
- className="group peer hidden md:block text-sidebar-foreground"
- data-state={state}
- data-collapsible={state === "collapsed" ? collapsible : ""}
- data-variant={variant}
- data-side={side}
- >
- {/* This is what handles the sidebar gap on desktop */}
- <div
- className={cn(
- "duration-200 relative h-svh w-[--sidebar-width] bg-transparent transition-[width] ease-linear",
- "group-data-[collapsible=offcanvas]:w-0",
- "group-data-[side=right]:rotate-180",
- variant === "floating" || variant === "inset"
- ? "group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)_+_theme(spacing.4))]"
- : "group-data-[collapsible=icon]:w-[--sidebar-width-icon]"
- )}
- />
- <div
- className={cn(
- "duration-200 fixed inset-y-0 z-10 hidden h-svh w-[--sidebar-width] transition-[left,right,width] ease-linear md:flex",
- side === "left"
- ? "left-0 group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)]"
- : "right-0 group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)]",
- // Adjust the padding for floating and inset variants.
- variant === "floating" || variant === "inset"
- ? "p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)_+_theme(spacing.4)_+2px)]"
- : "group-data-[collapsible=icon]:w-[--sidebar-width-icon] group-data-[side=left]:border-r group-data-[side=right]:border-l",
- className
- )}
- {...props}
- >
- <div
- data-sidebar="sidebar"
- className="flex h-full w-full flex-col bg-sidebar group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:border-sidebar-border group-data-[variant=floating]:shadow"
- >
- {children}
- </div>
- </div>
- </div>
- )
- }
-)
-Sidebar.displayName = "Sidebar"
+ return (
+ <div
+ ref={ref}
+ className="group peer hidden md:block text-sidebar-foreground"
+ data-state={state}
+ data-collapsible={state === "collapsed" ? collapsible : ""}
+ data-variant={variant}
+ data-side={side}
+ >
+ {/* This is what handles the sidebar gap on desktop */}
+ <div
+ className={cn(
+ "duration-200 relative h-svh w-[--sidebar-width] bg-transparent transition-[width] ease-linear",
+ "group-data-[collapsible=offcanvas]:w-0",
+ "group-data-[side=right]:rotate-180",
+ variant === "floating" || variant === "inset"
+ ? "group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)_+_theme(spacing.4))]"
+ : "group-data-[collapsible=icon]:w-[--sidebar-width-icon]",
+ )}
+ />
+ <div
+ className={cn(
+ "duration-200 fixed inset-y-0 z-10 hidden h-svh w-[--sidebar-width] transition-[left,right,width] ease-linear md:flex",
+ side === "left"
+ ? "left-0 group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)]"
+ : "right-0 group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)]",
+ // Adjust the padding for floating and inset variants.
+ variant === "floating" || variant === "inset"
+ ? "p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)_+_theme(spacing.4)_+2px)]"
+ : "group-data-[collapsible=icon]:w-[--sidebar-width-icon] group-data-[side=left]:border-r group-data-[side=right]:border-l",
+ className,
+ )}
+ {...props}
+ >
+ <div
+ data-sidebar="sidebar"
+ className="flex h-full w-full flex-col bg-sidebar group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:border-sidebar-border group-data-[variant=floating]:shadow"
+ >
+ {children}
+ </div>
+ </div>
+ </div>
+ );
+});
+Sidebar.displayName = "Sidebar";
-const SidebarTrigger = React.forwardRef<
- React.ElementRef<typeof Button>,
- React.ComponentProps<typeof Button>
->(({ className, onClick, ...props }, ref) => {
- const { toggleSidebar } = useSidebar()
+const SidebarTrigger = React.forwardRef<React.ElementRef<typeof Button>, React.ComponentProps<typeof Button>>(
+ ({ className, onClick, ...props }, ref) => {
+ const { toggleSidebar } = useSidebar();
- return (
- <Button
- ref={ref}
- data-sidebar="trigger"
- variant="ghost"
- size="icon"
- className={cn("h-7 w-7", className)}
- onClick={(event) => {
- onClick?.(event)
- toggleSidebar()
- }}
- {...props}
- >
- <PanelLeft />
- <span className="sr-only">Toggle Sidebar</span>
- </Button>
- )
-})
-SidebarTrigger.displayName = "SidebarTrigger"
+ return (
+ <Button
+ ref={ref}
+ data-sidebar="trigger"
+ variant="ghost"
+ size="icon"
+ className={cn("h-7 w-7", className)}
+ onClick={(event) => {
+ onClick?.(event);
+ toggleSidebar();
+ }}
+ {...props}
+ >
+ <PanelLeft />
+ <span className="sr-only">Toggle Sidebar</span>
+ </Button>
+ );
+ },
+);
+SidebarTrigger.displayName = "SidebarTrigger";
-const SidebarRail = React.forwardRef<
- HTMLButtonElement,
- React.ComponentProps<"button">
->(({ className, ...props }, ref) => {
- const { toggleSidebar } = useSidebar()
+const SidebarRail = React.forwardRef<HTMLButtonElement, React.ComponentProps<"button">>(
+ ({ className, ...props }, ref) => {
+ const { toggleSidebar } = useSidebar();
- return (
- <button
- ref={ref}
- data-sidebar="rail"
- aria-label="Toggle Sidebar"
- tabIndex={-1}
- onClick={toggleSidebar}
- title="Toggle Sidebar"
- className={cn(
- "absolute inset-y-0 z-20 hidden w-4 -translate-x-1/2 transition-all ease-linear after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] hover:after:bg-sidebar-border group-data-[side=left]:-right-4 group-data-[side=right]:left-0 sm:flex",
- "[[data-side=left]_&]:cursor-w-resize [[data-side=right]_&]:cursor-e-resize",
- "[[data-side=left][data-state=collapsed]_&]:cursor-e-resize [[data-side=right][data-state=collapsed]_&]:cursor-w-resize",
- "group-data-[collapsible=offcanvas]:translate-x-0 group-data-[collapsible=offcanvas]:after:left-full group-data-[collapsible=offcanvas]:hover:bg-sidebar",
- "[[data-side=left][data-collapsible=offcanvas]_&]:-right-2",
- "[[data-side=right][data-collapsible=offcanvas]_&]:-left-2",
- className
- )}
- {...props}
- />
- )
-})
-SidebarRail.displayName = "SidebarRail"
+ return (
+ <button
+ ref={ref}
+ data-sidebar="rail"
+ aria-label="Toggle Sidebar"
+ tabIndex={-1}
+ onClick={toggleSidebar}
+ title="Toggle Sidebar"
+ className={cn(
+ "absolute inset-y-0 z-20 hidden w-4 -translate-x-1/2 transition-all ease-linear after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] hover:after:bg-sidebar-border group-data-[side=left]:-right-4 group-data-[side=right]:left-0 sm:flex",
+ "[[data-side=left]_&]:cursor-w-resize [[data-side=right]_&]:cursor-e-resize",
+ "[[data-side=left][data-state=collapsed]_&]:cursor-e-resize [[data-side=right][data-state=collapsed]_&]:cursor-w-resize",
+ "group-data-[collapsible=offcanvas]:translate-x-0 group-data-[collapsible=offcanvas]:after:left-full group-data-[collapsible=offcanvas]:hover:bg-sidebar",
+ "[[data-side=left][data-collapsible=offcanvas]_&]:-right-2",
+ "[[data-side=right][data-collapsible=offcanvas]_&]:-left-2",
+ className,
+ )}
+ {...props}
+ />
+ );
+ },
+);
+SidebarRail.displayName = "SidebarRail";
-const SidebarInset = React.forwardRef<
- HTMLDivElement,
- React.ComponentProps<"main">
->(({ className, ...props }, ref) => {
- return (
- <main
- ref={ref}
- className={cn(
- "relative flex min-h-svh flex-1 flex-col bg-background",
- "peer-data-[variant=inset]:min-h-[calc(100svh-theme(spacing.4))] md:peer-data-[variant=inset]:m-2 md:peer-data-[state=collapsed]:peer-data-[variant=inset]:ml-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow",
- className
- )}
- {...props}
- />
- )
-})
-SidebarInset.displayName = "SidebarInset"
+const SidebarInset = React.forwardRef<HTMLDivElement, React.ComponentProps<"main">>(({ className, ...props }, ref) => {
+ return (
+ <main
+ ref={ref}
+ className={cn(
+ "relative flex min-h-svh flex-1 flex-col bg-background",
+ "peer-data-[variant=inset]:min-h-[calc(100svh-theme(spacing.4))] md:peer-data-[variant=inset]:m-2 md:peer-data-[state=collapsed]:peer-data-[variant=inset]:ml-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow",
+ className,
+ )}
+ {...props}
+ />
+ );
+});
+SidebarInset.displayName = "SidebarInset";
-const SidebarInput = React.forwardRef<
- React.ElementRef<typeof Input>,
- React.ComponentProps<typeof Input>
->(({ className, ...props }, ref) => {
- return (
- <Input
- ref={ref}
- data-sidebar="input"
- className={cn(
- "h-8 w-full bg-background shadow-none focus-visible:ring-2 focus-visible:ring-sidebar-ring",
- className
- )}
- {...props}
- />
- )
-})
-SidebarInput.displayName = "SidebarInput"
+const SidebarInput = React.forwardRef<React.ElementRef<typeof Input>, React.ComponentProps<typeof Input>>(
+ ({ className, ...props }, ref) => {
+ return (
+ <Input
+ ref={ref}
+ data-sidebar="input"
+ className={cn(
+ "h-8 w-full bg-background shadow-none focus-visible:ring-2 focus-visible:ring-sidebar-ring",
+ className,
+ )}
+ {...props}
+ />
+ );
+ },
+);
+SidebarInput.displayName = "SidebarInput";
-const SidebarHeader = React.forwardRef<
- HTMLDivElement,
- React.ComponentProps<"div">
->(({ className, ...props }, ref) => {
- return (
- <div
- ref={ref}
- data-sidebar="header"
- className={cn("flex flex-col gap-2 p-2", className)}
- {...props}
- />
- )
-})
-SidebarHeader.displayName = "SidebarHeader"
+const SidebarHeader = React.forwardRef<HTMLDivElement, React.ComponentProps<"div">>(({ className, ...props }, ref) => {
+ return <div ref={ref} data-sidebar="header" className={cn("flex flex-col gap-2 p-2", className)} {...props} />;
+});
+SidebarHeader.displayName = "SidebarHeader";
-const SidebarFooter = React.forwardRef<
- HTMLDivElement,
- React.ComponentProps<"div">
->(({ className, ...props }, ref) => {
- return (
- <div
- ref={ref}
- data-sidebar="footer"
- className={cn("flex flex-col gap-2 p-2", className)}
- {...props}
- />
- )
-})
-SidebarFooter.displayName = "SidebarFooter"
+const SidebarFooter = React.forwardRef<HTMLDivElement, React.ComponentProps<"div">>(({ className, ...props }, ref) => {
+ return <div ref={ref} data-sidebar="footer" className={cn("flex flex-col gap-2 p-2", className)} {...props} />;
+});
+SidebarFooter.displayName = "SidebarFooter";
-const SidebarSeparator = React.forwardRef<
- React.ElementRef<typeof Separator>,
- React.ComponentProps<typeof Separator>
->(({ className, ...props }, ref) => {
- return (
- <Separator
- ref={ref}
- data-sidebar="separator"
- className={cn("mx-2 w-auto bg-sidebar-border", className)}
- {...props}
- />
- )
-})
-SidebarSeparator.displayName = "SidebarSeparator"
+const SidebarSeparator = React.forwardRef<React.ElementRef<typeof Separator>, React.ComponentProps<typeof Separator>>(
+ ({ className, ...props }, ref) => {
+ return (
+ <Separator
+ ref={ref}
+ data-sidebar="separator"
+ className={cn("mx-2 w-auto bg-sidebar-border", className)}
+ {...props}
+ />
+ );
+ },
+);
+SidebarSeparator.displayName = "SidebarSeparator";
-const SidebarContent = React.forwardRef<
- HTMLDivElement,
- React.ComponentProps<"div">
->(({ className, ...props }, ref) => {
- return (
- <div
- ref={ref}
- data-sidebar="content"
- className={cn(
- "flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
- className
- )}
- {...props}
- />
- )
-})
-SidebarContent.displayName = "SidebarContent"
+const SidebarContent = React.forwardRef<HTMLDivElement, React.ComponentProps<"div">>(({ className, ...props }, ref) => {
+ return (
+ <div
+ ref={ref}
+ data-sidebar="content"
+ className={cn(
+ "flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
+ className,
+ )}
+ {...props}
+ />
+ );
+});
+SidebarContent.displayName = "SidebarContent";
-const SidebarGroup = React.forwardRef<
- HTMLDivElement,
- React.ComponentProps<"div">
->(({ className, ...props }, ref) => {
- return (
- <div
- ref={ref}
- data-sidebar="group"
- className={cn("relative flex w-full min-w-0 flex-col p-2", className)}
- {...props}
- />
- )
-})
-SidebarGroup.displayName = "SidebarGroup"
+const SidebarGroup = React.forwardRef<HTMLDivElement, React.ComponentProps<"div">>(({ className, ...props }, ref) => {
+ return (
+ <div
+ ref={ref}
+ data-sidebar="group"
+ className={cn("relative flex w-full min-w-0 flex-col p-2", className)}
+ {...props}
+ />
+ );
+});
+SidebarGroup.displayName = "SidebarGroup";
-const SidebarGroupLabel = React.forwardRef<
- HTMLDivElement,
- React.ComponentProps<"div"> & { asChild?: boolean }
->(({ className, asChild = false, ...props }, ref) => {
- const Comp = asChild ? Slot : "div"
+const SidebarGroupLabel = React.forwardRef<HTMLDivElement, React.ComponentProps<"div"> & { asChild?: boolean }>(
+ ({ className, asChild = false, ...props }, ref) => {
+ const Comp = asChild ? Slot : "div";
- return (
- <Comp
- ref={ref}
- data-sidebar="group-label"
- className={cn(
- "duration-200 flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-medium text-sidebar-foreground/70 outline-none ring-sidebar-ring transition-[margin,opa] ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
- "group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0",
- className
- )}
- {...props}
- />
- )
-})
-SidebarGroupLabel.displayName = "SidebarGroupLabel"
+ return (
+ <Comp
+ ref={ref}
+ data-sidebar="group-label"
+ className={cn(
+ "duration-200 flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-medium text-sidebar-foreground/70 outline-none ring-sidebar-ring transition-[margin,opa] ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
+ "group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0",
+ className,
+ )}
+ {...props}
+ />
+ );
+ },
+);
+SidebarGroupLabel.displayName = "SidebarGroupLabel";
-const SidebarGroupAction = React.forwardRef<
- HTMLButtonElement,
- React.ComponentProps<"button"> & { asChild?: boolean }
->(({ className, asChild = false, ...props }, ref) => {
- const Comp = asChild ? Slot : "button"
+const SidebarGroupAction = React.forwardRef<HTMLButtonElement, React.ComponentProps<"button"> & { asChild?: boolean }>(
+ ({ className, asChild = false, ...props }, ref) => {
+ const Comp = asChild ? Slot : "button";
- return (
- <Comp
- ref={ref}
- data-sidebar="group-action"
- className={cn(
- "absolute right-3 top-3.5 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-sidebar-foreground outline-none ring-sidebar-ring transition-transform hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
- // Increases the hit area of the button on mobile.
- "after:absolute after:-inset-2 after:md:hidden",
- "group-data-[collapsible=icon]:hidden",
- className
- )}
- {...props}
- />
- )
-})
-SidebarGroupAction.displayName = "SidebarGroupAction"
+ return (
+ <Comp
+ ref={ref}
+ data-sidebar="group-action"
+ className={cn(
+ "absolute right-3 top-3.5 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-sidebar-foreground outline-none ring-sidebar-ring transition-transform hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
+ // Increases the hit area of the button on mobile.
+ "after:absolute after:-inset-2 after:md:hidden",
+ "group-data-[collapsible=icon]:hidden",
+ className,
+ )}
+ {...props}
+ />
+ );
+ },
+);
+SidebarGroupAction.displayName = "SidebarGroupAction";
-const SidebarGroupContent = React.forwardRef<
- HTMLDivElement,
- React.ComponentProps<"div">
->(({ className, ...props }, ref) => (
- <div
- ref={ref}
- data-sidebar="group-content"
- className={cn("w-full text-sm", className)}
- {...props}
- />
-))
-SidebarGroupContent.displayName = "SidebarGroupContent"
+const SidebarGroupContent = React.forwardRef<HTMLDivElement, React.ComponentProps<"div">>(
+ ({ className, ...props }, ref) => (
+ <div ref={ref} data-sidebar="group-content" className={cn("w-full text-sm", className)} {...props} />
+ ),
+);
+SidebarGroupContent.displayName = "SidebarGroupContent";
-const SidebarMenu = React.forwardRef<
- HTMLUListElement,
- React.ComponentProps<"ul">
->(({ className, ...props }, ref) => (
- <ul
- ref={ref}
- data-sidebar="menu"
- className={cn("flex w-full min-w-0 flex-col gap-1", className)}
- {...props}
- />
-))
-SidebarMenu.displayName = "SidebarMenu"
+const SidebarMenu = React.forwardRef<HTMLUListElement, React.ComponentProps<"ul">>(({ className, ...props }, ref) => (
+ <ul ref={ref} data-sidebar="menu" className={cn("flex w-full min-w-0 flex-col gap-1", className)} {...props} />
+));
+SidebarMenu.displayName = "SidebarMenu";
-const SidebarMenuItem = React.forwardRef<
- HTMLLIElement,
- React.ComponentProps<"li">
->(({ className, ...props }, ref) => (
- <li
- ref={ref}
- data-sidebar="menu-item"
- className={cn("group/menu-item relative", className)}
- {...props}
- />
-))
-SidebarMenuItem.displayName = "SidebarMenuItem"
+const SidebarMenuItem = React.forwardRef<HTMLLIElement, React.ComponentProps<"li">>(({ className, ...props }, ref) => (
+ <li ref={ref} data-sidebar="menu-item" className={cn("group/menu-item relative", className)} {...props} />
+));
+SidebarMenuItem.displayName = "SidebarMenuItem";
const sidebarMenuButtonVariants = cva(
- "peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm outline-none ring-sidebar-ring transition-[width,height,padding] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-[[data-sidebar=menu-action]]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-sidebar-accent data-[active=true]:font-medium data-[active=true]:text-sidebar-accent-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground group-data-[collapsible=icon]:!size-8 group-data-[collapsible=icon]:!p-2 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0",
- {
- variants: {
- variant: {
- default: "hover:bg-sidebar-accent hover:text-sidebar-accent-foreground",
- outline:
- "bg-background shadow-[0_0_0_1px_hsl(var(--sidebar-border))] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground hover:shadow-[0_0_0_1px_hsl(var(--sidebar-accent))]",
- },
- size: {
- default: "h-8 text-sm",
- sm: "h-7 text-xs",
- lg: "h-12 text-sm group-data-[collapsible=icon]:!p-0",
- },
- },
- defaultVariants: {
- variant: "default",
- size: "default",
- },
- }
-)
+ "peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm outline-none ring-sidebar-ring transition-[width,height,padding] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-[[data-sidebar=menu-action]]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-sidebar-accent data-[active=true]:font-medium data-[active=true]:text-sidebar-accent-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground group-data-[collapsible=icon]:!size-8 group-data-[collapsible=icon]:!p-2 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0",
+ {
+ variants: {
+ variant: {
+ default: "hover:bg-sidebar-accent hover:text-sidebar-accent-foreground",
+ outline:
+ "bg-background shadow-[0_0_0_1px_hsl(var(--sidebar-border))] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground hover:shadow-[0_0_0_1px_hsl(var(--sidebar-accent))]",
+ },
+ size: {
+ default: "h-8 text-sm",
+ sm: "h-7 text-xs",
+ lg: "h-12 text-sm group-data-[collapsible=icon]:!p-0",
+ },
+ },
+ defaultVariants: {
+ variant: "default",
+ size: "default",
+ },
+ },
+);
const SidebarMenuButton = React.forwardRef<
- HTMLButtonElement,
- React.ComponentProps<"button"> & {
- asChild?: boolean
- isActive?: boolean
- tooltip?: string | React.ComponentProps<typeof TooltipContent>
- } & VariantProps<typeof sidebarMenuButtonVariants>
->(
- (
- {
- asChild = false,
- isActive = false,
- variant = "default",
- size = "default",
- tooltip,
- className,
- ...props
- },
- ref
- ) => {
- const Comp = asChild ? Slot : "button"
- const { isMobile, state } = useSidebar()
+ HTMLButtonElement,
+ React.ComponentProps<"button"> & {
+ asChild?: boolean;
+ isActive?: boolean;
+ tooltip?: string | React.ComponentProps<typeof TooltipContent>;
+ } & VariantProps<typeof sidebarMenuButtonVariants>
+>(({ asChild = false, isActive = false, variant = "default", size = "default", tooltip, className, ...props }, ref) => {
+ const Comp = asChild ? Slot : "button";
+ const { isMobile, state } = useSidebar();
- const button = (
- <Comp
- ref={ref}
- data-sidebar="menu-button"
- data-size={size}
- data-active={isActive}
- className={cn(sidebarMenuButtonVariants({ variant, size }), className)}
- {...props}
- />
- )
+ const button = (
+ <Comp
+ ref={ref}
+ data-sidebar="menu-button"
+ data-size={size}
+ data-active={isActive}
+ className={cn(sidebarMenuButtonVariants({ variant, size }), className)}
+ {...props}
+ />
+ );
- if (!tooltip) {
- return button
- }
+ if (!tooltip) {
+ return button;
+ }
- if (typeof tooltip === "string") {
- tooltip = {
- children: tooltip,
- }
- }
+ if (typeof tooltip === "string") {
+ tooltip = {
+ children: tooltip,
+ };
+ }
- return (
- <Tooltip>
- <TooltipTrigger asChild>{button}</TooltipTrigger>
- <TooltipContent
- side="right"
- align="center"
- hidden={state !== "collapsed" || isMobile}
- {...tooltip}
- />
- </Tooltip>
- )
- }
-)
-SidebarMenuButton.displayName = "SidebarMenuButton"
+ return (
+ <Tooltip>
+ <TooltipTrigger asChild>{button}</TooltipTrigger>
+ <TooltipContent side="right" align="center" hidden={state !== "collapsed" || isMobile} {...tooltip} />
+ </Tooltip>
+ );
+});
+SidebarMenuButton.displayName = "SidebarMenuButton";
const SidebarMenuAction = React.forwardRef<
- HTMLButtonElement,
- React.ComponentProps<"button"> & {
- asChild?: boolean
- showOnHover?: boolean
- }
+ HTMLButtonElement,
+ React.ComponentProps<"button"> & {
+ asChild?: boolean;
+ showOnHover?: boolean;
+ }
>(({ className, asChild = false, showOnHover = false, ...props }, ref) => {
- const Comp = asChild ? Slot : "button"
+ const Comp = asChild ? Slot : "button";
- return (
- <Comp
- ref={ref}
- data-sidebar="menu-action"
- className={cn(
- "absolute right-1 top-1.5 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-sidebar-foreground outline-none ring-sidebar-ring transition-transform hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 peer-hover/menu-button:text-sidebar-accent-foreground [&>svg]:size-4 [&>svg]:shrink-0",
- // Increases the hit area of the button on mobile.
- "after:absolute after:-inset-2 after:md:hidden",
- "peer-data-[size=sm]/menu-button:top-1",
- "peer-data-[size=default]/menu-button:top-1.5",
- "peer-data-[size=lg]/menu-button:top-2.5",
- "group-data-[collapsible=icon]:hidden",
- showOnHover &&
- "group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100 data-[state=open]:opacity-100 peer-data-[active=true]/menu-button:text-sidebar-accent-foreground md:opacity-0",
- className
- )}
- {...props}
- />
- )
-})
-SidebarMenuAction.displayName = "SidebarMenuAction"
+ return (
+ <Comp
+ ref={ref}
+ data-sidebar="menu-action"
+ className={cn(
+ "absolute right-1 top-1.5 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-sidebar-foreground outline-none ring-sidebar-ring transition-transform hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 peer-hover/menu-button:text-sidebar-accent-foreground [&>svg]:size-4 [&>svg]:shrink-0",
+ // Increases the hit area of the button on mobile.
+ "after:absolute after:-inset-2 after:md:hidden",
+ "peer-data-[size=sm]/menu-button:top-1",
+ "peer-data-[size=default]/menu-button:top-1.5",
+ "peer-data-[size=lg]/menu-button:top-2.5",
+ "group-data-[collapsible=icon]:hidden",
+ showOnHover &&
+ "group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100 data-[state=open]:opacity-100 peer-data-[active=true]/menu-button:text-sidebar-accent-foreground md:opacity-0",
+ className,
+ )}
+ {...props}
+ />
+ );
+});
+SidebarMenuAction.displayName = "SidebarMenuAction";
-const SidebarMenuBadge = React.forwardRef<
- HTMLDivElement,
- React.ComponentProps<"div">
->(({ className, ...props }, ref) => (
- <div
- ref={ref}
- data-sidebar="menu-badge"
- className={cn(
- "absolute right-1 flex h-5 min-w-5 items-center justify-center rounded-md px-1 text-xs font-medium tabular-nums text-sidebar-foreground select-none pointer-events-none",
- "peer-hover/menu-button:text-sidebar-accent-foreground peer-data-[active=true]/menu-button:text-sidebar-accent-foreground",
- "peer-data-[size=sm]/menu-button:top-1",
- "peer-data-[size=default]/menu-button:top-1.5",
- "peer-data-[size=lg]/menu-button:top-2.5",
- "group-data-[collapsible=icon]:hidden",
- className
- )}
- {...props}
- />
-))
-SidebarMenuBadge.displayName = "SidebarMenuBadge"
+const SidebarMenuBadge = React.forwardRef<HTMLDivElement, React.ComponentProps<"div">>(
+ ({ className, ...props }, ref) => (
+ <div
+ ref={ref}
+ data-sidebar="menu-badge"
+ className={cn(
+ "absolute right-1 flex h-5 min-w-5 items-center justify-center rounded-md px-1 text-xs font-medium tabular-nums text-sidebar-foreground select-none pointer-events-none",
+ "peer-hover/menu-button:text-sidebar-accent-foreground peer-data-[active=true]/menu-button:text-sidebar-accent-foreground",
+ "peer-data-[size=sm]/menu-button:top-1",
+ "peer-data-[size=default]/menu-button:top-1.5",
+ "peer-data-[size=lg]/menu-button:top-2.5",
+ "group-data-[collapsible=icon]:hidden",
+ className,
+ )}
+ {...props}
+ />
+ ),
+);
+SidebarMenuBadge.displayName = "SidebarMenuBadge";
const SidebarMenuSkeleton = React.forwardRef<
- HTMLDivElement,
- React.ComponentProps<"div"> & {
- showIcon?: boolean
- }
+ HTMLDivElement,
+ React.ComponentProps<"div"> & {
+ showIcon?: boolean;
+ }
>(({ className, showIcon = false, ...props }, ref) => {
- // Random width between 50 to 90%.
- const width = React.useMemo(() => {
- return `${Math.floor(Math.random() * 40) + 50}%`
- }, [])
+ // Random width between 50 to 90%.
+ const width = React.useMemo(() => {
+ return `${Math.floor(Math.random() * 40) + 50}%`;
+ }, []);
- return (
- <div
- ref={ref}
- data-sidebar="menu-skeleton"
- className={cn("rounded-md h-8 flex gap-2 px-2 items-center", className)}
- {...props}
- >
- {showIcon && (
- <Skeleton
- className="size-4 rounded-md"
- data-sidebar="menu-skeleton-icon"
- />
- )}
- <Skeleton
- className="h-4 flex-1 max-w-[--skeleton-width]"
- data-sidebar="menu-skeleton-text"
- style={
- {
- "--skeleton-width": width,
- } as React.CSSProperties
- }
- />
- </div>
- )
-})
-SidebarMenuSkeleton.displayName = "SidebarMenuSkeleton"
+ return (
+ <div
+ ref={ref}
+ data-sidebar="menu-skeleton"
+ className={cn("rounded-md h-8 flex gap-2 px-2 items-center", className)}
+ {...props}
+ >
+ {showIcon && <Skeleton className="size-4 rounded-md" data-sidebar="menu-skeleton-icon" />}
+ <Skeleton
+ className="h-4 flex-1 max-w-[--skeleton-width]"
+ data-sidebar="menu-skeleton-text"
+ style={
+ {
+ "--skeleton-width": width,
+ } as React.CSSProperties
+ }
+ />
+ </div>
+ );
+});
+SidebarMenuSkeleton.displayName = "SidebarMenuSkeleton";
-const SidebarMenuSub = React.forwardRef<
- HTMLUListElement,
- React.ComponentProps<"ul">
->(({ className, ...props }, ref) => (
- <ul
- ref={ref}
- data-sidebar="menu-sub"
- className={cn(
- "mx-3.5 flex min-w-0 translate-x-px flex-col gap-1 border-l border-sidebar-border px-2.5 py-0.5",
- "group-data-[collapsible=icon]:hidden",
- className
- )}
- {...props}
- />
-))
-SidebarMenuSub.displayName = "SidebarMenuSub"
+const SidebarMenuSub = React.forwardRef<HTMLUListElement, React.ComponentProps<"ul">>(
+ ({ className, ...props }, ref) => (
+ <ul
+ ref={ref}
+ data-sidebar="menu-sub"
+ className={cn(
+ "mx-3.5 flex min-w-0 translate-x-px flex-col gap-1 border-l border-sidebar-border px-2.5 py-0.5",
+ "group-data-[collapsible=icon]:hidden",
+ className,
+ )}
+ {...props}
+ />
+ ),
+);
+SidebarMenuSub.displayName = "SidebarMenuSub";
-const SidebarMenuSubItem = React.forwardRef<
- HTMLLIElement,
- React.ComponentProps<"li">
->(({ ...props }, ref) => <li ref={ref} {...props} />)
-SidebarMenuSubItem.displayName = "SidebarMenuSubItem"
+const SidebarMenuSubItem = React.forwardRef<HTMLLIElement, React.ComponentProps<"li">>(({ ...props }, ref) => (
+ <li ref={ref} {...props} />
+));
+SidebarMenuSubItem.displayName = "SidebarMenuSubItem";
const SidebarMenuSubButton = React.forwardRef<
- HTMLAnchorElement,
- React.ComponentProps<"a"> & {
- asChild?: boolean
- size?: "sm" | "md"
- isActive?: boolean
- }
+ HTMLAnchorElement,
+ React.ComponentProps<"a"> & {
+ asChild?: boolean;
+ size?: "sm" | "md";
+ isActive?: boolean;
+ }
>(({ asChild = false, size = "md", isActive, className, ...props }, ref) => {
- const Comp = asChild ? Slot : "a"
+ const Comp = asChild ? Slot : "a";
- return (
- <Comp
- ref={ref}
- data-sidebar="menu-sub-button"
- data-size={size}
- data-active={isActive}
- className={cn(
- "flex h-7 min-w-0 -translate-x-px items-center gap-2 overflow-hidden rounded-md px-2 text-sidebar-foreground outline-none ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0 [&>svg]:text-sidebar-accent-foreground",
- "data-[active=true]:bg-sidebar-accent data-[active=true]:text-sidebar-accent-foreground",
- size === "sm" && "text-xs",
- size === "md" && "text-sm",
- "group-data-[collapsible=icon]:hidden",
- className
- )}
- {...props}
- />
- )
-})
-SidebarMenuSubButton.displayName = "SidebarMenuSubButton"
+ return (
+ <Comp
+ ref={ref}
+ data-sidebar="menu-sub-button"
+ data-size={size}
+ data-active={isActive}
+ className={cn(
+ "flex h-7 min-w-0 -translate-x-px items-center gap-2 overflow-hidden rounded-md px-2 text-sidebar-foreground outline-none ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0 [&>svg]:text-sidebar-accent-foreground",
+ "data-[active=true]:bg-sidebar-accent data-[active=true]:text-sidebar-accent-foreground",
+ size === "sm" && "text-xs",
+ size === "md" && "text-sm",
+ "group-data-[collapsible=icon]:hidden",
+ className,
+ )}
+ {...props}
+ />
+ );
+});
+SidebarMenuSubButton.displayName = "SidebarMenuSubButton";
export {
- Sidebar,
- SidebarContent,
- SidebarFooter,
- SidebarGroup,
- SidebarGroupAction,
- SidebarGroupContent,
- SidebarGroupLabel,
- SidebarHeader,
- SidebarInput,
- SidebarInset,
- SidebarMenu,
- SidebarMenuAction,
- SidebarMenuBadge,
- SidebarMenuButton,
- SidebarMenuItem,
- SidebarMenuSkeleton,
- SidebarMenuSub,
- SidebarMenuSubButton,
- SidebarMenuSubItem,
- SidebarProvider,
- SidebarRail,
- SidebarSeparator,
- SidebarTrigger,
- useSidebar,
-}
+ Sidebar,
+ SidebarContent,
+ SidebarFooter,
+ SidebarGroup,
+ SidebarGroupAction,
+ SidebarGroupContent,
+ SidebarGroupLabel,
+ SidebarHeader,
+ SidebarInput,
+ SidebarInset,
+ SidebarMenu,
+ SidebarMenuAction,
+ SidebarMenuBadge,
+ SidebarMenuButton,
+ SidebarMenuItem,
+ SidebarMenuSkeleton,
+ SidebarMenuSub,
+ SidebarMenuSubButton,
+ SidebarMenuSubItem,
+ SidebarProvider,
+ SidebarRail,
+ SidebarSeparator,
+ SidebarTrigger,
+ useSidebar,
+};
diff --git a/apps/canvas/front/src/components/ui/skeleton.tsx b/apps/canvas/front/src/components/ui/skeleton.tsx
index d7e45f7..b1ba559 100644
--- a/apps/canvas/front/src/components/ui/skeleton.tsx
+++ b/apps/canvas/front/src/components/ui/skeleton.tsx
@@ -1,15 +1,7 @@
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
-function Skeleton({
- className,
- ...props
-}: React.HTMLAttributes<HTMLDivElement>) {
- return (
- <div
- className={cn("animate-pulse rounded-md bg-primary/10", className)}
- {...props}
- />
- )
+function Skeleton({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) {
+ return <div className={cn("animate-pulse rounded-md bg-primary/10", className)} {...props} />;
}
-export { Skeleton }
+export { Skeleton };
diff --git a/apps/canvas/front/src/components/ui/table.tsx b/apps/canvas/front/src/components/ui/table.tsx
index 1272c84..12270a9 100644
--- a/apps/canvas/front/src/components/ui/table.tsx
+++ b/apps/canvas/front/src/components/ui/table.tsx
@@ -1,120 +1,83 @@
-import * as React from "react"
+import * as React from "react";
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
-const Table = React.forwardRef<
- HTMLTableElement,
- React.HTMLAttributes<HTMLTableElement>
->(({ className, ...props }, ref) => (
- <div className="relative w-full overflow-auto">
- <table
- ref={ref}
- className={cn("w-full caption-top text-sm", className)}
- {...props}
- />
- </div>
-))
-Table.displayName = "Table"
+const Table = React.forwardRef<HTMLTableElement, React.HTMLAttributes<HTMLTableElement>>(
+ ({ className, ...props }, ref) => (
+ <div className="relative w-full overflow-auto">
+ <table ref={ref} className={cn("w-full caption-top text-sm", className)} {...props} />
+ </div>
+ ),
+);
+Table.displayName = "Table";
-const TableHeader = React.forwardRef<
- HTMLTableSectionElement,
- React.HTMLAttributes<HTMLTableSectionElement>
->(({ className, ...props }, ref) => (
- <thead ref={ref} className={cn("[&_tr]:border-b", className)} {...props} />
-))
-TableHeader.displayName = "TableHeader"
+const TableHeader = React.forwardRef<HTMLTableSectionElement, React.HTMLAttributes<HTMLTableSectionElement>>(
+ ({ className, ...props }, ref) => <thead ref={ref} className={cn("[&_tr]:border-b", className)} {...props} />,
+);
+TableHeader.displayName = "TableHeader";
-const TableBody = React.forwardRef<
- HTMLTableSectionElement,
- React.HTMLAttributes<HTMLTableSectionElement>
->(({ className, ...props }, ref) => (
- <tbody
- ref={ref}
- className={cn("[&_tr:last-child]:border-0", className)}
- {...props}
- />
-))
-TableBody.displayName = "TableBody"
+const TableBody = React.forwardRef<HTMLTableSectionElement, React.HTMLAttributes<HTMLTableSectionElement>>(
+ ({ className, ...props }, ref) => (
+ <tbody ref={ref} className={cn("[&_tr:last-child]:border-0", className)} {...props} />
+ ),
+);
+TableBody.displayName = "TableBody";
-const TableFooter = React.forwardRef<
- HTMLTableSectionElement,
- React.HTMLAttributes<HTMLTableSectionElement>
->(({ className, ...props }, ref) => (
- <tfoot
- ref={ref}
- className={cn(
- "border-t bg-muted/50 font-medium [&>tr]:last:border-b-0",
- className
- )}
- {...props}
- />
-))
-TableFooter.displayName = "TableFooter"
+const TableFooter = React.forwardRef<HTMLTableSectionElement, React.HTMLAttributes<HTMLTableSectionElement>>(
+ ({ className, ...props }, ref) => (
+ <tfoot
+ ref={ref}
+ className={cn("border-t bg-muted/50 font-medium [&>tr]:last:border-b-0", className)}
+ {...props}
+ />
+ ),
+);
+TableFooter.displayName = "TableFooter";
-const TableRow = React.forwardRef<
- HTMLTableRowElement,
- React.HTMLAttributes<HTMLTableRowElement>
->(({ className, ...props }, ref) => (
- <tr
- ref={ref}
- className={cn(
- "border-b transition-colors hover:bg-muted/50 data-[state=selected]:bg-muted",
- className
- )}
- {...props}
- />
-))
-TableRow.displayName = "TableRow"
+const TableRow = React.forwardRef<HTMLTableRowElement, React.HTMLAttributes<HTMLTableRowElement>>(
+ ({ className, ...props }, ref) => (
+ <tr
+ ref={ref}
+ className={cn("border-b transition-colors hover:bg-muted/50 data-[state=selected]:bg-muted", className)}
+ {...props}
+ />
+ ),
+);
+TableRow.displayName = "TableRow";
-const TableHead = React.forwardRef<
- HTMLTableCellElement,
- React.ThHTMLAttributes<HTMLTableCellElement>
->(({ className, ...props }, ref) => (
- <th
- ref={ref}
- className={cn(
- "h-10 px-2 text-left align-middle font-medium text-muted-foreground [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
- className
- )}
- {...props}
- />
-))
-TableHead.displayName = "TableHead"
+const TableHead = React.forwardRef<HTMLTableCellElement, React.ThHTMLAttributes<HTMLTableCellElement>>(
+ ({ className, ...props }, ref) => (
+ <th
+ ref={ref}
+ className={cn(
+ "h-10 px-2 text-left align-middle font-medium text-muted-foreground [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
+ className,
+ )}
+ {...props}
+ />
+ ),
+);
+TableHead.displayName = "TableHead";
-const TableCell = React.forwardRef<
- HTMLTableCellElement,
- React.TdHTMLAttributes<HTMLTableCellElement>
->(({ className, ...props }, ref) => (
- <td
- ref={ref}
- className={cn(
- "p-2 align-middle [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
- className
- )}
- {...props}
- />
-))
-TableCell.displayName = "TableCell"
+const TableCell = React.forwardRef<HTMLTableCellElement, React.TdHTMLAttributes<HTMLTableCellElement>>(
+ ({ className, ...props }, ref) => (
+ <td
+ ref={ref}
+ className={cn(
+ "p-2 align-middle [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
+ className,
+ )}
+ {...props}
+ />
+ ),
+);
+TableCell.displayName = "TableCell";
-const TableCaption = React.forwardRef<
- HTMLTableCaptionElement,
- React.HTMLAttributes<HTMLTableCaptionElement>
->(({ className, ...props }, ref) => (
- <caption
- ref={ref}
- className={cn("mt-4 text-sm text-muted-foreground", className)}
- {...props}
- />
-))
-TableCaption.displayName = "TableCaption"
+const TableCaption = React.forwardRef<HTMLTableCaptionElement, React.HTMLAttributes<HTMLTableCaptionElement>>(
+ ({ className, ...props }, ref) => (
+ <caption ref={ref} className={cn("mt-4 text-sm text-muted-foreground", className)} {...props} />
+ ),
+);
+TableCaption.displayName = "TableCaption";
-export {
- Table,
- TableHeader,
- TableBody,
- TableFooter,
- TableHead,
- TableRow,
- TableCell,
- TableCaption,
-}
+export { Table, TableHeader, TableBody, TableFooter, TableHead, TableRow, TableCell, TableCaption };
diff --git a/apps/canvas/front/src/components/ui/tabs.tsx b/apps/canvas/front/src/components/ui/tabs.tsx
index 85d83be..411025f 100644
--- a/apps/canvas/front/src/components/ui/tabs.tsx
+++ b/apps/canvas/front/src/components/ui/tabs.tsx
@@ -1,53 +1,53 @@
-import * as React from "react"
-import * as TabsPrimitive from "@radix-ui/react-tabs"
+import * as React from "react";
+import * as TabsPrimitive from "@radix-ui/react-tabs";
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
-const Tabs = TabsPrimitive.Root
+const Tabs = TabsPrimitive.Root;
const TabsList = React.forwardRef<
- React.ElementRef<typeof TabsPrimitive.List>,
- React.ComponentPropsWithoutRef<typeof TabsPrimitive.List>
+ React.ElementRef<typeof TabsPrimitive.List>,
+ React.ComponentPropsWithoutRef<typeof TabsPrimitive.List>
>(({ className, ...props }, ref) => (
- <TabsPrimitive.List
- ref={ref}
- className={cn(
- "inline-flex h-9 items-center justify-center rounded-lg bg-muted p-1 text-muted-foreground",
- className
- )}
- {...props}
- />
-))
-TabsList.displayName = TabsPrimitive.List.displayName
+ <TabsPrimitive.List
+ ref={ref}
+ className={cn(
+ "inline-flex h-9 items-center justify-center rounded-lg bg-muted p-1 text-muted-foreground",
+ className,
+ )}
+ {...props}
+ />
+));
+TabsList.displayName = TabsPrimitive.List.displayName;
const TabsTrigger = React.forwardRef<
- React.ElementRef<typeof TabsPrimitive.Trigger>,
- React.ComponentPropsWithoutRef<typeof TabsPrimitive.Trigger>
+ React.ElementRef<typeof TabsPrimitive.Trigger>,
+ React.ComponentPropsWithoutRef<typeof TabsPrimitive.Trigger>
>(({ className, ...props }, ref) => (
- <TabsPrimitive.Trigger
- ref={ref}
- className={cn(
- "inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow",
- className
- )}
- {...props}
- />
-))
-TabsTrigger.displayName = TabsPrimitive.Trigger.displayName
+ <TabsPrimitive.Trigger
+ ref={ref}
+ className={cn(
+ "inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow",
+ className,
+ )}
+ {...props}
+ />
+));
+TabsTrigger.displayName = TabsPrimitive.Trigger.displayName;
const TabsContent = React.forwardRef<
- React.ElementRef<typeof TabsPrimitive.Content>,
- React.ComponentPropsWithoutRef<typeof TabsPrimitive.Content>
+ React.ElementRef<typeof TabsPrimitive.Content>,
+ React.ComponentPropsWithoutRef<typeof TabsPrimitive.Content>
>(({ className, ...props }, ref) => (
- <TabsPrimitive.Content
- ref={ref}
- className={cn(
- "mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
- className
- )}
- {...props}
- />
-))
-TabsContent.displayName = TabsPrimitive.Content.displayName
+ <TabsPrimitive.Content
+ ref={ref}
+ className={cn(
+ "mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
+ className,
+ )}
+ {...props}
+ />
+));
+TabsContent.displayName = TabsPrimitive.Content.displayName;
-export { Tabs, TabsList, TabsTrigger, TabsContent }
+export { Tabs, TabsList, TabsTrigger, TabsContent };
diff --git a/apps/canvas/front/src/components/ui/textarea.tsx b/apps/canvas/front/src/components/ui/textarea.tsx
index e56b0af..4822314 100644
--- a/apps/canvas/front/src/components/ui/textarea.tsx
+++ b/apps/canvas/front/src/components/ui/textarea.tsx
@@ -1,22 +1,21 @@
-import * as React from "react"
+import * as React from "react";
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
-const Textarea = React.forwardRef<
- HTMLTextAreaElement,
- React.ComponentProps<"textarea">
->(({ className, ...props }, ref) => {
- return (
- <textarea
- className={cn(
- "flex min-h-[60px] w-full rounded-md border border-input bg-transparent px-3 py-2 text-base shadow-sm placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
- className
- )}
- ref={ref}
- {...props}
- />
- )
-})
-Textarea.displayName = "Textarea"
+const Textarea = React.forwardRef<HTMLTextAreaElement, React.ComponentProps<"textarea">>(
+ ({ className, ...props }, ref) => {
+ return (
+ <textarea
+ className={cn(
+ "flex min-h-[60px] w-full rounded-md border border-input bg-transparent px-3 py-2 text-base shadow-sm placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
+ className,
+ )}
+ ref={ref}
+ {...props}
+ />
+ );
+ },
+);
+Textarea.displayName = "Textarea";
-export { Textarea }
+export { Textarea };
diff --git a/apps/canvas/front/src/components/ui/toast.tsx b/apps/canvas/front/src/components/ui/toast.tsx
index 1e09b4e..c919aee 100644
--- a/apps/canvas/front/src/components/ui/toast.tsx
+++ b/apps/canvas/front/src/components/ui/toast.tsx
@@ -1,126 +1,110 @@
-import * as React from "react"
-import * as ToastPrimitives from "@radix-ui/react-toast"
-import { cva, type VariantProps } from "class-variance-authority"
-import { cn } from "@/lib/utils"
-import { Cross2Icon } from "@radix-ui/react-icons"
+import * as React from "react";
+import * as ToastPrimitives from "@radix-ui/react-toast";
+import { cva, type VariantProps } from "class-variance-authority";
+import { cn } from "@/lib/utils";
+import { Cross2Icon } from "@radix-ui/react-icons";
-const ToastProvider = ToastPrimitives.Provider
+const ToastProvider = ToastPrimitives.Provider;
const ToastViewport = React.forwardRef<
- React.ElementRef<typeof ToastPrimitives.Viewport>,
- React.ComponentPropsWithoutRef<typeof ToastPrimitives.Viewport>
+ React.ElementRef<typeof ToastPrimitives.Viewport>,
+ React.ComponentPropsWithoutRef<typeof ToastPrimitives.Viewport>
>(({ className, ...props }, ref) => (
- <ToastPrimitives.Viewport
- ref={ref}
- className={cn(
- "fixed top-0 z-[100] flex max-h-screen w-full flex-col-reverse p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px]",
- className
- )}
- {...props}
- />
-))
-ToastViewport.displayName = ToastPrimitives.Viewport.displayName
+ <ToastPrimitives.Viewport
+ ref={ref}
+ className={cn(
+ "fixed top-0 z-[100] flex max-h-screen w-full flex-col-reverse p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px]",
+ className,
+ )}
+ {...props}
+ />
+));
+ToastViewport.displayName = ToastPrimitives.Viewport.displayName;
const toastVariants = cva(
- "group pointer-events-auto relative flex w-full items-center justify-between space-x-2 overflow-hidden rounded-md border p-4 pr-6 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full",
- {
- variants: {
- variant: {
- default: "border bg-background text-foreground",
- destructive:
- "destructive group border-destructive bg-destructive text-destructive-foreground",
- },
- },
- defaultVariants: {
- variant: "default",
- },
- }
-)
+ "group pointer-events-auto relative flex w-full items-center justify-between space-x-2 overflow-hidden rounded-md border p-4 pr-6 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full",
+ {
+ variants: {
+ variant: {
+ default: "border bg-background text-foreground",
+ destructive: "destructive group border-destructive bg-destructive text-destructive-foreground",
+ },
+ },
+ defaultVariants: {
+ variant: "default",
+ },
+ },
+);
const Toast = React.forwardRef<
- React.ElementRef<typeof ToastPrimitives.Root>,
- React.ComponentPropsWithoutRef<typeof ToastPrimitives.Root> &
- VariantProps<typeof toastVariants>
+ React.ElementRef<typeof ToastPrimitives.Root>,
+ React.ComponentPropsWithoutRef<typeof ToastPrimitives.Root> & VariantProps<typeof toastVariants>
>(({ className, variant, ...props }, ref) => {
- return (
- <ToastPrimitives.Root
- ref={ref}
- className={cn(toastVariants({ variant }), className)}
- {...props}
- />
- )
-})
-Toast.displayName = ToastPrimitives.Root.displayName
+ return <ToastPrimitives.Root ref={ref} className={cn(toastVariants({ variant }), className)} {...props} />;
+});
+Toast.displayName = ToastPrimitives.Root.displayName;
const ToastAction = React.forwardRef<
- React.ElementRef<typeof ToastPrimitives.Action>,
- React.ComponentPropsWithoutRef<typeof ToastPrimitives.Action>
+ React.ElementRef<typeof ToastPrimitives.Action>,
+ React.ComponentPropsWithoutRef<typeof ToastPrimitives.Action>
>(({ className, ...props }, ref) => (
- <ToastPrimitives.Action
- ref={ref}
- className={cn(
- "inline-flex h-8 shrink-0 items-center justify-center rounded-md border bg-transparent px-3 text-sm font-medium transition-colors hover:bg-secondary focus:outline-none focus:ring-1 focus:ring-ring disabled:pointer-events-none disabled:opacity-50 group-[.destructive]:border-muted/40 group-[.destructive]:hover:border-destructive/30 group-[.destructive]:hover:bg-destructive group-[.destructive]:hover:text-destructive-foreground group-[.destructive]:focus:ring-destructive",
- className
- )}
- {...props}
- />
-))
-ToastAction.displayName = ToastPrimitives.Action.displayName
+ <ToastPrimitives.Action
+ ref={ref}
+ className={cn(
+ "inline-flex h-8 shrink-0 items-center justify-center rounded-md border bg-transparent px-3 text-sm font-medium transition-colors hover:bg-secondary focus:outline-none focus:ring-1 focus:ring-ring disabled:pointer-events-none disabled:opacity-50 group-[.destructive]:border-muted/40 group-[.destructive]:hover:border-destructive/30 group-[.destructive]:hover:bg-destructive group-[.destructive]:hover:text-destructive-foreground group-[.destructive]:focus:ring-destructive",
+ className,
+ )}
+ {...props}
+ />
+));
+ToastAction.displayName = ToastPrimitives.Action.displayName;
const ToastClose = React.forwardRef<
- React.ElementRef<typeof ToastPrimitives.Close>,
- React.ComponentPropsWithoutRef<typeof ToastPrimitives.Close>
+ React.ElementRef<typeof ToastPrimitives.Close>,
+ React.ComponentPropsWithoutRef<typeof ToastPrimitives.Close>
>(({ className, ...props }, ref) => (
- <ToastPrimitives.Close
- ref={ref}
- className={cn(
- "absolute right-1 top-1 rounded-md p-1 text-foreground/50 opacity-0 transition-opacity hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-1 group-hover:opacity-100 group-[.destructive]:text-red-300 group-[.destructive]:hover:text-red-50 group-[.destructive]:focus:ring-red-400 group-[.destructive]:focus:ring-offset-red-600",
- className
- )}
- toast-close=""
- {...props}
- >
- <Cross2Icon className="h-4 w-4" />
- </ToastPrimitives.Close>
-))
-ToastClose.displayName = ToastPrimitives.Close.displayName
+ <ToastPrimitives.Close
+ ref={ref}
+ className={cn(
+ "absolute right-1 top-1 rounded-md p-1 text-foreground/50 opacity-0 transition-opacity hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-1 group-hover:opacity-100 group-[.destructive]:text-red-300 group-[.destructive]:hover:text-red-50 group-[.destructive]:focus:ring-red-400 group-[.destructive]:focus:ring-offset-red-600",
+ className,
+ )}
+ toast-close=""
+ {...props}
+ >
+ <Cross2Icon className="h-4 w-4" />
+ </ToastPrimitives.Close>
+));
+ToastClose.displayName = ToastPrimitives.Close.displayName;
const ToastTitle = React.forwardRef<
- React.ElementRef<typeof ToastPrimitives.Title>,
- React.ComponentPropsWithoutRef<typeof ToastPrimitives.Title>
+ React.ElementRef<typeof ToastPrimitives.Title>,
+ React.ComponentPropsWithoutRef<typeof ToastPrimitives.Title>
>(({ className, ...props }, ref) => (
- <ToastPrimitives.Title
- ref={ref}
- className={cn("text-sm font-semibold [&+div]:text-xs", className)}
- {...props}
- />
-))
-ToastTitle.displayName = ToastPrimitives.Title.displayName
+ <ToastPrimitives.Title ref={ref} className={cn("text-sm font-semibold [&+div]:text-xs", className)} {...props} />
+));
+ToastTitle.displayName = ToastPrimitives.Title.displayName;
const ToastDescription = React.forwardRef<
- React.ElementRef<typeof ToastPrimitives.Description>,
- React.ComponentPropsWithoutRef<typeof ToastPrimitives.Description>
+ React.ElementRef<typeof ToastPrimitives.Description>,
+ React.ComponentPropsWithoutRef<typeof ToastPrimitives.Description>
>(({ className, ...props }, ref) => (
- <ToastPrimitives.Description
- ref={ref}
- className={cn("text-sm opacity-90", className)}
- {...props}
- />
-))
-ToastDescription.displayName = ToastPrimitives.Description.displayName
+ <ToastPrimitives.Description ref={ref} className={cn("text-sm opacity-90", className)} {...props} />
+));
+ToastDescription.displayName = ToastPrimitives.Description.displayName;
-type ToastProps = React.ComponentPropsWithoutRef<typeof Toast>
+type ToastProps = React.ComponentPropsWithoutRef<typeof Toast>;
-type ToastActionElement = React.ReactElement<typeof ToastAction>
+type ToastActionElement = React.ReactElement<typeof ToastAction>;
export {
- type ToastProps,
- type ToastActionElement,
- ToastProvider,
- ToastViewport,
- Toast,
- ToastTitle,
- ToastDescription,
- ToastClose,
- ToastAction,
-}
+ type ToastProps,
+ type ToastActionElement,
+ ToastProvider,
+ ToastViewport,
+ Toast,
+ ToastTitle,
+ ToastDescription,
+ ToastClose,
+ ToastAction,
+};
diff --git a/apps/canvas/front/src/components/ui/toaster.tsx b/apps/canvas/front/src/components/ui/toaster.tsx
index 6c67edf..5b0257c 100644
--- a/apps/canvas/front/src/components/ui/toaster.tsx
+++ b/apps/canvas/front/src/components/ui/toaster.tsx
@@ -1,33 +1,24 @@
-import { useToast } from "@/hooks/use-toast"
-import {
- Toast,
- ToastClose,
- ToastDescription,
- ToastProvider,
- ToastTitle,
- ToastViewport,
-} from "@/components/ui/toast"
+import { useToast } from "@/hooks/use-toast";
+import { Toast, ToastClose, ToastDescription, ToastProvider, ToastTitle, ToastViewport } from "@/components/ui/toast";
export function Toaster() {
- const { toasts } = useToast()
+ const { toasts } = useToast();
- return (
- <ToastProvider>
- {toasts.map(function ({ id, title, description, action, ...props }) {
- return (
- <Toast key={id} {...props}>
- <div className="grid gap-1">
- {title && <ToastTitle>{title}</ToastTitle>}
- {description && (
- <ToastDescription>{description}</ToastDescription>
- )}
- </div>
- {action}
- <ToastClose />
- </Toast>
- )
- })}
- <ToastViewport />
- </ToastProvider>
- )
+ return (
+ <ToastProvider>
+ {toasts.map(function ({ id, title, description, action, ...props }) {
+ return (
+ <Toast key={id} {...props}>
+ <div className="grid gap-1">
+ {title && <ToastTitle>{title}</ToastTitle>}
+ {description && <ToastDescription>{description}</ToastDescription>}
+ </div>
+ {action}
+ <ToastClose />
+ </Toast>
+ );
+ })}
+ <ToastViewport />
+ </ToastProvider>
+ );
}
diff --git a/apps/canvas/front/src/components/ui/tooltip.tsx b/apps/canvas/front/src/components/ui/tooltip.tsx
index 218d183..d244b85 100644
--- a/apps/canvas/front/src/components/ui/tooltip.tsx
+++ b/apps/canvas/front/src/components/ui/tooltip.tsx
@@ -1,30 +1,30 @@
-import * as React from "react"
-import * as TooltipPrimitive from "@radix-ui/react-tooltip"
+import * as React from "react";
+import * as TooltipPrimitive from "@radix-ui/react-tooltip";
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
-const TooltipProvider = TooltipPrimitive.Provider
+const TooltipProvider = TooltipPrimitive.Provider;
-const Tooltip = TooltipPrimitive.Root
+const Tooltip = TooltipPrimitive.Root;
-const TooltipTrigger = TooltipPrimitive.Trigger
+const TooltipTrigger = TooltipPrimitive.Trigger;
const TooltipContent = React.forwardRef<
- React.ElementRef<typeof TooltipPrimitive.Content>,
- React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
+ React.ElementRef<typeof TooltipPrimitive.Content>,
+ React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
>(({ className, sideOffset = 4, ...props }, ref) => (
- <TooltipPrimitive.Portal>
- <TooltipPrimitive.Content
- ref={ref}
- sideOffset={sideOffset}
- className={cn(
- "z-50 overflow-hidden rounded-md bg-primary px-3 py-1.5 text-xs text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
- className
- )}
- {...props}
- />
- </TooltipPrimitive.Portal>
-))
-TooltipContent.displayName = TooltipPrimitive.Content.displayName
+ <TooltipPrimitive.Portal>
+ <TooltipPrimitive.Content
+ ref={ref}
+ sideOffset={sideOffset}
+ className={cn(
+ "z-50 overflow-hidden rounded-md bg-primary px-3 py-1.5 text-xs text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+ className,
+ )}
+ {...props}
+ />
+ </TooltipPrimitive.Portal>
+));
+TooltipContent.displayName = TooltipPrimitive.Content.displayName;
-export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider }
+export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };
diff --git a/apps/canvas/front/src/hooks/use-mobile.tsx b/apps/canvas/front/src/hooks/use-mobile.tsx
index 2b0fe1d..21e5c1f 100644
--- a/apps/canvas/front/src/hooks/use-mobile.tsx
+++ b/apps/canvas/front/src/hooks/use-mobile.tsx
@@ -1,19 +1,19 @@
-import * as React from "react"
+import * as React from "react";
-const MOBILE_BREAKPOINT = 768
+const MOBILE_BREAKPOINT = 768;
export function useIsMobile() {
- const [isMobile, setIsMobile] = React.useState<boolean | undefined>(undefined)
+ const [isMobile, setIsMobile] = React.useState<boolean | undefined>(undefined);
- React.useEffect(() => {
- const mql = window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`)
- const onChange = () => {
- setIsMobile(window.innerWidth < MOBILE_BREAKPOINT)
- }
- mql.addEventListener("change", onChange)
- setIsMobile(window.innerWidth < MOBILE_BREAKPOINT)
- return () => mql.removeEventListener("change", onChange)
- }, [])
+ React.useEffect(() => {
+ const mql = window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`);
+ const onChange = () => {
+ setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);
+ };
+ mql.addEventListener("change", onChange);
+ setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);
+ return () => mql.removeEventListener("change", onChange);
+ }, []);
- return !!isMobile
+ return !!isMobile;
}
diff --git a/apps/canvas/front/src/hooks/use-toast.ts b/apps/canvas/front/src/hooks/use-toast.ts
index 55ec184..66b24fc 100644
--- a/apps/canvas/front/src/hooks/use-toast.ts
+++ b/apps/canvas/front/src/hooks/use-toast.ts
@@ -1,194 +1,189 @@
-"use client"
+"use client";
// Inspired by react-hot-toast library
-import * as React from "react"
+import * as React from "react";
-import type {
- ToastActionElement,
- ToastProps,
-} from "@/components/ui/toast"
+import type { ToastActionElement, ToastProps } from "@/components/ui/toast";
-const TOAST_LIMIT = 1
-const TOAST_REMOVE_DELAY = 1000000
+const TOAST_LIMIT = 1;
+const TOAST_REMOVE_DELAY = 1000000;
type ToasterToast = ToastProps & {
- id: string
- title?: React.ReactNode
- description?: React.ReactNode
- action?: ToastActionElement
-}
+ id: string;
+ title?: React.ReactNode;
+ description?: React.ReactNode;
+ action?: ToastActionElement;
+};
const actionTypes = {
- ADD_TOAST: "ADD_TOAST",
- UPDATE_TOAST: "UPDATE_TOAST",
- DISMISS_TOAST: "DISMISS_TOAST",
- REMOVE_TOAST: "REMOVE_TOAST",
-} as const
+ ADD_TOAST: "ADD_TOAST",
+ UPDATE_TOAST: "UPDATE_TOAST",
+ DISMISS_TOAST: "DISMISS_TOAST",
+ REMOVE_TOAST: "REMOVE_TOAST",
+} as const;
-let count = 0
+let count = 0;
function genId() {
- count = (count + 1) % Number.MAX_SAFE_INTEGER
- return count.toString()
+ count = (count + 1) % Number.MAX_SAFE_INTEGER;
+ return count.toString();
}
-type ActionType = typeof actionTypes
+type ActionType = typeof actionTypes;
type Action =
- | {
- type: ActionType["ADD_TOAST"]
- toast: ToasterToast
- }
- | {
- type: ActionType["UPDATE_TOAST"]
- toast: Partial<ToasterToast>
- }
- | {
- type: ActionType["DISMISS_TOAST"]
- toastId?: ToasterToast["id"]
- }
- | {
- type: ActionType["REMOVE_TOAST"]
- toastId?: ToasterToast["id"]
- }
+ | {
+ type: ActionType["ADD_TOAST"];
+ toast: ToasterToast;
+ }
+ | {
+ type: ActionType["UPDATE_TOAST"];
+ toast: Partial<ToasterToast>;
+ }
+ | {
+ type: ActionType["DISMISS_TOAST"];
+ toastId?: ToasterToast["id"];
+ }
+ | {
+ type: ActionType["REMOVE_TOAST"];
+ toastId?: ToasterToast["id"];
+ };
interface State {
- toasts: ToasterToast[]
+ toasts: ToasterToast[];
}
-const toastTimeouts = new Map<string, ReturnType<typeof setTimeout>>()
+const toastTimeouts = new Map<string, ReturnType<typeof setTimeout>>();
const addToRemoveQueue = (toastId: string) => {
- if (toastTimeouts.has(toastId)) {
- return
- }
+ if (toastTimeouts.has(toastId)) {
+ return;
+ }
- const timeout = setTimeout(() => {
- toastTimeouts.delete(toastId)
- dispatch({
- type: "REMOVE_TOAST",
- toastId: toastId,
- })
- }, TOAST_REMOVE_DELAY)
+ const timeout = setTimeout(() => {
+ toastTimeouts.delete(toastId);
+ dispatch({
+ type: "REMOVE_TOAST",
+ toastId: toastId,
+ });
+ }, TOAST_REMOVE_DELAY);
- toastTimeouts.set(toastId, timeout)
-}
+ toastTimeouts.set(toastId, timeout);
+};
export const reducer = (state: State, action: Action): State => {
- switch (action.type) {
- case "ADD_TOAST":
- return {
- ...state,
- toasts: [action.toast, ...state.toasts].slice(0, TOAST_LIMIT),
- }
+ switch (action.type) {
+ case "ADD_TOAST":
+ return {
+ ...state,
+ toasts: [action.toast, ...state.toasts].slice(0, TOAST_LIMIT),
+ };
- case "UPDATE_TOAST":
- return {
- ...state,
- toasts: state.toasts.map((t) =>
- t.id === action.toast.id ? { ...t, ...action.toast } : t
- ),
- }
+ case "UPDATE_TOAST":
+ return {
+ ...state,
+ toasts: state.toasts.map((t) => (t.id === action.toast.id ? { ...t, ...action.toast } : t)),
+ };
- case "DISMISS_TOAST": {
- const { toastId } = action
+ case "DISMISS_TOAST": {
+ const { toastId } = action;
- // ! Side effects ! - This could be extracted into a dismissToast() action,
- // but I'll keep it here for simplicity
- if (toastId) {
- addToRemoveQueue(toastId)
- } else {
- state.toasts.forEach((toast) => {
- addToRemoveQueue(toast.id)
- })
- }
+ // ! Side effects ! - This could be extracted into a dismissToast() action,
+ // but I'll keep it here for simplicity
+ if (toastId) {
+ addToRemoveQueue(toastId);
+ } else {
+ state.toasts.forEach((toast) => {
+ addToRemoveQueue(toast.id);
+ });
+ }
- return {
- ...state,
- toasts: state.toasts.map((t) =>
- t.id === toastId || toastId === undefined
- ? {
- ...t,
- open: false,
- }
- : t
- ),
- }
- }
- case "REMOVE_TOAST":
- if (action.toastId === undefined) {
- return {
- ...state,
- toasts: [],
- }
- }
- return {
- ...state,
- toasts: state.toasts.filter((t) => t.id !== action.toastId),
- }
- }
-}
+ return {
+ ...state,
+ toasts: state.toasts.map((t) =>
+ t.id === toastId || toastId === undefined
+ ? {
+ ...t,
+ open: false,
+ }
+ : t,
+ ),
+ };
+ }
+ case "REMOVE_TOAST":
+ if (action.toastId === undefined) {
+ return {
+ ...state,
+ toasts: [],
+ };
+ }
+ return {
+ ...state,
+ toasts: state.toasts.filter((t) => t.id !== action.toastId),
+ };
+ }
+};
-const listeners: Array<(state: State) => void> = []
+const listeners: Array<(state: State) => void> = [];
-let memoryState: State = { toasts: [] }
+let memoryState: State = { toasts: [] };
function dispatch(action: Action) {
- memoryState = reducer(memoryState, action)
- listeners.forEach((listener) => {
- listener(memoryState)
- })
+ memoryState = reducer(memoryState, action);
+ listeners.forEach((listener) => {
+ listener(memoryState);
+ });
}
-type Toast = Omit<ToasterToast, "id">
+type Toast = Omit<ToasterToast, "id">;
function toast({ ...props }: Toast) {
- const id = genId()
+ const id = genId();
- const update = (props: ToasterToast) =>
- dispatch({
- type: "UPDATE_TOAST",
- toast: { ...props, id },
- })
- const dismiss = () => dispatch({ type: "DISMISS_TOAST", toastId: id })
+ const update = (props: ToasterToast) =>
+ dispatch({
+ type: "UPDATE_TOAST",
+ toast: { ...props, id },
+ });
+ const dismiss = () => dispatch({ type: "DISMISS_TOAST", toastId: id });
- dispatch({
- type: "ADD_TOAST",
- toast: {
- ...props,
- id,
- open: true,
- onOpenChange: (open) => {
- if (!open) dismiss()
- },
- },
- })
+ dispatch({
+ type: "ADD_TOAST",
+ toast: {
+ ...props,
+ id,
+ open: true,
+ onOpenChange: (open) => {
+ if (!open) dismiss();
+ },
+ },
+ });
- return {
- id: id,
- dismiss,
- update,
- }
+ return {
+ id: id,
+ dismiss,
+ update,
+ };
}
function useToast() {
- const [state, setState] = React.useState<State>(memoryState)
+ const [state, setState] = React.useState<State>(memoryState);
- React.useEffect(() => {
- listeners.push(setState)
- return () => {
- const index = listeners.indexOf(setState)
- if (index > -1) {
- listeners.splice(index, 1)
- }
- }
- }, [state])
+ React.useEffect(() => {
+ listeners.push(setState);
+ return () => {
+ const index = listeners.indexOf(setState);
+ if (index > -1) {
+ listeners.splice(index, 1);
+ }
+ };
+ }, [state]);
- return {
- ...state,
- toast,
- dismiss: (toastId?: string) => dispatch({ type: "DISMISS_TOAST", toastId }),
- }
+ return {
+ ...state,
+ toast,
+ dismiss: (toastId?: string) => dispatch({ type: "DISMISS_TOAST", toastId }),
+ };
}
-export { useToast, toast }
+export { useToast, toast };
diff --git a/apps/canvas/front/src/index.css b/apps/canvas/front/src/index.css
index 881907b..ec30ac4 100644
--- a/apps/canvas/front/src/index.css
+++ b/apps/canvas/front/src/index.css
@@ -3,102 +3,99 @@
@tailwind utilities;
@layer base {
- :root {
- --background: 0 0% 100%;
- --foreground: 0 0% 3.9%;
- --card: 0 0% 100%;
- --card-foreground: 0 0% 3.9%;
- --popover: 0 0% 100%;
- --popover-foreground: 0 0% 3.9%;
- --primary: 0 0% 9%;
- --primary-foreground: 0 0% 98%;
- --secondary: 0 0% 96.1%;
- --secondary-foreground: 0 0% 9%;
- --muted: 0 0% 96.1%;
- --muted-foreground: 0 0% 45.1%;
- --accent: 0 0% 96.1%;
- --accent-foreground: 0 0% 9%;
- --destructive: 0 84.2% 60.2%;
- --destructive-foreground: 0 0% 98%;
- --border: 0 0% 89.8%;
- --input: 0 0% 89.8%;
- --ring: 0 0% 3.9%;
- --chart-1: 12 76% 61%;
- --chart-2: 173 58% 39%;
- --chart-3: 197 37% 24%;
- --chart-4: 43 74% 66%;
- --chart-5: 27 87% 67%;
- --radius: 0.5rem
- ;
- --sidebar-background: 0 0% 98%;
- --sidebar-foreground: 240 5.3% 26.1%;
- --sidebar-primary: 240 5.9% 10%;
- --sidebar-primary-foreground: 0 0% 98%;
- --sidebar-accent: 240 4.8% 95.9%;
- --sidebar-accent-foreground: 240 5.9% 10%;
- --sidebar-border: 220 13% 91%;
- --sidebar-ring: 217.2 91.2% 59.8%;
- --sidebar-background: 0 0% 98%;
- --sidebar-foreground: 240 5.3% 26.1%;
- --sidebar-primary: 240 5.9% 10%;
- --sidebar-primary-foreground: 0 0% 98%;
- --sidebar-accent: 240 4.8% 95.9%;
- --sidebar-accent-foreground: 240 5.9% 10%;
- --sidebar-border: 220 13% 91%;
- --sidebar-ring: 217.2 91.2% 59.8%;
- }
+ :root {
+ --background: 0 0% 100%;
+ --foreground: 0 0% 3.9%;
+ --card: 0 0% 100%;
+ --card-foreground: 0 0% 3.9%;
+ --popover: 0 0% 100%;
+ --popover-foreground: 0 0% 3.9%;
+ --primary: 0 0% 9%;
+ --primary-foreground: 0 0% 98%;
+ --secondary: 0 0% 96.1%;
+ --secondary-foreground: 0 0% 9%;
+ --muted: 0 0% 96.1%;
+ --muted-foreground: 0 0% 45.1%;
+ --accent: 0 0% 96.1%;
+ --accent-foreground: 0 0% 9%;
+ --destructive: 0 84.2% 60.2%;
+ --destructive-foreground: 0 0% 98%;
+ --border: 0 0% 89.8%;
+ --input: 0 0% 89.8%;
+ --ring: 0 0% 3.9%;
+ --chart-1: 12 76% 61%;
+ --chart-2: 173 58% 39%;
+ --chart-3: 197 37% 24%;
+ --chart-4: 43 74% 66%;
+ --chart-5: 27 87% 67%;
+ --radius: 0.5rem;
+ --sidebar-background: 0 0% 98%;
+ --sidebar-foreground: 240 5.3% 26.1%;
+ --sidebar-primary: 240 5.9% 10%;
+ --sidebar-primary-foreground: 0 0% 98%;
+ --sidebar-accent: 240 4.8% 95.9%;
+ --sidebar-accent-foreground: 240 5.9% 10%;
+ --sidebar-border: 220 13% 91%;
+ --sidebar-ring: 217.2 91.2% 59.8%;
+ --sidebar-background: 0 0% 98%;
+ --sidebar-foreground: 240 5.3% 26.1%;
+ --sidebar-primary: 240 5.9% 10%;
+ --sidebar-primary-foreground: 0 0% 98%;
+ --sidebar-accent: 240 4.8% 95.9%;
+ --sidebar-accent-foreground: 240 5.9% 10%;
+ --sidebar-border: 220 13% 91%;
+ --sidebar-ring: 217.2 91.2% 59.8%;
+ }
- .dark {
- --background: 0 0% 3.9%;
- --foreground: 0 0% 98%;
- --card: 0 0% 3.9%;
- --card-foreground: 0 0% 98%;
- --popover: 0 0% 3.9%;
- --popover-foreground: 0 0% 98%;
- --primary: 0 0% 98%;
- --primary-foreground: 0 0% 9%;
- --secondary: 0 0% 14.9%;
- --secondary-foreground: 0 0% 98%;
- --muted: 0 0% 14.9%;
- --muted-foreground: 0 0% 63.9%;
- --accent: 0 0% 14.9%;
- --accent-foreground: 0 0% 98%;
- --destructive: 0 62.8% 30.6%;
- --destructive-foreground: 0 0% 98%;
- --border: 0 0% 14.9%;
- --input: 0 0% 14.9%;
- --ring: 0 0% 83.1%;
- --chart-1: 220 70% 50%;
- --chart-2: 160 60% 45%;
- --chart-3: 30 80% 55%;
- --chart-4: 280 65% 60%;
- --chart-5: 340 75% 55%
- ;
- --sidebar-background: 240 5.9% 10%;
- --sidebar-foreground: 240 4.8% 95.9%;
- --sidebar-primary: 224.3 76.3% 48%;
- --sidebar-primary-foreground: 0 0% 100%;
- --sidebar-accent: 240 3.7% 15.9%;
- --sidebar-accent-foreground: 240 4.8% 95.9%;
- --sidebar-border: 240 3.7% 15.9%;
- --sidebar-ring: 217.2 91.2% 59.8%;
- --sidebar-background: 240 5.9% 10%;
- --sidebar-foreground: 240 4.8% 95.9%;
- --sidebar-primary: 224.3 76.3% 48%;
- --sidebar-primary-foreground: 0 0% 100%;
- --sidebar-accent: 240 3.7% 15.9%;
- --sidebar-accent-foreground: 240 4.8% 95.9%;
- --sidebar-border: 240 3.7% 15.9%;
- --sidebar-ring: 217.2 91.2% 59.8%;
- }
+ .dark {
+ --background: 0 0% 3.9%;
+ --foreground: 0 0% 98%;
+ --card: 0 0% 3.9%;
+ --card-foreground: 0 0% 98%;
+ --popover: 0 0% 3.9%;
+ --popover-foreground: 0 0% 98%;
+ --primary: 0 0% 98%;
+ --primary-foreground: 0 0% 9%;
+ --secondary: 0 0% 14.9%;
+ --secondary-foreground: 0 0% 98%;
+ --muted: 0 0% 14.9%;
+ --muted-foreground: 0 0% 63.9%;
+ --accent: 0 0% 14.9%;
+ --accent-foreground: 0 0% 98%;
+ --destructive: 0 62.8% 30.6%;
+ --destructive-foreground: 0 0% 98%;
+ --border: 0 0% 14.9%;
+ --input: 0 0% 14.9%;
+ --ring: 0 0% 83.1%;
+ --chart-1: 220 70% 50%;
+ --chart-2: 160 60% 45%;
+ --chart-3: 30 80% 55%;
+ --chart-4: 280 65% 60%;
+ --chart-5: 340 75% 55%;
+ --sidebar-background: 240 5.9% 10%;
+ --sidebar-foreground: 240 4.8% 95.9%;
+ --sidebar-primary: 224.3 76.3% 48%;
+ --sidebar-primary-foreground: 0 0% 100%;
+ --sidebar-accent: 240 3.7% 15.9%;
+ --sidebar-accent-foreground: 240 4.8% 95.9%;
+ --sidebar-border: 240 3.7% 15.9%;
+ --sidebar-ring: 217.2 91.2% 59.8%;
+ --sidebar-background: 240 5.9% 10%;
+ --sidebar-foreground: 240 4.8% 95.9%;
+ --sidebar-primary: 224.3 76.3% 48%;
+ --sidebar-primary-foreground: 0 0% 100%;
+ --sidebar-accent: 240 3.7% 15.9%;
+ --sidebar-accent-foreground: 240 4.8% 95.9%;
+ --sidebar-border: 240 3.7% 15.9%;
+ --sidebar-ring: 217.2 91.2% 59.8%;
+ }
}
@layer base {
- * {
- @apply border-border;
- }
- body {
- @apply bg-background text-foreground;
- }
+ * {
+ @apply border-border;
+ }
+ body {
+ @apply bg-background text-foreground;
+ }
}
-
diff --git a/apps/canvas/front/src/lib/categories.ts b/apps/canvas/front/src/lib/categories.ts
index 17e786e..8753455 100644
--- a/apps/canvas/front/src/lib/categories.ts
+++ b/apps/canvas/front/src/lib/categories.ts
@@ -1,101 +1,105 @@
import { NodeType, InitData } from "@/lib/state";
export interface CategoryItem<T extends NodeType> {
- title: string;
- init: InitData;
- type: T;
-};
+ title: string;
+ init: InitData;
+ type: T;
+}
export type Category = {
- title: string;
- items: CategoryItem<NodeType>[];
- active?: boolean;
+ title: string;
+ items: CategoryItem<NodeType>[];
+ active?: boolean;
};
const defaultInit: Pick<InitData, "label" | "envVars" | "ports"> = {
- label: "",
- envVars: [],
- ports: [],
+ label: "",
+ envVars: [],
+ ports: [],
};
export const defaultCategories: Category[] = [
- {
- title: "Repository",
- items: [
- {
- title: "Github",
- init: {
- ...defaultInit,
- },
- type: "github",
- }
- ]
- },
- {
- title: "Services",
- items: [
- {
- title: "Service",
- init: {
- ...defaultInit,
- },
- type: "app",
- }
- ],
- },
- {
- title: "Storage",
- items: [
- {
- title: "File system",
- init: {
- ...defaultInit,
- },
- type: "volume",
- },
- {
- title: "PostgreSQL",
- init: {
- ...defaultInit,
- ports: [{
- id: "connection",
- name: "connection",
- value: 5432,
- }],
- },
- type: "postgresql",
- },
- {
- title: "MongoDB",
- init: {
- ...defaultInit,
- ports: [{
- id: "connection",
- name: "connection",
- value: 27017,
- }],
- },
- type: "mongodb",
- },
- ],
- },
- {
- title: "Gateways",
- items: [
- {
- title: "HTTPS",
- init: {
- ...defaultInit,
- },
- type: "gateway-https",
- },
- {
- title: "TCP",
- init: {
- ...defaultInit,
- },
- type: "gateway-tcp",
- },
- ],
- },
-];
\ No newline at end of file
+ {
+ title: "Repository",
+ items: [
+ {
+ title: "Github",
+ init: {
+ ...defaultInit,
+ },
+ type: "github",
+ },
+ ],
+ },
+ {
+ title: "Services",
+ items: [
+ {
+ title: "Service",
+ init: {
+ ...defaultInit,
+ },
+ type: "app",
+ },
+ ],
+ },
+ {
+ title: "Storage",
+ items: [
+ {
+ title: "File system",
+ init: {
+ ...defaultInit,
+ },
+ type: "volume",
+ },
+ {
+ title: "PostgreSQL",
+ init: {
+ ...defaultInit,
+ ports: [
+ {
+ id: "connection",
+ name: "connection",
+ value: 5432,
+ },
+ ],
+ },
+ type: "postgresql",
+ },
+ {
+ title: "MongoDB",
+ init: {
+ ...defaultInit,
+ ports: [
+ {
+ id: "connection",
+ name: "connection",
+ value: 27017,
+ },
+ ],
+ },
+ type: "mongodb",
+ },
+ ],
+ },
+ {
+ title: "Gateways",
+ items: [
+ {
+ title: "HTTPS",
+ init: {
+ ...defaultInit,
+ },
+ type: "gateway-https",
+ },
+ {
+ title: "TCP",
+ init: {
+ ...defaultInit,
+ },
+ type: "gateway-tcp",
+ },
+ ],
+ },
+];
diff --git a/apps/canvas/front/src/lib/config.ts b/apps/canvas/front/src/lib/config.ts
index 3ea29b6..ea7f892 100644
--- a/apps/canvas/front/src/lib/config.ts
+++ b/apps/canvas/front/src/lib/config.ts
@@ -1,394 +1,525 @@
import { AppNode, Env, GatewayHttpsNode, Message, MessageType, NodeType, ServiceType, VolumeType } from "./state";
export type AuthDisabled = {
- enabled: false;
+ enabled: false;
};
export type AuthEnabled = {
- enabled: true;
- groups: string[];
- noAuthPathPatterns: string[];
+ enabled: true;
+ groups: string[];
+ noAuthPathPatterns: string[];
};
export type Auth = AuthDisabled | AuthEnabled;
export type Ingress = {
- network: string;
- subdomain: string;
- port: { name: string; } | { value: string; };
- auth: Auth;
+ network: string;
+ subdomain: string;
+ port: { name: string } | { value: string };
+ auth: Auth;
};
export type Domain = {
- network: string;
- subdomain: string;
+ network: string;
+ subdomain: string;
};
-export type PortValue = {
- name: string;
-} | {
- value: number;
-};
+export type PortValue =
+ | {
+ name: string;
+ }
+ | {
+ value: number;
+ };
export type PortDomain = Domain & {
- port: PortValue;
-}
+ port: PortValue;
+};
export type Service = {
- type: ServiceType;
- name: string;
- source: {
- repository: string;
- branch: string;
- rootDir: string;
- };
- ports?: {
- name: string;
- value: number;
- protocol: "TCP" | "UDP";
- }[];
- env?: {
- name: string;
- alias?: string;
- }[]
- ingress?: Ingress[];
- expose?: PortDomain[];
- volume?: string[];
- preBuildCommands?: { bin: string }[];
+ type: ServiceType;
+ name: string;
+ source: {
+ repository: string;
+ branch: string;
+ rootDir: string;
+ };
+ ports?: {
+ name: string;
+ value: number;
+ protocol: "TCP" | "UDP";
+ }[];
+ env?: {
+ name: string;
+ alias?: string;
+ }[];
+ ingress?: Ingress[];
+ expose?: PortDomain[];
+ volume?: string[];
+ preBuildCommands?: { bin: string }[];
};
export type Volume = {
- name: string;
- accessMode: VolumeType;
- size: string;
+ name: string;
+ accessMode: VolumeType;
+ size: string;
};
export type PostgreSQL = {
- name: string;
- size: string;
- expose?: Domain[];
+ name: string;
+ size: string;
+ expose?: Domain[];
};
export type MongoDB = {
- name: string;
- size: string;
- expose?: Domain[];
+ name: string;
+ size: string;
+ expose?: Domain[];
};
export type Config = {
- service?: Service[];
- volume?: Volume[];
- postgresql?: PostgreSQL[];
- mongodb?: MongoDB[];
+ service?: Service[];
+ volume?: Volume[];
+ postgresql?: PostgreSQL[];
+ mongodb?: MongoDB[];
};
export function generateDodoConfig(nodes: AppNode[], env: Env): Config | null {
- try {
- const networkMap = new Map(env.networks.map((n) => [n.domain, n.name]));
- const ingressNodes = nodes.filter((n) => n.type === "gateway-https").filter((n) => n.data.https !== undefined);
- const tcpNodes = nodes.filter((n) => n.type === "gateway-tcp").filter((n) => n.data.exposed !== undefined);
- const findExpose = (n: AppNode): PortDomain[] => {
- return n.data.ports.map((p) => [n.id, p.id, p.name]).flatMap((sp) => {
- return tcpNodes.flatMap((i) => (i.data.exposed || []).filter((t) => t.serviceId === sp[0] && t.portId === sp[1]).map(() => ({
- network: networkMap.get(i.data.network!)!,
- subdomain: i.data.subdomain!,
- port: { name: sp[2] },
- })));
- });
- };
- return {
- service: nodes.filter((n) => n.type === "app").map((n): Service => {
- return {
- type: n.data.type,
- name: n.data.label,
- source: {
- repository: nodes.filter((i) => i.type === "github").find((i) => i.id === n.data.repository.id)!.data.repository!.sshURL,
- branch: n.data.repository.branch,
- rootDir: n.data.repository.rootDir,
- },
- ports: (n.data.ports || []).map((p) => ({
- name: p.name,
- value: p.value,
- protocol: "TCP", // TODO(gio)
- })),
- env: (n.data.envVars || []).filter((e) => "name" in e).map((e) => ({
- name: e.name,
- alias: "alias" in e ? e.alias : undefined,
- })),
- ingress: ingressNodes.filter((i) => i.data.https!.serviceId === n.id).map((i: GatewayHttpsNode): Ingress => ({
- network: networkMap.get(i.data.network!)!,
- subdomain: i.data.subdomain!,
- port: {
- name: n.data.ports.find((p) => p.id === i.data.https!.portId)!.name,
- },
- auth: (i.data.auth?.enabled || false ? {
- enabled: true,
- groups: i.data.auth!.groups,
- noAuthPathPatterns: i.data.auth!.noAuthPathPatterns,
- } : {
- enabled: false,
- }),
- })),
- expose: findExpose(n),
- preBuildCommands: n.data.preBuildCommands ? n.data.preBuildCommands.split("\n").map((cmd) => ({ bin: cmd })) : [],
- };
- }),
- volume: nodes.filter((n) => n.type === "volume").map((n): Volume => ({
- name: n.data.label,
- accessMode: n.data.type,
- size: n.data.size,
- })),
- postgresql: nodes.filter((n) => n.type === "postgresql").map((n): PostgreSQL => ({
- name: n.data.label,
- size: "1Gi", // TODO(gio)
- expose: findExpose(n).map((e) => ({ network: e.network, subdomain: e.subdomain })),
- })),
- mongodb: nodes.filter((n) => n.type === "mongodb").map((n): MongoDB => ({
- name: n.data.label,
- size: "1Gi", // TODO(gio)
- expose: findExpose(n).map((e) => ({ network: e.network, subdomain: e.subdomain })),
- })),
- };
- } catch (e) {
- console.log(e);
- return null;
- }
+ try {
+ const networkMap = new Map(env.networks.map((n) => [n.domain, n.name]));
+ const ingressNodes = nodes.filter((n) => n.type === "gateway-https").filter((n) => n.data.https !== undefined);
+ const tcpNodes = nodes.filter((n) => n.type === "gateway-tcp").filter((n) => n.data.exposed !== undefined);
+ const findExpose = (n: AppNode): PortDomain[] => {
+ return n.data.ports
+ .map((p) => [n.id, p.id, p.name])
+ .flatMap((sp) => {
+ return tcpNodes.flatMap((i) =>
+ (i.data.exposed || [])
+ .filter((t) => t.serviceId === sp[0] && t.portId === sp[1])
+ .map(() => ({
+ network: networkMap.get(i.data.network!)!,
+ subdomain: i.data.subdomain!,
+ port: { name: sp[2] },
+ })),
+ );
+ });
+ };
+ return {
+ service: nodes
+ .filter((n) => n.type === "app")
+ .map((n): Service => {
+ return {
+ type: n.data.type,
+ name: n.data.label,
+ source: {
+ repository: nodes
+ .filter((i) => i.type === "github")
+ .find((i) => i.id === n.data.repository.id)!.data.repository!.sshURL,
+ branch: n.data.repository.branch,
+ rootDir: n.data.repository.rootDir,
+ },
+ ports: (n.data.ports || []).map((p) => ({
+ name: p.name,
+ value: p.value,
+ protocol: "TCP", // TODO(gio)
+ })),
+ env: (n.data.envVars || [])
+ .filter((e) => "name" in e)
+ .map((e) => ({
+ name: e.name,
+ alias: "alias" in e ? e.alias : undefined,
+ })),
+ ingress: ingressNodes
+ .filter((i) => i.data.https!.serviceId === n.id)
+ .map(
+ (i: GatewayHttpsNode): Ingress => ({
+ network: networkMap.get(i.data.network!)!,
+ subdomain: i.data.subdomain!,
+ port: {
+ name: n.data.ports.find((p) => p.id === i.data.https!.portId)!.name,
+ },
+ auth:
+ i.data.auth?.enabled || false
+ ? {
+ enabled: true,
+ groups: i.data.auth!.groups,
+ noAuthPathPatterns: i.data.auth!.noAuthPathPatterns,
+ }
+ : {
+ enabled: false,
+ },
+ }),
+ ),
+ expose: findExpose(n),
+ preBuildCommands: n.data.preBuildCommands
+ ? n.data.preBuildCommands.split("\n").map((cmd) => ({ bin: cmd }))
+ : [],
+ };
+ }),
+ volume: nodes
+ .filter((n) => n.type === "volume")
+ .map(
+ (n): Volume => ({
+ name: n.data.label,
+ accessMode: n.data.type,
+ size: n.data.size,
+ }),
+ ),
+ postgresql: nodes
+ .filter((n) => n.type === "postgresql")
+ .map(
+ (n): PostgreSQL => ({
+ name: n.data.label,
+ size: "1Gi", // TODO(gio)
+ expose: findExpose(n).map((e) => ({ network: e.network, subdomain: e.subdomain })),
+ }),
+ ),
+ mongodb: nodes
+ .filter((n) => n.type === "mongodb")
+ .map(
+ (n): MongoDB => ({
+ name: n.data.label,
+ size: "1Gi", // TODO(gio)
+ expose: findExpose(n).map((e) => ({ network: e.network, subdomain: e.subdomain })),
+ }),
+ ),
+ };
+ } catch (e) {
+ console.log(e);
+ return null;
+ }
}
export interface Validator {
- (nodes: AppNode[]): Message[];
+ (nodes: AppNode[]): Message[];
}
function CombineValidators(...v: Validator[]): Validator {
- return (n) => v.flatMap((v) => v(n));
+ return (n) => v.flatMap((v) => v(n));
}
function MessageTypeToNumber(t: MessageType) {
- switch (t) {
- case "FATAL": return 0;
- case "WARNING": return 1;
- case "INFO": return 2;
- }
+ switch (t) {
+ case "FATAL":
+ return 0;
+ case "WARNING":
+ return 1;
+ case "INFO":
+ return 2;
+ }
}
function NodeTypeToNumber(t?: NodeType) {
- switch (t) {
- case "github": return 0;
- case "app": return 1;
- case "volume": return 2;
- case "postgresql": return 3;
- case "mongodb": return 4;
- case "gateway-https": return 5;
- case undefined: return 100;
- }
+ switch (t) {
+ case "github":
+ return 0;
+ case "app":
+ return 1;
+ case "volume":
+ return 2;
+ case "postgresql":
+ return 3;
+ case "mongodb":
+ return 4;
+ case "gateway-https":
+ return 5;
+ case undefined:
+ return 100;
+ }
}
function SortingValidator(v: Validator): Validator {
- return (n) => {
- const nt = new Map(n.map((n) => [n.id, NodeTypeToNumber(n.type)]))
- return v(n).sort((a, b) => {
- const at = MessageTypeToNumber(a.type);
- const bt = MessageTypeToNumber(b.type);
- if (a.nodeId === undefined && b.nodeId === undefined) {
- if (at !== bt) {
- return at - bt;
- }
- return a.id.localeCompare(b.id);
- }
- if (a.nodeId === undefined) {
- return -1;
- }
- if (b.nodeId === undefined) {
- return 1;
- }
- if (a.nodeId === b.nodeId) {
- if (at !== bt) {
- return at - bt;
- }
- return a.id.localeCompare(b.id);
- }
- const ant = nt.get(a.id)!;
- const bnt = nt.get(b.id)!;
- if (ant !== bnt) {
- return ant - bnt;
- }
- return a.id.localeCompare(b.id);
- });
- };
+ return (n) => {
+ const nt = new Map(n.map((n) => [n.id, NodeTypeToNumber(n.type)]));
+ return v(n).sort((a, b) => {
+ const at = MessageTypeToNumber(a.type);
+ const bt = MessageTypeToNumber(b.type);
+ if (a.nodeId === undefined && b.nodeId === undefined) {
+ if (at !== bt) {
+ return at - bt;
+ }
+ return a.id.localeCompare(b.id);
+ }
+ if (a.nodeId === undefined) {
+ return -1;
+ }
+ if (b.nodeId === undefined) {
+ return 1;
+ }
+ if (a.nodeId === b.nodeId) {
+ if (at !== bt) {
+ return at - bt;
+ }
+ return a.id.localeCompare(b.id);
+ }
+ const ant = nt.get(a.id)!;
+ const bnt = nt.get(b.id)!;
+ if (ant !== bnt) {
+ return ant - bnt;
+ }
+ return a.id.localeCompare(b.id);
+ });
+ };
}
export function CreateValidators(): Validator {
- return SortingValidator(
- CombineValidators(
- EmptyValidator,
- GitRepositoryValidator,
- ServiceValidator,
- GatewayHTTPSValidator,
- GatewayTCPValidator,
- )
- );
+ return SortingValidator(
+ CombineValidators(
+ EmptyValidator,
+ GitRepositoryValidator,
+ ServiceValidator,
+ GatewayHTTPSValidator,
+ GatewayTCPValidator,
+ ),
+ );
}
function EmptyValidator(nodes: AppNode[]): Message[] {
- nodes = nodes.filter((n) => n.type !== "network");
- if (nodes.length > 0) {
- return [];
- }
- return [{
- id: "no-nodes",
- type: "FATAL",
- message: "Start by importing application source code",
- onHighlight: (store) => store.setHighlightCategory("repository", true),
- onLooseHighlight: (store) => store.setHighlightCategory("repository", false),
- }];
+ nodes = nodes.filter((n) => n.type !== "network");
+ if (nodes.length > 0) {
+ return [];
+ }
+ return [
+ {
+ id: "no-nodes",
+ type: "FATAL",
+ message: "Start by importing application source code",
+ onHighlight: (store) => store.setHighlightCategory("repository", true),
+ onLooseHighlight: (store) => store.setHighlightCategory("repository", false),
+ },
+ ];
}
function GitRepositoryValidator(nodes: AppNode[]): Message[] {
- const git = nodes.filter((n) => n.type === "github");
- const noAddress: Message[] = git.filter((n) => n.data == null || n.data.repository == null).map((n) => ({
- id: `${n.id}-no-address`,
- type: "FATAL",
- nodeId: n.id,
- message: "Configure repository address",
- onHighlight: (store) => store.updateNode(n.id, { selected: true }),
- onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
- } satisfies Message));
- const noApp = git.filter((n) => !nodes.some((i) => i.type === "app" && i.data?.repository?.id === n.id)).map((n) => ({
- id: `${n.id}-no-app`,
- type: "WARNING",
- nodeId: n.id,
- message: "Connect to service",
- onHighlight: (store) => store.setHighlightCategory("Services", true),
- onLooseHighlight: (store) => store.setHighlightCategory("Services", false),
- } satisfies Message));
- return noAddress.concat(noApp);
+ const git = nodes.filter((n) => n.type === "github");
+ const noAddress: Message[] = git
+ .filter((n) => n.data == null || n.data.repository == null)
+ .map(
+ (n) =>
+ ({
+ id: `${n.id}-no-address`,
+ type: "FATAL",
+ nodeId: n.id,
+ message: "Configure repository address",
+ onHighlight: (store) => store.updateNode(n.id, { selected: true }),
+ onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
+ }) satisfies Message,
+ );
+ const noApp = git
+ .filter((n) => !nodes.some((i) => i.type === "app" && i.data?.repository?.id === n.id))
+ .map(
+ (n) =>
+ ({
+ id: `${n.id}-no-app`,
+ type: "WARNING",
+ nodeId: n.id,
+ message: "Connect to service",
+ onHighlight: (store) => store.setHighlightCategory("Services", true),
+ onLooseHighlight: (store) => store.setHighlightCategory("Services", false),
+ }) satisfies Message,
+ );
+ return noAddress.concat(noApp);
}
function ServiceValidator(nodes: AppNode[]): Message[] {
- const apps = nodes.filter((n) => n.type === "app");
- const noName = apps.filter((n) => n.data == null || n.data.label == null || n.data.label === "").map((n): Message => ({
- id: `${n.id}-no-name`,
- type: "FATAL",
- nodeId: n.id,
- message: "Name the service",
- onHighlight: (store) => store.updateNode(n.id, { selected: true }),
- onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
- onClick: (store) => {
- store.updateNode(n.id, { selected: true });
- store.updateNodeData<"app">(n.id, {
- activeField: "name",
- });
- },
- }));
- const noSource = apps.filter((n) => n.data == null || n.data.repository == null || n.data.repository.id === "").map((n): Message => ({
- id: `${n.id}-no-repo`,
- type: "FATAL",
- nodeId: n.id,
- message: "Connect to source repository",
- onHighlight: (store) => store.updateNode(n.id, { selected: true }),
- onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
- }));
- const noRuntime = apps.filter((n) => n.data == null || n.data.type == null).map((n): Message => ({
- id: `${n.id}-no-runtime`,
- type: "FATAL",
- nodeId: n.id,
- message: "Choose runtime",
- onHighlight: (store) => store.updateNode(n.id, { selected: true }),
- onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
- onClick: (store) => {
- store.updateNode(n.id, { selected: true });
- store.updateNodeData<"app">(n.id, {
- activeField: "type",
- });
- },
- }));
- const noPorts = apps.filter((n) => n.data == null || n.data.ports == null || n.data.ports.length === 0).map((n): Message => ({
- id: `${n.id}-no-ports`,
- type: "INFO",
- nodeId: n.id,
- message: "Expose ports",
- onHighlight: (store) => store.updateNode(n.id, { selected: true }),
- onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
- }));
- const noIngress = apps.flatMap((n): Message[] => {
- if (n.data == null) {
- return [];
- }
- return (n.data.ports || []).filter((p) => !nodes.filter((i) => i.type === "gateway-https").some((i) => {
- if (i.data && i.data.https && i.data.https.serviceId === n.id && i.data.https.portId === p.id) {
- return true;
- }
- return false;
- })).map((p): Message => ({
- id: `${n.id}-${p.id}-no-ingress`,
- type: "WARNING",
- nodeId: n.id,
- message: `Connect to ingress: ${p.name} - ${p.value}`,
- onHighlight: (store) => {
- store.updateNode(n.id, { selected: true });
- store.setHighlightCategory("gateways", true);
- },
- onLooseHighlight: (store) => {
- store.updateNode(n.id, { selected: false });
- store.setHighlightCategory("gateways", false);
- },
- }));
- });
- const multipleIngress = apps.filter((n) => n.data != null && n.data.ports != null).flatMap((n) => n.data.ports.map((p): Message | undefined => {
- const ing = nodes.filter((i) => i.type === "gateway-https").filter((i) => i.data && i.data.https && i.data.https.serviceId === n.id && i.data.https.portId === p.id);
- if (ing.length < 2) {
- return undefined;
- }
- return {
- id: `${n.id}-${p.id}-multiple-ingress`,
- type: "FATAL",
- nodeId: n.id,
- message: `Can not expose same port using multiple ingresses: ${p.name} - ${p.value}`,
- onHighlight: (store) => store.updateNode(n.id, { selected: true }),
- onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
- };
- })).filter((m) => m !== undefined);
- return noName.concat(noSource).concat(noRuntime).concat(noPorts).concat(noIngress).concat(multipleIngress);
+ const apps = nodes.filter((n) => n.type === "app");
+ const noName = apps
+ .filter((n) => n.data == null || n.data.label == null || n.data.label === "")
+ .map(
+ (n): Message => ({
+ id: `${n.id}-no-name`,
+ type: "FATAL",
+ nodeId: n.id,
+ message: "Name the service",
+ onHighlight: (store) => store.updateNode(n.id, { selected: true }),
+ onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
+ onClick: (store) => {
+ store.updateNode(n.id, { selected: true });
+ store.updateNodeData<"app">(n.id, {
+ activeField: "name",
+ });
+ },
+ }),
+ );
+ const noSource = apps
+ .filter((n) => n.data == null || n.data.repository == null || n.data.repository.id === "")
+ .map(
+ (n): Message => ({
+ id: `${n.id}-no-repo`,
+ type: "FATAL",
+ nodeId: n.id,
+ message: "Connect to source repository",
+ onHighlight: (store) => store.updateNode(n.id, { selected: true }),
+ onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
+ }),
+ );
+ const noRuntime = apps
+ .filter((n) => n.data == null || n.data.type == null)
+ .map(
+ (n): Message => ({
+ id: `${n.id}-no-runtime`,
+ type: "FATAL",
+ nodeId: n.id,
+ message: "Choose runtime",
+ onHighlight: (store) => store.updateNode(n.id, { selected: true }),
+ onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
+ onClick: (store) => {
+ store.updateNode(n.id, { selected: true });
+ store.updateNodeData<"app">(n.id, {
+ activeField: "type",
+ });
+ },
+ }),
+ );
+ const noPorts = apps
+ .filter((n) => n.data == null || n.data.ports == null || n.data.ports.length === 0)
+ .map(
+ (n): Message => ({
+ id: `${n.id}-no-ports`,
+ type: "INFO",
+ nodeId: n.id,
+ message: "Expose ports",
+ onHighlight: (store) => store.updateNode(n.id, { selected: true }),
+ onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
+ }),
+ );
+ const noIngress = apps.flatMap((n): Message[] => {
+ if (n.data == null) {
+ return [];
+ }
+ return (n.data.ports || [])
+ .filter(
+ (p) =>
+ !nodes
+ .filter((i) => i.type === "gateway-https")
+ .some((i) => {
+ if (
+ i.data &&
+ i.data.https &&
+ i.data.https.serviceId === n.id &&
+ i.data.https.portId === p.id
+ ) {
+ return true;
+ }
+ return false;
+ }),
+ )
+ .map(
+ (p): Message => ({
+ id: `${n.id}-${p.id}-no-ingress`,
+ type: "WARNING",
+ nodeId: n.id,
+ message: `Connect to ingress: ${p.name} - ${p.value}`,
+ onHighlight: (store) => {
+ store.updateNode(n.id, { selected: true });
+ store.setHighlightCategory("gateways", true);
+ },
+ onLooseHighlight: (store) => {
+ store.updateNode(n.id, { selected: false });
+ store.setHighlightCategory("gateways", false);
+ },
+ }),
+ );
+ });
+ const multipleIngress = apps
+ .filter((n) => n.data != null && n.data.ports != null)
+ .flatMap((n) =>
+ n.data.ports.map((p): Message | undefined => {
+ const ing = nodes
+ .filter((i) => i.type === "gateway-https")
+ .filter(
+ (i) =>
+ i.data && i.data.https && i.data.https.serviceId === n.id && i.data.https.portId === p.id,
+ );
+ if (ing.length < 2) {
+ return undefined;
+ }
+ return {
+ id: `${n.id}-${p.id}-multiple-ingress`,
+ type: "FATAL",
+ nodeId: n.id,
+ message: `Can not expose same port using multiple ingresses: ${p.name} - ${p.value}`,
+ onHighlight: (store) => store.updateNode(n.id, { selected: true }),
+ onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
+ };
+ }),
+ )
+ .filter((m) => m !== undefined);
+ return noName.concat(noSource).concat(noRuntime).concat(noPorts).concat(noIngress).concat(multipleIngress);
}
function GatewayHTTPSValidator(nodes: AppNode[]): Message[] {
- const ing = nodes.filter((n) => n.type === "gateway-https");
- const noNetwork: Message[] = ing.filter((n) => n.data == null || n.data.network == null || n.data.network == "" || n.data.subdomain == null || n.data.subdomain == "").map((n): Message => ({
- id: `${n.id}-no-network`,
- type: "FATAL",
- nodeId: n.id,
- message: "Network and subdomain must be defined",
- onHighlight: (store) => store.updateNode(n.id, { selected: true }),
- onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
- }));
- const notConnected: Message[] = ing.filter((n) => n.data == null || n.data.https == null || n.data.https.serviceId == null || n.data.https.serviceId == "" || n.data.https.portId == null || n.data.https.portId == "").map((n) => ({
- id: `${n.id}-not-connected`,
- type: "FATAL",
- nodeId: n.id,
- message: "Connect to a service port",
- onHighlight: (store) => store.updateNode(n.id, { selected: true }),
- onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
- }));
- return noNetwork.concat(notConnected);
+ const ing = nodes.filter((n) => n.type === "gateway-https");
+ const noNetwork: Message[] = ing
+ .filter(
+ (n) =>
+ n.data == null ||
+ n.data.network == null ||
+ n.data.network == "" ||
+ n.data.subdomain == null ||
+ n.data.subdomain == "",
+ )
+ .map(
+ (n): Message => ({
+ id: `${n.id}-no-network`,
+ type: "FATAL",
+ nodeId: n.id,
+ message: "Network and subdomain must be defined",
+ onHighlight: (store) => store.updateNode(n.id, { selected: true }),
+ onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
+ }),
+ );
+ const notConnected: Message[] = ing
+ .filter(
+ (n) =>
+ n.data == null ||
+ n.data.https == null ||
+ n.data.https.serviceId == null ||
+ n.data.https.serviceId == "" ||
+ n.data.https.portId == null ||
+ n.data.https.portId == "",
+ )
+ .map((n) => ({
+ id: `${n.id}-not-connected`,
+ type: "FATAL",
+ nodeId: n.id,
+ message: "Connect to a service port",
+ onHighlight: (store) => store.updateNode(n.id, { selected: true }),
+ onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
+ }));
+ return noNetwork.concat(notConnected);
}
function GatewayTCPValidator(nodes: AppNode[]): Message[] {
- const ing = nodes.filter((n) => n.type === "gateway-tcp");
- const noNetwork: Message[] = ing.filter((n) => n.data == null || n.data.network == null || n.data.network == "" || n.data.subdomain == null || n.data.subdomain == "").map((n): Message => ({
- id: `${n.id}-no-network`,
- type: "FATAL",
- nodeId: n.id,
- message: "Network and subdomain must be defined",
- onHighlight: (store) => store.updateNode(n.id, { selected: true }),
- onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
- }));
- const notConnected: Message[] = ing.filter((n) => n.data == null || n.data.exposed == null || n.data.exposed.length === 0).map((n) => ({
- id: `${n.id}-not-connected`,
- type: "FATAL",
- nodeId: n.id,
- message: "Connect to a service port",
- onHighlight: (store) => store.updateNode(n.id, { selected: true }),
- onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
- }));
- return noNetwork.concat(notConnected);
+ const ing = nodes.filter((n) => n.type === "gateway-tcp");
+ const noNetwork: Message[] = ing
+ .filter(
+ (n) =>
+ n.data == null ||
+ n.data.network == null ||
+ n.data.network == "" ||
+ n.data.subdomain == null ||
+ n.data.subdomain == "",
+ )
+ .map(
+ (n): Message => ({
+ id: `${n.id}-no-network`,
+ type: "FATAL",
+ nodeId: n.id,
+ message: "Network and subdomain must be defined",
+ onHighlight: (store) => store.updateNode(n.id, { selected: true }),
+ onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
+ }),
+ );
+ const notConnected: Message[] = ing
+ .filter((n) => n.data == null || n.data.exposed == null || n.data.exposed.length === 0)
+ .map((n) => ({
+ id: `${n.id}-not-connected`,
+ type: "FATAL",
+ nodeId: n.id,
+ message: "Connect to a service port",
+ onHighlight: (store) => store.updateNode(n.id, { selected: true }),
+ onLooseHighlight: (store) => store.updateNode(n.id, { selected: false }),
+ }));
+ return noNetwork.concat(notConnected);
}
diff --git a/apps/canvas/front/src/lib/github.ts b/apps/canvas/front/src/lib/github.ts
index 8537671..b1732a0 100644
--- a/apps/canvas/front/src/lib/github.ts
+++ b/apps/canvas/front/src/lib/github.ts
@@ -1,36 +1,36 @@
export interface GitHubRepository {
- id: number;
- name: string;
- full_name: string;
- html_url: string;
- ssh_url: string;
- description: string | null;
- private: boolean;
- default_branch: string;
+ id: number;
+ name: string;
+ full_name: string;
+ html_url: string;
+ ssh_url: string;
+ description: string | null;
+ private: boolean;
+ default_branch: string;
}
export interface GitHubService {
- /**
- * Fetches a list of repositories for the authenticated user
- * @returns Promise resolving to an array of GitHub repositories
- */
- getRepositories(): Promise<GitHubRepository[]>;
+ /**
+ * Fetches a list of repositories for the authenticated user
+ * @returns Promise resolving to an array of GitHub repositories
+ */
+ getRepositories(): Promise<GitHubRepository[]>;
}
export class GitHubServiceImpl implements GitHubService {
- private projectId: string;
+ private projectId: string;
- constructor(projectId: string) {
- this.projectId = projectId;
- }
+ constructor(projectId: string) {
+ this.projectId = projectId;
+ }
- async getRepositories(): Promise<GitHubRepository[]> {
- const response = await fetch(`/api/project/${this.projectId}/repos/github`);
+ async getRepositories(): Promise<GitHubRepository[]> {
+ const response = await fetch(`/api/project/${this.projectId}/repos/github`);
- if (!response.ok) {
- throw new Error(`Failed to fetch repositories: ${response.statusText}`);
- }
+ if (!response.ok) {
+ throw new Error(`Failed to fetch repositories: ${response.statusText}`);
+ }
- return response.json();
- }
-}
\ No newline at end of file
+ return response.json();
+ }
+}
diff --git a/apps/canvas/front/src/lib/state.ts b/apps/canvas/front/src/lib/state.ts
index 2492642..0749fbb 100644
--- a/apps/canvas/front/src/lib/state.ts
+++ b/apps/canvas/front/src/lib/state.ts
@@ -1,275 +1,302 @@
-import { v4 as uuidv4 } from "uuid";
-import { create } from 'zustand';
-import { addEdge, applyNodeChanges, applyEdgeChanges, Connection, EdgeChange, useNodes } from '@xyflow/react';
-import type {
- Edge,
- Node,
- OnNodesChange,
- OnEdgesChange,
- OnConnect,
-} from '@xyflow/react';
-import type { DeepPartial } from "react-hook-form";
import { Category, defaultCategories } from "./categories";
import { CreateValidators, Validator } from "./config";
+import { GitHubService, GitHubServiceImpl } from "./github";
+import type { Edge, Node, OnConnect, OnEdgesChange, OnNodesChange } from "@xyflow/react";
+import { addEdge, applyEdgeChanges, applyNodeChanges, Connection, EdgeChange, useNodes } from "@xyflow/react";
+import type { DeepPartial } from "react-hook-form";
+import { v4 as uuidv4 } from "uuid";
import { z } from "zod";
-import { GitHubService, GitHubServiceImpl } from './github';
+import { create } from "zustand";
export type InitData = {
- label: string;
- envVars: BoundEnvVar[];
- ports: Port[];
+ label: string;
+ envVars: BoundEnvVar[];
+ ports: Port[];
};
export type NodeData = InitData & {
- activeField?: string | undefined;
- state: string | null;
+ activeField?: string | undefined;
+ state: string | null;
};
export type PortConnectedTo = {
- serviceId: string;
- portId: string;
-}
+ serviceId: string;
+ portId: string;
+};
export type NetworkData = NodeData & {
- domain: string;
+ domain: string;
};
export type NetworkNode = Node<NetworkData> & {
- type: "network";
+ type: "network";
};
export type GatewayHttpsData = NodeData & {
- network?: string;
- subdomain?: string;
- https?: PortConnectedTo;
- auth?: {
- enabled: boolean;
- groups: string[];
- noAuthPathPatterns: string[];
- }
+ network?: string;
+ subdomain?: string;
+ https?: PortConnectedTo;
+ auth?: {
+ enabled: boolean;
+ groups: string[];
+ noAuthPathPatterns: string[];
+ };
};
export type GatewayHttpsNode = Node<GatewayHttpsData> & {
- type: "gateway-https";
+ type: "gateway-https";
};
export type GatewayTCPData = NodeData & {
- network?: string;
- subdomain?: string;
- exposed: PortConnectedTo[];
- selected?: {
- serviceId?: string;
- portId?: string;
- };
+ network?: string;
+ subdomain?: string;
+ exposed: PortConnectedTo[];
+ selected?: {
+ serviceId?: string;
+ portId?: string;
+ };
};
export type GatewayTCPNode = Node<GatewayTCPData> & {
- type: "gateway-tcp";
+ type: "gateway-tcp";
};
export type Port = {
- id: string;
- name: string;
- value: number;
+ id: string;
+ name: string;
+ value: number;
};
export const ServiceTypes = [
- "deno:2.2.0",
- "golang:1.20.0",
- "golang:1.22.0",
- "golang:1.24.0",
- "hugo:latest",
- "php:8.2-apache",
- "nextjs:deno-2.0.0",
- "node-23.1.0"
+ "deno:2.2.0",
+ "golang:1.20.0",
+ "golang:1.22.0",
+ "golang:1.24.0",
+ "hugo:latest",
+ "php:8.2-apache",
+ "nextjs:deno-2.0.0",
+ "node-23.1.0",
] as const;
-export type ServiceType = typeof ServiceTypes[number];
+export type ServiceType = (typeof ServiceTypes)[number];
export type ServiceData = NodeData & {
- type: ServiceType;
- repository: {
- id: string;
- } | {
- id: string;
- branch: string;
- } | {
- id: string;
- branch: string;
- rootDir: string;
- };
- env: string[];
- volume: string[];
- preBuildCommands: string;
- isChoosingPortToConnect: boolean;
+ type: ServiceType;
+ repository:
+ | {
+ id: string;
+ }
+ | {
+ id: string;
+ branch: string;
+ }
+ | {
+ id: string;
+ branch: string;
+ rootDir: string;
+ };
+ env: string[];
+ volume: string[];
+ preBuildCommands: string;
+ isChoosingPortToConnect: boolean;
};
export type ServiceNode = Node<ServiceData> & {
- type: "app";
+ type: "app";
};
export type VolumeType = "ReadWriteOnce" | "ReadOnlyMany" | "ReadWriteMany" | "ReadWriteOncePod";
export type VolumeData = NodeData & {
- type: VolumeType;
- size: string;
- attachedTo: string[];
+ type: VolumeType;
+ size: string;
+ attachedTo: string[];
};
export type VolumeNode = Node<VolumeData> & {
- type: "volume";
+ type: "volume";
};
export type PostgreSQLData = NodeData & {
- volumeId: string;
+ volumeId: string;
};
export type PostgreSQLNode = Node<PostgreSQLData> & {
- type: "postgresql";
+ type: "postgresql";
};
export type MongoDBData = NodeData & {
- volumeId: string;
+ volumeId: string;
};
export type MongoDBNode = Node<MongoDBData> & {
- type: "mongodb";
+ type: "mongodb";
};
export type GithubData = NodeData & {
- repository?: {
- id: number;
- sshURL: string;
- };
+ repository?: {
+ id: number;
+ sshURL: string;
+ };
};
export type GithubNode = Node<GithubData> & {
- type: "github";
+ type: "github";
};
export type NANode = Node<NodeData> & {
- type: undefined;
+ type: undefined;
};
-export type AppNode = NetworkNode | GatewayHttpsNode | GatewayTCPNode | ServiceNode | VolumeNode | PostgreSQLNode | MongoDBNode | GithubNode | NANode;
+export type AppNode =
+ | NetworkNode
+ | GatewayHttpsNode
+ | GatewayTCPNode
+ | ServiceNode
+ | VolumeNode
+ | PostgreSQLNode
+ | MongoDBNode
+ | GithubNode
+ | NANode;
export function nodeLabel(n: AppNode): string {
- switch (n.type) {
- case "network": return n.data.domain;
- case "app": return n.data.label || "Service";
- case "github": return n.data.repository?.sshURL || "Github";
- case "gateway-https": {
- if (n.data && n.data.network && n.data.subdomain) {
- return `https://${n.data.subdomain}.${n.data.network}`;
- } else {
- return "HTTPS Gateway";
- }
- }
- case "gateway-tcp": {
- if (n.data && n.data.network && n.data.subdomain) {
- return `${n.data.subdomain}.${n.data.network}`;
- } else {
- return "TCP Gateway";
- }
- }
- case "mongodb": return n.data.label || "MongoDB";
- case "postgresql": return n.data.label || "PostgreSQL";
- case "volume": return n.data.label || "Volume";
- case undefined: throw new Error("MUST NOT REACH!");
- }
+ switch (n.type) {
+ case "network":
+ return n.data.domain;
+ case "app":
+ return n.data.label || "Service";
+ case "github":
+ return n.data.repository?.sshURL || "Github";
+ case "gateway-https": {
+ if (n.data && n.data.network && n.data.subdomain) {
+ return `https://${n.data.subdomain}.${n.data.network}`;
+ } else {
+ return "HTTPS Gateway";
+ }
+ }
+ case "gateway-tcp": {
+ if (n.data && n.data.network && n.data.subdomain) {
+ return `${n.data.subdomain}.${n.data.network}`;
+ } else {
+ return "TCP Gateway";
+ }
+ }
+ case "mongodb":
+ return n.data.label || "MongoDB";
+ case "postgresql":
+ return n.data.label || "PostgreSQL";
+ case "volume":
+ return n.data.label || "Volume";
+ case undefined:
+ throw new Error("MUST NOT REACH!");
+ }
}
export function nodeIsConnectable(n: AppNode, handle: string): boolean {
- switch (n.type) {
- case "network":
- return true;
- case "app":
- if (handle === "ports") {
- return n.data !== undefined && n.data.ports !== undefined && n.data.ports.length > 0;
- } else if (handle === "repository") {
- if (!n.data || !n.data.repository || !n.data.repository.id) {
- return true;
- }
- return false;
- }
- return false;
- case "github":
- if (n.data.repository?.id !== undefined) {
- return true;
- }
- return false;
- case "gateway-https":
- if (handle === "subdomain") {
- return n.data.network === undefined;
- }
- return n.data === undefined || n.data.https === undefined;
- case "gateway-tcp":
- if (handle === "subdomain") {
- return n.data.network === undefined;
- }
- return true;
- case "mongodb":
- return true;
- case "postgresql":
- return true;
- case "volume":
- if (n.data === undefined || n.data.type === undefined) {
- return false;
- }
- if (n.data.type === "ReadWriteOnce" || n.data.type === "ReadWriteOncePod") {
- return n.data.attachedTo === undefined || n.data.attachedTo.length === 0;
- }
- return true;
- case undefined: throw new Error("MUST NOT REACH!");
- }
+ switch (n.type) {
+ case "network":
+ return true;
+ case "app":
+ if (handle === "ports") {
+ return n.data !== undefined && n.data.ports !== undefined && n.data.ports.length > 0;
+ } else if (handle === "repository") {
+ if (!n.data || !n.data.repository || !n.data.repository.id) {
+ return true;
+ }
+ return false;
+ }
+ return false;
+ case "github":
+ if (n.data.repository?.id !== undefined) {
+ return true;
+ }
+ return false;
+ case "gateway-https":
+ if (handle === "subdomain") {
+ return n.data.network === undefined;
+ }
+ return n.data === undefined || n.data.https === undefined;
+ case "gateway-tcp":
+ if (handle === "subdomain") {
+ return n.data.network === undefined;
+ }
+ return true;
+ case "mongodb":
+ return true;
+ case "postgresql":
+ return true;
+ case "volume":
+ if (n.data === undefined || n.data.type === undefined) {
+ return false;
+ }
+ if (n.data.type === "ReadWriteOnce" || n.data.type === "ReadWriteOncePod") {
+ return n.data.attachedTo === undefined || n.data.attachedTo.length === 0;
+ }
+ return true;
+ case undefined:
+ throw new Error("MUST NOT REACH!");
+ }
}
-export type BoundEnvVar = {
- id: string;
- source: string | null;
-} | {
- id: string;
- source: string | null;
- name: string;
- isEditting: boolean;
-} | {
- id: string;
- source: string | null;
- name: string;
- alias: string;
- isEditting: boolean;
-} | {
- id: string;
- source: string | null;
- portId: string;
- name: string;
- alias: string;
- isEditting: boolean;
-};
+export type BoundEnvVar =
+ | {
+ id: string;
+ source: string | null;
+ }
+ | {
+ id: string;
+ source: string | null;
+ name: string;
+ isEditting: boolean;
+ }
+ | {
+ id: string;
+ source: string | null;
+ name: string;
+ alias: string;
+ isEditting: boolean;
+ }
+ | {
+ id: string;
+ source: string | null;
+ portId: string;
+ name: string;
+ alias: string;
+ isEditting: boolean;
+ };
export type EnvVar = {
- name: string;
- value: string;
+ name: string;
+ value: string;
};
export function nodeEnvVarNamePort(n: AppNode, portName: string): string {
- return `DODO_SERVICE_${n.data.label.toUpperCase()}_ADDRESS_${portName.toUpperCase()}`;
+ return `DODO_SERVICE_${n.data.label.toUpperCase()}_ADDRESS_${portName.toUpperCase()}`;
}
export function nodeEnvVarNames(n: AppNode): string[] {
- switch (n.type) {
- case "app": return [
- `DODO_SERVICE_${n.data.label.toUpperCase()}_ADDRESS`,
- ...(n.data.ports || []).map((p) => nodeEnvVarNamePort(n, p.name)),
- ];
- case "github": return [];
- case "gateway-https": return [];
- case "gateway-tcp": return [];
- case "mongodb": return [`DODO_MONGODB_${n.data.label.toUpperCase()}_URL`];
- case "postgresql": return [`DODO_POSTGRESQL_${n.data.label.toUpperCase()}_URL`];
- case "volume": return [`DODO_VOLUME_${n.data.label.toUpperCase()}_PATH`];
- case undefined: throw new Error("MUST NOT REACH");
- default: throw new Error("MUST NOT REACH");
- }
+ switch (n.type) {
+ case "app":
+ return [
+ `DODO_SERVICE_${n.data.label.toUpperCase()}_ADDRESS`,
+ ...(n.data.ports || []).map((p) => nodeEnvVarNamePort(n, p.name)),
+ ];
+ case "github":
+ return [];
+ case "gateway-https":
+ return [];
+ case "gateway-tcp":
+ return [];
+ case "mongodb":
+ return [`DODO_MONGODB_${n.data.label.toUpperCase()}_URL`];
+ case "postgresql":
+ return [`DODO_POSTGRESQL_${n.data.label.toUpperCase()}_URL`];
+ case "volume":
+ return [`DODO_VOLUME_${n.data.label.toUpperCase()}_PATH`];
+ case undefined:
+ throw new Error("MUST NOT REACH");
+ default:
+ throw new Error("MUST NOT REACH");
+ }
}
export type NodeType = Exclude<Pick<AppNode, "type">["type"], undefined>;
@@ -277,68 +304,72 @@
export type MessageType = "INFO" | "WARNING" | "FATAL";
export type Message = {
- id: string;
- type: MessageType;
- nodeId?: string;
- message: string;
- onHighlight?: (state: AppState) => void;
- onLooseHighlight?: (state: AppState) => void;
- onClick?: (state: AppState) => void;
+ id: string;
+ type: MessageType;
+ nodeId?: string;
+ message: string;
+ onHighlight?: (state: AppState) => void;
+ onLooseHighlight?: (state: AppState) => void;
+ onClick?: (state: AppState) => void;
};
export const envSchema = z.object({
- deployKey: z.optional(z.string().min(1)),
- networks: z.array(z.object({
- name: z.string().min(1),
- domain: z.string().min(1),
- })).default([]),
- integrations: z.object({
- github: z.boolean(),
- }),
+ deployKey: z.optional(z.string().min(1)),
+ networks: z
+ .array(
+ z.object({
+ name: z.string().min(1),
+ domain: z.string().min(1),
+ }),
+ )
+ .default([]),
+ integrations: z.object({
+ github: z.boolean(),
+ }),
});
export type Env = z.infer<typeof envSchema>;
const defaultEnv: Env = {
- deployKey: undefined,
- networks: [],
- integrations: {
- github: false,
- }
+ deployKey: undefined,
+ networks: [],
+ integrations: {
+ github: false,
+ },
};
export type Project = {
- id: string;
- name: string;
-}
+ id: string;
+ name: string;
+};
export type IntegrationsConfig = {
- github: boolean;
+ github: boolean;
};
type NodeUpdate<T extends NodeType> = DeepPartial<Extract<AppNode, { type: T }>>;
type NodeDataUpdate<T extends NodeType> = DeepPartial<Extract<AppNode, { type: T }>["data"]>;
export type AppState = {
- projectId: string | undefined;
- projects: Project[];
- nodes: AppNode[];
- edges: Edge[];
- categories: Category[];
- messages: Message[];
- env: Env;
- githubService: GitHubService | null;
- setHighlightCategory: (name: string, active: boolean) => void;
- onNodesChange: OnNodesChange<AppNode>;
- onEdgesChange: OnEdgesChange;
- onConnect: OnConnect;
- setNodes: (nodes: AppNode[]) => void;
- setEdges: (edges: Edge[]) => void;
- setProject: (projectId: string | undefined) => void;
- updateNode: <T extends NodeType>(id: string, node: NodeUpdate<T>) => void;
- updateNodeData: <T extends NodeType>(id: string, data: NodeDataUpdate<T>) => void;
- replaceEdge: (c: Connection, id?: string) => void;
- refreshEnv: () => Promise<void>;
+ projectId: string | undefined;
+ projects: Project[];
+ nodes: AppNode[];
+ edges: Edge[];
+ categories: Category[];
+ messages: Message[];
+ env: Env;
+ githubService: GitHubService | null;
+ setHighlightCategory: (name: string, active: boolean) => void;
+ onNodesChange: OnNodesChange<AppNode>;
+ onEdgesChange: OnEdgesChange;
+ onConnect: OnConnect;
+ setNodes: (nodes: AppNode[]) => void;
+ setEdges: (edges: Edge[]) => void;
+ setProject: (projectId: string | undefined) => void;
+ updateNode: <T extends NodeType>(id: string, node: NodeUpdate<T>) => void;
+ updateNodeData: <T extends NodeType>(id: string, data: NodeDataUpdate<T>) => void;
+ replaceEdge: (c: Connection, id?: string) => void;
+ refreshEnv: () => Promise<void>;
};
const projectIdSelector = (state: AppState) => state.projectId;
@@ -348,326 +379,325 @@
const envSelector = (state: AppState) => state.env;
export function useProjectId(): string | undefined {
- return useStateStore(projectIdSelector);
+ return useStateStore(projectIdSelector);
}
export function useCategories(): Category[] {
- return useStateStore(categoriesSelector);
+ return useStateStore(categoriesSelector);
}
export function useMessages(): Message[] {
- return useStateStore(messagesSelector);
+ return useStateStore(messagesSelector);
}
export function useNodeMessages(id: string): Message[] {
- return useMessages().filter((m) => m.nodeId === id);
+ return useMessages().filter((m) => m.nodeId === id);
}
export function useNodeLabel(id: string): string {
- return nodeLabel(useNodes<AppNode>().find((n) => n.id === id)!);
+ return nodeLabel(useNodes<AppNode>().find((n) => n.id === id)!);
}
export function useNodePortName(id: string, portId: string): string {
- return (useNodes<AppNode>().find((n) => n.id === id)!.data.ports || []).find((p) => p.id === portId)!.name;
+ return (useNodes<AppNode>().find((n) => n.id === id)!.data.ports || []).find((p) => p.id === portId)!.name;
}
export function useEnv(): Env {
- return useStateStore(envSelector);
+ return useStateStore(envSelector);
}
export function useGithubService(): GitHubService | null {
- return useStateStore(githubServiceSelector);
+ return useStateStore(githubServiceSelector);
}
const v: Validator = CreateValidators();
export const useStateStore = create<AppState>((set, get): AppState => {
- const setN = (nodes: AppNode[]) => {
- set((state) => ({
- ...state,
- nodes,
- }));
- };
+ const setN = (nodes: AppNode[]) => {
+ set((state) => ({
+ ...state,
+ nodes,
+ }));
+ };
- function updateNodeData<T extends NodeType>(id: string, data: NodeDataUpdate<T>): void {
- setN(
- get().nodes.map((n) => {
- if (n.id === id) {
- return {
- ...n,
- data: {
- ...n.data,
- ...data,
- },
- } as Extract<AppNode, { type: T }>;
- }
- return n;
- })
- );
- }
+ function updateNodeData<T extends NodeType>(id: string, data: NodeDataUpdate<T>): void {
+ setN(
+ get().nodes.map((n) => {
+ if (n.id === id) {
+ return {
+ ...n,
+ data: {
+ ...n.data,
+ ...data,
+ },
+ } as Extract<AppNode, { type: T }>;
+ }
+ return n;
+ }),
+ );
+ }
- function updateNode<T extends NodeType>(id: string, node: NodeUpdate<T>): void {
- setN(
- get().nodes.map((n) => {
- if (n.id === id) {
- return {
- ...n,
- ...node,
- } as Extract<AppNode, { type: T }>;
- }
- return n;
- })
- );
- }
+ function updateNode<T extends NodeType>(id: string, node: NodeUpdate<T>): void {
+ setN(
+ get().nodes.map((n) => {
+ if (n.id === id) {
+ return {
+ ...n,
+ ...node,
+ } as Extract<AppNode, { type: T }>;
+ }
+ return n;
+ }),
+ );
+ }
- function onConnect(c: Connection) {
- const { nodes, edges } = get();
- set({
- edges: addEdge(c, edges),
- });
- const sn = nodes.filter((n) => n.id === c.source)[0]!;
- const tn = nodes.filter((n) => n.id === c.target)[0]!;
- if (tn.type === "network") {
- if (sn.type === "gateway-https") {
- updateNodeData<"gateway-https">(sn.id, {
- network: tn.data.domain,
- });
- } else if (sn.type === "gateway-tcp") {
- updateNodeData<"gateway-tcp">(sn.id, {
- network: tn.data.domain,
- });
- }
- }
- if (tn.type === "app") {
- if (c.sourceHandle === "env_var" && c.targetHandle === "env_var") {
- const sourceEnvVars = nodeEnvVarNames(sn);
- if (sourceEnvVars.length === 0) {
- throw new Error("MUST NOT REACH!");
- }
- const id = uuidv4();
- if (sourceEnvVars.length === 1) {
- updateNode<"app">(c.target, {
- ...tn,
- data: {
- ...tn.data,
- envVars: [
- ...(tn.data.envVars || []),
- {
- id: id,
- source: c.source,
- name: sourceEnvVars[0],
- isEditting: false,
- },
- ],
- },
- });
- } else {
- updateNode<"app">(c.target, {
- ...tn,
- data: {
- ...tn.data,
- envVars: [
- ...(tn.data.envVars || []),
- {
- id: id,
- source: c.source,
- },
- ],
- },
- });
- }
- }
- if (c.sourceHandle === "ports" && c.targetHandle === "env_var") {
- const sourcePorts = sn.data.ports || [];
- const id = uuidv4();
- if (sourcePorts.length === 1) {
- updateNode<"app">(c.target, {
- ...tn,
- data: {
- ...tn.data,
- envVars: [
- ...(tn.data.envVars || []),
- {
- id: id,
- source: c.source,
- name: nodeEnvVarNamePort(sn, sourcePorts[0].name),
- portId: sourcePorts[0].id,
- isEditting: false,
- },
- ],
- },
- });
- }
- }
- }
- if (c.sourceHandle === "volume") {
- updateNodeData<"volume">(c.source, {
- attachedTo: ((sn as VolumeNode).data.attachedTo || []).concat(c.source),
- });
- }
- if (c.targetHandle === "volume") {
- if (tn.type === "postgresql" || tn.type === "mongodb") {
- updateNodeData(c.target, {
- volumeId: c.source,
- });
- }
- }
- if (c.targetHandle === "https") {
- if ((sn.data.ports || []).length === 1) {
- updateNodeData<"gateway-https">(c.target, {
- https: {
- serviceId: c.source,
- portId: sn.data.ports![0].id,
- }
- });
- } else {
- updateNodeData<"gateway-https">(c.target, {
- https: {
- serviceId: c.source,
- portId: "", // TODO(gio)
- }
- });
- }
- }
- if (c.targetHandle === "tcp") {
- const td = tn.data as GatewayTCPData;
- if ((sn.data.ports || []).length === 1) {
- updateNodeData<"gateway-tcp">(c.target, {
- exposed: (td.exposed || []).concat({
- serviceId: c.source,
- portId: sn.data.ports![0].id,
- }),
- });
- } else {
- updateNodeData<"gateway-tcp">(c.target, {
- selected: {
- serviceId: c.source,
- portId: undefined,
- },
- });
- }
- }
- if (sn.type === "app") {
- if (c.sourceHandle === "ports") {
- updateNodeData<"app">(sn.id, {
- isChoosingPortToConnect: true,
- });
- }
- }
- if (tn.type === "app") {
- if (c.targetHandle === "repository") {
- updateNodeData<"app">(tn.id, {
- repository: {
- id: c.source,
- branch: "master",
- rootDir: "/",
- }
- });
- }
- }
- }
- return {
- projectId: undefined,
- projects: [],
- nodes: [],
- edges: [],
- categories: defaultCategories,
- messages: v([]),
- env: defaultEnv,
- githubService: null,
- setHighlightCategory: (name, active) => {
- set({
- categories: get().categories.map(
- (c) => {
- if (c.title.toLowerCase() !== name.toLowerCase()) {
- return c;
- } else {
- return {
- ...c,
- active,
- }
- }
- })
- });
- },
- onNodesChange: (changes) => {
- const nodes = applyNodeChanges(changes, get().nodes);
- setN(nodes);
- },
- onEdgesChange: (changes) => {
- set({
- edges: applyEdgeChanges(changes, get().edges),
- });
- },
- setNodes: (nodes) => {
- setN(nodes);
- },
- setEdges: (edges) => {
- set({ edges });
- },
- replaceEdge: (c, id) => {
- let change: EdgeChange;
- if (id === undefined) {
- change = {
- type: "add",
- item: {
- id: uuidv4(),
- ...c,
- }
- };
- onConnect(c);
- } else {
- change = {
- type: "replace",
- id,
- item: {
- id,
- ...c,
- }
- };
- }
- set({
- edges: applyEdgeChanges([change], get().edges),
- })
- },
- updateNode,
- updateNodeData,
- onConnect,
- refreshEnv: async () => {
- const projectId = get().projectId;
- let env: Env = defaultEnv;
+ function onConnect(c: Connection) {
+ const { nodes, edges } = get();
+ set({
+ edges: addEdge(c, edges),
+ });
+ const sn = nodes.filter((n) => n.id === c.source)[0]!;
+ const tn = nodes.filter((n) => n.id === c.target)[0]!;
+ if (tn.type === "network") {
+ if (sn.type === "gateway-https") {
+ updateNodeData<"gateway-https">(sn.id, {
+ network: tn.data.domain,
+ });
+ } else if (sn.type === "gateway-tcp") {
+ updateNodeData<"gateway-tcp">(sn.id, {
+ network: tn.data.domain,
+ });
+ }
+ }
+ if (tn.type === "app") {
+ if (c.sourceHandle === "env_var" && c.targetHandle === "env_var") {
+ const sourceEnvVars = nodeEnvVarNames(sn);
+ if (sourceEnvVars.length === 0) {
+ throw new Error("MUST NOT REACH!");
+ }
+ const id = uuidv4();
+ if (sourceEnvVars.length === 1) {
+ updateNode<"app">(c.target, {
+ ...tn,
+ data: {
+ ...tn.data,
+ envVars: [
+ ...(tn.data.envVars || []),
+ {
+ id: id,
+ source: c.source,
+ name: sourceEnvVars[0],
+ isEditting: false,
+ },
+ ],
+ },
+ });
+ } else {
+ updateNode<"app">(c.target, {
+ ...tn,
+ data: {
+ ...tn.data,
+ envVars: [
+ ...(tn.data.envVars || []),
+ {
+ id: id,
+ source: c.source,
+ },
+ ],
+ },
+ });
+ }
+ }
+ if (c.sourceHandle === "ports" && c.targetHandle === "env_var") {
+ const sourcePorts = sn.data.ports || [];
+ const id = uuidv4();
+ if (sourcePorts.length === 1) {
+ updateNode<"app">(c.target, {
+ ...tn,
+ data: {
+ ...tn.data,
+ envVars: [
+ ...(tn.data.envVars || []),
+ {
+ id: id,
+ source: c.source,
+ name: nodeEnvVarNamePort(sn, sourcePorts[0].name),
+ portId: sourcePorts[0].id,
+ isEditting: false,
+ },
+ ],
+ },
+ });
+ }
+ }
+ }
+ if (c.sourceHandle === "volume") {
+ updateNodeData<"volume">(c.source, {
+ attachedTo: ((sn as VolumeNode).data.attachedTo || []).concat(c.source),
+ });
+ }
+ if (c.targetHandle === "volume") {
+ if (tn.type === "postgresql" || tn.type === "mongodb") {
+ updateNodeData(c.target, {
+ volumeId: c.source,
+ });
+ }
+ }
+ if (c.targetHandle === "https") {
+ if ((sn.data.ports || []).length === 1) {
+ updateNodeData<"gateway-https">(c.target, {
+ https: {
+ serviceId: c.source,
+ portId: sn.data.ports![0].id,
+ },
+ });
+ } else {
+ updateNodeData<"gateway-https">(c.target, {
+ https: {
+ serviceId: c.source,
+ portId: "", // TODO(gio)
+ },
+ });
+ }
+ }
+ if (c.targetHandle === "tcp") {
+ const td = tn.data as GatewayTCPData;
+ if ((sn.data.ports || []).length === 1) {
+ updateNodeData<"gateway-tcp">(c.target, {
+ exposed: (td.exposed || []).concat({
+ serviceId: c.source,
+ portId: sn.data.ports![0].id,
+ }),
+ });
+ } else {
+ updateNodeData<"gateway-tcp">(c.target, {
+ selected: {
+ serviceId: c.source,
+ portId: undefined,
+ },
+ });
+ }
+ }
+ if (sn.type === "app") {
+ if (c.sourceHandle === "ports") {
+ updateNodeData<"app">(sn.id, {
+ isChoosingPortToConnect: true,
+ });
+ }
+ }
+ if (tn.type === "app") {
+ if (c.targetHandle === "repository") {
+ updateNodeData<"app">(tn.id, {
+ repository: {
+ id: c.source,
+ branch: "master",
+ rootDir: "/",
+ },
+ });
+ }
+ }
+ }
+ return {
+ projectId: undefined,
+ projects: [],
+ nodes: [],
+ edges: [],
+ categories: defaultCategories,
+ messages: v([]),
+ env: defaultEnv,
+ githubService: null,
+ setHighlightCategory: (name, active) => {
+ set({
+ categories: get().categories.map((c) => {
+ if (c.title.toLowerCase() !== name.toLowerCase()) {
+ return c;
+ } else {
+ return {
+ ...c,
+ active,
+ };
+ }
+ }),
+ });
+ },
+ onNodesChange: (changes) => {
+ const nodes = applyNodeChanges(changes, get().nodes);
+ setN(nodes);
+ },
+ onEdgesChange: (changes) => {
+ set({
+ edges: applyEdgeChanges(changes, get().edges),
+ });
+ },
+ setNodes: (nodes) => {
+ setN(nodes);
+ },
+ setEdges: (edges) => {
+ set({ edges });
+ },
+ replaceEdge: (c, id) => {
+ let change: EdgeChange;
+ if (id === undefined) {
+ change = {
+ type: "add",
+ item: {
+ id: uuidv4(),
+ ...c,
+ },
+ };
+ onConnect(c);
+ } else {
+ change = {
+ type: "replace",
+ id,
+ item: {
+ id,
+ ...c,
+ },
+ };
+ }
+ set({
+ edges: applyEdgeChanges([change], get().edges),
+ });
+ },
+ updateNode,
+ updateNodeData,
+ onConnect,
+ refreshEnv: async () => {
+ const projectId = get().projectId;
+ let env: Env = defaultEnv;
- try {
- if (projectId) {
- const response = await fetch(`/api/project/${projectId}/env`);
- if (response.ok) {
- const data = await response.json();
- const result = envSchema.safeParse(data);
- if (result.success) {
- env = result.data;
- } else {
- console.error("Invalid env data:", result.error);
- }
- }
- }
- } catch (error) {
- console.error("Failed to fetch integrations:", error);
- } finally {
- set({ env: env });
- if (env.integrations.github) {
- set({ githubService: new GitHubServiceImpl(projectId!) });
- } else {
- set({ githubService: null });
- }
- }
- },
- setProject: (projectId) => {
- set({
- projectId,
- });
- if (projectId) {
- get().refreshEnv();
- }
- },
- };
+ try {
+ if (projectId) {
+ const response = await fetch(`/api/project/${projectId}/env`);
+ if (response.ok) {
+ const data = await response.json();
+ const result = envSchema.safeParse(data);
+ if (result.success) {
+ env = result.data;
+ } else {
+ console.error("Invalid env data:", result.error);
+ }
+ }
+ }
+ } catch (error) {
+ console.error("Failed to fetch integrations:", error);
+ } finally {
+ set({ env: env });
+ if (env.integrations.github) {
+ set({ githubService: new GitHubServiceImpl(projectId!) });
+ } else {
+ set({ githubService: null });
+ }
+ }
+ },
+ setProject: (projectId) => {
+ set({
+ projectId,
+ });
+ if (projectId) {
+ get().refreshEnv();
+ }
+ },
+ };
});
diff --git a/apps/canvas/front/src/lib/utils.ts b/apps/canvas/front/src/lib/utils.ts
index bd0c391..ac680b3 100644
--- a/apps/canvas/front/src/lib/utils.ts
+++ b/apps/canvas/front/src/lib/utils.ts
@@ -1,6 +1,6 @@
-import { clsx, type ClassValue } from "clsx"
-import { twMerge } from "tailwind-merge"
+import { type ClassValue, clsx } from "clsx";
+import { twMerge } from "tailwind-merge";
export function cn(...inputs: ClassValue[]) {
- return twMerge(clsx(inputs))
+ return twMerge(clsx(inputs));
}
diff --git a/apps/canvas/front/src/main.tsx b/apps/canvas/front/src/main.tsx
index bef5202..f67fbc1 100644
--- a/apps/canvas/front/src/main.tsx
+++ b/apps/canvas/front/src/main.tsx
@@ -1,10 +1,10 @@
-import { StrictMode } from 'react'
-import { createRoot } from 'react-dom/client'
-import './index.css'
-import App from './App.tsx'
+import "./index.css";
+import App from "./App.tsx";
+import { createRoot } from "react-dom/client";
+import { StrictMode } from "react";
-createRoot(document.getElementById('root')!).render(
- <StrictMode>
- <App />
- </StrictMode>,
-)
+createRoot(document.getElementById("root")!).render(
+ <StrictMode>
+ <App />
+ </StrictMode>,
+);