Convert ValidationsActions to named exports
* avoid using 'this' in thunks Change-Id: Ia3c07b43984e1b7a01c07c524fe9c49d291facc1
This commit is contained in:
parent
f34edf9c62
commit
a3dab0a523
@ -20,7 +20,7 @@ import { InitialPlanState, Plan } from '../../js/immutableRecords/plans';
|
||||
import { mockStore } from './utils';
|
||||
import * as NodesActions from '../../js/actions/NodesActions';
|
||||
import NotificationActions from '../../js/actions/NotificationActions';
|
||||
import ValidationsActions from '../../js/actions/ValidationsActions';
|
||||
import * as ValidationsActions from '../../js/actions/ValidationsActions';
|
||||
import RegisterNodesActions from '../../js/actions/RegisterNodesActions';
|
||||
|
||||
describe('startNodesRegistration Action', () => {
|
||||
|
@ -15,7 +15,7 @@
|
||||
*/
|
||||
|
||||
import MistralApiService from '../../js/services/MistralApiService';
|
||||
import ValidationsActions from '../../js/actions/ValidationsActions';
|
||||
import * as ValidationsActions from '../../js/actions/ValidationsActions';
|
||||
import ValidationsConstants from '../../js/constants/ValidationsConstants';
|
||||
import * as WorkflowActions from '../../js/actions/WorkflowActions';
|
||||
import MistralConstants from '../../js/constants/MistralConstants';
|
||||
|
@ -15,7 +15,7 @@
|
||||
*/
|
||||
|
||||
import PlansConstants from '../constants/PlansConstants';
|
||||
import ValidationsActions from '../actions/ValidationsActions';
|
||||
import { runValidationGroups } from '../actions/ValidationsActions';
|
||||
import { getPlans, getCurrentPlanName } from '../selectors/plans';
|
||||
|
||||
export default {
|
||||
@ -29,10 +29,7 @@ export default {
|
||||
storePlan(newPlanName);
|
||||
dispatch(this.planChosen(newPlanName));
|
||||
dispatch(
|
||||
ValidationsActions.runValidationGroups(
|
||||
['prep', 'pre-deployment'],
|
||||
newPlanName
|
||||
)
|
||||
runValidationGroups(['prep', 'pre-deployment'], newPlanName)
|
||||
);
|
||||
}
|
||||
} else {
|
||||
|
@ -23,7 +23,7 @@ import RegisterNodesConstants from '../constants/RegisterNodesConstants';
|
||||
import NotificationActions from './NotificationActions';
|
||||
import { addNodes, fetchNodes } from './NodesActions';
|
||||
import { nodeSchema } from '../normalizrSchemas/nodes';
|
||||
import ValidationsActions from './ValidationsActions';
|
||||
import { runValidationGroups } from './ValidationsActions';
|
||||
|
||||
const messages = defineMessages({
|
||||
registrationNotificationTitle: {
|
||||
@ -68,7 +68,7 @@ export default {
|
||||
|
||||
// run pre-introspection validations
|
||||
dispatch(
|
||||
ValidationsActions.runValidationGroups(
|
||||
runValidationGroups(
|
||||
['pre-introspection'],
|
||||
getCurrentPlanName(getState())
|
||||
)
|
||||
|
@ -23,72 +23,59 @@ import { validationSchema } from '../normalizrSchemas/validations';
|
||||
import MistralConstants from '../constants/MistralConstants';
|
||||
import { startWorkflow } from './WorkflowActions';
|
||||
|
||||
export default {
|
||||
fetchValidations() {
|
||||
return (dispatch, getState) => {
|
||||
dispatch(this.fetchValidationsPending());
|
||||
return dispatch(
|
||||
MistralApiService.runAction(MistralConstants.VALIDATIONS_LIST)
|
||||
)
|
||||
.then(response => {
|
||||
const validations =
|
||||
normalize(response, [validationSchema]).entities.validations || {};
|
||||
dispatch(this.fetchValidationsSuccess(validations));
|
||||
})
|
||||
.catch(error => {
|
||||
dispatch(handleErrors(error, 'Validations could not be loaded'));
|
||||
dispatch(this.fetchValidationsFailed());
|
||||
});
|
||||
};
|
||||
},
|
||||
|
||||
fetchValidationsPending() {
|
||||
return {
|
||||
type: ValidationsConstants.FETCH_VALIDATIONS_PENDING
|
||||
};
|
||||
},
|
||||
|
||||
fetchValidationsSuccess(validations) {
|
||||
return {
|
||||
type: ValidationsConstants.FETCH_VALIDATIONS_SUCCESS,
|
||||
payload: validations
|
||||
};
|
||||
},
|
||||
|
||||
fetchValidationsFailed() {
|
||||
return {
|
||||
type: ValidationsConstants.FETCH_VALIDATIONS_FAILED
|
||||
};
|
||||
},
|
||||
|
||||
runValidation(id, currentPlanName) {
|
||||
return (dispatch, getState) =>
|
||||
dispatch(
|
||||
startWorkflow(MistralConstants.VALIDATIONS_RUN, {
|
||||
validation_name: id,
|
||||
plan: currentPlanName
|
||||
})
|
||||
).catch(error => {
|
||||
dispatch(handleErrors(error, 'Error running validation'));
|
||||
});
|
||||
},
|
||||
|
||||
runValidationGroups(groups, currentPlanName) {
|
||||
return (dispatch, getState) => {
|
||||
dispatch(
|
||||
MistralApiService.runWorkflow(MistralConstants.VALIDATIONS_RUN_GROUPS, {
|
||||
group_names: groups,
|
||||
plan: currentPlanName
|
||||
})
|
||||
).catch(error => {
|
||||
dispatch(handleErrors(error, 'Validation Group could not be started'));
|
||||
});
|
||||
};
|
||||
},
|
||||
|
||||
toggleValidations() {
|
||||
return {
|
||||
type: ValidationsConstants.TOGGLE_VALIDATIONS
|
||||
};
|
||||
}
|
||||
export const fetchValidations = () => (dispatch, getState) => {
|
||||
dispatch(fetchValidationsPending());
|
||||
return dispatch(
|
||||
MistralApiService.runAction(MistralConstants.VALIDATIONS_LIST)
|
||||
)
|
||||
.then(response => {
|
||||
const validations =
|
||||
normalize(response, [validationSchema]).entities.validations || {};
|
||||
dispatch(fetchValidationsSuccess(validations));
|
||||
})
|
||||
.catch(error => {
|
||||
dispatch(handleErrors(error, 'Validations could not be loaded'));
|
||||
dispatch(fetchValidationsFailed());
|
||||
});
|
||||
};
|
||||
|
||||
export const fetchValidationsPending = () => ({
|
||||
type: ValidationsConstants.FETCH_VALIDATIONS_PENDING
|
||||
});
|
||||
|
||||
export const fetchValidationsSuccess = validations => ({
|
||||
type: ValidationsConstants.FETCH_VALIDATIONS_SUCCESS,
|
||||
payload: validations
|
||||
});
|
||||
|
||||
export const fetchValidationsFailed = () => ({
|
||||
type: ValidationsConstants.FETCH_VALIDATIONS_FAILED
|
||||
});
|
||||
|
||||
export const runValidation = (id, currentPlanName) => (dispatch, getState) =>
|
||||
dispatch(
|
||||
startWorkflow(MistralConstants.VALIDATIONS_RUN, {
|
||||
validation_name: id,
|
||||
plan: currentPlanName
|
||||
})
|
||||
).catch(error => {
|
||||
dispatch(handleErrors(error, 'Error running validation'));
|
||||
});
|
||||
|
||||
export const runValidationGroups = (groups, currentPlanName) => (
|
||||
dispatch,
|
||||
getState
|
||||
) => {
|
||||
dispatch(
|
||||
MistralApiService.runWorkflow(MistralConstants.VALIDATIONS_RUN_GROUPS, {
|
||||
group_names: groups,
|
||||
plan: currentPlanName
|
||||
})
|
||||
).catch(error => {
|
||||
dispatch(handleErrors(error, 'Validation Group could not be started'));
|
||||
});
|
||||
};
|
||||
|
||||
export const toggleValidations = () => ({
|
||||
type: ValidationsConstants.TOGGLE_VALIDATIONS
|
||||
});
|
||||
|
@ -28,7 +28,7 @@ import NavTab from './ui/NavTab';
|
||||
import I18nDropdown from './i18n/I18nDropdown';
|
||||
import StatusDropdown from './StatusDropdown';
|
||||
import UserDropdown from './UserDropdown';
|
||||
import ValidationsActions from '../actions/ValidationsActions';
|
||||
import { toggleValidations } from '../actions/ValidationsActions';
|
||||
import ValidationsList from './validations/ValidationsList';
|
||||
import ValidationsToggle from './validations/ValidationsToggle';
|
||||
|
||||
@ -165,7 +165,7 @@ const mapStateToProps = state => ({
|
||||
});
|
||||
const mapDispatchToProps = dispatch => ({
|
||||
logoutUser: () => dispatch(LoginActions.logoutUser()),
|
||||
toggleValidations: () => dispatch(ValidationsActions.toggleValidations())
|
||||
toggleValidations: () => dispatch(toggleValidations())
|
||||
});
|
||||
|
||||
export default withRouter(connect(mapStateToProps, mapDispatchToProps)(NavBar));
|
||||
|
@ -36,7 +36,7 @@ import { getEnvironmentConfigurationSummary } from '../../selectors/environmentC
|
||||
import InlineNotification from '../ui/InlineNotification';
|
||||
import { InlineLoader } from '../ui/Loader';
|
||||
import { startDeployment } from '../../actions/DeploymentActions';
|
||||
import ValidationsActions from '../../actions/ValidationsActions';
|
||||
import { runValidationGroups } from '../../actions/ValidationsActions';
|
||||
|
||||
const messages = defineMessages({
|
||||
close: {
|
||||
@ -168,9 +168,7 @@ const mapStateToProps = (state, props) => ({
|
||||
const mapDispatchToProps = dispatch => ({
|
||||
startDeployment: planName => dispatch(startDeployment(planName)),
|
||||
runPreDeploymentValidations: planName =>
|
||||
dispatch(
|
||||
ValidationsActions.runValidationGroups(['pre-deployment'], planName)
|
||||
)
|
||||
dispatch(runValidationGroups(['pre-deployment'], planName))
|
||||
});
|
||||
|
||||
export default injectIntl(
|
||||
|
@ -25,7 +25,10 @@ import { addActiveFilter } from '../../actions/FiltersActions';
|
||||
import BlankSlate from '../ui/BlankSlate';
|
||||
import { getCurrentPlanName } from '../../selectors/plans';
|
||||
import { InlineLoader, Loader } from '../ui/Loader';
|
||||
import ValidationsActions from '../../actions/ValidationsActions';
|
||||
import {
|
||||
fetchValidations,
|
||||
runValidation
|
||||
} from '../../actions/ValidationsActions';
|
||||
import ValidationsToolbar from './ValidationsToolbar';
|
||||
import Validation from './Validation';
|
||||
import ValidationDetail from './ValidationDetail';
|
||||
@ -229,11 +232,11 @@ ValidationsList.propTypes = {
|
||||
const mapDispatchToProps = dispatch => ({
|
||||
addActiveFilter: data =>
|
||||
dispatch(addActiveFilter('validationsToolbar', data)),
|
||||
fetchValidations: () => dispatch(ValidationsActions.fetchValidations()),
|
||||
fetchValidations: () => dispatch(fetchValidations()),
|
||||
fetchWorkflowExecutions: () =>
|
||||
dispatch(WorkflowExecutionsActions.fetchWorkflowExecutions()),
|
||||
runValidation: (id, currentPlanName) => {
|
||||
dispatch(ValidationsActions.runValidation(id, currentPlanName));
|
||||
dispatch(runValidation(id, currentPlanName));
|
||||
},
|
||||
stopValidation: executionId => {
|
||||
dispatch(
|
||||
|
Loading…
Reference in New Issue
Block a user