Skip to content

Database diagrams editor that allows you to visualize and design your DB with a single query.

set table location on creation

Guy Ben-Aharonf6bc2a394d5c
diff --git a/src/context/chartdb-context/chartdb-context.tsx b/src/context/chartdb-context/chartdb-context.tsx
index 9825f610..4f36dade 100644
--- a/src/context/chartdb-context/chartdb-context.tsx
+++ b/src/context/chartdb-context/chartdb-context.tsx
@@ -37,7 +37,9 @@ export interface ChartDBContext {
updateDatabaseEdition: (databaseEdition?: DatabaseEdition) => Promise<void>;
// Table operations
- createTable: () => Promise<DBTable>;
+ createTable: (
+ attributes?: Partial<Omit<DBTable, 'id'>>
+ ) => Promise<DBTable>;
addTable: (
table: DBTable,
options?: { updateHistory: boolean }
@@ -126,12 +128,6 @@ export interface ChartDBContext {
relationship: Partial<DBRelationship>,
options?: { updateHistory: boolean }
) => Promise<void>;
-
- updateViewport: (viewport: {
- x: number;
- y: number;
- zoom: number;
- }) => Promise<void>;
}
export const chartDBContext = createContext<ChartDBContext>({
@@ -170,7 +166,6 @@ export const chartDBContext = createContext<ChartDBContext>({
removeTable: emptyFn,
updateTable: emptyFn,
updateTablesState: emptyFn,
- updateViewport: emptyFn,
// Field operations
updateField: emptyFn,
diff --git a/src/context/chartdb-context/chartdb-provider.tsx b/src/context/chartdb-context/chartdb-provider.tsx
index bedfa010..7e721fdd 100644
--- a/src/context/chartdb-context/chartdb-provider.tsx
+++ b/src/context/chartdb-context/chartdb-provider.tsx
@@ -16,7 +16,6 @@ import { DatabaseEdition } from '@/lib/domain/database-edition';
import { DBSchema, schemaNameToSchemaId } from '@/lib/domain/db-schema';
import { useLocalConfig } from '@/hooks/use-local-config';
import { defaultSchemas } from '@/lib/data/default-schemas';
-import { useLayout } from '@/hooks/use-layout';
export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({
children,
@@ -39,8 +38,6 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({
>();
const [tables, setTables] = useState<DBTable[]>([]);
const [relationships, setRelationships] = useState<DBRelationship[]>([]);
- const [viewport, setViewport] = useState({ x: 0, y: 0, zoom: 1 });
- const { openTableFromSidebar } = useLayout();
const defaultSchemaName = defaultSchemas[databaseType];
@@ -278,40 +275,39 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({
[db, diagramId, setTables, addUndoAction, resetRedoStack]
);
- const createTable: ChartDBContext['createTable'] = useCallback(async () => {
- const padding = 150; // Add some padding from the edge
- const centerX = -viewport.x / viewport.zoom + padding / viewport.zoom;
- const centerY = -viewport.y / viewport.zoom + padding / viewport.zoom;
-
- const table: DBTable = {
- id: generateId(),
- name: `table_${tables.length + 1}`,
- x: centerX,
- y: centerY,
- fields: [
- {
- id: generateId(),
- name: 'id',
- type:
- databaseType === DatabaseType.SQLITE
- ? { id: 'integer', name: 'integer' }
- : { id: 'bigint', name: 'bigint' },
- unique: true,
- nullable: false,
- primaryKey: true,
- createdAt: Date.now(),
- },
- ],
- indexes: [],
- color: randomColor(),
- createdAt: Date.now(),
- isView: false,
- };
- await addTable(table);
- openTableFromSidebar(table.id);
-
- return table;
- }, [viewport, tables.length, databaseType, addTable, openTableFromSidebar]);
+ const createTable: ChartDBContext['createTable'] = useCallback(
+ async (attributes) => {
+ const table: DBTable = {
+ id: generateId(),
+ name: `table_${tables.length + 1}`,
+ x: 0,
+ y: 0,
+ fields: [
+ {
+ id: generateId(),
+ name: 'id',
+ type:
+ databaseType === DatabaseType.SQLITE
+ ? { id: 'integer', name: 'integer' }
+ : { id: 'bigint', name: 'bigint' },
+ unique: true,
+ nullable: false,
+ primaryKey: true,
+ createdAt: Date.now(),
+ },
+ ],
+ indexes: [],
+ color: randomColor(),
+ createdAt: Date.now(),
+ isView: false,
+ ...attributes,
+ };
+ await addTable(table);
+
+ return table;
+ },
+ [addTable, tables, databaseType]
+ );
const getTable: ChartDBContext['getTable'] = useCallback(
(id: string) => tables.find((table) => table.id === id) ?? null,
@@ -1129,13 +1125,6 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({
]
);
- const updateViewport = useCallback(
- async (newViewport: { x: number; y: number; zoom: number }) => {
- setViewport(newViewport);
- },
- []
- );
-
return (
<chartDBContext.Provider
value={{
@@ -1179,7 +1168,6 @@ export const ChartDBProvider: React.FC<React.PropsWithChildren> = ({
removeRelationship,
removeRelationships,
updateRelationship,
- updateViewport,
}}
>
{children}
diff --git a/src/pages/editor-page/canvas/canvas.tsx b/src/pages/editor-page/canvas/canvas.tsx
index 39ec37d2..b1122e59 100644
--- a/src/pages/editor-page/canvas/canvas.tsx
+++ b/src/pages/editor-page/canvas/canvas.tsx
@@ -14,7 +14,6 @@ import {
NodeDimensionChange,
OnEdgesChange,
OnNodesChange,
- useViewport,
} from '@xyflow/react';
import '@xyflow/react/dist/style.css';
import equal from 'fast-deep-equal';
@@ -92,12 +91,6 @@ export const Canvas: React.FC<CanvasProps> = ({ initialTables }) => {
const nodeTypes = useMemo(() => ({ table: TableNode }), []);
const edgeTypes = useMemo(() => ({ 'table-edge': TableEdge }), []);
const [isInitialLoadingNodes, setIsInitialLoadingNodes] = useState(true);
- const { x, y, zoom } = useViewport();
- const { updateViewport } = useChartDB();
-
- useEffect(() => {
- updateViewport({ x, y, zoom });
- }, [x, y, zoom, updateViewport]);
const [nodes, setNodes, onNodesChange] = useNodesState<TableNodeType>(
initialTables.map((table) => tableToTableNode(table, filteredSchemas))
diff --git a/src/pages/editor-page/side-panel/tables-section/table-list/table-list.tsx b/src/pages/editor-page/side-panel/tables-section/table-list/table-list.tsx
index 522e36a4..fc3786dc 100644
--- a/src/pages/editor-page/side-panel/tables-section/table-list/table-list.tsx
+++ b/src/pages/editor-page/side-panel/tables-section/table-list/table-list.tsx
@@ -29,9 +29,7 @@ export const TableList: React.FC<TableListProps> = ({ tables }) => {
useEffect(() => {
if (openedTableInSidebar) {
- setTimeout(() => {
- scrollToTable(openedTableInSidebar);
- }, 100);
+ scrollToTable(openedTableInSidebar);
}
}, [openedTableInSidebar, scrollToTable]);
diff --git a/src/pages/editor-page/side-panel/tables-section/tables-section.tsx b/src/pages/editor-page/side-panel/tables-section/tables-section.tsx
index 73bac138..a81fb854 100644
--- a/src/pages/editor-page/side-panel/tables-section/tables-section.tsx
+++ b/src/pages/editor-page/side-panel/tables-section/tables-section.tsx
@@ -15,13 +15,15 @@ import {
TooltipContent,
TooltipTrigger,
} from '@/components/tooltip/tooltip';
+import { useViewport } from '@xyflow/react';
export interface TablesSectionProps {}
export const TablesSection: React.FC<TablesSectionProps> = () => {
const { createTable, tables, filteredSchemas } = useChartDB();
+ const viewport = useViewport();
const { t } = useTranslation();
- const { closeAllTablesInSidebar } = useLayout();
+ const { closeAllTablesInSidebar, openTableFromSidebar } = useLayout();
const [filterText, setFilterText] = React.useState('');
const filteredTables = useMemo(() => {
@@ -36,8 +38,16 @@ export const TablesSection: React.FC<TablesSectionProps> = () => {
}, [tables, filterText, filteredSchemas]);
const handleCreateTable = async () => {
- await createTable();
- setFilterText(''); // Clear the filter to ensure the new table is visible
+ setFilterText('');
+ const padding = 150;
+ const centerX = -viewport.x / viewport.zoom + padding / viewport.zoom;
+ const centerY = -viewport.y / viewport.zoom + padding / viewport.zoom;
+
+ const table = await createTable({
+ x: centerX,
+ y: centerY,
+ });
+ openTableFromSidebar(table.id);
};
return (