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

feat: handle string and number values correctly

Browse Source
This commit is contained in:
Yunus M 2025-04-27 22:03:00 +05:30 committed by ahrefabhi
parent c6bb4077b9
commit bcb2824e07
1 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
frontend/src/components/QueryBuilderV2/CodeMirrorWhereClause/CodeMirrorWhereClause.tsx
View File

@ -122,8 +122,6 @@ function CodeMirrorWhereClause(): JSX.Element {
async (key: string): Promise<void> => {
if (!key || (key === activeKey && !isLoadingSuggestions)) return;
console.log('Fetching suggestions for key:', key);
// Set loading state and store the key we're fetching for
setIsLoadingSuggestions(true);
lastKeyRef.current = key;
@ -149,26 +147,42 @@ function CodeMirrorWhereClause(): JSX.Element {
const stringValues = values.stringValues || [];
const numberValues = values.numberValues || [];
// Generate options from string values
const stringOptions = stringValues.map((value: string) => ({
label: value || '""',
type: 'value',
}));
// Generate options from string values - explicitly handle empty strings
const stringOptions = stringValues
// Strict filtering for empty string - we'll handle it as a special case if needed
.filter(
(value: string | null | undefined): value is string =>
value !== null && value !== undefined && value !== '',
)
.map((value: string) => ({
label: value,
type: 'value',
}));
// Generate options from number values
const numberOptions = numberValues.map((value: number) => ({
label: value.toString(),
type: 'number',
}));
const numberOptions = numberValues
.filter(
(value: number | null | undefined): value is number =>
value !== null && value !== undefined,
)
.map((value: number) => ({
label: value.toString(),
type: 'number',
}));
// Update suggestions
const allOptions = [...stringOptions, ...numberOptions];
// Combine all options and make sure we don't have duplicate labels
let allOptions = [...stringOptions, ...numberOptions];
// Remove duplicates by label
allOptions = allOptions.filter(
(option, index, self) =>
index === self.findIndex((o) => o.label === option.label),
);
// Only if we're still on the same key
if (lastKeyRef.current === key) {
if (allOptions.length > 0) {
setValueSuggestions(allOptions);
console.log('Updated value suggestions:', allOptions);
} else {
setValueSuggestions([
{ label: 'No suggestions available', type: 'text' },
@ -319,13 +333,9 @@ function CodeMirrorWhereClause(): JSX.Element {
}
if (queryContext.isInValue) {
console.log('is In Value', queryContext.currentToken);
// Fetch values based on the key - use the keyToken if available
const key = queryContext.keyToken || queryContext.currentToken;
console.log('key', key);
// Trigger fetch only if key is different from activeKey or if we're still loading
if (key && (key !== activeKey || isLoadingSuggestions)) {
// Don't trigger a new fetch if we're already loading for this key