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

chore(client/ts): port widgets/attribute_editor

Browse Source
This commit is contained in:
Elian Doran 2024-12-22 21:59:08 +02:00
parent b01725101d
commit a349223e54
No known key found for this signature in database
8 changed files with 207 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/public/app/components/app_context.ts
View File

@ -19,7 +19,8 @@ import { ResolveOptions } from "../widgets/dialogs/delete_notes.js";
import { PromptDialogOptions } from "../widgets/dialogs/prompt.js";
import { ConfirmWithMessageOptions, ConfirmWithTitleOptions } from "../widgets/dialogs/confirm.js";
import { Node } from "../services/tree.js";
import FAttribute from "../entities/fattribute.js";
import LoadResults from "../services/load_results.js";
import { Attribute } from "../services/attribute_parser.js";
interface Layout {
getRootWidget: (appContext: AppContext) => RootWidget;
@ -36,7 +37,7 @@ interface BeforeUploadListener extends Component {
/**
* Base interface for the data/arguments for a given command (see {@link CommandMappings}).
*/
interface CommandData {
export interface CommandData {
ntxId?: string;
}
@ -144,8 +145,13 @@ export type CommandMappings = {
copyImageReferenceToClipboard: CommandData;
copyImageToClipboard: CommandData;
updateAttributesList: {
attributes: FAttribute[];
attributes: Attribute[];
};
addNewLabel: CommandData;
addNewRelation: CommandData;
addNewLabelDefinition: CommandData;
addNewRelationDefinition: CommandData;
}
type EventMappings = {
@ -162,8 +168,19 @@ type EventMappings = {
noteId: string;
messages: string[];
};
entitiesReloaded: {
loadResults: LoadResults
};
addNewLabel: CommandData;
addNewRelation: CommandData;
}
export type EventListener<T extends EventNames> = {
[key in T as `${key}Event`]: (data: EventData<T>) => void
}
export type EventData<T extends EventNames> = EventMappings[T];
type CommandAndEventMappings = (CommandMappings & EventMappings);
/**

7
src/public/app/services/attribute_parser.ts
View File

@ -7,13 +7,14 @@ interface Token {
endIndex: number;
}
interface Attribute {
export interface Attribute {
type: AttributeType;
name: string;
isInheritable: boolean;
value?: string;
startIndex: number;
endIndex: number;
startIndex?: number;
endIndex?: number;
noteId?: string;
}
function lex(str: string) {

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

@ -1,6 +1,7 @@
import server from './server.js';
import froca from './froca.js';
import FNote from '../entities/fnote.js';
import { AttributeRow } from './load_results.js';
async function addLabel(noteId: string, name: string, value: string = "") {
await server.put(`notes/${noteId}/attribute`, {
@ -23,18 +24,18 @@ async function removeAttributeById(noteId: string, attributeId: string) {
}
/**
* @returns {boolean} - 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:
* 1. attribute is owned by the note
* 2. attribute is owned by the template of the note
* 3. attribute is owned by some note's ancestor and is inheritable
*/
function isAffecting(this: { isInheritable: boolean }, attrRow: { noteId: string }, affectedNote: FNote) {
function isAffecting(attrRow: AttributeRow, affectedNote: FNote) {
if (!affectedNote || !attrRow) {
return false;
}
const attrNote = froca.notes[attrRow.noteId];
const attrNote = attrRow.noteId && froca.notes[attrRow.noteId];
if (!attrNote) {
// the note (owner of the attribute) is not even loaded into the cache, so it should not affect anything else
@ -50,6 +51,7 @@ function isAffecting(this: { isInheritable: boolean }, attrRow: { noteId: string
}
// TODO: This doesn't seem right.
//@ts-ignore
if (this.isInheritable) {
for (const owningNote of owningNotes) {
if (owningNote.hasAncestor(attrNote.noteId, true)) {

8
src/public/app/services/load_results.ts
View File

@ -5,9 +5,11 @@ interface BranchRow {
componentId: string;
}
interface AttributeRow {
export interface AttributeRow {
noteId?: string;
attributeId: string;
componentId: string;
isInheritable?: boolean;
}
interface RevisionRow {
@ -110,11 +112,11 @@ export default class LoadResults {
this.attributeRows.push({attributeId, componentId});
}
getAttributeRows(componentId = 'none') {
getAttributeRows(componentId = 'none'): AttributeRow[] {
return this.attributeRows
.filter(row => row.componentId !== componentId)
.map(row => this.getEntityRow("attributes", row.attributeId))
.filter(attr => !!attr);
.filter(attr => !!attr) as AttributeRow[];
}
addRevision(revisionId: string, noteId?: string, componentId?: string | null) {

4
src/public/app/services/note_autocomplete.ts
View File

@ -30,14 +30,14 @@ interface Options {
}
async function autocompleteSourceForCKEditor(queryText: string) {
return await new Promise((res, rej) => {
return await new Promise<MentionItem[]>((res, rej) => {
autocompleteSource(queryText, rows => {
res(rows.map(row => {
return {
action: row.action,
noteTitle: row.noteTitle,
id: `@${row.notePathTitle}`,
name: row.notePathTitle,
name: row.notePathTitle || "",
link: `#${row.notePath}`,
notePath: row.notePath,
highlightedNotePathTitle: row.highlightedNotePathTitle

85
src/public/app/types.d.ts vendored
View File

@ -144,4 +144,89 @@ declare global {
}
};
var MERMAID_ELK: MermaidLoader;
var CKEditor: {
BalloonEditor: {
create(el: HTMLElement, config: {
removePlugins?: string[];
toolbar: {
items: any[];
},
placeholder: string;
mention: MentionConfig
})
}
};
type TextEditorElement = {};
interface Writer {
setAttribute(name: string, value: string, el: TextEditorElement);
createPositionAt(el: TextEditorElement, opt?: "end");
setSelection(pos: number);
}
interface TextNode {
previousSibling?: TextNode;
name: string;
data: string;
startOffset: number;
_attrs: {
get(key: string): {
length: number
}
}
}
interface TextPosition {
textNode: TextNode;
offset: number;
}
interface TextEditor {
model: {
document: {
on(event: string, cb: () => void);
getRoot(): TextEditorElement;
selection: {
getFirstPosition(): undefined | TextPosition;
}
},
change(cb: (writer: Writer) => void)
},
editing: {
view: {
document: {
on(event: string, cb: (event: {
stop();
}, data: {
preventDefault();
}) => void, opts?: {
priority: "high"
});
getRoot(): TextEditorElement
},
change(cb: (writer: Writer) => void)
}
},
getData(): string;
setData(data: string): void;
}
interface MentionItem {
action?: string;
noteTitle?: string;
id: string;
name: string;
link?: string;
notePath?: string;
highlightedNotePathTitle?: string;
}
interface MentionConfig {
feeds: {
marker: string;
feed: (queryText: string) => MentionItem[] | Promise<MentionItem[]>;
itemRenderer?: (item: {
highlightedNotePathTitle: string
}) => void;
minimumCharacters: number;
}[];
}
}

20
src/public/app/widgets/attribute_widgets/attribute_detail.ts
View File

@ -12,6 +12,7 @@ import shortcutService from "../../services/shortcuts.js";
import appContext from "../../components/app_context.js";
import FAttribute from "../../entities/fattribute.js";
import FNote, { FNoteRow } from "../../entities/fnote.js";
import { Attribute } from "../../services/attribute_parser.js";
const TPL = `
<div class="attr-detail">
@ -269,12 +270,12 @@ const ATTR_HELP: Record<string, Record<string, string>> = {
};
interface AttributeDetailOpts {
allAttributes: FAttribute[];
attribute: FAttribute;
allAttributes: Attribute[];
attribute: Attribute;
isOwned: boolean;
x: number;
y: number;
focus: "name";
focus?: "name";
}
interface SearchRelatedResponse {
@ -319,8 +320,8 @@ export default class AttributeDetailWidget extends NoteContextAwareWidget {
private $attrHelp!: JQuery<HTMLElement>;
private relatedNotesSpacedUpdate!: SpacedUpdate;
private attribute!: FAttribute;
private allAttributes!: FAttribute[];
private attribute!: Attribute;
private allAttributes!: Attribute[];
private attrType!: ReturnType<AttributeDetailWidget["getAttrType"]>;
async refresh() {
@ -475,7 +476,7 @@ export default class AttributeDetailWidget extends NoteContextAwareWidget {
: (this.attrType === 'relation-definition' ? attribute.name.substr(9) : attribute.name);
const definition = this.attrType?.endsWith('-definition')
? promotedAttributeDefinitionParser.parse(attribute.value)
? promotedAttributeDefinitionParser.parse(attribute.value || "")
: {};
if (this.attrType) {
@ -492,8 +493,7 @@ export default class AttributeDetailWidget extends NoteContextAwareWidget {
if (isOwned) {
this.$attrIsOwnedBy.hide();
}
else {
} else if (attribute.noteId) {
this.$attrIsOwnedBy
.show()
.empty()
@ -543,7 +543,7 @@ export default class AttributeDetailWidget extends NoteContextAwareWidget {
if (attribute.type === 'label') {
this.$inputValue
.val(attribute.value)
.val(attribute.value || "")
.attr('readonly', disabledFn);
}
else if (attribute.type === 'relation') {
@ -696,7 +696,7 @@ export default class AttributeDetailWidget extends NoteContextAwareWidget {
}
}
getAttrType(attribute: FAttribute) {
getAttrType(attribute: Attribute) {
if (attribute.type === 'label') {
if (attribute.name.startsWith('label:')) {
return "label-definition";

90
src/public/app/widgets/attribute_widgets/attribute_editor.js → src/public/app/widgets/attribute_widgets/attribute_editor.ts
View File

@ -3,13 +3,17 @@ import NoteContextAwareWidget from "../note_context_aware_widget.js";
import noteAutocompleteService from "../../services/note_autocomplete.js";
import server from "../../services/server.js";
import contextMenuService from "../../menus/context_menu.js";
import attributeParser from "../../services/attribute_parser.js";
import attributeParser, { Attribute } from "../../services/attribute_parser.js";
import libraryLoader from "../../services/library_loader.js";
import froca from "../../services/froca.js";
import attributeRenderer from "../../services/attribute_renderer.js";
import noteCreateService from "../../services/note_create.js";
import attributeService from "../../services/attributes.js";
import linkService from "../../services/link.js";
import AttributeDetailWidget from "./attribute_detail.js";
import { CommandData, EventData, EventListener, FilteredCommandNames } from "../../components/app_context.js";
import FAttribute, { AttributeType } from "../../entities/fattribute.js";
import FNote from "../../entities/fnote.js";
const HELP_TEXT = `
<p>${t("attribute_editor.help_text_body1")}</p>
@ -79,7 +83,7 @@ const TPL = `
</div>
`;
const mentionSetup = {
const mentionSetup: MentionConfig = {
feeds: [
{
marker: '@',
@ -96,7 +100,7 @@ const mentionSetup = {
{
marker: '#',
feed: async queryText => {
const names = await server.get(`attribute-names/?type=label&query=${encodeURIComponent(queryText)}`);
const names = await server.get<string[]>(`attribute-names/?type=label&query=${encodeURIComponent(queryText)}`);
return names.map(name => {
return {
@ -110,7 +114,7 @@ const mentionSetup = {
{
marker: '~',
feed: async queryText => {
const names = await server.get(`attribute-names/?type=relation&query=${encodeURIComponent(queryText)}`);
const names = await server.get<string[]>(`attribute-names/?type=relation&query=${encodeURIComponent(queryText)}`);
return names.map(name => {
return {
@ -179,8 +183,24 @@ const editorConfig = {
mention: mentionSetup
};
export default class AttributeEditorWidget extends NoteContextAwareWidget {
constructor(attributeDetailWidget) {
type AttributeCommandNames = FilteredCommandNames<CommandData>;
export default class AttributeEditorWidget extends NoteContextAwareWidget implements
EventListener<"entitiesReloaded">,
EventListener<"addNewLabel">,
EventListener<"addNewRelation"> {
private attributeDetailWidget: AttributeDetailWidget;
private $editor!: JQuery<HTMLElement>;
private $addNewAttributeButton!: JQuery<HTMLElement>;
private $saveAttributesButton!: JQuery<HTMLElement>;
private $errors!: JQuery<HTMLElement>;
private textEditor!: TextEditor;
private lastUpdatedNoteId!: string | undefined;
private lastSavedContent!: string;
constructor(attributeDetailWidget: AttributeDetailWidget) {
super();
this.attributeDetailWidget = attributeDetailWidget;
@ -212,8 +232,8 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget {
this.$errors = this.$widget.find('.attribute-errors');
}
addNewAttribute(e) {
contextMenuService.show({
addNewAttribute(e: JQuery.ClickEvent) {
contextMenuService.show<AttributeCommandNames>({
x: e.pageX,
y: e.pageY,
orientation: 'left',
@ -229,7 +249,7 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget {
}
// triggered from keyboard shortcut
async addNewLabelEvent({ntxId}) {
async addNewLabelEvent({ntxId}: EventData<"addNewLabel">) {
if (this.isNoteContext(ntxId)) {
await this.refresh();
@ -238,7 +258,7 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget {
}
// triggered from keyboard shortcut
async addNewRelationEvent({ntxId}) {
async addNewRelationEvent({ntxId}: EventData<"addNewRelation">) {
if (this.isNoteContext(ntxId)) {
await this.refresh();
@ -246,14 +266,17 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget {
}
}
async handleAddNewAttributeCommand(command) {
const attrs = this.parseAttributes();
async handleAddNewAttributeCommand(command: AttributeCommandNames | undefined) {
// TODO: Not sure what the relation between FAttribute[] and Attribute[] is.
const attrs = this.parseAttributes() as FAttribute[];
if (!attrs) {
return;
}
let type, name, value;
let type: AttributeType;
let name;
let value;
if (command === 'addNewLabel') {
type = 'label';
@ -275,6 +298,8 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget {
return;
}
// TODO: Incomplete type
//@ts-ignore
attrs.push({
type,
name,
@ -326,8 +351,7 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget {
parseAttributes() {
try {
return attributeParser.lexAndParse(this.getPreprocessedData());
}
catch (e) {
} catch (e: any) {
this.$errors.text(e.message).slideDown();
}
}
@ -376,7 +400,7 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget {
}
}
async handleEditorClick(e) {
async handleEditorClick(e: JQuery.ClickEvent) {
const pos = this.textEditor.model.document.selection.getFirstPosition();
if (pos && pos.textNode && pos.textNode.data) {
@ -395,7 +419,8 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget {
let matchedAttr = null;
for (const attr of parsedAttrs) {
if (clickIndex > attr.startIndex && clickIndex <= attr.endIndex) {
if (attr.startIndex && clickIndex > attr.startIndex &&
attr.endIndex && clickIndex <= attr.endIndex) {
matchedAttr = attr;
break;
}
@ -437,7 +462,7 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget {
this.$editor.tooltip('show');
}
getClickIndex(pos) {
getClickIndex(pos: TextPosition) {
let clickIndex = pos.offset - pos.textNode.startOffset;
let curNode = pos.textNode;
@ -455,20 +480,19 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget {
return clickIndex;
}
async loadReferenceLinkTitle($el, href) {
async loadReferenceLinkTitle($el: JQuery<HTMLElement>, href: string) {
const {noteId} = linkService.parseNavigationStateFromUrl(href);
const note = await froca.getNote(noteId, true);
const note = noteId ? await froca.getNote(noteId, true) : null;
const title = note ? note.title : '[missing]';
$el.text(title);
}
async refreshWithNote(note) {
async refreshWithNote(note: FNote) {
await this.renderOwnedAttributes(note.getOwnedAttributes(), true);
}
async renderOwnedAttributes(ownedAttributes, saved) {
async renderOwnedAttributes(ownedAttributes: FAttribute[], saved: boolean) {
// attrs are not resorted if position changes after the initial load
ownedAttributes.sort((a, b) => a.position - b.position);
@ -487,16 +511,19 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget {
}
}
async createNoteForReferenceLink(title) {
const {note} = await noteCreateService.createNoteWithTypePrompt(this.notePath, {
activate: false,
title: title
});
async createNoteForReferenceLink(title: string) {
let result;
if (this.notePath) {
result = await noteCreateService.createNoteWithTypePrompt(this.notePath, {
activate: false,
title: title
});
}
return note.getBestNotePathString();
return result?.note?.getBestNotePathString();
}
async updateAttributeList(attributes) {
async updateAttributeList(attributes: FAttribute[]) {
await this.renderOwnedAttributes(attributes, false);
}
@ -510,9 +537,10 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget {
} );
}
entitiesReloadedEvent({loadResults}) {
entitiesReloadedEvent({loadResults}: EventData<"entitiesReloaded">) {
if (loadResults.getAttributeRows(this.componentId).find(attr => attributeService.isAffecting(attr, this.note))) {
this.refresh();
}
}
}