From 2be1a44edab5bdda7b0126e84a7c7e24aa256dfa Mon Sep 17 00:00:00 2001 From: Alf Eaton Date: Mon, 5 Jul 2021 11:39:38 +0100 Subject: [PATCH] Merge pull request #4257 from overleaf/ae-file-views-beta Roll out new file view UI to beta users GitOrigin-RevId: c8665c5043ad55dd530989fb3b9c51f21858fcac --- services/web/app/src/Features/Project/ProjectController.js | 2 +- .../js/features/file-view/components/file-view-header.js | 7 +++++++ .../web/frontend/stylesheets/app/editor/file-view.less | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js index 1a03027b64..34a0cde598 100644 --- a/services/web/app/src/Features/Project/ProjectController.js +++ b/services/web/app/src/Features/Project/ProjectController.js @@ -887,7 +887,7 @@ const ProjectController = { ), showNewFileViewUI: shouldDisplayFeature( 'new_file_view', - user.alphaProgram + user.alphaProgram || user.betaProgram ), showSymbolPalette: shouldDisplayFeature( 'symbol_palette', diff --git a/services/web/frontend/js/features/file-view/components/file-view-header.js b/services/web/frontend/js/features/file-view/components/file-view-header.js index eda9fc9d17..7b847647aa 100644 --- a/services/web/frontend/js/features/file-view/components/file-view-header.js +++ b/services/web/frontend/js/features/file-view/components/file-view-header.js @@ -9,6 +9,7 @@ import { useProjectContext } from '../../../shared/context/project-context' import importOverleafModules from '../../../../macros/import-overleaf-module.macro' import useAbortController from '../../../shared/hooks/use-abort-controller' +import BetaBadge from '../../../shared/components/beta-badge' const tprLinkedFileInfo = importOverleafModules('tprLinkedFileInfo') const tprLinkedFileRefreshError = importOverleafModules( 'tprLinkedFileRefreshError' @@ -105,6 +106,12 @@ export default function FileViewHeader({ file, storeReferencesKeys }) { return (
+ {file.linkedFileData && fileInfo} {file.linkedFileData && tprLinkedFileInfo.map(({ import: { LinkedFileInfo }, path }) => ( diff --git a/services/web/frontend/stylesheets/app/editor/file-view.less b/services/web/frontend/stylesheets/app/editor/file-view.less index d0d454c3be..8efd2683b0 100644 --- a/services/web/frontend/stylesheets/app/editor/file-view.less +++ b/services/web/frontend/stylesheets/app/editor/file-view.less @@ -44,4 +44,8 @@ .linked-file-icon { color: @blue; } + + .beta-badge { + float: left; + } }