Skip to content

Free, simple, and intuitive online database diagram editor and SQL generator.

Clean up workspace

1ilit83985ba18849
diff --git a/src/components/Workspace.jsx b/src/components/Workspace.jsx
index 0cbd0e89..a2c5e297 100644
--- a/src/components/Workspace.jsx
+++ b/src/components/Workspace.jsx
@@ -25,11 +25,11 @@ export default function WorkSpace() {
const [width, setWidth] = useState(340);
const [lastSaved, setLastSaved] = useState("");
const { layout } = useLayout();
+ const { settings } = useSettings();
const { types, setTypes } = useTypes();
const { areas, setAreas } = useAreas();
const { tasks, setTasks } = useTasks();
const { notes, setNotes } = useNotes();
- const { settings, setSettings } = useSettings();
const { saveState, setSaveState } = useSaveState();
const { transform, setTransform } = useTransform();
const { tables, relationships, setTables, setRelationships } = useTables();
@@ -41,91 +41,45 @@ export default function WorkSpace() {
if (w > 340) setWidth(w);
};
- useEffect(() => {
- if (
- tables?.length === 0 &&
- areas?.length === 0 &&
- notes?.length === 0 &&
- types?.length === 0 &&
- tasks?.length === 0
- )
- return;
-
- if (settings.autosave) {
- setSaveState(State.SAVING);
- }
- }, [
- undoStack,
- redoStack,
- settings.autosave,
- tables?.length,
- areas?.length,
- notes?.length,
- types?.length,
- relationships?.length,
- tasks?.length,
- transform.zoom,
- title,
- setSaveState,
- ]);
+ const save = useCallback(async () => {
+ const name = window.name.split(" ");
+ const op = name[0];
+ const saveAsDiagram = window.name === "" || op === "d" || op === "lt";
- const save = useCallback(
- async (diagram = true) => {
- if (saveState !== State.SAVING) {
- return;
- }
- if (diagram) {
- if (
- (id === 0 && window.name === "") ||
- window.name.split(" ")[0] === "lt"
- ) {
- db.diagrams
- .add({
- name: title,
- lastModified: new Date(),
- tables: tables,
- references: relationships,
- types: types,
- notes: notes,
- areas: areas,
- todos: tasks,
- pan: transform.pan,
- zoom: transform.zoom,
- })
- .then((id) => {
- setId(id);
- window.name = `d ${id}`;
- setSaveState(State.SAVED);
- setLastSaved(new Date().toLocaleString());
- });
- } else {
- db.diagrams
- .update(id, {
- name: title,
- lastModified: new Date(),
- tables: tables,
- references: relationships,
- types: types,
- notes: notes,
- areas: areas,
- todos: tasks,
- pan: transform.pan,
- zoom: transform.zoom,
- })
- .then(() => {
- setSaveState(State.SAVED);
- setLastSaved(new Date().toLocaleString());
- });
- }
+ if (saveAsDiagram) {
+ if (
+ (id === 0 && window.name === "") ||
+ window.name.split(" ")[0] === "lt"
+ ) {
+ await db.diagrams
+ .add({
+ name: title,
+ lastModified: new Date(),
+ tables: tables,
+ references: relationships,
+ types: types,
+ notes: notes,
+ areas: areas,
+ todos: tasks,
+ pan: transform.pan,
+ zoom: transform.zoom,
+ })
+ .then((id) => {
+ setId(id);
+ window.name = `d ${id}`;
+ setSaveState(State.SAVED);
+ setLastSaved(new Date().toLocaleString());
+ });
} else {
- db.templates
+ await db.diagrams
.update(id, {
- title: title,
+ name: title,
+ lastModified: new Date(),
tables: tables,
- relationships: relationships,
+ references: relationships,
types: types,
notes: notes,
- subjectAreas: areas,
+ areas: areas,
todos: tasks,
pan: transform.pan,
zoom: transform.zoom,
@@ -133,40 +87,45 @@ export default function WorkSpace() {
.then(() => {
setSaveState(State.SAVED);
setLastSaved(new Date().toLocaleString());
- })
- .catch(() => {
- setSaveState(State.ERROR);
});
}
- },
- [
- tables,
- relationships,
- notes,
- areas,
- types,
- title,
- id,
- saveState,
- tasks,
- transform.zoom,
- transform.pan,
- setSaveState,
- ]
- );
- useEffect(() => {
- const name = window.name.split(" ");
- const op = name[0];
- const diagram = window.name === "" || op === "d" || op === "lt";
-
- save(diagram);
- }, [id, saveState, save]);
-
- useEffect(() => {
- document.title = "Editor | drawDB";
+ } else {
+ await db.templates
+ .update(id, {
+ title: title,
+ tables: tables,
+ relationships: relationships,
+ types: types,
+ notes: notes,
+ subjectAreas: areas,
+ todos: tasks,
+ pan: transform.pan,
+ zoom: transform.zoom,
+ })
+ .then(() => {
+ setSaveState(State.SAVED);
+ setLastSaved(new Date().toLocaleString());
+ })
+ .catch(() => {
+ setSaveState(State.ERROR);
+ });
+ }
+ }, [
+ tables,
+ relationships,
+ notes,
+ areas,
+ types,
+ title,
+ id,
+ tasks,
+ transform,
+ setSaveState,
+ ]);
+ const load = useCallback(async () => {
const loadLatestDiagram = async () => {
- db.diagrams
+ await db.diagrams
.orderBy("lastModified")
.last()
.then((d) => {
@@ -190,7 +149,7 @@ export default function WorkSpace() {
};
const loadDiagram = async (id) => {
- db.diagrams
+ await db.diagrams
.get(id)
.then((diagram) => {
if (diagram) {
@@ -219,7 +178,7 @@ export default function WorkSpace() {
};
const loadTemplate = async (id) => {
- db.templates
+ await db.templates
.get(id)
.then((diagram) => {
if (diagram) {
@@ -244,24 +203,20 @@ export default function WorkSpace() {
});
};
- if (window.name == "") {
- console.log("Loading the latest diagram");
+ if (window.name === "") {
loadLatestDiagram();
} else {
const name = window.name.split(" ");
const op = name[0];
- const did = parseInt(name[1]);
+ const id = parseInt(name[1]);
switch (op) {
case "d": {
- loadDiagram(did);
+ loadDiagram(id);
break;
}
+ case "t":
case "lt": {
- loadTemplate(did);
- break;
- }
- case "t": {
- loadTemplate(did);
+ loadTemplate(id);
break;
}
default:
@@ -269,7 +224,6 @@ export default function WorkSpace() {
}
}
}, [
- setSettings,
setTransform,
setRedoStack,
setUndoStack,
@@ -281,6 +235,46 @@ export default function WorkSpace() {
setTasks,
]);
+ useEffect(() => {
+ if (
+ tables?.length === 0 &&
+ areas?.length === 0 &&
+ notes?.length === 0 &&
+ types?.length === 0 &&
+ tasks?.length === 0
+ )
+ return;
+
+ if (settings.autosave) {
+ setSaveState(State.SAVING);
+ }
+ }, [
+ undoStack,
+ redoStack,
+ settings.autosave,
+ tables?.length,
+ areas?.length,
+ notes?.length,
+ types?.length,
+ relationships?.length,
+ tasks?.length,
+ transform.zoom,
+ title,
+ setSaveState,
+ ]);
+
+ useEffect(() => {
+ if (saveState !== State.SAVING) return;
+
+ save();
+ }, [id, saveState, save]);
+
+ useEffect(() => {
+ document.title = "Editor | drawDB";
+
+ load();
+ }, [load]);
+
return (
<div className="h-[100vh] flex flex-col overflow-hidden theme">
<ControlPanel
diff --git a/src/pages/Templates.jsx b/src/pages/Templates.jsx
index 208b436b..4d3ab715 100644
--- a/src/pages/Templates.jsx
+++ b/src/pages/Templates.jsx
@@ -110,7 +110,9 @@ export default function Templates() {
key={i}
className="bg-gray-100 hover:translate-y-[-6px] transition-all duration-300 border rounded-md"
>
- <Thumbnail diagram={c} i={"2" + i} />
+ <div className="h-48">
+ <Thumbnail diagram={c} i={"2" + i} zoom={0.3} />
+ </div>
<div className="px-4 py-3 w-full">
<div className="flex justify-between">
<div className="text-lg font-bold text-zinc-700">