Merge pull request #178 from labzero/develop

Merge to master
labzero · Apr 16, 2018 · 9bb3f54 · 9bb3f54
2 parents 1e6ea7e + 8ee856d
commit 9bb3f54
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/components/NameFilterForm/NameFilterForm.js b/src/components/NameFilterForm/NameFilterForm.js
@@ -48,6 +48,7 @@ class NameFilterForm extends Component {
   }
 
   hideForm = () => {
+    this.props.setFlipMove(false);
     this.props.setNameFilter('');
     this.setState(() => ({
       shown: false,
@@ -84,6 +85,7 @@ class NameFilterForm extends Component {
               value={nameFilter}
               onChange={this.setNameFilterValue}
               onFocus={this.setFlipMoveFalse}
+              onBlur={this.setFlipMoveTrue}
               ref={i => { this.input = i; }}
             />
           </div>

diff --git a/src/components/TagFilterForm/TagFilterForm.js b/src/components/TagFilterForm/TagFilterForm.js
@@ -30,13 +30,10 @@ class TagFilterForm extends Component {
   }
 
   componentDidUpdate(prevProps, prevState) {
-    if (this.state.shown !== prevState.shown) {
-      if (this.state.shown) {
-        this.autosuggest.input.focus();
-      } else {
-        this.props.setFlipMove(true);
-      }
+    if (this.state.shown !== prevState.shown && this.state.shown) {
+      this.autosuggest.input.focus();
     }
+    this.props.setFlipMove(true);
   }
 
   setAutosuggestValue = (event, { newValue, method }) => {
@@ -52,6 +49,7 @@ class TagFilterForm extends Component {
     if (method === 'enter') {
       event.preventDefault();
     }
+    this.props.setFlipMove(false);
     this.props.addTag(suggestion.id);
     this.setState(() => ({
       autosuggestValue: '',
@@ -60,26 +58,30 @@ class TagFilterForm extends Component {
 
   hideForm = () => {
     this.props.clearTags();
+    this.props.setFlipMove(false);
     this.setState(() => ({
       autosuggestValue: '',
       shown: false,
     }));
   }
 
   showForm = () => {
-    this.props.setFlipMove(false);
     this.setState(() => ({
       shown: true,
     }));
   }
 
+  removeTagFilter = (tag) => {
+    this.props.removeTag(tag); 
+    this.props.setFlipMove(false);
+  }
+
   render() {
     const {
       addByName,
       addedTags,
       allTags,
       exclude,
-      removeTag,
       restaurantIds,
     } = this.props;
 
@@ -122,7 +124,7 @@ class TagFilterForm extends Component {
               <TagContainer
                 id={tag}
                 showDelete
-                onDeleteClicked={() => removeTag(tag)}
+                onDeleteClicked={() => this.removeTagFilter(tag)}
                 exclude={exclude}
               />
             </div>

diff --git a/src/models/index.js b/src/models/index.js
@@ -68,7 +68,6 @@ Restaurant.findAllWithTagIds = ({ team_id }) =>
       order: [
         [Restaurant.associations.decisions, 'id', 'NULLS LAST'],
         sequelize.literal('(COUNT(*) OVER(PARTITION BY "restaurant"."id")) DESC'),
-        [Restaurant.associations.votes, 'created_at', 'DESC', 'NULLS LAST'],
         sequelize.literal('all_decision_count ASC'),
         sequelize.literal('all_vote_count DESC'),
         ['name', 'ASC'],