From 7fa3c41b7cda7fc8c920ccfaa59861a7d04f726f Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Wed, 20 Feb 2019 16:37:17 +0000
Subject: [PATCH] GH-991: Update some proptype issues
---
.../src/app/src/components/GroupedListing/index.js | 2 +-
.../src/app/src/components/SubmissionDisplay/answers.js | 9 +++++++--
.../static_src/src/app/src/containers/ByRoundListing.js | 5 ++---
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/opentech/static_src/src/app/src/components/GroupedListing/index.js b/opentech/static_src/src/app/src/components/GroupedListing/index.js
index 772a5d314..00c75f0bc 100644
--- a/opentech/static_src/src/app/src/components/GroupedListing/index.js
+++ b/opentech/static_src/src/app/src/components/GroupedListing/index.js
@@ -19,7 +19,7 @@ export default class GroupedListing extends React.Component {
order: PropTypes.arrayOf(PropTypes.shape({
key: PropTypes.string.isRequired,
display: PropTypes.string.isRequired,
- values: PropTypes.arrayOf(PropTypes.string),
+ values: PropTypes.arrayOf(PropTypes.number),
})),
onItemSelection: PropTypes.func,
shouldSelectFirst: PropTypes.bool,
diff --git a/opentech/static_src/src/app/src/components/SubmissionDisplay/answers.js b/opentech/static_src/src/app/src/components/SubmissionDisplay/answers.js
index d270da8d5..d362877c0 100644
--- a/opentech/static_src/src/app/src/components/SubmissionDisplay/answers.js
+++ b/opentech/static_src/src/app/src/components/SubmissionDisplay/answers.js
@@ -19,7 +19,7 @@ const ListAnswer = ({Wrapper, answers}) => {
)
};
ListAnswer.propTypes = {
- Wrapper: PropTypes.element,
+ Wrapper: PropTypes.func,
...arrayAnswerType,
}
@@ -43,7 +43,12 @@ const FileAnswer = ({answer}) => (
FileAnswer.propTypes = fileType
const MultiFileAnswer = ({answer}) => <ListAnswer Wrapper={FileAnswer} answers={answer} />;
-MultiFileAnswer.propTypes = {answer: PropTypes.arrayOf(fileType)}
+MultiFileAnswer.propTypes = {
+ answer: PropTypes.arrayOf(PropTypes.shape({
+ filename: PropTypes.string.isRequired,
+ url:PropTypes.string.isRequired,
+ }))
+}
const AddressAnswer = ({answer}) => (
<div>{
diff --git a/opentech/static_src/src/app/src/containers/ByRoundListing.js b/opentech/static_src/src/app/src/containers/ByRoundListing.js
index 93fcb34c3..963074ee9 100644
--- a/opentech/static_src/src/app/src/containers/ByRoundListing.js
+++ b/opentech/static_src/src/app/src/containers/ByRoundListing.js
@@ -38,7 +38,7 @@ class ByRoundListing extends React.Component {
setCurrentItem: PropTypes.func,
activeSubmission: PropTypes.number,
shouldSelectFirst: PropTypes.bool,
- rounds: PropTypes.array,
+ rounds: PropTypes.object,
isLoading: PropTypes.bool,
errorMessage: PropTypes.string,
};
@@ -90,8 +90,7 @@ class ByRoundListing extends React.Component {
const mapStateToProps = (state) => ({
statuses: getCurrentStatuses(state),
submissions: getCurrentStatusesSubmissions(state),
- isErrored: getRoundsErrored(state),
- errorMessage: getByStatusesError(state),
+ isErrored: getRoundsErrored(state) || getByStatusesError(state),
isLoading: (
getByStatusesLoading(state) ||
getRoundsFetching(state)
--
GitLab