Skip to content

Commit b1d13e7

Browse files
committed
Updating submission page to functional component
+ Also fixing a missing import in another file
1 parent 21845c6 commit b1d13e7

File tree

2 files changed

+20
-36
lines changed

2 files changed

+20
-36
lines changed
Lines changed: 19 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import React from 'react';
21
import PropTypes from 'prop-types';
32

43
import Banner from 'components/SharedComponents/Banner';
@@ -28,65 +27,49 @@ const propTypes = {
2827
reverting: PropTypes.bool
2928
};
3029

31-
const defaultProps = {
32-
error: false,
33-
errorMessage: '',
34-
loading: true,
35-
submissionInfo: {},
36-
currentStep: 0,
37-
reverting: false
38-
};
39-
40-
export default class SubmissionPage extends React.Component {
41-
render() {
42-
const {
43-
loading,
44-
error,
45-
errorMessage,
46-
submissionID,
47-
currentStep,
48-
submissionInfo
49-
} = this.props;
30+
const SubmissionPage = ({
31+
error = false, errorMessage = '', loading = true, submissionInfo = {}, currentStep = 0, reverting = false, ...props
32+
}) => {
5033
let content;
5134
switch (currentStep) {
5235
case 1:
5336
content = (
5437
<ValidateDataContainer
55-
submissionID={submissionID}
56-
errorFromStep={this.props.errorFromStep} />
38+
submissionID={props.submissionID}
39+
errorFromStep={props.errorFromStep} />
5740
);
5841
break;
5942
case 2:
6043
content = (
6144
<GenerateFilesContainer
62-
submissionID={submissionID}
63-
errorFromStep={this.props.errorFromStep} />
45+
submissionID={props.submissionID}
46+
errorFromStep={props.errorFromStep} />
6447
);
6548
break;
6649
case 3:
6750
content = (
6851
<CrossFileContentContainer
69-
submissionID={submissionID}
70-
errorFromStep={this.props.errorFromStep}
52+
submissionID={props.submissionID}
53+
errorFromStep={props.errorFromStep}
7154
publishStatus={submissionInfo.publish_status} />
7255
);
7356
break;
7457
case 4:
75-
content = <GenerateEFContainer submissionID={submissionID} errorFromStep={this.props.errorFromStep} />;
58+
content = <GenerateEFContainer submissionID={props.submissionID} errorFromStep={props.errorFromStep} />;
7659
break;
7760
case 5:
7861
content = (<ReviewDataContainer
79-
submissionID={submissionID}
80-
errorFromStep={this.props.errorFromStep}
62+
submissionID={props.submissionID}
63+
errorFromStep={props.errorFromStep}
8164
testSubmission={submissionInfo.test_submission} />);
8265
break;
8366
default:
8467
content = null;
8568
}
8669
const subStatusBanner = (<SubmissionWarningBanner
87-
submissionInfo={this.props.submissionInfo}
88-
revertSubmission={this.props.revertSubmission}
89-
reverting={this.props.reverting} />);
70+
submissionInfo={submissionInfo}
71+
revertSubmission={props.revertSubmission}
72+
reverting={reverting} />);
9073
return (
9174
<div className="usa-da-submission-page">
9275
<Navbar activeTab="submissionGuide" type="dabs" />
@@ -98,7 +81,7 @@ export default class SubmissionPage extends React.Component {
9881
<div className="row">
9982
<Progress
10083
currentStep={currentStep}
101-
id={submissionID} />
84+
id={props.submissionID} />
10285
</div>
10386
</div>
10487
</div>
@@ -109,8 +92,8 @@ export default class SubmissionPage extends React.Component {
10992
</main>
11093
</div>
11194
);
112-
}
113-
}
95+
};
11496

11597
SubmissionPage.propTypes = propTypes;
116-
SubmissionPage.defaultProps = defaultProps;
98+
99+
export default SubmissionPage;

src/js/components/uploadFabsFile/UploadFabsFileValidation.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Created by Minahm Kim
44
*/
55

6+
import React from 'react';
67
import { CSSTransition, TransitionGroup } from 'react-transition-group';
78

89
import { useState, useEffect, useRef } from 'react';

0 commit comments

Comments
 (0)