Merge pull request #245 from openedx/aakbar/PROD-2761

feat: remove old UserPage, related older actions and version toggle
openedx · Apr 5, 2022 · 01583af · 01583af
2 parents 6f24847 + b3fb55a
commit 01583af
Show file tree

Hide file tree

Showing 21 changed files with 61 additions and 1,114 deletions.
diff --git a/src/SupportToolsTab/SupportToolsTab.jsx b/src/SupportToolsTab/SupportToolsTab.jsx
@@ -9,7 +9,7 @@ import {
   PROGRAM_ENROLLMENT_TAB,
   TAB_PATH_MAP,
 } from './constants';
-import UserPage from '../users/v2/UserPage';
+import UserPage from '../users/UserPage';
 import FeatureBasedEnrollmentIndexPage from '../FeatureBasedEnrollments/FeatureBasedEnrollmentIndexPage';
 import ProgramEnrollmentsIndexPage from '../ProgramEnrollments/ProgramEnrollmentsIndexPage';
 

diff --git a/src/Table.jsx b/src/Table.jsx
diff --git a/src/index.jsx b/src/index.jsx
@@ -13,9 +13,8 @@ import { Switch, Route } from 'react-router-dom';
 import SupportHomePage from './supportHome/SupportHomePage';
 import Header from './supportHeader';
 import appMessages from './i18n';
-import UserPage from './users/UserPage';
 import SupportToolsTab from './SupportToolsTab/SupportToolsTab';
-import UserPageV2 from './users/v2/UserPage';
+import UserPageV2 from './users/UserPage';
 import FBEIndexPage from './FeatureBasedEnrollments/FeatureBasedEnrollmentIndexPage';
 import UserMessagesProvider from './userMessages/UserMessagesProvider';
 import ProgramEnrollmentsIndexPage from './ProgramEnrollments/ProgramEnrollmentsIndexPage';
@@ -38,7 +37,6 @@ subscribe(APP_READY, () => {
         <Header />
         <Switch>
           <Route exact path="/" component={SupportHomePage} />
-          <Route path="/users" component={UserPage} />
           <Route path="/v2" component={SupportToolsTab} />
           <Route path="/v2/learner_information" component={UserPageV2} />
           <Route path="/v2/feature_based_enrollments" component={FBEIndexPage} />

diff --git a/src/supportHeader/DesktopHeader.jsx b/src/supportHeader/DesktopHeader.jsx
@@ -8,7 +8,6 @@ import { LinkedLogo, Logo } from './Logo';
 
 // Assets
 import { CaretIcon } from './Icons';
-import ToggleVersion from './ToggleVersion';
 
 export default class DesktopHeader extends React.Component {
   renderMainMenu() {
@@ -53,7 +52,6 @@ export default class DesktopHeader extends React.Component {
 
     return (
       <>
-        <ToggleVersion />
         <Dropdown>
           <Dropdown.Toggle as={AvatarButton} src={avatar}>
             {username}

diff --git a/src/supportHeader/MobileHeader.jsx b/src/supportHeader/MobileHeader.jsx
@@ -8,7 +8,6 @@ import { LinkedLogo, Logo } from './Logo';
 
 // Assets
 import { MenuIcon } from './Icons';
-import ToggleVersion from './ToggleVersion';
 
 export default class MobileHeader extends React.Component {
   renderMainMenu() {
@@ -55,7 +54,6 @@ export default class MobileHeader extends React.Component {
 
     return (
       <>
-        <ToggleVersion />
         <Dropdown>
           <Dropdown.Toggle showLabel={false} size="md" as={AvatarButton} src={avatar}>
             {username}

diff --git a/src/supportHeader/ToggleVersion.jsx b/src/supportHeader/ToggleVersion.jsx