Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 20:06:08 +01:00
Code Issues Packages Projects Releases Activity

server-ts: Convert attribute_formatter

Browse Source
This commit is contained in:
Elian Doran
2024-02-17 19:15:50 +02:00
parent 9826fed905
commit a183f21078
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/routes/api/clipper.js
View File

@@ -12,7 +12,7 @@ const log = require('../../services/log');
const utils = require('../../services/utils');
const path = require('path');
const htmlSanitizer = require('../../services/html_sanitizer.js');
const {formatAttrForSearch} = require('../../services/attribute_formatter.js');
const {formatAttrForSearch} = require('../../services/attribute_formatter');
const jsdom = require("jsdom");
const { JSDOM } = jsdom;

2
src/routes/api/search.js
View File

@@ -5,7 +5,7 @@ const SearchContext = require('../../services/search/search_context.js');
const searchService = require('../../services/search/services/search.js');
const bulkActionService = require('../../services/bulk_actions.js');
const cls = require('../../services/cls');
const {formatAttrForSearch} = require('../../services/attribute_formatter.js');
const {formatAttrForSearch} = require('../../services/attribute_formatter');
const ValidationError = require('../../errors/validation_error');
function searchFromNote(req) {

8
src/services/attribute_formatter.js → src/services/attribute_formatter.ts
View File

@@ -1,6 +1,8 @@
"use strict";
function formatAttrForSearch(attr, searchWithValue) {
import BAttribute = require("../becca/entities/battribute");
function formatAttrForSearch(attr: BAttribute, searchWithValue: string) {
let searchStr = '';
if (attr.type === 'label') {
@@ -27,7 +29,7 @@ function formatAttrForSearch(attr, searchWithValue) {
return searchStr;
}
function formatValue(val) {
function formatValue(val: string) {
if (!/[^\w]/.test(val)) {
return val;
}
@@ -45,6 +47,6 @@ function formatValue(val) {
}
}
module.exports = {
export = {
formatAttrForSearch
};

2
src/services/attributes.js
View File

@@ -4,7 +4,7 @@ const searchService = require('./search/services/search.js');
const sql = require('./sql');
const becca = require('../becca/becca');
const BAttribute = require('../becca/entities/battribute');
const {formatAttrForSearch} = require('./attribute_formatter.js');
const {formatAttrForSearch} = require('./attribute_formatter');
const BUILTIN_ATTRIBUTES = require('./builtin_attributes');
const ATTRIBUTE_TYPES = ['label', 'relation'];