From cd4befcda37e6c51baccdd16ecf57c126d6d183c Mon Sep 17 00:00:00 2001
From: 1ilit <1ilit@proton.me>
Date: Sun, 11 May 2025 21:34:20 +0400
Subject: [PATCH] Fix review comments

---
 src/components/EditorCanvas/Canvas.jsx       |  4 ++--
 src/components/EditorHeader/ControlPanel.jsx |  8 ++------
 src/utils/exportAs/dbml.js                   |  2 +-
 src/utils/importSQL/oraclesql.js             | 10 ++--------
 src/utils/importSQL/postgres.js              |  8 +-------
 5 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/components/EditorCanvas/Canvas.jsx b/src/components/EditorCanvas/Canvas.jsx
index 1578e4f..57e1c4c 100644
--- a/src/components/EditorCanvas/Canvas.jsx
+++ b/src/components/EditorCanvas/Canvas.jsx
@@ -507,7 +507,7 @@ export default function Canvas() {
     }
     setDragging({
       element: ObjectType.NONE,
-      id: -1,
+      id: null,
       prevX: 0,
       prevY: 0,
       initialPositions: [],
@@ -589,7 +589,7 @@ export default function Canvas() {
     setPanning((old) => ({ ...old, isPanning: false }));
     setDragging({
       element: ObjectType.NONE,
-      id: -1,
+      id: null,
       prevX: 0,
       prevY: 0,
       initialPositions: [],
diff --git a/src/components/EditorHeader/ControlPanel.jsx b/src/components/EditorHeader/ControlPanel.jsx
index d60b551..e485806 100644
--- a/src/components/EditorHeader/ControlPanel.jsx
+++ b/src/components/EditorHeader/ControlPanel.jsx
@@ -145,7 +145,6 @@ export default function ControlPanel({
         }
       }
       setRedoStack((prev) => [...prev, a]);
-      console.log(a);
       return;
     }
 
@@ -660,7 +659,6 @@ export default function ControlPanel({
   const paste = () => {
     navigator.clipboard.readText().then((text) => {
       let obj = null;
-      console.log(text);
       try {
         obj = JSON.parse(text);
       } catch (error) {
@@ -1148,16 +1146,14 @@ export default function ControlPanel({
           setRedoStack([]);
 
           if (!diagramId) {
-            console.error("Something went wrong.");
+            Toast.error(t("oops_smth_went_wrong"));
             return;
           }
 
           db.table("diagrams")
             .delete(diagramId)
-            .then(() => {
-              console.info("Deleted diagram successfully.");
-            })
             .catch((error) => {
+              Toast.error(t("oops_smth_went_wrong"));
               console.error(
                 `Error deleting records with gistId '${diagramId}':`,
                 error,
diff --git a/src/utils/exportAs/dbml.js b/src/utils/exportAs/dbml.js
index 0418da3..e8614cc 100644
--- a/src/utils/exportAs/dbml.js
+++ b/src/utils/exportAs/dbml.js
@@ -65,7 +65,7 @@ export function toDBML(diagram) {
       (f) => f.id === rel.endFieldId,
     );
 
-    `Ref ${rel.name} {\n\t${startTableName}.${startFieldName} ${cardinality(rel)} ${endTableName}.${endFieldName} [ delete: ${rel.deleteConstraint.toLowerCase()}, update: ${rel.updateConstraint.toLowerCase()} ]\n}`;
+    return `Ref ${rel.name} {\n\t${startTableName}.${startFieldName} ${cardinality(rel)} ${endTableName}.${endFieldName} [ delete: ${rel.deleteConstraint.toLowerCase()}, update: ${rel.updateConstraint.toLowerCase()} ]\n}`;
   };
 
   return `${diagram.enums
diff --git a/src/utils/importSQL/oraclesql.js b/src/utils/importSQL/oraclesql.js
index ef2d12b..fcd7539 100644
--- a/src/utils/importSQL/oraclesql.js
+++ b/src/utils/importSQL/oraclesql.js
@@ -80,7 +80,6 @@ export function fromOracleSQL(ast, diagramDb = DB.GENERIC) {
             table.fields.push(field);
           } else if (d.resource === "constraint") {
             const relationship = {};
-            const startTableId = table.id;
             const startFieldName = d.constraint.columns[0];
             const endFieldName = d.constraint.reference.columns[0];
             const endTableName = d.constraint.reference.object.name;
@@ -98,7 +97,7 @@ export function fromOracleSQL(ast, diagramDb = DB.GENERIC) {
             );
             if (!startField) return;
 
-            relationship.startTableId = startTableId;
+            relationship.startTableId = table.id;
             relationship.startFieldId = startField.id;
             relationship.endTableId = endTable.id;
             relationship.endFieldId = endField.id;
@@ -106,12 +105,7 @@ export function fromOracleSQL(ast, diagramDb = DB.GENERIC) {
             relationship.name =
               d.name && Boolean(d.name.trim())
                 ? d.name
-                : "fk_" +
-                  table.name +
-                  "_" +
-                  startFieldName +
-                  "_" +
-                  endTableName;
+                : `fk_${table.name}_${startFieldName}_${endTableName}`;
             relationship.deleteConstraint =
               d.constraint.reference.on_delete &&
               Boolean(d.constraint.reference.on_delete.trim())
diff --git a/src/utils/importSQL/postgres.js b/src/utils/importSQL/postgres.js
index ac7f9f2..d99572a 100644
--- a/src/utils/importSQL/postgres.js
+++ b/src/utils/importSQL/postgres.js
@@ -137,13 +137,7 @@ export function fromPostgres(ast, diagramDb = DB.GENERIC) {
               const startField = table.find((f) => f.name === startFieldName);
               if (!startField) return;
 
-              relationship.name =
-                "fk_" +
-                startTableName +
-                "_" +
-                startFieldName +
-                "_" +
-                endTableName;
+              relationship.name = `fk_${startTableName}_${startFieldName}_${endTableName}`;
               relationship.startTableId = startTableId;
               relationship.endTableId = endTable.id;
               relationship.endFieldId = endField.id;