diff --git a/apps/client/src/translations/en/translation.json b/apps/client/src/translations/en/translation.json index 7987a79ec1..958a576ccf 100644 --- a/apps/client/src/translations/en/translation.json +++ b/apps/client/src/translations/en/translation.json @@ -99,9 +99,11 @@ "notes_to_be_deleted": "Notes to be deleted ({{notesCount}})", "no_note_to_delete": "No note will be deleted (only clones).", "broken_relations_to_be_deleted": "Broken relations ({{relationCount}})", + "table_note": "Note", + "table_relation": "Relation", + "table_source": "Source", "cancel": "Cancel", "ok": "OK", - "deleted_relation_text": "Note {{- note}} (to be deleted) is referenced by relation {{- relation}} originating from {{- source}}.", "no_clones_message": "The selected notes have no clones." }, "export": { diff --git a/apps/client/src/widgets/dialogs/delete_notes.tsx b/apps/client/src/widgets/dialogs/delete_notes.tsx index edc0abd01e..59426a44bd 100644 --- a/apps/client/src/widgets/dialogs/delete_notes.tsx +++ b/apps/client/src/widgets/dialogs/delete_notes.tsx @@ -1,17 +1,18 @@ import "./delete_notes.css"; -import { useRef, useState, useEffect } from "preact/hooks"; -import { t } from "../../services/i18n.js"; -import Modal from "../react/Modal.js"; -import FormToggle from "../react/FormToggle.js"; import type { DeleteNotesPreview } from "@triliumnext/commons"; -import server from "../../services/server.js"; -import froca from "../../services/froca.js"; +import { useEffect,useRef, useState } from "preact/hooks"; + import FNote from "../../entities/fnote.js"; +import froca from "../../services/froca.js"; +import { t } from "../../services/i18n.js"; import link from "../../services/link.js"; +import server from "../../services/server.js"; import Button from "../react/Button.jsx"; -import { useTriliumEvent } from "../react/hooks.jsx"; import { Card, CardSection } from "../react/Card.js"; +import FormToggle from "../react/FormToggle.js"; +import { useTriliumEvent } from "../react/hooks.jsx"; +import Modal from "../react/Modal.js"; import OptionsRow from "../type_widgets/options/components/OptionsRow.js"; interface CloneInfo { @@ -49,7 +50,7 @@ export default function DeleteNotesDialog() { useTriliumEvent("showDeleteNotesDialog", (opts) => { setOpts(opts); setShown(true); - }) + }); // Calculate clone information when branches change useEffect(() => { @@ -102,7 +103,7 @@ export default function DeleteNotesDialog() { title={t("delete_notes.delete_notes_preview")} onShown={() => okButtonRef.current?.focus()} onHidden={() => { - opts.callback?.({ proceed: false }) + opts.callback?.({ proceed: false }); setShown(false); }} footer={<> @@ -240,13 +241,26 @@ function BrokenRelations({ brokenRelations }: { brokenRelations: DeleteNotesPrev return ( - +
+ + + + + + + + + + {notesWithBrokenRelations.map((relation, index) => ( + + + ))} + +
{t("delete_notes.table_note")}{t("delete_notes.table_relation")}{t("delete_notes.table_source")}
+ + +
+
);