github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3502 from overleaf/ta-file-tree-select-created

Browse source 
[ReactFileTree] Auto-Select Entities Created by User

GitOrigin-RevId: b45d54cbe124c51be819456b8ea17ddd075b1922
This commit is contained in:
Timothée Alby 2021-01-05 11:56:58 +01:00 committed by Copybot
parent fc38e20dfb
commit 8c7bf5fbd2
7 changed files with 80 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
services/web/app/src/Features/Editor/EditorController.js
View file

@ -80,7 +80,8 @@ const EditorController = {
'reciveNewDoc',
folder_id,
doc,
source
source,
user_id
)
return callback(err, doc)
}
@ -124,7 +125,8 @@ const EditorController = {
folder_id,
fileRef,
source,
linkedFileData
linkedFileData,
user_id
)
return callback(err, fileRef)
}
@ -157,7 +159,8 @@ const EditorController = {
'reciveNewDoc',
folder_id,
doc,
source
source,
user_id
)
}
return callback(err, doc)
@ -205,7 +208,8 @@ const EditorController = {
folder_id,
newFile,
source,
linkedFileData
linkedFileData,
user_id
)
return callback(null, newFile)
}
@ -243,7 +247,8 @@ const EditorController = {
'reciveNewDoc',
lastFolder._id,
doc,
source
source,
user_id
)
}
return callback()
@ -295,7 +300,8 @@ const EditorController = {
lastFolder._id,
newFile,
source,
linkedFileData
linkedFileData,
user_id
)
return callback()
}
@ -304,7 +310,7 @@ const EditorController = {
)
},
addFolder(project_id, folder_id, folderName, source, callback) {
addFolder(project_id, folder_id, folderName, source, userId, callback) {
if (callback == null) {
callback = function(error, folder) {}
}
@ -328,6 +334,7 @@ const EditorController = {
project_id,
folder_id,
folder,
userId,
function(err) {
if (err != null) {
return callback(err)
@ -677,13 +684,20 @@ const EditorController = {
project_id,
folder.parentFolder_id,
folder,
null,
cb
),
callback
)
},
_notifyProjectUsersOfNewFolder(project_id, folder_id, folder, callback) {
_notifyProjectUsersOfNewFolder(
project_id,
folder_id,
folder,
userId,
callback
) {
if (callback == null) {
callback = function(error) {}
}
@ -691,7 +705,8 @@ const EditorController = {
project_id,
'reciveNewFolder',
folder_id,
folder
folder,
userId
)
return callback()
}

4
services/web/app/src/Features/Editor/EditorHttpController.js
View file

@ -170,6 +170,7 @@ async function addFolder(req, res, next) {
const projectId = req.params.Project_id
const { name } = req.body
const parentFolderId = req.body.parent_folder_id
const userId = AuthenticationController.getLoggedInUserId(req)
if (!_nameIsAcceptableLength(name)) {
return res.sendStatus(400)
}
@ -178,7 +179,8 @@ async function addFolder(req, res, next) {
projectId,
parentFolderId,
name,
'editor'
'editor',
userId
)
res.json(doc)
} catch (err) {

3
services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js
View file

@ -1643,7 +1643,8 @@ const ProjectEntityUpdateHandler = {
folder._id,
fileRef,
'convertDocToFile',
null
null,
userId
)
callback(null, fileRef)
}

3
services/web/app/src/Features/Uploads/FileSystemImportManager.js
View file

@ -71,7 +71,8 @@ async function addFolder(userId, projectId, folderId, name, path, replace) {
projectId,
folderId,
name,
'upload'
'upload',
userId
)
await addFolderContents(userId, projectId, newFolder._id, path, replace)
return newFolder

5
services/web/frontend/js/features/file-tree/contexts/file-tree-selectable.js
View file

@ -154,12 +154,17 @@ export function useSelectableEntity(id) {
export function useFileTreeSelectable() {
const { selectedEntityIds, dispatch } = useContext(FileTreeSelectableContext)
function select(id) {
dispatch({ type: ACTION_TYPES.SELECT, id })
}
function unselect(id) {
dispatch({ type: ACTION_TYPES.UNSELECT, id })
}
return {
selectedEntityIds,
select,
unselect
}
}

34
services/web/frontend/js/features/file-tree/hooks/file-tree-socket-listener.js
View file

@ -1,4 +1,4 @@
import { useEffect } from 'react'
import { useCallback, useEffect } from 'react'
import { useFileTreeMutable } from '../contexts/file-tree-mutable'
import { useFileTreeSelectable } from '../contexts/file-tree-selectable'
@ -12,9 +12,18 @@ export function useFileTreeSocketListener() {
dispatchCreateDoc,
dispatchCreateFile
} = useFileTreeMutable()
const { unselect } = useFileTreeSelectable()
const { select, unselect } = useFileTreeSelectable()
const socket = window._ide && window._ide.socket
const selectEntityIfCreatedByUser = useCallback(
(entityId, userId) => {
if (window.user && window.user.id && window.user.id === userId) {
select(entityId)
}
},
[select]
)
useEffect(() => {
function handleDispatchRename(entityId, name) {
dispatchRename(entityId, name)
@ -48,34 +57,43 @@ export function useFileTreeSocketListener() {
}, [socket, dispatchMove])
useEffect(() => {
function handleDispatchCreateFolder(parentFolderId, folder) {
function handleDispatchCreateFolder(parentFolderId, folder, userId) {
dispatchCreateFolder(parentFolderId, folder)
selectEntityIfCreatedByUser(folder._id, userId)
}
if (socket) socket.on('reciveNewFolder', handleDispatchCreateFolder)
return () => {
if (socket)
socket.removeListener('reciveNewFolder', handleDispatchCreateFolder)
}
}, [socket, dispatchCreateFolder])
}, [socket, dispatchCreateFolder, selectEntityIfCreatedByUser])
useEffect(() => {
function handleDispatchCreateDoc(parentFolderId, doc) {
function handleDispatchCreateDoc(parentFolderId, doc, _source, userId) {
dispatchCreateDoc(parentFolderId, doc)
selectEntityIfCreatedByUser(doc._id, userId)
}
if (socket) socket.on('reciveNewDoc', handleDispatchCreateDoc)
return () => {
if (socket) socket.removeListener('reciveNewDoc', handleDispatchCreateDoc)
}
}, [socket, dispatchCreateDoc])
}, [socket, dispatchCreateDoc, selectEntityIfCreatedByUser])
useEffect(() => {
function handleDispatchCreateFile(parentFolderId, file) {
function handleDispatchCreateFile(
parentFolderId,
file,
_source,
_linkedFileData,
userId
) {
dispatchCreateFile(parentFolderId, file)
selectEntityIfCreatedByUser(file._id, userId)
}
if (socket) socket.on('reciveNewFile', handleDispatchCreateFile)
return () => {
if (socket)
socket.removeListener('reciveNewFile', handleDispatchCreateFile)
}
}, [socket, dispatchCreateFile])
}, [socket, dispatchCreateFile, selectEntityIfCreatedByUser])
}

29
services/web/test/unit/src/Editor/EditorControllerTests.js
View file

@ -22,11 +22,13 @@ const modulePath = require('path').join(
)
const MockClient = require('../helpers/MockClient')
const assert = require('assert')
const { ObjectId } = require('mongodb')
describe('EditorController', function() {
beforeEach(function() {
this.project_id = 'test-project-id'
this.source = 'dropbox'
this.user_id = new ObjectId()
this.doc = { _id: (this.doc_id = 'test-doc-id') }
this.docName = 'doc.tex'
@ -112,7 +114,8 @@ describe('EditorController', function() {
'reciveNewDoc',
this.folder_id,
this.doc,
this.source
this.source,
this.user_id
)
.should.equal(true)
})
@ -160,7 +163,8 @@ describe('EditorController', function() {
this.folder_id,
this.file,
this.source,
this.linkedFileData
this.linkedFileData,
this.user_id
)
.should.equal(true)
})
@ -225,7 +229,8 @@ describe('EditorController', function() {
'reciveNewDoc',
this.folder_id,
this.doc,
this.source
this.source,
this.user_id
)
.should.equal(true)
})
@ -291,7 +296,8 @@ describe('EditorController', function() {
this.folder_id,
this.file,
this.source,
this.linkedFileData
this.linkedFileData,
this.user_id
)
.should.equal(true)
})
@ -343,7 +349,8 @@ describe('EditorController', function() {
'reciveNewDoc',
this.folder_id,
this.doc,
this.source
this.source,
this.user_id
)
.should.equal(true)
})
@ -442,7 +449,8 @@ describe('EditorController', function() {
this.folder_id,
this.file,
this.source,
this.linkedFileData
this.linkedFileData,
this.user_id
)
.should.equal(true)
})
@ -502,6 +510,7 @@ describe('EditorController', function() {
this.folder_id,
this.folderName,
this.source,
this.user_id,
this.callback
)
})
@ -513,11 +522,9 @@ describe('EditorController', function() {
})
it('should notifyProjectUsersOfNewFolder', function() {
return this.EditorController._notifyProjectUsersOfNewFolder.calledWith(
this.project_id,
this.folder_id,
this.folder
)
return this.EditorController._notifyProjectUsersOfNewFolder
.calledWith(this.project_id, this.folder_id, this.folder, this.user_id)
.should.equal(true)
})
it('should return the folder in the callback', function() {