From 3d75366f02152afc342b033415e1d1301884f24f Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 6 Apr 2024 21:57:09 +0300 Subject: [PATCH] server-ts: Convert routes/api/options --- src/routes/api/{options.js => options.ts} | 21 +++++++++++---------- src/routes/routes.js | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) rename src/routes/api/{options.js => options.ts} (86%) diff --git a/src/routes/api/options.js b/src/routes/api/options.ts similarity index 86% rename from src/routes/api/options.js rename to src/routes/api/options.ts index 88f72ae71..54630e825 100644 --- a/src/routes/api/options.js +++ b/src/routes/api/options.ts @@ -1,9 +1,10 @@ "use strict"; -const optionService = require('../../services/options'); -const log = require('../../services/log'); -const searchService = require('../../services/search/services/search'); -const ValidationError = require('../../errors/validation_error'); +import optionService = require('../../services/options'); +import log = require('../../services/log'); +import searchService = require('../../services/search/services/search'); +import ValidationError = require('../../errors/validation_error'); +import { Request } from 'express'; // options allowed to be updated directly in the Options dialog const ALLOWED_OPTIONS = new Set([ @@ -62,7 +63,7 @@ const ALLOWED_OPTIONS = new Set([ function getOptions() { const optionMap = optionService.getOptionMap(); - const resultMap = {}; + const resultMap: Record = {}; for (const optionName in optionMap) { if (isAllowed(optionName)) { @@ -75,7 +76,7 @@ function getOptions() { return resultMap; } -function updateOption(req) { +function updateOption(req: Request) { const {name, value} = req.params; if (!update(name, value)) { @@ -83,7 +84,7 @@ function updateOption(req) { } } -function updateOptions(req) { +function updateOptions(req: Request) { for (const optionName in req.body) { if (!update(optionName, req.body[optionName])) { // this should be improved @@ -93,7 +94,7 @@ function updateOptions(req) { } } -function update(name, value) { +function update(name: string, value: string) { if (!isAllowed(name)) { return false; } @@ -128,14 +129,14 @@ function getUserThemes() { return ret; } -function isAllowed(name) { +function isAllowed(name: string) { return ALLOWED_OPTIONS.has(name) || name.startsWith("keyboardShortcuts") || name.endsWith("Collapsed") || name.startsWith("hideArchivedNotes"); } -module.exports = { +export = { getOptions, updateOption, updateOptions, diff --git a/src/routes/routes.js b/src/routes/routes.js index d028698a9..b5886e8f3 100644 --- a/src/routes/routes.js +++ b/src/routes/routes.js @@ -30,7 +30,7 @@ const autocompleteApiRoute = require('./api/autocomplete'); const cloningApiRoute = require('./api/cloning'); const revisionsApiRoute = require('./api/revisions'); const recentChangesApiRoute = require('./api/recent_changes.js'); -const optionsApiRoute = require('./api/options.js'); +const optionsApiRoute = require('./api/options'); const passwordApiRoute = require('./api/password'); const syncApiRoute = require('./api/sync'); const loginApiRoute = require('./api/login');