Convert ZaqarActions to named exports

* avoid using 'this' in thunk

Change-Id: I94e8c618469d1ee04c8493ba189044de45fc5b67

src/__tests__/actions/StacksActions.tests.js

@@ -17,7 +17,7 @@
 import { mockStore } from './utils';
 import * as ErrorActions from '../../js/actions/ErrorActions';
 import HeatApiService from '../../js/services/HeatApiService';
-import StacksActions from '../../js/actions/StacksActions';
+import * as StacksActions from '../../js/actions/StacksActions';
 
 describe('StacksActions', () => {
   describe('fetchStacks (success)', () => {

src/__tests__/reducers/stacksReducer.tests.js

@@ -17,7 +17,7 @@
 import { fromJS, Map, OrderedMap } from 'immutable';
 
 import { StacksState, Stack } from '../../js/immutableRecords/stacks';
-import StacksActions from '../../js/actions/StacksActions';
+import * as StacksActions from '../../js/actions/StacksActions';
 import stacksReducer from '../../js/reducers/stacksReducer';
 
 describe('stacksReducer state', () => {

src/js/actions/StacksActions.js

@@ -21,29 +21,21 @@ import HeatApiService from '../services/HeatApiService';
 import StacksConstants from '../constants/StacksConstants';
 import { stackSchema } from '../normalizrSchemas/stacks';
 
-export default {
+export const fetchStacksPending = () => ({
-  fetchStacksPending() {
-    return {
   type: StacksConstants.FETCH_STACKS_PENDING
-    };
+});
-  },
 
-  fetchStacksSuccess(data) {
+export const fetchStacksSuccess = data => ({
-    return {
   type: StacksConstants.FETCH_STACKS_SUCCESS,
   payload: data
-    };
+});
-  },
 
-  fetchStacksFailed() {
+export const fetchStacksFailed = () => ({
-    return {
   type: StacksConstants.FETCH_STACKS_FAILED
-    };
+});
-  },
 
-  fetchStacks(planName) {
+export const fetchStacks = planName => dispatch => {
-    return (dispatch, getState) => {
+  dispatch(fetchStacksPending());
-      dispatch(this.fetchStacksPending());
   return dispatch(HeatApiService.getStacks())
     .then(response =>
       Promise.all(
@@ -54,118 +46,88 @@ export default {
     )
     .then(responses => {
       const stacks =
-            normalize(responses.map(r => r.stack), [stackSchema]).entities
+        normalize(responses.map(r => r.stack), [stackSchema]).entities.stacks ||
-              .stacks || {};
+        {};
-          dispatch(this.fetchStacksSuccess(stacks));
+      dispatch(fetchStacksSuccess(stacks));
     })
     .catch(error => {
       dispatch(handleErrors(error, 'Stacks could not be loaded'));
-          dispatch(this.fetchStacksFailed());
+      dispatch(fetchStacksFailed());
     });
-    };
+};
-  },
 
-  fetchResourcesPending() {
+export const fetchResourcesPending = () => ({
-    return {
   type: StacksConstants.FETCH_RESOURCES_PENDING
-    };
+});
-  },
 
-  fetchResourcesSuccess(resources) {
+export const fetchResourcesSuccess = resources => ({
-    return {
   type: StacksConstants.FETCH_RESOURCES_SUCCESS,
   payload: resources
-    };
+});
-  },
 
-  fetchResourcesFailed() {
+export const fetchResourcesFailed = () => ({
-    return {
   type: StacksConstants.FETCH_RESOURCES_FAILED
-    };
+});
-  },
 
-  fetchResources(stackName, stackId) {
+export const fetchResources = (stackName, stackId) => dispatch => {
-    return dispatch => {
+  dispatch(fetchResourcesPending());
-      dispatch(this.fetchResourcesPending());
   dispatch(HeatApiService.getResources(stackName, stackId))
-        .then(({ resources }) =>
+    .then(({ resources }) => dispatch(fetchResourcesSuccess(resources)))
-          dispatch(this.fetchResourcesSuccess(resources))
-        )
     .catch(error => {
       dispatch(handleErrors(error, 'Stack Resources could not be loaded'));
-          dispatch(this.fetchResourcesFailed());
+      dispatch(fetchResourcesFailed());
     });
-    };
+};
-  },
 
-  fetchResourceSuccess(resource) {
+export const fetchResourceSuccess = resource => ({
-    return {
   type: StacksConstants.FETCH_RESOURCE_SUCCESS,
   payload: resource
-    };
+});
-  },
 
-  fetchResourceFailed(resourceName) {
+export const fetchResourceFailed = resourceName => ({
-    return {
   type: StacksConstants.FETCH_RESOURCE_FAILED,
   payload: resourceName
-    };
+});
-  },
 
-  fetchResourcePending() {
+export const fetchResourcePending = () => ({
-    return {
   type: StacksConstants.FETCH_RESOURCE_PENDING
-    };
+});
-  },
 
-  fetchResource(stack, resourceName) {
+export const fetchResource = (stack, resourceName) => dispatch => {
-    return dispatch => {
+  dispatch(fetchResourcePending());
-      dispatch(this.fetchResourcePending());
   dispatch(HeatApiService.getResource(stack, resourceName))
     .then(({ resource }) => {
-          dispatch(this.fetchResourceSuccess(resource));
+      dispatch(fetchResourceSuccess(resource));
     })
     .catch(error => {
       dispatch(handleErrors(error, 'Stack Resource could not be loaded'));
-          dispatch(this.fetchResourceFailed(resourceName));
+      dispatch(fetchResourceFailed(resourceName));
     });
-    };
+};
-  },
 
-  fetchEnvironmentSuccess(stack, environment) {
+export const fetchEnvironmentSuccess = (stack, environment) => ({
-    return {
   type: StacksConstants.FETCH_STACK_ENVIRONMENT_SUCCESS,
   payload: { environment, stack }
-    };
+});
-  },
 
-  fetchEnvironmentFailed(stack) {
+export const fetchEnvironmentFailed = stack => ({
-    return {
   type: StacksConstants.FETCH_STACK_ENVIRONMENT_FAILED,
   payload: { stack }
-    };
+});
-  },
 
-  fetchEnvironmentPending(stack) {
+export const fetchEnvironmentPending = stack => ({
-    return {
   type: StacksConstants.FETCH_STACK_ENVIRONMENT_PENDING,
   payload: { stack }
-    };
+});
-  },
 
-  fetchEnvironment(stack) {
+export const fetchEnvironment = stack => dispatch => {
-    return dispatch => {
+  dispatch(fetchEnvironmentPending(stack));
-      dispatch(this.fetchEnvironmentPending(stack));
   dispatch(HeatApiService.getEnvironment(stack))
     .then(response => {
-          dispatch(this.fetchEnvironmentSuccess(stack, response));
+      dispatch(fetchEnvironmentSuccess(stack, response));
     })
     .catch(error => {
-          dispatch(
+      dispatch(handleErrors(error, 'Stack Environment could not be loaded'));
-            handleErrors(error, 'Stack Environment could not be loaded')
+      dispatch(fetchEnvironmentFailed(stack));
-          );
-          dispatch(this.fetchEnvironmentFailed(stack));
     });
-    };
-  }
 };

src/js/actions/ZaqarActions.js

@@ -41,7 +41,7 @@ import {
   fetchAvailableRolesFinished,
   selectRolesFinished
 } from './RolesActions';
-import StacksActions from './StacksActions';
+import { fetchStacksSuccess, fetchResources } from './StacksActions';
 import { stackSchema } from '../normalizrSchemas/stacks';
 import MistralConstants from '../constants/MistralConstants';
 import ZaqarWebSocketService from '../services/ZaqarWebSocketService';
@@ -56,45 +56,34 @@ import {
 } from './DeploymentActions';
 import { fetchNetworksFinished } from './NetworksActions';
 
-export default {
+export const handleAuthenticationSuccess = (message, dispatch) => {
-  handleAuthenticationSuccess(message, dispatch) {
   message = get(message, ['body', 'message']);
 
   if (message === 'Authentified.') {
     dispatch(authenticated());
     dispatch(flushMessages());
   }
-  },
+};
 
-  messageReceived(message) {
+export const messageReceived = message => (dispatch, getState) => {
-    return (dispatch, getState) => {
+  handleAuthenticationSuccess(message, dispatch);
-      this.handleAuthenticationSuccess(message, dispatch);
   const { type, payload } = message.body;
   switch (type) {
     case MistralConstants.BAREMETAL_REGISTER_OR_UPDATE:
       dispatch(
-            handleWorkflowMessage(
+        handleWorkflowMessage(payload.execution.id, nodesRegistrationFinished)
-              payload.execution.id,
-              nodesRegistrationFinished
-            )
       );
       break;
 
     case MistralConstants.BAREMETAL_INTROSPECT:
       dispatch(
-            handleWorkflowMessage(
+        handleWorkflowMessage(payload.execution_id, nodesIntrospectionFinished)
-              payload.execution_id,
-              nodesIntrospectionFinished
-            )
       );
       break;
 
     case MistralConstants.BAREMETAL_INTROSPECT_INTERNAL:
       dispatch(
-            handleWorkflowMessage(
+        handleWorkflowMessage(payload.execution_id, nodeIntrospectionFinished)
-              payload.execution_id,
-              nodeIntrospectionFinished
-            )
       );
       break;
 
@@ -127,16 +116,12 @@ export default {
     }
 
     case MistralConstants.PLAN_CREATE: {
-          dispatch(
+      dispatch(handleWorkflowMessage(payload.execution_id, createPlanFinished));
-            handleWorkflowMessage(payload.execution_id, createPlanFinished)
-          );
       break;
     }
 
     case MistralConstants.PLAN_UPDATE: {
-          dispatch(
+      dispatch(handleWorkflowMessage(payload.execution_id, updatePlanFinished));
-            handleWorkflowMessage(payload.execution_id, updatePlanFinished)
-          );
       break;
     }
 
@@ -160,7 +145,7 @@ export default {
     case MistralConstants.HEAT_STACKS_LIST: {
       const stacks =
         normalize(payload.stacks, [stackSchema]).entities.stacks || {};
-          dispatch(StacksActions.fetchStacksSuccess(stacks));
+      dispatch(fetchStacksSuccess(stacks));
 
       // TODO(jtomasek): It would be nicer if we could identify that
       // stack has changed in the component and fetch resources there
@@ -168,7 +153,7 @@ export default {
       const currentStack = getCurrentStack(getState());
       if (!isFetchingResources && currentStack) {
         const { stack_name, id } = currentStack;
-            dispatch(StacksActions.fetchResources(stack_name, id));
+        dispatch(fetchResources(stack_name, id));
       }
     }
 
@@ -202,9 +187,7 @@ export default {
           })
         );
       } else {
-            dispatch(
+        dispatch(handleWorkflowMessage(payload.execution_id, undeployFinished));
-              handleWorkflowMessage(payload.execution_id, undeployFinished)
-            );
       }
       break;
     }
@@ -228,9 +211,7 @@ export default {
       break;
 
     case MistralConstants.PLAN_EXPORT: {
-          dispatch(
+      dispatch(handleWorkflowMessage(payload.execution_id, exportPlanFinished));
-            handleWorkflowMessage(payload.execution_id, exportPlanFinished)
-          );
       break;
     }
 
@@ -243,10 +224,7 @@ export default {
 
     case MistralConstants.LIST_AVAILABLE_ROLES: {
       dispatch(
-            handleWorkflowMessage(
+        handleWorkflowMessage(payload.execution.id, fetchAvailableRolesFinished)
-              payload.execution.id,
-              fetchAvailableRolesFinished
-            )
       );
       break;
     }
@@ -269,11 +247,12 @@ export default {
     default:
       break;
   }
-    };
+};
-  },
 
-  postMessage(queueName, body, ttl = 3600) {
+export const postMessage = (queueName, body, ttl = 3600) => (
-    return (dispatch, getState) => {
+  dispatch,
+  getState
+) => {
   const message = {
     queue_name: queueName,
     messages: [
@@ -295,6 +274,4 @@ export default {
   }
 
   dispatch(ZaqarWebSocketService.sendMessage('message_post', message));
-    };
-  }
 };

src/js/components/AuthenticatedContent.js

@@ -28,7 +28,7 @@ import { GlobalLoader } from './ui/Loader';
 import NavBar from './NavBar';
 import Nodes from './nodes/Nodes';
 import Plans from './plan/Plans.js';
-import StacksActions from '../actions/StacksActions';
+import { fetchStacks } from '../actions/StacksActions';
 import { fetchPlans } from '../actions/PlansActions';
 import { fetchWorkflowExecutions } from '../actions/WorkflowExecutionsActions';
 import ZaqarWebSocketService from '../services/ZaqarWebSocketService';
@@ -94,7 +94,7 @@ AuthenticatedContent.propTypes = {
 };
 
 const mapDispatchToProps = (dispatch, ownProps) => ({
-  fetchStacks: () => dispatch(StacksActions.fetchStacks()),
+  fetchStacks: () => dispatch(fetchStacks()),
   fetchPlans: () => dispatch(fetchPlans()),
   fetchWorkflowExecutions: () => dispatch(fetchWorkflowExecutions()),
   initializeZaqarConnection: () => dispatch(ZaqarWebSocketService.init())

src/js/components/deployment/DeploymentFailure.js

@@ -34,7 +34,7 @@ import {
 import InlineNotification from '../ui/InlineNotification';
 import { Loader } from '../ui/Loader';
 import { sanitizeMessage } from '../../utils';
-import StacksActions from '../../actions/StacksActions';
+import { fetchStacks } from '../../actions/StacksActions';
 import { startUndeploy } from '../../actions/DeploymentActions';
 import StackResources from './StackResources';
 
@@ -126,7 +126,7 @@ const mapStateToProps = (state, props) => ({
 
 const mapDispatchToProps = (dispatch, { planName }) => ({
   undeployPlan: () => dispatch(startUndeploy(planName)),
-  fetchStacks: () => dispatch(StacksActions.fetchStacks())
+  fetchStacks: () => dispatch(fetchStacks())
 });
 
 export default injectIntl(

src/js/components/deployment/DeploymentProgress.js

@@ -147,8 +147,6 @@ class DeploymentProgress extends React.Component {
 DeploymentProgress.propTypes = {
   completeResourcesCount: PropTypes.number,
   deploymentStatus: PropTypes.object.isRequired,
-  fetchResources: PropTypes.func.isRequired,
-  fetchStacks: PropTypes.func.isRequired,
   intl: PropTypes.object,
   isFetchingStacks: PropTypes.bool.isRequired,
   planName: PropTypes.string.isRequired,
@@ -172,10 +170,4 @@ const mapStateToProps = (state, props) => ({
   stacksLoaded: state.stacks.isLoaded
 });
 
-const mapDispatchToProps = (dispatch, { planName }) => ({
+export default connect(mapStateToProps)(DeploymentProgress);
-  fetchStacks: () => dispatch(StacksActions.fetchStacks()),
-  fetchResources: (stackName, stackId) =>
-    dispatch(StacksActions.fetchResources(stackName, stackId))
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(DeploymentProgress);

src/js/components/deployment/StackResources.js

@@ -21,7 +21,7 @@ import PropTypes from 'prop-types';
 import React, { Component, Fragment } from 'react';
 
 import StackResourcesTable from './StackResourcesTable';
-import StacksActions from '../../actions/StacksActions';
+import { fetchResources } from '../../actions/StacksActions';
 
 const messages = defineMessages({
   title: {
@@ -75,8 +75,7 @@ const mapStateToProps = state => ({
   isFetchingResources: state.stacks.isFetchingResources
 });
 const mapDispatchToProps = (dispatch, { stack }) => ({
-  fetchResources: () =>
+  fetchResources: () => dispatch(fetchResources(stack.stack_name, stack.id))
-    dispatch(StacksActions.fetchResources(stack.stack_name, stack.id))
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(StackResources);

src/js/components/deployment/UndeployProgress.js

@@ -136,8 +136,6 @@ class UndeployProgress extends React.Component {
 
 UndeployProgress.propTypes = {
   deploymentStatus: PropTypes.object.isRequired,
-  fetchResources: PropTypes.func.isRequired,
-  fetchStacks: PropTypes.func.isRequired,
   intl: PropTypes.object,
   isFetchingStacks: PropTypes.bool.isRequired,
   planName: PropTypes.string.isRequired,
@@ -158,10 +156,4 @@ const mapStateToProps = (state, props) => ({
   stacksLoaded: state.stacks.isLoaded
 });
 
-const mapDispatchToProps = (dispatch, { planName }) => ({
+export default connect(mapStateToProps)(UndeployProgress);
-  fetchStacks: () => dispatch(StacksActions.fetchStacks()),
-  fetchResources: (stackName, stackId) =>
-    dispatch(StacksActions.fetchResources(stackName, stackId))
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(UndeployProgress);

src/js/components/deployment_plan/DeploymentFailure.js

@@ -24,7 +24,6 @@ import { deploymentStatusMessages } from '../../constants/DeploymentConstants';
 import { getCurrentPlanDeploymentStatus } from '../../selectors/deployment';
 import InlineNotification from '../ui/InlineNotification';
 import { sanitizeMessage } from '../../utils';
-import StacksActions from '../../actions/StacksActions';
 
 const messages = defineMessages({
   deleteDeployment: {
@@ -75,12 +74,4 @@ const mapStateToProps = (state, props) => ({
   deploymentStatus: getCurrentPlanDeploymentStatus(state)
 });
 
-const mapDispatchToProps = (dispatch, { planName }) => ({
+export default injectIntl(connect(mapStateToProps)(DeploymentFailure));
-  deleteStack: () => {
-    dispatch(StacksActions.deleteStack(planName, ''));
-  }
-});
-
-export default injectIntl(
-  connect(mapStateToProps, mapDispatchToProps)(DeploymentFailure)
-);

src/js/components/deployment_plan/DeploymentProgress.js

@@ -31,7 +31,7 @@ import {
   getCreateCompleteResources
 } from '../../selectors/stacks';
 import { InlineLoader, Loader } from '../ui/Loader';
-import StacksActions from '../../actions/StacksActions';
+import { fetchStacks, fetchResources } from '../../actions/StacksActions';
 
 const messages = defineMessages({
   initializingDeployment: {
@@ -177,12 +177,6 @@ const mapStateToProps = (state, props) => ({
   resourcesCount: state.stacks.resources.size
 });
 
-const mapDispatchToProps = (dispatch, { planName }) => ({
-  fetchStacks: () => dispatch(StacksActions.fetchStacks()),
-  fetchResources: (stackName, stackId) =>
-    dispatch(StacksActions.fetchResources(stackName, stackId))
-});
-
 export default injectIntl(
-  connect(mapStateToProps, mapDispatchToProps)(DeploymentProgress)
+  connect(mapStateToProps, { fetchStacks, fetchResources })(DeploymentProgress)
 );

src/js/components/deployment_plan/DeploymentSuccess.js

@@ -32,7 +32,11 @@ import InlineNotification from '../ui/InlineNotification';
 import OvercloudInfo from '../deployment/OvercloudInfo';
 import { Loader } from '../ui/Loader';
 import { startUndeploy } from '../../actions/DeploymentActions';
-import StacksActions from '../../actions/StacksActions';
+import {
+  fetchStacks,
+  fetchEnvironment,
+  fetchResource
+} from '../../actions/StacksActions';
 
 class DeploymentSuccess extends React.Component {
   componentDidMount() {
@@ -108,11 +112,10 @@ const mapStateToProps = state => ({
 
 const mapDispatchToProps = dispatch => ({
   undeployPlan: planName => dispatch(startUndeploy(planName)),
-  fetchStacks: () => dispatch(StacksActions.fetchStacks()),
+  fetchStacks: () => dispatch(fetchStacks()),
-  fetchStackEnvironment: stack =>
+  fetchStackEnvironment: stack => dispatch(fetchEnvironment(stack)),
-    dispatch(StacksActions.fetchEnvironment(stack)),
   fetchStackResource: (stack, resourceName) =>
-    dispatch(StacksActions.fetchResource(stack, resourceName))
+    dispatch(fetchResource(stack, resourceName))
 });
 
 export default injectIntl(

src/js/components/deployment_plan/UndeployProgress.js

@@ -31,7 +31,7 @@ import {
   getDeleteCompleteResources
 } from '../../selectors/stacks';
 import { InlineLoader, Loader } from '../ui/Loader';
-import StacksActions from '../../actions/StacksActions';
+import { fetchStacks, fetchResources } from '../../actions/StacksActions';
 
 const messages = defineMessages({
   initializingUndeploy: {
@@ -172,12 +172,6 @@ const mapStateToProps = (state, props) => ({
   resourcesCount: state.stacks.resources.size
 });
 
-const mapDispatchToProps = (dispatch, { planName }) => ({
-  fetchStacks: () => dispatch(StacksActions.fetchStacks()),
-  fetchResources: (stackName, stackId) =>
-    dispatch(StacksActions.fetchResources(stackName, stackId))
-});
-
 export default injectIntl(
-  connect(mapStateToProps, mapDispatchToProps)(UndeployProgress)
+  connect(mapStateToProps, { fetchStacks, fetchResources })(UndeployProgress)
 );

src/js/components/nodes/Nodes.js

@@ -35,7 +35,7 @@ import NodesListView from './NodesListView/NodesListView';
 import NodesToolbar from './NodesToolbar/NodesToolbar';
 import NodesTableView from './NodesTableView';
 import RegisterNodesDialog from './registerNodes/RegisterNodesDialog';
-import StacksActions from '../../actions/StacksActions';
+import { fetchStacks } from '../../actions/StacksActions';
 
 const messages = defineMessages({
   loadingNodes: {
@@ -180,11 +180,10 @@ const mapStateToProps = state => ({
   stacksLoaded: state.stacks.isLoaded
 });
 
-const mapDispatchToProps = dispatch => ({
+export default injectIntl(
-  fetchStacks: () => dispatch(StacksActions.fetchStacks()),
+  connect(mapStateToProps, {
-  fetchNodes: () => dispatch(fetchNodes()),
+    fetchStacks,
-  fetchNodeIntrospectionData: nodeId =>
+    fetchNodes,
-    dispatch(fetchNodeIntrospectionData(nodeId))
+    fetchNodeIntrospectionData
-});
+  })(Nodes)
-
+);
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(Nodes));

src/js/services/ZaqarWebSocketService.js

@@ -21,7 +21,7 @@ import {
   getDefaultZaqarQueue,
   getLoggingZaqarQueue
 } from '../selectors/appConfig';
-import ZaqarActions from '../actions/ZaqarActions';
+import { messageReceived } from '../actions/ZaqarActions';
 import { notify } from '../actions/NotificationActions';
 
 // We're using `console` here to avoid circular imports.
@@ -65,7 +65,7 @@ export default {
 
       this.socket.onmessage = evt => {
         const data = JSON.parse(evt.data);
-        dispatch(ZaqarActions.messageReceived(data));
+        dispatch(messageReceived(data));
       };
     };
   },

src/js/services/logging/adapters/ZaqarAdapter.js

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-import ZaqarActions from '../../../actions/ZaqarActions';
+import { postMessage } from '../../../actions/ZaqarActions';
 import Adapter from './BaseAdapter';
 
 export default class ZaqarAdapter extends Adapter {
@@ -62,7 +62,7 @@ export default class ZaqarAdapter extends Adapter {
     const loggingQueue =
       (window.tripleOUiConfig || {})['logger-zaqar-queue'] ||
       'tripleo-ui-logging';
-    this._dispatch(ZaqarActions.postMessage(loggingQueue, msg));
+    this._dispatch(postMessage(loggingQueue, msg));
   }
 
   debug(...args) {