Merge pull request #1173 from 18F/ab-service-instance-bind-errors

Display error when service instance creation fails

static_src/actions/service_actions.js

@@ -134,7 +134,8 @@ const serviceActions = {
 
     return cfApi.createServiceInstance(name, spaceGuid, servicePlanGuid)
       .then(serviceInstance => serviceActions.fetchInstance(serviceInstance.guid))
-      .then(serviceActions.createdInstance, serviceActions.errorCreateInstance);
+      .then(serviceActions.createdInstance)
+      .catch(serviceActions.errorCreateInstance);
   },
 
   createdInstance(serviceInstance) {
@@ -146,10 +147,13 @@ const serviceActions = {
     return Promise.resolve(serviceInstance);
   },
 
-  errorCreateInstance(err) {
+  errorCreateInstance(error) {
+    const { response } = error;
+    const safeError = (response && response.data) || { code: 500 };
+
     AppDispatcher.handleServerAction({
       type: serviceActionTypes.SERVICE_INSTANCE_CREATE_ERROR,
-      error: err
+      error: safeError
     });
 
     return Promise.resolve();

static_src/components/create_service_instance.jsx

@@ -1,12 +1,9 @@
 /**
  * Renders the form to create a service instance
  */
-
-import style from 'cloudgov-style/css/cloudgov-style.css';
 import PropTypes from 'prop-types';
 import React from 'react';
 import ReactDOM from 'react-dom';
-
 import Action from './action.jsx';
 import { Form, FormText, FormSelect, FormElement, FormError } from './form';
 import FormStore from '../stores/form_store';
@@ -15,7 +12,6 @@ import OrgStore from '../stores/org_store.js';
 import SpaceStore from '../stores/space_store.js';
 import ServiceInstanceStore from '../stores/service_instance_store.js';
 import serviceActions from '../actions/service_actions.js';
-import createStyler from '../util/create_styler';
 import { validateString } from '../util/validators';
 
 const CREATE_SERVICE_INSTANCE_FORM_GUID = 'create-service-form';
@@ -48,17 +44,14 @@ export default class CreateServiceInstance extends React.Component {
       createError: ServiceInstanceStore.createError
     };
 
-    // Create the form in the store
-    FormStore.create(CREATE_SERVICE_INSTANCE_FORM_GUID);
-
     this.validateString = validateString().bind(this);
     this._onChange = this._onChange.bind(this);
     this._onValidForm = this._onValidForm.bind(this);
     this._onCancelForm = this._onCancelForm.bind(this);
-    this.styler = createStyler(style);
   }
 
   componentDidMount() {
+    FormStore.create(CREATE_SERVICE_INSTANCE_FORM_GUID);
     SpaceStore.addChangeListener(this._onChange);
     ServiceInstanceStore.addChangeListener(this._onChange);
     this.scrollIntoView();
@@ -80,9 +73,13 @@ export default class CreateServiceInstance extends React.Component {
 
   _onValidForm(errs, values) {
     this.setState({ errs }, () => {
+      const { name, space } = values;
+      const instanceName = name || null;
+      const spaceName = space || null;
+
       serviceActions.createInstance(
-        values.name.value,
-        values.space.value,
+        instanceName,
+        spaceName,
         this.props.servicePlan.guid
       );
     });
@@ -101,8 +98,18 @@ export default class CreateServiceInstance extends React.Component {
     return this.props.servicePlan.name || 'Unknown Service Plan Name';
   }
 
-  render() {
+  get validSpaceTargets() {
     const currentOrgGuid = OrgStore.currentOrgGuid;
+    const { spaces } = this.state;
+
+    return spaces.filter(space => {
+      return space.org === currentOrgGuid;
+    }).map(space => {
+      return { value: space.guid, label: space.name }
+    });
+  }
+
+  render() {
     let createError;
     let createAction = (
       <Action label="submit" type="submit">Create service instance</Action>
@@ -116,14 +123,14 @@ export default class CreateServiceInstance extends React.Component {
       createAction = <Loading style="inline" />;
     } else if (this.state.createdTempNotification) {
       createAction = (
-        <span className={ this.styler('status', 'status-ok') }>
+        <span className="status status-ok">
           Created! To bind the service instance to an app, go to an application page and use the services panel.
         </span>
       );
     }
 
     return (
-      <div className = { this.styler('actions-large') }>
+      <div className="actions-large">
         { createError }
         <Form
           guid={ CREATE_SERVICE_INSTANCE_FORM_GUID }
@@ -132,11 +139,13 @@ export default class CreateServiceInstance extends React.Component {
           onSubmit={ this._onValidForm }
         >
           <legend>
-            Create a service instance for <strong
-              className={this.styler('actions-callout-inline-block') }>
-            { this.serviceName }</strong> using <strong
-              className={this.styler('actions-callout-inline-block')}>
-            { this.servicePlanName }</strong> plan.
+            Create a service instance for
+            <strong className="actions-callout-inline-block">
+              { this.serviceName }
+            </strong> using
+            <strong className="actions-callout-inline-block">
+              { this.servicePlanName }
+            </strong> plan.
           </legend>
           <FormText
             formGuid={ CREATE_SERVICE_INSTANCE_FORM_GUID }
@@ -150,16 +159,16 @@ export default class CreateServiceInstance extends React.Component {
             classes={ ['test-create_service_instance_space'] }
             label="Select the space for the service instance"
             name="space"
-            options={ this.state.spaces.filter((space) => {
-              return space.org === currentOrgGuid;
-            }).map((space) => {
-              return { value: space.guid, label: space.name };
-            })}
+            options={ this.validSpaceTargets }
             validator={ this.validateString }
           />
           { createAction }
-                                                                                                                                       <Action label="cancel" style="base" type="outline"
-              clickHandler={ this._onCancelForm.bind(this) }>
+          <Action
+            label="cancel"
+            style="base"
+            type="outline"
+            clickHandler={ this._onCancelForm }
+          >
             Cancel
           </Action>
         </Form>

static_src/components/form/form_error.jsx

@@ -1,26 +1,14 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import style from 'cloudgov-style/css/cloudgov-style.css';
-
-import createStyler from '../../util/create_styler';
-
 const propTypes = { message: PropTypes.string };
 const defaultProps = { message: '' };
 
-export default class FormError extends React.Component {
-  constructor(props) {
-    super(props);
-    this.styler = createStyler(style);
-  }
-
-  render() {
-    return (
-      <span className={ this.styler('error_message')}>
-        { this.props.message }
-      </span>
-    );
-  }
-}
+const FormError = ({ message }) =>
+  <span className="error_message">
+    { message }
+  </span>;
 
 FormError.propTypes = propTypes;
 FormError.defaultProps = defaultProps;
+
+export default FormError;

static_src/components/form/form_text.jsx

@@ -1,12 +1,10 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-
 import style from 'cloudgov-style/css/cloudgov-style.css';
 import FormElement from './form_element.jsx';
 import FormError from './form_error.jsx';
 import createStyler from '../../util/create_styler';
 
-
 export default class FormText extends FormElement {
   constructor(props) {
     super(props);

static_src/stores/form_store.js

@@ -18,17 +18,15 @@ export class FormStore extends BaseStore {
     return form.fields[fieldName];
   }
 
-  create(formGuid, initialData) {
-    const formFields = Object.keys(initialData || {})
-      .reduce((fields, fieldName) => {
-        const formField = {
-          name: fieldName,
-          value: initialData[fieldName]
-        };
-
-        return { ...fields, [fieldName]: formField };
-      }, {});
-
+  create(formGuid, initialData = {}) {
+    const formFields = Object.keys(initialData).reduce((fields, fieldName) => {
+      const formField = {
+        name: fieldName,
+        value: initialData[fieldName]
+      };
+
+      return { ...fields, [fieldName]: formField };
+    }, {});
     const form = { guid: formGuid, fields: formFields };
     this.push(form);
     return form;

static_src/stores/service_instance_store.js

@@ -33,6 +33,21 @@ const APP_STATE_MAP = {
   [OPERATION_RUNNING]: appStates.running
 };
 
+const FRIENDLY_ERROR_MAP = {
+  'CF-ServiceInstanceInvalid': 'Invalid space selected.',
+  'CF-MessageParseError': 'One or more form fields is blank or invalid.'
+};
+
+const getFriendlyError = error => {
+  const { code, error_code: errorCode } = error;
+
+  if (errorCode in FRIENDLY_ERROR_MAP) {
+    return FRIENDLY_ERROR_MAP[errorCode];
+  }
+
+  return `Error #${code}: please contact cloud.gov support for help troubleshooting this issue.`;
+};
+
 export class ServiceInstanceStore extends BaseStore {
   constructor() {
     super();
@@ -199,7 +214,9 @@ export class ServiceInstanceStore extends BaseStore {
       }
 
       case serviceActionTypes.SERVICE_INSTANCE_CREATE_ERROR: {
-        this._createError = action.error;
+        this._createError = {
+          description: getFriendlyError(action.error)
+        };
         this._createLoading = false;
         this.emitChange();
         break;

static_src/test/unit/actions/service_actions.spec.js

@@ -357,8 +357,7 @@ describe('serviceActions', function() {
   });
 
   describe('createdInstance()', function() {
-    it('should dispatch a server event of type instance created with service',
-        function() {
+    it('dispatchs a server event of type instance created with service', () => {
       var expectedInstance = { guid: 'asdfas' };
 
       let expectedParams = {
@@ -373,19 +372,47 @@ describe('serviceActions', function() {
     });
   });
 
-  describe('errorCreateInstance()', function() {
-    it('should dispatch a server event of type error create instance', function() {
-      var expectedErr = { status: 400 };
+  describe('errorCreateInstance()', () => {
+    const type = serviceActionTypes.SERVICE_INSTANCE_CREATE_ERROR;
+    let spy;
 
-      let expectedParams = {
-        error: expectedErr
-      }
-      let spy = setupServerSpy(sandbox);
+    beforeEach(() => {
+      spy = sandbox.spy(AppDispatcher, 'handleServerAction');
+    });
 
-      serviceActions.errorCreateInstance(expectedErr);
+    afterEach(() => {
+      spy.restore();
+    });
 
-      assertAction(spy, serviceActionTypes.SERVICE_INSTANCE_CREATE_ERROR,
-                   expectedParams);
+    describe('server fault', () => {
+      it('dispatches the correct error type and a code 500', () => {
+        const originalError = { message: 'Bad error', stack: [] };
+        const actual = { code: 500 };
+
+        serviceActions.errorCreateInstance(originalError);
+
+        const actionInfo = spy.getCall(0).args[0];
+        const { type, error } = actionInfo;
+
+        expect(spy).toHaveBeenCalledOnce();
+        expect(actionInfo.type).toEqual(type);
+        expect(error).toEqual(actual);
+      });
+    });
+
+    describe('API error/malformed request', () => {
+      it('dispatches the correct error type and error data object', () => {
+        const originalError = { response: { data: { hey: 'there' } } };
+
+        serviceActions.errorCreateInstance(originalError);
+
+        const actionInfo = spy.getCall(0).args[0];
+        const { type, error } = actionInfo;
+
+        expect(spy).toHaveBeenCalledOnce();
+        expect(actionInfo.type).toEqual(type);
+        expect(error).toEqual(originalError.response.data);
+      });
     });
   });
 

static_src/test/unit/components/create_service_instance.spec.jsx

@@ -0,0 +1,23 @@
+import '../../global_setup';
+
+import React from 'react';
+import CreateServiceInstance from '../../../components/create_service_instance.jsx';
+import FormError from '../../../components/form/form_error.jsx';
+import Immutable from 'immutable';
+import SpaceStore from '../../../stores/space_store';
+import ServiceInstanceStore from '../../../stores/service_instance_store';
+import { shallow } from 'enzyme';
+
+describe('<CreateServiceInstance />', () => {
+  beforeEach(() => {
+    ServiceInstanceStore._createError = { description: 'Bad stuff everyone' };
+  });
+
+  it('displays an error message when ServiceInstanceStore has one', () => {
+    SpaceStore._data = Immutable.fromJS([]);
+
+    const wrapper = shallow(<CreateServiceInstance servicePlan={ {} } />);
+
+    expect(wrapper.find(FormError).length).toBe(1);
+  });
+});

static_src/test/unit/helpers.js

@@ -23,6 +23,7 @@ export function assertAction(spy, type, params) {
   expect(spy).toHaveBeenCalledOnce();
   let actionInfo = spy.getCall(0).args[0];
   expect(actionInfo.type).toEqual(type);
+
   for (let param in params) {
     const datum = 'data' in actionInfo ? actionInfo.data[param] : actionInfo[param];
     expect(datum).toEqual(params[param]);