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 772a5d314b1b929bbf0ae68ff131fc6454f22031..00c75f0bc095e02e252ea67b5bae582ee3117e56 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 d270da8d5d091b5a8ca22ee60e16581039677e0b..d362877c05f4a68ff759eba4ec779fefcebd31e6 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 93fcb34c3575db7dd90e4b757f213622e974affd..963074ee9c12b8a133c8bba81352f40686f7365c 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)