Database diagrams editor that allows you to visualize and design your DB with a single query.
TypeScript databasedbdb-migrationeditorerdmariadbmssqlmysqlpostgresqlreactreact-flowschema-migrationssqlsqlitetypescriptvisualizationxyflow
align filter (#890)
Guy Ben-Aharonac128d67de56
diff --git a/src/pages/editor-page/canvas/canvas-filter/canvas-filter.tsx b/src/pages/editor-page/canvas/canvas-filter/canvas-filter.tsxindex f53726ac..af76f282 100644--- a/src/pages/editor-page/canvas/canvas-filter/canvas-filter.tsx+++ b/src/pages/editor-page/canvas/canvas-filter/canvas-filter.tsx@@ -28,6 +28,7 @@ import { FilterItemActions } from './filter-item-actions';import { databasesWithSchemas } from '@/lib/domain';import { getOperatingSystem } from '@/lib/utils';import { useLocalConfig } from '@/hooks/use-local-config';+import { useDiff } from '@/context/diff-context/use-diff';export interface CanvasFilterProps {onClose: () => void;@@ -36,6 +37,7 @@ export interface CanvasFilterProps {export const CanvasFilter: React.FC<CanvasFilterProps> = ({ onClose }) => {const { t } = useTranslation();const { tables, databaseType, areas } = useChartDB();+ const { checkIfNewTable } = useDiff();const {filter,toggleSchemaFilter,@@ -58,13 +60,14 @@ export const CanvasFilter: React.FC<CanvasFilterProps> = ({ onClose }) => {() =>tables.filter((table) => (showDBViews ? true : !table.isView))+ .filter((table) => !checkIfNewTable({ tableId: table.id })).map((table) => ({id: table.id,name: table.name,schema: table.schema,parentAreaId: table.parentAreaId,})),- [tables, showDBViews]+ [tables, showDBViews, checkIfNewTable]);const databaseWithSchemas = useMemo(diff --git a/src/pages/editor-page/canvas/canvas.tsx b/src/pages/editor-page/canvas/canvas.tsxindex c1fa246b..6419371a 100644--- a/src/pages/editor-page/canvas/canvas.tsx+++ b/src/pages/editor-page/canvas/canvas.tsx@@ -95,6 +95,7 @@ import type { DiagramFilter } from '@/lib/domain/diagram-filter/diagram-filter';import { useDiagramFilter } from '@/context/diagram-filter-context/use-diagram-filter';import { filterTable } from '@/lib/domain/diagram-filter/filter';import { defaultSchemas } from '@/lib/data/default-schemas';+import { useDiff } from '@/context/diff-context/use-diff';const HIGHLIGHTED_EDGE_Z_INDEX = 1;const DEFAULT_EDGE_Z_INDEX = 0;@@ -124,16 +125,33 @@ const tableToTableNode = (databaseType,filterLoading,showDBViews,+ forceShow,}: {filter?: DiagramFilter;databaseType: DatabaseType;filterLoading: boolean;showDBViews?: boolean;+ forceShow?: boolean;}): TableNodeType => {// Always use absolute position for nowconst position = { x: table.x, y: table.y };+ let hidden = false;++ if (forceShow) {+ hidden = false;+ } else {+ hidden =+ !filterTable({+ table: { id: table.id, schema: table.schema },+ filter,+ options: { defaultSchema: defaultSchemas[databaseType] },+ }) ||+ filterLoading ||+ (!showDBViews && table.isView);+ }+return {id: table.id,type: 'table',@@ -143,14 +161,7 @@ const tableToTableNode = (isOverlapping: false,},width: table.width ?? MIN_TABLE_SIZE,- hidden:- !filterTable({- table: { id: table.id, schema: table.schema },- filter,- options: { defaultSchema: defaultSchemas[databaseType] },- }) ||- filterLoading ||- (!showDBViews && table.isView),+ hidden,};};@@ -244,6 +255,14 @@ export const Canvas: React.FC<CanvasProps> = ({ initialTables }) => {setShowFilter,} = useCanvas();const { filter, loading: filterLoading } = useDiagramFilter();+ const { checkIfNewTable } = useDiff();++ const shouldForceShowTable = useCallback(+ (tableId: string) => {+ return checkIfNewTable({ tableId });+ },+ [checkIfNewTable]+ );const [isInitialLoadingNodes, setIsInitialLoadingNodes] = useState(true);@@ -254,6 +273,7 @@ export const Canvas: React.FC<CanvasProps> = ({ initialTables }) => {databaseType,filterLoading,showDBViews,+ forceShow: shouldForceShowTable(table.id),})));@@ -273,6 +293,7 @@ export const Canvas: React.FC<CanvasProps> = ({ initialTables }) => {databaseType,filterLoading,showDBViews,+ forceShow: shouldForceShowTable(table.id),}));if (equal(initialNodes, nodes)) {@@ -285,6 +306,7 @@ export const Canvas: React.FC<CanvasProps> = ({ initialTables }) => {databaseType,filterLoading,showDBViews,+ shouldForceShowTable,]);useEffect(() => {@@ -445,6 +467,7 @@ export const Canvas: React.FC<CanvasProps> = ({ initialTables }) => {databaseType,filterLoading,showDBViews,+ forceShow: shouldForceShowTable(table.id),});// Check if table uses the highlighted custom type@@ -495,6 +518,7 @@ export const Canvas: React.FC<CanvasProps> = ({ initialTables }) => {highlightedCustomType,filterLoading,showDBViews,+ shouldForceShowTable,]);const prevFilter = useRef<DiagramFilter | undefined>(undefined);