Skip to content

Commit 4be1c29

Browse files
committed
Lint and test fixes
1 parent 6781c2b commit 4be1c29

File tree

4 files changed

+23
-19
lines changed

4 files changed

+23
-19
lines changed

src/LogContext/components/LogContextQueryBuilderSidebar.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ export function LogContextQueryBuilderSidebar(props: LogContextProps & QueryBuil
159159
}
160160

161161
const renderFieldSection = (field: Field)=>{
162-
console.log('FIELD', field)
163162
return (
164163
<CollapsableSection
165164
label={LogContextFieldSection(field)}

src/components/LuceneQueryEditor.tsx

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useMemo, useRef} from "react";
1+
import React, { useRef, useCallback } from "react";
22
import { css } from "@emotion/css";
33

44
import { LuceneQueryBuilder } from '@/QueryBuilder/lucene';
@@ -11,8 +11,8 @@ import {autocompletion, CompletionContext} from "@codemirror/autocomplete"
1111
export type LuceneQueryEditorProps = {
1212
placeholder?: string,
1313
builder: LuceneQueryBuilder,
14-
autocompleter: (word: string)=>any,
15-
onChange: (query: string)=>void
14+
autocompleter: (word: string) => any,
15+
onChange: (query: string) => void
1616
}
1717

1818
export function LuceneQueryEditor(props: LuceneQueryEditorProps){
@@ -33,17 +33,20 @@ export function LuceneQueryEditor(props: LuceneQueryEditorProps){
3333
return diagnostics
3434
})
3535

36-
const autocomplete = useMemo(()=>autocompletion({
37-
override: [async (context: CompletionContext)=>{
38-
let word = context.matchBefore(/\S*/);
39-
if (!word){ return null }
40-
const suggestions = await props.autocompleter(word?.text);
41-
return {
42-
from: word.from + suggestions.from,
43-
options: suggestions.options
44-
}
45-
}]
46-
}),[props.autocompleter])
36+
37+
const {autocompleter} = props;
38+
const datasourceCompletions = useCallback(async (context: CompletionContext)=>{
39+
let word = context.matchBefore(/\S*/);
40+
if (!word){ return null }
41+
const suggestions = await autocompleter(word?.text);
42+
return {
43+
from: word.from + suggestions.from,
44+
options: suggestions.options
45+
}
46+
},[autocompleter])
47+
48+
49+
const autocomplete = autocompletion({ override: [datasourceCompletions] })
4750

4851
return (<CodeMirror
4952
ref={editorRef}

src/components/QueryEditor/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,18 @@ interface Props {
6060
export const ElasticSearchQueryField = ({ value, onChange }: { value?: string; onChange: (v: string) => void }) => {
6161
const styles = useStyles2(getStyles);
6262
const builder = useQueryBuilder();
63-
const {query, setQuery} = builder;
63+
const {setQuery} = builder;
6464
const datasource = useDatasource()
6565
const [fields, autocompleter] = useDatasourceFields(datasource);
6666

6767
useEffect(()=>{
6868
setQuery(value || '')
6969
}, [setQuery, value])
7070

71-
const onEditorChange = useCallback((query:string)=>{
71+
const onEditorChange = useCallback((query: string)=>{
7272
setQuery(query);
7373
onChange(query)
74-
},[query, setQuery])
74+
},[setQuery, onChange])
7575

7676
return (
7777
<div className={styles.queryItem}>

src/datasource.utils.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ export function useDatasourceFields(datasource: QuickwitDataSource): [any[], (wo
1111
const [fields, setFields] = useState<any[]>([]);
1212

1313
useEffect(() => {
14-
datasource.getTagKeys({ searchable: true }).then(setFields);
14+
if (datasource.getTagKeys) {
15+
datasource.getTagKeys({ searchable: true }).then(setFields);
16+
}
1517
}, [datasource, setFields]);
1618

1719
const getSuggestions = useCallback(async (word: string) => {

0 commit comments

Comments
 (0)