Merge pull request #18506 from overleaf/em-revert-web-resolved-comment-ids
Revert #18398 - return resolved commentIds with getDocument() GitOrigin-RevId: c5d2dd91d02d88029eb2702d73ac37cb8dbca32c
This commit is contained in:
@@ -90,13 +90,6 @@ async function deleteMessage(projectId, threadId, messageId) {
|
||||
)
|
||||
}
|
||||
|
||||
async function getResolvedThreadIds(projectId) {
|
||||
const body = await fetchJson(
|
||||
chatApiUrl(`/project/${projectId}/resolved-thread-ids`)
|
||||
)
|
||||
return body.resolvedThreadIds
|
||||
}
|
||||
|
||||
function chatApiUrl(path) {
|
||||
return new URL(path, settings.apis.chat.internal_url)
|
||||
}
|
||||
@@ -112,7 +105,6 @@ module.exports = {
|
||||
deleteThread: callbackify(deleteThread),
|
||||
editMessage: callbackify(editMessage),
|
||||
deleteMessage: callbackify(deleteMessage),
|
||||
getResolvedThreadIds: callbackify(getResolvedThreadIds),
|
||||
promises: {
|
||||
getThreads,
|
||||
destroyProject,
|
||||
@@ -124,6 +116,5 @@ module.exports = {
|
||||
deleteThread,
|
||||
editMessage,
|
||||
deleteMessage,
|
||||
getResolvedThreadIds,
|
||||
},
|
||||
}
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
const ChatApiHandler = require('../Chat/ChatApiHandler')
|
||||
const ProjectGetter = require('../Project/ProjectGetter')
|
||||
const ProjectLocator = require('../Project/ProjectLocator')
|
||||
const ProjectEntityHandler = require('../Project/ProjectEntityHandler')
|
||||
@@ -32,17 +31,6 @@ async function getDocument(req, res) {
|
||||
{ peek }
|
||||
)
|
||||
|
||||
const resolvedCommentIdsInProject =
|
||||
await ChatApiHandler.promises.getResolvedThreadIds(projectId)
|
||||
|
||||
const commentIdsInDoc = new Set(
|
||||
ranges.comments?.map(comment => comment.id) ?? []
|
||||
)
|
||||
|
||||
const resolvedCommentIds = resolvedCommentIdsInProject.filter(commentId =>
|
||||
commentIdsInDoc.has(commentId)
|
||||
)
|
||||
|
||||
if (plain) {
|
||||
plainTextResponse(res, lines.join('\n'))
|
||||
} else {
|
||||
@@ -65,7 +53,6 @@ async function getDocument(req, res) {
|
||||
projectHistoryId,
|
||||
projectHistoryType,
|
||||
historyRangesSupport,
|
||||
resolvedCommentIds,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user