gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-12-05 06:54:23 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

rename conflicting type name

Browse Source
This commit is contained in:
contributor 2025-11-21 14:08:53 +02:00
parent 0cec3c7764
commit 400674325a
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/client/src/widgets/EditedNotes.tsx
View File

@ -1,5 +1,5 @@
import { useEffect, useState } from "preact/hooks"; 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 server from "../services/server";
import { t } from "../services/i18n"; import { t } from "../services/i18n";
import froca from "../services/froca"; import froca from "../services/froca";
@ -12,7 +12,7 @@ interface EditedNotesProps {
} }
export default function EditedNotes({ noteId, dateFilter } : EditedNotesProps) { export default function EditedNotes({ noteId, dateFilter } : EditedNotesProps) {
const [ editedNotes, setEditedNotes ] = useState<EditedNotesList>(); const [ editedNotes, setEditedNotes ] = useState<EditedNote[]>();
useEffect(() => { useEffect(() => {
if (!noteId || !dateFilter) return; if (!noteId || !dateFilter) return;

2
apps/server/src/routes/api/edited-notes.ts
View File

@ -6,7 +6,7 @@ import becca from "../../becca/becca.js";
import type { Request } from "express"; import type { Request } from "express";
import { NotePojo } from "../../becca/becca-interface.js"; import { NotePojo } from "../../becca/becca-interface.js";
import type BNote from "../../becca/entities/bnote.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"; import dateUtils from "../../services/date_utils.js";
interface NotePath { interface NotePath {

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

@ -164,7 +164,7 @@ export type ToggleInParentResponse = {
} }
export type EditedNotesResponse = { export type EditedNotesResponse = {
notes: EditedNotes, notes: EditedNote[],
limit: number limit: number
} }
@ -175,8 +175,6 @@ export type EditedNote = {
notePath?: string[] | null; notePath?: string[] | null;
}; };
export type EditedNotes = EditedNote[];
export interface MetadataResponse { export interface MetadataResponse {
dateCreated: string | undefined; dateCreated: string | undefined;
utcDateCreated: string; utcDateCreated: string;