Database diagrams editor that allows you to visualize and design your DB with a single query.
TypeScript databasedbdb-migrationeditorerdmariadbmssqlmysqlpostgresqlreactreact-flowschema-migrationssqlsqlitetypescriptvisualizationxyflow
add open diagram dialog, last updated and created time
Guy Ben-Aharon685365abfe9a
diff --git a/src/components/table/table.tsx b/src/components/table/table.tsxnew file mode 100644index 00000000..1d670ebc--- /dev/null+++ b/src/components/table/table.tsx@@ -0,0 +1,120 @@+import React from 'react';++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-bottom 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 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 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 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';++export {+ Table,+ TableHeader,+ TableBody,+ TableFooter,+ TableHead,+ TableRow,+ TableCell,+ TableCaption,+};diff --git a/src/context/chartdb-context/chartdb-context.tsx b/src/context/chartdb-context/chartdb-context.tsxindex 07ccb8ed..379522b3 100644--- a/src/context/chartdb-context/chartdb-context.tsx+++ b/src/context/chartdb-context/chartdb-context.tsx@@ -128,6 +128,8 @@ export const chartDBContext = createContext<ChartDBContext>({id: '',name: '',databaseType: DatabaseType.GENERIC,+ createdAt: new Date(),+ updatedAt: new Date(),},// General operationsdiff --git a/src/context/chartdb-context/chartdb-provider.tsx b/src/context/chartdb-context/chartdb-provider.tsxindex 21eb20cf..ed84f833 100644--- a/src/context/chartdb-context/chartdb-provider.tsx+++ b/src/context/chartdb-context/chartdb-provider.tsx@@ -1,4 +1,4 @@-import React, { useCallback, useMemo } from 'react';+import React, { useCallback, useMemo, useState } from 'react';import { DBTable } from '@/lib/domain/db-table';import { generateId, randomHSLA } from '@/lib/utils';import { ChartDBContext, chartDBContext } from './chartdb-context';@@ -15,25 +15,35 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({}) => {const db = useStorage();const { addUndoAction, resetRedoStack } = useRedoUndoStack();- const [diagramId, setDiagramId] = React.useState('');- const [diagramName, setDiagramName] = React.useState('');- const [databaseType, setDatabaseType] = React.useState<DatabaseType>(+ const [diagramId, setDiagramId] = useState('');+ const [diagramName, setDiagramName] = useState('');+ const [diagramCreatedAt, setDiagramCreatedAt] = useState<Date>(new Date());+ const [diagramUpdatedAt, setDiagramUpdatedAt] = useState<Date>(new Date());+ const [databaseType, setDatabaseType] = useState<DatabaseType>(DatabaseType.GENERIC);- const [tables, setTables] = React.useState<DBTable[]>([]);- const [relationships, setRelationships] = React.useState<DBRelationship[]>(- []- );+ const [tables, setTables] = useState<DBTable[]>([]);+ const [relationships, setRelationships] = useState<DBRelationship[]>([]);const currentDiagram: Diagram = useMemo(() => ({id: diagramId,name: diagramName,+ createdAt: diagramCreatedAt,+ updatedAt: diagramUpdatedAt,databaseType,tables,relationships,}),- [diagramId, diagramName, databaseType, tables, relationships]+ [+ diagramId,+ diagramName,+ databaseType,+ tables,+ relationships,+ diagramCreatedAt,+ diagramUpdatedAt,+ ]);const updateDatabaseType: ChartDBContext['updateDatabaseType'] =@@ -62,7 +72,12 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({async (name, options = { updateHistory: true }) => {const prevName = diagramName;setDiagramName(name);- await db.updateDiagram({ id: diagramId, attributes: { name } });+ const updatedAt = new Date();+ setDiagramUpdatedAt(updatedAt);+ await db.updateDiagram({+ id: diagramId,+ attributes: { name, updatedAt },+ });if (options.updateHistory) {addUndoAction({@@ -86,7 +101,12 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({const addTable: ChartDBContext['addTable'] = useCallback(async (table: DBTable, options = { updateHistory: true }) => {setTables((tables) => [...tables, table]);- await db.addTable({ diagramId, table });+ const updatedAt = new Date();+ setDiagramUpdatedAt(updatedAt);+ await Promise.all([+ db.updateDiagram({ id: diagramId, attributes: { updatedAt } }),+ db.addTable({ diagramId, table }),+ ]);if (options.updateHistory) {addUndoAction({@@ -136,7 +156,13 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({async (id: string, options = { updateHistory: true }) => {const table = getTable(id);setTables((tables) => tables.filter((table) => table.id !== id));- await db.deleteTable({ diagramId, id });++ const updatedAt = new Date();+ setDiagramUpdatedAt(updatedAt);+ await Promise.all([+ db.updateDiagram({ id: diagramId, attributes: { updatedAt } }),+ db.deleteTable({ diagramId, id }),+ ]);if (!!table && options.updateHistory) {addUndoAction({@@ -160,7 +186,12 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({setTables((tables) =>tables.map((t) => (t.id === id ? { ...t, ...table } : t)));- await db.updateTable({ id, attributes: table });+ const updatedAt = new Date();+ setDiagramUpdatedAt(updatedAt);+ await Promise.all([+ db.updateDiagram({ id: diagramId, attributes: { updatedAt } }),+ db.updateTable({ id, attributes: table }),+ ]);if (!!prevTable && options.updateHistory) {addUndoAction({@@ -171,7 +202,7 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({resetRedoStack();}},- [db, setTables, addUndoAction, resetRedoStack, getTable]+ [db, setTables, addUndoAction, resetRedoStack, getTable, diagramId]);const updateTablesState: ChartDBContext['updateTablesState'] = useCallback(@@ -222,6 +253,12 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({promises.push(db.deleteTable({ diagramId, id: table.id }));}+ const updatedAt = new Date();+ setDiagramUpdatedAt(updatedAt);+ promises.push(+ db.updateDiagram({ id: diagramId, attributes: { updatedAt } })+ );+await Promise.all(promises);if (options.updateHistory) {@@ -270,15 +307,20 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({return;}- await db.updateTable({- id: tableId,- attributes: {- ...table,- fields: table.fields.map((f) =>- f.id === fieldId ? { ...f, ...field } : f- ),- },- });+ const updatedAt = new Date();+ setDiagramUpdatedAt(updatedAt);+ await Promise.all([+ db.updateDiagram({ id: diagramId, attributes: { updatedAt } }),+ db.updateTable({+ id: tableId,+ attributes: {+ ...table,+ fields: table.fields.map((f) =>+ f.id === fieldId ? { ...f, ...field } : f+ ),+ },+ }),+ ]);if (!!prevField && options.updateHistory) {addUndoAction({@@ -321,13 +363,18 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({return;}- await db.updateTable({- id: tableId,- attributes: {- ...table,- fields: table.fields.filter((f) => f.id !== fieldId),- },- });+ const updatedAt = new Date();+ setDiagramUpdatedAt(updatedAt);+ await Promise.all([+ db.updateDiagram({ id: diagramId, attributes: { updatedAt } }),+ db.updateTable({+ id: tableId,+ attributes: {+ ...table,+ fields: table.fields.filter((f) => f.id !== fieldId),+ },+ }),+ ]);if (!!prevField && options.updateHistory) {addUndoAction({@@ -361,13 +408,18 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({return;}- await db.updateTable({- id: tableId,- attributes: {- ...table,- fields: [...table.fields, field],- },- });+ const updatedAt = new Date();+ setDiagramUpdatedAt(updatedAt);+ await Promise.all([+ db.updateDiagram({ id: diagramId, attributes: { updatedAt } }),+ db.updateTable({+ id: tableId,+ attributes: {+ ...table,+ fields: [...table.fields, field],+ },+ }),+ ]);if (options.updateHistory) {addUndoAction({@@ -428,13 +480,18 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({return;}- await db.updateTable({- id: tableId,- attributes: {- ...dbTable,- indexes: [...dbTable.indexes, index],- },- });+ const updatedAt = new Date();+ setDiagramUpdatedAt(updatedAt);+ await Promise.all([+ db.updateDiagram({ id: diagramId, attributes: { updatedAt } }),+ db.updateTable({+ id: tableId,+ attributes: {+ ...dbTable,+ indexes: [...dbTable.indexes, index],+ },+ }),+ ]);if (options.updateHistory) {addUndoAction({@@ -477,13 +534,20 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({return;}- await db.updateTable({- id: tableId,- attributes: {- ...dbTable,- indexes: dbTable.indexes.filter((i) => i.id !== indexId),- },- });+ const updatedAt = new Date();+ setDiagramUpdatedAt(updatedAt);+ await Promise.all([+ db.updateDiagram({ id: diagramId, attributes: { updatedAt } }),+ db.updateTable({+ id: tableId,+ attributes: {+ ...dbTable,+ indexes: dbTable.indexes.filter(+ (i) => i.id !== indexId+ ),+ },+ }),+ ]);if (!!prevIndex && options.updateHistory) {addUndoAction({@@ -542,15 +606,20 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({return;}- await db.updateTable({- id: tableId,- attributes: {- ...dbTable,- indexes: dbTable.indexes.map((i) =>- i.id === indexId ? { ...i, ...index } : i- ),- },- });+ const updatedAt = new Date();+ setDiagramUpdatedAt(updatedAt);+ await Promise.all([+ db.updateDiagram({ id: diagramId, attributes: { updatedAt } }),+ db.updateTable({+ id: tableId,+ attributes: {+ ...dbTable,+ indexes: dbTable.indexes.map((i) =>+ i.id === indexId ? { ...i, ...index } : i+ ),+ },+ }),+ ]);if (!!prevIndex && options.updateHistory) {addUndoAction({@@ -574,7 +643,12 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({relationship,]);- await db.addRelationship({ diagramId, relationship });+ const updatedAt = new Date();+ setDiagramUpdatedAt(updatedAt);+ await Promise.all([+ db.updateDiagram({ id: diagramId, attributes: { updatedAt } }),+ db.addRelationship({ diagramId, relationship }),+ ]);if (options.updateHistory) {addUndoAction({@@ -598,11 +672,15 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({...relationships,]);- await Promise.all(- relationships.map((relationship) =>+ const updatedAt = new Date();+ setDiagramUpdatedAt(updatedAt);++ await Promise.all([+ ...relationships.map((relationship) =>db.addRelationship({ diagramId, relationship })- )- );+ ),+ db.updateDiagram({ id: diagramId, attributes: { updatedAt } }),+ ]);if (options.updateHistory) {addUndoAction({@@ -663,7 +741,15 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({));- await db.deleteRelationship({ diagramId, id });+ const updatedAt = new Date();+ setDiagramUpdatedAt(updatedAt);+ await Promise.all([+ db.updateDiagram({+ id: diagramId,+ attributes: { updatedAt },+ }),+ db.deleteRelationship({ diagramId, id }),+ ]);if (!!relationship && options.updateHistory) {addUndoAction({@@ -699,9 +785,17 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({));- await Promise.all(- ids.map((id) => db.deleteRelationship({ diagramId, id }))- );+ const updatedAt = new Date();+ setDiagramUpdatedAt(updatedAt);+ await Promise.all([+ ...ids.map((id) =>+ db.deleteRelationship({ diagramId, id })+ ),+ db.updateDiagram({+ id: diagramId,+ attributes: { updatedAt },+ }),+ ]);if (prevRelationships.length > 0 && options.updateHistory) {addUndoAction({@@ -736,7 +830,15 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({));- await db.updateRelationship({ id, attributes: relationship });+ const updatedAt = new Date();+ setDiagramUpdatedAt(updatedAt);+ await Promise.all([+ db.updateDiagram({+ id: diagramId,+ attributes: { updatedAt },+ }),+ db.updateRelationship({ id, attributes: relationship }),+ ]);if (!!prevRelationship && options.updateHistory) {addUndoAction({@@ -756,6 +858,7 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({addUndoAction,getRelationship,resetRedoStack,+ diagramId,]);@@ -772,6 +875,8 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({setDatabaseType(diagram.databaseType);setTables(diagram?.tables ?? []);setRelationships(diagram?.relationships ?? []);+ setDiagramCreatedAt(diagram.createdAt);+ setDiagramUpdatedAt(diagram.updatedAt);}return diagram;@@ -783,6 +888,8 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({setDatabaseType,setTables,setRelationships,+ setDiagramCreatedAt,+ setDiagramUpdatedAt,]);diff --git a/src/context/dialog-context/dialog-context.tsx b/src/context/dialog-context/dialog-context.tsxindex d26243dd..7c7ce646 100644--- a/src/context/dialog-context/dialog-context.tsx+++ b/src/context/dialog-context/dialog-context.tsx@@ -2,11 +2,18 @@ import { createContext } from 'react';import { emptyFn } from '@/lib/utils';export interface DialogContext {+ // Create diagram dialogopenCreateDiagramDialog: () => void;closeCreateDiagramDialog: () => void;++ // Open diagram dialog+ openOpenDiagramDialog: () => void;+ closeOpenDiagramDialog: () => void;}export const dialogContext = createContext<DialogContext>({openCreateDiagramDialog: emptyFn,closeCreateDiagramDialog: emptyFn,+ openOpenDiagramDialog: emptyFn,+ closeOpenDiagramDialog: emptyFn,});diff --git a/src/context/dialog-context/dialog-provider.tsx b/src/context/dialog-context/dialog-provider.tsxindex 0f56ce36..deb597ad 100644--- a/src/context/dialog-context/dialog-provider.tsx+++ b/src/context/dialog-context/dialog-provider.tsx@@ -1,22 +1,26 @@-import React from 'react';+import React, { useState } from 'react';import { dialogContext } from './dialog-context';import { CreateDiagramDialog } from '@/dialogs/create-diagram-dialog/create-diagram-dialog';+import { OpenDiagramDialog } from '@/dialogs/open-diagram-dialog/open-diagram-dialog';export const DialogProvider: React.FC<React.PropsWithChildren> = ({children,}) => {- const [openNewDiagramDialog, setOpenNewDiagramDialog] =- React.useState(false);+ const [openNewDiagramDialog, setOpenNewDiagramDialog] = useState(false);+ const [openOpenDiagramDialog, setOpenOpenDiagramDialog] = useState(false);return (<dialogContext.Providervalue={{openCreateDiagramDialog: () => setOpenNewDiagramDialog(true),closeCreateDiagramDialog: () => setOpenNewDiagramDialog(false),+ openOpenDiagramDialog: () => setOpenOpenDiagramDialog(true),+ closeOpenDiagramDialog: () => setOpenOpenDiagramDialog(false),}}>{children}<CreateDiagramDialog dialog={{ open: openNewDiagramDialog }} />+ <OpenDiagramDialog dialog={{ open: openOpenDiagramDialog }} /></dialogContext.Provider>);};diff --git a/src/context/storage-context/storage-provider.tsx b/src/context/storage-context/storage-provider.tsxindex 863455f2..f490b14a 100644--- a/src/context/storage-context/storage-provider.tsx+++ b/src/context/storage-context/storage-provider.tsx@@ -30,7 +30,7 @@ export const StorageProvider: React.FC<React.PropsWithChildren> = ({// Schema declaration:db.version(1).stores({- diagrams: '++id, name, databaseType, tables, relationships',+ diagrams: '++id, name, databaseType, createdAt, updatedAt',db_tables:'++id, diagramId, name, x, y, fields, indexes, color, createdAt',db_relationships:@@ -72,6 +72,8 @@ export const StorageProvider: React.FC<React.PropsWithChildren> = ({id: diagram.id,name: diagram.name,databaseType: diagram.databaseType,+ createdAt: diagram.createdAt,+ updatedAt: diagram.updatedAt,}));diff --git a/src/dialogs/create-diagram-dialog/create-diagram-dialog.tsx b/src/dialogs/create-diagram-dialog/create-diagram-dialog.tsxindex 65eba1f7..f7d40c81 100644--- a/src/dialogs/create-diagram-dialog/create-diagram-dialog.tsx+++ b/src/dialogs/create-diagram-dialog/create-diagram-dialog.tsx@@ -25,7 +25,7 @@ import {} from '@/lib/data/import-metadata/metadata-types/database-metadata';import { generateId } from '@/lib/utils';import { useChartDB } from '@/hooks/use-chartdb';-import { useDiagramDialog } from '@/hooks/use-dialog';+import { useDialog } from '@/hooks/use-dialog';enum CreateDiagramDialogStep {SELECT_DATABASE = 'SELECT_DATABASE',@@ -43,7 +43,7 @@ export const CreateDiagramDialog: React.FC<CreateDiagramDialogProps> = ({const [databaseType, setDatabaseType] = React.useState<DatabaseType>(DatabaseType.GENERIC);- const { closeCreateDiagramDialog } = useDiagramDialog();+ const { closeCreateDiagramDialog } = useDialog();const { updateConfig } = useConfig();const [scriptResult, setScriptResult] = React.useState('');const [step, setStep] = React.useState<CreateDiagramDialogStep>(@@ -59,7 +59,7 @@ export const CreateDiagramDialog: React.FC<CreateDiagramDialogProps> = ({setDiagramNumber(diagrams.length + 1);};fetchDiagrams();- }, [listDiagrams, setDiagramNumber]);+ }, [listDiagrams, setDiagramNumber, dialog.open]);const hasExistingDiagram = (diagramId ?? '').trim().length !== 0;@@ -68,6 +68,8 @@ export const CreateDiagramDialog: React.FC<CreateDiagramDialogProps> = ({id: generateId(),name: `Diagram ${diagramNumber}`,databaseType: databaseType ?? DatabaseType.GENERIC,+ createdAt: new Date(),+ updatedAt: new Date(),};if (scriptResult.trim().length !== 0) {@@ -83,7 +85,6 @@ export const CreateDiagramDialog: React.FC<CreateDiagramDialogProps> = ({await addDiagram({ diagram });await updateConfig({ defaultDiagramId: diagram.id });- setDiagramNumber(diagramNumber + 1);closeCreateDiagramDialog();navigate(`/diagrams/${diagram.id}`);}, [diff --git a/src/dialogs/open-diagram-dialog/open-diagram-dialog.tsx b/src/dialogs/open-diagram-dialog/open-diagram-dialog.tsxnew file mode 100644index 00000000..6759a879--- /dev/null+++ b/src/dialogs/open-diagram-dialog/open-diagram-dialog.tsx@@ -0,0 +1,152 @@+import { Button } from '@/components/button/button';+import {+ Dialog,+ DialogClose,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+} from '@/components/dialog/dialog';+import {+ Table,+ TableBody,+ TableCell,+ TableHead,+ TableHeader,+ TableRow,+} from '@/components/table/table';+import { useDialog } from '@/hooks/use-dialog';+import { useStorage } from '@/hooks/use-storage';+import { databaseTypeToLabel } from '@/lib/domain/database-type';+import { Diagram } from '@/lib/domain/diagram';+import { DialogProps } from '@radix-ui/react-dialog';+import React, { useEffect, useState } from 'react';+import { useNavigate } from 'react-router-dom';++export interface OpenDiagramDialogProps {+ dialog: DialogProps;+}++export const OpenDiagramDialog: React.FC<OpenDiagramDialogProps> = ({+ dialog,+}) => {+ const { closeOpenDiagramDialog } = useDialog();+ const navigate = useNavigate();+ const { listDiagrams } = useStorage();+ const [diagrams, setDiagrams] = useState<Diagram[]>([]);+ const [selectedDiagramId, setSelectedDiagramId] = useState<+ string | undefined+ >();++ useEffect(() => {+ setSelectedDiagramId(undefined);+ }, [dialog.open]);++ useEffect(() => {+ const fetchDiagrams = async () => {+ const diagrams = await listDiagrams();+ setDiagrams(+ diagrams.sort(+ (a, b) => b.updatedAt.getTime() - a.updatedAt.getTime()+ )+ );+ };+ fetchDiagrams();+ }, [listDiagrams, setDiagrams, dialog.open]);++ const openDiagram = (diagramId: string) => {+ if (selectedDiagramId) {+ navigate(`/diagrams/${diagramId}`);+ }+ };+ return (+ <Dialog+ {...dialog}+ onOpenChange={(open) => {+ if (!open) {+ closeOpenDiagramDialog();+ }+ }}+ >+ <DialogContent+ className="flex flex-col min-w-[500px] xl:min-w-[75vw] max-h-[80vh] overflow-y-auto"+ showClose+ >+ <DialogHeader>+ <DialogTitle>Open Diagram</DialogTitle>+ <DialogDescription>+ Select a diagram to open from the list below.+ </DialogDescription>+ </DialogHeader>+ <div className="flex flex-1 items-center justify-center">+ <Table>+ <TableHeader>+ <TableRow>+ <TableHead>Name</TableHead>+ <TableHead>Created at</TableHead>+ <TableHead>Last modified</TableHead>+ <TableHead>Type</TableHead>+ </TableRow>+ </TableHeader>+ <TableBody>+ {diagrams.map((diagram) => (+ <TableRow+ key={diagram.id}+ data-state={`${selectedDiagramId === diagram.id ? 'selected' : ''}`}+ onClick={(e) => {+ switch (e.detail) {+ case 1:+ setSelectedDiagramId(+ diagram.id+ );+ break;+ case 2:+ openDiagram(diagram.id);+ closeOpenDiagramDialog();+ break;+ default:+ setSelectedDiagramId(+ diagram.id+ );+ }+ }}+ >+ <TableCell>{diagram.name}</TableCell>+ <TableCell>+ {diagram.createdAt.toLocaleString()}+ </TableCell>+ <TableCell>+ {diagram.updatedAt.toLocaleString()}+ </TableCell>+ <TableCell>+ {databaseTypeToLabel(+ diagram.databaseType+ )}+ </TableCell>+ </TableRow>+ ))}+ </TableBody>+ </Table>+ </div>++ <DialogFooter className="flex !justify-between gap-2">+ <DialogClose asChild>+ <Button type="button" variant="secondary">+ Cancel+ </Button>+ </DialogClose>+ <DialogClose asChild>+ <Button+ type="submit"+ disabled={!selectedDiagramId}+ onClick={() => openDiagram(selectedDiagramId ?? '')}+ >+ Open+ </Button>+ </DialogClose>+ </DialogFooter>+ </DialogContent>+ </Dialog>+ );+};diff --git a/src/hooks/use-dialog.ts b/src/hooks/use-dialog.tsindex 2271a582..3c70b332 100644--- a/src/hooks/use-dialog.ts+++ b/src/hooks/use-dialog.ts@@ -1,4 +1,4 @@import { dialogContext } from '@/context/dialog-context/dialog-context';import { useContext } from 'react';-export const useDiagramDialog = () => useContext(dialogContext);+export const useDialog = () => useContext(dialogContext);diff --git a/src/lib/domain/database-type.ts b/src/lib/domain/database-type.tsindex 6de04d44..636126c1 100644--- a/src/lib/domain/database-type.ts+++ b/src/lib/domain/database-type.ts@@ -6,3 +6,20 @@ export enum DatabaseType {MARIADB = 'mariadb',SQLITE = 'sqlite',}++export const databaseTypeToLabel = (type: DatabaseType) => {+ switch (type) {+ case DatabaseType.GENERIC:+ return 'Generic';+ case DatabaseType.POSTGRESQL:+ return 'PostgreSQL';+ case DatabaseType.MYSQL:+ return 'MySQL';+ case DatabaseType.SQL_SERVER:+ return 'SQL Server';+ case DatabaseType.MARIADB:+ return 'MariaDB';+ case DatabaseType.SQLITE:+ return 'SQLite';+ }+};diff --git a/src/lib/domain/diagram.ts b/src/lib/domain/diagram.tsindex cdc6d21b..8b664d61 100644--- a/src/lib/domain/diagram.ts+++ b/src/lib/domain/diagram.ts@@ -16,6 +16,8 @@ export interface Diagram {databaseType: DatabaseType;tables?: DBTable[];relationships?: DBRelationship[];+ createdAt: Date;+ updatedAt: Date;}export const loadFromDatabaseMetadata = ({@@ -69,5 +71,7 @@ export const loadFromDatabaseMetadata = ({databaseType: databaseType ?? DatabaseType.GENERIC,tables: sortedTables,relationships,+ createdAt: new Date(),+ updatedAt: new Date(),};};diff --git a/src/pages/editor-page/editor-page.tsx b/src/pages/editor-page/editor-page.tsxindex 41e822b2..694fe4ef 100644--- a/src/pages/editor-page/editor-page.tsx+++ b/src/pages/editor-page/editor-page.tsx@@ -11,11 +11,11 @@ import { Canvas } from './canvas/canvas';import { useNavigate, useParams } from 'react-router-dom';import { useConfig } from '@/hooks/use-config';import { useChartDB } from '@/hooks/use-chartdb';-import { useDiagramDialog } from '@/hooks/use-dialog';+import { useDialog } from '@/hooks/use-dialog';export const EditorPage: React.FC = () => {const { loadDiagram } = useChartDB();- const { openCreateDiagramDialog } = useDiagramDialog();+ const { openCreateDiagramDialog } = useDialog();const { diagramId } = useParams<{ diagramId: string }>();const { config } = useConfig();const navigate = useNavigate();diff --git a/src/pages/editor-page/top-navbar/top-navbar.tsx b/src/pages/editor-page/top-navbar/top-navbar.tsxindex 300cc1a9..2e348883 100644--- a/src/pages/editor-page/top-navbar/top-navbar.tsx+++ b/src/pages/editor-page/top-navbar/top-navbar.tsx@@ -18,13 +18,13 @@ import { Input } from '@/components/input/input';import { useChartDB } from '@/hooks/use-chartdb';import { useClickAway, useKeyPressEvent } from 'react-use';import ChartDBLogo from '@/assets/logo.png';-import { useDiagramDialog } from '@/hooks/use-dialog';+import { useDialog } from '@/hooks/use-dialog';export interface TopNavbarProps {}export const TopNavbar: React.FC<TopNavbarProps> = () => {const { diagramName, updateDiagramName, currentDiagram } = useChartDB();- const { openCreateDiagramDialog } = useDiagramDialog();+ const { openCreateDiagramDialog, openOpenDiagramDialog } = useDialog();const [editMode, setEditMode] = useState(false);const [editedDiagramName, setEditedDiagramName] =React.useState(diagramName);@@ -50,6 +50,10 @@ export const TopNavbar: React.FC<TopNavbarProps> = () => {openCreateDiagramDialog();};+ const openDiagram = () => {+ openOpenDiagramDialog();+ };+const enterEditMode = (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {@@ -81,7 +85,9 @@ export const TopNavbar: React.FC<TopNavbarProps> = () => {New<MenubarShortcut>⌘T</MenubarShortcut></MenubarItem>- <MenubarItem>Open</MenubarItem>+ <MenubarItem onClick={openDiagram}>+ Open+ </MenubarItem><MenubarSeparator /><MenubarItem onClick={exportSql}>Export