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

refactor(react/promoted_attributes): deduplicate server API typings

Browse Source
This commit is contained in:
Elian Doran 2025-11-23 13:15:33 +02:00
parent 891e71aec6
commit 6a126009a8
No known key found for this signature in database
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/client/src/widgets/PromotedAttributes.tsx
View File

@ -12,6 +12,7 @@ import { ComponentChild, HTMLInputTypeAttribute, InputHTMLAttributes, MouseEvent
import tree from "../services/tree"; import tree from "../services/tree";
import NoteAutocomplete from "./react/NoteAutocomplete"; import NoteAutocomplete from "./react/NoteAutocomplete";
import ws from "../services/ws"; import ws from "../services/ws";
import { UpdateAttributeResponse } from "@triliumnext/commons";
interface Cell { interface Cell {
definitionAttr: FAttribute; definitionAttr: FAttribute;
@ -30,12 +31,6 @@ interface CellProps {
setCellToFocus(cell: Cell): void; setCellToFocus(cell: Cell): void;
} }
// TODO: Deduplicate
interface AttributeResult {
attributeId: string;
}
export default function PromotedAttributes() { export default function PromotedAttributes() {
const { note, componentId } = useNoteContext(); const { note, componentId } = useNoteContext();
const [ cells, setCells ] = useState<Cell[]>(); const [ cells, setCells ] = useState<Cell[]>();
@ -417,7 +412,7 @@ function buildPromotedAttributeLabelChangedListener({ note, cell, componentId, .
} }
function updateAttribute(note: FNote, cell: Cell, componentId: string, value: string) { function updateAttribute(note: FNote, cell: Cell, componentId: string, value: string) {
return server.put<AttributeResult>( return server.put<UpdateAttributeResponse>(
`notes/${note.noteId}/attribute`, `notes/${note.noteId}/attribute`,
{ {
attributeId: cell.valueAttr.attributeId, attributeId: cell.valueAttr.attributeId,

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

@ -7,6 +7,7 @@ import BAttribute from "../../becca/entities/battribute.js";
import becca from "../../becca/becca.js"; import becca from "../../becca/becca.js";
import ValidationError from "../../errors/validation_error.js"; import ValidationError from "../../errors/validation_error.js";
import type { Request } from "express"; import type { Request } from "express";
import { UpdateAttributeResponse } from "@triliumnext/commons";
function getEffectiveNoteAttributes(req: Request) { function getEffectiveNoteAttributes(req: Request) {
const note = becca.getNote(req.params.noteId); const note = becca.getNote(req.params.noteId);
@ -18,7 +19,7 @@ function updateNoteAttribute(req: Request) {
const noteId = req.params.noteId; const noteId = req.params.noteId;
const body = req.body; const body = req.body;
let attribute; let attribute: BAttribute;
if (body.attributeId) { if (body.attributeId) {
attribute = becca.getAttributeOrThrow(body.attributeId); attribute = becca.getAttributeOrThrow(body.attributeId);
@ -64,7 +65,7 @@ function updateNoteAttribute(req: Request) {
return { return {
attributeId: attribute.attributeId attributeId: attribute.attributeId
}; } satisfies UpdateAttributeResponse;
} }
function setNoteAttribute(req: Request) { function setNoteAttribute(req: Request) {

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

@ -273,3 +273,7 @@ export interface NoteMapPostResponse {
links: NoteMapLink[]; links: NoteMapLink[];
noteIdToDescendantCountMap: Record<string, number>; noteIdToDescendantCountMap: Record<string, number>;
} }
export interface UpdateAttributeResponse {
attributeId: string;
}