github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-03-02 22:43:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3601 from overleaf/ta-file-tree-open-doc-null

Browse source 
[ReactFileTree] Fix Possible Entities Not Found Error

GitOrigin-RevId: 15fd8c0ad115cc30427114330e2a6e960fd2e9a2
This commit is contained in:
Miguel Serrano 2021-01-27 10:54:29 +01:00 committed by Copybot
parent ecd42944ad
commit 4955231abf
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -130,11 +130,14 @@ export function FileTreeSelectableProvider({
useEffect(() => { useEffect(() => {
// listen for `editor.openDoc` and selected that doc // listen for `editor.openDoc` and selected that doc
function handleOpenDoc(ev) { function handleOpenDoc(ev) {
dispatch({ type: ACTION_TYPES.SELECT, id: ev.detail }) const found = findInTree(fileTreeData, ev.detail)
if (!found) return
dispatch({ type: ACTION_TYPES.SELECT, id: found.entity._id })
} }
window.addEventListener('editor.openDoc', handleOpenDoc) window.addEventListener('editor.openDoc', handleOpenDoc)
return () => window.removeEventListener('editor.openDoc', handleOpenDoc) return () => window.removeEventListener('editor.openDoc', handleOpenDoc)
}, []) }, [fileTreeData])
return ( return (
<FileTreeSelectableContext.Provider <FileTreeSelectableContext.Provider

6
services/web/test/frontend/features/file-tree/components/file-tree-root.test.js
View file

@ -183,6 +183,12 @@ describe('<FileTreeRoot/>', function() {
screen.getByRole('treeitem', { name: 'main.tex', selected: true }) screen.getByRole('treeitem', { name: 'main.tex', selected: true })
// entities not found should be ignored
window.dispatchEvent(
new CustomEvent('editor.openDoc', { detail: 'not-an-id' })
)
screen.getByRole('treeitem', { name: 'main.tex', selected: true })
window.dispatchEvent( window.dispatchEvent(
new CustomEvent('editor.openDoc', { detail: '789ghi' }) new CustomEvent('editor.openDoc', { detail: '789ghi' })
) )