Merge pull request #31606 from overleaf/ds-editor-settings-tear-down

Tearing down of old Editor (Settings)

GitOrigin-RevId: d9e23e61a8e34eb22e9c9e3453a157fb275f68f0

services/web/frontend/js/features/ide-react/components/layout/ide-page.tsx

@@ -13,7 +13,7 @@ import { useStatusFavicon } from '@/features/ide-react/hooks/use-status-favicon'
 import useThemedPage from '@/shared/hooks/use-themed-page'
 
 import MainLayout from '@/features/ide-react/components/layout/main-layout'
-import SettingsModalNew from '@/features/ide-redesign/components/settings/settings-modal'
+import SettingsModalNew from '@/features/settings/components/settings-modal'
 
 export default function IdePage() {
   useLayoutEventTracking() // sent event when the layout changes

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

@@ -5,7 +5,7 @@ import {
 } 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 DictionarySettingsModal from '@/features/ide-redesign/components/settings/editor-settings/dictionary-settings-modal'
+import DictionarySettingsModal from '@/features/settings/components/editor-settings/dictionary-settings-modal'
 
 const RAIL_MODALS: {
   key: RailModalKey

services/web/frontend/js/features/ide-redesign/contexts/settings-modal-context.tsx

@@ -1,33 +1,34 @@
 import { createContext, FC, useContext, useMemo, useState } from 'react'
 import { useLayoutContext } from '@/shared/context/layout-context'
-import AutoCloseBracketsSetting from '../components/settings/editor-settings/auto-close-brackets-setting'
-import AutoCompleteSetting from '../components/settings/editor-settings/auto-complete-setting'
-import CodeCheckSetting from '../components/settings/editor-settings/code-check-setting'
-import KeybindingSetting from '../components/settings/editor-settings/keybinding-setting'
-import PDFViewerSetting from '../components/settings/editor-settings/pdf-viewer-setting'
+import AutoCloseBracketsSetting from '@/features/settings/components/editor-settings/auto-close-brackets-setting'
+import AutoCompleteSetting from '@/features/settings/components/editor-settings/auto-complete-setting'
+import CodeCheckSetting from '@/features/settings/components/editor-settings/code-check-setting'
+import KeybindingSetting from '@/features/settings/components/editor-settings/keybinding-setting'
+import PDFViewerSetting from '@/features/settings/components/editor-settings/pdf-viewer-setting'
 import importOverleafModules from '../../../../macros/import-overleaf-module.macro'
-import SpellCheckSetting from '../components/settings/editor-settings/spell-check-setting'
-import DictionarySetting from '../components/settings/editor-settings/dictionary-setting'
+import SpellCheckSetting from '@/features/settings/components/editor-settings/spell-check-setting'
+import DictionarySetting from '@/features/settings/components/editor-settings/dictionary-setting'
 import { useTranslation } from 'react-i18next'
-import BreadcrumbsSetting from '../components/settings/editor-settings/breadcrumbs-setting'
-import MathPreviewSetting from '../components/settings/editor-settings/math-preview-setting'
-import RootDocumentSetting from '../components/settings/compiler-settings/root-document-setting'
-import CompilerSetting from '../components/settings/compiler-settings/compiler-setting'
-import ImageNameSetting from '../components/settings/compiler-settings/image-name-setting'
-import DraftSetting from '../components/settings/compiler-settings/draft-setting'
-import StopOnFirstErrorSetting from '../components/settings/compiler-settings/stop-on-first-error-setting'
-import AutoCompileSetting from '../components/settings/compiler-settings/auto-compile-setting'
-import OverallThemeSetting from '../components/settings/appearance-settings/overall-theme-setting'
-import EditorThemeSetting from '../components/settings/appearance-settings/editor-theme-setting'
-import FontSizeSetting from '../components/settings/appearance-settings/font-size-setting'
-import LineHeightSetting from '../components/settings/appearance-settings/line-height-setting'
-import FontFamilySetting from '../components/settings/appearance-settings/font-family-setting'
+import BreadcrumbsSetting from '@/features/settings/components/editor-settings/breadcrumbs-setting'
+import MathPreviewSetting from '@/features/settings/components/editor-settings/math-preview-setting'
+import RootDocumentSetting from '@/features/settings/components/compiler-settings/root-document-setting'
+import CompilerSetting from '@/features/settings/components/compiler-settings/compiler-setting'
+import ImageNameSetting from '@/features/settings/components/compiler-settings/image-name-setting'
+import DraftSetting from '@/features/settings/components/compiler-settings/draft-setting'
+import StopOnFirstErrorSetting from '@/features/settings/components/compiler-settings/stop-on-first-error-setting'
+import AutoCompileSetting from '@/features/settings/components/compiler-settings/auto-compile-setting'
+import OverallThemeSetting from '@/features/settings/components/appearance-settings/overall-theme-setting'
+import EditorThemeSetting from '@/features/settings/components/appearance-settings/editor-theme-setting'
+import FontSizeSetting from '@/features/settings/components/appearance-settings/font-size-setting'
+import LineHeightSetting from '@/features/settings/components/appearance-settings/line-height-setting'
+import FontFamilySetting from '@/features/settings/components/appearance-settings/font-family-setting'
 import { AvailableUnfilledIcon } from '@/shared/components/material-icon'
 import { EditorLeftMenuProvider } from '@/features/editor-left-menu/components/editor-left-menu-context'
-import DarkModePdfSetting from '../components/settings/appearance-settings/dark-mode-pdf-setting'
+import DarkModePdfSetting from '@/features/settings/components/appearance-settings/dark-mode-pdf-setting'
+
 import { useProjectSettingsContext } from '@/features/editor-left-menu/context/project-settings-context'
 import { useFeatureFlag } from '@/shared/context/split-test-context'
-import ProjectNotificationsSetting from '../components/settings/editor-settings/project-notifications-setting'
+import ProjectNotificationsSetting from '@/features/settings/components/editor-settings/project-notifications-setting'
 import getMeta from '@/utils/meta'
 
 const [referenceSearchSettingModule] = importOverleafModules(

services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/overall-theme-setting.tsx → services/web/frontend/js/features/settings/components/appearance-settings/overall-theme-setting.tsx

@@ -4,7 +4,7 @@ import getMeta from '@/utils/meta'
 import { useMemo } from 'react'
 import type { Option } from '../dropdown-setting'
 import { useTranslation } from 'react-i18next'
-import { OverallThemeMeta } from '../../../../../../../types/project-settings'
+import { OverallThemeMeta } from '@ol-types/project-settings'
 import { isIEEEBranded } from '@/utils/is-ieee-branded'
 import { useLayoutContext } from '@/shared/context/layout-context'
 import { OverallTheme } from '@/shared/utils/styles'

services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/compiler-setting.tsx → services/web/frontend/js/features/settings/components/compiler-settings/compiler-setting.tsx

@@ -3,7 +3,7 @@ import DropdownSetting from '../dropdown-setting'
 import type { Option } from '../dropdown-setting'
 import { useTranslation } from 'react-i18next'
 import { usePermissionsContext } from '@/features/ide-react/context/permissions-context'
-import { ProjectCompiler } from '../../../../../../../types/project-settings'
+import { ProjectCompiler } from '@ol-types/project-settings'
 import { useSetCompilationSettingWithEvent } from '@/features/editor-left-menu/hooks/use-set-compilation-setting'
 
 const OPTIONS: Option<ProjectCompiler>[] = [

services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/keybinding-setting.tsx → services/web/frontend/js/features/settings/components/editor-settings/keybinding-setting.tsx

@@ -1,7 +1,7 @@
 import { useProjectSettingsContext } from '@/features/editor-left-menu/context/project-settings-context'
 import { useTranslation } from 'react-i18next'
 import DropdownSetting from '../dropdown-setting'
-import { Keybindings } from '../../../../../../../types/user-settings'
+import { Keybindings } from '../../../../../../types/user-settings'
 
 const OPTIONS: { value: Keybindings; label: string }[] = [
   {

services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/project-notifications-setting.tsx → services/web/frontend/js/features/settings/components/editor-settings/project-notifications-setting.tsx

@@ -3,7 +3,7 @@ import RadioButtonSetting, { RadioOption } from '../radio-button-setting'
 import {
   NotificationLevel,
   useProjectNotificationPreferences,
-} from '../../../hooks/use-project-notification-preferences'
+} from '../../../ide-redesign/hooks/use-project-notification-preferences'
 
 export default function ProjectNotificationsSetting() {
   const { t } = useTranslation()

services/web/frontend/js/features/ide-redesign/components/settings/settings-modal-body.tsx → services/web/frontend/js/features/settings/components/settings-modal-body.tsx

@@ -1,7 +1,7 @@
 import MaterialIcon from '@/shared/components/material-icon'
 
 import { Nav, NavLink, TabContainer, TabContent } from 'react-bootstrap'
-import { SettingsEntry } from '../../contexts/settings-modal-context'
+import { SettingsEntry } from '../../ide-redesign/contexts/settings-modal-context'
 import SettingsTabPane from './settings-tab-pane'
 import BetaBadgeIcon from '@/shared/components/beta-badge-icon'
 import OLTooltip from '@/shared/components/ol/ol-tooltip'

services/web/frontend/js/features/ide-redesign/components/settings/settings-modal.tsx → services/web/frontend/js/features/settings/components/settings-modal.tsx

@@ -9,8 +9,8 @@ import { SettingsModalBody } from './settings-modal-body'
 import {
   SettingsModalProvider,
   useSettingsModalContext,
-} from '../../contexts/settings-modal-context'
-import useFocusOnSetting from '../../hooks/use-focus-on-setting'
+} from '../../ide-redesign/contexts/settings-modal-context'
+import useFocusOnSetting from '../../ide-redesign/hooks/use-focus-on-setting'
 
 const SettingsModalWrapper = () => {
   return (

services/web/frontend/js/features/ide-redesign/components/settings/settings-tab-pane.tsx → services/web/frontend/js/features/settings/components/settings-tab-pane.tsx

@@ -1,5 +1,5 @@
 import { TabPane } from 'react-bootstrap'
-import { SettingsTab } from '../../contexts/settings-modal-context'
+import { SettingsTab } from '../../ide-redesign/contexts/settings-modal-context'
 import SettingsSection from './settings-section'
 import { Fragment } from 'react'
 

services/web/test/frontend/features/settings-modal/settings-modal.test.tsx

@@ -2,7 +2,7 @@ import { screen, render } from '@testing-library/react'
 import { expect } from 'chai'
 import fetchMock from 'fetch-mock'
 import { EditorProviders } from '../../helpers/editor-providers'
-import SettingsModal from '@/features/ide-redesign/components/settings/settings-modal'
+import SettingsModal from '@/features/settings/components/settings-modal'
 import { Folder } from '@ol-types/folder'
 import { ImageName, OverallThemeMeta } from '@ol-types/project-settings'
 

services/web/test/frontend/features/settings-modal/settings/auto-close-brackets-setting.test.tsx

@@ -2,7 +2,7 @@ import { screen, render } from '@testing-library/react'
 import { expect } from 'chai'
 import fetchMock from 'fetch-mock'
 import { EditorProviders } from '../../../helpers/editor-providers'
-import AutoCloseBracketsSetting from '@/features/ide-redesign/components/settings/editor-settings/auto-close-brackets-setting'
+import AutoCloseBracketsSetting from '@/features/settings/components/editor-settings/auto-close-brackets-setting'
 import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context'
 
 describe('<AutoCloseBracketsSetting />', function () {

services/web/test/frontend/features/settings-modal/settings/auto-compile-setting.test.tsx

@@ -6,7 +6,7 @@ import {
   EditorProviders,
   projectDefaults,
 } from '../../../helpers/editor-providers'
-import AutoCompileSetting from '@/features/ide-redesign/components/settings/compiler-settings/auto-compile-setting'
+import AutoCompileSetting from '@/features/settings/components/compiler-settings/auto-compile-setting'
 import localStorage from '@/infrastructure/local-storage'
 import userEvent from '@testing-library/user-event'
 

services/web/test/frontend/features/settings-modal/settings/auto-complete-setting.test.tsx

@@ -3,7 +3,7 @@ import { expect } from 'chai'
 import fetchMock from 'fetch-mock'
 import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context'
 import { EditorProviders } from '../../../helpers/editor-providers'
-import AutoCompleteSetting from '@/features/ide-redesign/components/settings/editor-settings/auto-complete-setting'
+import AutoCompleteSetting from '@/features/settings/components/editor-settings/auto-complete-setting'
 
 describe('<AutoCompleteSetting />', function () {
   afterEach(function () {

services/web/test/frontend/features/settings-modal/settings/breadcrumbs-setting.test.tsx

@@ -3,7 +3,7 @@ import { expect } from 'chai'
 import fetchMock from 'fetch-mock'
 import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context'
 import { EditorProviders } from '../../../helpers/editor-providers'
-import BreadcrumbsSetting from '@/features/ide-redesign/components/settings/editor-settings/breadcrumbs-setting'
+import BreadcrumbsSetting from '@/features/settings/components/editor-settings/breadcrumbs-setting'
 
 describe('<BreadcrumbsSetting />', function () {
   afterEach(function () {

services/web/test/frontend/features/settings-modal/settings/code-check-setting.test.tsx

@@ -3,7 +3,7 @@ import { expect } from 'chai'
 import fetchMock from 'fetch-mock'
 import { EditorProviders } from '../../../helpers/editor-providers'
 import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context'
-import CodeCheckSetting from '@/features/ide-redesign/components/settings/editor-settings/code-check-setting'
+import CodeCheckSetting from '@/features/settings/components/editor-settings/code-check-setting'
 
 describe('<CodeCheckSetting />', function () {
   afterEach(function () {

services/web/test/frontend/features/settings-modal/settings/compiler-setting.test.tsx

@@ -6,7 +6,7 @@ import {
   EditorProviders,
   projectDefaults,
 } from '../../../helpers/editor-providers'
-import CompilerSetting from '@/features/ide-redesign/components/settings/compiler-settings/compiler-setting'
+import CompilerSetting from '@/features/settings/components/compiler-settings/compiler-setting'
 import userEvent from '@testing-library/user-event'
 
 const OPTIONS = [

services/web/test/frontend/features/settings-modal/settings/dictionary-setting.test.tsx

@@ -2,7 +2,7 @@ import { fireEvent, screen, within, render } from '@testing-library/react'
 import { expect } from 'chai'
 import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context'
 import { EditorProviders } from '../../../helpers/editor-providers'
-import DictionarySetting from '@/features/ide-redesign/components/settings/editor-settings/dictionary-setting'
+import DictionarySetting from '@/features/settings/components/editor-settings/dictionary-setting'
 import RailModals from '@/features/ide-react/components/rail/rail-modals'
 
 describe('<DictionarySetting />', function () {

services/web/test/frontend/features/settings-modal/settings/draft-setting.test.tsx

@@ -6,7 +6,7 @@ import {
   projectDefaults,
 } from '../../../helpers/editor-providers'
 import userEvent from '@testing-library/user-event'
-import DraftSetting from '@/features/ide-redesign/components/settings/compiler-settings/draft-setting'
+import DraftSetting from '@/features/settings/components/compiler-settings/draft-setting'
 
 const OPTIONS = [
   {

services/web/test/frontend/features/settings-modal/settings/editor-theme-setting.test.tsx

@@ -3,7 +3,7 @@ import { expect } from 'chai'
 import fetchMock from 'fetch-mock'
 import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context'
 import { EditorProviders } from '../../../helpers/editor-providers'
-import EditorThemeSetting from '@/features/ide-redesign/components/settings/appearance-settings/editor-theme-setting'
+import EditorThemeSetting from '@/features/settings/components/appearance-settings/editor-theme-setting'
 import userEvent from '@testing-library/user-event'
 
 const MOCK_IEEE_BRAND_ID = 123

services/web/test/frontend/features/settings-modal/settings/font-family-setting.test.tsx

@@ -3,7 +3,7 @@ import { expect } from 'chai'
 import fetchMock from 'fetch-mock'
 import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context'
 import { EditorProviders } from '../../../helpers/editor-providers'
-import FontFamilySetting from '@/features/ide-redesign/components/settings/appearance-settings/font-family-setting'
+import FontFamilySetting from '@/features/settings/components/appearance-settings/font-family-setting'
 import userEvent from '@testing-library/user-event'
 
 const options = [

services/web/test/frontend/features/settings-modal/settings/font-size-setting.test.tsx

@@ -3,7 +3,7 @@ import { expect } from 'chai'
 import fetchMock from 'fetch-mock'
 import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context'
 import { EditorProviders } from '../../../helpers/editor-providers'
-import FontSizeSetting from '@/features/ide-redesign/components/settings/appearance-settings/font-size-setting'
+import FontSizeSetting from '@/features/settings/components/appearance-settings/font-size-setting'
 import userEvent from '@testing-library/user-event'
 
 describe('<FontSizeSetting />', function () {

services/web/test/frontend/features/settings-modal/settings/image-name-setting.test.tsx

@@ -7,7 +7,7 @@ import {
   EditorProviders,
   projectDefaults,
 } from '../../../helpers/editor-providers'
-import ImageNameSetting from '@/features/ide-redesign/components/settings/compiler-settings/image-name-setting'
+import ImageNameSetting from '@/features/settings/components/compiler-settings/image-name-setting'
 import userEvent from '@testing-library/user-event'
 
 describe('<ImageNameSetting />', function () {

services/web/test/frontend/features/settings-modal/settings/keybinding-setting.test.tsx

@@ -3,7 +3,7 @@ import { expect } from 'chai'
 import fetchMock from 'fetch-mock'
 import { EditorProviders } from '../../../helpers/editor-providers'
 import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context'
-import KeybindingSetting from '@/features/ide-redesign/components/settings/editor-settings/keybinding-setting'
+import KeybindingSetting from '@/features/settings/components/editor-settings/keybinding-setting'
 import userEvent from '@testing-library/user-event'
 
 const OPTIONS = [

services/web/test/frontend/features/settings-modal/settings/line-height-setting.test.tsx

@@ -3,7 +3,7 @@ import { expect } from 'chai'
 import fetchMock from 'fetch-mock'
 import { EditorProviders } from '../../../helpers/editor-providers'
 import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context'
-import LineHeightSetting from '@/features/ide-redesign/components/settings/appearance-settings/line-height-setting'
+import LineHeightSetting from '@/features/settings/components/appearance-settings/line-height-setting'
 import userEvent from '@testing-library/user-event'
 
 const OPTIONS = [

services/web/test/frontend/features/settings-modal/settings/math-preview-setting.test.tsx

@@ -3,7 +3,7 @@ import { expect } from 'chai'
 import fetchMock from 'fetch-mock'
 import { EditorProviders } from '../../../helpers/editor-providers'
 import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context'
-import MathPreviewSetting from '@/features/ide-redesign/components/settings/editor-settings/math-preview-setting'
+import MathPreviewSetting from '@/features/settings/components/editor-settings/math-preview-setting'
 
 describe('<MathPreviewSetting />', function () {
   afterEach(function () {

services/web/test/frontend/features/settings-modal/settings/overall-theme-setting.test.tsx

@@ -5,7 +5,8 @@ import type { OverallThemeMeta } from '../../../../../types/project-settings'
 import getMeta from '@/utils/meta'
 import { EditorProviders } from '../../../helpers/editor-providers'
 import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context'
-import OverallThemeSetting from '@/features/ide-redesign/components/settings/appearance-settings/overall-theme-setting'
+import OverallThemeSetting from '@/features/settings/components/appearance-settings/overall-theme-setting'
+
 import userEvent from '@testing-library/user-event'
 
 const IEEE_BRAND_ID = 1234

services/web/test/frontend/features/settings-modal/settings/pdf-viewer-setting.test.tsx

@@ -3,7 +3,7 @@ import { expect } from 'chai'
 import fetchMock from 'fetch-mock'
 import { EditorProviders } from '../../../helpers/editor-providers'
 import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context'
-import PDFViewerSetting from '@/features/ide-redesign/components/settings/editor-settings/pdf-viewer-setting'
+import PDFViewerSetting from '@/features/settings/components/editor-settings/pdf-viewer-setting'
 import userEvent from '@testing-library/user-event'
 
 const OPTIONS = [

services/web/test/frontend/features/settings-modal/settings/root-document-setting.test.tsx

@@ -7,7 +7,7 @@ import {
   EditorProviders,
   projectDefaults,
 } from '../../../helpers/editor-providers'
-import RootDocumentSetting from '@/features/ide-redesign/components/settings/compiler-settings/root-document-setting'
+import RootDocumentSetting from '@/features/settings/components/compiler-settings/root-document-setting'
 import userEvent from '@testing-library/user-event'
 
 const OPTIONS = [

services/web/test/frontend/features/settings-modal/settings/spell-check-setting.test.tsx

@@ -7,7 +7,7 @@ import {
   projectDefaults,
 } from '../../../helpers/editor-providers'
 import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context'
-import SpellCheckSetting from '@/features/ide-redesign/components/settings/editor-settings/spell-check-setting'
+import SpellCheckSetting from '@/features/settings/components/editor-settings/spell-check-setting'
 import userEvent from '@testing-library/user-event'
 
 describe('<SpellCheckSetting />', function () {

services/web/test/frontend/features/settings-modal/settings/stop-on-first-error-setting.test.tsx

@@ -8,7 +8,7 @@ import {
 } from '../../../helpers/editor-providers'
 import localStorage from '@/infrastructure/local-storage'
 import userEvent from '@testing-library/user-event'
-import StopOnFirstErrorSetting from '@/features/ide-redesign/components/settings/compiler-settings/stop-on-first-error-setting'
+import StopOnFirstErrorSetting from '@/features/settings/components/compiler-settings/stop-on-first-error-setting'
 
 describe('<StopOnFirstErrorSetting />', function () {
   afterEach(function () {