Skip to content

Commit 82cbc3c

Browse files
fix: update api pattern usage
1 parent e4de1f5 commit 82cbc3c

File tree

8 files changed

+29
-26
lines changed

8 files changed

+29
-26
lines changed

src/components/FilePreview/index.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React from 'react';
22

3-
import { useSubmissionResponse } from 'data/services/lms/hooks/selectors';
3+
import { useResponseData } from 'data/services/lms/hooks/selectors';
44
import { FileRenderer, isSupported } from './components';
55

66
const FilePreview = () => {
7-
const { uploadedFiles } = useSubmissionResponse();
7+
const { uploadedFiles } = useResponseData();
88
return (
99
<div>
1010
{uploadedFiles.filter(isSupported).map((file) => (

src/views/PeerAssessmentView/Content.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22

33
import {
44
usePrompts,
5-
useSubmissionResponse,
5+
useResponseData,
66
} from 'data/services/lms/hooks/selectors';
77

88
import Prompt from 'components/Prompt';
@@ -12,7 +12,7 @@ import FilePreview from 'components/FilePreview';
1212

1313
const AssessmentContent = () => {
1414
const prompts = usePrompts();
15-
const response = useSubmissionResponse();
15+
const response = useResponseData();
1616
return (
1717
<div>
1818
{React.Children.toArray(

src/views/SelfAssessmentView/Content.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22

33
import {
44
usePrompts,
5-
useSubmissionResponse,
5+
useResponseData,
66
} from 'data/services/lms/hooks/selectors';
77

88
import Prompt from 'components/Prompt';
@@ -12,7 +12,7 @@ import FilePreview from 'components/FilePreview';
1212

1313
const AssessmentContent = () => {
1414
const prompts = usePrompts();
15-
const response = useSubmissionResponse();
15+
const response = useResponseData();
1616
return (
1717
<div>
1818
{React.Children.toArray(

src/views/StudentTrainingView/Content.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22

33
import {
44
usePrompts,
5-
useSubmissionResponse,
5+
useResponseData,
66
} from 'data/services/lms/hooks/selectors';
77

88
import Prompt from 'components/Prompt';
@@ -11,7 +11,7 @@ import FileUpload from 'components/FileUpload';
1111

1212
const AssessmentContent = () => {
1313
const prompts = usePrompts();
14-
const response = useSubmissionResponse();
14+
const response = useResponseData();
1515
return (
1616
<div>
1717
{React.Children.toArray(

src/views/SubmissionView/SubmissionActions.jsx

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,17 @@ import { MutationStatus } from 'data/services/lms/constants';
66
import messages from './messages';
77

88
const SubmissionActions = ({
9-
submitResponseHandler,
10-
submitResponseStatus,
11-
saveResponseHandler,
12-
saveResponseStatus,
9+
submitResponse,
10+
saveResponse,
1311
}) => {
1412
const { formatMessage } = useIntl();
1513

1614
return (
1715
<ActionRow>
1816
<StatefulButton
1917
variant="secondary"
20-
onClick={saveResponseHandler}
21-
state={saveResponseStatus}
18+
onClick={saveResponse.handler}
19+
state={saveResponse.status}
2220
disabledStates={[MutationStatus.loading]}
2321
labels={{
2422
default: formatMessage(messages.saveActionSave),
@@ -28,8 +26,8 @@ const SubmissionActions = ({
2826
}}
2927
/>
3028
<StatefulButton
31-
onClick={submitResponseHandler}
32-
state={submitResponseStatus}
29+
onClick={submitResponse.handler}
30+
state={submitResponse.status}
3331
disabledStates={[MutationStatus.loading, MutationStatus.success]}
3432
labels={{
3533
[MutationStatus.idle]: formatMessage(messages.submissionActionSubmit),
@@ -46,12 +44,14 @@ const SubmissionActions = ({
4644
};
4745

4846
SubmissionActions.propTypes = {
49-
submitResponseHandler: PropTypes.func.isRequired,
50-
submitResponseStatus: PropTypes.oneOf(Object.values(MutationStatus))
51-
.isRequired,
52-
saveResponseHandler: PropTypes.func.isRequired,
53-
saveResponseStatus: PropTypes.oneOf(Object.values(MutationStatus))
54-
.isRequired,
47+
saveResponse: PropTypes.shape({
48+
status: PropTypes.oneOf(Object.values(MutationStatus)).isRequired,
49+
handler: PropTypes.func.isRequired,
50+
}).isRequired,
51+
submitResponse: PropTypes.shape({
52+
status: PropTypes.oneOf(Object.values(MutationStatus)).isRequired,
53+
handler: PropTypes.func.isRequired,
54+
}).isRequired,
5555
};
5656

5757
export default SubmissionActions;

src/views/SubmissionView/SubmissionContent.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const SubmissionContent = ({
2020
const submissionConfig = useSubmissionConfig();
2121
const prompts = usePrompts();
2222
const { formatMessage } = useIntl();
23+
console.log({ textResponses, uploadedFiles });
2324

2425
return (
2526
<div>
@@ -63,11 +64,11 @@ SubmissionContent.propTypes = {
6364
draftSaved: PropTypes.bool.isRequired,
6465
}).isRequired,
6566
uploadedFiles: PropTypes.shape({
66-
value: PropTypes.shape({
67+
value: PropTypes.arrayOf(PropTypes.shape({
6768
fileDescription: PropTypes.string,
6869
fileName: PropTypes.string,
6970
fileSize: PropTypes.number,
70-
}),
71+
})),
7172
onDeletedFile: PropTypes.func.isRequired,
7273
onFileUploaded: PropTypes.func.isRequired,
7374
}).isRequired,

src/views/SubmissionView/hooks.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
usePageData,
66
usePrompts,
77
useRubricConfig,
8+
useResponseData,
89
} from 'data/services/lms/hooks/selectors';
910

1011
import {
@@ -19,7 +20,7 @@ export const stateKeys = StrictDict({
1920
});
2021

2122
export const useTextResponses = () => {
22-
const { response } = usePageData().submission;
23+
const response = useResponseData();
2324
const prompts = usePrompts();
2425

2526
const [isDirty, setIsDirty] = useKeyedState(stateKeys.isDirty, false);
@@ -61,7 +62,7 @@ export const useUploadedFiles = () => {
6162
const deleteFileMutation = useDeleteFile();
6263
const uploadFilesMutation = useUploadFiles();
6364

64-
const { response } = usePageData().submission;
65+
const response = useResponseData();
6566

6667
const [value, setValue] = useKeyedState(
6768
stateKeys.uploadedFiles,

src/views/SubmissionView/index.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import './index.scss';
1515

1616
export const SubmissionView = () => {
1717
const { actionsProps, formProps, showRubric } = useSubmissionViewData();
18+
console.log({ formProps });
1819
if (!useIsPageDataLoaded()) {
1920
return null;
2021
}

0 commit comments

Comments
 (0)