Skip to content

Feat: Added cardinality to subtypes #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HansMarcus01 merged 3 commits into from
Oct 22, 2025
Merged

Feat: Added cardinality to subtypes #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e57dcb4
Changed layout of TableInfo to improve UX
dvd-22 Sep 29, 2025
3afc0e2
Added cardinality to subtypes
dvd-22 Oct 18, 2025
a36e7fe
Merge branch 'LIDSOL:main' into feat-cardinality-to-subtypes
dvd-22 Oct 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 71 additions & 47 deletions src/components/EditorCanvas/Relationship.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,17 @@ export default function Relationship({
connectionPointX = subtypePoint.x;
connectionPointY = subtypePoint.y + 20;
}

// Calculate cardinality position for each child
const lineLength = Math.sqrt(
Math.pow(childCenter.x - connectionPointX, 2) +
Math.pow(childCenter.y - connectionPointY, 2)
);
const cardinalityOffset = 30;
const cardinalityRatio = Math.min(cardinalityOffset / lineLength, 0.8);
const cardinalityX = connectionPointX + (childCenter.x - connectionPointX) * (1 - cardinalityRatio);
const cardinalityY = connectionPointY + (childCenter.y - connectionPointY) * (1 - cardinalityRatio);

return (
<g key={`child-group-${data.id}-${index}`}>
<line
Expand All @@ -352,6 +363,21 @@ export default function Relationship({
cursor="pointer"
onContextMenu={handleContextMenu}
/>
{/* Show (0,1) cardinality near each child table */}
{settings.showCardinality && (
<text
x={cardinalityX}
y={cardinalityY}
fill={theme === "dark" ? "lightgrey" : "#333"}
fontSize={12}
fontWeight={400}
textAnchor="middle"
alignmentBaseline="middle"
className="group-hover:fill-sky-700"
>
{settings.notation === Notation.DEFAULT ? "(0,1)" : "(0,1)"}
</text>
)}
</g>
);
})}
Expand Down Expand Up @@ -517,8 +543,18 @@ export default function Relationship({
const isDefault = settings.notation === Notation.DEFAULT;
const fkFields = getForeignKeyFields();

// Skip cardinality calculation for subtype relationships
if (!data.subtype && data.relationshipType !== RelationshipType.SUBTYPE) {
// Calculate cardinality
if (data.subtype || data.relationshipType === RelationshipType.SUBTYPE) {
// For subtype relationships
if (isCrowOrIDEF) {
cardinalityStart = ParentCardinality.DEFAULT.label;
cardinalityEnd = ParentCardinality.NULLEABLE.label;
} else if (isDefault) {
cardinalityStart = "1";
cardinalityEnd = "0,1";
}
} else {
// For regular relationships
if (isCrowOrIDEF) {
const allNullable =
fkFields.length > 0 && fkFields.every((field) => !field.notNull);
Expand Down Expand Up @@ -559,52 +595,43 @@ export default function Relationship({
},
};

// For subtype relationships, force specific notation regardless of global setting
const effectiveNotationKey = data.subtype
? "default"
: settings.notation &&
Object.prototype.hasOwnProperty.call(
formats.notation,
settings.notation,
)
? settings.notation
: Notation.DEFAULT;
const effectiveNotationKey = settings.notation &&
Object.prototype.hasOwnProperty.call(
formats.notation,
settings.notation,
)
? settings.notation
: Notation.DEFAULT;

const currentNotation = formats.notation[effectiveNotationKey];

let parentFormat = null;
// Skip parent/child notation logic for subtype relationships
if (!data.subtype && data.relationshipType !== RelationshipType.SUBTYPE) {
if (settings.notation === Notation.CROWS_FOOT) {
if (cardinalityStart === "(1,1)") {
parentFormat = currentNotation.parent_lines;
} else if (cardinalityStart === "(0,1)") {
parentFormat = currentNotation.parent_diamond;
}
} else if (settings.notation === Notation.IDEF1X) {
if (cardinalityStart === "(0,1)") {
parentFormat = currentNotation.parent_diamond;
}
if (settings.notation === Notation.CROWS_FOOT) {
if (cardinalityStart === "(1,1)") {
parentFormat = currentNotation.parent_lines;
} else if (cardinalityStart === "(0,1)") {
parentFormat = currentNotation.parent_diamond;
}
} else if (settings.notation === Notation.IDEF1X) {
if (cardinalityStart === "(0,1)") {
parentFormat = currentNotation.parent_diamond;
}
}

let childFormat;
// Skip child notation logic for subtype relationships
if (!data.subtype && data.relationshipType !== RelationshipType.SUBTYPE) {
if (settings.notation === Notation.CROWS_FOOT) {
childFormat = currentNotation.child;
} else if (settings.notation === Notation.IDEF1X) {
if (data.relationshipType === RelationshipType.ONE_TO_ONE) {
childFormat = currentNotation.one_to_one;
} else if (data.relationshipType === RelationshipType.ONE_TO_MANY) {
childFormat = currentNotation.one_to_many;
}
} else {
if (data.relationshipType === RelationshipType.ONE_TO_ONE) {
childFormat = currentNotation.one_to_one;
} else if (data.relationshipType === RelationshipType.ONE_TO_MANY) {
childFormat = currentNotation.one_to_many;
}
if (settings.notation === Notation.CROWS_FOOT) {
childFormat = currentNotation.child;
} else if (settings.notation === Notation.IDEF1X) {
if (data.relationshipType === RelationshipType.ONE_TO_ONE || data.subtype) {
childFormat = currentNotation.one_to_one;
} else if (data.relationshipType === RelationshipType.ONE_TO_MANY) {
childFormat = currentNotation.one_to_many;
}
} else {
if (data.relationshipType === RelationshipType.ONE_TO_ONE || data.subtype) {
childFormat = currentNotation.one_to_one;
} else if (data.relationshipType === RelationshipType.ONE_TO_MANY) {
childFormat = currentNotation.one_to_many;
}
}

Expand Down Expand Up @@ -750,18 +777,16 @@ export default function Relationship({
strokeDasharray={relationshipType}
strokeWidth={2}
/>
{/* Only show parent/child notations for non-subtype relationships */}
{!data.subtype &&
parentFormat &&
{/* Show parent/child notations for all relationships */}
{parentFormat &&
parentFormat(
cardinalityStartX,
cardinalityStartY,
direction,
isVertical,
cardinalityStart, // Add cardinality text
)}
{!data.subtype &&
settings.notation === "default" &&
{settings.notation === "default" &&
settings.showCardinality &&
childFormat &&
childFormat(
Expand All @@ -777,8 +802,7 @@ export default function Relationship({
isVertical,
vectorInfo, // Pass vector information
)}
{!data.subtype &&
settings.notation !== "default" &&
{settings.notation !== "default" &&
childFormat &&
childFormat(
pathRef,
Expand Down
72 changes: 36 additions & 36 deletions src/components/EditorSidePanel/TablesTab/TableInfo.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,42 +188,6 @@ export default function TableInfo({ data }) {
</Collapse>
</Card>
)}
<Card
bodyStyle={{ padding: "4px" }}
style={{ marginTop: "12px", marginBottom: "12px" }}
headerLine={false}
>
<Collapse keepDOM={false} lazyRender>
<Collapse.Panel header={t("comment")} itemKey="1">
<TextArea
field="comment"
value={data.comment}
autosize
placeholder={t("comment")}
rows={1}
onChange={(value) =>
updateTable(data.id, { comment: value }, false)
}
onFocus={(e) => setEditField({ comment: e.target.value })}
onBlur={(e) => {
if (e.target.value === editField.comment) return;
pushUndo({
action: Action.EDIT,
element: ObjectType.TABLE,
component: "self",
tid: data.id,
undo: editField,
redo: { comment: e.target.value },
message: t("edit_table", {
tableName: e.target.value,
extra: "[comment]",
}),
});
}}
/>
</Collapse.Panel>
</Collapse>
</Card>
<div className="flex flex-col gap-1">
<div className="flex gap-1 w-full">
{!(settings.notation === Notation.CROWS_FOOT || settings.notation === Notation.IDEF1X)? (
Expand Down Expand Up @@ -352,6 +316,42 @@ export default function TableInfo({ data }) {
</Button>
</div>
</div>
<Card
bodyStyle={{ padding: "4px" }}
style={{ marginTop: "12px", marginBottom: "12px" }}
headerLine={false}
>
<Collapse keepDOM={false} lazyRender>
<Collapse.Panel header={t("comment")} itemKey="1">
<TextArea
field="comment"
value={data.comment}
autosize
placeholder={t("comment")}
rows={1}
onChange={(value) =>
updateTable(data.id, { comment: value }, false)
}
onFocus={(e) => setEditField({ comment: e.target.value })}
onBlur={(e) => {
if (e.target.value === editField.comment) return;
pushUndo({
action: Action.EDIT,
element: ObjectType.TABLE,
component: "self",
tid: data.id,
undo: editField,
redo: { comment: e.target.value },
message: t("edit_table", {
tableName: e.target.value,
extra: "[comment]",
}),
});
}}
/>
</Collapse.Panel>
</Collapse>
</Card>
</div>
);
}