Skip to content

Commit 5f5c68b

Browse files
muselesscreatormuselesscreator
committed
fix: merge conflicts
1 parent 0bdcd8a commit 5f5c68b

File tree

24 files changed

+366
-556
lines changed

24 files changed

+366
-556
lines changed

‎.eslintrc.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,7 @@ const { createConfig } = require('@edx/frontend-build');
44
const config = createConfig('eslint', {
55
rules: {
66
'import/no-unresolved': 'off',
7-
'import/no-named-as-default': 'off',
87
},
9-
overrides: [
10-
{
11-
files: ['*{h,H}ooks.js'],
12-
rules: {
13-
'react-hooks/rules-of-hooks': 'off',
14-
},
15-
},
16-
],
178
});
189

1910
config.rules['react/function-component-definition'][1].unnamedComponents = 'arrow-function';

‎jest.config.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ const config = createConfig('jest', {
1313
});
1414

1515
config.moduleDirectories = ['node_modules', 'src'];
16-
<<<<<<< HEAD
17-
=======
1816

19-
>>>>>>> 8f4b2e6 (chore: package updates)
2017
// add axios to the list of modules to not transform
2118
config.transformIgnorePatterns = ['/node_modules/(?!@edx|axios)'];
2219

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"dependencies": {
3737
"@edx/brand": "npm:@edx/[email protected]",
3838
"@edx/frontend-component-footer": "12.2.1",
39-
"@edx/frontend-component-header": "4.6.1",
39+
"@edx/frontend-component-header": "4.6.0",
4040
"@edx/frontend-platform": "5.4.0",
4141
"@edx/paragon": "^20.20.0",
4242
"@edx/react-unit-test-utils": "1.7.0",
@@ -51,7 +51,7 @@
5151
"@tinymce/tinymce-react": "3.14.0",
5252
"axios": "^1.5.1",
5353
"classnames": "^2.3.2",
54-
"core-js": "3.33.0",
54+
"core-js": "3.32.2",
5555
"filesize": "^8.0.6",
5656
"jest-when": "^3.6.0",
5757
"pdfjs-dist": "^3.11.174",

‎src/App.jsx

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,42 +12,54 @@ import SelfAssessmentView from 'views/SelfAssessmentView';
1212
import StudentTrainingView from 'views/StudentTrainingView';
1313
import SubmissionView from 'views/SubmissionView';
1414
import XBlockView from 'views/XBlockView';
15-
import FilePreviewView from 'views/FilePreviewView';
15+
import PageDataProvider from 'components/PageDataProvider';
16+
1617
import messages from './messages';
1718
import routes from './routes';
1819

1920
const RouterRoot = () => {
2021
const { formatMessage } = useIntl();
2122
const appRoute = (route, Component) => (
22-
<Route path={route} element={<AppContainer Component={Component} />} />
23+
<Route
24+
path={route}
25+
element={(
26+
<PageDataProvider>
27+
<AppContainer Component={Component} />
28+
</PageDataProvider>
29+
)}
30+
/>
2331
);
2432
const modalRoute = (route, Component, title) => (
25-
<Route path={route} element={<ModalContainer {...{ title, Component }} />} />
33+
<Route
34+
path={route}
35+
element={(
36+
<PageDataProvider>
37+
<ModalContainer {...{ title, Component }} />
38+
</PageDataProvider>
39+
)}
40+
/>
2641
);
2742

2843
const embeddedRoutes = [
29-
<Route path={routes.embedded.xblock} element={<XBlockView />} />,
30-
modalRoute(routes.embedded.peerAssessment, PeerAssessmentView, 'ORA Peer Assessment'),
31-
modalRoute(routes.embedded.selfAssessment, SelfAssessmentView, 'ORA Self Assessment'),
32-
modalRoute(routes.embedded.studentTraining, StudentTrainingView, 'ORA Student Training'),
33-
modalRoute(routes.embedded.submission, SubmissionView, 'ORA Submission'),
34-
modalRoute(routes.preview, FilePreviewView, 'File Preview'),
35-
<Route path={routes.embedded.root} element={<ErrorPage message={formatMessage(messages.error404Message)} />} />,
44+
<Route path={routes.xblockEmbed} element={<XBlockView />} />,
45+
modalRoute(routes.peerAssessmentEmbed, PeerAssessmentView, 'ORA Peer Assessment'),
46+
modalRoute(routes.selfAssessmentEmbed, SelfAssessmentView, 'ORA Self Assessment'),
47+
modalRoute(routes.studentTrainingEmbed, StudentTrainingView, 'ORA Student Training'),
48+
modalRoute(routes.submissionEmbed, SubmissionView, 'ORA Submission'),
49+
<Route path={routes.rootEmbed} element={<ErrorPage message={formatMessage(messages.error404Message)} />} />,
3650
];
3751
const baseRoutes = [
3852
appRoute(routes.xblock, PeerAssessmentView),
3953
appRoute(routes.peerAssessment, PeerAssessmentView),
4054
appRoute(routes.selfAssessment, SelfAssessmentView),
4155
appRoute(routes.studentTraining, StudentTrainingView),
4256
appRoute(routes.submission, SubmissionView),
43-
appRoute(routes.preview, FilePreviewView),
4457
<Route path={routes.root} element={<ErrorPage message={formatMessage(messages.error404Message)} />} />,
4558
];
4659

4760
const isConfigLoaded = useIsORAConfigLoaded();
48-
const isPageLoaded = useIsPageDataLoaded();
4961

50-
if (!isConfigLoaded || !isPageLoaded) {
62+
if (!isConfigLoaded) {
5163
return (
5264
<div className="h-screen d-flex justify-content-center align-items-center">
5365
<Spinner

‎src/components/FileUpload/__snapshots__/index.test.jsx.snap

Lines changed: 21 additions & 161 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ exports[`<FileUpload /> render default 1`] = `
2525
"accessor": "fileSize",
2626
},
2727
Object {
28-
"Cell": "ActionCell",
28+
"Cell": [Function],
2929
"Header": "Actions",
3030
"accessor": "actions",
3131
},
@@ -50,177 +50,42 @@ exports[`<FileUpload /> render default 1`] = `
5050
itemCount={2}
5151
/>
5252
</Fragment>
53-
<Dropzone
54-
multiple={true}
55-
onProcessUpload={[MockFunction onProcessUpload]}
56-
progressVariant="bar"
57-
/>
58-
<UploadConfirmModal
59-
closeHandler={[MockFunction closeUploadModal]}
60-
open={false}
61-
uploadHandler={[MockFunction confirmUpload]}
62-
/>
63-
</div>
64-
`;
65-
66-
exports[`<FileUpload /> render no uploaded files 1`] = `
67-
<div>
68-
<h3>
69-
File Upload
70-
</h3>
71-
<Dropzone
72-
multiple={true}
73-
onProcessUpload={[MockFunction onProcessUpload]}
74-
progressVariant="bar"
75-
/>
76-
<UploadConfirmModal
77-
closeHandler={[MockFunction closeUploadModal]}
78-
open={false}
79-
uploadHandler={[MockFunction confirmUpload]}
80-
/>
81-
</div>
82-
`;
83-
84-
exports[`<FileUpload /> render read only 1`] = `
85-
<div>
86-
<h3>
87-
File Upload
88-
</h3>
8953
<Fragment>
90-
<b>
91-
Uploaded Files
92-
</b>
93-
<DataTable
94-
columns={
95-
Array [
96-
Object {
97-
"Header": "File Name",
98-
"accessor": "fileName",
99-
},
100-
Object {
101-
"Header": "File Description",
102-
"accessor": "fileDescription",
103-
},
104-
Object {
105-
"Header": "File Size",
106-
"accessor": "fileSize",
107-
},
108-
Object {
109-
"Cell": "ActionCell",
110-
"Header": "Actions",
111-
"accessor": "actions",
112-
},
113-
]
114-
}
115-
data={
116-
Array [
117-
Object {
118-
"fileDescription": "file1 desc",
119-
"fileName": "file1",
120-
"fileSize": 100,
121-
"size": "Unknown",
122-
},
123-
Object {
124-
"fileDescription": "file2 desc",
125-
"fileName": "file2",
126-
"fileSize": 200,
127-
"size": "Unknown",
128-
},
129-
]
130-
}
131-
itemCount={2}
54+
<Dropzone
55+
multiple={true}
56+
onProcessUpload={[MockFunction onProcessUpload]}
57+
progressVariant="bar"
58+
/>
59+
<UploadConfirmModal
60+
closeHandler={[MockFunction closeUploadModal]}
61+
open={false}
62+
uploadHandler={[MockFunction confirmUpload]}
13263
/>
13364
</Fragment>
134-
<UploadConfirmModal
135-
closeHandler={[MockFunction closeUploadModal]}
136-
open={false}
137-
uploadHandler={[MockFunction confirmUpload]}
138-
/>
13965
</div>
14066
`;
14167

142-
exports[`<FileUpload /> renders default 1`] = `
68+
exports[`<FileUpload /> render no uploaded files 1`] = `
14369
<div>
14470
<h3>
14571
File Upload
14672
</h3>
14773
<Fragment>
148-
<b>
149-
Uploaded Files
150-
</b>
151-
<DataTable
152-
columns={
153-
Array [
154-
Object {
155-
"Header": "File Name",
156-
"accessor": "fileName",
157-
},
158-
Object {
159-
"Header": "File Description",
160-
"accessor": "fileDescription",
161-
},
162-
Object {
163-
"Header": "File Size",
164-
"accessor": "fileSize",
165-
},
166-
Object {
167-
"Cell": [Function],
168-
"Header": "Actions",
169-
"accessor": "actions",
170-
},
171-
]
172-
}
173-
data={
174-
Array [
175-
Object {
176-
"fileDescription": "file1 desc",
177-
"fileName": "file1",
178-
"fileSize": 100,
179-
"size": "Unknown",
180-
},
181-
Object {
182-
"fileDescription": "file2 desc",
183-
"fileName": "file2",
184-
"fileSize": 200,
185-
"size": "Unknown",
186-
},
187-
]
188-
}
189-
itemCount={2}
74+
<Dropzone
75+
multiple={true}
76+
onProcessUpload={[MockFunction onProcessUpload]}
77+
progressVariant="bar"
78+
/>
79+
<UploadConfirmModal
80+
closeHandler={[MockFunction closeUploadModal]}
81+
open={false}
82+
uploadHandler={[MockFunction confirmUpload]}
19083
/>
19184
</Fragment>
192-
<Dropzone
193-
multiple={true}
194-
onProcessUpload={[MockFunction onProcessUpload]}
195-
progressVariant="bar"
196-
/>
197-
<UploadConfirmModal
198-
closeHandler={[MockFunction closeUploadModal]}
199-
open={false}
200-
uploadHandler={[MockFunction confirmUpload]}
201-
/>
20285
</div>
20386
`;
20487

205-
exports[`<FileUpload /> renders no uploaded files 1`] = `
206-
<div>
207-
<h3>
208-
File Upload
209-
</h3>
210-
<Dropzone
211-
multiple={true}
212-
onProcessUpload={[MockFunction onProcessUpload]}
213-
progressVariant="bar"
214-
/>
215-
<UploadConfirmModal
216-
closeHandler={[MockFunction closeUploadModal]}
217-
open={false}
218-
uploadHandler={[MockFunction confirmUpload]}
219-
/>
220-
</div>
221-
`;
222-
223-
exports[`<FileUpload /> renders read only 1`] = `
88+
exports[`<FileUpload /> render read only 1`] = `
22489
<div>
22590
<h3>
22691
File Upload
@@ -270,10 +135,5 @@ exports[`<FileUpload /> renders read only 1`] = `
270135
itemCount={2}
271136
/>
272137
</Fragment>
273-
<UploadConfirmModal
274-
closeHandler={[MockFunction closeUploadModal]}
275-
open={false}
276-
uploadHandler={[MockFunction confirmUpload]}
277-
/>
278138
</div>
279139
`;

0 commit comments

Comments
 (0)