From 52c27d8e7857a529b57c5c134284062f91aa2eff Mon Sep 17 00:00:00 2001 From: yu-i-i Date: Thu, 3 Jul 2025 20:10:28 +0200 Subject: [PATCH] Track changes: convert to `mjs` --- ...ntroller.js => TrackChangesController.mjs} | 25 ++++++++++--------- ...hangesRouter.js => TrackChangesRouter.mjs} | 24 ++++++++++-------- services/web/modules/track-changes/index.js | 2 -- services/web/modules/track-changes/index.mjs | 3 +++ 4 files changed, 30 insertions(+), 24 deletions(-) rename services/web/modules/track-changes/app/src/{TrackChangesController.js => TrackChangesController.mjs} (86%) rename services/web/modules/track-changes/app/src/{TrackChangesRouter.js => TrackChangesRouter.mjs} (81%) delete mode 100644 services/web/modules/track-changes/index.js create mode 100644 services/web/modules/track-changes/index.mjs diff --git a/services/web/modules/track-changes/app/src/TrackChangesController.js b/services/web/modules/track-changes/app/src/TrackChangesController.mjs similarity index 86% rename from services/web/modules/track-changes/app/src/TrackChangesController.js rename to services/web/modules/track-changes/app/src/TrackChangesController.mjs index e66a49d3d4..931ce06bfa 100644 --- a/services/web/modules/track-changes/app/src/TrackChangesController.js +++ b/services/web/modules/track-changes/app/src/TrackChangesController.mjs @@ -1,14 +1,14 @@ -const ChatApiHandler = require('../../../../app/src/Features/Chat/ChatApiHandler') -const ChatManager = require('../../../../app/src/Features/Chat/ChatManager') -const EditorRealTimeController = require('../../../../app/src/Features/Editor/EditorRealTimeController') -const SessionManager = require('../../../../app/src/Features/Authentication/SessionManager') -const UserInfoManager = require('../../../../app/src/Features/User/UserInfoManager') -const UserInfoController = require('../../../../app/src/Features/User/UserInfoController') -const DocstoreManager = require('../../../../app/src/Features/Docstore/DocstoreManager') -const DocumentUpdaterHandler = require('../../../../app/src/Features/DocumentUpdater/DocumentUpdaterHandler') -const CollaboratorsGetter = require('../../../../app/src/Features/Collaborators/CollaboratorsGetter') -const { Project } = require('../../../../app/src/models/Project') -const pLimit = require('p-limit') +import ChatApiHandler from '../../../../app/src/Features/Chat/ChatApiHandler.js' +import ChatManager from '../../../../app/src/Features/Chat/ChatManager.js' +import EditorRealTimeController from '../../../../app/src/Features/Editor/EditorRealTimeController.js' +import SessionManager from '../../../../app/src/Features/Authentication/SessionManager.js' +import UserInfoManager from '../../../../app/src/Features/User/UserInfoManager.js' +import UserInfoController from '../../../../app/src/Features/User/UserInfoController.js' +import DocstoreManager from '../../../../app/src/Features/Docstore/DocstoreManager.js' +import DocumentUpdaterHandler from '../../../../app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js' +import CollaboratorsGetter from '../../../../app/src/Features/Collaborators/CollaboratorsGetter.js' +import { Project } from '../../../../app/src/models/Project.js' +import pLimit from 'p-limit' function _transformId(doc) { if (doc._id) { @@ -168,4 +168,5 @@ const TrackChangesController = { } }, } -module.exports = TrackChangesController + +export default TrackChangesController diff --git a/services/web/modules/track-changes/app/src/TrackChangesRouter.js b/services/web/modules/track-changes/app/src/TrackChangesRouter.mjs similarity index 81% rename from services/web/modules/track-changes/app/src/TrackChangesRouter.js rename to services/web/modules/track-changes/app/src/TrackChangesRouter.mjs index 3791e251a1..21d73f2ad4 100644 --- a/services/web/modules/track-changes/app/src/TrackChangesRouter.js +++ b/services/web/modules/track-changes/app/src/TrackChangesRouter.mjs @@ -1,28 +1,32 @@ -const logger = require('@overleaf/logger') -const AuthorizationMiddleware = require('../../../../app/src/Features/Authorization/AuthorizationMiddleware') -const TrackChangesController = require('./TrackChangesController') +import logger from '@overleaf/logger' +import AuthorizationMiddleware from '../../../../app/src/Features/Authorization/AuthorizationMiddleware.js' +import TrackChangesController from './TrackChangesController.mjs' -module.exports = { +export default { apply(webRouter) { logger.debug({}, 'Init track-changes router') - webRouter.post('/project/:project_id/track_changes', + webRouter.post( + '/project/:project_id/track_changes', AuthorizationMiddleware.blockRestrictedUserFromProject, AuthorizationMiddleware.ensureUserCanReadProject, TrackChangesController.trackChanges ) - webRouter.post('/project/:project_id/doc/:doc_id/changes/accept', + webRouter.post( + '/project/:project_id/doc/:doc_id/changes/accept', AuthorizationMiddleware.blockRestrictedUserFromProject, AuthorizationMiddleware.ensureUserCanReadProject, TrackChangesController.acceptChanges ) - webRouter.get('/project/:project_id/ranges', + webRouter.get( + '/project/:project_id/ranges', AuthorizationMiddleware.blockRestrictedUserFromProject, AuthorizationMiddleware.ensureUserCanReadProject, TrackChangesController.getAllRanges ) - webRouter.get('/project/:project_id/changes/users', - AuthorizationMiddleware.blockRestrictedUserFromProject, + webRouter.get( + '/project/:project_id/changes/users', + AuthorizationMiddleware.blockRestrictedUserFromProject, AuthorizationMiddleware.ensureUserCanReadProject, TrackChangesController.getChangesUsers ) @@ -68,5 +72,5 @@ module.exports = { AuthorizationMiddleware.ensureUserCanReadProject, TrackChangesController.deleteThread ) - }, + } } diff --git a/services/web/modules/track-changes/index.js b/services/web/modules/track-changes/index.js deleted file mode 100644 index aa9e6a73da..0000000000 --- a/services/web/modules/track-changes/index.js +++ /dev/null @@ -1,2 +0,0 @@ -const TrackChangesRouter = require('./app/src/TrackChangesRouter') -module.exports = { router : TrackChangesRouter } diff --git a/services/web/modules/track-changes/index.mjs b/services/web/modules/track-changes/index.mjs new file mode 100644 index 0000000000..1ddf76966f --- /dev/null +++ b/services/web/modules/track-changes/index.mjs @@ -0,0 +1,3 @@ +import TrackChangesRouter from './app/src/TrackChangesRouter.mjs' +const TrackChangesModule = { router: TrackChangesRouter } +export default TrackChangesModule