From 88a3b79f146cfbfe3c67c842a179af8f3229078e Mon Sep 17 00:00:00 2001 From: David <33458145+davidmcpowell@users.noreply.github.com> Date: Thu, 15 May 2025 11:05:51 +0100 Subject: [PATCH] Merge pull request #25547 from overleaf/dp-remove-reviewer-role-flag-frontend Clean up reviewer-role feature flag from frontend GitOrigin-RevId: 0cac59be58b0350c24f57d3e63898246b2bd6881 --- .../web/frontend/extracted-translations.json | 17 --- .../components/review-panel-container.tsx | 10 +- .../components/review-panel-header.tsx | 21 +-- .../review-panel-resolved-threads-button.tsx | 7 +- ...review-panel-track-changes-menu-button.tsx | 60 -------- .../review-panel-track-changes-menu.tsx | 92 ------------ .../components/review-tooltip-menu.tsx | 14 +- .../components/track-changes-on-widget.tsx | 36 ----- .../upgrade-track-changes-modal-legacy.tsx | 109 -------------- .../context/track-changes-state-context.tsx | 48 ++---- .../hooks/use-review-panel-styles.ts | 5 +- .../review-panel-new/utils/position-items.ts | 3 +- .../components/add-collaborators.jsx | 23 +-- .../components/edit-member.tsx | 50 ++----- services/web/frontend/js/utils/meta.ts | 1 - .../pages/editor/review-panel-new.scss | 139 ------------------ services/web/locales/en.json | 16 -- .../review-panel/review-panel.spec.tsx | 2 - .../components/share-project-modal.test.jsx | 1 - .../codemirror-editor-figure-modal.spec.tsx | 10 +- 20 files changed, 47 insertions(+), 617 deletions(-) delete mode 100644 services/web/frontend/js/features/review-panel-new/components/review-panel-track-changes-menu-button.tsx delete mode 100644 services/web/frontend/js/features/review-panel-new/components/review-panel-track-changes-menu.tsx delete mode 100644 services/web/frontend/js/features/review-panel-new/components/track-changes-on-widget.tsx delete mode 100644 services/web/frontend/js/features/review-panel-new/components/upgrade-track-changes-modal-legacy.tsx diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json index 53fc6adae9..cf47e358d4 100644 --- a/services/web/frontend/extracted-translations.json +++ b/services/web/frontend/extracted-translations.json @@ -38,7 +38,6 @@ "accept_change_error_description": "", "accept_change_error_title": "", "accept_invitation": "", - "accept_or_reject_each_changes_individually": "", "accept_or_reject_individual_edits": "", "accept_selected_changes": "", "accept_terms_and_conditions": "", @@ -127,7 +126,6 @@ "all_these_experiments_are_available_exclusively": "", "allows_to_search_by_author_title_etc_possible_to_pull_results_directly_from_your_reference_manager_if_connected": "", "already_have_a_papers_account": "", - "already_subscribed_try_refreshing_the_page": "", "an_email_has_already_been_sent_to": "", "an_error_occured_while_restoring_project": "", "an_error_occurred_when_verifying_the_coupon_code": "", @@ -925,10 +923,6 @@ "limited_offer": "", "limited_to_n_collaborators_per_project": "", "limited_to_n_collaborators_per_project_plural": "", - "limited_to_n_editors": "", - "limited_to_n_editors_per_project": "", - "limited_to_n_editors_per_project_plural": "", - "limited_to_n_editors_plural": "", "line": "", "line_height": "", "line_width_is_the_width_of_the_line_in_the_current_environment": "", @@ -1434,7 +1428,6 @@ "review": "", "review_panel": "", "review_panel_and_error_logs_moved_to_the_left": "", - "review_your_peers_work": "", "reviewer": "", "reviewer_dropbox_sync_message": "", "reviewing": "", @@ -1489,7 +1482,6 @@ "search_within_selection": "", "searched_path_for_lines_containing": "", "security": "", - "see_changes_in_your_documents_live": "", "see_suggestions_from_collaborators": "", "select_a_column_or_a_merged_cell_to_align": "", "select_a_column_to_adjust_column_width": "", @@ -1714,8 +1706,6 @@ "tags": "", "take_short_survey": "", "take_survey": "", - "tc_everyone": "", - "tc_guests": "", "tell_the_project_owner_and_ask_them_to_upgrade": "", "template": "", "template_description": "", @@ -1874,13 +1864,7 @@ "total_today": "", "total_with_subtotal_and_tax": "", "total_words": "", - "track_any_change_in_real_time": "", "track_changes": "", - "track_changes_for_everyone": "", - "track_changes_for_guests": "", - "track_changes_for_x": "", - "track_changes_is_off": "", - "track_changes_is_on": "", "tracked_change_added": "", "tracked_change_deleted": "", "transfer_management_of_your_account": "", @@ -1972,7 +1956,6 @@ "upgrade_to_add_more_collaborators_and_access_collaboration_features": "", "upgrade_to_get_feature": "", "upgrade_to_review": "", - "upgrade_to_track_changes": "", "upgrade_to_unlock_more_time": "", "upgrade_your_subscription": "", "upload": "", diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-container.tsx b/services/web/frontend/js/features/review-panel-new/components/review-panel-container.tsx index 269ffde3b6..f7ee56f105 100644 --- a/services/web/frontend/js/features/review-panel-new/components/review-panel-container.tsx +++ b/services/web/frontend/js/features/review-panel-new/components/review-panel-container.tsx @@ -2,28 +2,20 @@ import ReactDOM from 'react-dom' import { useCodeMirrorViewContext } from '../../source-editor/components/codemirror-context' import { memo } from 'react' import ReviewPanel from './review-panel' -import TrackChangesOnWidget from './track-changes-on-widget' -import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context' import ReviewModeSwitcher from './review-mode-switcher' -import getMeta from '@/utils/meta' import useReviewPanelLayout from '../hooks/use-review-panel-layout' function ReviewPanelContainer() { const view = useCodeMirrorViewContext() const { showPanel, mini } = useReviewPanelLayout() - const { wantTrackChanges } = useEditorManagerContext() - const enableReviewerRole = getMeta('ol-isReviewerRoleEnabled') if (!view) { return null } - const showTrackChangesWidget = !enableReviewerRole && wantTrackChanges && mini - return ReactDOM.createPortal( <> - {showTrackChangesWidget && } - {enableReviewerRole && } + {showPanel && } , view.scrollDOM diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-header.tsx b/services/web/frontend/js/features/review-panel-new/components/review-panel-header.tsx index 950af503c1..ab5d5509e8 100644 --- a/services/web/frontend/js/features/review-panel-new/components/review-panel-header.tsx +++ b/services/web/frontend/js/features/review-panel-new/components/review-panel-header.tsx @@ -1,35 +1,18 @@ -import { FC, memo, useState } from 'react' +import { FC, memo } from 'react' import { ReviewPanelResolvedThreadsButton } from './review-panel-resolved-threads-button' -import { ReviewPanelTrackChangesMenu } from './review-panel-track-changes-menu' -import ReviewPanelTrackChangesMenuButton from './review-panel-track-changes-menu-button' import { useTranslation } from 'react-i18next' -import getMeta from '@/utils/meta' import { PanelHeading } from '@/shared/components/panel-heading' import useReviewPanelLayout from '../hooks/use-review-panel-layout' const ReviewPanelHeader: FC = () => { - const isReviewerRoleEnabled = getMeta('ol-isReviewerRoleEnabled') - const [trackChangesMenuExpanded, setTrackChangesMenuExpanded] = - useState(false) const { closeReviewPanel } = useReviewPanelLayout() const { t } = useTranslation() return (
- {isReviewerRoleEnabled && } + - {!isReviewerRoleEnabled && ( -
- - -
- )} - - {trackChangesMenuExpanded && }
) } diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-resolved-threads-button.tsx b/services/web/frontend/js/features/review-panel-new/components/review-panel-resolved-threads-button.tsx index 6f05a555fa..93192800ed 100644 --- a/services/web/frontend/js/features/review-panel-new/components/review-panel-resolved-threads-button.tsx +++ b/services/web/frontend/js/features/review-panel-new/components/review-panel-resolved-threads-button.tsx @@ -5,7 +5,6 @@ import OLTooltip from '@/features/ui/components/ol/ol-tooltip' import { ReviewPanelResolvedThreadsMenu } from './review-panel-resolved-threads-menu' import { useTranslation } from 'react-i18next' import MaterialIcon from '@/shared/components/material-icon' -import getMeta from '@/utils/meta' export const ReviewPanelResolvedThreadsButton: FC = () => { const [expanded, setExpanded] = useState(false) @@ -20,11 +19,7 @@ export const ReviewPanelResolvedThreadsButton: FC = () => { description={t('resolved_comments')} > - - - - ) -} - -export default memo(ReviewPanelTrackChangesMenuButton) diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-track-changes-menu.tsx b/services/web/frontend/js/features/review-panel-new/components/review-panel-track-changes-menu.tsx deleted file mode 100644 index 85f5cb4c26..0000000000 --- a/services/web/frontend/js/features/review-panel-new/components/review-panel-track-changes-menu.tsx +++ /dev/null @@ -1,92 +0,0 @@ -import { FC } from 'react' -import TrackChangesToggle from '@/features/review-panel-new/components/track-changes-toggle' -import { useProjectContext } from '@/shared/context/project-context' -import { usePermissionsContext } from '@/features/ide-react/context/permissions-context' -import { useTranslation } from 'react-i18next' -import { - useTrackChangesStateActionsContext, - useTrackChangesStateContext, -} from '../context/track-changes-state-context' -import { useChangesUsersContext } from '../context/changes-users-context' -import { buildName } from '../utils/build-name' - -export const ReviewPanelTrackChangesMenu: FC = () => { - const { t } = useTranslation() - const permissions = usePermissionsContext() - const project = useProjectContext() - const trackChanges = useTrackChangesStateContext() - const { saveTrackChanges } = useTrackChangesStateActionsContext() - const changesUsers = useChangesUsersContext() - - if (trackChanges === undefined || !changesUsers) { - return null - } - - const { onForEveryone, onForGuests, onForMembers } = trackChanges - - const canToggle = project.features.trackChanges && permissions.write - - return ( -
-
- {t('tc_everyone')} - - - saveTrackChanges(onForEveryone ? { on_for: {} } : { on: true }) - } - value={onForEveryone} - disabled={!canToggle} - /> -
- - {[project.owner, ...project.members].map(member => { - const user = changesUsers.get(member._id) ?? member - const name = buildName(user) - - const value = onForEveryone || onForMembers[member._id] === true - - return ( -
- {name} - - { - saveTrackChanges({ - on_for: { - ...onForMembers, - [member._id]: !value, - }, - on_for_guests: onForGuests, - }) - }} - value={value} - disabled={!canToggle || onForEveryone} - /> -
- ) - })} - -
- {t('tc_guests')} - - - saveTrackChanges({ - on_for: onForMembers, - on_for_guests: !onForGuests, - }) - } - value={onForGuests} - disabled={!canToggle || onForEveryone} - /> -
-
- ) -} 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 ebb176c0b5..85fe5830f6 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 @@ -34,13 +34,10 @@ import { numberOfChangesInSelection } from '../utils/changes-in-selection' import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context' import classNames from 'classnames' import useEventListener from '@/shared/hooks/use-event-listener' -import getMeta from '@/utils/meta' import useReviewPanelLayout from '../hooks/use-review-panel-layout' -const isReviewerRoleEnabled = getMeta('ol-isReviewerRoleEnabled') -const TRACK_CHANGES_ON_WIDGET_HEIGHT = 25 const EDIT_MODE_SWITCH_WIDGET_HEIGHT = 40 -const CM_LINE_RIGHT_PADDING = isReviewerRoleEnabled ? 8 : 2 +const CM_LINE_RIGHT_PADDING = 8 const TOOLTIP_SHOW_DELAY = 120 const ReviewTooltipMenu: FC = () => { @@ -190,16 +187,9 @@ const ReviewTooltipMenuContent: FC<{ onAddComment: () => void }> = ({ return } - let widgetOffset = 0 - if (isReviewerRoleEnabled) { - widgetOffset = EDIT_MODE_SWITCH_WIDGET_HEIGHT - } else if (wantTrackChanges && !reviewPanelOpen) { - widgetOffset = TRACK_CHANGES_ON_WIDGET_HEIGHT - } - return { position: 'fixed' as const, - top: scrollDomRect.top + widgetOffset, + top: scrollDomRect.top + EDIT_MODE_SWITCH_WIDGET_HEIGHT, right: window.innerWidth - editorRightPos, } }, diff --git a/services/web/frontend/js/features/review-panel-new/components/track-changes-on-widget.tsx b/services/web/frontend/js/features/review-panel-new/components/track-changes-on-widget.tsx deleted file mode 100644 index 63ee10060f..0000000000 --- a/services/web/frontend/js/features/review-panel-new/components/track-changes-on-widget.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import { Trans } from 'react-i18next' -import { EditorView } from '@codemirror/view' -import classnames from 'classnames' -import { useCodeMirrorStateContext } from '@/features/source-editor/components/codemirror-context' -import { useLayoutContext } from '@/shared/context/layout-context' -import { useCallback } from 'react' - -function TrackChangesOnWidget() { - const { setReviewPanelOpen } = useLayoutContext() - const state = useCodeMirrorStateContext() - const darkTheme = state.facet(EditorView.darkTheme) - - const openReviewPanel = useCallback(() => { - setReviewPanelOpen(true) - }, [setReviewPanelOpen]) - - return ( -
-
- -
-
- ) -} - -export default TrackChangesOnWidget diff --git a/services/web/frontend/js/features/review-panel-new/components/upgrade-track-changes-modal-legacy.tsx b/services/web/frontend/js/features/review-panel-new/components/upgrade-track-changes-modal-legacy.tsx deleted file mode 100644 index ccc5f1d452..0000000000 --- a/services/web/frontend/js/features/review-panel-new/components/upgrade-track-changes-modal-legacy.tsx +++ /dev/null @@ -1,109 +0,0 @@ -import { useTranslation } from 'react-i18next' -import { useProjectContext } from '@/shared/context/project-context' -import { useUserContext } from '@/shared/context/user-context' -import teaserVideo from '../images/teaser-track-changes.mp4' -import teaserImage from '../images/teaser-track-changes.gif' -import { startFreeTrial, upgradePlan } from '@/main/account-upgrade' -import { memo } from 'react' -import OLModal, { - OLModalBody, - OLModalFooter, - OLModalHeader, - OLModalTitle, -} from '@/features/ui/components/ol/ol-modal' -import OLButton from '@/features/ui/components/ol/ol-button' -import OLRow from '@/features/ui/components/ol/ol-row' -import OLCol from '@/features/ui/components/ol/ol-col' -import MaterialIcon from '@/shared/components/material-icon' - -type UpgradeTrackChangesModalProps = { - show: boolean - setShow: React.Dispatch> -} - -function UpgradeTrackChangesModalLegacy({ - show, - setShow, -}: UpgradeTrackChangesModalProps) { - const { t } = useTranslation() - const project = useProjectContext() - const user = useUserContext() - - return ( - setShow(false)}> - - {t('upgrade_to_track_changes')} - - -
- {/* eslint-disable-next-line jsx-a11y/media-has-caption */} - -
-

- {t('see_changes_in_your_documents_live')} -

- - -
    - {[ - t('track_any_change_in_real_time'), - t('review_your_peers_work'), - t('accept_or_reject_each_changes_individually'), - ].map(translation => ( -
  • - -  {translation} -
    • - ))} -
- - -

- {t('already_subscribed_try_refreshing_the_page')} -

- {project.owner && ( -
- {project.owner._id === user.id ? ( - user.allowedFreeTrial ? ( - startFreeTrial('track-changes')} - > - {t('try_it_for_free')} - - ) : ( - upgradePlan('project-sharing')} - > - {t('upgrade')} - - ) - ) : ( -

- - {t( - 'please_ask_the_project_owner_to_upgrade_to_track_changes' - )} - -

- )} -
- )} - - - setShow(false)}> - {t('close')} - - - - ) -} - -export default memo(UpgradeTrackChangesModalLegacy) diff --git a/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx b/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx index 2d77ef9d8d..73ffe78b5d 100644 --- a/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx +++ b/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx @@ -17,7 +17,6 @@ import { postJSON } from '@/infrastructure/fetch-json' import useEventListener from '@/shared/hooks/use-event-listener' import { ProjectContextValue } from '@/shared/context/types/project-context' import { usePermissionsContext } from '@/features/ide-react/context/permissions-context' -import getMeta from '@/utils/meta' export type TrackChangesState = { onForEveryone: boolean @@ -99,25 +98,15 @@ export const TrackChangesStateProvider: FC = ({ const saveTrackChangesForCurrentUser = useCallback( async (trackChanges: boolean) => { if (user.id) { - if (getMeta('ol-isReviewerRoleEnabled')) { - saveTrackChanges({ - on_for: { - ...onForMembers, - [user.id]: trackChanges, - }, - }) - } else { - saveTrackChanges({ - on_for: { - ...onForMembers, - [user.id]: trackChanges, - }, - on_for_guests: onForGuests, - }) - } + saveTrackChanges({ + on_for: { + ...onForMembers, + [user.id]: trackChanges, + }, + }) } }, - [onForMembers, onForGuests, user.id, saveTrackChanges] + [onForMembers, user.id, saveTrackChanges] ) const actions = useMemo( @@ -138,27 +127,16 @@ export const TrackChangesStateProvider: FC = ({ !onForEveryone ) { const value = onForMembers[user.id] - if (getMeta('ol-isReviewerRoleEnabled')) { - actions.saveTrackChanges({ - on_for: { - ...onForMembers, - [user.id]: !value, - }, - }) - } else { - actions.saveTrackChanges({ - on_for: { - ...onForMembers, - [user.id]: !value, - }, - on_for_guests: onForGuests, - }) - } + actions.saveTrackChanges({ + on_for: { + ...onForMembers, + [user.id]: !value, + }, + }) } }, [ actions, onForMembers, - onForGuests, onForEveryone, permissions.write, project.features.trackChanges, diff --git a/services/web/frontend/js/features/review-panel-new/hooks/use-review-panel-styles.ts b/services/web/frontend/js/features/review-panel-new/hooks/use-review-panel-styles.ts index 59006db354..7e7dda1850 100644 --- a/services/web/frontend/js/features/review-panel-new/hooks/use-review-panel-styles.ts +++ b/services/web/frontend/js/features/review-panel-new/hooks/use-review-panel-styles.ts @@ -1,14 +1,11 @@ import { CSSProperties, useCallback, useEffect, useState } from 'react' import { useCodeMirrorViewContext } from '@/features/source-editor/components/codemirror-context' -import getMeta from '@/utils/meta' export const useReviewPanelStyles = (mini: boolean) => { const view = useCodeMirrorViewContext() const [styles, setStyles] = useState({ - '--review-panel-header-height': getMeta('ol-isReviewerRoleEnabled') - ? '36px' - : '69px', + '--review-panel-header-height': '36px', } as CSSProperties) const updateScrollDomVariables = useCallback((element: HTMLDivElement) => { diff --git a/services/web/frontend/js/features/review-panel-new/utils/position-items.ts b/services/web/frontend/js/features/review-panel-new/utils/position-items.ts index 87fa92cd80..54489310a9 100644 --- a/services/web/frontend/js/features/review-panel-new/utils/position-items.ts +++ b/services/web/frontend/js/features/review-panel-new/utils/position-items.ts @@ -1,8 +1,7 @@ -import getMeta from '@/utils/meta' import { debounce } from 'lodash' export const OFFSET_FOR_ENTRIES_ABOVE = 70 -const COLLAPSED_HEADER_HEIGHT = getMeta('ol-isReviewerRoleEnabled') ? 42 : 75 +const COLLAPSED_HEADER_HEIGHT = 42 const GAP_BETWEEN_ENTRIES = 4 export const positionItems = debounce( diff --git a/services/web/frontend/js/features/share-project-modal/components/add-collaborators.jsx b/services/web/frontend/js/features/share-project-modal/components/add-collaborators.jsx index cad9d03177..b6d8491596 100644 --- a/services/web/frontend/js/features/share-project-modal/components/add-collaborators.jsx +++ b/services/web/frontend/js/features/share-project-modal/components/add-collaborators.jsx @@ -14,7 +14,6 @@ import OLForm from '@/features/ui/components/ol/ol-form' import OLFormGroup from '@/features/ui/components/ol/ol-form-group' import { Select } from '@/shared/components/select' import OLButton from '@/features/ui/components/ol/ol-button' -import getMeta from '@/utils/meta' export default function AddCollaborators({ readOnly }) { const [privileges, setPrivileges] = useState('readAndWrite') @@ -178,29 +177,23 @@ export default function AddCollaborators({ readOnly }) { ]) const privilegeOptions = useMemo(() => { - const options = [ + return [ { key: 'readAndWrite', label: t('editor'), }, - ] - - if (getMeta('ol-isReviewerRoleEnabled')) { - options.push({ + { key: 'review', label: t('reviewer'), description: !features.trackChanges ? t('comment_only_upgrade_for_track_changes') : null, - }) - } - - options.push({ - key: 'readOnly', - label: t('viewer'), - }) - - return options + }, + { + key: 'readOnly', + label: t('viewer'), + }, + ] }, [features.trackChanges, t]) return ( diff --git a/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx b/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx index 45a04dd99c..46b0e21443 100644 --- a/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx +++ b/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx @@ -14,9 +14,7 @@ import OLButton from '@/features/ui/components/ol/ol-button' import OLFormGroup from '@/features/ui/components/ol/ol-form-group' import OLCol from '@/features/ui/components/ol/ol-col' import MaterialIcon from '@/shared/components/material-icon' -import getMeta from '@/utils/meta' import { useUserContext } from '@/shared/context/user-context' -import { isSplitTestEnabled } from '@/utils/splitTestUtils' import { upgradePlan } from '@/main/account-upgrade' type PermissionsOption = PermissionsLevel | 'removeAccess' | 'downgraded' @@ -256,21 +254,13 @@ function SelectPrivilege({ const { features } = useProjectContext() const privileges = useMemo( - (): Privilege[] => - getMeta('ol-isReviewerRoleEnabled') - ? [ - { key: 'owner', label: t('make_owner') }, - { key: 'readAndWrite', label: t('editor') }, - { key: 'review', label: t('reviewer') }, - { key: 'readOnly', label: t('viewer') }, - { key: 'removeAccess', label: t('remove_access') }, - ] - : [ - { key: 'owner', label: t('make_owner') }, - { key: 'readAndWrite', label: t('editor') }, - { key: 'readOnly', label: t('viewer') }, - { key: 'removeAccess', label: t('remove_access') }, - ], + (): Privilege[] => [ + { key: 'owner', label: t('make_owner') }, + { key: 'readAndWrite', label: t('editor') }, + { key: 'review', label: t('reviewer') }, + { key: 'readOnly', label: t('viewer') }, + { key: 'removeAccess', label: t('remove_access') }, + ], [t] ) @@ -284,27 +274,13 @@ function SelectPrivilege({ return '' } - if (hasBeenDowngraded) { - if (isSplitTestEnabled('reviewer-role')) { - return t('limited_to_n_collaborators_per_project', { - count: features.collaborators, - }) - } else { - return t('limited_to_n_editors', { count: features.collaborators }) - } - } else if ( - !canAddCollaborators && - !['readAndWrite', 'review'].includes(value) + if ( + hasBeenDowngraded || + (!canAddCollaborators && !['readAndWrite', 'review'].includes(value)) ) { - if (isSplitTestEnabled('reviewer-role')) { - return t('limited_to_n_collaborators_per_project', { - count: features.collaborators, - }) - } else { - return t('limited_to_n_editors_per_project', { - count: features.collaborators, - }) - } + return t('limited_to_n_collaborators_per_project', { + count: features.collaborators, + }) } else { return '' } diff --git a/services/web/frontend/js/utils/meta.ts b/services/web/frontend/js/utils/meta.ts index 220cd0803f..2e0e40c49d 100644 --- a/services/web/frontend/js/utils/meta.ts +++ b/services/web/frontend/js/utils/meta.ts @@ -140,7 +140,6 @@ export interface Meta { 'ol-isProfessional': boolean 'ol-isRegisteredViaGoogle': boolean 'ol-isRestrictedTokenMember': boolean - 'ol-isReviewerRoleEnabled': boolean 'ol-isSaas': boolean 'ol-itm_campaign': string 'ol-itm_content': string diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/review-panel-new.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/review-panel-new.scss index 074870d0f7..5e9f53b7f7 100644 --- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/review-panel-new.scss +++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/review-panel-new.scss @@ -250,75 +250,7 @@ del.review-panel-content-highlight { z-index: 4; } -// TODO: Update this when we move the track changes menu to the new design -.rp-tc-state { - position: absolute; - top: 100%; - left: 0; - right: 0; - overflow: hidden; - list-style: none; - padding: 0 var(--spacing-03); - margin: 0; - border-bottom: 1px solid var(--rp-border-grey); - text-align: left; - background-color: var(--white); - max-height: calc( - 100vh - var(--review-panel-top) - var(--review-panel-header-height) - ); - overflow-y: auto; - - .rp-tc-state-item { - display: flex; - align-items: center; - padding: var(--spacing-02) 0; - - &:last-of-type { - padding-bottom: var(--spacing-03); - } - } - - .rp-tc-state-item-name { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - flex-grow: 1; - font-weight: 600; - } -} - -.review-panel-tools { - display: flex; - align-items: center; - justify-content: space-between; - padding-left: var(--spacing-02); - padding-right: var(--spacing-05); - flex-shrink: 0; - flex-basis: 32px; -} - .review-panel-resolved-comments-toggle { - background-color: var(--bg-light-secondary); - font-size: var(--font-size-02); - color: color.adjust($rp-type-blue, $lightness: 25%); - border: solid 1px var(--rp-border-grey); - border-radius: var(--border-radius-base); - padding: 0; - height: 22px; - width: 22px; - line-height: 1.4; - display: flex; - align-items: center; - justify-content: center; - - &:hover, - &:focus { - text-decoration: none; - color: var(--rp-type-blue); - } -} - -.review-panel-resolved-comments-toggle-reviewer-role { display: flex; align-items: center; border: none; @@ -333,27 +265,6 @@ del.review-panel-content-highlight { } } -.track-changes-indicator-circle { - width: 8px; - height: 8px; - border-radius: 100%; - background-color: var(--bg-accent-01); -} - -.track-changes-menu-button { - border: none; - background: none; - padding: 0; - display: flex; - align-items: center; - gap: var(--spacing-02); - font-size: var(--font-size-02); - - i { - width: 8px; - } -} - .review-panel-resolved-comments { --bs-popover-border-width: 1px; --bs-popover-bg: var(--bg-light-secondary); @@ -780,56 +691,6 @@ del.review-panel-content-highlight { pointer-events: none; // this is to prevent mouseLeave event from firing when hovering over the tooltip } -.review-panel-in-editor-widgets { - position: sticky; - top: 0; - right: 0; - font-size: 11px; - z-index: 2; - font-family: $font-family-base; - - .review-panel-in-editor-widgets-inner { - position: absolute; - top: 0; - right: 0; - display: flex; - flex-direction: column; - } - - .review-panel-track-changes-indicator { - border: 0; - } -} - -.review-panel-track-changes-indicator { - display: block; - padding: 5px 10px; - background-color: rgb(240 240 240 / 90%); - color: var(--rp-type-blue); - text-align: center; - border-bottom-left-radius: 3px; - white-space: nowrap; - - &.review-panel-track-changes-indicator-on-dark { - background-color: rgb(88 88 88 / 80%); - color: #fff; - - &:hover, - &:focus { - background-color: rgb(88 88 88 / 100%); - color: #fff; - } - } - - &:hover, - &:focus { - outline: 0; - text-decoration: none; - background-color: rgb(240 240 240 / 100%); - color: var(--rp-type-blue); - } -} - .review-mode-switcher-container { position: sticky; top: 0; diff --git a/services/web/locales/en.json b/services/web/locales/en.json index 97818e2116..6b947e50dc 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -42,7 +42,6 @@ "accept_change_error_description": "There was an error accepting a track change. Please try again in a few moments.", "accept_change_error_title": "Accept Change Error", "accept_invitation": "Accept invitation", - "accept_or_reject_each_changes_individually": "Accept or reject each change individually", "accept_or_reject_individual_edits": "Accept or reject individual edits", "accept_selected_changes": "Accept selected changes", "accept_terms_and_conditions": "Accept terms and conditions", @@ -154,7 +153,6 @@ "already_have_a_papers_account": "Managing your citations and bibliographies in Overleaf just got way easier! Already have a Papers account? <0>Link your account here.", "already_have_an_account": "Already have an account?", "already_have_sl_account": "Already have an __appName__ account?", - "already_subscribed_try_refreshing_the_page": "Already subscribed? Try refreshing the page.", "also": "Also", "alternatively_create_new_institution_account": "Alternatively, you can create a new account with your institution email (__email__) by clicking __clickText__.", "an_email_has_already_been_sent_to": "An email has already been sent to <0>__email__. Please wait and try again later.", @@ -1206,10 +1204,6 @@ "limited_document_history": "Limited document history", "limited_to_n_collaborators_per_project": "Limited to __count__ collaborator per project", "limited_to_n_collaborators_per_project_plural": "Limited to __count__ collaborators per project", - "limited_to_n_editors": "Limited to __count__ editor", - "limited_to_n_editors_per_project": "Limited to __count__ editor per project", - "limited_to_n_editors_per_project_plural": "Limited to __count__ editors per project", - "limited_to_n_editors_plural": "Limited to __count__ editors", "line_height": "Line Height", "line_width_is_the_width_of_the_line_in_the_current_environment": "Line width is the width of the line in the current environment. e.g. a full page width in single-column layout or half a page width in a two-column layout.", "link": "Link", @@ -1888,7 +1882,6 @@ "review": "Review", "review_panel": "Review panel", "review_panel_and_error_logs_moved_to_the_left": "Review panel and error logs moved to the left", - "review_your_peers_work": "Review your peers’ work", "reviewer": "Reviewer", "reviewer_dropbox_sync_message": "As a reviewer you can sync the current project version to Dropbox, but changes made in Dropbox will <0>not sync back to Overleaf.", "reviewing": "Reviewing", @@ -1953,7 +1946,6 @@ "searched_path_for_lines_containing": "Searched __path__ for lines containing \"__query__\"", "secondary_email_password_reset": "That email is registered as a secondary email. Please enter the primary email for your account.", "security": "Security", - "see_changes_in_your_documents_live": "See changes in your documents, live", "see_suggestions_from_collaborators": "See suggestions from collaborators", "select_a_column_or_a_merged_cell_to_align": "Select a column or a merged cell to align", "select_a_column_to_adjust_column_width": "Select a column to adjust column width", @@ -2214,8 +2206,6 @@ "take_me_home": "Take me home!", "take_short_survey": "Take a short survey", "take_survey": "Take survey", - "tc_everyone": "Everyone", - "tc_guests": "Guests", "tell_the_project_owner_and_ask_them_to_upgrade": "<0>Tell the project owner and ask them to upgrade their Overleaf plan if you need more compile time.", "template": "Template", "template_approved_by_publisher": "This template has been approved by the publisher", @@ -2402,12 +2392,7 @@ "total_with_subtotal_and_tax": "Total: <0>__total__ (__subtotal__ + __tax__ tax) per year", "total_words": "Total Words", "tr": "Turkish", - "track_any_change_in_real_time": "Track any change, in real-time", "track_changes": "Track changes", - "track_changes_for_everyone": "Track changes for everyone", - "track_changes_for_x": "Track changes for __name__", - "track_changes_is_off": "Track changes is off", - "track_changes_is_on": "Track changes is on", "tracked_change_added": "Added", "tracked_change_deleted": "Deleted", "transfer_management_of_your_account": "Transfer management of your Overleaf account", @@ -2506,7 +2491,6 @@ "upgrade_to_add_more_collaborators_and_access_collaboration_features": "Upgrade to add more collaborators and access collaboration features like track changes and full project history.", "upgrade_to_get_feature": "Upgrade to get __feature__, plus:", "upgrade_to_review": "Upgrade to Review", - "upgrade_to_track_changes": "Upgrade to track changes", "upgrade_to_unlock_more_time": "Upgrade now to unlock 12x more compile time on our fastest servers.", "upgrade_your_subscription": "Upgrade your subscription", "upload": "Upload", diff --git a/services/web/test/frontend/features/review-panel/review-panel.spec.tsx b/services/web/test/frontend/features/review-panel/review-panel.spec.tsx index 7971ff01d2..d667787810 100644 --- a/services/web/test/frontend/features/review-panel/review-panel.spec.tsx +++ b/services/web/test/frontend/features/review-panel/review-panel.spec.tsx @@ -10,7 +10,6 @@ import { docId } from '../source-editor/helpers/mock-doc' describe('', function () { beforeEach(function () { - window.metaAttributesCache.set('ol-isReviewerRoleEnabled', true) window.metaAttributesCache.set('ol-preventCompileOnLoad', true) cy.interceptEvents() @@ -650,7 +649,6 @@ describe(' for free users', function () { } beforeEach(function () { - window.metaAttributesCache.set('ol-isReviewerRoleEnabled', true) window.metaAttributesCache.set('ol-preventCompileOnLoad', true) cy.interceptEvents() cy.intercept('GET', '/project/*/changes/users', []) diff --git a/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx b/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx index cdeb0adb6f..91a64581da 100644 --- a/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx +++ b/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx @@ -94,7 +94,6 @@ describe('', function () { fetchMock.get('/user/contacts', { contacts }) window.metaAttributesCache.set('ol-user', { allowedFreeTrial: true }) window.metaAttributesCache.set('ol-showUpgradePrompt', true) - window.metaAttributesCache.set('ol-isReviewerRoleEnabled', true) window.metaAttributesCache.set('ol-preventCompileOnLoad', true) }) diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor-figure-modal.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor-figure-modal.spec.tsx index eda6dcec6b..0d80f9bde8 100644 --- a/services/web/test/frontend/features/source-editor/components/codemirror-editor-figure-modal.spec.tsx +++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor-figure-modal.spec.tsx @@ -509,7 +509,7 @@ describe('', function () { \\end{{}figure}`, { delay: 0 } ) - cy.get('[aria-label="Edit figure"]').click() + cy.get('[aria-label="Edit figure"]').click({ force: true }) cy.findByRole('checkbox', { name: 'Include caption' }).should( 'be.checked' ) @@ -526,7 +526,7 @@ describe('', function () { \\end{{}figure}`, { delay: 0 } ) - cy.get('[aria-label="Edit figure"]').click() + cy.get('[aria-label="Edit figure"]').click({ force: true }) cy.get('[value="0.75"]').should('be.checked') }) @@ -539,7 +539,7 @@ describe('', function () { \\end{{}figure}`, { delay: 0 } ) - cy.get('[aria-label="Edit figure"]').click() + cy.get('[aria-label="Edit figure"]').click({ force: true }) cy.findByRole('checkbox', { name: 'Include label' }).click() cy.findByRole('checkbox', { name: 'Include label' }).should( 'not.be.checked' @@ -561,7 +561,7 @@ describe('', function () { \\end{{}figure}`, { delay: 0 } ) - cy.get('[aria-label="Edit figure"]').click() + cy.get('[aria-label="Edit figure"]').click({ force: true }) cy.findByRole('checkbox', { name: 'Include caption' }).click() cy.findByRole('checkbox', { name: 'Include caption' }).should( 'not.be.checked' @@ -585,7 +585,7 @@ describe('', function () { text below`, { delay: 0 } ) - cy.get('[aria-label="Edit figure"]').click() + cy.get('[aria-label="Edit figure"]').click({ force: true }) cy.findByRole('button', { name: 'Remove or replace figure' }).click() cy.findByText('Delete figure').click() cy.get('.cm-content').should('have.text', 'text abovetext below')