From 400674325a5a48862c1c40f6e3c83ebae2afab65 Mon Sep 17 00:00:00 2001 From: contributor Date: Fri, 21 Nov 2025 14:08:53 +0200 Subject: [PATCH] rename conflicting type name --- apps/client/src/widgets/EditedNotes.tsx | 4 ++-- apps/server/src/routes/api/edited-notes.ts | 2 +- packages/commons/src/lib/server_api.ts | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/apps/client/src/widgets/EditedNotes.tsx b/apps/client/src/widgets/EditedNotes.tsx index 155cfca60..3c27958f9 100644 --- a/apps/client/src/widgets/EditedNotes.tsx +++ b/apps/client/src/widgets/EditedNotes.tsx @@ -1,5 +1,5 @@ import { useEffect, useState } from "preact/hooks"; -import { EditedNotesResponse, EditedNotes as EditedNotesList } from "@triliumnext/commons"; +import { EditedNotesResponse, EditedNote } from "@triliumnext/commons"; import server from "../services/server"; import { t } from "../services/i18n"; import froca from "../services/froca"; @@ -12,7 +12,7 @@ interface EditedNotesProps { } export default function EditedNotes({ noteId, dateFilter } : EditedNotesProps) { - const [ editedNotes, setEditedNotes ] = useState(); + const [ editedNotes, setEditedNotes ] = useState(); useEffect(() => { if (!noteId || !dateFilter) return; diff --git a/apps/server/src/routes/api/edited-notes.ts b/apps/server/src/routes/api/edited-notes.ts index 884b554c0..5b794586f 100644 --- a/apps/server/src/routes/api/edited-notes.ts +++ b/apps/server/src/routes/api/edited-notes.ts @@ -6,7 +6,7 @@ import becca from "../../becca/becca.js"; import type { Request } from "express"; import { NotePojo } from "../../becca/becca-interface.js"; import type BNote from "../../becca/entities/bnote.js"; -import { EditedNotes, EditedNotesResponse } from "@triliumnext/commons"; +import { EditedNotesResponse } from "@triliumnext/commons"; import dateUtils from "../../services/date_utils.js"; interface NotePath { diff --git a/packages/commons/src/lib/server_api.ts b/packages/commons/src/lib/server_api.ts index 42958434c..9ab064d6e 100644 --- a/packages/commons/src/lib/server_api.ts +++ b/packages/commons/src/lib/server_api.ts @@ -164,7 +164,7 @@ export type ToggleInParentResponse = { } export type EditedNotesResponse = { - notes: EditedNotes, + notes: EditedNote[], limit: number } @@ -175,8 +175,6 @@ export type EditedNote = { notePath?: string[] | null; }; -export type EditedNotes = EditedNote[]; - export interface MetadataResponse { dateCreated: string | undefined; utcDateCreated: string;