Skip to content

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

add selection indication for cardinality

Guy Ben-Aharon47ff7b1564ed
diff --git a/src/pages/editor-page/canvas/canvas-utils.ts b/src/pages/editor-page/canvas/canvas-utils.ts
new file mode 100644
index 00000000..c0e83c2a
--- /dev/null
+++ b/src/pages/editor-page/canvas/canvas-utils.ts
@@ -0,0 +1,12 @@
+import { Cardinality } from '@/lib/domain/db-relationship';
+
+export const getCardinalityMarkerId = ({
+ cardinality,
+ selected,
+ side,
+}: {
+ cardinality: Cardinality;
+ selected: boolean;
+ side: 'left' | 'right';
+}) =>
+ `cardinality_${selected ? 'selected' : 'not_selected'}_${cardinality}_${side}`;
diff --git a/src/pages/editor-page/canvas/marker-definitions.tsx b/src/pages/editor-page/canvas/marker-definitions.tsx
index 392f18d4..1db41fc3 100644
--- a/src/pages/editor-page/canvas/marker-definitions.tsx
+++ b/src/pages/editor-page/canvas/marker-definitions.tsx
@@ -2,6 +2,7 @@ import React from 'react';
import { cn } from '@/lib/utils';
import { Cardinality } from '@/lib/domain/db-relationship';
import { useLocalConfig } from '@/hooks/use-local-config';
+import { getCardinalityMarkerId } from './canvas-utils';
export const MarkerDefinitions: React.FC = () => {
const { showCardinality } = useLocalConfig();
@@ -11,6 +12,7 @@ export const MarkerDefinitions: React.FC = () => {
};
const sideOptions: ('left' | 'right')[] = ['left', 'right'];
+ const selectionOptions: boolean[] = [true, false];
if (!showCardinality) {
return null;
@@ -20,39 +22,51 @@ export const MarkerDefinitions: React.FC = () => {
<svg className="absolute left-0 top-0 z-0 size-0">
<defs>
{Object.entries(cardinalityOptions).map(([cardinality, text]) =>
- sideOptions.map((side) => (
- <marker
- key={`cardinality_${cardinality}_${side}`}
- id={`cardinality_${cardinality}_${side}`}
- viewBox="0 0 16 16"
- markerWidth="16"
- markerHeight="16"
- refX={side === 'left' ? '15' : '1'}
- refY="8"
- >
- <circle
- cx="8"
- cy="8"
- r="5"
- className={cn([
- 'fill-muted-foreground',
- 'stroke-background',
- 'stroke-[0.5]',
- ])}
- />
- <text
- x="7.9"
- y="8.4"
- fontSize="6"
- fontWeight="600"
- textAnchor="middle"
- dominantBaseline="middle"
- className="fill-muted"
+ sideOptions.map((side) =>
+ selectionOptions.map((selected) => (
+ <marker
+ key={getCardinalityMarkerId({
+ cardinality: cardinality as Cardinality,
+ selected,
+ side,
+ })}
+ id={getCardinalityMarkerId({
+ cardinality: cardinality as Cardinality,
+ selected,
+ side,
+ })}
+ viewBox="0 0 16 16"
+ markerWidth="16"
+ markerHeight="16"
+ refX={side === 'left' ? '15' : '1'}
+ refY="8"
>
- {text}
- </text>
- </marker>
- ))
+ <circle
+ cx="8"
+ cy="8"
+ r="5"
+ className={cn([
+ selected
+ ? 'fill-pink-600'
+ : 'fill-muted-foreground',
+ 'stroke-background',
+ 'stroke-[0.5]',
+ ])}
+ />
+ <text
+ x="7.9"
+ y="8.4"
+ fontSize="6"
+ fontWeight="600"
+ textAnchor="middle"
+ dominantBaseline="middle"
+ className="fill-muted"
+ >
+ {text}
+ </text>
+ </marker>
+ ))
+ )
)}
</defs>
</svg>
diff --git a/src/pages/editor-page/canvas/table-edge.tsx b/src/pages/editor-page/canvas/table-edge.tsx
index 7c4bb4f7..ab420845 100644
--- a/src/pages/editor-page/canvas/table-edge.tsx
+++ b/src/pages/editor-page/canvas/table-edge.tsx
@@ -11,6 +11,7 @@ import { RIGHT_HANDLE_ID_PREFIX } from './table-node-field';
import { useChartDB } from '@/hooks/use-chartdb';
import { useLayout } from '@/hooks/use-layout';
import { cn } from '@/lib/utils';
+import { getCardinalityMarkerId } from './canvas-utils';
export type TableEdgeType = Edge<
{
@@ -129,15 +130,16 @@ export const TableEdge: React.FC<EdgeProps<TableEdgeType>> = ({
]
);
- const sourceMarker =
- relationship?.sourceCardinality === 'one'
- ? `cardinality_one_${sourceSide}`
- : `cardinality_many_${sourceSide}`;
- const targetMarker =
- relationship?.targetCardinality === 'one'
- ? `cardinality_one_${targetSide}`
- : `cardinality_many_${targetSide}`;
-
+ const sourceMarker = getCardinalityMarkerId({
+ cardinality: relationship?.sourceCardinality ?? 'one',
+ selected: selected ?? false,
+ side: sourceSide as 'left' | 'right',
+ });
+ const targetMarker = getCardinalityMarkerId({
+ cardinality: relationship?.targetCardinality ?? 'one',
+ selected: selected ?? false,
+ side: targetSide as 'left' | 'right',
+ });
return (
<>
<path