Free, simple, and intuitive online database diagram editor and SQL generator.
JavaScript databasedatabase-designdatabase-diagramdatabase-schemadbmldiagram-editoreditorer-diagramerderdiagramindexeddbmariadbmcporacle-databaseoracle-dbpostgresqlschema-designsqlsql-serversqlite
Add error checking for enums
1ilitd7025e1ff189
diff --git a/src/components/EditorSidePanel/EnumsTab/EnumDetails.jsx b/src/components/EditorSidePanel/EnumsTab/EnumDetails.jsxindex 0de37486..6f40f4f0 100644--- a/src/components/EditorSidePanel/EnumsTab/EnumDetails.jsx+++ b/src/components/EditorSidePanel/EnumsTab/EnumDetails.jsx@@ -18,6 +18,7 @@ export default function EnumDetails({ data, i }) {<Inputvalue={data.name}placeholder={t("name")}+ validateStatus={data.name.trim() === "" ? "error" : "default"}onChange={(value) => updateEnum(i, { name: value })}onFocus={(e) => setEditField({ name: e.target.value })}onBlur={(e) => {@@ -46,6 +47,7 @@ export default function EnumDetails({ data, i }) {addOnBlurclassName="my-2"placeholder={t("values")}+ validateStatus={data.values.length === 0 ? "error" : "default"}onChange={(v) => updateEnum(i, { values: v })}onFocus={() => setEditField({ values: data.values })}onBlur={() => {diff --git a/src/components/EditorSidePanel/Issues.jsx b/src/components/EditorSidePanel/Issues.jsxindex 61335fda..eacbace1 100644--- a/src/components/EditorSidePanel/Issues.jsx+++ b/src/components/EditorSidePanel/Issues.jsx@@ -2,13 +2,14 @@ import { useState, useEffect } from "react";import { Collapse, Badge } from "@douyinfe/semi-ui";import { arrayIsEqual } from "../../utils/utils";import { getIssues } from "../../utils/issues";-import { useSettings, useTables, useTypes } from "../../hooks";+import { useEnums, useSettings, useTables, useTypes } from "../../hooks";import { useTranslation } from "react-i18next";export default function Issues() {const { types } = useTypes();const { t } = useTranslation();const { settings } = useSettings();+ const { enums } = useEnums();const { tables, relationships, database } = useTables();const [issues, setIssues] = useState([]);@@ -19,6 +20,7 @@ export default function Issues() {relationships: relationships,types: types,database: database,+ enums: enums,});if (!arrayIsEqual(newIssues, issues)) {@@ -27,7 +29,7 @@ export default function Issues() {};findIssues();- }, [tables, relationships, issues, types, database]);+ }, [tables, relationships, issues, types, database, enums]);return (<Collapse keepDOM lazyRender style={{ width: "100%" }}>diff --git a/src/i18n/locales/en.js b/src/i18n/locales/en.jsindex 835d8fba..2998d597 100644--- a/src/i18n/locales/en.js+++ b/src/i18n/locales/en.js@@ -220,6 +220,9 @@ const en = {add_enum: "Add enum",edit_enum: "{{extra}} Edit enum {{enumName}}",delete_enum: "Delete enum",+ enum_w_no_name: "Found enum with no name",+ enum_w_no_values: "Found enum '{{enumName}}' with no values",+ duplicate_enums: "Duplicate enums with the name '{{enumName}}'",},};diff --git a/src/utils/issues.js b/src/utils/issues.jsindex e2a4fdf1..ffffbf1c 100644--- a/src/utils/issues.js+++ b/src/utils/issues.js@@ -9,7 +9,7 @@ function checkDefault(field, database) {if (!field.notNull && field.default.toLowerCase() === "null") return true;- if(!dbToTypes[database][field.type].checkDefault) return true;+ if (!dbToTypes[database][field.type].checkDefault) return true;return dbToTypes[database][field.type].checkDefault(field);}@@ -169,6 +169,24 @@ export function getIssues(diagram) {});});+ const duplicateEnumNames = {};+ diagram.enums.forEach((e) => {+ if (e.name === "") {+ issues.push(i18n.t("enum_w_no_name"));+ }++ if (duplicateEnumNames[e.name]) {+ issues.push(i18n.t("duplicate_enums", { enumName: e.name }));+ } else {+ duplicateEnumNames[e.name] = true;+ }++ if (e.values.length === 0) {+ issues.push(i18n.t("enum_w_no_values", { enumName: e.name }));+ return;+ }+ });+const duplicateFKName = {};diagram.relationships.forEach((r) => {if (duplicateFKName[r.name]) {