External/signoz
1
0
Fork 0
mirror of https://github.com/SigNoz/signoz.git synced 2025-12-18 16:07:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: handle autocomplete

Browse Source
This commit is contained in:
Yunus M 2025-05-14 13:11:06 +05:30 committed by SagarRajput-7
parent de3497d439
commit ab594cd9ba
1 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
frontend/src/components/QueryBuilderV2/QueryAggregation/QueryAggregationSelect.tsx
View File

@ -181,7 +181,6 @@ function QueryAggregationSelect(): JSX.Element {
if (validFunctions.includes(func)) { if (validFunctions.includes(func)) {
const start = from + match.index; const start = from + match.index;
const end = start + match[0].length; const end = start + match[0].length;
builder.add(start, end, chipDecoration); builder.add(start, end, chipDecoration);
} }
} }
@ -208,8 +207,11 @@ function QueryAggregationSelect(): JSX.Element {
from: number, from: number,
to: number, to: number,
): void => { ): void => {
const insertText = `${op.value}()`; const isCount = op.value === TracesAggregatorOperator.COUNT;
const cursorPos = from + op.value.length + 1; // after '(' const insertText = isCount ? `${op.value}() ` : `${op.value}(`;
const cursorPos = isCount
? from + op.value.length + 3 // after 'count() '
: from + op.value.length + 1; // after 'operator('
view.dispatch({ view.dispatch({
changes: { from, to, insert: insertText }, changes: { from, to, insert: insertText },
selection: { anchor: cursorPos }, selection: { anchor: cursorPos },
@ -218,7 +220,7 @@ function QueryAggregationSelect(): JSX.Element {
}), }),
); );
// Memoize field suggestions from API // Memoize field suggestions from API (no filtering here)
const fieldSuggestions = useMemo( const fieldSuggestions = useMemo(
() => () =>
aggregateAttributeData?.payload?.attributeKeys?.map( aggregateAttributeData?.payload?.attributeKeys?.map(
@ -232,24 +234,9 @@ function QueryAggregationSelect(): JSX.Element {
from: number, from: number,
to: number, to: number,
): void => { ): void => {
const currentText = view.state.sliceDoc(0, from);
const lastOpenParen = currentText.lastIndexOf('(');
const endPos = from;
// Find the last comma before the cursor, but after the last open paren
const lastComma = currentText.lastIndexOf(',', endPos - 1);
const startPos =
lastComma > lastOpenParen ? lastComma + 1 : lastOpenParen + 1;
const before = view.state.sliceDoc(startPos, endPos).trim();
let insertText = '';
if (before.length > 0) {
// If there's already an argument, insert ", arg"
insertText = `, ${completion.label}`;
} else {
insertText = completion.label;
}
view.dispatch({ view.dispatch({
changes: { from: endPos, to, insert: insertText }, changes: { from, to, insert: completion.label },
selection: { anchor: endPos + insertText.length }, selection: { anchor: from + completion.label.length },
}); });
}, },
}), }),
@ -289,9 +276,40 @@ function QueryAggregationSelect(): JSX.Element {
], ],
}; };
} }
// Calculate the start of the current argument
const doc = context.state.sliceDoc(0, cursorPos);
const lastOpenParen = doc.lastIndexOf('(');
const lastComma = doc.lastIndexOf(',', cursorPos - 1);
const startOfArg =
lastComma > lastOpenParen ? lastComma + 1 : lastOpenParen + 1;
const inputText = doc.slice(startOfArg, cursorPos).trim();
// Parse arguments already present in the function call (before the cursor)
const usedArgs = new Set<string>();
if (lastOpenParen !== -1) {
const argsString = doc.slice(lastOpenParen + 1, cursorPos);
argsString.split(',').forEach((arg) => {
const trimmed = arg.trim();
if (trimmed) usedArgs.add(trimmed);
});
}
// Now filter out suggestions that are already used
const availableSuggestions = fieldSuggestions.filter(
(suggestion) => !usedArgs.has(suggestion.label),
);
const filteredSuggestions =
inputText === ''
? availableSuggestions
: availableSuggestions.filter((suggestion) =>
suggestion.label.toLowerCase().includes(inputText.toLowerCase()),
);
return { return {
from: cursorPos, from: startOfArg,
options: fieldSuggestions, options: filteredSuggestions,
}; };
} }