gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-20 15:19:01 +02:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

refactor(react/dialogs): deduplicate data types

Browse Source
This commit is contained in:
Elian Doran 2025-08-06 17:10:18 +03:00
parent 7a0f148d28
commit 0af5feab79
No known key found for this signature in database
5 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/client/src/widgets/dialogs/revisions.tsx
View File

@ -1,4 +1,4 @@
import { NoteType } from "@triliumnext/commons"; import type { FullRevision, RevisionItem } from "@triliumnext/commons";
import appContext, { EventData } from "../../components/app_context"; import appContext, { EventData } from "../../components/app_context";
import FNote from "../../entities/fnote"; import FNote from "../../entities/fnote";
import dialog, { closeActiveDialog, openDialog } from "../../services/dialog"; import dialog, { closeActiveDialog, openDialog } from "../../services/dialog";
@ -21,22 +21,6 @@ interface RevisionsDialogProps {
note?: FNote; note?: FNote;
} }
interface RevisionItem {
noteId: string;
revisionId: string;
dateLastEdited: string;
contentLength: number;
type: NoteType;
title: string;
isProtected: boolean;
mime: string;
}
interface FullRevision {
content: string;
mime: string;
}
function RevisionsDialogComponent({ note }: RevisionsDialogProps) { function RevisionsDialogComponent({ note }: RevisionsDialogProps) {
const [ revisions, setRevisions ] = useState<RevisionItem[]>([]); const [ revisions, setRevisions ] = useState<RevisionItem[]>([]);
const [ currentRevision, setCurrentRevision ] = useState<RevisionItem>(); const [ currentRevision, setCurrentRevision ] = useState<RevisionItem>();

4
apps/server/src/routes/api/notes.ts
View File

@ -12,7 +12,7 @@ import ValidationError from "../../errors/validation_error.js";
import blobService from "../../services/blob.js"; import blobService from "../../services/blob.js";
import type { Request } from "express"; import type { Request } from "express";
import type BBranch from "../../becca/entities/bbranch.js"; import type BBranch from "../../becca/entities/bbranch.js";
import type { AttributeRow } from "@triliumnext/commons"; import type { AttributeRow, DeleteNotesPreview } from "@triliumnext/commons";
/** /**
* @swagger * @swagger
@ -339,7 +339,7 @@ function getDeleteNotesPreview(req: Request) {
return { return {
noteIdsToBeDeleted: Array.from(noteIdsToBeDeleted), noteIdsToBeDeleted: Array.from(noteIdsToBeDeleted),
brokenRelations brokenRelations
}; } satisfies DeleteNotesPreview;
} }
function forceSaveRevision(req: Request) { function forceSaveRevision(req: Request) {

5
apps/server/src/routes/api/revisions.ts
View File

@ -12,6 +12,7 @@ import type { Request, Response } from "express";
import type BRevision from "../../becca/entities/brevision.js"; import type BRevision from "../../becca/entities/brevision.js";
import type BNote from "../../becca/entities/bnote.js"; import type BNote from "../../becca/entities/bnote.js";
import type { NotePojo } from "../../becca/becca-interface.js"; import type { NotePojo } from "../../becca/becca-interface.js";
import { RevisionItem, RevisionRow } from "@triliumnext/commons";
interface NotePath { interface NotePath {
noteId: string; noteId: string;
@ -41,7 +42,7 @@ function getRevisions(req: Request) {
WHERE revisions.noteId = ? WHERE revisions.noteId = ?
ORDER BY revisions.utcDateCreated DESC`, ORDER BY revisions.utcDateCreated DESC`,
[req.params.noteId] [req.params.noteId]
); ) satisfies RevisionItem[];
} }
function getRevision(req: Request) { function getRevision(req: Request) {
@ -59,7 +60,7 @@ function getRevision(req: Request) {
} }
} }
return revision; return revision satisfies RevisionRow;
} }
function getRevisionFilename(revision: BRevision) { function getRevisionFilename(revision: BRevision) {

4
packages/commons/src/lib/rows.ts
View File

@ -28,10 +28,10 @@ export interface RevisionRow {
title: string; title: string;
blobId?: string; blobId?: string;
dateLastEdited?: string; dateLastEdited?: string;
dateCreated: string; dateCreated?: string;
utcDateLastEdited?: string; utcDateLastEdited?: string;
utcDateCreated: string; utcDateCreated: string;
utcDateModified: string; utcDateModified?: string;
contentLength?: number; contentLength?: number;
} }

13
packages/commons/src/lib/server_api.ts
View File

@ -1,4 +1,4 @@
import { AttributeRow } from "./rows.js"; import { AttributeRow, NoteType } from "./rows.js";
export interface AppInfo { export interface AppInfo {
appVersion: string; appVersion: string;
@ -17,3 +17,14 @@ export interface DeleteNotesPreview {
noteIdsToBeDeleted: string[]; noteIdsToBeDeleted: string[];
brokenRelations: AttributeRow[]; brokenRelations: AttributeRow[];
} }
export interface RevisionItem {
noteId: string;
revisionId?: string;
dateLastEdited?: string;
contentLength?: number;
type: NoteType;
title: string;
isProtected?: boolean;
mime: string;
}