From e57dcb4b68a85c86e9aacc1a7948398251349e60 Mon Sep 17 00:00:00 2001
From: Dvd <dvdnet22@gmail.com>
Date: Sun, 28 Sep 2025 22:04:32 -0600
Subject: [PATCH 1/2] Changed layout of TableInfo to improve UX

---
 .../EditorSidePanel/TablesTab/TableInfo.jsx   | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/components/EditorSidePanel/TablesTab/TableInfo.jsx b/src/components/EditorSidePanel/TablesTab/TableInfo.jsx
index 7dfab0aa6..92ca78b34 100644
--- a/src/components/EditorSidePanel/TablesTab/TableInfo.jsx
+++ b/src/components/EditorSidePanel/TablesTab/TableInfo.jsx
@@ -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)? (
@@ -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>
   );
 }
\ No newline at end of file

From 3afc0e2443c88a7258f1f43b177633446607e1cf Mon Sep 17 00:00:00 2001
From: Dvd <dvdnet22@gmail.com>
Date: Sat, 18 Oct 2025 12:41:18 -0600
Subject: [PATCH 2/2] Added cardinality to subtypes

---
 src/components/EditorCanvas/Relationship.jsx | 118 +++++++++++--------
 1 file changed, 71 insertions(+), 47 deletions(-)

diff --git a/src/components/EditorCanvas/Relationship.jsx b/src/components/EditorCanvas/Relationship.jsx
index c4c19474a..654f823b6 100644
--- a/src/components/EditorCanvas/Relationship.jsx
+++ b/src/components/EditorCanvas/Relationship.jsx
@@ -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
@@ -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>
             );
           })}
@@ -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);
@@ -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;
       }
     }
 
@@ -750,9 +777,8 @@ 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,
@@ -760,8 +786,7 @@ export default function Relationship({
               isVertical,
               cardinalityStart, // Add cardinality text
             )}
-          {!data.subtype &&
-            settings.notation === "default" &&
+          {settings.notation === "default" &&
             settings.showCardinality &&
             childFormat &&
             childFormat(
@@ -777,8 +802,7 @@ export default function Relationship({
               isVertical,
               vectorInfo, // Pass vector information
             )}
-          {!data.subtype &&
-            settings.notation !== "default" &&
+          {settings.notation !== "default" &&
             childFormat &&
             childFormat(
               pathRef,