Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-18 03:00:41 +01:00
Code Issues Packages Projects Releases Activity

chore(react/dialog): improve recent changes

Browse Source
This commit is contained in:
Elian Doran
2025-08-07 22:31:51 +03:00
parent c0d7278827
commit bd6c690160
4 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
apps/client/src/widgets/dialogs/recent_changes.tsx
View File

@@ -1,6 +1,6 @@
import { useEffect, useState } from "preact/hooks";
import { EventData } from "../../components/app_context";
import { openDialog } from "../../services/dialog";
import appContext, { EventData } from "../../components/app_context";
import dialog, { closeActiveDialog, openDialog } from "../../services/dialog";
import { t } from "../../services/i18n";
import server from "../../services/server";
import toast from "../../services/toast";
@@ -8,11 +8,12 @@ import Button from "../react/Button";
import Modal from "../react/Modal";
import ReactBasicWidget from "../react/ReactBasicWidget";
import hoisted_note from "../../services/hoisted_note";
import { RecentChangesRow } from "@triliumnext/commons";
import type { RecentChangesRow } from "@triliumnext/commons";
import froca from "../../services/froca";
import { formatDateTime } from "../../utils/formatters";
import link from "../../services/link";
import RawHtml from "../react/RawHtml";
import ws from "../../services/ws";
interface RecentChangesDialogProps {
ancestorNoteId?: string;
@@ -90,9 +91,9 @@ function RecentChangesTimeline({ groupedByDate }: { groupedByDate: Map<String, R
return (
<li className={isDeleted ? "deleted-note" : ""}>
<span title={change.date}>{formattedTime}</span>
{ !isDeleted && notePath
{ !isDeleted
? <NoteLink notePath={notePath} title={change.current_title} />
: <span className="note-title">{change.current_title}</span> }
: <DeletedNoteLink change={change} /> }
</li>
);
})}
@@ -117,7 +118,35 @@ function NoteLink({ notePath, title }: { notePath: string, title: string }) {
}).then(setNoteLink);
}, [notePath, title]);
return (
noteLink ? <RawHtml className="note-title" html={noteLink[0].innerHTML} /> : <span className="note-title">Foo {title}</span>
noteLink ? <RawHtml className="note-title" html={noteLink[0].innerHTML} /> : <span className="note-title">{title}</span>
);
}
function DeletedNoteLink({ change }: { change: RecentChangesRow }) {
return (
<>
<span className="note-title">{change.current_title}</span>
&nbsp;
(<a href="javascript:"
onClick={() => {
async () => {
const text = t("recent_changes.confirm_undelete");
if (await dialog.confirm(text)) {
await server.put(`notes/${change.noteId}/undelete`);
closeActiveDialog();
await ws.waitForMaxKnownEntityChangeId();
const activeContext = appContext.tabManager.getActiveContext();
if (activeContext) {
activeContext.setNote(change.noteId);
}
}
}
}}>
{t("recent_changes.undelete_link")})
</a>
</>
);
}