Fix search by adding result id

- Apollo cache requires an id to commit to their store
- add id to each query result
- refactor out the store
- still can use a lot of refactoring

backend/src/schema/resolvers/searches.js

@@ -1,15 +1,15 @@
-export default {
-  SearchResult: {
-    __resolveType(obj, context, info) {
-      if (obj.encryptedPassword) {
-        return 'User'
-      }
-      if (obj.content) {
-        return 'Post'
-      }
-      return null
+import uuid from 'uuid/v4'
+
+const transformReturnType = record => {
+  return {
+    id: uuid(),
+    searchResults: {
+      __typename: record.get('type'),
+      ...record.get('resource').properties,
     },
-  },
+  }
+}
+export default {
   Query: {
     findResources: async (_parent, args, context, _resolveInfo) => {
       const query = args.query
@@ -21,14 +21,14 @@ export default {
       const userQuery = query.replace(/\s/g, '~ ') + '~'
       const postCypher = `
       CALL db.index.fulltext.queryNodes('post_fulltext_search', $query)
-      YIELD node as post, score
-      MATCH (post)<-[:WROTE]-(user:User)
+      YIELD node as resource, score
+      MATCH (resource)<-[:WROTE]-(user:User)
       WHERE score >= 0.2
       AND NOT user.deleted = true AND NOT user.disabled = true
-      AND NOT post.deleted = true AND NOT post.disabled = true
+      AND NOT resource.deleted = true AND NOT resource.disabled = true
       AND NOT user.id in COALESCE($filter.author_not.id_in, [])
       AND NOT (:User { id: $thisUserId })-[:BLOCKED]->(user)
-      RETURN post
+      RETURN resource, labels(resource)[0] AS type
       LIMIT $limit
       `
       const session = context.driver.session()
@@ -41,12 +41,12 @@ export default {
       session.close()
       const userCypher = `
       CALL db.index.fulltext.queryNodes('user_fulltext_search', $query)
-      YIELD node as user, score
-      MATCH (user)
+      YIELD node as resource, score
+      MATCH (resource)
       WHERE score >= 0.2
-      AND NOT user.deleted = true AND NOT user.disabled = true
-      AND NOT (:User { id: $thisUserId })-[:BLOCKED]->(user)
-      RETURN user
+      AND NOT resource.deleted = true AND NOT resource.disabled = true
+      AND NOT (:User { id: $thisUserId })-[:BLOCKED]->(resource)
+      RETURN resource, labels(resource)[0] AS type
       LIMIT $limit
       `
       const userResults = await session.run(userCypher, {
@@ -57,10 +57,8 @@ export default {
       })
 
       session.close()
-      const result = []
-      postResults.records
-        .concat(userResults.records)
-        .forEach(record => result.push(record._fields[0].properties))
+      const result = postResults.records.concat(userResults.records).map(transformReturnType)
+
       return result
     },
   },

backend/src/schema/types/type/Search.gql

@@ -1,4 +1,9 @@
-union SearchResult = Post | User
+type SearchResult {
+  id: ID!
+  searchResults: ResourceResults
+}
+
+union ResourceResults = Post | User
 
 type Query {
   findResources(query: String!, limit: Int = 5): [SearchResult]!

webapp/components/SearchInput/SearchInput.vue

@@ -23,7 +23,7 @@
           :no-options-available="emptyText"
           :icon-right="isActive ? 'close' : null"
           :filter="item => item"
-          :options="results"
+          :options="searchResults"
           :auto-reset-search="!searchValue"
           :placeholder="$t('search.placeholder')"
           :loading="pending"
@@ -45,7 +45,7 @@
               </ds-flex-item>
             </ds-flex>
             <ds-flex v-if="option.__typename === 'User'">
-	      <ds-flex-item class="search-option" :class="{'extra-space': isFirstOfType(option)}">
+              <ds-flex-item class="search-option" :class="{ 'extra-space': isFirstOfType(option) }">
                 <ds-avatar class="avatar" name="option.name" image="option.avatar" />
                 <div>
                   <ds-text class="userinfo">
@@ -93,6 +93,8 @@
 
 <script>
 import { isEmpty } from 'lodash'
+import { findResourcesQuery } from '~/graphql/Search.js'
+
 export default {
   name: 'SearchInput',
   props: {
@@ -100,30 +102,22 @@ export default {
       type: String,
       default: 'nav-search',
     },
-    value: {
-      type: String,
-      default: '',
-    },
-    results: {
-      type: Array,
-      default: () => [],
-    },
     delay: {
       type: Number,
       default: 300,
     },
-    pending: {
-      type: Boolean,
-      default: false,
-    },
   },
   data() {
     return {
       searchProcess: null,
+      value: '',
+      pending: false,
       isOpen: false,
       lastSearchTerm: '',
       unprocessedSearchInput: '',
       searchValue: '',
+      quickValue: '',
+      searchResults: [],
     }
   },
   computed: {
@@ -136,21 +130,42 @@ export default {
     },
   },
   methods: {
-      async query(value) {
-	if (isEmpty(value) || value.length < 3) {
-          this.clear()
-          return
-        }
-      this.$emit('search', value)
+    async query(value) {
+      if (
+        isEmpty(value) ||
+        value.length < 3 ||
+        this.quickValue.toLowerCase() === value.toLowerCase()
+      ) {
+        this.clear()
+        return
+      }
+      this.quickValue = value
+      this.pending = true
+      try {
+        const {
+          data: { findResources },
+        } = await this.$apollo.query({
+          query: findResourcesQuery,
+          variables: {
+            query: value,
+          },
+        })
+        const searchResults = findResources.map(searchResult => searchResult.searchResults)
+        this.searchResults = searchResults
+      } catch (error) {
+        this.searchResults = []
+      } finally {
+        this.pending = false
+      }
     },
     handleInput(e) {
       clearTimeout(this.searchProcess)
-      const value = e.target ? e.target.value.trim() : ''
+      this.value = e.target ? e.target.value.trim() : ''
       this.isOpen = true
-      this.unprocessedSearchInput = value
+      this.unprocessedSearchInput = this.value
       this.searchProcess = setTimeout(() => {
-        this.lastSearchTerm = value
-        this.query(value)
+        this.lastSearchTerm = this.value
+        this.query(this.value)
       }, this.delay)
     },
     onSelect(item) {
@@ -193,8 +208,10 @@ export default {
       }
     },
     clear() {
-      this.$emit('clear')
-      clearTimeout(this.searchProcess)
+      this.pending = false
+      this.searchResults = []
+      this.quickValue = ''
+      this.clearTimeout(this.searchProcess)
       this.isOpen = false
       this.unprocessedSearchInput = ''
       this.lastSearchTerm = ''
@@ -202,8 +219,8 @@ export default {
     },
     isFirstOfType(option) {
       return (
-        this.results.findIndex(o => o === option) ===
-        this.results.findIndex(o => o.__typename === option.__typename)
+        this.searchResults.findIndex(o => o === option) ===
+        this.searchResults.findIndex(o => o.__typename === option.__typename)
       )
     },
   },
@@ -211,109 +228,109 @@ export default {
 </script>
 
 <style lang="scss">
- .search {
-     display: flex;
-     align-self: center;
-     width: 100%;
-     position: relative;
-     $padding-left: $space-x-small;
-     .search-option-label {
-	 align-self: center;
-	 padding-left: $padding-left;
-     }
-     .search-option-meta {
-	 align-self: center;
-	 .ds-flex {
-	     flex-direction: column;
-	 }
-     }
-     &,
-     .ds-select-dropdown {
-	 transition: box-shadow 100ms;
-	 max-height: 70vh;
-     }
-     &.is-open {
-	 .ds-select-dropdown {
-	     box-shadow: $box-shadow-x-large;
-	 }
-     }
-     .ds-select-dropdown-message {
-	 opacity: 0.5;
-	 padding-left: $padding-left;
-     }
-     .search-clear-btn {
-	 right: 0;
-	 z-index: 10;
-	 position: absolute;
-	 height: 100%;
-	 width: 36px;
-	 cursor: pointer;
-     }
-     .search-meta {
-	 float: right;
-	 padding-top: 2px;
-	 white-space: nowrap;
-	 word-wrap: none;
-	 .base-icon {
-	     vertical-align: sub;
-	 }
-     }
-     .ds-select {
-	 z-index: $z-index-dropdown + 1;
-     }
-     .ds-select-option-hover {
-	 .ds-text-size-small,
-	 .ds-text-size-small-x {
-	     color: $text-color-soft;
-	 }
-     }
-     .field {
-	 width: 100%;
-	 display: flex;
-	 align-items: center;
-     }
-     .control {
-	 width: 100%;
-     }
-     .search-option-heading {
-	 font-weight: bold;
-	 cursor: default;
-	 background-color: white;
-	 margin: -8px;
-	 padding: 8px;
-     }
-     .avatar {
-	 display: inline-block;
-	 float: left;
-	 margin-right: 4px;
-	 height: 100%;
-	 vertical-align: middle;
-     }
-     .userinfo {
-	 display: flex;
-	 align-items: center;
-	 > .ds-text {
-	     display: flex;
-	     align-items: center;
-	     margin-left: $space-xx-small;
-	 }
-     }
-     .user {
-	 white-space: nowrap;
-	 position: relative;
-	 display: flex;
-	 align-items: center;
-	 &:hover,
-	 &.active {
-	     z-index: 999;
-	 }
-     }
-     .username {
-	 color: #17b53f;
-     }
-     .extra-space {
-	 margin-top: 8px;
-	 padding-top: 4px;
-     }
- }
+.search {
+  display: flex;
+  align-self: center;
+  width: 100%;
+  position: relative;
+  $padding-left: $space-x-small;
+  .search-option-label {
+    align-self: center;
+    padding-left: $padding-left;
+  }
+  .search-option-meta {
+    align-self: center;
+    .ds-flex {
+      flex-direction: column;
+    }
+  }
+  &,
+  .ds-select-dropdown {
+    transition: box-shadow 100ms;
+    max-height: 70vh;
+  }
+  &.is-open {
+    .ds-select-dropdown {
+      box-shadow: $box-shadow-x-large;
+    }
+  }
+  .ds-select-dropdown-message {
+    opacity: 0.5;
+    padding-left: $padding-left;
+  }
+  .search-clear-btn {
+    right: 0;
+    z-index: 10;
+    position: absolute;
+    height: 100%;
+    width: 36px;
+    cursor: pointer;
+  }
+  .search-meta {
+    float: right;
+    padding-top: 2px;
+    white-space: nowrap;
+    word-wrap: none;
+    .base-icon {
+      vertical-align: sub;
+    }
+  }
+  .ds-select {
+    z-index: $z-index-dropdown + 1;
+  }
+  .ds-select-option-hover {
+    .ds-text-size-small,
+    .ds-text-size-small-x {
+      color: $text-color-soft;
+    }
+  }
+  .field {
+    width: 100%;
+    display: flex;
+    align-items: center;
+  }
+  .control {
+    width: 100%;
+  }
+  .search-option-heading {
+    font-weight: bold;
+    cursor: default;
+    background-color: white;
+    margin: -8px;
+    padding: 8px;
+  }
+  .avatar {
+    display: inline-block;
+    float: left;
+    margin-right: 4px;
+    height: 100%;
+    vertical-align: middle;
+  }
+  .userinfo {
+    display: flex;
+    align-items: center;
+    > .ds-text {
+      display: flex;
+      align-items: center;
+      margin-left: $space-xx-small;
+    }
+  }
+  .user {
+    white-space: nowrap;
+    position: relative;
+    display: flex;
+    align-items: center;
+    &:hover,
+    &.active {
+      z-index: 999;
+    }
+  }
+  .username {
+    color: #17b53f;
+  }
+  .extra-space {
+    margin-top: 8px;
+    padding-top: 4px;
+  }
+}
 </style>

webapp/graphql/Search.js

@@ -0,0 +1,29 @@
+import gql from 'graphql-tag'
+
+export const findResourcesQuery = gql`
+  query($query: String!) {
+    findResources(query: $query, limit: 5) {
+      id
+      searchResults {
+        __typename
+        ... on Post {
+          id
+          title
+          slug
+          commentsCount
+          shoutedCount
+          createdAt
+          author {
+            name
+          }
+        }
+        ... on User {
+          id
+          name
+          slug
+          avatar
+        }
+      }
+    }
+  }
+`

webapp/layouts/default.vue

@@ -21,15 +21,7 @@
               :class="{ 'hide-mobile-menu': !toggleMobileMenu }"
             >
               <div id="nav-search-box" v-if="isLoggedIn">
-                <search-input
-                  id="nav-search"
-                  :delay="300"
-                  :pending="quickSearchPending"
-                  :results="quickSearchResults"
-                  @clear="quickSearchClear"
-                  @search="value => quickSearch({ value })"
-                  @select="goToResource"
-                />
+                <search-input id="nav-search" :delay="300" @select="goToResource" />
               </div>
             </ds-flex-item>
             <ds-flex-item
@@ -122,8 +114,6 @@ export default {
   computed: {
     ...mapGetters({
       isLoggedIn: 'auth/isLoggedIn',
-      quickSearchResults: 'search/quickResults',
-      quickSearchPending: 'search/quickPending',
     }),
     showFilterPostsDropdown() {
       const [firstRoute] = this.$route.matched

webapp/store/search.js

@@ -1,92 +0,0 @@
-import gql from 'graphql-tag'
-import isString from 'lodash/isString'
-
-export const state = () => {
-  return {
-    quickResults: [],
-    quickPending: false,
-    quickValue: '',
-  }
-}
-
-export const mutations = {
-  SET_QUICK_RESULTS(state, results) {
-    state.quickResults = results || []
-    state.quickPending = false
-  },
-  SET_QUICK_PENDING(state, pending) {
-    state.quickPending = pending
-  },
-  SET_QUICK_VALUE(state, value) {
-    state.quickValue = value
-  },
-}
-
-export const getters = {
-  quickResults(state) {
-    return state.quickResults
-  },
-  quickPending(state) {
-    return state.quickPending
-  },
-  quickValue(state) {
-    return state.quickValue
-  },
-}
-
-export const actions = {
-  async quickSearch({ commit, getters }, { value }) {
-    value = isString(value) ? value.trim() : ''
-    const lastVal = getters.quickValue
-    if (value.length < 3 || lastVal.toLowerCase() === value.toLowerCase()) {
-      return
-    }
-    commit('SET_QUICK_VALUE', value)
-    commit('SET_QUICK_PENDING', true)
-    await this.app.apolloProvider.defaultClient
-      .query({
-        query: gql`
-          query findResources($query: String!) {
-            findResources(query: $query, limit: 5) {
-              __typename
-              ... on Post {
-                id
-                title
-                slug
-                commentsCount
-                shoutedCount
-                createdAt
-                author {
-                  name
-                }
-              }
-              ... on User {
-                id
-                name
-                slug
-                avatar
-              }
-            }
-          }
-        `,
-        variables: {
-          query: value,
-        },
-      })
-      .then(res => {
-        commit('SET_QUICK_RESULTS', res.data.findResources || [])
-      })
-      .catch(() => {
-        commit('SET_QUICK_RESULTS', [])
-      })
-      .finally(() => {
-        commit('SET_QUICK_PENDING', false)
-      })
-    return getters.quickResults
-  },
-  async quickClear({ commit }) {
-    commit('SET_QUICK_PENDING', false)
-    commit('SET_QUICK_RESULTS', [])
-    commit('SET_QUICK_VALUE', '')
-  },
-}