From 3c8a9d98637234d6cc1e52a2583f56785e21094a Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Mon, 18 Jul 2022 11:24:14 +0100 Subject: [PATCH] Merge pull request #8853 from overleaf/jpa-no-pdf-download-in-editor-only-mode [web] do not download the pdf in editor only view mode GitOrigin-RevId: 4d8936964540c0820f72abb8c858e86e2e7196e2 --- .../js/features/pdf-preview/components/pdf-preview.js | 4 ++++ .../components/toolbar-header.test.js | 4 ++-- services/web/test/frontend/helpers/editor-providers.js | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-preview.js b/services/web/frontend/js/features/pdf-preview/components/pdf-preview.js index 1e56c4d2f5..33d820df0b 100644 --- a/services/web/frontend/js/features/pdf-preview/components/pdf-preview.js +++ b/services/web/frontend/js/features/pdf-preview/components/pdf-preview.js @@ -3,9 +3,13 @@ import useCompileTriggers from '../hooks/use-compile-triggers' import { memo } from 'react' import withErrorBoundary from '../../../infrastructure/error-boundary' import ErrorBoundaryFallback from './error-boundary-fallback' +import { useLayoutContext } from '../../../shared/context/layout-context' function PdfPreview() { useCompileTriggers() + + const { detachRole } = useLayoutContext() + if (detachRole === 'detacher') return null return } diff --git a/services/web/test/frontend/features/editor-navigation-toolbar/components/toolbar-header.test.js b/services/web/test/frontend/features/editor-navigation-toolbar/components/toolbar-header.test.js index 40cb16b85d..b7f0b78a64 100644 --- a/services/web/test/frontend/features/editor-navigation-toolbar/components/toolbar-header.test.js +++ b/services/web/test/frontend/features/editor-navigation-toolbar/components/toolbar-header.test.js @@ -19,8 +19,8 @@ describe('', function () { hasPublishPermissions: true, trackChangesVisible: true, handleChangeLayout: () => {}, - pdfLayout: '', - view: '', + pdfLayout: 'sideBySide', + view: 'editor', reattach: () => {}, detach: () => {}, } diff --git a/services/web/test/frontend/helpers/editor-providers.js b/services/web/test/frontend/helpers/editor-providers.js index 6f98da06b9..913f619be4 100644 --- a/services/web/test/frontend/helpers/editor-providers.js +++ b/services/web/test/frontend/helpers/editor-providers.js @@ -45,7 +45,7 @@ export function EditorProviders({ fileRefs: [], }, ], - ui = { view: null, pdfLayout: 'flat', chatOpen: true }, + ui = { view: 'editor', pdfLayout: 'sideBySide', chatOpen: true }, fileTreeManager = { findEntityById: () => null, findEntityByPath: () => null,