Skip to content

Commit 464e952

Browse files
authored
Merge pull request #379 from openedx/aansari/INF-993
feat: deprecate notification tray in learning header
2 parents 4b89e75 + 018ca18 commit 464e952

32 files changed

+36
-2081
lines changed

example/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import React from 'react';
44
import ReactDOM from 'react-dom';
55
import { initialize, getConfig, subscribe, APP_READY } from '@edx/frontend-platform';
66
import { AppContext, AppProvider } from '@edx/frontend-platform/react';
7-
// import Header from '@edx/frontend-component-header';
8-
import { LearningHeader as Header } from '@edx/frontend-component-header';
7+
import Header from '@edx/frontend-component-header';
98

109
import './index.scss';
1110

package-lock.json

Lines changed: 8 additions & 60 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,11 @@
6262
"@fortawesome/free-regular-svg-icons": "6.4.0",
6363
"@fortawesome/free-solid-svg-icons": "6.4.0",
6464
"@fortawesome/react-fontawesome": "^0.2.0",
65-
"@reduxjs/toolkit": "1.9.5",
6665
"axios-mock-adapter": "1.21.5",
6766
"babel-polyfill": "6.26.0",
68-
"classnames": "2.3.2",
69-
"lodash": "4.17.21",
70-
"react-redux": "7.2.9",
7167
"react-responsive": "8.2.0",
7268
"react-router-dom": "5.3.4",
73-
"react-transition-group": "4.4.5",
74-
"rosie": "2.1.0",
75-
"timeago.js": "4.0.2"
69+
"react-transition-group": "4.4.5"
7670
},
7771
"peerDependencies": {
7872
"@edx/frontend-platform": "^4.0.0",

src/Header.test.jsx

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,24 @@
22
import React from 'react';
33
import { IntlProvider } from '@edx/frontend-platform/i18n';
44
import TestRenderer from 'react-test-renderer';
5-
import { AppContext, AppProvider } from '@edx/frontend-platform/react';
5+
import { AppContext } from '@edx/frontend-platform/react';
66
import { Context as ResponsiveContext } from 'react-responsive';
7-
import { initializeMockApp } from '@edx/frontend-platform';
8-
import store from './store';
97

108
import Header from './index';
119

1210
const HeaderComponent = ({ width, contextValue }) => (
1311
<ResponsiveContext.Provider value={width}>
1412
<IntlProvider locale="en" messages={{}}>
15-
<AppProvider store={store}>
16-
<AppContext.Provider
17-
value={contextValue}
18-
>
19-
<Header />
20-
</AppContext.Provider>
21-
</AppProvider>
13+
<AppContext.Provider
14+
value={contextValue}
15+
>
16+
<Header />
17+
</AppContext.Provider>
2218
</IntlProvider>
2319
</ResponsiveContext.Provider>
2420
);
2521

2622
describe('<Header />', () => {
27-
beforeEach(async () => {
28-
initializeMockApp({
29-
authenticatedUser: {
30-
userId: '123abc',
31-
username: 'testuser',
32-
administrator: false,
33-
roles: [],
34-
},
35-
});
36-
});
3723
it('renders correctly for anonymous desktop', () => {
3824
const contextValue = {
3925
authenticatedUser: null,

src/Notifications/NotificationRowItem.jsx

Lines changed: 0 additions & 79 deletions
This file was deleted.

0 commit comments

Comments
 (0)