From 475c84dfbc5b806fb598710bd6b4b5c52c52537e Mon Sep 17 00:00:00 2001 From: gaba Date: Mon, 12 Dec 2016 22:18:11 -0800 Subject: [PATCH] Fix date comparision and change article for asset. --- client/coral-framework/actions/config.js | 9 +++++---- client/coral-framework/reducers/config.js | 2 +- models/asset.js | 2 +- routes/api/asset/index.js | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/client/coral-framework/actions/config.js b/client/coral-framework/actions/config.js index 7850577dc..c2d4083b7 100644 --- a/client/coral-framework/actions/config.js +++ b/client/coral-framework/actions/config.js @@ -24,16 +24,17 @@ export const updateConfiguration = newConfig => (dispatch, getState) => { .catch(error => dispatch(updateConfigFailure(error))); }; -export const updateOpenStream = newConfig => (dispatch, getState) => { +export const updateOpenStream = closedBody => (dispatch, getState) => { const assetId = getState().items.get('assets') .keySeq() .toArray()[0]; dispatch(updateConfigRequest()); - coralApi(`/asset/${assetId}/status`, {method: 'PUT', body: newConfig}) + + coralApi(`/asset/${assetId}/status`, {method: 'PUT', body: closedBody}) .then(() => { dispatch(addNotification('success', lang.t('successUpdateSettings'))); - dispatch(updateConfigSuccess(newConfig)); + dispatch(updateConfigSuccess(closedBody)); }) .catch(error => dispatch(updateConfigFailure(error))); }; @@ -47,6 +48,6 @@ export const updateOpenStatus = status => dispatch => { dispatch(updateOpenStream({closedAt: null})); } else { dispatch(closeStream()); - dispatch(updateOpenStream({closedAt: Date.now(), closedMessage: ''})); + dispatch(updateOpenStream({closedAt: new Date().getTime(), closedMessage: ''})); } }; diff --git a/client/coral-framework/reducers/config.js b/client/coral-framework/reducers/config.js index 8266fbfa1..362608d6d 100644 --- a/client/coral-framework/reducers/config.js +++ b/client/coral-framework/reducers/config.js @@ -22,7 +22,7 @@ export default (state = initialState, action) => { return state .set('status', 'closed'); case actions.ADD_ITEM: - return action.item_type === 'assets' ? state.set('status', action.item.status) : state; + return action.item_type === 'assets' ? state.set('status', (action.item && action.item.closedAt && new Date(action.item.closedAt).getTime() <= new Date().getTime()) ? 'closed' : 'open') : state; default: return state; } diff --git a/models/asset.js b/models/asset.js index ed1bf98d0..f3d0bae91 100644 --- a/models/asset.js +++ b/models/asset.js @@ -19,7 +19,7 @@ const AssetSchema = new Schema({ }, type: { type: String, - default: 'article' + default: 'assets' }, scraped: { type: Date, diff --git a/routes/api/asset/index.js b/routes/api/asset/index.js index 6723d3671..32961416d 100644 --- a/routes/api/asset/index.js +++ b/routes/api/asset/index.js @@ -94,7 +94,7 @@ router.put('/:asset_id/status', (req, res, next) => { const { closedAt = null, closedMessage = null - } = req.query; + } = req.body; Asset .update(id, { closedAt: closedAt,