wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-01 09:28:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'admin-asset-list' of github.com:coralproject/talk into admin-asset-list

Browse Source
This commit is contained in:
David Jay
2016-12-21 18:11:51 -08:00
parent 0fc3e09c74 b8b47e9c2c
commit fdf5da56cf
6 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-admin/src/actions/assets.js
+10 -10
View File
@@ -1,10 +1,10 @@
import {
FETCH_ASSETS,
FETCH_ASSETS_REQUEST,
FETCH_ASSETS_SUCCESS,
FETCH_ASSETS_FAILED,
UPDATE_ASSET_STATE,
FETCH_ASSETS_FAILURE,
UPDATE_ASSET_STATE_REQUEST,
UPDATE_ASSET_STATE_SUCCESS,
UPDATE_ASSET_STATE_FAILED
UPDATE_ASSET_STATE_FAILURE
} from '../constants/assets';
import coralApi from '../../../coral-framework/helpers/response';
@@ -14,23 +14,23 @@ import coralApi from '../../../coral-framework/helpers/response';
// Fetch a page of assets
// Get comments to fill each of the three lists on the mod queue
export const fetchAssets = (skip, limit, search, sort, filter) => (dispatch) => {
dispatch({type: FETCH_ASSETS});
return coralApi(`/assets?skip=${skip || ''}&limit=${limit || ''}&sort=${sort || ''}&search=${search || ''}&filter=${filter || ''}`)
export const fetchAssets = (skip = '', limit = '', search = '', sort = '', filter = '') => (dispatch) => {
dispatch({type: FETCH_ASSETS_REQUEST});
return coralApi(`/assets?skip=${skip}&limit=${limit}&sort=${sort}&search=${search}&filter=${filter}`)
.then(({result, count}) =>
dispatch({type: FETCH_ASSETS_SUCCESS,
assets: result,
count
}))
.catch(error => dispatch({type: FETCH_ASSETS_FAILED, error}));
.catch(error => dispatch({type: FETCH_ASSETS_FAILURE, error}));
};
// Update an asset state
// Get comments to fill each of the three lists on the mod queue
export const updateAssetState = (id, closedAt) => (dispatch) => {
dispatch({type: UPDATE_ASSET_STATE});
dispatch({type: UPDATE_ASSET_STATE_REQUEST});
return coralApi(`/assets/${id}/status`, {method: 'PUT', body: {closedAt}})
.then(() =>
dispatch({type: UPDATE_ASSET_STATE_SUCCESS}))
.catch(error => dispatch({type: UPDATE_ASSET_STATE_FAILED, error}));
.catch(error => dispatch({type: UPDATE_ASSET_STATE_FAILURE, error}));
};
client/coral-admin/src/constants/assets.js
+4 -4
View File
@@ -1,6 +1,6 @@
export const FETCH_ASSETS = 'FETCH_ASSETS';
export const FETCH_ASSETS_REQUEST = 'FETCH_ASSETS_REQUEST';
export const FETCH_ASSETS_SUCCESS = 'FETCH_ASSETS_SUCCESS';
export const FETCH_ASSETS_FAILED = 'FETCH_ASSETS_FAILED';
export const UPDATE_ASSET_STATE = 'UPDATE_ASSET_STATE';
export const FETCH_ASSETS_FAILURE = 'FETCH_ASSETS_FAILURE';
export const UPDATE_ASSET_STATE_REQUEST = 'UPDATE_ASSET_STATE_REQUEST';
export const UPDATE_ASSET_STATE_SUCCESS = 'UPDATE_ASSET_STATE_SUCCESS';
export const UPDATE_ASSET_STATE_FAILED = 'UPDATE_ASSET_STATE_FAILED';
export const UPDATE_ASSET_STATE_FAILURE = 'UPDATE_ASSET_STATE_FAILURE';
client/coral-admin/src/containers/Streams/Streams.js
+6 -4
View File
@@ -60,7 +60,11 @@ class Streams extends Component {
prev.statusMenus[id] = false;
return prev;
});
this.props.updateAssetState(id, closeStream ? Date.now() : null);
this.props.updateAssetState(id, closeStream ? Date.now() : null)
.then(() => {
const {search, sort, filter, page} = this.state;
this.props.fetchAssets(page, limit, search, sort, filter);
});
} else {
this.setState(prev => {
prev.statusMenus[id] = true;
@@ -167,9 +171,7 @@ const mapDispatchToProps = (dispatch) => {
fetchAssets: (...args) => {
dispatch(fetchAssets.apply(this, args));
},
updateAssetState: (...args) => {
dispatch(updateAssetState.apply(this, args));
}
updateAssetState: (...args) => dispatch(updateAssetState.apply(this, args))
};
};
client/coral-admin/src/reducers/assets.js
+2 -2
View File
@@ -1,5 +1,5 @@
import {Map, List, fromJS} from 'immutable';
import {FETCH_ASSETS_SUCCESS, UPDATE_ASSET_STATE} from '../constants/assets';
import {FETCH_ASSETS_SUCCESS, UPDATE_ASSET_STATE_REQUEST} from '../constants/assets';
const initialState = Map({
byId: Map(),
@@ -10,7 +10,7 @@ export default (state = initialState, action) => {
switch (action.type) {
case FETCH_ASSETS_SUCCESS:
return replaceAssets(action, state);
case UPDATE_ASSET_STATE:
case UPDATE_ASSET_STATE_REQUEST:
return state.setIn(['byId', action.id, 'closedAt'], action.closedAt);
default: return state;
}
tests/client/coral-admin/actions/assets.js
+8 -8
View File
@@ -30,7 +30,7 @@ describe('Asset actions', () => {
fetchMock.restore();
});
describe('FETCH_ASSETS', () => {
describe('FETCH_ASSETS_REQUEST', () => {
it('should fetch a list of assets', () => {
@@ -41,7 +41,7 @@ describe('Asset actions', () => {
return actions.fetchAssets(2, 20)(store.dispatch)
.then(() => {
expect(store.getActions()[0]).to.have.property('type', 'FETCH_ASSETS');
expect(store.getActions()[0]).to.have.property('type', 'FETCH_ASSETS_REQUEST');
expect(store.getActions()[1]).to.have.property('type', 'FETCH_ASSETS_SUCCESS');
expect(store.getActions()[1]).to.have.property('count', 2);
expect(store.getActions()[1]).to.have.property('assets').
@@ -55,13 +55,13 @@ describe('Asset actions', () => {
return actions.fetchAssets(2, 20)(store.dispatch)
.then(() => {
expect(store.getActions()[0]).to.have.property('type', 'FETCH_ASSETS');
expect(store.getActions()[1]).to.have.property('type', 'FETCH_ASSETS_FAILED');
expect(store.getActions()[0]).to.have.property('type', 'FETCH_ASSETS_REQUEST');
expect(store.getActions()[1]).to.have.property('type', 'FETCH_ASSETS_FAILURE');
});
});
});
describe('UPDATE_ASSET_STATE', () => {
describe('UPDATE_ASSET_STATE_REQUEST', () => {
it('should update an asset', () => {
@@ -69,7 +69,7 @@ describe('Asset actions', () => {
return actions.updateAssetState('123', 'status', 'open')(store.dispatch)
.then(() => {
expect(store.getActions()[0]).to.have.property('type', 'UPDATE_ASSET_STATE');
expect(store.getActions()[0]).to.have.property('type', 'UPDATE_ASSET_STATE_REQUEST');
expect(store.getActions()[1]).to.have.property('type', 'UPDATE_ASSET_STATE_SUCCESS');
});
@@ -81,8 +81,8 @@ describe('Asset actions', () => {
return actions.updateAssetState('123', 'status', 'open')(store.dispatch)
.then(() => {
expect(store.getActions()[0]).to.have.property('type', 'UPDATE_ASSET_STATE');
expect(store.getActions()[1]).to.have.property('type', 'UPDATE_ASSET_STATE_FAILED');
expect(store.getActions()[0]).to.have.property('type', 'UPDATE_ASSET_STATE_REQUEST');
expect(store.getActions()[1]).to.have.property('type', 'UPDATE_ASSET_STATE_FAILURE');
});
});
});
tests/client/coral-admin/reducers/assets.js
+2 -2
View File
@@ -36,10 +36,10 @@ describe ('assetsReducer', () => {
});
});
describe('UPDATE_ASSET_STATE', () => {
describe('UPDATE_ASSET_STATE_REQUEST', () => {
it('should update the state of a particular asset', () => {
const action = {
type: 'UPDATE_ASSET_STATE',
type: 'UPDATE_ASSET_STATE_REQUEST',
id: '123',
closedAt: null
};