diff --git a/backend/src/db/migrate/template.js b/backend/src/db/migrate/template.js index 9adb0786d..72bfc9b1b 100644 --- a/backend/src/db/migrate/template.js +++ b/backend/src/db/migrate/template.js @@ -40,6 +40,7 @@ export async function down(next) { await transaction.rollback() // eslint-disable-next-line no-console console.log('rolled back') + throw new Error(error) } finally { session.close() } diff --git a/backend/src/db/migrations/20200207080200-fulltext_index_for_tags.js b/backend/src/db/migrations/20200207080200-fulltext_index_for_tags.js index 0a92c90c3..5064a8b17 100644 --- a/backend/src/db/migrations/20200207080200-fulltext_index_for_tags.js +++ b/backend/src/db/migrations/20200207080200-fulltext_index_for_tags.js @@ -20,6 +20,7 @@ export async function up(next) { await transaction.rollback() // eslint-disable-next-line no-console console.log('rolled back') + throw new Error(error) } finally { session.close() } @@ -43,6 +44,7 @@ export async function down(next) { await transaction.rollback() // eslint-disable-next-line no-console console.log('rolled back') + throw new Error(error) } finally { session.close() } diff --git a/backend/src/schema/resolvers/searches.js b/backend/src/schema/resolvers/searches.js index d4a2bf02a..3471c783b 100644 --- a/backend/src/schema/resolvers/searches.js +++ b/backend/src/schema/resolvers/searches.js @@ -41,18 +41,18 @@ export default { RETURN resource {.*, __typename: labels(resource)[0]} LIMIT $limit ` - const myQuery = queryString(query) - const tagCypher = ` CALL db.index.fulltext.queryNodes('tag_fulltext_search', $query) YIELD node as resource, score MATCH (resource) - WHERE score >= 0.5 + WHERE score >= 0.0 AND NOT (resource.deleted = true OR resource.disabled = true) RETURN resource {.*, __typename: labels(resource)[0]} LIMIT $limit ` + const myQuery = queryString(query) + const session = context.driver.session() const searchResultPromise = session.readTransaction(async transaction => { const postTransactionResponse = transaction.run(postCypher, { diff --git a/webapp/components/generic/SearchTag/SearchTag.vue b/webapp/components/generic/SearchTag/SearchTag.vue deleted file mode 100644 index a94431eea..000000000 --- a/webapp/components/generic/SearchTag/SearchTag.vue +++ /dev/null @@ -1,23 +0,0 @@ - - - diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue index 654deaad4..b0050b429 100644 --- a/webapp/components/generic/SearchableInput/SearchableInput.vue +++ b/webapp/components/generic/SearchableInput/SearchableInput.vue @@ -85,16 +85,6 @@ export default { return !isEmpty(this.previousSearchTerm) }, }, - watch: { - $route(to, from) { - console.log('to', to) - console.log('from', from) - // console.log(this.finalFilters) - if (to.query.hashtag) { - this.hashtag = to.query.hashtag - } - }, - }, methods: { isFirstOfType(option) { return ( @@ -167,7 +157,6 @@ export default { params: { id: item.id, slug: item.slug }, }) } else { - console.log('HIT¡') this.$router.push('?hashtag=' + item.id) } }) diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue index 8aef52c1d..d73c993ec 100644 --- a/webapp/pages/index.vue +++ b/webapp/pages/index.vue @@ -64,158 +64,164 @@