Skip to content

Commit f42207b

Browse files
committed
fix: requested changes
1 parent 489742d commit f42207b

4 files changed

Lines changed: 34 additions & 39 deletions

File tree

src/App.jsx

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import React from 'react';
2-
import { Helmet } from 'react-helmet';
32

43
import { useIntl } from '@edx/frontend-platform/i18n';
54
import { logError } from '@edx/frontend-platform/logging';
@@ -68,22 +67,16 @@ export const App = () => {
6867
}
6968
}, [authenticatedUser, loadData]);
7069
return (
71-
<>
72-
<Helmet>
73-
<title>{formatMessage(messages.pageTitle)}</title>
74-
<link rel="shortcut icon" href={getConfig().FAVICON_URL} type="image/x-icon" />
75-
</Helmet>
76-
<main id="main">
77-
{hasNetworkFailure
78-
? (
79-
<Alert variant="danger">
80-
<ErrorPage message={formatMessage(messages.errorMessage, { supportEmail })} />
81-
</Alert>
82-
) : (
83-
<Dashboard />
84-
)}
85-
</main>
86-
</>
70+
<main id="main">
71+
{hasNetworkFailure
72+
? (
73+
<Alert variant="danger">
74+
<ErrorPage message={formatMessage(messages.errorMessage, { supportEmail })} />
75+
</Alert>
76+
) : (
77+
<Dashboard />
78+
)}
79+
</main>
8780
);
8881
};
8982

src/containers/LearnerDashboardHeader/index.jsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import React from 'react';
2+
import { Helmet } from 'react-helmet';
23

4+
import { getConfig } from '@edx/frontend-platform';
5+
import { useIntl } from '@edx/frontend-platform/i18n';
36
import MasqueradeBar from 'containers/MasqueradeBar';
47
import { AppContext } from '@edx/frontend-platform/react';
58
import Header from '@edx/frontend-component-header';
@@ -9,12 +12,13 @@ import urls from 'data/services/lms/urls';
912
import { useLocation } from 'react-router-dom';
1013
import { useDashboardMessages } from 'containers/Dashboard/hooks';
1114
import ConfirmEmailBanner from './ConfirmEmailBanner';
12-
15+
import appMessages from '../../messages';
1316
import { useLearnerDashboardHeaderMenu, findCoursesNavClicked } from './hooks';
1417
import './index.scss';
1518

1619
export const LearnerDashboardHeader = () => {
1720
const { authenticatedUser } = React.useContext(AppContext);
21+
const { formatMessage } = useIntl();
1822
const { courseSearchUrl } = reduxHooks.usePlatformSettingsData();
1923
const { pageTitle } = useDashboardMessages();
2024
const location = useLocation();
@@ -33,6 +37,10 @@ export const LearnerDashboardHeader = () => {
3337

3438
return (
3539
<>
40+
<Helmet>
41+
<title>{formatMessage(appMessages.pageTitle)}</title>
42+
<link rel="shortcut icon" href={getConfig().FAVICON_URL} type="image/x-icon" />
43+
</Helmet>
3644
<ConfirmEmailBanner />
3745
<Header
3846
mainMenuItems={learnerHomeHeaderMenu.mainMenu}

src/containers/ProgramDashboard/ProgramsList/index.tsx

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import React, { useState, useEffect } from 'react';
2-
import { Helmet } from 'react-helmet';
32
import {
43
Alert, CardGrid, Col, Container, Row, Spinner,
54
} from '@openedx/paragon';
@@ -83,25 +82,18 @@ const ProgramsList: React.FC = () => {
8382
};
8483

8584
return (
86-
<>
87-
<Helmet>
88-
<title>
89-
{formatMessage(messages.programDashboardPageTitle)}
90-
</title>
91-
</Helmet>
92-
<Container size="lg" className="p-4.5">
93-
<h2>
94-
{formatMessage(messages.programsListHeaderText)}
95-
</h2>
96-
<Row className="py-3">
97-
{errorState ? (
98-
renderFailureAlert()
99-
) : (
100-
renderPrograms()
101-
)}
102-
</Row>
103-
</Container>
104-
</>
85+
<Container size="lg" className="p-4.5">
86+
<h2>
87+
{formatMessage(messages.programsListHeaderText)}
88+
</h2>
89+
<Row className="py-3">
90+
{errorState ? (
91+
renderFailureAlert()
92+
) : (
93+
renderPrograms()
94+
)}
95+
</Row>
96+
</Container>
10597
);
10698
};
10799

src/containers/ProgramDashboard/data/api.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
22
import { getProgramsListData } from './api';
33

4-
const mockGet = jest.fn();
4+
const mockGet = jest.fn(() => ({
5+
data: {},
6+
}));
57
const mockLMSBaseUrl = 'http://test-lms-base-url';
68

79
jest.mock('@edx/frontend-platform/auth', () => ({

0 commit comments

Comments
 (0)