diff --git a/client/coral-admin/src/containers/Streams/Streams.css b/client/coral-admin/src/containers/Streams/Streams.css index 7ab1b5199..5ad875b35 100644 --- a/client/coral-admin/src/containers/Streams/Streams.css +++ b/client/coral-admin/src/containers/Streams/Streams.css @@ -46,6 +46,10 @@ margin-top: 3px; } +.streamsTable { + width: 100%; +} + .radio { display: block; } diff --git a/client/coral-admin/src/containers/Streams/Streams.js b/client/coral-admin/src/containers/Streams/Streams.js index ea365d0d1..7b1778012 100644 --- a/client/coral-admin/src/containers/Streams/Streams.js +++ b/client/coral-admin/src/containers/Streams/Streams.js @@ -30,15 +30,17 @@ class Streams extends Component { renderDate = (date) => { const d = new Date(date); - return `${d.getMonth()}/${d.getDate()}/${d.getYear()}`; + return `${d.getMonth() + 1}/${d.getDate()}/${d.getFullYear()}`; } - renderStatus = (status) => { + renderStatus = (closedAt) => { + const status = closedAt && new Date(closedAt) < Date.now ? lang.t('streams.closed') : lang.t('streams.open'); return
{status}
; } render () { const {searchTerm, sortBy, statusFilter} = this.state; + const {assets} = this.props; return
@@ -77,17 +79,13 @@ class Streams extends Component {
- {lang.t('streams.article')} - + className={styles.streamsTable} + rows={assets.ids.map((id) => assets.byId[id])}> + {lang.t('streams.article')} + {lang.t('streams.pubdate')} - + {lang.t('streams.status')} @@ -96,7 +94,11 @@ class Streams extends Component { } } -const mapStateToProps = () => {}; +const mapStateToProps = ({assets}) => { + return { + assets: assets.toJS() + }; +}; const mapDispatchToProps = (dispatch) => { return { fetchAssets: (skip, limit, search, sort) => { diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json index da859c49c..c093f7ae0 100644 --- a/client/coral-admin/src/translations.json +++ b/client/coral-admin/src/translations.json @@ -79,7 +79,12 @@ "closed": "Closed", "newest": "Newest", "oldest": "Oldest", - "sort-by": "Sort By" + "sort-by": "Sort By", + "open": "Open", + "closed": "Closed", + "article": "Article", + "pubdate": "Publication Date", + "status": "Status" } }, "es": { @@ -150,7 +155,12 @@ "closed": "", "newest": "", "oldest": "", - "sort-by": "" + "sort-by": "", + "open": "", + "closed": "", + "article": "", + "pubdate": "", + "status": "" } } }