Skip to content

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

fix sizes & storage for hiding/showing cardinality

Guy Ben-Aharonfef70e04bff6
diff --git a/src/context/local-config-context/local-config-context.tsx b/src/context/local-config-context/local-config-context.tsx
index 0e689786..287b8f6e 100644
--- a/src/context/local-config-context/local-config-context.tsx
+++ b/src/context/local-config-context/local-config-context.tsx
@@ -15,6 +15,9 @@ export interface LocalConfigContext {
schemasFilter: SchemasFilter;
setSchemasFilter: React.Dispatch<React.SetStateAction<SchemasFilter>>;
+
+ showCardinality: boolean;
+ setShowCardinality: (showCardinality: boolean) => void;
}
export const LocalConfigContext = createContext<LocalConfigContext>({
@@ -26,4 +29,7 @@ export const LocalConfigContext = createContext<LocalConfigContext>({
schemasFilter: {},
setSchemasFilter: emptyFn,
+
+ showCardinality: true,
+ setShowCardinality: emptyFn,
});
diff --git a/src/context/local-config-context/local-config-provider.tsx b/src/context/local-config-context/local-config-provider.tsx
index 0e40c28a..b22cc379 100644
--- a/src/context/local-config-context/local-config-provider.tsx
+++ b/src/context/local-config-context/local-config-provider.tsx
@@ -6,35 +6,48 @@ import {
} from './local-config-context';
import { Theme } from '../theme-context/theme-context';
+const themeKey = 'theme';
+const scrollActionKey = 'scroll_action';
+const schemasFilterKey = 'schemas_filter';
+const showCardinalityKey = 'show_cardinality';
+
export const LocalConfigProvider: React.FC<React.PropsWithChildren> = ({
children,
}) => {
const [theme, setTheme] = React.useState<Theme>(
- (localStorage.getItem('theme') as Theme) || 'system'
+ (localStorage.getItem(themeKey) as Theme) || 'system'
);
const [scrollAction, setScrollAction] = React.useState<ScrollAction>(
- (localStorage.getItem('scroll_action') as ScrollAction) || 'pan'
+ (localStorage.getItem(scrollActionKey) as ScrollAction) || 'pan'
);
const [schemasFilter, setSchemasFilter] = React.useState<SchemasFilter>(
JSON.parse(
- localStorage.getItem('schemas_filter') || '{}'
+ localStorage.getItem(schemasFilterKey) || '{}'
) as SchemasFilter
);
+ const [showCardinality, setShowCardinality] = React.useState<boolean>(
+ (localStorage.getItem(showCardinalityKey) || 'true') === 'true'
+ );
+
useEffect(() => {
- localStorage.setItem('theme', theme);
+ localStorage.setItem(themeKey, theme);
}, [theme]);
useEffect(() => {
- localStorage.setItem('scroll_action', scrollAction);
+ localStorage.setItem(scrollActionKey, scrollAction);
}, [scrollAction]);
useEffect(() => {
- localStorage.setItem('schemas_filter', JSON.stringify(schemasFilter));
+ localStorage.setItem(schemasFilterKey, JSON.stringify(schemasFilter));
}, [schemasFilter]);
+ useEffect(() => {
+ localStorage.setItem(showCardinalityKey, showCardinality.toString());
+ }, [showCardinality]);
+
return (
<LocalConfigContext.Provider
value={{
@@ -44,6 +57,8 @@ export const LocalConfigProvider: React.FC<React.PropsWithChildren> = ({
setScrollAction,
schemasFilter,
setSchemasFilter,
+ showCardinality,
+ setShowCardinality,
}}
>
{children}
diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts
index 8061c12f..49ed4cb5 100644
--- a/src/i18n/locales/en.ts
+++ b/src/i18n/locales/en.ts
@@ -23,6 +23,8 @@ export const en = {
view: 'View',
show_sidebar: 'Show Sidebar',
hide_sidebar: 'Hide Sidebar',
+ hide_cardinality: 'Hide Cardinality',
+ show_cardinality: 'Show Cardinality',
zoom_on_scroll: 'Zoom on Scroll',
theme: 'Theme',
change_language: 'Language',
diff --git a/src/i18n/locales/es.ts b/src/i18n/locales/es.ts
index 9dc8ed79..ff9930a0 100644
--- a/src/i18n/locales/es.ts
+++ b/src/i18n/locales/es.ts
@@ -21,6 +21,8 @@ export const es: LanguageTranslation = {
},
view: {
view: 'Ver',
+ hide_cardinality: 'Ocultar Cardinalidad',
+ show_cardinality: 'Mostrar Cardinalidad',
show_sidebar: 'Mostrar Barra Lateral',
hide_sidebar: 'Ocultar Barra Lateral',
zoom_on_scroll: 'Zoom al Desplazarse',
diff --git a/src/pages/editor-page/canvas/marker-definitions.tsx b/src/pages/editor-page/canvas/marker-definitions.tsx
index f3450e58..392f18d4 100644
--- a/src/pages/editor-page/canvas/marker-definitions.tsx
+++ b/src/pages/editor-page/canvas/marker-definitions.tsx
@@ -1,14 +1,21 @@
import React from 'react';
import { cn } from '@/lib/utils';
import { Cardinality } from '@/lib/domain/db-relationship';
+import { useLocalConfig } from '@/hooks/use-local-config';
export const MarkerDefinitions: React.FC = () => {
+ const { showCardinality } = useLocalConfig();
const cardinalityOptions: Record<Cardinality, string> = {
one: '1',
many: 'N',
};
const sideOptions: ('left' | 'right')[] = ['left', 'right'];
+
+ if (!showCardinality) {
+ return null;
+ }
+
return (
<svg className="absolute left-0 top-0 z-0 size-0">
<defs>
@@ -26,11 +33,11 @@ export const MarkerDefinitions: React.FC = () => {
<circle
cx="8"
cy="8"
- r="6"
+ r="5"
className={cn([
'fill-muted-foreground',
'stroke-background',
- 'stroke-[1.5]',
+ 'stroke-[0.5]',
])}
/>
<text
diff --git a/src/pages/editor-page/canvas/table-edge.tsx b/src/pages/editor-page/canvas/table-edge.tsx
index 73576220..7c4bb4f7 100644
--- a/src/pages/editor-page/canvas/table-edge.tsx
+++ b/src/pages/editor-page/canvas/table-edge.tsx
@@ -63,9 +63,9 @@ export const TableEdge: React.FC<EdgeProps<TableEdgeType>> = ({
const sourceWidth = sourceNode?.measured.width ?? 0;
const sourceLeftX =
- sourceHandle === 'left' ? sourceX - 1 : sourceX - sourceWidth - 10;
+ sourceHandle === 'left' ? sourceX + 3 : sourceX - sourceWidth - 10;
const sourceRightX =
- sourceHandle === 'left' ? sourceX + sourceWidth + 10 : sourceX;
+ sourceHandle === 'left' ? sourceX + sourceWidth + 9 : sourceX;
const targetWidth = targetNode?.measured.width ?? 0;
const targetLeftX = targetX - 1;
diff --git a/src/pages/editor-page/top-navbar/top-navbar.tsx b/src/pages/editor-page/top-navbar/top-navbar.tsx
index e99dc7ab..3060f051 100644
--- a/src/pages/editor-page/top-navbar/top-navbar.tsx
+++ b/src/pages/editor-page/top-navbar/top-navbar.tsx
@@ -66,7 +66,12 @@ export const TopNavbar: React.FC<TopNavbarProps> = () => {
} = useDialog();
const { setTheme, theme } = useTheme();
const { hideSidePanel, isSidePanelShowed, showSidePanel } = useLayout();
- const { scrollAction, setScrollAction } = useLocalConfig();
+ const {
+ scrollAction,
+ setScrollAction,
+ setShowCardinality,
+ showCardinality,
+ } = useLocalConfig();
const { effectiveTheme } = useTheme();
const { t, i18n } = useTranslation();
const { redo, undo, hasRedo, hasUndo } = useHistory();
@@ -278,6 +283,10 @@ export const TopNavbar: React.FC<TopNavbarProps> = () => {
}
}, [isSidePanelShowed, showSidePanel, hideSidePanel]);
+ const showOrHideCardinality = useCallback(() => {
+ setShowCardinality(!showCardinality);
+ }, [showCardinality, setShowCardinality]);
+
const emojiAI = '✨';
const changeLanguage = useCallback(
@@ -517,6 +526,11 @@ export const TopNavbar: React.FC<TopNavbarProps> = () => {
? t('menu.view.hide_sidebar')
: t('menu.view.show_sidebar')}
</MenubarItem>
+ <MenubarItem onClick={showOrHideCardinality}>
+ {showCardinality
+ ? t('menu.view.hide_cardinality')
+ : t('menu.view.show_cardinality')}
+ </MenubarItem>
<MenubarSeparator />
<MenubarSub>
<MenubarSubTrigger>