Compare commits

...

5 Commits

Author SHA1 Message Date
Ishan Uniyal
c7386064a1 feat: list panel check 2026-02-11 10:06:03 +05:30
Ishan Uniyal
55dcaf2209 feat: reverting to first commit 2026-02-11 09:36:08 +05:30
Ishan Uniyal
eb6d19bedd feat: updated null checks 2026-02-10 16:50:05 +05:30
Ishan Uniyal
a1f82c35b9 feat: moved logic to util 2026-02-10 16:43:25 +05:30
Ishan Uniyal
27079d536d feat: add to alert bug 2026-02-09 10:35:55 +05:30

View File

@@ -173,22 +173,45 @@ function ExplorerOptions({
const handleConditionalQueryModification = useCallback(
(defaultQuery: Query | null): string => {
const queryToUse = defaultQuery || query;
if (
queryToUse?.builder?.queryData?.[0]?.aggregateOperator !==
StringOperators.NOOP
) {
return JSON.stringify(queryToUse);
try {
const queryToUse = defaultQuery || query;
const modifiedQuery = cloneDeep(queryToUse);
// Return early only for non-LOGS queries with aggregation
if (
queryToUse?.builder?.queryData?.[0]?.aggregateOperator !==
StringOperators.NOOP &&
sourcepage !== DataSource.LOGS
) {
return JSON.stringify(queryToUse);
}
// Convert NOOP to COUNT for alerts and strip orderBy for logs
if (modifiedQuery && modifiedQuery.builder?.queryData) {
modifiedQuery.builder.queryData = modifiedQuery.builder.queryData.map(
(item) => {
const updatedItem = { ...item };
if (updatedItem.aggregateOperator === StringOperators.NOOP) {
updatedItem.aggregateOperator = StringOperators.COUNT;
}
// Alerts do not support order by on logs explorer queries
if (sourcepage === DataSource.LOGS && panelType === PANEL_TYPES.LIST) {
updatedItem.orderBy = [];
}
return updatedItem;
},
);
}
return JSON.stringify(modifiedQuery);
} catch (error) {
return JSON.stringify(defaultQuery || query);
}
// Modify aggregateOperator to count, as noop is not supported in alerts
const modifiedQuery = cloneDeep(queryToUse);
modifiedQuery.builder.queryData[0].aggregateOperator = StringOperators.COUNT;
return JSON.stringify(modifiedQuery);
},
[query],
[panelType, query, sourcepage],
);
const onCreateAlertsHandler = useCallback(
@@ -757,9 +780,9 @@ function ExplorerOptions({
);
}, [
disabled,
query,
isOneChartPerQuery,
onCreateAlertsHandler,
query,
splitedQueries,
]);