Skip to content

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

fix(core): fix update diagram id (#477)

Guy Ben-Aharon348f80568e0f
diff --git a/src/components/diagram-icon/diagram-icon.tsx b/src/components/diagram-icon/diagram-icon.tsx
index 773ec82a..5fa0783a 100644
--- a/src/components/diagram-icon/diagram-icon.tsx
+++ b/src/components/diagram-icon/diagram-icon.tsx
@@ -25,7 +25,7 @@ export const DiagramIcon = React.forwardRef<
>(({ databaseType, databaseEdition, className, imgClassName }, ref) =>
databaseEdition ? (
<Tooltip>
- <TooltipTrigger className={cn('mr-1', className)} ref={ref}>
+ <TooltipTrigger className={cn('mr-1', className)} ref={ref} asChild>
<img
src={databaseEditionToImageMap[databaseEdition]}
className={cn('h-5 max-w-fit rounded-full', imgClassName)}
@@ -38,7 +38,7 @@ export const DiagramIcon = React.forwardRef<
</Tooltip>
) : (
<Tooltip>
- <TooltipTrigger className={cn('mr-2', className)} ref={ref}>
+ <TooltipTrigger className={cn('mr-2', className)} ref={ref} asChild>
<img
src={databaseSecondaryLogoMap[databaseType]}
className={cn('h-5 max-w-fit', imgClassName)}
diff --git a/src/context/storage-context/storage-provider.tsx b/src/context/storage-context/storage-provider.tsx
index 53086fce..5a0e1e0d 100644
--- a/src/context/storage-context/storage-provider.tsx
+++ b/src/context/storage-context/storage-provider.tsx
@@ -282,6 +282,23 @@ export const StorageProvider: React.FC<React.PropsWithChildren> = ({
attributes: Partial<Diagram>;
}) => {
await db.diagrams.update(id, attributes);
+
+ if (attributes.id) {
+ await Promise.all([
+ db.db_tables
+ .where('diagramId')
+ .equals(id)
+ .modify({ diagramId: attributes.id }),
+ db.db_relationships
+ .where('diagramId')
+ .equals(id)
+ .modify({ diagramId: attributes.id }),
+ db.db_dependencies
+ .where('diagramId')
+ .equals(id)
+ .modify({ diagramId: attributes.id }),
+ ]);
+ }
};
const deleteDiagram: StorageContext['deleteDiagram'] = async (
diff --git a/src/pages/editor-page/editor-page.tsx b/src/pages/editor-page/editor-page.tsx
index 7dee7ecb..be124d03 100644
--- a/src/pages/editor-page/editor-page.tsx
+++ b/src/pages/editor-page/editor-page.tsx
@@ -93,7 +93,14 @@ const EditorPageComponent: React.FC = () => {
resetUndoStack();
const diagram = await loadDiagram(diagramId);
if (!diagram) {
- navigate('/');
+ if (currentDiagram?.id) {
+ await updateConfig({
+ defaultDiagramId: currentDiagram.id,
+ });
+ navigate(`/diagrams/${currentDiagram.id}`);
+ } else {
+ navigate('/');
+ }
}
setInitialDiagram(diagram);
hideLoader();