diff --git a/src/SmartComponents/CreateImageWizard/CreateImageWizard.js b/src/SmartComponents/CreateImageWizard/CreateImageWizard.js index ff08a6d4..6537d4c9 100644 --- a/src/SmartComponents/CreateImageWizard/CreateImageWizard.js +++ b/src/SmartComponents/CreateImageWizard/CreateImageWizard.js @@ -222,7 +222,7 @@ class CreateImageWizard extends Component { image_type: request.image_requests[0].image_type, upload_type: request.image_requests[0].upload_request.type, }; - this.props.updateCompose(compose); + this.props.composeUpdated(compose); }); composeRequests.push(composeRequest); }); @@ -348,13 +348,13 @@ function mapStateToProps(state) { function mapDispatchToProps(dispatch) { return { - updateCompose: (compose) => dispatch(actions.updateCompose(compose)), + composeUpdated: (compose) => dispatch(actions.composeUpdated(compose)), addNotification: (not) => dispatch(addNotification(not)), }; } CreateImageWizard.propTypes = { - updateCompose: PropTypes.func, + composeUpdated: PropTypes.func, addNotification: PropTypes.func, history: PropTypes.object, release: PropTypes.object, diff --git a/src/SmartComponents/ImagesTable/ImagesTable.js b/src/SmartComponents/ImagesTable/ImagesTable.js index 8c8c29ff..7d22d27f 100644 --- a/src/SmartComponents/ImagesTable/ImagesTable.js +++ b/src/SmartComponents/ImagesTable/ImagesTable.js @@ -51,7 +51,7 @@ class ImagesTable extends Component { } pollComposeStatuses() { - let { updateCompose, composes } = this.props; + let { composeUpdated, composes } = this.props; Object.entries(composes).map(([ id, compose ]) => { /* Skip composes that have been complete */ if (compose.image_status.status === 'success' || compose.image_status.status === 'failure') { @@ -61,7 +61,7 @@ class ImagesTable extends Component { api.getComposeStatus(id).then(response => { let newCompose = {}; newCompose[id] = Object.assign({}, compose, { image_status: response.image_status }); - updateCompose(newCompose); + composeUpdated(newCompose); }); }); } @@ -131,13 +131,13 @@ function mapStateToProps(state) { function mapDispatchToProps(dispatch) { return { - updateCompose: (compose) => dispatch(actions.updateCompose(compose)), + composeUpdated: (compose) => dispatch(actions.composeUpdated(compose)), }; } ImagesTable.propTypes = { composes: PropTypes.object, - updateCompose: PropTypes.func, + composeUpdated: PropTypes.func, }; export default connect(mapStateToProps, mapDispatchToProps)(ImagesTable); diff --git a/src/store/actions/actions.js b/src/store/actions/actions.js index 0efc586d..4f555938 100644 --- a/src/store/actions/actions.js +++ b/src/store/actions/actions.js @@ -1,8 +1,8 @@ import types from '../types'; -function updateCompose(compose) { +function composeUpdated(compose) { return { - type: types.UPDATE_COMPOSE, + type: types.COMPOSE_UPDATED, compose }; } @@ -84,7 +84,7 @@ function setSubscribeNow(subscribeNow) { } export default { - updateCompose, + composeUpdated, setRelease, setUploadDestinations, setUploadAWS, diff --git a/src/store/reducers/composes.js b/src/store/reducers/composes.js index cba1a6a6..bdd00017 100644 --- a/src/store/reducers/composes.js +++ b/src/store/reducers/composes.js @@ -14,7 +14,7 @@ import types from '../types'; export function composes(state = { }, action) { switch (action.type) { - case types.UPDATE_COMPOSE: + case types.COMPOSE_UPDATED: return Object.assign({}, state, action.compose); default: return state; diff --git a/src/store/types.js b/src/store/types.js index 520404bd..40131801 100644 --- a/src/store/types.js +++ b/src/store/types.js @@ -1,4 +1,4 @@ -const UPDATE_COMPOSE = 'UPDATE_COMPOSE'; +const COMPOSE_UPDATED = 'COMPOSE_UPDATED'; const SET_RELEASE = 'SET_RELEASE'; const SET_UPLOAD_DESTINATIONS = 'SET_UPLOAD_DESTINATIONS'; const SET_UPLOAD_AWS = 'SET_UPLOAD_AWS'; @@ -9,7 +9,7 @@ const SET_SUBSCRIPTION = 'SET_SUBSCRIPTION'; const SET_SUBSCRIBE_NOW = 'SET_SUBSCRIBE_NOW'; export default { - UPDATE_COMPOSE, + COMPOSE_UPDATED, SET_RELEASE, SET_UPLOAD_DESTINATIONS, SET_UPLOAD_AWS, diff --git a/src/test/SmartComponents/redux/actions.test.js b/src/test/SmartComponents/redux/actions.test.js index 42743dfc..2b3978a0 100644 --- a/src/test/SmartComponents/redux/actions.test.js +++ b/src/test/SmartComponents/redux/actions.test.js @@ -10,13 +10,13 @@ const compose = { } }; -describe('updateCompose', () => { +describe('composeUpdated', () => { test('returns dict', () => { - const result = actions.updateCompose(compose); + const result = actions.composeUpdated(compose); // this function updates the type attribute and // returns everything else unchanged - expect(result.type).toBe(types.UPDATE_COMPOSE); + expect(result.type).toBe(types.COMPOSE_UPDATED); expect(result.compose).toBe(compose); }); }); diff --git a/src/test/SmartComponents/redux/reducers.test.js b/src/test/SmartComponents/redux/reducers.test.js index 0946d7cf..d5c0584b 100644 --- a/src/test/SmartComponents/redux/reducers.test.js +++ b/src/test/SmartComponents/redux/reducers.test.js @@ -19,12 +19,12 @@ describe('composes', () => { expect(result).toEqual({}); }); - test('returns updates state for types.UPDATE_COMPOSE', () => { + test('returns updates state for types.COMPOSE_UPDATED', () => { const state = { testAttr: 'test-me' }; const result = composes(state, { - type: types.UPDATE_COMPOSE, + type: types.COMPOSE_UPDATED, compose });