Skip to content

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

fix(open diagram): in case there is no diagram, opens the dialog (#593)

Guy Ben-Aharon68f48190c93f
diff --git a/src/context/dialog-context/dialog-context.tsx b/src/context/dialog-context/dialog-context.tsx
index def7a6f1..6e4b1a9f 100644
--- a/src/context/dialog-context/dialog-context.tsx
+++ b/src/context/dialog-context/dialog-context.tsx
@@ -8,6 +8,7 @@ import type { ExportDiagramDialogProps } from '@/dialogs/export-diagram-dialog/e
import type { ImportDiagramDialogProps } from '@/dialogs/import-diagram-dialog/import-diagram-dialog';
import type { CreateRelationshipDialogProps } from '@/dialogs/create-relationship-dialog/create-relationship-dialog';
import type { ImportDBMLDialogProps } from '@/dialogs/import-dbml-dialog/import-dbml-dialog';
+import type { OpenDiagramDialogProps } from '@/dialogs/open-diagram-dialog/open-diagram-dialog';
export interface DialogContext {
// Create diagram dialog
@@ -15,7 +16,9 @@ export interface DialogContext {
closeCreateDiagramDialog: () => void;
// Open diagram dialog
- openOpenDiagramDialog: () => void;
+ openOpenDiagramDialog: (
+ params?: Omit<OpenDiagramDialogProps, 'dialog'>
+ ) => void;
closeOpenDiagramDialog: () => void;
// Export SQL dialog
diff --git a/src/context/dialog-context/dialog-provider.tsx b/src/context/dialog-context/dialog-provider.tsx
index b0d8c60f..32cafadf 100644
--- a/src/context/dialog-context/dialog-provider.tsx
+++ b/src/context/dialog-context/dialog-provider.tsx
@@ -2,6 +2,7 @@ import React, { useCallback, useState } from 'react';
import type { DialogContext } from './dialog-context';
import { dialogContext } from './dialog-context';
import { CreateDiagramDialog } from '@/dialogs/create-diagram-dialog/create-diagram-dialog';
+import type { OpenDiagramDialogProps } from '@/dialogs/open-diagram-dialog/open-diagram-dialog';
import { OpenDiagramDialog } from '@/dialogs/open-diagram-dialog/open-diagram-dialog';
import type { ExportSQLDialogProps } from '@/dialogs/export-sql-dialog/export-sql-dialog';
import { ExportSQLDialog } from '@/dialogs/export-sql-dialog/export-sql-dialog';
@@ -27,6 +28,17 @@ export const DialogProvider: React.FC<React.PropsWithChildren> = ({
}) => {
const [openNewDiagramDialog, setOpenNewDiagramDialog] = useState(false);
const [openOpenDiagramDialog, setOpenOpenDiagramDialog] = useState(false);
+ const [openDiagramDialogParams, setOpenDiagramDialogParams] =
+ useState<Omit<OpenDiagramDialogProps, 'dialog'>>();
+
+ const openOpenDiagramDialogHandler: DialogContext['openOpenDiagramDialog'] =
+ useCallback(
+ (props) => {
+ setOpenDiagramDialogParams(props);
+ setOpenOpenDiagramDialog(true);
+ },
+ [setOpenOpenDiagramDialog]
+ );
const [openCreateRelationshipDialog, setOpenCreateRelationshipDialog] =
useState(false);
@@ -120,7 +132,7 @@ export const DialogProvider: React.FC<React.PropsWithChildren> = ({
value={{
openCreateDiagramDialog: () => setOpenNewDiagramDialog(true),
closeCreateDiagramDialog: () => setOpenNewDiagramDialog(false),
- openOpenDiagramDialog: () => setOpenOpenDiagramDialog(true),
+ openOpenDiagramDialog: openOpenDiagramDialogHandler,
closeOpenDiagramDialog: () => setOpenOpenDiagramDialog(false),
openExportSQLDialog: openExportSQLDialogHandler,
closeExportSQLDialog: () => setOpenExportSQLDialog(false),
@@ -154,7 +166,10 @@ export const DialogProvider: React.FC<React.PropsWithChildren> = ({
>
{children}
<CreateDiagramDialog dialog={{ open: openNewDiagramDialog }} />
- <OpenDiagramDialog dialog={{ open: openOpenDiagramDialog }} />
+ <OpenDiagramDialog
+ dialog={{ open: openOpenDiagramDialog }}
+ {...openDiagramDialogParams}
+ />
<ExportSQLDialog
dialog={{ open: openExportSQLDialog }}
{...exportSQLDialogParams}
diff --git a/src/context/keyboard-shortcuts-context/keyboard-shortcuts-provider.tsx b/src/context/keyboard-shortcuts-context/keyboard-shortcuts-provider.tsx
index 59deb4e7..4214fb7c 100644
--- a/src/context/keyboard-shortcuts-context/keyboard-shortcuts-provider.tsx
+++ b/src/context/keyboard-shortcuts-context/keyboard-shortcuts-provider.tsx
@@ -39,7 +39,7 @@ export const KeyboardShortcutsProvider: React.FC<React.PropsWithChildren> = ({
useHotkeys(
keyboardShortcutsForOS[KeyboardShortcutAction.OPEN_DIAGRAM]
.keyCombination,
- openOpenDiagramDialog,
+ () => openOpenDiagramDialog(),
{
preventDefault: true,
},
diff --git a/src/dialogs/open-diagram-dialog/open-diagram-dialog.tsx b/src/dialogs/open-diagram-dialog/open-diagram-dialog.tsx
index 0d0e9b4c..72ffbfae 100644
--- a/src/dialogs/open-diagram-dialog/open-diagram-dialog.tsx
+++ b/src/dialogs/open-diagram-dialog/open-diagram-dialog.tsx
@@ -28,10 +28,13 @@ import { useNavigate } from 'react-router-dom';
import type { BaseDialogProps } from '../common/base-dialog-props';
import { useDebounce } from '@/hooks/use-debounce';
-export interface OpenDiagramDialogProps extends BaseDialogProps {}
+export interface OpenDiagramDialogProps extends BaseDialogProps {
+ canClose?: boolean;
+}
export const OpenDiagramDialog: React.FC<OpenDiagramDialogProps> = ({
dialog,
+ canClose = true,
}) => {
const { closeOpenDiagramDialog } = useDialog();
const { t } = useTranslation();
@@ -122,14 +125,14 @@ export const OpenDiagramDialog: React.FC<OpenDiagramDialogProps> = ({
<Dialog
{...dialog}
onOpenChange={(open) => {
- if (!open) {
+ if (!open && canClose) {
closeOpenDiagramDialog();
}
}}
>
<DialogContent
className="flex h-[30rem] max-h-screen flex-col overflow-y-auto md:min-w-[80vw] xl:min-w-[55vw]"
- showClose
+ showClose={canClose}
>
<DialogHeader>
<DialogTitle>{t('open_diagram_dialog.title')}</DialogTitle>
@@ -226,11 +229,15 @@ export const OpenDiagramDialog: React.FC<OpenDiagramDialogProps> = ({
</DialogInternalContent>
<DialogFooter className="flex !justify-between gap-2">
- <DialogClose asChild>
- <Button type="button" variant="secondary">
- {t('open_diagram_dialog.cancel')}
- </Button>
- </DialogClose>
+ {canClose ? (
+ <DialogClose asChild>
+ <Button type="button" variant="secondary">
+ {t('open_diagram_dialog.cancel')}
+ </Button>
+ </DialogClose>
+ ) : (
+ <div />
+ )}
<DialogClose asChild>
<Button
type="submit"
diff --git a/src/pages/editor-page/use-diagram-loader.tsx b/src/pages/editor-page/use-diagram-loader.tsx
index 76ae1bea..77380ff6 100644
--- a/src/pages/editor-page/use-diagram-loader.tsx
+++ b/src/pages/editor-page/use-diagram-loader.tsx
@@ -5,20 +5,22 @@ import { useFullScreenLoader } from '@/hooks/use-full-screen-spinner';
import { useRedoUndoStack } from '@/hooks/use-redo-undo-stack';
import { useStorage } from '@/hooks/use-storage';
import type { Diagram } from '@/lib/domain/diagram';
-import { useEffect, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
export const useDiagramLoader = () => {
const [initialDiagram, setInitialDiagram] = useState<Diagram | undefined>();
const { diagramId } = useParams<{ diagramId: string }>();
- const { config, updateConfig } = useConfig();
+ const { config } = useConfig();
const { loadDiagram, currentDiagram } = useChartDB();
const { resetRedoStack, resetUndoStack } = useRedoUndoStack();
const { showLoader, hideLoader } = useFullScreenLoader();
- const { openCreateDiagramDialog } = useDialog();
+ const { openCreateDiagramDialog, openOpenDiagramDialog } = useDialog();
const navigate = useNavigate();
const { listDiagrams } = useStorage();
+ const currentDiagramLoadingRef = useRef<string | undefined>(undefined);
+
useEffect(() => {
if (!config) {
return;
@@ -36,40 +38,41 @@ export const useDiagramLoader = () => {
resetUndoStack();
const diagram = await loadDiagram(diagramId);
if (!diagram) {
- if (currentDiagram?.id) {
- await updateConfig({
- defaultDiagramId: currentDiagram.id,
- });
- navigate(`/diagrams/${currentDiagram.id}`);
- } else {
- navigate('/');
- }
+ openOpenDiagramDialog({ canClose: false });
+ hideLoader();
+ return;
}
+
setInitialDiagram(diagram);
hideLoader();
} else if (!diagramId && config.defaultDiagramId) {
+ currentDiagramLoadingRef.current = diagramId;
const diagram = await loadDiagram(config.defaultDiagramId);
if (!diagram) {
- await updateConfig({
- defaultDiagramId: '',
- });
- navigate('/');
- } else {
- navigate(`/diagrams/${config.defaultDiagramId}`);
+ openOpenDiagramDialog({ canClose: false });
+ hideLoader();
+ return;
}
+ navigate(`/diagrams/${config.defaultDiagramId}`);
} else {
const diagrams = await listDiagrams();
if (diagrams.length > 0) {
- const defaultDiagramId = diagrams[0].id;
- await updateConfig({ defaultDiagramId });
- navigate(`/diagrams/${defaultDiagramId}`);
+ openOpenDiagramDialog({ canClose: false });
} else {
openCreateDiagramDialog();
}
}
};
+ if (
+ currentDiagramLoadingRef.current === (diagramId ?? '') &&
+ currentDiagramLoadingRef.current !== undefined
+ ) {
+ return;
+ }
+
loadDefaultDiagram();
+ currentDiagramLoadingRef.current = diagramId ?? '';
}, [
diagramId,
openCreateDiagramDialog,
@@ -82,7 +85,7 @@ export const useDiagramLoader = () => {
hideLoader,
showLoader,
currentDiagram?.id,
- updateConfig,
+ openOpenDiagramDialog,
]);
return { initialDiagram };