Skip to content

Commit 1343452

Browse files
author
Ben Warzeski
authored
Merge pull request #9 from openedx/bw/consume_new_api
feat: consume new api
2 parents d1ecdcb + 797309d commit 1343452

28 files changed

+800
-21977
lines changed

package-lock.json

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

src/App.jsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,21 @@ import { useIntl } from '@edx/frontend-platform/i18n';
55
import AssessmentView from 'views/AssessmentView';
66
import SubmissionView from 'views/SubmissionView';
77
import messages from './messages';
8+
import routes from './routes';
89

910
const RouterRoot = () => {
1011
const { formatMessage } = useIntl();
1112

1213
return (
1314
<Router>
1415
<Switch>
15-
<Route path="/assessment/:id">
16+
<Route path={routes.assessment}>
1617
<AssessmentView />
1718
</Route>
18-
<Route path="/submission/:id">
19+
<Route path={routes.submission}>
1920
<SubmissionView />
2021
</Route>
21-
<Route path="/*">
22+
<Route path={routes.root}>
2223
<ErrorPage message={formatMessage(messages.error404Message)} />
2324
</Route>
2425
</Switch>

src/components/FileUpload/index.jsx

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React from 'react';
2+
import PropTypes from 'prop-types';
23
import { DataTable, Dropzone } from '@edx/paragon';
34

45
import { useSubmissionResponse } from 'data/services/lms/hooks/selectors';
@@ -8,7 +9,7 @@ import filesize from 'filesize';
89

910
import messages from './messages';
1011

11-
const FileUpload = () => {
12+
const FileUpload = ({ isReadOnly }) => {
1213
const { uploadedFiles } = useSubmissionResponse();
1314
const { formatMessage } = useIntl();
1415
return (
@@ -26,23 +27,30 @@ const FileUpload = () => {
2627
columns={[
2728
{
2829
Header: formatMessage(messages.fileNameTitle),
29-
accessor: 'name',
30+
accessor: 'fileName',
3031
},
3132
{
3233
Header: formatMessage(messages.fileDescriptionTitle),
33-
accessor: 'description',
34+
accessor: 'fileDescription',
3435
},
3536
{
3637
Header: formatMessage(messages.fileSizeTitle),
37-
accessor: 'size',
38+
accessor: 'fileSize',
3839
},
3940
]}
4041
/>
4142
</>
4243
)}
43-
<Dropzone />
44+
{!isReadOnly && <Dropzone />}
4445
</div>
4546
);
4647
};
4748

49+
FileUpload.defaultProps = {
50+
isReadOnly: false,
51+
};
52+
FileUpload.propTypes = {
53+
isReadOnly: PropTypes.bool,
54+
};
55+
4856
export default FileUpload;

src/components/Rubric/CriterionContainer/__snapshots__/CriterionFeedback.test.jsx.snap

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

src/components/Rubric/CriterionContainer/__snapshots__/RadioCriterion.test.jsx.snap

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

src/components/Rubric/CriterionContainer/__snapshots__/ReviewCriterion.test.jsx.snap

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

0 commit comments

Comments
 (0)