diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js index 7f1eeecee..1b9bd3870 100644 --- a/backend/src/schema/resolvers/searches.js +++ b/backend/src/schema/resolvers/searches.js @@ -46,15 +46,6 @@ export default { RETURN resource {.*, __typename: labels(resource)[0]} LIMIT $limit ` - /* - const tagCypher = ` -MATCH (resource:Tag) -WHERE resource.id CONTAINS $query -AND NOT(resource.deleted = true OR resource.disabled = true) -RETURN resource {.*, __typename: labels(resource)[0]} -LIMIT $limit -` -*/ const session = context.driver.session() const searchResultPromise = session.readTransaction(async transaction => { @@ -68,20 +59,14 @@ LIMIT $limit limit, thisUserId, }) - /* - const tagTransactionResponse = transaction.run(tagCypher, { - query: query, - limit, - }) */ - return Promise.all([postTransactionResponse, userTransactionResponse]) //, tagTransactionResponse + return Promise.all([postTransactionResponse, userTransactionResponse]) }) try { - const [postResults, userResults] = await searchResultPromise //, tagResults + const [postResults, userResults] = await searchResultPromise log(postResults) log(userResults) - // log(tagResults) - return [...postResults.records, ...userResults.records].map(r => r.get('resource')) //, ...tagResults.records + return [...postResults.records, ...userResults.records].map(r => r.get('resource')) } finally { session.close() } diff --git a/backend/src/schema/types/type/Search.gql b/backend/src/schema/types/type/Search.gql index 1ce38001d..2c22fa61f 100644 --- a/backend/src/schema/types/type/Search.gql +++ b/backend/src/schema/types/type/Search.gql @@ -1,4 +1,4 @@ -union SearchResult = Post | User | Tag +union SearchResult = Post | User type Query { findResources(query: String!, limit: Int = 5): [SearchResult]! diff --git a/webapp/components/generic/SearchTag/SearchTag.vue b/webapp/components/generic/SearchTag/SearchTag.vue deleted file mode 100644 index 74a7a5345..000000000 --- a/webapp/components/generic/SearchTag/SearchTag.vue +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue index 78226e443..1d80246cc 100644 --- a/webapp/components/generic/SearchableInput/SearchableInput.vue +++ b/webapp/components/generic/SearchableInput/SearchableInput.vue @@ -49,12 +49,6 @@ > - - - @@ -65,14 +59,12 @@ import { isEmpty } from 'lodash' import SearchHeading from '~/components/generic/SearchHeading/SearchHeading.vue' import SearchPost from '~/components/generic/SearchPost/SearchPost.vue' -import SearchTag from '~/components/generic/SearchTag/SearchTag.vue' import HcUser from '~/components/User/User.vue' export default { components: { SearchHeading, SearchPost, - SearchTag, HcUser, }, props: { diff --git a/webapp/graphql/Search.js b/webapp/graphql/Search.js index ab34b58b6..9b142b429 100644 --- a/webapp/graphql/Search.js +++ b/webapp/graphql/Search.js @@ -19,9 +19,6 @@ export const findResourcesQuery = gql` ... on User { ...user } - ... on Tag { - id - } } } `