Merge pull request #376 from arbrandes/fix-route-quince

[Quince backport] fix: Route with PUBLIC_PATH
fix: Route with PUBLIC_PATH
2023-12-10 20:47:54 -03:00 · 2023-12-08 16:27:28 -03:00 · 2023-10-18 11:22:51 +05:00
5 changed files with 8 additions and 16 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
        "@edx/brand": "npm:@edx/brand-openedx@^1.2.0",
        "@edx/frontend-component-footer": "12.2.0",
        "@edx/frontend-component-header": "4.6.0",
-        "@edx/frontend-platform": "5.0.0",
+        "@edx/frontend-platform": "5.5.4",
        "@edx/paragon": "20.45.0",
        "@edx/react-unit-test-utils": "1.7.0",
        "@edx/reactifex": "^2.1.1",
@@ -2452,9 +2452,9 @@
      }
    },
    "node_modules/@edx/frontend-platform": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-5.0.0.tgz",
-      "integrity": "sha512-DD9/B4rnC3BKPiWlbEFF1JIYFbWC6vUBKTyN8sf4khi4DNhhWhsobk+iNeCWNzF9UgCPRbniIqesdV1F9NXNZw==",
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-5.5.4.tgz",
+      "integrity": "sha512-Yum+oST7XfDwDnDhBnzeR/mjp6O+G0g+5AZtIJ1BdTKQH1z9FObfim/pfoiI9STiYlguVpeWMkzWuca/QMLO/Q==",
      "dependencies": {
        "@cospired/i18n-iso-languages": "4.1.0",
        "@formatjs/intl-pluralrules": "4.3.3",
@@ -2482,7 +2482,7 @@
      },
      "peerDependencies": {
        "@edx/frontend-build": ">= 8.1.0 || ^12.9.0-alpha.1",
-        "@edx/paragon": ">= 10.0.0 < 21.0.0",
+        "@edx/paragon": ">= 10.0.0 < 22.0.0",
        "prop-types": "^15.7.2",
        "react": "^16.9.0 || ^17.0.0",
        "react-dom": "^16.9.0 || ^17.0.0",
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
    "@edx/brand": "npm:@edx/brand-openedx@^1.2.0",
    "@edx/frontend-component-footer": "12.2.0",
    "@edx/frontend-component-header": "4.6.0",
-    "@edx/frontend-platform": "5.0.0",
+    "@edx/frontend-platform": "5.5.4",
    "@edx/paragon": "20.45.0",
    "@edx/react-unit-test-utils": "1.7.0",
    "@edx/reactifex": "^2.1.1",
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -6,7 +6,6 @@ import { AppProvider } from '@edx/frontend-platform/react';
 import Footer from '@edx/frontend-component-footer';
 import Header from '@edx/frontend-component-header';

-import { routePath } from 'data/constants/app';
 import store from 'data/store';
 import GradebookPage from 'containers/GradebookPage';
 import './App.scss';
@@ -20,7 +19,7 @@ const App = () => (
      <main>
        <Routes>
          <Route
-            path={routePath}
+            path="/:courseId"
            element={<GradebookPage />}
          />
        </Routes>
--- a/src/App.test.jsx
+++ b/src/App.test.jsx
@@ -7,7 +7,6 @@ import { AppProvider } from '@edx/frontend-platform/react';
 import Footer from '@edx/frontend-component-footer';
 import Header from '@edx/frontend-component-header';

-import { routePath } from 'data/constants/app';
 import store from 'data/store';
 import GradebookPage from 'containers/GradebookPage';

@@ -21,9 +20,6 @@ jest.mock('react-router-dom', () => ({
 jest.mock('@edx/frontend-platform/react', () => ({
  AppProvider: () => 'AppProvider',
 }));
-jest.mock('data/constants/app', () => ({
-  routePath: '/:courseId',
-}));
 jest.mock('@edx/frontend-component-footer', () => 'Footer');
 jest.mock('data/store', () => 'testStore');
 jest.mock('containers/GradebookPage', () => 'GradebookPage');
@@ -66,7 +62,7 @@ describe('App router component', () => {
        expect(secondChild.find('main')).toEqual(shallow(
          <main>
            <Routes>
-              <Route path={routePath} element={<GradebookPage />} />
+              <Route path="/:courseId" element={<GradebookPage />} />
            </Routes>
          </main>,
        ));
--- a/src/data/constants/app.js
+++ b/src/data/constants/app.js
@@ -1,7 +1,4 @@
 import { StrictDict } from 'utils';
-import { getConfig } from '@edx/frontend-platform';
-
-export const routePath = `${getConfig().PUBLIC_PATH}:courseId`;

 export const views = StrictDict({
  grades: 'grades',
Author	SHA1	Message	Date
Adolfo R. Brandes	acdad5af00	Merge pull request #376 from arbrandes/fix-route-quince [Quince backport] fix: Route with PUBLIC_PATH	2023-12-10 20:47:54 -03:00
Adolfo R. Brandes	ba9fb375d9	fix: Route with PUBLIC_PATH Prior to this change, the MFE would fail to render with any PUBLIC_PATH set. Because that is now handled entirely by `frontend-platform`, we can avoid referring to PUBLIC_PATH entirely, here.	2023-12-08 16:27:28 -03:00
Syed Ali Abbas Zaidi	b536180a3e	chore: bump frontend-platform (#356 )	2023-10-18 11:22:51 +05:00