agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-06-02 05:41:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26257 from overleaf/mj-ide-breadcrumbs-crash

Browse Source 
[web] Avoid editor crash when breadcrumbs can't find open entity

GitOrigin-RevId: 7c7f198c82e102ee9f8e2a59ca1755c3550bdf37
This commit is contained in:
Mathias Jakobsen
2025-06-09 10:16:49 +01:00
committed by Copybot
parent e0f6ee8b20
commit d3a9b4943a
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/web/frontend/js/features/ide-react/context/online-users-context.tsx
View File

@@ -95,7 +95,7 @@ export const OnlineUsersProvider: FC<React.PropsWithChildren> = ({
for (const [clientId, user] of Object.entries(onlineUsers)) {
const decoratedUser = { ...user }
const docId = user.doc_id
if (docId) {
if (docId && fileTreeData) {
decoratedUser.doc = findDocEntityById(fileTreeData, docId)
}

33
services/web/frontend/js/features/ide-redesign/components/breadcrumbs.tsx
View File

@@ -1,4 +1,7 @@
import { findInTreeOrThrow } from '@/features/file-tree/util/find-in-tree'
import {
findInTree,
findInTreeOrThrow,
} from '@/features/file-tree/util/find-in-tree'
import { useFileTreeOpenContext } from '@/features/ide-react/context/file-tree-open-context'
import { useOutlineContext } from '@/features/ide-react/context/outline-context'
import useNestedOutline from '@/features/outline/hooks/use-nested-outline'
@@ -39,35 +42,41 @@ export default function Breadcrumbs() {
const { highlightedLine, canShowOutline } = useOutlineContext()
const folderHierarchy = useMemo(() => {
if (!openEntity || !fileTreeData) {
if (openEntity?.type !== 'doc' || !fileTreeData) {
return []
}
return openEntity.path
.filter(id => id !== fileTreeData._id) // Filter out the root folder
.map(id => {
return findInTreeOrThrow(fileTreeData, id)?.entity
})
try {
return openEntity.path
.filter(id => id !== fileTreeData._id) // Filter out the root folder
.map(id => {
return findInTreeOrThrow(fileTreeData, id)?.entity
})
} catch {
// If any of the folders in the path are not found, the entire hierarchy
// is invalid.
return []
}
}, [openEntity, fileTreeData])
const fileName = useMemo(() => {
// NOTE: openEntity.entity.name may not always be accurate, so we read it
// from the file tree data instead.
if (!openEntity || !fileTreeData) {
if (openEntity?.type !== 'doc' || !fileTreeData) {
return undefined
}
return findInTreeOrThrow(fileTreeData, openEntity.entity._id)?.entity.name
return findInTree(fileTreeData, openEntity.entity._id)?.entity.name
}, [fileTreeData, openEntity])
const outlineHierarchy = useMemo(() => {
if (!canShowOutline || !outline) {
if (openEntity?.type !== 'doc' || !canShowOutline || !outline) {
return []
}
return constructOutlineHierarchy(outline.items, highlightedLine)
}, [outline, highlightedLine, canShowOutline])
}, [outline, highlightedLine, canShowOutline, openEntity])
if (!openEntity || !fileTreeData) {
if (openEntity?.type !== 'doc' || !fileTreeData) {
return null
}