Skip to content

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

fix: filter to default schema on load new diagram (#849)

Guy Ben-Aharon712bdf5b9589
diff --git a/src/context/diagram-filter-context/diagram-filter-context.tsx b/src/context/diagram-filter-context/diagram-filter-context.tsx
index 1a51d6e3..23e604a3 100644
--- a/src/context/diagram-filter-context/diagram-filter-context.tsx
+++ b/src/context/diagram-filter-context/diagram-filter-context.tsx
@@ -8,6 +8,7 @@ import { createContext } from 'react';
export interface DiagramFilterContext {
filter?: DiagramFilter;
+ loading: boolean;
hasActiveFilter: boolean;
schemasDisplayed: DBSchema[];
@@ -45,4 +46,5 @@ export const diagramFilterContext = createContext<DiagramFilterContext>({
schemasDisplayed: [],
addTablesToFilter: emptyFn,
removeTablesFromFilter: emptyFn,
+ loading: false,
});
diff --git a/src/context/diagram-filter-context/diagram-filter-provider.tsx b/src/context/diagram-filter-context/diagram-filter-provider.tsx
index b59d73dc..981a8994 100644
--- a/src/context/diagram-filter-context/diagram-filter-provider.tsx
+++ b/src/context/diagram-filter-context/diagram-filter-provider.tsx
@@ -28,6 +28,7 @@ export const DiagramFilterProvider: React.FC<React.PropsWithChildren> = ({
const { diagramId, tables, schemas, databaseType, events } = useChartDB();
const { getDiagramFilter, updateDiagramFilter } = useStorage();
const [filter, setFilter] = useState<DiagramFilter>({});
+ const [loading, setLoading] = useState<boolean>(true);
const allSchemasIds = useMemo(() => {
return schemas.map((schema) => schema.id);
@@ -62,11 +63,26 @@ export const DiagramFilterProvider: React.FC<React.PropsWithChildren> = ({
return;
}
+ setLoading(true);
+
const loadFilterFromStorage = async (diagramId: string) => {
if (diagramId) {
const storedFilter = await getDiagramFilter(diagramId);
- setFilter(storedFilter ?? {});
+
+ let filterToSet = storedFilter;
+
+ if (!filterToSet) {
+ // If no filter is stored, set default based on database type
+ filterToSet =
+ schemas.length > 0
+ ? { schemaIds: [schemas[0].id] }
+ : {};
+ }
+
+ setFilter(filterToSet);
}
+
+ setLoading(false);
};
setFilter({});
@@ -75,7 +91,7 @@ export const DiagramFilterProvider: React.FC<React.PropsWithChildren> = ({
loadFilterFromStorage(diagramId);
diagramIdOfLoadedFilter.current = diagramId;
}
- }, [diagramId, getDiagramFilter]);
+ }, [diagramId, getDiagramFilter, schemas]);
const clearSchemaIds: DiagramFilterContext['clearSchemaIdsFilter'] =
useCallback(() => {
@@ -500,6 +516,7 @@ export const DiagramFilterProvider: React.FC<React.PropsWithChildren> = ({
events.useSubscription(eventConsumer);
const value: DiagramFilterContext = {
+ loading,
filter,
clearSchemaIdsFilter: clearSchemaIds,
setTableIdsFilterEmpty: setTableIdsEmpty,
diff --git a/src/context/storage-context/storage-provider.tsx b/src/context/storage-context/storage-provider.tsx
index 709df61a..b5ff2622 100644
--- a/src/context/storage-context/storage-provider.tsx
+++ b/src/context/storage-context/storage-provider.tsx
@@ -245,7 +245,9 @@ export const StorageProvider: React.FC<React.PropsWithChildren> = ({
const getDiagramFilter: StorageContext['getDiagramFilter'] = useCallback(
async (diagramId: string): Promise<DiagramFilter | undefined> => {
- return await db.diagram_filters.get({ diagramId });
+ const filter = await db.diagram_filters.get({ diagramId });
+
+ return filter;
},
[db]
);
diff --git a/src/pages/editor-page/canvas/canvas.tsx b/src/pages/editor-page/canvas/canvas.tsx
index 9bb7df8b..4d2038c0 100644
--- a/src/pages/editor-page/canvas/canvas.tsx
+++ b/src/pages/editor-page/canvas/canvas.tsx
@@ -122,9 +122,11 @@ const tableToTableNode = (
{
filter,
databaseType,
+ filterLoading,
}: {
filter?: DiagramFilter;
databaseType: DatabaseType;
+ filterLoading: boolean;
}
): TableNodeType => {
// Always use absolute position for now
@@ -139,11 +141,12 @@ const tableToTableNode = (
isOverlapping: false,
},
width: table.width ?? MIN_TABLE_SIZE,
- hidden: !filterTable({
- table: { id: table.id, schema: table.schema },
- filter,
- options: { defaultSchema: defaultSchemas[databaseType] },
- }),
+ hidden:
+ !filterTable({
+ table: { id: table.id, schema: table.schema },
+ filter,
+ options: { defaultSchema: defaultSchemas[databaseType] },
+ }) || filterLoading,
};
};
@@ -153,10 +156,12 @@ const areaToAreaNode = (
tables,
filter,
databaseType,
+ filterLoading,
}: {
tables: DBTable[];
filter?: DiagramFilter;
databaseType: DatabaseType;
+ filterLoading: boolean;
}
): AreaNodeType => {
// Get all tables in this area
@@ -183,7 +188,7 @@ const areaToAreaNode = (
width: area.width,
height: area.height,
zIndex: -10,
- hidden: !hasVisibleTable,
+ hidden: !hasVisibleTable || filterLoading,
};
};
@@ -235,13 +240,13 @@ export const Canvas: React.FC<CanvasProps> = ({ initialTables }) => {
showFilter,
setShowFilter,
} = useCanvas();
- const { filter } = useDiagramFilter();
+ const { filter, loading: filterLoading } = useDiagramFilter();
const [isInitialLoadingNodes, setIsInitialLoadingNodes] = useState(true);
const [nodes, setNodes, onNodesChange] = useNodesState<NodeType>(
initialTables.map((table) =>
- tableToTableNode(table, { filter, databaseType })
+ tableToTableNode(table, { filter, databaseType, filterLoading })
)
);
const [edges, setEdges, onEdgesChange] =
@@ -255,12 +260,12 @@ export const Canvas: React.FC<CanvasProps> = ({ initialTables }) => {
useEffect(() => {
const initialNodes = initialTables.map((table) =>
- tableToTableNode(table, { filter, databaseType })
+ tableToTableNode(table, { filter, databaseType, filterLoading })
);
if (equal(initialNodes, nodes)) {
setIsInitialLoadingNodes(false);
}
- }, [initialTables, nodes, filter, databaseType]);
+ }, [initialTables, nodes, filter, databaseType, filterLoading]);
useEffect(() => {
if (!isInitialLoadingNodes) {
@@ -426,6 +431,7 @@ export const Canvas: React.FC<CanvasProps> = ({ initialTables }) => {
const node = tableToTableNode(table, {
filter,
databaseType,
+ filterLoading,
});
// Check if table uses the highlighted custom type
@@ -448,7 +454,12 @@ export const Canvas: React.FC<CanvasProps> = ({ initialTables }) => {
};
}),
...areas.map((area) =>
- areaToAreaNode(area, { tables, filter, databaseType })
+ areaToAreaNode(area, {
+ tables,
+ filter,
+ databaseType,
+ filterLoading,
+ })
),
];
@@ -469,6 +480,7 @@ export const Canvas: React.FC<CanvasProps> = ({ initialTables }) => {
overlapGraph.graph,
highlightOverlappingTables,
highlightedCustomType,
+ filterLoading,
]);
const prevFilter = useRef<DiagramFilter | undefined>(undefined);