Skip to content

Commit

Permalink
Lint and test fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ddelemeny committed Feb 5, 2024
1 parent 6781c2b commit 4be1c29
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ export function LogContextQueryBuilderSidebar(props: LogContextProps & QueryBuil
}

const renderFieldSection = (field: Field)=>{
console.log('FIELD', field)
return (
<CollapsableSection
label={LogContextFieldSection(field)}
Expand Down
31 changes: 17 additions & 14 deletions src/components/LuceneQueryEditor.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useMemo, useRef} from "react";
import React, { useRef, useCallback } from "react";
import { css } from "@emotion/css";

import { LuceneQueryBuilder } from '@/QueryBuilder/lucene';
Expand All @@ -11,8 +11,8 @@ import {autocompletion, CompletionContext} from "@codemirror/autocomplete"
export type LuceneQueryEditorProps = {
placeholder?: string,
builder: LuceneQueryBuilder,
autocompleter: (word: string)=>any,
onChange: (query: string)=>void
autocompleter: (word: string) => any,
onChange: (query: string) => void
}

export function LuceneQueryEditor(props: LuceneQueryEditorProps){
Expand All @@ -33,17 +33,20 @@ export function LuceneQueryEditor(props: LuceneQueryEditorProps){
return diagnostics
})

const autocomplete = useMemo(()=>autocompletion({
override: [async (context: CompletionContext)=>{
let word = context.matchBefore(/\S*/);
if (!word){ return null }
const suggestions = await props.autocompleter(word?.text);
return {
from: word.from + suggestions.from,
options: suggestions.options
}
}]
}),[props.autocompleter])

const {autocompleter} = props;
const datasourceCompletions = useCallback(async (context: CompletionContext)=>{
let word = context.matchBefore(/\S*/);
if (!word){ return null }
const suggestions = await autocompleter(word?.text);
return {
from: word.from + suggestions.from,
options: suggestions.options
}
},[autocompleter])


const autocomplete = autocompletion({ override: [datasourceCompletions] })

return (<CodeMirror
ref={editorRef}
Expand Down
6 changes: 3 additions & 3 deletions src/components/QueryEditor/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,18 @@ interface Props {
export const ElasticSearchQueryField = ({ value, onChange }: { value?: string; onChange: (v: string) => void }) => {
const styles = useStyles2(getStyles);
const builder = useQueryBuilder();
const {query, setQuery} = builder;
const {setQuery} = builder;
const datasource = useDatasource()
const [fields, autocompleter] = useDatasourceFields(datasource);

useEffect(()=>{
setQuery(value || '')
}, [setQuery, value])

const onEditorChange = useCallback((query:string)=>{
const onEditorChange = useCallback((query: string)=>{
setQuery(query);
onChange(query)
},[query, setQuery])
},[setQuery, onChange])

return (
<div className={styles.queryItem}>
Expand Down
4 changes: 3 additions & 1 deletion src/datasource.utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ export function useDatasourceFields(datasource: QuickwitDataSource): [any[], (wo
const [fields, setFields] = useState<any[]>([]);

useEffect(() => {
datasource.getTagKeys({ searchable: true }).then(setFields);
if (datasource.getTagKeys) {
datasource.getTagKeys({ searchable: true }).then(setFields);
}
}, [datasource, setFields]);

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

0 comments on commit 4be1c29

Please sign in to comment.