From b100ab2a055eeeb1735ccb162b6304d9b1f593eb Mon Sep 17 00:00:00 2001 From: dawkaka Date: Tue, 20 Aug 2024 14:35:38 +0000 Subject: [PATCH] towards auto complete key paths --- static/public/assets/filtercomponent.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/static/public/assets/filtercomponent.js b/static/public/assets/filtercomponent.js index 6b39b3ba7..f0b0b682a 100644 --- a/static/public/assets/filtercomponent.js +++ b/static/public/assets/filtercomponent.js @@ -543,12 +543,12 @@ class Filter extends LitElement { needsAutoCompleteKeyPath(filter) { let rootEnd = filter.indexOf('.') - if (rootEnd == -1) return { result: false, field: null, prefix: null } - - const field = filter.substring(0, rootEnd) - const prefix = filter.substring(rootEnd + 1) - if (prefix.length < 2) return { result: false, field: null, prefix: null } - + let field = filter + let prefix = '' + if (rootEnd !== -1) { + field = filter.substring(0, rootEnd) + prefix = filter.substring(rootEnd + 1) + } if (['request_body', 'response_body', 'request_header', 'response_header', 'query_param', 'path_param'].includes(field)) { return { result: true, @@ -556,7 +556,7 @@ class Filter extends LitElement { prefix: prefix, } } - if (rootEnd == -1) return { result: false, field: null, prefix: null } + return { result: false, field: null, prefix: null } } handleChange(val) { @@ -572,6 +572,7 @@ class Filter extends LitElement { let target_info = filterAutoComplete[target] if (!target_info) { const key = this.needsAutoCompleteKeyPath(this.inputVal) + target_info = { operators: string_operators, values: [] } if (key.result) { fetch(`/p/${this.projectId}/query_builder/autocomplete?category=${key.field}&prefix=.${key.prefix}`) .then((res) => res.json()) @@ -588,8 +589,6 @@ class Filter extends LitElement { this.matches = data.map((d) => `${result.key} ${result.operator} "${d}"`) }) return - } else { - target_info = { operators: string_operators, values: [] } } } }