From 1154b65c9166b86370e5e070faeb859cad606fd0 Mon Sep 17 00:00:00 2001 From: David Jay Date: Thu, 15 Dec 2016 14:19:44 -0500 Subject: [PATCH] Updating state from menu. --- client/coral-admin/src/actions/assets.js | 4 ++-- client/coral-admin/src/containers/Streams/Streams.js | 12 ++++++------ client/coral-admin/src/services/talk-adapter.js | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/coral-admin/src/actions/assets.js b/client/coral-admin/src/actions/assets.js index 5918d1df8..b13454a21 100644 --- a/client/coral-admin/src/actions/assets.js +++ b/client/coral-admin/src/actions/assets.js @@ -4,8 +4,8 @@ import {FETCH_ASSETS, UPDATE_ASSET_STATE} from '../constants/assets'; * Action disptacher related to assets */ -export const updateAssetState = (id, property, value) => (dispatch) => { - dispatch({type: UPDATE_ASSET_STATE, id, property, value}); +export const updateAssetState = (id, closedAt) => (dispatch) => { + dispatch({type: UPDATE_ASSET_STATE, id, closedAt}); }; export const fetchAssets = (skip, limit, search, sort) => (dispatch) => { diff --git a/client/coral-admin/src/containers/Streams/Streams.js b/client/coral-admin/src/containers/Streams/Streams.js index 078f7c98a..53db75c89 100644 --- a/client/coral-admin/src/containers/Streams/Streams.js +++ b/client/coral-admin/src/containers/Streams/Streams.js @@ -2,7 +2,7 @@ import React, {Component} from 'react'; import styles from './Streams.css'; import {connect} from 'react-redux'; import I18n from 'coral-framework/modules/i18n/i18n'; -import {fetchAssets, updateAsset} from '../../actions/assets'; +import {fetchAssets, updateAssetState} from '../../actions/assets'; import translations from '../../translations.json'; import { RadioGroup, @@ -40,7 +40,7 @@ class Streams extends Component { prev.statusMenus[id] = false; return prev; }); - this.props.updateAsset(id, 'closedAt', closeStream ? Date.now() : null); + this.props.updateAssetState(id, closeStream ? Date.now() : null); } else { this.setState(prev => { prev.statusMenus[id] = true; @@ -49,8 +49,8 @@ class Streams extends Component { } } - renderStatus = (closedAt, id) => { - const closed = closedAt && new Date(closedAt) < Date.now; + renderStatus = (closedAt, {id}) => { + const closed = closedAt && new Date(closedAt).getTime() < Date.now(); const statusMenuOpen = this.state.statusMenus[id]; return
{ fetchAssets: (...args) => { dispatch(fetchAssets.apply(this, args)); }, - updateAsset: (...args) => { - dispatch(updateAsset.apply(this, args)); + updateAssetState: (...args) => { + dispatch(updateAssetState.apply(this, args)); } }; }; diff --git a/client/coral-admin/src/services/talk-adapter.js b/client/coral-admin/src/services/talk-adapter.js index dea4d7cb2..67835e30d 100644 --- a/client/coral-admin/src/services/talk-adapter.js +++ b/client/coral-admin/src/services/talk-adapter.js @@ -120,6 +120,6 @@ const updateAssetState = (store, action) => { return coralApi(`/assets/${id}/status`, {method: 'PUT', body: {closedAt}}) .then(() => /* Post comments and users to redux store. Actions will be posted when they are needed. */ - store.dispatch({type: UPDATE_ASSET_STATE_SUCCESS, closedAt})) + store.dispatch({type: UPDATE_ASSET_STATE_SUCCESS})) .catch(error => store.dispatch({type: UPDATE_ASSET_STATE_FAILED, error})); };