Skip to content
Open
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
c2a6cdb
Implement Grafana Query Builder
archef2000 Jul 4, 2025
201f871
delete unused files
archef2000 Jul 4, 2025
66b3d5b
Make Editors compatible with lower versions
archef2000 Jul 10, 2025
ffac882
Add error handling for unsupported field types in LogsQlLanguageProvider
archef2000 Jul 10, 2025
b96a69c
fix tests
archef2000 Jul 12, 2025
52f4b3e
remove unneeded query rendering
archef2000 Jul 15, 2025
cbc49bb
combine QueryBuilder and QueryEditor
archef2000 Jul 15, 2025
c87894a
fix requested changes
archef2000 Jul 15, 2025
aef6be4
simplify FieldAsFieldEditor updateValue function
archef2000 Jul 15, 2025
111e28c
fix parseFieldMapList function
archef2000 Jul 15, 2025
f28b814
simplify onChange for all editors with a Select component
archef2000 Jul 15, 2025
cd5862d
compare with VictoriaLogsOperationId values
archef2000 Jul 15, 2025
50bc9e5
remove redundant returning of undefined
archef2000 Jul 15, 2025
cd4ca7c
convert value safely
archef2000 Jul 15, 2025
2aef4a9
simplify logic in FieldsEditorWithPrefix
archef2000 Jul 15, 2025
3476058
remove check for empty expr
archef2000 Jul 15, 2025
760a477
simplify to remove all falsy values
archef2000 Jul 15, 2025
b9bbcd6
flatten if block for clarity
archef2000 Jul 15, 2025
92f195f
simplity SortedFieldsEditor
archef2000 Jul 15, 2025
9fd29cf
split state into separate useState calls
archef2000 Jul 15, 2025
c8220f8
improve readability for getFieldName
archef2000 Jul 15, 2025
a1c20cb
use switch case to parse math expresion
archef2000 Jul 15, 2025
a291aec
allow creating values while loading
archef2000 Jul 15, 2025
b2d0fbe
correct wording in getValuesFromBrackets function
archef2000 Jul 15, 2025
838960f
make the logic of parsing the stream filter less complex
archef2000 Jul 15, 2025
8281796
add tests to make shure the parsing is correct
archef2000 Jul 15, 2025
238b3b2
turn onOpenMenu handler into function in ExactValueEditor editor
archef2000 Jul 16, 2025
a5527ae
remove else branch in FieldsEditorWithPrefix editor
archef2000 Jul 16, 2025
12ff850
move menu handlers from components to seperate functions
archef2000 Jul 16, 2025
b6ae599
fix comparison operations
archef2000 Jul 27, 2025
b45858c
improve SortedFieldsEditor
archef2000 Jul 27, 2025
8c2cd63
fix unselection of item in editors using MultiSelect
archef2000 Sep 5, 2025
e265f8e
fix variable generation and option queries
archef2000 Sep 5, 2025
51eb66f
reorder operations for better searching
archef2000 Sep 5, 2025
bd6b7aa
fixed various parsing errors
archef2000 Sep 7, 2025
23af02b
fix disapearing of disabled operations
archef2000 Sep 7, 2025
db33be0
fix disapearing of disabled operations in editors
archef2000 Sep 8, 2025
0e0e0c3
fix math editor and query renderer
archef2000 Sep 24, 2025
bbd152c
add time_add pipe
archef2000 Sep 24, 2025
7d8a171
add missing options
archef2000 Sep 24, 2025
8f1c222
add generate_sequence
archef2000 Sep 24, 2025
6efef10
add query_stats
archef2000 Sep 24, 2025
ed2fee6
add split
archef2000 Sep 24, 2025
7842bc8
add all missing operations
archef2000 Sep 26, 2025
3d9de16
Merge branch 'main' into main
archef2000 Sep 26, 2025
3270538
fix options generation for subqueries
archef2000 Sep 27, 2025
55d2517
fix logic error in subquery editor
archef2000 Sep 29, 2025
7f3d219
Merge branch 'VictoriaMetrics:main' into main
archef2000 Oct 1, 2025
cc26956
fix stream field parsing and field prediction
archef2000 Oct 1, 2025
55f7fbe
remove else
archef2000 Oct 1, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import React, { useState } from 'react';

import { QueryBuilderOperationParamEditorProps, toOption } from '@grafana/plugin-ui';
import { InlineField, Select } from '@grafana/ui';

import { getFieldValueOptions } from './utils/editorHelper';

export default function ExactValueEditor(props: QueryBuilderOperationParamEditorProps) {
const { onChange, index, value, operation } = props;
const [state, setState] = useState({
loading: false,
options: [] as any[],
});

return (
<InlineField>
<Select<string>
allowCustomValue={true}
allowCreateWhileLoading={true}
isLoading={state.loading}
onOpenMenu={async () => {
setState((prev) => ({ ...prev, loading: true }));
setState({
loading: false,
options: await getFieldValueOptions(props, operation.params[0] as string),
});
}}
options={state.options}
onChange={(value) => {
onChange(index, value.value as string);
}}
value={toOption(value as string)}
width="auto"
/>
</InlineField>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
import React, { useState } from 'react';

import { QueryBuilderOperationParamEditorProps, toOption } from '@grafana/plugin-ui';
import { InlineField, Stack, Select } from '@grafana/ui';

import { isValue, quoteString, getValue } from '../utils/stringHandler';
import { splitString } from '../utils/stringSplitter';

import { getFieldNameOptions } from './utils/editorHelper';

export default function FieldAsFieldEditor(props: QueryBuilderOperationParamEditorProps) {
const { value, onChange, index } = props;

const str = splitString(value as string);
let parsedFromField = "";
let parsedToField = "";
if (str.length === 3) {
if (isValue(str[0])) {
parsedFromField = getValue(str[0]);
}
if (str[1].type === "space" && str[1].value === "as") {
if (isValue(str[2])) {
parsedToField = getValue(str[2]);
}
}
}

const [fromField, setFromField] = useState<string>(parsedFromField);
const [toField, setToField] = useState<string>(parsedToField);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Too much nesting makes this logic harder to read. Consider extracting it into a separate function like:

function getParsedFields(value: string): { fromField: string; toField: string } {
  const str = splitString(value);
  let fromField = "";
  let toField = "";

  if (str.length !== 3) return { fromField, toField };

  const [first, second, third] = str;

  if (isValue(first)) {
    fromField = getValue(first);
  }

  if (second.type === "space" && second.value === "as" && isValue(third)) {
    toField = getValue(third);
  }

  return { fromField, toField };
}
const { fromField, toField } = getParsedFields(value as string);
const [fromField, setFromField] = useState(fromField);
const [toField, setToField] = useState(toField);

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the parseFieldMapList function ensures that there are always 3 parts now so a simple check would be enough

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So this would be totally save.

  if (str.length === 3) {
    parsedFromField = getValue(str[0]);
    parsedToField = getValue(str[2]);
  }


const updateValue = (fromField: string, toField: string) => {
let value = "";
if (fromField.trim() === "") {
value += "\"\"";
} else {
value += quoteString(fromField.trim());
}
value += " as ";
if (toField.trim() === "") {
value += "\"\"";
} else {
value += quoteString(toField.trim());
}
onChange(index, value);
};

const [state, setState] = useState({
loading: false,
options: [] as any[],
});

const handleOpenMenu = async () => {
setState((prev) => ({ ...prev, loading: true }));
const options = await getFieldNameOptions(props);
setState({
loading: false,
options,
});
};

return (
<Stack>
<InlineField>
<Select<string>
allowCustomValue={true}
allowCreateWhileLoading={true}
isLoading={state.loading}
onOpenMenu={handleOpenMenu}
options={state.options}
onChange={(value) => {
setFromField(value.value as string);
updateValue(value.value as string, toField);
}}
value={toOption(fromField as string)}
width="auto"
/>
</InlineField>
<div style={{ padding: '6px 0 8px 0px' }}>as</div>
<InlineField>
<Select<string>
allowCustomValue={true}
allowCreateWhileLoading={true}
isLoading={state.loading}
onOpenMenu={handleOpenMenu}
options={state.options}
onChange={(value) => {
setToField(value.value as string);
updateValue(fromField, value.value as string);
}}
value={toOption(toField as string)}
width="auto"
/>
</InlineField>
</Stack>
);
}
37 changes: 37 additions & 0 deletions src/components/QueryEditor/QueryBuilder/Editors/FieldEditor.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import React, { useState } from 'react';

import { QueryBuilderOperationParamEditorProps, toOption } from '@grafana/plugin-ui';
import { InlineField, Select } from '@grafana/ui';

import { getFieldNameOptions } from './utils/editorHelper';

export default function FieldEditor(props: QueryBuilderOperationParamEditorProps) {
const { value, onChange, index } = props;
const [state, setState] = useState({
loading: false,
options: [] as any[],
});

return (
<InlineField>
<Select<string>
allowCustomValue={true}
allowCreateWhileLoading={true}
isLoading={state.loading}
onOpenMenu={async () => {
setState((prev) => ({ ...prev, loading: true }));
setState({
loading: false,
options: await getFieldNameOptions(props),
});
}}
options={state.options}
onChange={(value) => {
onChange(index, value.value as string);
}}
value={toOption(value as string)}
width="auto"
/>
</InlineField>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import React, { useState } from "react";

import { QueryBuilderOperationParamEditorProps, toOption } from "@grafana/plugin-ui";
import { Select } from "@grafana/ui";

import { getValueTypeOptions } from "./utils/editorHelper";

export default function FieldValueTypeEditor(props: QueryBuilderOperationParamEditorProps) {
const { value, onChange, index } = props;
const [state, setState] = useState({
loading: false,
options: [] as any[],
});

return (
<Select<string>
allowCustomValue={true}
allowCreateWhileLoading={true}
isLoading={state.loading}
onOpenMenu={async () => {
setState((prev) => ({ ...prev, loading: true }));
setState({
loading: false,
options: await getValueTypeOptions(props),
});
}}
options={state.options}
onChange={(value) => {
onChange(index, value.value as string);
}}
value={toOption(value as string)}
width="auto"
/>
)
}
46 changes: 46 additions & 0 deletions src/components/QueryEditor/QueryBuilder/Editors/FieldsEditor.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import React, { useState } from 'react';

import { SelectableValue } from '@grafana/data';
import { QueryBuilderOperationParamEditorProps } from '@grafana/plugin-ui';
import { MultiSelect } from '@grafana/ui';

import { getValuesFromBrackets } from '../utils/operationParser';
import { quoteString } from '../utils/stringHandler';
import { splitString } from '../utils/stringSplitter';

import { getFieldNameOptions } from './utils/editorHelper';

export default function FieldsEditor(props: QueryBuilderOperationParamEditorProps) {
const { value, onChange, index } = props;

const setFields = (values: SelectableValue<string>[]) => {
const rawValues = values.map((v) => v.value?.trim()).filter((v) => v !== undefined && v !== null);
let value = rawValues.map((v)=> quoteString(v)).join(", ");
onChange(index, value);
}

const [state, setState] = useState<{
options?: SelectableValue[];
isLoading?: boolean;
}>({});

const handleOpenMenu = async () => {
setState({ isLoading: true });
const options = await getFieldNameOptions(props);
setState({ options, isLoading: undefined });
}

return (
<MultiSelect<string>
onChange={setFields}
options={state.options}
value={getValuesFromBrackets(splitString(value as string))}
isLoading={state.isLoading}
allowCustomValue
noOptionsMessage="No labels found"
loadingMessage="Loading labels"
width={20}
onOpenMenu={handleOpenMenu}
/>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
import React, { useState } from 'react';

import { SelectableValue } from '@grafana/data';
import { QueryBuilderOperationParamEditorProps } from '@grafana/plugin-ui';
import { MultiSelect } from '@grafana/ui';

import { quoteString, unquoteString } from '../utils/stringHandler';
import { splitByUnescapedChar, SplitString, splitString } from '../utils/stringSplitter';

import { getFieldNameOptions } from './utils/editorHelper';

interface FieldWithPrefix {
name: string;
isPrefix: boolean;
}

export default function FieldsEditorWithPrefix(props: QueryBuilderOperationParamEditorProps) {
const { value, onChange, index } = props;

const str = splitString(value as string);
const parsedValues = parseInputValues(str);
const [values, setValues] = useState<FieldWithPrefix[]>(parsedValues);

const setFields = (values: FieldWithPrefix[]) => {
setValues(values);
const newValue = values.map((field) => {
if (field.isPrefix !== undefined) {
return field.isPrefix ? `${quoteString(field.name)}*` : `${quoteString(field.name)}`;
} else {
return quoteString(field as unknown as string);
}
}).join(', ');
onChange(index, newValue);
}

const togglePrefix = (index: number) => {
const field = values[index];
field.isPrefix = !field.isPrefix;
setFields(values);
};

const [state, setState] = useState<{
options?: SelectableValue<FieldWithPrefix>[];
isLoading?: boolean;
}>({});

return (
<MultiSelect<FieldWithPrefix>
openMenuOnFocus
onOpenMenu={async () => {
setState({ isLoading: true });
let options = await getFieldNameOptions(props);
const selectedNames = values.map(v => v.name);
options = options.filter((opt: SelectableValue<string>) => opt.value && !selectedNames.includes(opt.value));
setState({ options, isLoading: undefined });
}}
isLoading={state.isLoading}
allowCustomValue
noOptionsMessage="No labels found"
loadingMessage="Loading labels"
options={state.options}
value={values}
onChange={(values) => setFields(values.map((v) => v.value || v as FieldWithPrefix))}
formatOptionLabel={(option, { context }) => {
if (context === 'value') {
const field = option as FieldWithPrefix;
const handleToggle = (e: React.SyntheticEvent) => {
e.stopPropagation();
const idx = values.findIndex((v) => (v).name === field.name);
if (idx !== -1) {
togglePrefix(idx);
}
};
return (
<span
tabIndex={0}
style={{ cursor: 'pointer' }}
onMouseDown={handleToggle}
>
{formatFieldLabel(field)}
</span>
);
}
return <>{option.label}</>;
}}
/>
);
}

const formatFieldLabel = (field: FieldWithPrefix): string => {
return field.isPrefix ? `${field.name} *` : field.name;
};

const parseValue = (value: SplitString[]): FieldWithPrefix => {
if (value.length === 0 || value[0].type === "bracket") {
return { name: '', isPrefix: false };
}
if (value[0].type === "quote") {
let isPrefix = false;
if (value.length > 1) {
isPrefix = (value[1].type === "space" && value[1].value === "*");
}
return { name: unquoteString(value[0].value), isPrefix };
} else {
let fieldValue = value[0].value;
if (fieldValue.endsWith('*')) {
return { name: fieldValue.slice(0, -1), isPrefix: true };
}
return { name: fieldValue, isPrefix: false };
}
}

const parseInputValues = (str: SplitString[]): FieldWithPrefix[] => {
let fields: FieldWithPrefix[] = [];
for (const field of splitByUnescapedChar(str, ',')) {
if (field.length > 0 && field[0].type !== "bracket") {
fields.push(parseValue(field));
}
}
return fields;
};
Loading