hasura · 0x777 · Nov 14, 2018 · Nov 2, 2018 · Nov 2, 2018 · Nov 2, 2018
diff --git a/.circleci/test-server.sh b/.circleci/test-server.sh
@@ -107,6 +107,7 @@ mkdir -p "$OUTPUT_FOLDER"
 
 export EVENT_WEBHOOK_HEADER="MyEnvValue"
 export HGE_URL="http://localhost:8080"
+export WEBHOOK_FROM_ENV="http://127.0.0.1:5592"
 
 PID=""
 WH_PID=""

@@ -81,7 +81,7 @@ export const passCT = () => {
   cy.get(getElementFromAlias('delete-operation')).check();
 
   // webhook url
-  cy.get(getElementFromAlias('webhook'))
+  cy.get(getElementFromAlias('webhook-input'))
     .clear()
     .type(getWebhookURL());
 
@@ -120,7 +120,7 @@ export const failCTDuplicateTrigger = () => {
   cy.get(getElementFromAlias('delete-operation')).check();
 
   // webhook url
-  cy.get(getElementFromAlias('webhook'))
+  cy.get(getElementFromAlias('webhook-input'))
     .clear()
     .type(getWebhookURL());
 

@@ -0,0 +1,83 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import InputGroup from 'react-bootstrap/lib/InputGroup';
+import DropdownButton from 'react-bootstrap/lib/DropdownButton';
+import MenuItem from 'react-bootstrap/lib/MenuItem';
+
+class DropButton extends React.Component {
+  render() {
+    const {
+      title,
+      dropdownOptions,
+      value,
+      required,
+      onInputChange,
+      onButtonChange,
+      dataKey,
+      dataIndex,
+      bsClass,
+      disabled,
+      inputVal,
+      inputPlaceHolder,
+      id,
+      testId,
+    } = this.props;
+    return (
+      <InputGroup className={bsClass}>
+        <DropdownButton
+          title={value || title}
+          componentClass={InputGroup.Button}
+          disabled={disabled}
+          id={id}
+          data-test={testId + '-' + 'dropdown-button'}
+        >
+          {dropdownOptions.map((d, i) => (
+            <MenuItem
+              data-index-id={dataIndex}
+              value={d.value}
+              onClick={onButtonChange}
+              eventKey={i + 1}
+              key={i}
+              data-test={testId + '-' + 'dropdown-item'}
+            >
+              {d.display_text}
+            </MenuItem>
+          ))}
+        </DropdownButton>
+        <input
+          type="text"
+          data-key={dataKey}
+          data-index-id={dataIndex}
+          className={'form-control'}
+          required={required}
+          onChange={onInputChange}
+          disabled={disabled}
+          value={inputVal || ''}
+          placeholder={inputPlaceHolder}
+          data-test={testId + '-' + 'input'}
+        />
+      </InputGroup>
+    );
+  }
+}
+
+DropButton.propTypes = {
+  dispatch: PropTypes.func.isRequired,
+  dropdownOptions: PropTypes.array.isRequired,
+  title: PropTypes.string.isRequired,
+  value: PropTypes.string.isRequired,
+  dataKey: PropTypes.string.isRequired,
+  dataIndex: PropTypes.string.isRequired,
+  inputVal: PropTypes.string.isRequired,
+  inputPlaceHolder: PropTypes.string,
+  required: PropTypes.bool.isRequired,
+  onButtonChange: PropTypes.func.isRequired,
+  onInputChange: PropTypes.func.isRequired,
+  bsClass: PropTypes.string,
+  id: PropTypes.string,
+  testId: PropTypes.string,
+  disabled: PropTypes.bool.isRequired,
+};
+
+export default DropButton;
@@ -308,7 +308,11 @@ class Main extends React.Component {
                       </a>
                     </li>
                     <li className={'dropdown-item'}>
-                      <a href="https://docs.hasura.io/" target="_blank">
+                      <a
+                        href="https://docs.hasura.io/"
+                        target="_blank"
+                        rel="noopener noreferrer"
+                      >
                         <img
                           className={'img-responsive'}
                           src={docs}