From f294640f8a1af3919d6bf560ec706ab52dbf0487 Mon Sep 17 00:00:00 2001
From: Leonard Bogdonoff <rememberlenny@gmail.com>
Date: Thu, 17 Aug 2017 18:13:42 -0400
Subject: [PATCH 1/4] Create the response for when multiple param needing
 services are rendered

---
 .../components/create_service_instance.jsx    | 113 +++++++++++-------
 1 file changed, 73 insertions(+), 40 deletions(-)

diff --git a/static_src/components/create_service_instance.jsx b/static_src/components/create_service_instance.jsx
index 94afa20f..d77b718d 100644
--- a/static_src/components/create_service_instance.jsx
+++ b/static_src/components/create_service_instance.jsx
@@ -16,6 +16,11 @@ import formActions from '../actions/form_actions';
 import { validateString } from '../util/validators';
 
 const CREATE_SERVICE_INSTANCE_FORM_GUID = 'create-service-form';
+const CF_CLI_SERVICE_DETAILS = {
+  'cdn-route': 'https://cloud.gov/docs/services/cdn-route/',
+  'cloud-gov-identity-provider': 'https://cloud.gov/docs/services/cloud-gov-identity-provider/',
+  'cloud-gov-service-account': 'https://cloud.gov/docs/services/cloud-gov-service-account/'
+};
 
 const propTypes = {
   error: PropTypes.object,
@@ -90,6 +95,73 @@ export default class CreateServiceInstance extends React.Component {
     serviceActions.createInstanceFormCancel();
   }
 
+  get formContent() {
+    const serviceName = this.serviceName;
+    if (CF_CLI_SERVICE_DETAILS.hasOwnProperty(serviceName)) {
+      return (
+        <Form
+          guid={ CREATE_SERVICE_INSTANCE_FORM_GUID }
+          classes={ ['test-create_service_instance_form'] }
+          ref="form"
+          onSubmit={ this._onValidForm }
+        >
+          <legend>
+            The
+            <strong className="actions-callout-inline-block">
+              { serviceName }
+            </strong> service instance must be created using the CF CLI.
+            Please refer to <a href={ CF_CLI_SERVICE_DETAILS[serviceName] }
+            target="_blank">{ CF_CLI_SERVICE_DETAILS[serviceName] }</a> for more
+            information.
+          </legend>
+        </Form>
+      );
+    } else {
+      return (
+        <Form
+          guid={ CREATE_SERVICE_INSTANCE_FORM_GUID }
+          classes={ ['test-create_service_instance_form'] }
+          ref="form"
+          onSubmit={ this._onValidForm }
+        >
+          <legend>
+            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 }
+            classes={ ['test-create_service_instance_name'] }
+            label="Choose a name for the service instance"
+            name="name"
+            validator={ this.validateString }
+          />
+          <FormSelect
+            formGuid={ CREATE_SERVICE_INSTANCE_FORM_GUID }
+            classes={ ['test-create_service_instance_space'] }
+            label="Select the space for the service instance"
+            name="space"
+            options={ this.validSpaceTargets }
+            validator={ this.validateString }
+          />
+          { this.contextualAction }
+          <Action
+            label="cancel"
+            style="base"
+            type="outline"
+            clickHandler={ this._onCancelForm }
+          >
+            Cancel
+          </Action>
+        </Form>
+      );
+    }
+  }
+
   get serviceName() {
     return this.props.service.label || 'Unknown Service Name';
   }
@@ -139,46 +211,7 @@ export default class CreateServiceInstance extends React.Component {
     return (
       <div className="actions-large">
         { createError }
-        <Form
-          guid={ CREATE_SERVICE_INSTANCE_FORM_GUID }
-          classes={ ['test-create_service_instance_form'] }
-          ref="form"
-          onSubmit={ this._onValidForm }
-        >
-          <legend>
-            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 }
-            classes={ ['test-create_service_instance_name'] }
-            label="Choose a name for the service instance"
-            name="name"
-            validator={ this.validateString }
-          />
-          <FormSelect
-            formGuid={ CREATE_SERVICE_INSTANCE_FORM_GUID }
-            classes={ ['test-create_service_instance_space'] }
-            label="Select the space for the service instance"
-            name="space"
-            options={ this.validSpaceTargets }
-            validator={ this.validateString }
-          />
-          { this.contextualAction }
-          <Action
-            label="cancel"
-            style="base"
-            type="outline"
-            clickHandler={ this._onCancelForm }
-          >
-            Cancel
-          </Action>
-        </Form>
+        { this.formContent }
       </div>
     );
   }

From 46d775ce648257fea3962de412493a3716fefa3e Mon Sep 17 00:00:00 2001
From: Leonard Bogdonoff <rememberlenny@gmail.com>
Date: Fri, 18 Aug 2017 14:51:40 -0400
Subject: [PATCH 2/4] Create tests for the various create service instance
 conditions with hardcoded responses

---
 .../create_service_instance.spec.jsx          | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/static_src/test/unit/components/create_service_instance.spec.jsx b/static_src/test/unit/components/create_service_instance.spec.jsx
index c9027593..b3fba3c8 100644
--- a/static_src/test/unit/components/create_service_instance.spec.jsx
+++ b/static_src/test/unit/components/create_service_instance.spec.jsx
@@ -7,6 +7,14 @@ import serviceActions from '../../../actions/service_actions';
 import { shallow } from 'enzyme';
 
 describe('<CreateServiceInstance />', () => {
+
+  const serviceProps = {
+    service: {},
+    servicePlan: {
+      guid: 'some-plan-guid'
+    }
+  };
+
   it('displays an error message when ServiceInstanceStore has one', () => {
     const error = { description: 'Bad stuff everyone' };
     const wrapper = shallow(<CreateServiceInstance servicePlan={ {} } error={ error } />);
@@ -32,4 +40,53 @@ describe('<CreateServiceInstance />', () => {
       expect(typeof spy.getCall(0).args[0]).toBe('string');
     });
   });
+
+  describe('when serviceAction.createInstance has pre-designated responses', () => {
+    it('called for cdn-route', () => {
+      const serviceInstanceHTML = '<div class="actions-large"><form id="create-service-form"' +
+      ' action="/" method="post" class="test-create_service_instance_form"><fieldset><legend>' +
+      'The<strong class="actions-callout-inline-block">cdn-route</strong> service instance ' +
+      'must be created using the CF CLI. Please refer to <a href="https://cloud.gov/docs/' +
+      'services/cdn-route/" target="_blank">https://cloud.gov/docs/services/cdn-route/</a> ' +
+      'for more information.</legend></fieldset></form></div>';
+      const serviceProps = Object.assign({}, serviceProps, {
+        service: { label: 'cdn-route' }
+      });
+      const wrapper = shallow(<CreateServiceInstance { ...serviceProps } />);
+
+      expect(wrapper.html()).toEqual(serviceInstanceHTML);
+    });
+
+    it('called for cloud-gov-identity-provider', () => {
+      const serviceInstanceHTML = '<div class="actions-large"><form id="create-service-form"' +
+      ' action="/" method="post" class="test-create_service_instance_form"><fieldset><legend>' +
+      'The<strong class="actions-callout-inline-block">cloud-gov-identity-provider</strong> ' +
+      'service instance must be created using the CF CLI. Please refer to <a href="https:' +
+      '//cloud.gov/docs/services/cloud-gov-identity-provider/" target="_blank">https://clo' +
+      'ud.gov/docs/services/cloud-gov-identity-provider/</a> for more information.</legend>' +
+      '</fieldset></form></div>';
+      const serviceProps = Object.assign({}, serviceProps, {
+        service: { label: 'cloud-gov-identity-provider' }
+      });
+      const wrapper = shallow(<CreateServiceInstance { ...serviceProps } />);
+
+      expect(wrapper.html()).toEqual(serviceInstanceHTML);
+    });
+
+    it('called for cloud-gov-service-account', () => {
+      const serviceInstanceHTML = '<div class="actions-large"><form id="create-service-form"' +
+      ' action="/" method="post" class="test-create_service_instance_form"><fieldset><legend>' +
+      'The<strong class="actions-callout-inline-block">cloud-gov-service-account</strong> ' +
+      'service instance must be created using the CF CLI. Please refer to <a href="' +
+      'https://cloud.gov/docs/services/cloud-gov-service-account/" target="_blank">https://' +
+      'cloud.gov/docs/services/cloud-gov-service-account/</a> for more information.</legend>' +
+      '</fieldset></form></div>';
+      const serviceProps = Object.assign({}, serviceProps, {
+        service: { label: 'cloud-gov-service-account' }
+      });
+      const wrapper = shallow(<CreateServiceInstance { ...serviceProps } />);
+
+      expect(wrapper.html()).toEqual(serviceInstanceHTML);
+    });
+  });
 });

From de3f7353dd7dcc5146a2abab499873d98f693cf8 Mon Sep 17 00:00:00 2001
From: Leonard Bogdonoff <rememberlenny@gmail.com>
Date: Fri, 18 Aug 2017 15:06:30 -0400
Subject: [PATCH 3/4] Create comment

---
 static_src/components/create_service_instance.jsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/static_src/components/create_service_instance.jsx b/static_src/components/create_service_instance.jsx
index d77b718d..83b6f949 100644
--- a/static_src/components/create_service_instance.jsx
+++ b/static_src/components/create_service_instance.jsx
@@ -16,6 +16,10 @@ import formActions from '../actions/form_actions';
 import { validateString } from '../util/validators';
 
 const CREATE_SERVICE_INSTANCE_FORM_GUID = 'create-service-form';
+
+// Note:
+// This is a temporary hardcoded solution to resolve the need
+// for multiple parameters when setting up service instances.
 const CF_CLI_SERVICE_DETAILS = {
   'cdn-route': 'https://cloud.gov/docs/services/cdn-route/',
   'cloud-gov-identity-provider': 'https://cloud.gov/docs/services/cloud-gov-identity-provider/',

From cc2d78103b242c010581015bff315441f0c81b9b Mon Sep 17 00:00:00 2001
From: Leonard Bogdonoff <rememberlenny@gmail.com>
Date: Fri, 18 Aug 2017 15:11:36 -0400
Subject: [PATCH 4/4] Lint fix

---
 .../unit/components/create_service_instance.spec.jsx     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/static_src/test/unit/components/create_service_instance.spec.jsx b/static_src/test/unit/components/create_service_instance.spec.jsx
index b3fba3c8..2a82490e 100644
--- a/static_src/test/unit/components/create_service_instance.spec.jsx
+++ b/static_src/test/unit/components/create_service_instance.spec.jsx
@@ -7,8 +7,7 @@ import serviceActions from '../../../actions/service_actions';
 import { shallow } from 'enzyme';
 
 describe('<CreateServiceInstance />', () => {
-
-  const serviceProps = {
+  const serviceBaseProps = {
     service: {},
     servicePlan: {
       guid: 'some-plan-guid'
@@ -49,7 +48,7 @@ describe('<CreateServiceInstance />', () => {
       'must be created using the CF CLI. Please refer to <a href="https://cloud.gov/docs/' +
       'services/cdn-route/" target="_blank">https://cloud.gov/docs/services/cdn-route/</a> ' +
       'for more information.</legend></fieldset></form></div>';
-      const serviceProps = Object.assign({}, serviceProps, {
+      const serviceProps = Object.assign({}, serviceBaseProps, {
         service: { label: 'cdn-route' }
       });
       const wrapper = shallow(<CreateServiceInstance { ...serviceProps } />);
@@ -65,7 +64,7 @@ describe('<CreateServiceInstance />', () => {
       '//cloud.gov/docs/services/cloud-gov-identity-provider/" target="_blank">https://clo' +
       'ud.gov/docs/services/cloud-gov-identity-provider/</a> for more information.</legend>' +
       '</fieldset></form></div>';
-      const serviceProps = Object.assign({}, serviceProps, {
+      const serviceProps = Object.assign({}, serviceBaseProps, {
         service: { label: 'cloud-gov-identity-provider' }
       });
       const wrapper = shallow(<CreateServiceInstance { ...serviceProps } />);
@@ -81,7 +80,7 @@ describe('<CreateServiceInstance />', () => {
       'https://cloud.gov/docs/services/cloud-gov-service-account/" target="_blank">https://' +
       'cloud.gov/docs/services/cloud-gov-service-account/</a> for more information.</legend>' +
       '</fieldset></form></div>';
-      const serviceProps = Object.assign({}, serviceProps, {
+      const serviceProps = Object.assign({}, serviceBaseProps, {
         service: { label: 'cloud-gov-service-account' }
       });
       const wrapper = shallow(<CreateServiceInstance { ...serviceProps } />);