refactor: refactored code according to requested changes

openedx · Nov 13, 2024 · 1b6612c · 1b6612c
1 parent dabf556
commit 1b6612c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 18 deletions.
diff --git a/src/index.jsx b/src/index.jsx
@@ -7,6 +7,7 @@ import {
   initialize,
   mergeConfig,
   subscribe,
+  getConfig,
 } from '@edx/frontend-platform';
 import {
   AppProvider,
@@ -26,19 +27,19 @@ import Head from './head/Head';
 
 import AppRoutes from './routes/AppRoutes';
 
-if (process.env.ENABLE_NEW_PROFILE_VIEW === 'true') {
-  import('./index-v2.scss');
-} else {
-  import('./index.scss');
-}
-
-subscribe(APP_READY, () => {
+subscribe(APP_READY, async () => {
+  const isNewProfileEnabled = getConfig().ENABLE_NEW_PROFILE_VIEW === 'true';
+  if (isNewProfileEnabled) {
+    await import('./index-v2.scss');
+  } else {
+    await import('./index.scss');
+  }
   ReactDOM.render(
     <AppProvider store={configureStore()}>
       <Head />
       <Header />
       <main id="main">
-        <AppRoutes />
+        <AppRoutes isNewProfileEnabled={isNewProfileEnabled} />
       </main>
       <FooterSlot />
     </AppProvider>,

diff --git a/src/routes/AppRoutes.jsx b/src/routes/AppRoutes.jsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import {
   AuthenticatedPageRoute,
   PageWrap,
@@ -7,17 +8,25 @@ import { Routes, Route } from 'react-router-dom';
 import { ProfilePage, NotFoundPage } from '../profile';
 import { ProfilePage as NewProfilePage, NotFoundPage as NewNotFoundPage } from '../profile-v2';
 
-const isNewProfileEnabled = process.env.ENABLE_NEW_PROFILE_VIEW === 'true';
+const AppRoutes = ({ isNewProfileEnabled }) => {
+  const SelectedProfilePage = isNewProfileEnabled ? NewProfilePage : ProfilePage;
+  const SelectedNotFoundPage = isNewProfileEnabled ? NewNotFoundPage : NotFoundPage;
 
-const SelectedProfilePage = isNewProfileEnabled ? NewProfilePage : ProfilePage;
-const SelectedNotFoundPage = isNewProfileEnabled ? NewNotFoundPage : NotFoundPage;
+  return (
+    <Routes>
+      <Route path="/u/:username" element={<AuthenticatedPageRoute><SelectedProfilePage /></AuthenticatedPageRoute>} />
+      <Route path="/notfound" element={<PageWrap><SelectedNotFoundPage /></PageWrap>} />
+      <Route path="*" element={<PageWrap><SelectedNotFoundPage /></PageWrap>} />
+    </Routes>
+  );
+};
 
-const AppRoutes = () => (
-  <Routes>
-    <Route path="/u/:username" element={<AuthenticatedPageRoute><SelectedProfilePage /></AuthenticatedPageRoute>} />
-    <Route path="/notfound" element={<PageWrap><SelectedNotFoundPage /></PageWrap>} />
-    <Route path="*" element={<PageWrap><SelectedNotFoundPage /></PageWrap>} />
-  </Routes>
-);
+AppRoutes.propTypes = {
+  isNewProfileEnabled: PropTypes.bool,
+};
+
+AppRoutes.defaultProps = {
+  isNewProfileEnabled: null,
+};
 
 export default AppRoutes;