diff --git a/src/pages/JobList/JobList.js b/src/pages/JobList/JobList.js index b03769448..c337c7782 100644 --- a/src/pages/JobList/JobList.js +++ b/src/pages/JobList/JobList.js @@ -1,10 +1,12 @@ import React from 'react' +import { object, arrayOf, string } from 'prop-types' import { Card } from '@dhis2/ui-core' import { Link } from 'react-router-dom' import { Title } from '../../components/Title' import { Info } from '../../components/Icons' +import JobListItem from './JobListItem' -const JobList = () => ( +const JobList = ({ jobIds, jobEntities }) => ( Scheduled Jobs @@ -21,10 +23,19 @@ const JobList = () => ( On/off - + + {jobIds.map(id => ( + + ))} + ) +JobList.propTypes = { + jobIds: arrayOf(string).isRequired, + jobEntities: object.isRequired, +} + export default JobList diff --git a/src/pages/JobList/JobListContainer.js b/src/pages/JobList/JobListContainer.js index 75527b4ca..ea04bb597 100644 --- a/src/pages/JobList/JobListContainer.js +++ b/src/pages/JobList/JobListContainer.js @@ -1,5 +1,5 @@ import React, { useEffect } from 'react' -import { object, arrayOf, number, node, func, string, bool } from 'prop-types' +import { object, arrayOf, func, string, bool } from 'prop-types' import { connect } from 'react-redux' import { CircularLoader } from '@dhis2/ui-core' import { actions, selectors } from '../../data/jobs' @@ -29,10 +29,9 @@ export const UnconnectedJobListContainer = ({ } UnconnectedJobListContainer.propTypes = { - children: node.isRequired, isFetching: bool.isRequired, errorMessage: string.isRequired, - jobIds: arrayOf(number).isRequired, + jobIds: arrayOf(string).isRequired, jobEntities: object.isRequired, fetchJobsIfNeeded: func.isRequired, }