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

feat: enhance query processing to support negation context and improve space handling

Browse Source
This commit is contained in:
ahrefabhi 2025-06-27 11:49:31 +05:30
parent 299fafbbed
commit c32d86ab25
1 changed files with 57 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx
View File

@ -27,7 +27,11 @@ import {
import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
import { QueryKeyDataSuggestionsProps } from 'types/api/querySuggestions/types';
import { DataSource } from 'types/common/queryBuilder';
import { queryOperatorSuggestions, validateQuery } from 'utils/antlrQueryUtils';
import {
negationQueryOperatorSuggestions,
queryOperatorSuggestions,
validateQuery,
} from 'utils/antlrQueryUtils';
import { getQueryContextAtCursor } from 'utils/queryContextUtils';
import { queryExamples } from './constants';
@ -213,8 +217,7 @@ function QuerySearch({
// just wrap in quotes but not brackets (we're already in brackets)
if (
(type === 'value' || type === 'keyword') &&
!/^[a-zA-Z0-9_][a-zA-Z0-9_.\[\]]*$/.test(value) &&
!queryContext?.isValueWrappedInQuotes
!/^[a-zA-Z0-9_][a-zA-Z0-9_.\[\]]*$/.test(value)
) {
return wrapStringValueInQuotes(value);
}
@ -495,10 +498,19 @@ function QuerySearch({
completion: any,
from: number,
to: number,
shouldAddSpace: boolean = true,
): void => {
view.dispatch({
changes: { from, to, insert: `${completion.apply} ` },
selection: { anchor: from + completion.apply.length + 1 },
changes: {
from,
to,
insert: shouldAddSpace ? `${completion.apply} ` : `${completion.apply}`,
},
selection: {
anchor:
from +
(shouldAddSpace ? completion.apply.length + 1 : completion.apply.length),
},
});
};
@ -514,7 +526,26 @@ function QuerySearch({
from: number,
to: number,
): void => {
addSpaceAfterSelection(view, { apply: originalApply }, from, to);
if (queryContext.isInValue && option.type === 'value') {
if (
queryContext.currentPair?.position &&
queryContext.currentPair.position.valueStart &&
queryContext.currentPair.position.valueEnd
) {
const { valueStart, valueEnd } = queryContext.currentPair.position;
addSpaceAfterSelection(
view,
{ apply: originalApply },
valueStart,
valueEnd + 1,
false,
);
} else {
addSpaceAfterSelection(view, { apply: originalApply }, from, to);
}
} else {
addSpaceAfterSelection(view, { apply: originalApply }, from, to);
}
},
};
});
@ -620,6 +651,10 @@ function QuerySearch({
// Get key information from context or current pair
const keyName = queryContext.keyToken || queryContext.currentPair?.key;
if (queryContext.currentPair?.hasNegation) {
options = negationQueryOperatorSuggestions;
}
// If we have a key context, add that info to the operator suggestions
if (keyName) {
// Find the key details from suggestions
@ -760,7 +795,6 @@ function QuerySearch({
{ label: 'HAS', type: 'function' },
{ label: 'HASANY', type: 'function' },
{ label: 'HASALL', type: 'function' },
{ label: 'HASNONE', type: 'function' },
];
// Add space after selection for functions
@ -836,20 +870,26 @@ function QuerySearch({
}
}
// If no specific context is detected, provide general suggestions
options = [
...(keySuggestions || []),
{ label: 'AND', type: 'conjunction', boost: -10 },
{ label: 'OR', type: 'conjunction', boost: -10 },
{ label: '(', type: 'parenthesis', info: 'Open group', boost: -20 },
];
// // If no specific context is detected, provide general suggestions
// options = [
// ...(keySuggestions || []),
// { label: 'AND', type: 'conjunction', boost: -10 },
// { label: 'OR', type: 'conjunction', boost: -10 },
// { label: '(', type: 'parenthesis', info: 'Open group', boost: -20 },
// ];
// Add space after selection for general context
const optionsWithSpace = addSpaceToOptions(options);
// // Add space after selection for general context
// const optionsWithSpace = addSpaceToOptions(options);
// return {
// from: word?.from ?? 0,
// options: optionsWithSpace,
// };
//Don't show anything if no context detected
return {
from: word?.from ?? 0,
options: optionsWithSpace,
options: [],
};
}