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

server-ts: Convert routes/api/autocomplete

Browse Source
This commit is contained in:
Elian Doran 2024-04-05 20:26:45 +03:00
parent c0349b3f84
commit 82f5553980
No known key found for this signature in database
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/becca/becca-interface.ts
View File

@ -242,7 +242,7 @@ export default class Becca {
return (this as any)[camelCaseEntityName][entityId]; return (this as any)[camelCaseEntityName][entityId];
} }
getRecentNotesFromQuery(query: string, params = []): BRecentNote[] { getRecentNotesFromQuery(query: string, params: string[] = []): BRecentNote[] {
const rows = sql.getRows(query, params); const rows = sql.getRows(query, params);
const BRecentNote = require('./entities/brecent_note'); // avoiding circular dependency problems const BRecentNote = require('./entities/brecent_note'); // avoiding circular dependency problems

27
src/routes/api/autocomplete.js → src/routes/api/autocomplete.ts
View File

@ -1,21 +1,26 @@
"use strict"; "use strict";
const beccaService = require('../../becca/becca_service'); import beccaService = require('../../becca/becca_service');
const searchService = require('../../services/search/services/search'); import searchService = require('../../services/search/services/search');
const log = require('../../services/log'); import log = require('../../services/log');
const utils = require('../../services/utils'); import utils = require('../../services/utils');
const cls = require('../../services/cls'); import cls = require('../../services/cls');
const becca = require('../../becca/becca'); import becca = require('../../becca/becca');
import { Request } from 'express';
import ValidationError = require('../../errors/validation_error');
function getAutocomplete(req) { function getAutocomplete(req: Request) {
const query = req.query.query.trim(); if (typeof req.query.query !== "string") {
throw new ValidationError("Invalid query data type.");
}
const query = (req.query.query || "").trim();
const activeNoteId = req.query.activeNoteId || 'none'; const activeNoteId = req.query.activeNoteId || 'none';
let results; let results;
const timestampStarted = Date.now(); const timestampStarted = Date.now();
if (query.length === 0) { if (query.length === 0 && typeof activeNoteId === "string") {
results = getRecentNotes(activeNoteId); results = getRecentNotes(activeNoteId);
} }
else { else {
@ -31,7 +36,7 @@ function getAutocomplete(req) {
return results; return results;
} }
function getRecentNotes(activeNoteId) { function getRecentNotes(activeNoteId: string) {
let extraCondition = ''; let extraCondition = '';
const params = [activeNoteId]; const params = [activeNoteId];
@ -70,6 +75,6 @@ function getRecentNotes(activeNoteId) {
}); });
} }
module.exports = { export = {
getAutocomplete getAutocomplete
}; };

2
src/routes/routes.js
View File

@ -26,7 +26,7 @@ const treeApiRoute = require('./api/tree.js');
const notesApiRoute = require('./api/notes.js'); const notesApiRoute = require('./api/notes.js');
const branchesApiRoute = require('./api/branches.js'); const branchesApiRoute = require('./api/branches.js');
const attachmentsApiRoute = require('./api/attachments'); const attachmentsApiRoute = require('./api/attachments');
const autocompleteApiRoute = require('./api/autocomplete.js'); const autocompleteApiRoute = require('./api/autocomplete');
const cloningApiRoute = require('./api/cloning'); const cloningApiRoute = require('./api/cloning');
const revisionsApiRoute = require('./api/revisions'); const revisionsApiRoute = require('./api/revisions');
const recentChangesApiRoute = require('./api/recent_changes.js'); const recentChangesApiRoute = require('./api/recent_changes.js');