diff --git a/apps/client/src/translations/cn/translation.json b/apps/client/src/translations/cn/translation.json index 7ad6618a0..0f6800793 100644 --- a/apps/client/src/translations/cn/translation.json +++ b/apps/client/src/translations/cn/translation.json @@ -848,7 +848,7 @@ "debug": "调试", "debug_description": "调试将打印额外的调试信息到控制台，以帮助调试复杂查询", "action": "操作", - "search_button": "搜索 回车", + "search_button": "搜索", "search_execute": "搜索并执行操作", "save_to_note": "保存到笔记", "search_parameters": "搜索参数", diff --git a/apps/client/src/translations/de/translation.json b/apps/client/src/translations/de/translation.json index b9020ebce..0d2c74206 100644 --- a/apps/client/src/translations/de/translation.json +++ b/apps/client/src/translations/de/translation.json @@ -828,7 +828,7 @@ "debug": "debuggen", "debug_description": "Debug gibt zusätzliche Debuginformationen in die Konsole aus, um das Debuggen komplexer Abfragen zu erleichtern", "action": "Aktion", - "search_button": "Suchen Eingabetaste", + "search_button": "Suchen", "search_execute": "Aktionen suchen und ausführen", "save_to_note": "Als Notiz speichern", "search_parameters": "Suchparameter", diff --git a/apps/client/src/translations/en/translation.json b/apps/client/src/translations/en/translation.json index 6a7a966c9..ecbf40f62 100644 --- a/apps/client/src/translations/en/translation.json +++ b/apps/client/src/translations/en/translation.json @@ -848,7 +848,7 @@ "debug": "debug", "debug_description": "Debug will print extra debugging information into the console to aid in debugging complex queries", "action": "action", - "search_button": "Search enter", + "search_button": "Search", "search_execute": "Search & Execute actions", "save_to_note": "Save to note", "search_parameters": "Search Parameters", diff --git a/apps/client/src/translations/es/translation.json b/apps/client/src/translations/es/translation.json index 560456c32..4a0a7d684 100644 --- a/apps/client/src/translations/es/translation.json +++ b/apps/client/src/translations/es/translation.json @@ -848,7 +848,7 @@ "debug": "depurar", "debug_description": "La depuración imprimirá información de depuración adicional en la consola para ayudar a depurar consultas complejas", "action": "acción", - "search_button": "Buscar Enter", + "search_button": "Buscar", "search_execute": "Buscar y ejecutar acciones", "save_to_note": "Guardar en nota", "search_parameters": "Parámetros de búsqueda", diff --git a/apps/client/src/translations/fr/translation.json b/apps/client/src/translations/fr/translation.json index 20695211c..37cd2e061 100644 --- a/apps/client/src/translations/fr/translation.json +++ b/apps/client/src/translations/fr/translation.json @@ -848,7 +848,7 @@ "debug": "debug", "debug_description": "Debug imprimera des informations supplémentaires dans la console pour faciliter le débogage des requêtes complexes", "action": "action", - "search_button": "Recherche Entrée", + "search_button": "Recherche", "search_execute": "Rechercher et exécuter des actions", "save_to_note": "Enregistrer dans la note", "search_parameters": "Paramètres de recherche", diff --git a/apps/client/src/translations/ja/translation.json b/apps/client/src/translations/ja/translation.json index 6bdd89926..d35501a37 100644 --- a/apps/client/src/translations/ja/translation.json +++ b/apps/client/src/translations/ja/translation.json @@ -185,7 +185,7 @@ "debug": "デバッグ", "debug_description": "デバッグは複雑なクエリのデバッグを支援するために、追加のデバッグ情報をコンソールに出力します", "action": "アクション", - "search_button": "検索 Enter", + "search_button": "検索", "search_execute": "検索とアクションの実行", "save_to_note": "ノートに保存", "search_parameters": "検索パラメータ", diff --git a/apps/client/src/translations/pt_br/translation.json b/apps/client/src/translations/pt_br/translation.json index affef1885..ff18d5113 100644 --- a/apps/client/src/translations/pt_br/translation.json +++ b/apps/client/src/translations/pt_br/translation.json @@ -1006,7 +1006,7 @@ "limit_description": "Limitar número de resultados", "debug": "depurar", "action": "ação", - "search_button": "Pesquisar enter", + "search_button": "Pesquisar", "search_execute": "Pesquisar & Executar ações", "save_to_note": "Salvar para nota", "search_parameters": "Parâmetros de Pesquisa", diff --git a/apps/client/src/translations/ro/translation.json b/apps/client/src/translations/ro/translation.json index 57923ec28..89fdcc9dc 100644 --- a/apps/client/src/translations/ro/translation.json +++ b/apps/client/src/translations/ro/translation.json @@ -1106,7 +1106,7 @@ "limit_description": "Limitează numărul de rezultate", "order_by": "ordonează după", "save_to_note": "Salvează în notiță", - "search_button": "Căutare Enter", + "search_button": "Căutare", "search_execute": "Caută și execută acțiunile", "search_note_saved": "Notița de căutare a fost salvată în {{- notePathTitle}}", "search_parameters": "Parametrii de căutare", diff --git a/apps/client/src/translations/ru/translation.json b/apps/client/src/translations/ru/translation.json index df1ca0845..967634d2a 100644 --- a/apps/client/src/translations/ru/translation.json +++ b/apps/client/src/translations/ru/translation.json @@ -1060,7 +1060,7 @@ "fast_search": "быстрый поиск", "include_archived": "включать архивированные", "order_by": "сортировать по", - "search_button": "Поиск enter", + "search_button": "Поиск", "search_parameters": "Параметры поиска", "ancestor": "предок", "action": "действие", diff --git a/apps/client/src/translations/tw/translation.json b/apps/client/src/translations/tw/translation.json index 4b5da1d69..6dbde5a3e 100644 --- a/apps/client/src/translations/tw/translation.json +++ b/apps/client/src/translations/tw/translation.json @@ -845,7 +845,7 @@ "debug": "除錯", "debug_description": "除錯將顯示額外的除錯資訊至控制台，以幫助除錯複雜查詢", "action": "操作", - "search_button": "搜尋 Enter", + "search_button": "搜尋", "search_execute": "搜尋並執行操作", "save_to_note": "儲存至筆記", "search_parameters": "搜尋參數", diff --git a/apps/client/src/translations/uk/translation.json b/apps/client/src/translations/uk/translation.json index c2398bcc9..907828d91 100644 --- a/apps/client/src/translations/uk/translation.json +++ b/apps/client/src/translations/uk/translation.json @@ -960,7 +960,7 @@ "debug": "debug", "debug_description": "Debug виведе додаткову інформацію для налагодження в консоль, щоб допомогти у налагодженні складних запитів", "action": "дія", - "search_button": "Пошук enter", + "search_button": "Пошук", "search_execute": "Пошук & Виконання дій", "save_to_note": "Зберегти до нотатки", "search_parameters": "Параметри пошуку", diff --git a/apps/client/src/widgets/react/FormTextArea.tsx b/apps/client/src/widgets/react/FormTextArea.tsx index 801244c8c..d15fb879c 100644 --- a/apps/client/src/widgets/react/FormTextArea.tsx +++ b/apps/client/src/widgets/react/FormTextArea.tsx @@ -1,22 +1,26 @@ -interface FormTextAreaProps { +import { TextareaHTMLAttributes } from "preact/compat"; + +interface FormTextAreaProps extends Omit { id?: string; currentValue: string; + onChange?(newValue: string): void; onBlur?(newValue: string): void; rows: number; - className?: string; - placeholder?: string; } -export default function FormTextArea({ id, onBlur, rows, currentValue, className, placeholder }: FormTextAreaProps) { +export default function FormTextArea({ id, onBlur, onChange, rows, currentValue, className, ...restProps }: FormTextAreaProps) { return ( ) } diff --git a/apps/client/src/widgets/react/hooks.tsx b/apps/client/src/widgets/react/hooks.tsx index 45a751b10..1ac043f56 100644 --- a/apps/client/src/widgets/react/hooks.tsx +++ b/apps/client/src/widgets/react/hooks.tsx @@ -109,7 +109,7 @@ export function useTriliumEventBeta(eventName: T | T[], ha } } -export function useSpacedUpdate(callback: () => Promise, interval = 1000) { +export function useSpacedUpdate(callback: () => void | Promise, interval = 1000) { const callbackRef = useRef(callback); const spacedUpdateRef = useRef(); diff --git a/apps/client/src/widgets/ribbon/SearchDefinitionTab.tsx b/apps/client/src/widgets/ribbon/SearchDefinitionTab.tsx index 932892dc8..5ef43f6f0 100644 --- a/apps/client/src/widgets/ribbon/SearchDefinitionTab.tsx +++ b/apps/client/src/widgets/ribbon/SearchDefinitionTab.tsx @@ -6,9 +6,16 @@ import Dropdown from "../react/Dropdown"; import ActionButton from "../react/ActionButton"; import FormTextArea from "../react/FormTextArea"; import { AttributeType, OptionNames } from "@triliumnext/commons"; -import { removeOwnedAttributesByNameOrType } from "../../services/attributes"; +import attributes, { removeOwnedAttributesByNameOrType } from "../../services/attributes"; import { note } from "mermaid/dist/rendering-util/rendering-elements/shapes/note.js"; import FNote from "../../entities/fnote"; +import toast from "../../services/toast"; +import froca from "../../services/froca"; +import { useContext, useRef } from "preact/hooks"; +import { ParentComponent } from "../react/react_utils"; +import { useSpacedUpdate } from "../react/hooks"; +import appContext from "../../components/app_context"; +import server from "../../services/server"; interface SearchOption { searchOption: string; @@ -64,7 +71,29 @@ const SEARCH_OPTIONS: SearchOption[] = [ } ]; -export default function SearchDefinitionTab({ note }: TabContext) { +export default function SearchDefinitionTab({ note, ntxId }: TabContext) { + const parentComponent = useContext(ParentComponent); + + + async function refreshResults() { + const noteId = note?.noteId; + if (!noteId) { + return; + } + + try { + const result = await froca.loadSearchNote(noteId); + + if (result && result.error) { + //this.handleEvent("showSearchError", { error: result.error }); + } + } catch (e: any) { + toast.showError(e.message); + } + + parentComponent?.triggerEvent("searchRefreshed", { ntxId }); + } + return (
@@ -82,7 +111,27 @@ export default function SearchDefinitionTab({ note }: TabContext) { - + + + + + + + + +
+
+ +
@@ -114,7 +163,21 @@ function SearchOption({ note, title, children, help, attributeName, attributeTyp ) } -function SearchStringOption() { +function SearchStringOption({ note, refreshResults }: { note: FNote, refreshResults: () => void }) { + const currentValue = useRef(""); + const spacedUpdate = useSpacedUpdate(async () => { + const searchString = currentValue.current; + appContext.lastSearchString = searchString; + + await attributes.setAttribute(note, "label", "searchString", searchString); + + if (note.title.startsWith(t("search_string.search_prefix"))) { + await server.put(`notes/${note.noteId}/title`, { + title: `${t("search_string.search_prefix")} ${searchString.length < 30 ? searchString : `${searchString.substr(0, 30)}…`}` + }); + } + }, 1000); + return @@ -133,6 +196,21 @@ function SearchStringOption() { { + currentValue.current = text; + spacedUpdate.scheduleUpdate(); + }} + onKeyDown={async (e) => { + if (e.key === "Enter") { + e.preventDefault(); + + // this also in effect disallows new lines in query string. + // on one hand, this makes sense since search string is a label + // on the other hand, it could be nice for structuring long search string. It's probably a niche case though. + await spacedUpdate.updateNowIfNecessary(); + refreshResults(); + } + }} /> } \ No newline at end of file diff --git a/apps/client/src/widgets/ribbon_widgets/search_definition.ts b/apps/client/src/widgets/ribbon_widgets/search_definition.ts index 24e59c473..ed3f3dde7 100644 --- a/apps/client/src/widgets/ribbon_widgets/search_definition.ts +++ b/apps/client/src/widgets/ribbon_widgets/search_definition.ts @@ -43,7 +43,7 @@ const TPL = /*html*/`