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

feat(note_language): allow removing language tag

Browse Source
This commit is contained in:
Elian Doran 2025-03-04 18:35:42 +02:00
parent 598586f735
commit bb42b5fb19
No known key found for this signature in database
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/public/app/services/attributes.ts
View File

@ -23,6 +23,28 @@ async function removeAttributeById(noteId: string, attributeId: string) {
await server.remove(`notes/${noteId}/attributes/${attributeId}`); await server.remove(`notes/${noteId}/attributes/${attributeId}`);
} }
/**
* Sets the attribute of the given note to the provided value if its truthy, or removes the attribute if the value is falsy.
* For an attribute with an empty value, pass an empty string instead.
*
* @param note the note to set the attribute to.
* @param type the type of attribute (label or relation).
* @param name the name of the attribute to set.
* @param value the value of the attribute to set.
*/
async function setAttribute(note: FNote, type: "label" | "relation", name: string, value: string | null | undefined) {
if (value) {
// Create or update the attribute.
await server.put(`notes/${note.noteId}/set-attribute`, { type, name, value });
} else {
// Remove the attribute if it exists on the server but we don't define a value for it.
const attributeId = note.getAttribute(type, name)?.attributeId;
if (attributeId) {
await server.remove(`notes/${note.noteId}/attributes/${attributeId}`);
}
}
}
/** /**
* @returns - returns true if this attribute has the potential to influence the note in the argument. * @returns - returns true if this attribute has the potential to influence the note in the argument.
* That can happen in multiple ways: * That can happen in multiple ways:
@ -66,6 +88,7 @@ function isAffecting(attrRow: AttributeRow, affectedNote: FNote | null | undefin
export default { export default {
addLabel, addLabel,
setLabel, setLabel,
setAttribute,
removeAttributeById, removeAttributeById,
isAffecting isAffecting
}; };

4
src/public/app/widgets/note_language.ts
View File

@ -76,9 +76,7 @@ export default class NoteLanguageWidget extends NoteContextAwareWidget {
return; return;
} }
if (languageId) { attributes.setAttribute(this.note, "label", "language", languageId);
attributes.setLabel(this.note.noteId, "language", languageId);
}
} }
async refreshWithNote(note: FNote) { async refreshWithNote(note: FNote) {

18
src/public/app/widgets/view_widgets/calendar_view.ts
View File

@ -229,8 +229,8 @@ export default class CalendarView extends ViewMode {
return; return;
} }
CalendarView.#setAttribute(note, "label", "startDate", startDate); attributes.setAttribute(note, "label", "startDate", startDate);
CalendarView.#setAttribute(note, "label", "endDate", endDate); attributes.setAttribute(note, "label", "endDate", endDate);
} }
onEntitiesReloaded({ loadResults }: EventData<"entitiesReloaded">) { onEntitiesReloaded({ loadResults }: EventData<"entitiesReloaded">) {
@ -435,20 +435,6 @@ export default class CalendarView extends ViewMode {
return [ note.title ]; return [ note.title ];
} }
static async #setAttribute(note: FNote, type: "label" | "relation", name: string, value: string | null | undefined) {
if (value) {
// Create or update the attribute.
await server.put(`notes/${note.noteId}/set-attribute`, { type, name, value });
} else {
// Remove the attribute if it exists on the server but we don't define a value for it.
const attributeId = note.getAttribute(type, name)?.attributeId;
if (attributeId) {
await server.remove(`notes/${note.noteId}/attributes/${attributeId}`);
}
}
await ws.waitForMaxKnownEntityChangeId();
}
static #formatDateToLocalISO(date: Date | null | undefined) { static #formatDateToLocalISO(date: Date | null | undefined) {
if (!date) { if (!date) {
return undefined; return undefined;