Files
overleaf-cep/server-ce/hotfix/5.5.3/pr_27273.patch
Brian Gough ae180fba46 Merge pull request #27246 from overleaf/jpa-hotfix-5-5-3
[server-pro] add hotfix 5.5.3

GitOrigin-RevId: 6bd266afb8f5ba622224b6095204ee6801c05a44
2025-07-30 08:07:00 +00:00

83 lines
3.8 KiB
Diff

diff --git a/services/web/frontend/js/features/review-panel-new/components/review-tooltip-menu.tsx b/services/web/frontend/js/features/review-panel-new/components/review-tooltip-menu.tsx
index f26542ebe909..fb6b68460bdc 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-tooltip-menu.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-tooltip-menu.tsx
@@ -18,7 +18,6 @@ import {
reviewTooltipStateField,
} from '@/features/source-editor/extensions/review-tooltip'
import { EditorView, getTooltip } from '@codemirror/view'
-import useViewerPermissions from '@/shared/hooks/use-viewer-permissions'
import usePreviousValue from '@/shared/hooks/use-previous-value'
import { useLayoutContext } from '@/shared/context/layout-context'
import { useReviewPanelViewActionsContext } from '../context/review-panel-view-context'
@@ -35,6 +34,7 @@ import { useEditorPropertiesContext } from '@/features/ide-react/context/editor-
import classNames from 'classnames'
import useEventListener from '@/shared/hooks/use-event-listener'
import useReviewPanelLayout from '../hooks/use-review-panel-layout'
+import { usePermissionsContext } from '@/features/ide-react/context/permissions-context'
const EDIT_MODE_SWITCH_WIDGET_HEIGHT = 40
const CM_LINE_RIGHT_PADDING = 8
@@ -43,7 +43,7 @@ const TOOLTIP_SHOW_DELAY = 120
const ReviewTooltipMenu: FC = () => {
const state = useCodeMirrorStateContext()
const view = useCodeMirrorViewContext()
- const isViewer = useViewerPermissions()
+ const permissions = usePermissionsContext()
const [show, setShow] = useState(true)
const { setView } = useReviewPanelViewActionsContext()
const { openReviewPanel } = useReviewPanelLayout()
@@ -58,7 +58,7 @@ const ReviewTooltipMenu: FC = () => {
const addComment = useCallback(() => {
const { main } = view.state.selection
- if (main.empty) {
+ if (main.empty || !permissions.comment) {
return
}
@@ -74,11 +74,11 @@ const ReviewTooltipMenu: FC = () => {
view.dispatch({ effects })
setShow(false)
- }, [openReviewPanel, setView, setShow, view])
+ }, [view, permissions.comment, openReviewPanel, setView])
useEventListener('add-new-review-comment', addComment)
- if (isViewer || !show || !tooltipState) {
+ if (!permissions.comment || !show || !tooltipState) {
return null
}
diff --git a/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx b/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx
index 3404976d4462..1811ccc99950 100644
--- a/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx
+++ b/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx
@@ -16,5 +16,6 @@ import { isSplitTestEnabled } from '@/utils/splitTestUtils'
import { isMac } from '@/shared/utils/os'
import { useProjectContext } from '@/shared/context/project-context'
+import { usePermissionsContext } from '@/features/ide-react/context/permissions-context'
export const ToolbarItems: FC<{
state: EditorState
@@ -35,6 +36,7 @@ export const ToolbarItems: FC<{
useEditorPropertiesContext()
const { writefullInstance } = useEditorContext()
const { features } = useProjectContext()
+ const permissions = usePermissionsContext()
const isActive = withinFormattingCommand(state)
const symbolPaletteAvailable = getMeta('ol-symbolPaletteAvailable')
@@ -131,7 +133,7 @@ export const ToolbarItems: FC<{
command={commands.wrapInHref}
icon="add_link"
/>
- {features.trackChangesVisible && (
+ {features.trackChangesVisible && permissions.comment && (
<ToolbarButton
id="toolbar-add-comment"
label={t('add_comment')}