Merge branch 'master' of https://github.com/samtecspg/articulate

.gitignore

@@ -2,4 +2,5 @@
 .DS_Store
 npm-debug.log
 .idea
-.vscode
+.vscode
+*.iml

ui/.dockerignore

@@ -0,0 +1,7 @@
+Dockerfile
+# the .env settings are projected through the docker-compose environment block.
+# Lots of unexpected behavor will happen if you let the .env get pulled into
+# the build, so HIGHLY recommened .env is listed (blocked) on the following line:
+.env
+docker-compose.yml
+/node_modules/

ui/app/app.js

@@ -52,7 +52,7 @@ import createRoutes from './routes';
 const initialState = {};
 const store = configureStore(initialState, browserHistory);
 
-//Inject the sagas of the conversation bar to allow global listening
+// Inject the sagas of the conversation bar to allow global listening
 ConversationBarSagas.map(store.runSaga);
 
 // Sync history and store, as the react-router-redux reducer
@@ -83,7 +83,7 @@ const render = (messages) => {
         />
       </LanguageProvider>
     </Provider>,
-    document.getElementById('app')
+    document.getElementById('app'),
   );
 };
 

ui/app/components/ActionButton/index.js

@@ -2,18 +2,18 @@ import React, { PropTypes } from 'react';
 import { FormattedMessage } from 'react-intl';
 
 export function ActionButton(props) { // eslint-disable-line react/prefer-stateless-function
-    return (
-        <div className="fixed-action-btn">
-            <a className="btn-floating btn-large" onClick={props.onClick}>
-                <FormattedMessage {...props.label} />
-            </a>
-        </div>
-    );
-};
+  return (
+    <div className="fixed-action-btn">
+      <a className="btn-floating btn-large" onClick={props.onClick}>
+        <FormattedMessage {...props.label} />
+      </a>
+    </div>
+  );
+}
 
 ActionButton.propTypes = {
-    label: PropTypes.object,
-    onClick: PropTypes.func
+  label: PropTypes.object,
+  onClick: PropTypes.func,
 };
 
-export default ActionButton;
+export default ActionButton;

ui/app/components/AgentMessage/index.js

@@ -1,9 +1,13 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
 
-import { Row, Col, CardPanel } from 'react-materialize';
+import {
+  CardPanel,
+  Col,
+  Row,
+} from 'react-materialize';
 
 export function AgentMessage(props) {
-  
+
   return (
     <Row>
       <Col s={6} m={10}>

ui/app/components/CheckboxInput/CheckboxOption.js

@@ -2,20 +2,20 @@ import React, { PropTypes } from 'react';
 
 function CheckboxOption(props) { // eslint-disable-line react/prefer-stateless-function
 
-    return (
-        <div className="checkbox">
-            <input name={props.groupName} type="checkbox" id={props.id} />
-            <label htmlFor={props.id}>{props.label}</label>
-            <p>{props.text}</p>
-        </div>
-    );
+  return (
+    <div className="checkbox">
+      <input name={props.groupName} type="checkbox" id={props.id} />
+      <label htmlFor={props.id}>{props.label}</label>
+      <p>{props.text}</p>
+    </div>
+  );
 }
 
 CheckboxOption.propTypes = {
-    groupName: PropTypes.string,
-    id: PropTypes.string,
-    label: PropTypes.string,
-    text: PropTypes.string,
+  groupName: PropTypes.string,
+  id: PropTypes.string,
+  label: PropTypes.string,
+  text: PropTypes.string,
 };
 
-export default CheckboxOption;
+export default CheckboxOption;

ui/app/components/CheckboxInput/index.js

@@ -4,20 +4,20 @@ import CheckboxOption from './CheckboxOption';
 
 function CheckboxInput(props) { // eslint-disable-line react/prefer-stateless-function
 
-    return (
-        <form className="checkbox-container" action="#">
-            {
-                props.options.map( (option) => {
-                    return <CheckboxOption key={option.id} groupName={props.id} id={option.id} label={option.label} text={option.text}/>;
-                })
-            }
-        </form>
-    );
+  return (
+    <form className="checkbox-container" action="#">
+      {
+        props.options.map((option) => {
+          return <CheckboxOption key={option.id} groupName={props.id} id={option.id} label={option.label} text={option.text} />;
+        })
+      }
+    </form>
+  );
 }
 
 CheckboxInput.propTypes = {
-    id: PropTypes.string,
-    options: PropTypes.array,
+  id: PropTypes.string,
+  options: PropTypes.array,
 };
 
-export default CheckboxInput;
+export default CheckboxInput;

ui/app/components/Chip/index.js

@@ -1,5 +1,5 @@
-import React from 'react';
 import PropTypes from 'prop-types';
+import React from 'react';
 
 const Chip = ({ children, close, onClose }) => {
   return (
@@ -20,4 +20,4 @@ Chip.propTypes = {
   onClose: PropTypes.func,
 };
 
-export default Chip;
+export default Chip;

ui/app/components/Content/index.js

@@ -1,12 +1,12 @@
 import React from 'react';
 
 export function Content(props) {
-  
+
   return (
     <section className="content-area">
-        <div className="container">
-            {React.Children.toArray(props.children)}
-        </div>
+      <div className="container">
+        {React.Children.toArray(props.children)}
+      </div>
     </section>
   );
 }

ui/app/components/ContentHeader/index.js

@@ -5,23 +5,23 @@ import Row from '../Row';
 
 function ContentHeader(props) { // eslint-disable-line react/prefer-stateless-function
 
-    return (
-        <Row>
-            <header className="main-title">
-                <h1>
-                    <FormattedMessage {...props.title} />
-                </h1>
-                <p>
-                    <FormattedMessage {...props.subTitle} />
-                </p>
-            </header>
-        </Row>
-    );
+  return (
+    <Row>
+      <header className="main-title">
+        <h1>
+          <FormattedMessage {...props.title} />
+        </h1>
+        <p>
+          <FormattedMessage {...props.subTitle} />
+        </p>
+      </header>
+    </Row>
+  );
 }
 
 ContentHeader.propTypes = {
-    title: PropTypes.object,
-    subTitle: PropTypes.object,
+  title: PropTypes.object,
+  subTitle: PropTypes.object,
 };
 
-export default ContentHeader;
+export default ContentHeader;

ui/app/components/DomainsTable/columnDefinition.js

@@ -1,30 +1,24 @@
 export default [{
   label: 'Domains',
-  tooltip: 'String Tooltip',
+  tooltip: '',
   type: 'string',
-  accessor: 'name',
+  accessor: 'domainName',
   headerClassName: 'text-align-left table2-header',
   cellClassName: 'text-align-left table2-column',
+  filterable: true,
   minWidth: 1,
 }, {
-  label: 'Active',
-  tooltip: 'Number Tooltip',
+  label: 'Enabled',
+  tooltip: '',
   type: 'checkbox',
-  accessor: 'active',
+  accessor: 'enabled',
   headerClassName: 'table2-header',
   cellClassName: 'table2-column',
 }, {
-  label: 'T-Score',
-  tooltip: 'String2 Tooltip',
+  label: 'Intent Threshold',
+  tooltip: '',
   type: 'number',
-  accessor: 'tScore',
-  headerClassName: 'table2-header',
-  cellClassName: 'table2-column',
-}, {
-  label: 'U-Score',
-  tooltip: 'String2 Tooltip',
-  type: 'number',
-  accessor: 'uScore',
+  accessor: 'intentThreshold',
   headerClassName: 'table2-header',
   cellClassName: 'table2-column',
 }];

ui/app/components/DomainsTable/index.js

@@ -5,7 +5,7 @@
  */
 
 import React from 'react';
-import Table2 from 'components/Table2';
+import Table2 from '../../components/Table2';
 import columns from './columnDefinition';
 
 class DomainsTable extends React.Component { // eslint-disable-line react/prefer-stateless-function

ui/app/components/Dropdown/index.js

@@ -1,6 +1,5 @@
 import _ from 'lodash';
 import React from 'react';
-import cx from 'classnames';
 
 // import styled from 'styled-components';
 

ui/app/components/DropdownInput/index.js

@@ -2,26 +2,26 @@ import React, { PropTypes } from 'react';
 
 function DropdownInput(props) { // eslint-disable-line react/prefer-stateless-function
 
-    return (
-        <div>
-            <label htmlFor={props.id}>{props.label}</label>
-            <select id={props.id} onChange={props.onChange} value={props.selectedValue}>
-                {
-                    props.options.map( (option, index) => {
-                        return <option key={option.value} value={option.value} disabled={option.disabled}>{option.text}</option>;
-                    })
-                }
-            </select>
-        </div>
-    );
+  return (
+    <div>
+      <label htmlFor={props.id}>{props.label}</label>
+      <select id={props.id} onChange={props.onChange} value={props.selectedValue}>
+        {
+          props.options.map((option, index) => {
+            return <option key={option.value} value={option.value} disabled={option.disabled}>{option.text}</option>;
+          })
+        }
+      </select>
+    </div>
+  );
 }
 
 DropdownInput.propTypes = {
-    id: PropTypes.string,
-    label: PropTypes.string,
-    options: PropTypes.array,
-    onChange: React.PropTypes.func,
-    selectedValue: PropTypes.string,
+  id: PropTypes.string,
+  label: PropTypes.string,
+  options: PropTypes.array,
+  onChange: React.PropTypes.func,
+  selectedValue: PropTypes.string,
 };
 
-export default DropdownInput;
+export default DropdownInput;

ui/app/components/Form/index.js

@@ -1,7 +1,7 @@
 import React from 'react';
 
 export function Form(props) {
-  
+
   return (
     <div id="form-section" style={props.style}>
       {React.Children.toArray(props.children)}