diff --git a/src/containers/FindBar.js b/src/containers/FindBar.js index 728152c3..6a1de855 100644 --- a/src/containers/FindBar.js +++ b/src/containers/FindBar.js @@ -1,6 +1,7 @@ import React, { Component, PropTypes } from 'react'; import fuzzy from 'fuzzy'; import _ from 'lodash'; +import { runCommand } from '../actions/findbar'; import { connect } from 'react-redux'; import styles from './FindBar.css'; @@ -55,7 +56,7 @@ class FindBar extends Component { const matcher = /\(:([a-zA-Z_$][a-zA-Z0-9_$]*)(?:(?: as )(.*))?\)/g; const match = matcher.exec(command.pattern); - const token = command.pattern.slice(0, match.index); + const token = command.pattern.slice(0, match.index) || command.token; regexp += this._escapeRegExp(command.pattern.slice(0, match.index)); if (match[1]) { @@ -88,15 +89,9 @@ class FindBar extends Component { activeScope: command.token, placeholder: command.param.display }); + } else { + this.props.dispatch(runCommand(command.token, command.param.name, param)); } - console.log({ - command, - param - }) - return { - command, - param - }; } handleChange(event) { @@ -271,7 +266,8 @@ class FindBar extends Component { } } FindBar.propTypes = { - commands: PropTypes.array.isRequired + commands: PropTypes.array.isRequired, + dispatch: PropTypes.func.isRequired, }; diff --git a/src/containers/stories/FindBar.js b/src/containers/stories/FindBar.js index 043bece2..88f20d30 100644 --- a/src/containers/stories/FindBar.js +++ b/src/containers/stories/FindBar.js @@ -1,5 +1,5 @@ import React from 'react'; -import { storiesOf } from '@kadira/storybook'; +import { storiesOf, action } from '@kadira/storybook'; import FindBar from '../FindBar'; @@ -57,13 +57,13 @@ const commands = [ { pattern: 'Visit West Virginia at(:date)' }, { pattern: 'Visit Wisconsin at(:date)' }, { pattern: 'Visit Wyoming at(:date)' }, - { pattern: '(:searchTerm as Find...)' } + { pattern: '(:searchTerm as Find...)', token:'Search' } ]; - storiesOf('FindBar', module) .add('Default View', () => ( ));