Преглед изворни кода

Tearing down of old Editor (Integrations panel) and other files (#31701)

* moving files from ide-redesign/components/editor-tour to features/editor-tour

moving files from ide-redesign/components/integrations-panel to features/integrations-panel

fixing imports

Revert "moving files from ide-redesign/components/editor-tour to features/editor-tour"

This reverts commit 9e4dcd4e001ffa4bfdb1053fb8824c1e8521ab10.

* moving files from ide-redesign/components/help -> ide-react/components/rail

* ide-redesign/components/breadcrumbs → features/source-editor/extensions

* ide-redesign/components/editor.tsx → ide-react/components/layout

* ide-redesign/components/full-project-search-panel.tsx → ide-react/components/rail/full-project-search-panel.tsx

* removing old-editor-warning-tooltip

* ide-redesign/components/tooltip-promo.tsx → shared/components/tooltip-promo.tsx

make cleanup_unused_locales

* extract-translations

GitOrigin-RevId: b9f44c4820bb4e0a7eef4f6f9a58ff96fd007bf9
Davinder Singh пре 5 месеци
родитељ
комит
b7f5344859
19 измењених фајлова са 10 додато и 115 уклоњено
  1. 0 2
      services/web/app/src/Features/Tutorial/TutorialController.mjs
  2. 0 3
      services/web/frontend/extracted-translations.json
  3. 1 1
      services/web/frontend/js/features/ide-react/components/editor/editor-panel.tsx
  4. 0 0
      services/web/frontend/js/features/ide-react/components/layout/editor.tsx
  5. 1 1
      services/web/frontend/js/features/ide-react/components/rail/contact-us.tsx
  6. 1 1
      services/web/frontend/js/features/ide-react/components/rail/full-project-search-panel.tsx
  7. 0 0
      services/web/frontend/js/features/ide-react/components/rail/keyboard-shortcuts.tsx
  8. 2 2
      services/web/frontend/js/features/ide-react/components/rail/rail-modals.tsx
  9. 2 2
      services/web/frontend/js/features/ide-react/components/rail/rail.tsx
  10. 0 81
      services/web/frontend/js/features/ide-redesign/components/old-editor-warning-tooltip.tsx
  11. 0 0
      services/web/frontend/js/features/integrations-panel/integration-card.tsx
  12. 1 1
      services/web/frontend/js/features/integrations-panel/integrations-panel.tsx
  13. 1 1
      services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx
  14. 0 0
      services/web/frontend/js/features/source-editor/extensions/breadcrumbs.tsx
  15. 0 0
      services/web/frontend/js/shared/components/tooltip-promo.tsx
  16. 0 1
      services/web/frontend/stylesheets/pages/all.scss
  17. 0 15
      services/web/frontend/stylesheets/pages/editor/old-editor-warning-tooltip.scss
  18. 1 1
      services/web/knip.ts
  19. 0 3
      services/web/locales/en.json

+ 0 - 2
services/web/app/src/Features/Tutorial/TutorialController.mjs

@@ -28,8 +28,6 @@ const VALID_KEYS = [
   'new-editor-opt-in',
   'new-editor-intro',
   'new-editor-intro-2',
-  'old-editor-warning-tooltip',
-  'old-editor-warning-tooltip-2',
   'workbench-rail-popover',
   'themed-dashboard-intro',
 ]

+ 0 - 3
services/web/frontend/extracted-translations.json

@@ -1817,7 +1817,6 @@
   "suggested_fix_for_error_in_path": "",
   "suggestion_applied": "",
   "suggests_code_completions_while_typing": "",
-  "support_for_the_old_editor_is_ending_soon": "",
   "support_for_your_browser_is_ending_soon": "",
   "supporting_your_research_respecting_your_privacy": "",
   "supports_up_to_x_licenses": "",
@@ -1829,7 +1828,6 @@
   "switch_compile_mode_for_faster_draft_compilation": "",
   "switch_easily_between_your_files_comments_track_changes_and_more": "",
   "switch_to_editor": "",
-  "switch_to_new_editor_design": "",
   "switch_to_pdf": "",
   "switch_to_standard_plan": "",
   "symbol": "",
@@ -2200,7 +2198,6 @@
   "we_do_not_share_personal_information": "",
   "we_got_your_request": "",
   "we_logged_you_in": "",
-  "we_recommend_switching_to_the_new_editor_design_now_so_you_have_time_to_get_to_know_it": "",
   "we_sent_code": "",
   "we_sent_new_code": "",
   "we_will_charge_you_now_for_the_cost_of_your_additional_licenses_based_on_remaining_months": "",

+ 1 - 1
services/web/frontend/js/features/ide-react/components/editor/editor-panel.tsx

@@ -1,5 +1,5 @@
 import NoSelectionPane from '@/features/ide-react/components/editor/no-selection-pane'
-import { Editor } from '@/features/ide-redesign/components/editor'
+import { Editor } from '@/features/ide-react/components/layout/editor'
 import { useFileTreeOpenContext } from '@/features/ide-react/context/file-tree-open-context'
 import FileView from '@/features/file-view/components/file-view'
 import { fileViewFile } from '@/features/ide-react/util/file-view'

+ 0 - 0
services/web/frontend/js/features/ide-redesign/components/editor.tsx → services/web/frontend/js/features/ide-react/components/layout/editor.tsx


+ 1 - 1
services/web/frontend/js/features/ide-redesign/components/help/contact-us.tsx → services/web/frontend/js/features/ide-react/components/rail/contact-us.tsx

@@ -1,6 +1,6 @@
 import { FC, JSXElementConstructor, useCallback } from 'react'
 import importOverleafModules from '../../../../../macros/import-overleaf-module.macro'
-import { useRailContext } from '../../../ide-react/context/rail-context'
+import { useRailContext } from '../../context/rail-context'
 import getMeta from '@/utils/meta'
 
 const [contactUsModalModules] = importOverleafModules('contactUsModal')

+ 1 - 1
services/web/frontend/js/features/ide-redesign/components/full-project-search-panel.tsx → services/web/frontend/js/features/ide-react/components/rail/full-project-search-panel.tsx

@@ -1,5 +1,5 @@
 import { ElementType } from 'react'
-import importOverleafModules from '../../../../macros/import-overleaf-module.macro'
+import importOverleafModules from '../../../../../macros/import-overleaf-module.macro'
 
 const componentModule = importOverleafModules('fullProjectSearchPanel')[0] as
   | {

+ 0 - 0
services/web/frontend/js/features/ide-redesign/components/help/keyboard-shortcuts.tsx → services/web/frontend/js/features/ide-react/components/rail/keyboard-shortcuts.tsx


+ 2 - 2
services/web/frontend/js/features/ide-react/components/rail/rail-modals.tsx

@@ -3,8 +3,8 @@ import {
   RailModalKey,
   useRailContext,
 } from '@/features/ide-react/context/rail-context'
-import { RailHelpContactUsModal } from '@/features/ide-redesign/components/help/contact-us'
-import { RailHelpShowHotkeysModal } from '@/features/ide-redesign/components/help/keyboard-shortcuts'
+import { RailHelpContactUsModal } from './contact-us'
+import { RailHelpShowHotkeysModal } from './keyboard-shortcuts'
 import DictionarySettingsModal from '@/features/settings/components/editor-settings/dictionary-settings-modal'
 
 const RAIL_MODALS: {

+ 2 - 2
services/web/frontend/js/features/ide-react/components/rail/rail.tsx

@@ -11,13 +11,13 @@ import ChatPane from '@/features/chat/components/chat-pane'
 import ChatIndicator from '@/features/chat/components/chat-indicator'
 import getMeta from '@/utils/meta'
 import classNames from 'classnames'
-import IntegrationsPanel from '@/features/ide-redesign/components/integrations-panel/integrations-panel'
+import IntegrationsPanel from '@/features/integrations-panel/integrations-panel'
 import { useChatContext } from '@/features/chat/context/chat-context'
 import { useEditorAnalytics } from '@/shared/hooks/use-editor-analytics'
 import {
   FullProjectSearchPanel,
   hasFullProjectSearch,
-} from '@/features/ide-redesign/components/full-project-search-panel'
+} from '@/features/ide-react/components/rail/full-project-search-panel'
 import { sendSearchEvent } from '@/features/event-tracking/search-events'
 import { useProjectContext } from '@/shared/context/project-context'
 import { useCommandProvider } from '@/features/ide-react/hooks/use-command-provider'

+ 0 - 81
services/web/frontend/js/features/ide-redesign/components/old-editor-warning-tooltip.tsx

@@ -1,81 +0,0 @@
-import { Overlay, Popover } from 'react-bootstrap'
-import Close from '@/shared/components/close'
-import OLButton from '@/shared/components/ol/ol-button'
-import { useTranslation } from 'react-i18next'
-import useTutorial from '@/shared/hooks/promotions/use-tutorial'
-import { useCallback, useEffect, useState } from 'react'
-import { useSwitchEnableNewEditorState } from '../hooks/use-switch-enable-new-editor-state'
-import { canUseNewEditor } from '../utils/new-editor-utils'
-
-const TUTORIAL_KEY = 'old-editor-warning-tooltip-2'
-
-export default function OldEditorWarningTooltip({
-  target,
-}: {
-  target: HTMLElement | null
-}) {
-  const { t } = useTranslation()
-  const { loading, setEditorRedesignStatus } = useSwitchEnableNewEditorState()
-
-  const {
-    tryShowingPopup,
-    showPopup,
-    dismissTutorial,
-    completeTutorial,
-    clearPopup,
-    checkCompletion,
-  } = useTutorial(TUTORIAL_KEY, {
-    name: TUTORIAL_KEY,
-  })
-  const [hasShown, setHasShown] = useState(false)
-  const canShow = canUseNewEditor()
-
-  useEffect(() => {
-    if (canShow && !hasShown && !checkCompletion()) {
-      tryShowingPopup('notification-prompt')
-      setHasShown(true)
-    }
-  }, [tryShowingPopup, checkCompletion, hasShown, canShow])
-
-  const onSwitch = useCallback(() => {
-    completeTutorial({ event: 'notification-click', action: 'complete' })
-    setEditorRedesignStatus(true)
-  }, [setEditorRedesignStatus, completeTutorial])
-
-  const closePopup = useCallback(() => {
-    dismissTutorial('notification-dismiss')
-    clearPopup()
-  }, [dismissTutorial, clearPopup])
-
-  if (!showPopup) {
-    return null
-  }
-
-  return (
-    <Overlay show placement="bottom" target={target} onHide={closePopup}>
-      <Popover className="old-editor-warning-tooltip">
-        <Popover.Header>
-          {t('support_for_the_old_editor_is_ending_soon')}
-          <Close variant="dark" onDismiss={closePopup} />
-        </Popover.Header>
-        <Popover.Body>
-          <div>
-            {t(
-              'we_recommend_switching_to_the_new_editor_design_now_so_you_have_time_to_get_to_know_it'
-            )}
-          </div>
-          <OLButton
-            className="old-editor-warning-tooltip-switch-button"
-            isLoading={loading}
-            loadingLabel={t('loading')}
-            onClick={onSwitch}
-            variant="primary"
-            size="sm"
-          >
-            {t('switch_to_new_editor_design')}
-          </OLButton>
-        </Popover.Body>
-      </Popover>
-    </Overlay>
-  )
-}

+ 0 - 0
services/web/frontend/js/features/ide-redesign/components/integrations-panel/integration-card.tsx → services/web/frontend/js/features/integrations-panel/integration-card.tsx


+ 1 - 1
services/web/frontend/js/features/ide-redesign/components/integrations-panel/integrations-panel.tsx → services/web/frontend/js/features/integrations-panel/integrations-panel.tsx

@@ -1,5 +1,5 @@
 import { ElementType } from 'react'
-import importOverleafModules from '../../../../../macros/import-overleaf-module.macro'
+import importOverleafModules from '../../../macros/import-overleaf-module.macro'
 import { useTranslation } from 'react-i18next'
 import RailPanelHeader from '@/features/ide-react/components/rail/rail-panel-header'
 

+ 1 - 1
services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx

@@ -30,7 +30,7 @@ import { ToggleSearchButton } from '@/features/source-editor/components/toolbar/
 import ReviewPanelHeader from '@/features/review-panel/components/review-panel-header'
 import useReviewPanelLayout from '@/features/review-panel/hooks/use-review-panel-layout'
 import { useIsNewEditorEnabled } from '@/features/ide-redesign/utils/new-editor-utils'
-import Breadcrumbs from '@/features/ide-redesign/components/breadcrumbs'
+import Breadcrumbs from '@/features/source-editor/extensions/breadcrumbs'
 import classNames from 'classnames'
 import { useUserSettingsContext } from '@/shared/context/user-settings-context'
 import { useFeatureFlag } from '@/shared/context/split-test-context'

+ 0 - 0
services/web/frontend/js/features/ide-redesign/components/breadcrumbs.tsx → services/web/frontend/js/features/source-editor/extensions/breadcrumbs.tsx


+ 0 - 0
services/web/frontend/js/features/ide-redesign/components/tooltip-promo.tsx → services/web/frontend/js/shared/components/tooltip-promo.tsx


+ 0 - 1
services/web/frontend/stylesheets/pages/all.scss

@@ -37,7 +37,6 @@
 @import 'editor/editor-survey';
 @import 'editor/editor-tour-tooltip';
 @import 'editor/new-editor-promo-modal';
-@import 'editor/old-editor-warning-tooltip';
 @import 'error-pages';
 @import 'website-redesign';
 @import 'group-settings';

+ 0 - 15
services/web/frontend/stylesheets/pages/editor/old-editor-warning-tooltip.scss

@@ -1,15 +0,0 @@
-.old-editor-warning-tooltip {
-  .popover-header {
-    display: flex;
-  }
-
-  .popover-body {
-    display: flex;
-    flex-direction: column;
-    gap: var(--spacing-06);
-  }
-}
-
-.old-editor-warning-tooltip-switch-button {
-  align-self: flex-end;
-}

+ 1 - 1
services/web/knip.ts

@@ -55,7 +55,7 @@ const knipConfig: KnipConfig = {
     // to work out a way to do that (@knipignore only works for
     // individual exports rather than whole files)
     'frontend/js/shared/components/labs/labs-experiments-widget.tsx',
-    'frontend/js/features/ide-redesign/components/tooltip-promo.tsx',
+    'frontend/js/shared/components/tooltip-promo.tsx',
   ],
   ignoreExportsUsedInFile: true,
   ignoreBinaries: ['.*'],

+ 0 - 3
services/web/locales/en.json

@@ -2318,7 +2318,6 @@
   "suggestion_applied": "Suggestion applied",
   "suggests_code_completions_while_typing": "Suggests code completions while typing",
   "support": "Support",
-  "support_for_the_old_editor_is_ending_soon": "Support for the old editor is ending soon",
   "support_for_your_browser_is_ending_soon": "Support for your browser is ending soon",
   "supporting_your_research_respecting_your_privacy": "Supporting your research, respecting your privacy",
   "supports_up_to_x_licenses": "Supports up to <0>__count__ licenses</0>",
@@ -2331,7 +2330,6 @@
   "switch_compile_mode_for_faster_draft_compilation": "Switch compile mode for faster draft compilation",
   "switch_easily_between_your_files_comments_track_changes_and_more": "Switch easily between your files, comments, track changes, and more in the new left-hand menu.",
   "switch_to_editor": "Switch to editor",
-  "switch_to_new_editor_design": "Switch to new editor design",
   "switch_to_pdf": "Switch to PDF",
   "switch_to_standard_plan": "Switch to Standard plan",
   "symbol": "Symbol",
@@ -2756,7 +2754,6 @@
   "we_got_your_request": "We’ve got your request",
   "we_logged_you_in": "We have logged you in.",
   "we_may_also_contact_you_from_time_to_time_by_email_with_a_survey": "<0>We may also contact you</0> from time to time by email with a survey, or to see if you would like to participate in other user research initiatives",
-  "we_recommend_switching_to_the_new_editor_design_now_so_you_have_time_to_get_to_know_it": "We recommend switching to the new editor design now, so you have time to get to know it.",
   "we_sent_code": "We’ve sent you a confirmation code",
   "we_sent_new_code": "We’ve sent a new code. If it doesn’t arrive, make sure to check your spam and any promotions folders.",
   "we_will_charge_you_now_for_the_cost_of_your_additional_licenses_based_on_remaining_months": "We’ll charge you now for the cost of your additional licenses based on the remaining months of your current subscription.",