Free, simple, and intuitive online database diagram editor and SQL generator.
JavaScript databasedatabase-designdatabase-diagramdatabase-schemadbmldiagram-editoreditorer-diagramerderdiagramindexeddbmariadbmcporacle-databaseoracle-dbpostgresqlschema-designsqlsql-serversqlite
Add diagram ids improve navigation (#889)
1ilit394c54d5b4bc
diff --git a/src/App.jsx b/src/App.jsxindex fcb09811..592e36c1 100644--- a/src/App.jsx+++ b/src/App.jsx@@ -15,6 +15,8 @@ export default function App() {<Routes><Route path="/" element={<LandingPage />} /><Route path="/editor" element={<Editor />} />+ <Route path="/editor/diagrams/:id" element={<Editor />} />+ <Route path="/editor/templates/:id" element={<Editor />} /><Route path="/bug-report" element={<BugReport />} /><Route path="/templates" element={<Templates />} /><Route path="*" element={<NotFound />} />diff --git a/src/components/EditorHeader/ControlPanel.jsx b/src/components/EditorHeader/ControlPanel.jsxindex fdd3919c..685669c6 100644--- a/src/components/EditorHeader/ControlPanel.jsx+++ b/src/components/EditorHeader/ControlPanel.jsx@@ -11,7 +11,7 @@ import {IconEdit,IconShareStroked,} from "@douyinfe/semi-icons";-import { Link, useNavigate } from "react-router-dom";+import { Link, useMatch, useNavigate, useParams } from "react-router-dom";import icon from "../../assets/icon_dark_64.png";import {Button,@@ -85,13 +85,10 @@ import { getTableHeight } from "../../utils/utils";import { deleteFromCache, STORAGE_KEY } from "../../utils/cache";import { useLiveQuery } from "dexie-react-hooks";import { DateTime } from "luxon";-export default function ControlPanel({- diagramId,- setDiagramId,- title,- setTitle,- lastSaved,-}) {++export default function ControlPanel({ title, setTitle, lastSaved }) {+ const { id: diagramId } = useParams();+const [modal, setModal] = useState(MODAL.NONE);const [sidesheet, setSidesheet] = useState(SIDESHEET.NONE);const [showEditName, setShowEditName] = useState(false);@@ -119,7 +116,6 @@ export default function ControlPanel({deleteRelationship,updateRelationship,database,- setDatabase,} = useDiagram();const { enums, setEnums, deleteEnum, addEnum, updateEnum } = useEnums();const { types, addType, deleteType, updateType, setTypes } = useTypes();@@ -130,6 +126,7 @@ export default function ControlPanel({const { transform, setTransform } = useTransform();const { t, i18n } = useTranslation();const { version, gistId, setGistId } = useContext(IdContext);+ const isTemplate = useMatch("/editor/templates/:id");const navigate = useNavigate();const invertLayout = (component) =>@@ -527,7 +524,11 @@ export default function ControlPanel({minMaxXY.minX = Math.min(minMaxXY.minX, table.x);minMaxXY.minY = Math.min(minMaxXY.minY, table.y);minMaxXY.maxX = Math.max(minMaxXY.maxX, table.x + settings.tableWidth);- minMaxXY.maxY = Math.max(minMaxXY.maxY, table.y + getTableHeight(table, settings.tableWidth, settings.showComments));+ minMaxXY.maxY = Math.max(+ minMaxXY.maxY,+ table.y ++ getTableHeight(table, settings.tableWidth, settings.showComments),+ );});areas.forEach((area) => {@@ -754,71 +755,14 @@ export default function ControlPanel({const open = () => setModal(MODAL.OPEN);const saveDiagramAs = () => setModal(MODAL.SAVEAS);const fullscreen = useFullscreen();- const loadDiagram = async (id) => {- await db.diagrams- .get(id)- .then((diagram) => {- if (diagram) {- if (diagram.database) {- setDatabase(diagram.database);- } else {- setDatabase(DB.GENERIC);- }- setDiagramId(diagram.id);- setTitle(diagram.name);- setTables(diagram.tables);- setRelationships(diagram.references);- setAreas(diagram.areas);- setGistId(diagram.gistId ?? "");- setNotes(diagram.notes);- setTransform({- pan: diagram.pan,- zoom: diagram.zoom,- });- setUndoStack([]);- setRedoStack([]);- if (databases[diagram.database].hasTypes) {- setTypes(- diagram.types.map((t) =>- t.id- ? t- : {- ...t,- id: nanoid(),- fields: t.fields.map((f) =>- f.id ? f : { ...f, id: nanoid() },- ),- },- ),- );- }- if (databases[diagram.database].hasEnums) {- setEnums(- diagram.enums.map((e) => (!e.id ? { ...e, id: nanoid() } : e)) ??- [],- );- }- window.name = `d ${diagram.id}`;- } else {- window.name = "";- Toast.error(t("didnt_find_diagram"));- }- })- .catch((error) => {- console.log(error);- Toast.error(t("didnt_find_diagram"));- });- };+const menu = {file: {new: {function: () => setModal(MODAL.NEW),},new_window: {- function: () => {- const newWindow = window.open("/editor", "_blank");- newWindow.name = window.name;- },+ function: () => window.open("/editor", "_blank"),},open: {function: open,@@ -833,9 +777,8 @@ export default function ControlPanel({label: DateTime.fromJSDate(new Date(diagram.lastModified)).setLocale(i18n.language).toRelative(),- function: async () => {- await loadDiagram(diagram.id);- save();+ function: () => {+ navigate(`/editor/diagrams/${diagram.diagramId}`);},})),{ divider: true },@@ -865,8 +808,8 @@ export default function ControlPanel({disabled: layout.readOnly,},save_as_template: {- function: () => {- db.templates+ function: async () => {+ await db.templates.add({title: title,tables: tables,@@ -875,6 +818,7 @@ export default function ControlPanel({notes: notes,subjectAreas: areas,custom: 1,+ templateId: crypto.randomUUID(),...(databases[database].hasEnums && { enums: enums }),...(databases[database].hasTypes && { types: types }),})@@ -896,9 +840,10 @@ export default function ControlPanel({},function: async () => {await db.diagrams- .delete(diagramId)+ .where("diagramId")+ .equals(diagramId)+ .delete().then(() => {- setDiagramId(0);setTitle("Untitled diagram");setTables([]);setRelationships([]);@@ -909,6 +854,7 @@ export default function ControlPanel({setUndoStack([]);setRedoStack([]);setGistId("");+ navigate("/editor/templates/blank", { replace: true });}).catch(() => Toast.error(t("oops_smth_went_wrong")));},@@ -1305,21 +1251,6 @@ export default function ControlPanel({setTypes([]);setUndoStack([]);setRedoStack([]);-- if (!diagramId) {- Toast.error(t("oops_smth_went_wrong"));- return;- }-- db.table("diagrams")- .delete(diagramId)- .catch((error) => {- Toast.error(t("oops_smth_went_wrong"));- console.error(- `Error deleting records with gistId '${diagramId}':`,- error,- );- });},disabled: layout.readOnly,},@@ -1573,7 +1504,8 @@ export default function ControlPanel({db.delete().then(() => {Toast.success(t("storage_flushed"));- window.location.reload(false);+ navigate("/editor", { replace: true });+ window.location.reload();}).catch(() => {Toast.error(t("oops_smth_went_wrong"));@@ -1638,7 +1570,7 @@ export default function ControlPanel({style={isRtl(i18n.language) ? { direction: "rtl" } : {}}>{header()}- {window.name.split(" ")[0] !== "t" && (+ {!isTemplate && (<Buttontype="primary"className="!text-base me-2 !pe-6 !ps-5 !py-[18px] !rounded-md"@@ -1659,7 +1591,6 @@ export default function ControlPanel({setExportData={setExportData}title={title}setTitle={setTitle}- setDiagramId={setDiagramId}setModal={setModal}importFrom={importFrom}importDb={importDb}@@ -1909,11 +1840,7 @@ export default function ControlPanel({}}onClick={!layout.readOnly && (() => setModal(MODAL.RENAME))}>- <span>- {(window.name.split(" ")[0] === "t"- ? "Templates/"- : "Diagrams/") + title}- </span>+ <span>{(isTemplate ? "Templates/" : "Diagrams/") + title}</span>{version && (<Tag className="mt-1" color="blue" size="small">{version.substring(0, 7)}diff --git a/src/components/EditorHeader/Modal/Modal.jsx b/src/components/EditorHeader/Modal/Modal.jsxindex fd6e6b76..105df222 100644--- a/src/components/EditorHeader/Modal/Modal.jsx+++ b/src/components/EditorHeader/Modal/Modal.jsx@@ -1,24 +1,16 @@-import {- Image,- Input,- Modal as SemiUIModal,- Spin,- Toast,-} from "@douyinfe/semi-ui";+import { Image, Input, Modal as SemiUIModal, Spin } from "@douyinfe/semi-ui";import { saveAs } from "file-saver";import { Parser } from "node-sql-parser";import { Parser as OracleParser } from "oracle-sql-parser";-import { useContext, useState } from "react";+import { useState } from "react";import { useTranslation } from "react-i18next";-import { DB, MODAL, STATUS, State } from "../../../data/constants";+import { DB, MODAL, STATUS } from "../../../data/constants";import { databases } from "../../../data/databases";-import { db } from "../../../data/db";import {useAreas,useDiagram,useEnums,useNotes,- useSaveState,useTransform,useTypes,useUndoRedo,@@ -39,8 +31,7 @@ import Open from "./Open";import Rename from "./Rename";import SetTableWidth from "./SetTableWidth";import Share from "./Share";-import { IdContext } from "../../Workspace";-import { nanoid } from "nanoid";+import { useNavigate } from "react-router-dom";const extensionToLanguage = {md: "markdown",@@ -54,22 +45,19 @@ export default function Modal({setModal,title,setTitle,- setDiagramId,exportData,setExportData,importDb,importFrom,}) {const { t, i18n } = useTranslation();- const { setGistId } = useContext(IdContext);- const { setTables, setRelationships, database, setDatabase } = useDiagram();+ const { setTables, setRelationships, database } = useDiagram();const { setNotes } = useNotes();const { setAreas } = useAreas();const { setTypes } = useTypes();const { setEnums } = useEnums();const { setTransform } = useTransform();const { setUndoStack, setRedoStack } = useUndoRedo();- const { setSaveState } = useSaveState();const [uncontrolledTitle, setUncontrolledTitle] = useState(title);const [uncontrolledLanguage, setUncontrolledLanguage] = useState(i18n.language,@@ -86,6 +74,7 @@ export default function Modal({const [selectedTemplateId, setSelectedTemplateId] = useState(-1);const [selectedDiagramId, setSelectedDiagramId] = useState(0);const [saveAsTitle, setSaveAsTitle] = useState(title);+ const navigate = useNavigate();const overwriteDiagram = () => {setTables(importData.tables);@@ -103,63 +92,6 @@ export default function Modal({}};- const loadDiagram = async (id) => {- await db.diagrams- .get(id)- .then((diagram) => {- if (diagram) {- if (diagram.database) {- setDatabase(diagram.database);- } else {- setDatabase(DB.GENERIC);- }- setDiagramId(diagram.id);- setTitle(diagram.name);- setTables(diagram.tables);- setRelationships(diagram.references);- setAreas(diagram.areas);- setNotes(diagram.notes);- setGistId(diagram.gistId ?? "");- setTransform({- pan: diagram.pan,- zoom: diagram.zoom,- });- setUndoStack([]);- setRedoStack([]);- if (databases[diagram.database].hasTypes) {- setTypes(- diagram.types.map((t) =>- t.id- ? t- : {- ...t,- id: nanoid(),- fields: t.fields.map((f) =>- f.id ? f : { ...f, id: nanoid() },- ),- },- ),- );- }- if (databases[diagram.database].hasEnums) {- setEnums(- diagram.enums.map((e) => (!e.id ? { ...e, id: nanoid() } : e)) ??- [],- );- }- window.name = `d ${diagram.id}`;- setSaveState(State.SAVING);- } else {- window.name = "";- Toast.error(t("didnt_find_diagram"));- }- })- .catch((error) => {- console.log(error);- Toast.error(t("didnt_find_diagram"));- });- };-const parseSQLAndLoadDiagram = () => {const targetDatabase = database === DB.GENERIC ? importDb : database;@@ -226,11 +158,6 @@ export default function Modal({}};- const createNewDiagram = (id) => {- const newWindow = window.open("/editor");- newWindow.name = "lt " + id;- };-const getModalOnOk = async () => {switch (modal) {case MODAL.IMG:@@ -260,8 +187,8 @@ export default function Modal({parseSQLAndLoadDiagram();return;case MODAL.OPEN:- if (selectedDiagramId === 0) return;- loadDiagram(selectedDiagramId);+ if (!selectedDiagramId) return;+ navigate(`/editor/diagrams/${selectedDiagramId}`, "_blank");setModal(MODAL.NONE);return;case MODAL.RENAME:@@ -273,7 +200,7 @@ export default function Modal({setModal(MODAL.NONE);return;case MODAL.NEW:- createNewDiagram(selectedTemplateId);+ window.open("/editor/templates/" + selectedTemplateId, "_blank");setModal(MODAL.NONE);return;case MODAL.LANGUAGE:diff --git a/src/components/EditorHeader/Modal/New.jsx b/src/components/EditorHeader/Modal/New.jsxindex 9967de03..4c450264 100644--- a/src/components/EditorHeader/Modal/New.jsx+++ b/src/components/EditorHeader/Modal/New.jsx@@ -11,25 +11,30 @@ export default function New({ selectedTemplateId, setSelectedTemplateId }) {return (<div className="grid grid-cols-3 gap-2 overflow-auto px-1">- <div onClick={() => setSelectedTemplateId(0)}>+ <div onClick={() => setSelectedTemplateId("blank")}><div- className={`rounded-md h-[180px] border-2 hover:border-dashed ${selectedTemplateId === 0 ? "border-blue-400" : "border-zinc-400"- }`}+ className={`rounded-md h-[180px] border-2 hover:border-dashed ${+ selectedTemplateId === "blank" ? "border-blue-400" : "border-zinc-400"+ }`}>- <Thumbnail i={0} diagram={{}} zoom={0.24} theme={settings.mode} />+ <Thumbnail i="blank" diagram={{}} zoom={0.24} theme={settings.mode} /></div><div className="text-center mt-1">{t("blank")}</div></div>{templates?.map((temp) => (- <div key={temp.id} onClick={() => setSelectedTemplateId(temp.id)}>+ <div+ key={temp.templateId}+ onClick={() => setSelectedTemplateId(temp.templateId)}+ ><div- className={`rounded-md h-[180px] border-2 hover:border-dashed ${selectedTemplateId === temp.id+ className={`rounded-md h-[180px] border-2 hover:border-dashed ${+ selectedTemplateId === temp.templateId? "border-blue-400": "border-zinc-400"- }`}+ }`}><Thumbnail- i={temp.id}+ i={temp.templateId}diagram={temp}zoom={0.24}theme={settings.mode}diff --git a/src/components/EditorHeader/Modal/Open.jsx b/src/components/EditorHeader/Modal/Open.jsxindex 188a9dfc..4758c399 100644--- a/src/components/EditorHeader/Modal/Open.jsx+++ b/src/components/EditorHeader/Modal/Open.jsx@@ -19,6 +19,7 @@ export default function Open({ selectedDiagramId, setSelectedDiagramId }) {return sizeStr;};+return (<div>{diagrams?.length === 0 ? (@@ -45,12 +46,12 @@ export default function Open({ selectedDiagramId, setSelectedDiagramId }) {{diagrams?.map((d) => {return (<tr- key={d.id}+ key={d.diagramId}className={`${- selectedDiagramId === d.id ? "bg-blue-300/30" : "hover-1"+ selectedDiagramId === d.diagramId ? "bg-blue-300/30" : "hover-1"}`}onClick={() => {- setSelectedDiagramId(d.id);+ setSelectedDiagramId(d.diagramId);}}><td className="py-1">diff --git a/src/components/EditorHeader/Modal/Share.jsx b/src/components/EditorHeader/Modal/Share.jsxindex a8f80f8d..b632f473 100644--- a/src/components/EditorHeader/Modal/Share.jsx+++ b/src/components/EditorHeader/Modal/Share.jsx@@ -26,8 +26,7 @@ export default function Share({ title, setModal }) {const { enums } = useEnums();const { transform } = useTransform();const [error, setError] = useState(null);- const url =- window.location.origin + window.location.pathname + "?shareId=" + gistId;+ const url = window.location.origin + "/editor?shareId=" + gistId;const diagramToString = useCallback(() => {return JSON.stringify({@@ -83,7 +82,7 @@ export default function Share({ title, setModal }) {}};updateOrGenerateLink();- // eslint-disable-next-line react-hooks/exhaustive-deps+ // eslint-disable-next-line react-hooks/exhaustive-deps}, []);const copyLink = () => {diff --git a/src/components/Workspace.jsx b/src/components/Workspace.jsxindex 793c2c6c..fa0f1ebd 100644--- a/src/components/Workspace.jsx+++ b/src/components/Workspace.jsx@@ -23,7 +23,12 @@ import { IconAlertTriangle } from "@douyinfe/semi-icons";import { useTranslation } from "react-i18next";import { databases } from "../data/databases";import { isRtl } from "../i18n/utils/rtl";-import { useSearchParams } from "react-router-dom";+import {+ useMatch,+ useNavigate,+ useParams,+ useSearchParams,+} from "react-router-dom";import { get, SHARE_FILENAME } from "../api/gists";import { nanoid } from "nanoid";@@ -37,7 +42,6 @@ export const IdContext = createContext({const SIDEPANEL_MIN_WIDTH = 384;export default function WorkSpace() {- const [id, setId] = useState(0);const [gistId, setGistId] = useState("");const [version, setVersion] = useState("");const [loadedFromGistId, setLoadedFromGistId] = useState("");@@ -67,6 +71,12 @@ export default function WorkSpace() {const { undoStack, redoStack, setUndoStack, setRedoStack } = useUndoRedo();const { t, i18n } = useTranslation();let [searchParams, setSearchParams] = useSearchParams();+ const { id: loadedDiagramId } = useParams();+ const isDiagram = useMatch("/editor/diagrams/:id");+ const isTemplate = useMatch("/editor/templates/:id");++ const navigate = useNavigate();+const handleResize = (e) => {if (!resize) return;const w = isRtl(i18n.language) ? window.innerWidth - e.clientX : e.clientX;@@ -74,80 +84,57 @@ export default function WorkSpace() {};const save = useCallback(async () => {- const name = window.name.split(" ");- const op = name[0];- const saveAsDiagram = window.name === "" || op === "d" || op === "lt";+ if (searchParams.has("shareId")) {+ searchParams.delete("shareId");+ setSearchParams(searchParams, { replace: true });+ }- if (saveAsDiagram) {- if (searchParams.has("shareId")) {- searchParams.delete("shareId");- setSearchParams(searchParams, { replace: true });- }- if ((id === 0 && window.name === "") || op === "lt") {- await db.diagrams- .add({- database: database,- name: title,- gistId: gistId ?? "",- lastModified: new Date(),- tables: tables,- references: relationships,- notes: notes,- areas: areas,- pan: transform.pan,- zoom: transform.zoom,- loadedFromGistId: loadedFromGistId,- ...(databases[database].hasEnums && { enums: enums }),- ...(databases[database].hasTypes && { types: types }),- })- .then((id) => {- setId(id);- window.name = `d ${id}`;- setSaveState(State.SAVED);- setLastSaved(new Date().toLocaleString());- });- } else {- await db.diagrams- .update(id, {- database: database,- name: title,- lastModified: new Date(),- tables: tables,- references: relationships,- notes: notes,- areas: areas,- gistId: gistId ?? "",- pan: transform.pan,- zoom: transform.zoom,- loadedFromGistId: loadedFromGistId,- ...(databases[database].hasEnums && { enums: enums }),- ...(databases[database].hasTypes && { types: types }),- })- .then(() => {- setSaveState(State.SAVED);- setLastSaved(new Date().toLocaleString());- });- }- } else {- await db.templates- .update(id, {+ if (isTemplate || (!loadedDiagramId && !isTemplate && !isDiagram)) {+ const diagramId = crypto.randomUUID();+ await db.diagrams+ .add({+ diagramId,database: database,- title: title,+ name: title,+ gistId: gistId ?? "",+ lastModified: new Date(),tables: tables,- relationships: relationships,+ references: relationships,notes: notes,- subjectAreas: areas,+ areas: areas,pan: transform.pan,zoom: transform.zoom,+ loadedFromGistId: loadedFromGistId,...(databases[database].hasEnums && { enums: enums }),...(databases[database].hasTypes && { types: types }),}).then(() => {+ navigate(`/editor/diagrams/${diagramId}`, { replace: true });setSaveState(State.SAVED);setLastSaved(new Date().toLocaleString());+ });+ } else {+ await db.diagrams+ .where("diagramId")+ .equals(loadedDiagramId)+ .modify({+ database: database,+ name: title,+ lastModified: new Date(),+ tables: tables,+ references: relationships,+ notes: notes,+ areas: areas,+ gistId: gistId ?? "",+ pan: transform.pan,+ zoom: transform.zoom,+ loadedFromGistId: loadedFromGistId,+ ...(databases[database].hasEnums && { enums: enums }),+ ...(databases[database].hasTypes && { types: types }),})- .catch(() => {- setSaveState(State.ERROR);+ .then(() => {+ setSaveState(State.SAVED);+ setLastSaved(new Date().toLocaleString());});}}, [@@ -159,13 +146,16 @@ export default function WorkSpace() {areas,types,title,- id,transform,setSaveState,database,enums,gistId,loadedFromGistId,+ isDiagram,+ isTemplate,+ loadedDiagramId,+ navigate,]);const load = useCallback(async () => {@@ -173,60 +163,6 @@ export default function WorkSpace() {await db.diagrams.orderBy("lastModified").last()- .then((d) => {- if (d) {- if (d.database) {- setDatabase(d.database);- } else {- setDatabase(DB.GENERIC);- }- setId(d.id);- setGistId(d.gistId);- setLoadedFromGistId(d.loadedFromGistId);- setTitle(d.name);- setTables(d.tables);- setRelationships(d.references);- setNotes(d.notes);- setAreas(d.areas);- setTransform({ pan: d.pan, zoom: d.zoom });- if (databases[database].hasTypes) {- 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.map((e) => (!e.id ? { ...e, id: nanoid() } : e)) ?? [],- );- }- window.name = `d ${d.id}`;- } else {- window.name = "";- if (selectedDb === "") setShowSelectDbModal(true);- }- })- .catch((error) => {- console.log(error);- });- };-- const loadDiagram = async (id) => {- await db.diagrams- .get(id).then((diagram) => {if (diagram) {if (diagram.database) {@@ -234,20 +170,14 @@ export default function WorkSpace() {} else {setDatabase(DB.GENERIC);}- setId(diagram.id);setGistId(diagram.gistId);setLoadedFromGistId(diagram.loadedFromGistId);setTitle(diagram.name);setTables(diagram.tables);setRelationships(diagram.references);- setAreas(diagram.areas);setNotes(diagram.notes);- setTransform({- pan: diagram.pan,- zoom: diagram.zoom,- });- setUndoStack([]);- setRedoStack([]);+ setAreas(diagram.areas);+ setTransform({ pan: diagram.pan, zoom: diagram.zoom });if (databases[database].hasTypes) {if (diagram.types) {setTypes(@@ -274,9 +204,11 @@ export default function WorkSpace() {) ?? [],);}- window.name = `d ${diagram.id}`;+ navigate(`/editor/diagrams/${diagram.diagramId}`, {+ replace: true,+ });} else {- window.name = "";+ if (selectedDb === "") setShowSelectDbModal(true);}}).catch((error) => {@@ -284,65 +216,109 @@ export default function WorkSpace() {});};+ const loadDiagram = async (id) => {+ const diagram = await db.diagrams.where("diagramId").equals(id).first();++ if (!diagram) return;++ if (diagram.database) {+ setDatabase(diagram.database);+ } else {+ setDatabase(DB.GENERIC);+ }+ setGistId(diagram.gistId);+ setLoadedFromGistId(diagram.loadedFromGistId);+ setTitle(diagram.name);+ setTables(diagram.tables);+ setRelationships(diagram.references);+ setAreas(diagram.areas);+ setNotes(diagram.notes);+ setTransform({+ pan: diagram.pan,+ zoom: diagram.zoom,+ });+ setUndoStack([]);+ setRedoStack([]);+ if (databases[database].hasTypes) {+ 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.map((e) => (!e.id ? { ...e, id: nanoid() } : e)) ?? [],+ );+ }+ };+const loadTemplate = async (id) => {- await db.templates- .get(id)- .then((diagram) => {- if (diagram) {- if (diagram.database) {- setDatabase(diagram.database);- } else {- setDatabase(DB.GENERIC);- }- setId(diagram.id);- setTitle(diagram.title);- setTables(diagram.tables);- setRelationships(diagram.relationships);- setAreas(diagram.subjectAreas);- setNotes(diagram.notes);- setTransform({- zoom: 1,- pan: { x: 0, y: 0 },- });- setUndoStack([]);- setRedoStack([]);- if (databases[database].hasTypes) {- 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.map((e) =>- !e.id ? { ...e, id: nanoid() } : e,- ) ?? [],- );- }+ const template = await db.templates+ .where("templateId")+ .equals(id)+ .first();++ if (template) {+ if (template.database) {+ setDatabase(template.database);+ } else {+ setDatabase(DB.GENERIC);+ }+ setTitle(template.title);+ setTables(template.tables);+ setRelationships(template.relationships);+ setAreas(template.subjectAreas);+ setNotes(template.notes);+ setTransform({+ zoom: 1,+ pan: { x: 0, y: 0 },+ });+ setUndoStack([]);+ setRedoStack([]);+ if (databases[database].hasTypes) {+ if (template.types) {+ setTypes(+ template.types.map((t) =>+ t.id+ ? t+ : {+ ...t,+ id: nanoid(),+ fields: t.fields.map((f) =>+ f.id ? f : { ...f, id: nanoid() },+ ),+ },+ ),+ );} else {- if (selectedDb === "") setShowSelectDbModal(true);+ setTypes([]);}- })- .catch((error) => {- console.log(error);- if (selectedDb === "") setShowSelectDbModal(true);- });+ }+ if (databases[database].hasEnums) {+ setEnums(+ template.enums.map((e) => (!e.id ? { ...e, id: nanoid() } : e)) ??+ [],+ );+ }+ } else {+ if (selectedDb === "") setShowSelectDbModal(true);+ }};- const loadFromGist = async (shareId) => {+ const loadFromGist = async (shareId, diagramId = null) => {try {const { data } = await get(shareId);const parsedDiagram = JSON.parse(data.files[SHARE_FILENAME].content);@@ -383,6 +359,11 @@ export default function WorkSpace() {) ?? [],);}+ if (diagramId) {+ navigate(`/editor/diagrams/${diagramId}`, {+ replace: true,+ });+ }} catch (e) {console.log(e);setSaveState(State.FAILED_TO_LOAD);@@ -395,36 +376,23 @@ export default function WorkSpace() {loadedFromGistId: shareId,});- if (existingDiagram) {- window.name = "d " + existingDiagram.id;- setId(existingDiagram.id);- } else {- window.name = "";- setId(0);- }- await loadFromGist(shareId);+ await loadFromGist(shareId, existingDiagram?.diagramId || null);return;}- if (window.name === "") {+ if (!loadedDiagramId) {await loadLatestDiagram();- } else {- const name = window.name.split(" ");- const op = name[0];- const id = parseInt(name[1]);- switch (op) {- case "d": {- await loadDiagram(id);- break;- }- case "t":- case "lt": {- await loadTemplate(id);- break;- }- default:- break;- }+ return;+ }++ if (isDiagram && loadedDiagramId) {+ await loadDiagram(loadedDiagramId);+ return;+ }++ if (isTemplate && loadedDiagramId) {+ await loadTemplate(loadedDiagramId);+ return;}}, [setTransform,@@ -441,6 +409,10 @@ export default function WorkSpace() {selectedDb,setSaveState,searchParams,+ navigate,+ isDiagram,+ isTemplate,+ loadedDiagramId,]);const returnToCurrentDiagram = async () => {@@ -494,8 +466,6 @@ export default function WorkSpace() {<div className="h-full flex flex-col overflow-hidden theme"><IdContext.Provider value={{ gistId, setGistId, version, setVersion }}><ControlPanel- diagramId={id}- setDiagramId={setId}title={title}setTitle={setTitle}lastSaved={lastSaved}diff --git a/src/data/db.js b/src/data/db.jsindex adddd912..be65138b 100644--- a/src/data/db.js+++ b/src/data/db.js@@ -3,10 +3,23 @@ import { templateSeeds } from "./seeds";export const db = new Dexie("drawDB");-db.version(6).stores({- diagrams: "++id, lastModified, loadedFromGistId",- templates: "++id, custom",-});+db.version(67)+ .stores({+ diagrams: "++id, lastModified, loadedFromGistId, diagramId",+ templates: "++id, custom, templateId",+ })+ .upgrade(async (tx) => {+ await tx.diagrams.toCollection().modify((diagram) => {+ if (!diagram.diagramId) {+ diagram.diagramId = crypto.randomUUID();+ }+ });+ await tx.templates.toCollection().modify((template) => {+ if (!template.templateId) {+ template.templateId = crypto.randomUUID();+ }+ });+ });db.on("populate", (transaction) => {transaction.templates.bulkAdd(templateSeeds).catch((e) => console.log(e));diff --git a/src/pages/Templates.jsx b/src/pages/Templates.jsxindex 066ab6c6..b542a8e7 100644--- a/src/pages/Templates.jsx+++ b/src/pages/Templates.jsx@@ -10,25 +10,19 @@ import template_screenshot from "../assets/template_screenshot.png";export default function Templates() {const defaultTemplates = useLiveQuery(() =>- db.templates.where({ custom: 0 }).toArray()+ db.templates.where({ custom: 0 }).toArray(),);const customTemplates = useLiveQuery(() =>- db.templates.where({ custom: 1 }).toArray()+ db.templates.where({ custom: 1 }).toArray(),);const deleteTemplate = async (id) => {await db.templates.delete(id);};- const editTemplate = (id) => {- const newWindow = window.open("/editor", "_blank");- newWindow.name = "t " + id;- };-const forkTemplate = (id) => {- const newWindow = window.open("/editor", "_blank");- newWindow.name = "lt " + id;+ window.open("/editor/templates/" + id, "_blank");};useEffect(() => {@@ -89,7 +83,7 @@ export default function Templates() {</div><buttonclassName="border rounded-sm px-2 py-1 bg-white hover:bg-gray-200 transition-all duration-300"- onClick={() => forkTemplate(t.id)}+ onClick={() => forkTemplate(t.templateId)}><i className="fa-solid fa-code-fork"></i></button>@@ -122,21 +116,13 @@ export default function Templates() {<div><buttonclassName="me-1 border rounded-sm px-2 py-1 bg-white hover:bg-gray-200 transition-all duration-300"- onClick={() => forkTemplate(c.id)}+ onClick={() => forkTemplate(c.templateId)}><i className="fa-solid fa-code-fork"></i></button></div></div><div className="flex justify-around mt-2">- <button- className="w-full text-center flex justify-center items-center border rounded-sm px-2 py-1 bg-white hover:bg-gray-200 transition-all duration-300 text-blue-500"- onClick={() => editTemplate(c.id)}- >- <i className="bi bi-pencil-fill"></i>- <div className="ms-1.5 font-semibold">Edit</div>- </button>- <div className="border-l border-gray-300 mx-2" /><buttonclassName="w-full text-center flex justify-center items-center border rounded-sm px-2 py-1 bg-white hover:bg-gray-200 transition-all duration-300 text-red-500"onClick={() => deleteTemplate(c.id)}@@ -192,7 +178,8 @@ export default function Templates() {</div><hr className="border-zinc-300 my-1" /><div className="text-center text-sm py-3">- © {new Date().getFullYear()} <strong>drawDB</strong> - All rights reserved.+ © {new Date().getFullYear()} <strong>drawDB</strong> - All rights+ reserved.</div></div>);diff --git a/src/templates/template1.js b/src/templates/template1.jsindex 0185c530..c2166a3c 100644--- a/src/templates/template1.js+++ b/src/templates/template1.js@@ -348,4 +348,5 @@ export const template1 = {description:"A blog database including tables such as posts, users, comments, and tags to facilitate the storage and retrieval of blog-related information.",custom: 0,+ templateId: crypto.randomUUID(),};diff --git a/src/templates/template2.js b/src/templates/template2.jsindex ad51ae13..de7f3108 100644--- a/src/templates/template2.js+++ b/src/templates/template2.js@@ -352,4 +352,5 @@ export const template2 = {description:"A Human Resources (HR) schema designed to manage employee and project related information within an organization.",custom: 0,+ templateId: crypto.randomUUID(),};diff --git a/src/templates/template3.js b/src/templates/template3.jsindex 363dde0b..a768bf32 100644--- a/src/templates/template3.js+++ b/src/templates/template3.js@@ -424,4 +424,5 @@ export const template3 = {description:"An e-commerce schema designed to manage various aspects of an online store, including products, orders, and customers.",custom: 0,+ templateId: crypto.randomUUID(),};diff --git a/src/templates/template4.js b/src/templates/template4.jsindex 7e0fa8b9..4b5eadbf 100644--- a/src/templates/template4.js+++ b/src/templates/template4.js@@ -364,4 +364,5 @@ export const template4 = {description:"A library schema designed to manage the books, genres, reservations, and other aspects of a library system",custom: 0,+ templateId: crypto.randomUUID(),};diff --git a/src/templates/template5.js b/src/templates/template5.jsindex f0e3fd97..17c701e1 100644--- a/src/templates/template5.js+++ b/src/templates/template5.js@@ -635,4 +635,5 @@ export const template5 = {description:"A financial schema designed to manage financial transactions, accounts, customers, and other aspects of financial data.",custom: 0,+ templateId: crypto.randomUUID(),};diff --git a/src/templates/template6.js b/src/templates/template6.jsindex 6cdffc5f..bc9c3254 100644--- a/src/templates/template6.js+++ b/src/templates/template6.js@@ -459,4 +459,5 @@ export const template6 = {description:"A university schema designed to manage information about students, courses, instructors, and other aspects of university-related data.",custom: 0,+ templateId: crypto.randomUUID(),};