From fe8e2e21fb87ae98b52880bc69e1f75ccff10a22 Mon Sep 17 00:00:00 2001 From: Alf Eaton Date: Wed, 6 Aug 2025 12:07:14 +0100 Subject: [PATCH] Remove the "track changes have moved" notification (#27593) GitOrigin-RevId: 0ae1ee54c3a2d552705c5f17d2d54dc9cbe1d457 --- .../components/review-mode-promo.tsx | 80 ----------------- .../components/review-mode-switcher.tsx | 86 ++++--------------- 2 files changed, 19 insertions(+), 147 deletions(-) delete mode 100644 services/web/frontend/js/features/review-panel-new/components/review-mode-promo.tsx diff --git a/services/web/frontend/js/features/review-panel-new/components/review-mode-promo.tsx b/services/web/frontend/js/features/review-panel-new/components/review-mode-promo.tsx deleted file mode 100644 index 0979cc58ac..0000000000 --- a/services/web/frontend/js/features/review-panel-new/components/review-mode-promo.tsx +++ /dev/null @@ -1,80 +0,0 @@ -import { FC, RefObject, useCallback, useEffect } from 'react' -import { Button, Overlay, Popover } from 'react-bootstrap' -import Close from '@/shared/components/close' - -export const ReviewModePromo: FC<{ - target: RefObject - showPopup: boolean - tryShowingPopup: () => void - hideUntilReload: () => void - completeTutorial: (props: { - action: 'complete' - event: 'promo-click' | 'promo-dismiss' - }) => void -}> = ({ - showPopup, - tryShowingPopup, - hideUntilReload, - completeTutorial, - target, -}) => { - useEffect(() => { - tryShowingPopup() - }, [tryShowingPopup]) - - const handleHide = useCallback(() => { - hideUntilReload() - }, [hideUntilReload]) - - const handleClose = useCallback(() => { - completeTutorial({ - action: 'complete', - event: 'promo-dismiss', - }) - }, [completeTutorial]) - - const handleAccept = useCallback(() => { - completeTutorial({ - action: 'complete', - event: 'promo-click', - }) - }, [completeTutorial]) - - if (!showPopup) { - return null - } - - return ( - - - - -

Track changes have moved

-

- Choose Reviewing mode in the dropdown to turn on track - changes. -

-
- - -
-
-
-
- ) -} diff --git a/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx b/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx index b95b1a11b4..293e1870f7 100644 --- a/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx +++ b/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx @@ -1,4 +1,4 @@ -import { forwardRef, memo, MouseEventHandler, useRef, useState } from 'react' +import { forwardRef, memo, MouseEventHandler, useState } from 'react' import { Dropdown, DropdownMenu, @@ -16,13 +16,9 @@ import { useTranslation } from 'react-i18next' import { usePermissionsContext } from '@/features/ide-react/context/permissions-context' import usePersistedState from '@/shared/hooks/use-persisted-state' import { sendMB } from '@/infrastructure/event-tracking' -import { useEditorContext } from '@/shared/context/editor-context' import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context' import { useProjectContext } from '@/shared/context/project-context' import UpgradeTrackChangesModal from './upgrade-track-changes-modal' -import { ReviewModePromo } from '@/features/review-panel-new/components/review-mode-promo' -import useTutorial from '@/shared/hooks/promotions/use-tutorial' -import { useLayoutContext } from '@/shared/context/layout-context' import { useCodeMirrorViewContext } from '@/features/source-editor/components/codemirror-context' type Mode = 'view' | 'review' | 'edit' @@ -161,7 +157,6 @@ const ModeSwitcherToggleButton = forwardRef< iconType="edit" label={t('editing')} ariaExpanded={ariaExpanded} - currentMode={mode} /> ) } else if (mode === 'review') { @@ -173,7 +168,6 @@ const ModeSwitcherToggleButton = forwardRef< iconType="rate_review" label={t('reviewing')} ariaExpanded={ariaExpanded} - currentMode={mode} /> ) } @@ -186,7 +180,6 @@ const ModeSwitcherToggleButton = forwardRef< iconType="visibility" label={t('viewing')} ariaExpanded={ariaExpanded} - currentMode={mode} /> ) }) @@ -199,72 +192,31 @@ const ModeSwitcherToggleButtonContent = forwardRef< iconType: string label: string ariaExpanded: boolean - currentMode: string } ->(({ onClick, className, iconType, label, ariaExpanded, currentMode }, ref) => { +>(({ onClick, className, iconType, label, ariaExpanded }, ref) => { const [isFirstTimeUsed, setIsFirstTimeUsed] = usePersistedState( `modeSwitcherFirstTimeUsed`, true ) - const tutorialProps = useTutorial('review-mode', { - name: 'review-mode-notification', - }) - - const user = useUserContext() - const { features } = useProjectContext() - const { reviewPanelOpen } = useLayoutContext() - const { inactiveTutorials } = useEditorContext() - - const hasCompletedReviewModeTutorial = - inactiveTutorials.includes('review-mode') - - const canShowReviewModePromo = - reviewPanelOpen && - currentMode !== 'review' && - features.trackChanges && - user.signUpDate && - user.signUpDate < '2025-03-15' && - !hasCompletedReviewModeTutorial - - const containerRef = useRef(null) - return ( - <> - - - - - {canShowReviewModePromo && ( - - )} - + ) })