Database diagrams editor that allows you to visualize and design your DB with a single query.
TypeScript databasedbdb-migrationeditorerdmariadbmssqlmysqlpostgresqlreactreact-flowschema-migrationssqlsqlitetypescriptvisualizationxyflow
save actions to storage
Guy Ben-Aharon37f15caed6e5
diff --git a/src/components/accordion/accordion.tsx b/src/components/accordion/accordion.tsxindex 3e4e306e..7acb77b5 100644--- a/src/components/accordion/accordion.tsx+++ b/src/components/accordion/accordion.tsx@@ -37,9 +37,19 @@ const AccordionTrigger = React.forwardRef<)}{...props}>- {iconPosition === 'left' ? renderIcon() : null}- {children}- {iconPosition === 'right' ? renderIcon() : null}+ {props.asChild ? (+ <div className="flex">+ {iconPosition === 'left' ? renderIcon() : null}+ {children}+ {iconPosition === 'right' ? renderIcon() : null}+ </div>+ ) : (+ <>+ {iconPosition === 'left' ? renderIcon() : null}+ {children}+ {iconPosition === 'right' ? renderIcon() : null}+ </>+ )}</AccordionPrimitive.Trigger></AccordionPrimitive.Header>);diff --git a/src/context/chartdb-context/chartdb-provider.tsx b/src/context/chartdb-context/chartdb-provider.tsxindex 8c772d4d..57ce616b 100644--- a/src/context/chartdb-context/chartdb-provider.tsx+++ b/src/context/chartdb-context/chartdb-provider.tsx@@ -6,13 +6,13 @@ import { DatabaseType } from '@/lib/domain/database-type';import { DBField } from '@/lib/domain/db-field';import { DBIndex } from '@/lib/domain/db-index';import { DBRelationship } from '@/lib/domain/db-relationship';-import { useData } from '@/hooks/use-data';+import { useStorage } from '@/hooks/use-storage';export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({children,}) => {const [diagramId, setDiagramId] = React.useState('');- const db = useData();+ const db = useStorage();const [diagramName, setDiagramName] = React.useState('New Diagram');const [databaseType, setDatabaseType] = React.useState<DatabaseType>(DatabaseType.GENERICdiff --git a/src/context/config-context/config-provider.tsx b/src/context/config-context/config-provider.tsxindex 43bc01ef..d7bc1547 100644--- a/src/context/config-context/config-provider.tsx+++ b/src/context/config-context/config-provider.tsx@@ -1,13 +1,13 @@import React, { useEffect } from 'react';import { ConfigContext } from './config-context';-import { useData } from '@/hooks/use-data';+import { useStorage } from '@/hooks/use-storage';import { ChartDBConfig } from '@/lib/domain/config';export const ConfigProvider: React.FC<React.PropsWithChildren> = ({children,}) => {- const { getConfig, updateConfig: updateDataConfig } = useData();+ const { getConfig, updateConfig: updateDataConfig } = useStorage();const [config, setConfig] = React.useState<ChartDBConfig | undefined>();useEffect(() => {diff --git a/src/context/data-context/data-context.tsx b/src/context/storage-context/storage-context.tsxsimilarity index 96%rename from src/context/data-context/data-context.tsxrename to src/context/storage-context/storage-context.tsxindex 3fe4ae79..807fef57 100644--- a/src/context/data-context/data-context.tsx+++ b/src/context/storage-context/storage-context.tsx@@ -5,7 +5,7 @@ import { DBRelationship } from '@/lib/domain/db-relationship';import { DBTable } from '@/lib/domain/db-table';import { ChartDBConfig } from '@/lib/domain/config';-export interface DataContext {+export interface StorageContext {// Config operationsgetConfig: () => Promise<ChartDBConfig | undefined>;updateConfig: (config: Partial<ChartDBConfig>) => Promise<void>;@@ -59,7 +59,7 @@ export interface DataContext {listRelationships: (diagramId: string) => Promise<DBRelationship[]>;}-export const dataContext = createContext<DataContext>({+export const storageContext = createContext<StorageContext>({getConfig: emptyFn,updateConfig: emptyFn,diff --git a/src/context/data-context/data-provider.tsx b/src/context/storage-context/storage-provider.tsxsimilarity index 79%rename from src/context/data-context/data-provider.tsxrename to src/context/storage-context/storage-provider.tsxindex ab838500..6942dece 100644--- a/src/context/data-context/data-provider.tsx+++ b/src/context/storage-context/storage-provider.tsx@@ -1,12 +1,12 @@import React from 'react';-import { DataContext, dataContext } from './data-context';+import { StorageContext, storageContext } from './storage-context';import Dexie, { type EntityTable } from 'dexie';import { Diagram } from '@/lib/domain/diagram';import { DBTable } from '@/lib/domain/db-table';import { DBRelationship } from '@/lib/domain/db-relationship';import { ChartDBConfig } from '@/lib/domain/config';-export const DataProvider: React.FC<React.PropsWithChildren> = ({+export const StorageProvider: React.FC<React.PropsWithChildren> = ({children,}) => {const db = new Dexie('ChartDB') as Dexie & {@@ -49,19 +49,19 @@ export const DataProvider: React.FC<React.PropsWithChildren> = ({}});- const getConfig: DataContext['getConfig'] = async (): Promise<+ const getConfig: StorageContext['getConfig'] = async (): Promise<ChartDBConfig | undefined> => {return await db.config.get(1);};- const updateConfig: DataContext['updateConfig'] = async (+ const updateConfig: StorageContext['updateConfig'] = async (config: Partial<ChartDBConfig>) => {await db.config.update(1, config);};- const addDiagram: DataContext['addDiagram'] = async ({+ const addDiagram: StorageContext['addDiagram'] = async ({diagram,}: {diagram: Diagram;@@ -69,13 +69,13 @@ export const DataProvider: React.FC<React.PropsWithChildren> = ({await db.diagrams.add(diagram);};- const listDiagrams: DataContext['listDiagrams'] = async (): Promise<+ const listDiagrams: StorageContext['listDiagrams'] = async (): Promise<Diagram[]> => {return await db.diagrams.toArray();};- const getDiagram: DataContext['getDiagram'] = async (+ const getDiagram: StorageContext['getDiagram'] = async (id: string,options: {includeTables?: boolean;@@ -99,7 +99,7 @@ export const DataProvider: React.FC<React.PropsWithChildren> = ({return diagram;};- const updateDiagram: DataContext['updateDiagram'] = async ({+ const updateDiagram: StorageContext['updateDiagram'] = async ({id,attributes,}: {@@ -109,7 +109,9 @@ export const DataProvider: React.FC<React.PropsWithChildren> = ({await db.diagrams.update(id, attributes);};- const deleteDiagram: DataContext['deleteDiagram'] = async (id: string) => {+ const deleteDiagram: StorageContext['deleteDiagram'] = async (+ id: string+ ) => {await Promise.all([db.diagrams.delete(id),db.db_tables.where('diagramId').equals(id).delete(),@@ -117,7 +119,7 @@ export const DataProvider: React.FC<React.PropsWithChildren> = ({]);};- const addTable: DataContext['addTable'] = async ({+ const addTable: StorageContext['addTable'] = async ({diagramId,table,}: {@@ -130,7 +132,7 @@ export const DataProvider: React.FC<React.PropsWithChildren> = ({});};- const getTable: DataContext['getTable'] = async ({+ const getTable: StorageContext['getTable'] = async ({id,diagramId,}: {@@ -140,14 +142,14 @@ export const DataProvider: React.FC<React.PropsWithChildren> = ({return await db.db_tables.get({ id, diagramId });};- const updateTable: DataContext['updateTable'] = async ({+ const updateTable: StorageContext['updateTable'] = async ({id,attributes,}) => {await db.db_tables.update(id, attributes);};- const deleteTable: DataContext['deleteTable'] = async ({+ const deleteTable: StorageContext['deleteTable'] = async ({id,diagramId,}: {@@ -157,7 +159,7 @@ export const DataProvider: React.FC<React.PropsWithChildren> = ({await db.db_tables.where({ id, diagramId }).delete();};- const listTables: DataContext['listTables'] = async (+ const listTables: StorageContext['listTables'] = async (diagramId: string): Promise<DBTable[]> => {return await db.db_tables@@ -166,7 +168,7 @@ export const DataProvider: React.FC<React.PropsWithChildren> = ({.toArray();};- const addRelationship: DataContext['addRelationship'] = async ({+ const addRelationship: StorageContext['addRelationship'] = async ({diagramId,relationship,}: {@@ -179,7 +181,7 @@ export const DataProvider: React.FC<React.PropsWithChildren> = ({});};- const getRelationship: DataContext['getRelationship'] = async ({+ const getRelationship: StorageContext['getRelationship'] = async ({id,diagramId,}: {@@ -189,7 +191,7 @@ export const DataProvider: React.FC<React.PropsWithChildren> = ({return await db.db_relationships.get({ id, diagramId });};- const updateRelationship: DataContext['updateRelationship'] = async ({+ const updateRelationship: StorageContext['updateRelationship'] = async ({id,attributes,}: {@@ -199,7 +201,7 @@ export const DataProvider: React.FC<React.PropsWithChildren> = ({await db.db_relationships.update(id, attributes);};- const deleteRelationship: DataContext['deleteRelationship'] = async ({+ const deleteRelationship: StorageContext['deleteRelationship'] = async ({id,diagramId,}: {@@ -209,7 +211,7 @@ export const DataProvider: React.FC<React.PropsWithChildren> = ({await db.db_relationships.where({ id, diagramId }).delete();};- const listRelationships: DataContext['listRelationships'] = async (+ const listRelationships: StorageContext['listRelationships'] = async (diagramId: string): Promise<DBRelationship[]> => {return await db.db_relationships@@ -219,7 +221,7 @@ export const DataProvider: React.FC<React.PropsWithChildren> = ({};return (- <dataContext.Provider+ <storageContext.Providervalue={{getConfig,updateConfig,@@ -241,6 +243,6 @@ export const DataProvider: React.FC<React.PropsWithChildren> = ({}}>{children}- </dataContext.Provider>+ </storageContext.Provider>);};diff --git a/src/dialogs/create-diagram-dialog/create-diagram-dialog.tsx b/src/dialogs/create-diagram-dialog/create-diagram-dialog.tsxindex 35e04cee..21b53014 100644--- a/src/dialogs/create-diagram-dialog/create-diagram-dialog.tsx+++ b/src/dialogs/create-diagram-dialog/create-diagram-dialog.tsx@@ -15,7 +15,7 @@ import { DatabaseType } from '@/lib/domain/database-type';import { getDatabaseLogo } from '@/lib/databases';import { CodeSnippet } from '@/components/code-snippet/code-snippet';import { Textarea } from '@/components/textarea/textarea';-import { useData } from '@/hooks/use-data';+import { useStorage } from '@/hooks/use-storage';import { Diagram } from '@/lib/domain/diagram';import { generateId } from '@/lib/utils';import { useCreateDiagramDialog } from '@/hooks/use-create-diagram-dialog';@@ -43,7 +43,7 @@ export const CreateDiagramDialog: React.FC<CreateDiagramDialogProps> = ({const [step, setStep] = React.useState<CreateDiagramDialogStep>(CreateDiagramDialogStep.SELECT_DATABASE);- const { listDiagrams, addDiagram } = useData();+ const { listDiagrams, addDiagram } = useStorage();const [diagramNumber, setDiagramNumber] = React.useState<number>(1);const navigate = useNavigate();diff --git a/src/hooks/use-data.ts b/src/hooks/use-data.tsdeleted file mode 100644index ff01f460..00000000--- a/src/hooks/use-data.ts+++ /dev/null@@ -1,4 +0,0 @@-import { useContext } from 'react';-import { dataContext } from '@/context/data-context/data-context';--export const useData = () => useContext(dataContext);diff --git a/src/hooks/use-storage.ts b/src/hooks/use-storage.tsnew file mode 100644index 00000000..2de9d589--- /dev/null+++ b/src/hooks/use-storage.ts@@ -0,0 +1,4 @@+import { useContext } from 'react';+import { storageContext } from '@/context/storage-context/storage-context';++export const useStorage = () => useContext(storageContext);diff --git a/src/pages/editor-page/canvas/canvas.tsx b/src/pages/editor-page/canvas/canvas.tsxindex 4d4851bd..365157b8 100644--- a/src/pages/editor-page/canvas/canvas.tsx+++ b/src/pages/editor-page/canvas/canvas.tsx@@ -16,6 +16,7 @@ import '@xyflow/react/dist/style.css';import { TableNode, TableNodeType } from './table-node';import { TableEdge, TableEdgeType } from './table-edge';import { useChartDB } from '@/hooks/use-chartdb';+import { LEFT_HANDLE_ID_PREFIX, TARGET_ID_PREFIX } from './table-node-field';type AddEdgeParams = Parameters<typeof addEdge<TableEdgeType>>[0];@@ -28,6 +29,7 @@ export const Canvas: React.FC<CanvasProps> = () => {const { getEdge } = useReactFlow();const {tables,+ relationships,createRelationship,updateTablesState,removeRelationships,@@ -40,6 +42,29 @@ export const Canvas: React.FC<CanvasProps> = () => {const [edges, setEdges, onEdgesChange] =useEdgesState<TableEdgeType>(initialEdges);+ useEffect(() => {+ const targetIndexes: Record<string, number> = relationships.reduce(+ (acc, relationship) => {+ acc[+ `${relationship.targetTableId}${relationship.targetFieldId}`+ ] = 0;+ return acc;+ },+ {} as Record<string, number>+ );+ setEdges(+ relationships.map((relationship) => ({+ id: relationship.id,+ source: relationship.sourceTableId,+ target: relationship.targetTableId,+ sourceHandle: `${LEFT_HANDLE_ID_PREFIX}${relationship.sourceFieldId}`,+ targetHandle: `${TARGET_ID_PREFIX}${targetIndexes[`${relationship.targetTableId}${relationship.targetFieldId}`]++}_${relationship.targetFieldId}`,+ type: 'table-edge',+ data: { relationship },+ }))+ );+ }, [relationships, setEdges]);+useEffect(() => {setNodes(tables.map((table) => ({diff --git a/src/pages/editor-page/canvas/table-edge.tsx b/src/pages/editor-page/canvas/table-edge.tsxindex 53378eae..b026c8cd 100644--- a/src/pages/editor-page/canvas/table-edge.tsx+++ b/src/pages/editor-page/canvas/table-edge.tsx@@ -7,8 +7,9 @@ import {Position,useReactFlow,} from '@xyflow/react';-import { RIGHT_HANDLE_ID_PREFIX, TARGET_ID_PREFIX } from './table-node';import { DBRelationship } from '@/lib/domain/db-relationship';+import { RIGHT_HANDLE_ID_PREFIX } from './table-node-field';+import { useChartDB } from '@/hooks/use-chartdb';export type TableEdgeType = Edge<{@@ -28,15 +29,20 @@ export const TableEdge: React.FC<EdgeProps<TableEdgeType>> = ({selected,}) => {const { getInternalNode, getEdge } = useReactFlow();+ const { relationships } = useChartDB();++ const edgeNumber = relationships+ .filter(+ (relationship) =>+ relationship.targetTableId === target &&+ relationship.sourceTableId === source+ )+ .findIndex((relationship) => relationship.id === id);const sourceNode = getInternalNode(source);const targetNode = getInternalNode(target);const edge = getEdge(id);- const edgeNumber = parseInt(- edge?.targetHandle?.slice?.(TARGET_ID_PREFIX.length) ?? '0'- );-const sourceHandle: 'left' | 'right' = edge?.sourceHandle?.startsWith?.(RIGHT_HANDLE_ID_PREFIX)diff --git a/src/pages/editor-page/canvas/table-node-field.tsx b/src/pages/editor-page/canvas/table-node-field.tsxindex 767688d8..2adc0aa8 100644--- a/src/pages/editor-page/canvas/table-node-field.tsx+++ b/src/pages/editor-page/canvas/table-node-field.tsx@@ -3,7 +3,6 @@ import {Handle,Position,useConnection,- useReactFlow,useUpdateNodeInternals,} from '@xyflow/react';import { Button } from '@/components/button/button';@@ -27,17 +26,15 @@ export const TableNodeField: React.FC<TableNodeFieldProps> = ({focused,tableNodeId,}) => {- const { removeField } = useChartDB();- const { getEdges } = useReactFlow();+ const { removeField, relationships } = useChartDB();const updateNodeInternals = useUpdateNodeInternals();const connection = useConnection();const isTarget =connection.inProgress && connection.fromNode.id !== tableNodeId;- const edges = getEdges();- const numberOfEdgesToField = edges.filter(- (edge) =>- edge.target === tableNodeId &&- edge.targetHandle?.endsWith(`_${field.id}`)+ const numberOfEdgesToField = relationships.filter(+ (relationship) =>+ relationship.targetTableId === tableNodeId &&+ relationship.targetFieldId === field.id).length;useEffect(() => {@@ -49,13 +46,13 @@ export const TableNodeField: React.FC<TableNodeFieldProps> = ({{!connection.inProgress && (<><Handle- id={`${RIGHT_HANDLE_ID_PREFIX}_${field.id}`}+ id={`${RIGHT_HANDLE_ID_PREFIX}${field.id}`}className={`!h-3 !w-3 !bg-slate-400 ${!focused ? '!invisible' : ''}`}position={Position.Right}type="source"/><Handle- id={`${LEFT_HANDLE_ID_PREFIX}_${field.id}`}+ id={`${LEFT_HANDLE_ID_PREFIX}${field.id}`}className={`!h-3 !w-3 !bg-slate-400 ${!focused ? '!invisible' : ''}`}position={Position.Left}type="source"@@ -65,12 +62,12 @@ export const TableNodeField: React.FC<TableNodeFieldProps> = ({{(!connection.inProgress || isTarget) && (<>{Array.from(- { length: numberOfEdgesToField + 1 },+ { length: numberOfEdgesToField },(_, index) => index).map((index) => (<Handleid={`${TARGET_ID_PREFIX}${index}_${field.id}`}- key={`${TARGET_ID_PREFIX}${index}`}+ key={`${TARGET_ID_PREFIX}${index}_${field.id}`}className={`!invisible`}position={Position.Left}type="target"diff --git a/src/pages/editor-page/canvas/table-node.tsx b/src/pages/editor-page/canvas/table-node.tsxindex 657f24b3..140e15b1 100644--- a/src/pages/editor-page/canvas/table-node.tsx+++ b/src/pages/editor-page/canvas/table-node.tsx@@ -6,10 +6,6 @@ import { Label } from '@/components/label/label';import { DBTable } from '@/lib/domain/db-table';import { TableNodeField } from './table-node-field';-export const LEFT_HANDLE_ID_PREFIX = 'left_';-export const RIGHT_HANDLE_ID_PREFIX = 'right_';-export const TARGET_ID_PREFIX = 'target-';-export type TableNodeType = Node<{table: DBTable;diff --git a/src/pages/editor-page/side-panel/list-item-header-button/relationship-list-item-header-button.tsx b/src/pages/editor-page/side-panel/list-item-header-button/relationship-list-item-header-button.tsxindex 99c3af13..7c5e39f9 100644--- a/src/pages/editor-page/side-panel/list-item-header-button/relationship-list-item-header-button.tsx+++ b/src/pages/editor-page/side-panel/list-item-header-button/relationship-list-item-header-button.tsx@@ -1,12 +1,18 @@import React from 'react';import { Button, ButtonProps } from '@/components/button/button';-export const ListItemHeaderButton: React.FC<ButtonProps> = (props) => {+export const ListItemHeaderButton: React.FC<ButtonProps> = React.forwardRef<+ HTMLButtonElement,+ ButtonProps+>((props, ref) => {return (<Button+ ref={ref}variant="ghost"className="hover:bg-primary-foreground p-2 w-8 h-8 text-slate-500 hover:text-slate-700"{...props}/>);-};+});++ListItemHeaderButton.displayName = 'ListItemHeaderButton';diff --git a/src/pages/editor-page/side-panel/relationships-section/relationship-list/relationship-list-item/relationship-list-item.tsx b/src/pages/editor-page/side-panel/relationships-section/relationship-list/relationship-list-item/relationship-list-item.tsxindex 41c3855a..11d2108a 100644--- a/src/pages/editor-page/side-panel/relationships-section/relationship-list/relationship-list-item/relationship-list-item.tsx+++ b/src/pages/editor-page/side-panel/relationships-section/relationship-list/relationship-list-item/relationship-list-item.tsx@@ -16,8 +16,11 @@ export const RelationshipListItem: React.FC<RelationshipListItemProps> = ({relationship,}) => {return (- <AccordionItem value="item-1" className="rounded-md">- <AccordionTrigger className="hover:no-underline hover:bg-accent rounded-md px-2 py-0 data-[state=open]:rounded-b-none">+ <AccordionItem value={relationship.id} className="rounded-md">+ <AccordionTrigger+ asChild+ className="hover:no-underline hover:bg-accent rounded-md px-2 py-0 data-[state=open]:rounded-b-none"+ ><RelationshipListItemHeader relationship={relationship} /></AccordionTrigger><AccordionContent className="pb-0 p-1">diff --git a/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item.tsx b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item.tsxindex 7c7433ff..55d56c00 100644--- a/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item.tsx+++ b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item.tsx@@ -20,6 +20,7 @@ export const TableListItem: React.FC<TableListItemProps> = ({ table }) => {style={{borderColor: table.color,}}+ asChild><TableListItemHeader table={table} /></AccordionTrigger>diff --git a/src/pages/editor-page/top-navbar/top-navbar.tsx b/src/pages/editor-page/top-navbar/top-navbar.tsxindex 6ccaedf7..9eb0d0c7 100644--- a/src/pages/editor-page/top-navbar/top-navbar.tsx+++ b/src/pages/editor-page/top-navbar/top-navbar.tsx@@ -1,4 +1,4 @@-import React, { useCallback } from 'react';+import React, { useCallback, useEffect } from 'react';import {Menubar,MenubarContent,@@ -28,6 +28,10 @@ export const TopNavbar: React.FC<TopNavbarProps> = () => {React.useState(diagramName);const inputRef = React.useRef<HTMLInputElement>(null);+ useEffect(() => {+ setEditedDiagramName(diagramName);+ }, [diagramName]);+const editDiagramName = useCallback(() => {if (!editMode) return;if (editedDiagramName.trim()) {@@ -50,7 +54,11 @@ export const TopNavbar: React.FC<TopNavbarProps> = () => {<nav className="flex flex-row items-center justify-between px-4 h-12"><div className="flex flex-1 justify-start gap-x-3"><div className="flex font-primary items-center">- <img src={ChartDBLogo} alt="chartDB" className="h-4" />+ <img+ src={ChartDBLogo}+ alt="chartDB"+ className="h-4 max-w-fit"+ /></div><div><Menubar className="border-none shadow-none">@@ -159,7 +167,7 @@ export const TopNavbar: React.FC<TopNavbarProps> = () => {)}</div></div>- <div className="flex flex-1 justify-end"></div>+ <div className="hidden flex-1 justify-end sm:flex"></div></nav>);};diff --git a/src/router.tsx b/src/router.tsxindex 6a01754a..751c1b9e 100644--- a/src/router.tsx+++ b/src/router.tsx@@ -4,7 +4,7 @@ import { NotFoundPage } from './pages/not-found-page/not-found-page';import { EditorPage } from './pages/editor-page/editor-page';import { ChartDBProvider } from './context/chartdb-context/chartdb-provider';import { ReactFlowProvider } from '@xyflow/react';-import { DataProvider } from './context/data-context/data-provider';+import { StorageProvider } from './context/storage-context/storage-provider';import { CreateDiagramDialogProvider } from './dialogs/create-diagram-dialog/create-diagram-dialog-provider';import { ConfigProvider } from './context/config-context/config-provider';@@ -12,7 +12,7 @@ const routes: RouteObject[] = [...['', 'diagrams/:diagramId'].map((path) => ({path,element: (- <DataProvider>+ <StorageProvider><ConfigProvider><ChartDBProvider><CreateDiagramDialogProvider>@@ -22,7 +22,7 @@ const routes: RouteObject[] = [</CreateDiagramDialogProvider></ChartDBProvider></ConfigProvider>- </DataProvider>+ </StorageProvider>),})),{