Database diagrams editor that allows you to visualize and design your DB with a single query.
TypeScript databasedbdb-migrationeditorerdmariadbmssqlmysqlpostgresqlreactreact-flowschema-migrationssqlsqlitetypescriptvisualizationxyflow
fix(filter): filter toggle issues with no schemas dbs (#856)
Guy Ben-Aharond0dee8497021
diff --git a/src/context/diagram-filter-context/diagram-filter-provider.tsx b/src/context/diagram-filter-context/diagram-filter-provider.tsxindex b8d8c8a4..8ceadf7d 100644--- a/src/context/diagram-filter-context/diagram-filter-provider.tsx+++ b/src/context/diagram-filter-context/diagram-filter-provider.tsx@@ -205,7 +205,11 @@ export const DiagramFilterProvider: React.FC<React.PropsWithChildren> = ({schemaIds: newSchemaIds,tableIds: newTableIds,},- allTables satisfies FilterTableInfo[]+ allTables satisfies FilterTableInfo[],+ {+ databaseWithSchemas:+ databasesWithSchemas.includes(databaseType),+ });});},@@ -252,11 +256,15 @@ export const DiagramFilterProvider: React.FC<React.PropsWithChildren> = ({schemaIds: undefined,tableIds: newTableIds,},- allTables satisfies FilterTableInfo[]+ allTables satisfies FilterTableInfo[],+ {+ databaseWithSchemas:+ databasesWithSchemas.includes(databaseType),+ });});},- [allTables]+ [allTables, databaseType]);const toggleTableFilter: DiagramFilterContext['toggleTableFilter'] =@@ -340,7 +348,11 @@ export const DiagramFilterProvider: React.FC<React.PropsWithChildren> = ({schemaIds: newSchemaIds,tableIds: newTableIds,},- allTables satisfies FilterTableInfo[]+ allTables satisfies FilterTableInfo[],+ {+ databaseWithSchemas:+ databasesWithSchemas.includes(databaseType),+ });});},@@ -450,11 +462,15 @@ export const DiagramFilterProvider: React.FC<React.PropsWithChildren> = ({...filterByTableIds,tableIds: newTableIds,},- allTables satisfies FilterTableInfo[]+ allTables satisfies FilterTableInfo[],+ {+ databaseWithSchemas:+ databasesWithSchemas.includes(databaseType),+ });});},- [allTables]+ [allTables, databaseType]);const removeTablesFromFilter: DiagramFilterContext['removeTablesFromFilter'] =@@ -491,11 +507,15 @@ export const DiagramFilterProvider: React.FC<React.PropsWithChildren> = ({...filterByTableIds,tableIds: newTableIds,},- allTables satisfies FilterTableInfo[]+ allTables satisfies FilterTableInfo[],+ {+ databaseWithSchemas:+ databasesWithSchemas.includes(databaseType),+ });});},- [allTables]+ [allTables, databaseType]);const eventConsumer = useCallback(diff --git a/src/lib/domain/diagram-filter/diagram-filter.ts b/src/lib/domain/diagram-filter/diagram-filter.tsindex 84cdb915..9b2bcec0 100644--- a/src/lib/domain/diagram-filter/diagram-filter.ts+++ b/src/lib/domain/diagram-filter/diagram-filter.ts@@ -20,7 +20,8 @@ export interface FilterTableInfo {*/export function reduceFilter(filter: DiagramFilter,- tables: FilterTableInfo[]+ tables: FilterTableInfo[],+ options: { databaseWithSchemas: boolean }): DiagramFilter {let { schemaIds, tableIds } = filter;@@ -34,9 +35,9 @@ export function reduceFilter(}// Get all unique schema IDs from tables- const allSchemaIds = [- ...new Set(tables.filter((t) => t.schemaId).map((t) => t.schemaId!)),- ];+ const allSchemaIds = options.databaseWithSchemas+ ? [...new Set(tables.filter((t) => t.schemaId).map((t) => t.schemaId!))]+ : [];const allTableIds = tables.map((t) => t.id);// in case its db with no schemasdiff --git a/src/lib/domain/diagram-filter/filter.ts b/src/lib/domain/diagram-filter/filter.tsindex d10fff83..aaec3547 100644--- a/src/lib/domain/diagram-filter/filter.ts+++ b/src/lib/domain/diagram-filter/filter.ts@@ -1,4 +1,6 @@+import { defaultSchemas } from '@/lib/data/default-schemas';import { schemaNameToSchemaId } from '../db-schema';+import type { Diagram } from '../diagram';import type { DiagramFilter } from './diagram-filter';export const filterTable = ({@@ -70,3 +72,58 @@ export const filterRelationship = ({};export const filterDependency = filterRelationship;++export const applyFilterOnDiagram = ({+ diagram,+ filter,+}: {+ diagram: Diagram;+ filter: DiagramFilter;+}): Diagram => {+ const defaultSchema = defaultSchemas[diagram.databaseType];+ const filteredTables = diagram.tables?.filter((table) =>+ filterTable({+ table: { id: table.id, schema: table.schema },+ filter,+ options: { defaultSchema },+ })+ );++ const filteredRelationships = diagram.relationships?.filter(+ (relationship) =>+ filterRelationship({+ tableA: {+ id: relationship.sourceTableId,+ schema: relationship.sourceSchema,+ },+ tableB: {+ id: relationship.targetTableId,+ schema: relationship.targetSchema,+ },+ filter,+ options: { defaultSchema },+ })+ );++ const filteredDependencies = diagram.dependencies?.filter((dependency) =>+ filterDependency({+ tableA: {+ id: dependency.tableId,+ schema: dependency.schema,+ },+ tableB: {+ id: dependency.dependentTableId,+ schema: dependency.dependentSchema,+ },+ filter,+ options: { defaultSchema },+ })+ );++ return {+ ...diagram,+ tables: filteredTables,+ relationships: filteredRelationships,+ dependencies: filteredDependencies,+ };+};