Skip to content

Add ids to types #710

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
merged 3 commits into from
Nov 20, 2025
Merged

Add ids to types #710

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
ad31ae7
Add ids to types
1ilit Nov 20, 2025
57c8b65
Remove log
1ilit Nov 20, 2025
f32c999
Add type field ids
1ilit Nov 20, 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
26 changes: 13 additions & 13 deletions src/components/EditorHeader/ControlPanel.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export default function ControlPanel({
} else if (a.element === ObjectType.RELATIONSHIP) {
deleteRelationship(a.data.relationship.id, false);
} else if (a.element === ObjectType.TYPE) {
deleteType(types.length - 1, false);
deleteType(a.data.type.id, false);
} else if (a.element === ObjectType.ENUM) {
deleteEnum(enums.length - 1, false);
}
Expand Down Expand Up @@ -199,7 +199,7 @@ export default function ControlPanel({
} else if (a.element === ObjectType.AREA) {
addArea(a.data, false);
} else if (a.element === ObjectType.TYPE) {
addType({ id: a.id, ...a.data }, false);
addType(a.data, false);
} else if (a.element === ObjectType.ENUM) {
addEnum({ id: a.id, ...a.data }, false);
}
Expand Down Expand Up @@ -258,9 +258,12 @@ export default function ControlPanel({
updateRelationship(a.rid, a.undo);
} else if (a.element === ObjectType.TYPE) {
if (a.component === "field_add") {
const type = types.find((t, i) =>
typeof a.tid === "number" ? i === a.tid : t.id === a.tid,
);
updateType(a.tid, {
fields: types[a.tid].fields.filter(
(_, i) => i !== types[a.tid].fields.length - 1,
fields: type.fields.filter((f, i) =>
f.id ? f.id !== a.data.field.id : i !== type.fields.length - 1,
),
});
}
Expand Down Expand Up @@ -334,7 +337,7 @@ export default function ControlPanel({
} else if (a.element === ObjectType.RELATIONSHIP) {
addRelationship(a.data, false);
} else if (a.element === ObjectType.TYPE) {
addType(null, false);
addType(a.data, false);
} else if (a.element === ObjectType.ENUM) {
addEnum(null, false);
}
Expand Down Expand Up @@ -367,7 +370,7 @@ export default function ControlPanel({
} else if (a.element === ObjectType.AREA) {
deleteArea(a.data.id, false);
} else if (a.element === ObjectType.TYPE) {
deleteType(a.id, false);
deleteType(a.data.type.id, false);
} else if (a.element === ObjectType.ENUM) {
deleteEnum(a.id, false);
}
Expand Down Expand Up @@ -436,14 +439,11 @@ export default function ControlPanel({
updateRelationship(a.rid, a.redo);
} else if (a.element === ObjectType.TYPE) {
if (a.component === "field_add") {
const type = types.find((t, i) =>
typeof a.tid === "number" ? i === a.tid : t.id === a.tid,
);
updateType(a.tid, {
fields: [
...types[a.tid].fields,
{
name: "",
type: "",
},
],
fields: [...type.fields, a.data.field],
});
} else if (a.component === "field") {
updateType(a.tid, {
Expand Down
37 changes: 22 additions & 15 deletions src/components/EditorSidePanel/TypesTab/TypeInfo.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { IconDeleteStroked, IconPlus } from "@douyinfe/semi-icons";
import { useUndoRedo, useTypes, useDiagram, useLayout } from "../../../hooks";
import TypeField from "./TypeField";
import { useTranslation } from "react-i18next";
import { nanoid } from "nanoid";

export default function TypeInfo({ index, data }) {
const { layout } = useLayout();
Expand All @@ -22,8 +23,11 @@ export default function TypeInfo({ index, data }) {
const [editField, setEditField] = useState({});
const { t } = useTranslation();

// TODO: remove indexes, not a valid case after adding id to types
const typeId = data.id ?? index;

return (
<div id={`scroll_type_${index}`}>
<div id={`scroll_type_${typeId}`}>
<Collapse.Panel
header={
<div className="overflow-hidden text-ellipsis whitespace-nowrap">
Expand All @@ -41,7 +45,7 @@ export default function TypeInfo({ index, data }) {
placeholder={t("name")}
className="ms-2"
onChange={(value) => {
updateType(index, { name: value });
updateType(typeId, { name: value });
tables.forEach((table) => {
table.fields.forEach((field) => {
if (field.type.toLowerCase() === data.name.toLowerCase()) {
Expand Down Expand Up @@ -71,7 +75,7 @@ export default function TypeInfo({ index, data }) {
action: Action.EDIT,
element: ObjectType.TYPE,
component: "self",
tid: index,
tid: typeId,
undo: editField,
redo: { name: e.target.value },
updatedFields,
Expand Down Expand Up @@ -103,7 +107,7 @@ export default function TypeInfo({ index, data }) {
placeholder={t("comment")}
rows={1}
onChange={(value) =>
updateType(index, { comment: value }, false)
updateType(typeId, { comment: value }, false)
}
onFocus={(e) => setEditField({ comment: e.target.value })}
onBlur={(e) => {
Expand All @@ -114,7 +118,7 @@ export default function TypeInfo({ index, data }) {
action: Action.EDIT,
element: ObjectType.TYPE,
component: "self",
tid: index,
tid: typeId,
undo: editField,
redo: { comment: e.target.value },
message: t("edit_type", {
Expand All @@ -135,28 +139,31 @@ export default function TypeInfo({ index, data }) {
icon={<IconPlus />}
disabled={layout.readOnly}
onClick={() => {
const newField = {
name: "",
type: "",
id: nanoid(),
};
setUndoStack((prev) => [
...prev,
{
action: Action.EDIT,
element: ObjectType.TYPE,
component: "field_add",
tid: index,
data: {
field: newField,
index: data.fields.length,
},
tid: typeId,
message: t("edit_type", {
typeName: data.name,
extra: "[add field]",
}),
},
]);
setRedoStack([]);
updateType(index, {
fields: [
...data.fields,
{
name: "",
type: "",
},
],
updateType(typeId, {
fields: [...data.fields, newField],
});
}}
block
Expand All @@ -170,7 +177,7 @@ export default function TypeInfo({ index, data }) {
type="danger"
disabled={layout.readOnly}
icon={<IconDeleteStroked />}
onClick={() => deleteType(index)}
onClick={() => deleteType(typeId)}
>
{t("delete")}
</Button>
Expand Down
73 changes: 69 additions & 4 deletions src/components/Workspace.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { databases } from "../data/databases";
import { isRtl } from "../i18n/utils/rtl";
import { useSearchParams } from "react-router-dom";
import { get, SHARE_FILENAME } from "../api/gists";
import { nanoid } from "nanoid";

export const IdContext = createContext({
gistId: "",
Expand Down Expand Up @@ -196,7 +197,23 @@ export default function WorkSpace() {
setTasks(d.todos ?? []);
setTransform({ pan: d.pan, zoom: d.zoom });
if (databases[database].hasTypes) {
setTypes(d.types ?? []);
if (d.types) {
setTypes(
d.types.map((t) =>
t.id
? t
: {
...t,
id: nanoid(),
fields: t.fields.map((f) =>
f.id ? f : { ...f, id: nanoid() },
),
},
),
);
} else {
setTypes([]);
}
}
if (databases[database].hasEnums) {
setEnums(d.enums ?? []);
Expand Down Expand Up @@ -238,7 +255,23 @@ export default function WorkSpace() {
setUndoStack([]);
setRedoStack([]);
if (databases[database].hasTypes) {
setTypes(diagram.types ?? []);
if (diagram.types) {
setTypes(
diagram.types.map((t) =>
t.id
? t
: {
...t,
id: nanoid(),
fields: t.fields.map((f) =>
f.id ? f : { ...f, id: nanoid() },
),
},
),
);
} else {
setTypes([]);
}
}
if (databases[database].hasEnums) {
setEnums(diagram.enums ?? []);
Expand Down Expand Up @@ -277,7 +310,23 @@ export default function WorkSpace() {
setUndoStack([]);
setRedoStack([]);
if (databases[database].hasTypes) {
setTypes(diagram.types ?? []);
if (diagram.types) {
setTypes(
diagram.types.map((t) =>
t.id
? t
: {
...t,
id: nanoid(),
fields: t.fields.map((f) =>
f.id ? f : { ...f, id: nanoid() },
),
},
),
);
} else {
setTypes([]);
}
}
if (databases[database].hasEnums) {
setEnums(diagram.enums ?? []);
Expand Down Expand Up @@ -308,7 +357,23 @@ export default function WorkSpace() {
setAreas(parsedDiagram.subjectAreas);
setTransform(parsedDiagram.transform);
if (databases[parsedDiagram.database].hasTypes) {
setTypes(parsedDiagram.types ?? []);
if (parsedDiagram.types) {
setTypes(
parsedDiagram.types.map((t) =>
t.id
? t
: {
...t,
id: nanoid(),
fields: t.fields.map((f) =>
f.id ? f : { ...f, id: nanoid() },
),
},
),
);
} else {
setTypes([]);
}
}
if (databases[parsedDiagram.database].hasEnums) {
setEnums(parsedDiagram.enums ?? []);
Expand Down
32 changes: 26 additions & 6 deletions src/context/TypesContext.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Action, ObjectType } from "../data/constants";
import { useUndoRedo } from "../hooks";
import { Toast } from "@douyinfe/semi-ui";
import { useTranslation } from "react-i18next";
import { nanoid } from "nanoid";

export const TypesContext = createContext(null);

Expand All @@ -12,16 +13,18 @@ export default function TypesContextProvider({ children }) {
const { setUndoStack, setRedoStack } = useUndoRedo();

const addType = (data, addToHistory = true) => {
const id = nanoid();
if (data) {
setTypes((prev) => {
const temp = prev.slice();
temp.splice(data.id, 0, data);
temp.splice(data.index, 0, data.type);
return temp;
});
} else {
setTypes((prev) => [
...prev,
{
id,
name: `type_${prev.length}`,
fields: [],
comment: "",
Expand All @@ -32,6 +35,15 @@ export default function TypesContextProvider({ children }) {
setUndoStack((prev) => [
...prev,
{
data: {
index: types.length,
type: data?.type ?? {
id,
name: `type_${prev.length}`,
fields: [],
comment: "",
},
},
action: Action.ADD,
element: ObjectType.TYPE,
message: t("add_type"),
Expand All @@ -43,27 +55,35 @@ export default function TypesContextProvider({ children }) {

const deleteType = (id, addToHistory = true) => {
if (addToHistory) {
const deletedTypeIndex = types.findIndex((e, i) =>
typeof id === "number" ? i === id : e.id === id,
);
Toast.success(t("type_deleted"));
setUndoStack((prev) => [
...prev,
{
action: Action.DELETE,
element: ObjectType.TYPE,
id: id,
data: types[id],
data: { type: types[deletedTypeIndex], index: deletedTypeIndex },
message: t("delete_type", {
typeName: types[id].name,
typeName: types[deletedTypeIndex].name,
}),
},
]);
setRedoStack([]);
}
setTypes((prev) => prev.filter((e, i) => i !== id));
setTypes((prev) =>
prev.filter((e, i) => (typeof id === "number" ? i !== id : e.id !== id)),
);
};

const updateType = (id, values) => {
setTypes((prev) =>
prev.map((e, i) => (i === id ? { ...e, ...values } : e)),
prev.map((item, index) => {
const isMatch = typeof id === "number" ? index === id : item.id === id;

return isMatch ? { ...item, ...values } : item;
}),
);
};

Expand Down
2 changes: 2 additions & 0 deletions src/data/schemas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,14 @@ export const noteSchema = {
export const typeSchema = {
type: "object",
properties: {
id: { type: ["string"] },
name: { type: "string" },
fields: {
type: "array",
items: {
type: "object",
properties: {
id: { type: ["string"] },
name: { type: "string" },
type: { type: "string" },
values: {
Expand Down