Skip to content

SigNoz is an open-source, OpenTelemetry-native observability platform for your team and their AI agents. Get logs, metrics, and traces in one tool with features like APM, distributed tracing, log management, infra monitoring, etc. Combined with SigNoz MCP and a native AI teammate (in SigNoz Cloud) it helps you build more resilient apps.

refactor(query-builder): make panel field config actually drive the builder (#12793)

Abhi kumar6360da7d7c87
diff --git a/frontend/src/components/InputWithLabel/InputWithLabel.tsx b/frontend/src/components/InputWithLabel/InputWithLabel.tsx
index 68c3666f1e..eab8ece340 100644
--- a/frontend/src/components/InputWithLabel/InputWithLabel.tsx
+++ b/frontend/src/components/InputWithLabel/InputWithLabel.tsx
@@ -17,6 +17,7 @@ function InputWithLabel({
onChange,
className,
closeIcon,
+ disabled,
}: {
label: string;
initialValue?: string | number | null;
@@ -27,6 +28,7 @@ function InputWithLabel({
onChange: (value: string) => void;
className?: string;
closeIcon?: React.ReactNode;
+ disabled?: boolean;
}): JSX.Element {
const [inputValue, setInputValue] = useState<string>(
initialValue ? initialValue.toString() : '',
@@ -53,6 +55,7 @@ function InputWithLabel({
type={type}
value={inputValue}
onChange={handleChange}
+ disabled={disabled}
name={label.toLowerCase()}
data-testid={`input-${label}`}
/>
diff --git a/frontend/src/components/QueryBuilderV2/QueryBuilderV2.tsx b/frontend/src/components/QueryBuilderV2/QueryBuilderV2.tsx
index 2734a85856..ec82313863 100644
--- a/frontend/src/components/QueryBuilderV2/QueryBuilderV2.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryBuilderV2.tsx
@@ -1,11 +1,18 @@
import { memo, useCallback, useEffect, useMemo, useRef } from 'react';
-import { OPERATORS, PANEL_TYPES } from 'constants/queryBuilder';
+import { TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
+import { PANEL_TYPES } from 'constants/queryBuilder';
import { Formula } from 'container/QueryBuilder/components/Formula';
import { QueryBuilderProps } from 'container/QueryBuilder/QueryBuilder.interfaces';
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
import { IBuilderTraceOperator } from 'types/api/queryBuilder/queryBuilderData';
import { DataSource } from 'types/common/queryBuilder';
+import { QueryBuilderField } from './queryBuilderFields.types';
+import {
+ mergeQueryBuilderFieldsConfig,
+ RAW_QUERY_FIELDS,
+ resolveQueryBuilderField,
+} from './queryBuilderFields.utils';
import { QueryBuilderV2Provider } from './QueryBuilderV2Context';
import { clearPreviousQuery } from './QueryV2/previousQuery.utils';
import QueryFooter from './QueryV2/QueryFooter/QueryFooter';
@@ -14,12 +21,18 @@ import TraceOperator from './QueryV2/TraceOperator/TraceOperator';
import './QueryBuilderV2.styles.scss';
+// Raw rows come from logs or spans; metrics only exist aggregated.
+const RAW_QUERY_SIGNALS = [
+ TelemetrytypesSignalDTO.logs,
+ TelemetrytypesSignalDTO.traces,
+];
+
export const QueryBuilderV2 = memo(function QueryBuilderV2({
config,
panelType: newPanelType,
- filterConfigs = {},
- queryComponents,
- isListViewPanel = false,
+ fieldsConfig,
+ allowedDataSources,
+ isRawQuery = false,
showOnlyWhereClause = false,
showTraceOperator = false,
version,
@@ -71,55 +84,48 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
};
}, []);
+ const resolvedConfig = useMemo(
+ () =>
+ mergeQueryBuilderFieldsConfig(
+ isRawQuery ? RAW_QUERY_FIELDS : undefined,
+ fieldsConfig,
+ ),
+ [isRawQuery, fieldsConfig],
+ );
+
+ const additionalQueries = useMemo(
+ () =>
+ resolveQueryBuilderField(
+ QueryBuilderField.AdditionalQueries,
+ resolvedConfig,
+ ),
+ [resolvedConfig],
+ );
+
+ const formula = useMemo(
+ () => resolveQueryBuilderField(QueryBuilderField.Formula, resolvedConfig),
+ [resolvedConfig],
+ );
+
const isMultiQueryAllowed = useMemo(
- () => !isListViewPanel || showTraceOperator,
- [showTraceOperator, isListViewPanel],
+ () => !additionalQueries.hidden && (!isRawQuery || showTraceOperator),
+ [additionalQueries.hidden, showTraceOperator, isRawQuery],
);
- const listViewLogFilterConfigs: QueryBuilderProps['filterConfigs'] =
- useMemo(() => {
- const config: QueryBuilderProps['filterConfigs'] = {
- stepInterval: { isHidden: true, isDisabled: true },
- having: { isHidden: true, isDisabled: true },
- filters: {
- customKey: 'body',
- customOp: OPERATORS.CONTAINS,
- },
- };
-
- return config;
- }, []);
-
- const listViewTracesFilterConfigs: QueryBuilderProps['filterConfigs'] =
- useMemo(() => {
- const config: QueryBuilderProps['filterConfigs'] = {
- stepInterval: { isHidden: true, isDisabled: true },
- having: { isHidden: true, isDisabled: true },
- limit: { isHidden: true, isDisabled: true },
- filters: {
- customKey: 'body',
- customOp: OPERATORS.CONTAINS,
- },
- };
-
- return config;
- }, []);
-
- const queryFilterConfigs = useMemo(() => {
- if (isListViewPanel) {
- return currentQuery.builder.queryData[0].dataSource === DataSource.TRACES
- ? listViewTracesFilterConfigs
- : listViewLogFilterConfigs;
- }
+ const queryDataSources = useMemo(
+ () => allowedDataSources ?? (isRawQuery ? RAW_QUERY_SIGNALS : undefined),
+ [allowedDataSources, isRawQuery],
+ );
- return filterConfigs;
- }, [
- isListViewPanel,
- filterConfigs,
- currentQuery.builder.queryData,
- listViewLogFilterConfigs,
- listViewTracesFilterConfigs,
- ]);
+ // What the editor renders. A single-query builder edits the first query alone, so
+ // the query list beside it must not advertise ones there is no way to reach.
+ const renderedQueries = useMemo(
+ () =>
+ isMultiQueryAllowed
+ ? currentQuery.builder.queryData
+ : currentQuery.builder.queryData.slice(0, 1),
+ [isMultiQueryAllowed, currentQuery.builder.queryData],
+ );
const traceOperator = useMemo((): IBuilderTraceOperator | undefined => {
if (
@@ -145,31 +151,46 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
[showTraceOperator, traceOperator, hasAtLeastOneTraceQuery],
);
- const shouldShowFooter = useMemo(
- () =>
- (!showOnlyWhereClause && !isListViewPanel) ||
- (currentDataSource === DataSource.TRACES && showTraceOperator),
- [isListViewPanel, showTraceOperator, showOnlyWhereClause, currentDataSource],
- );
-
const showQueryList = useMemo(
- () => (!showOnlyWhereClause && !isListViewPanel) || showTraceOperator,
- [isListViewPanel, showOnlyWhereClause, showTraceOperator],
+ () => (!showOnlyWhereClause && !isRawQuery) || showTraceOperator,
+ [isRawQuery, showOnlyWhereClause, showTraceOperator],
);
const showFormula = useMemo(() => {
+ if (formula.hidden) {
+ return false;
+ }
+
if (currentDataSource === DataSource.TRACES) {
- return !isListViewPanel;
+ return !isRawQuery;
}
return true;
- }, [isListViewPanel, currentDataSource]);
+ }, [formula.hidden, isRawQuery, currentDataSource]);
const showAddTraceOperator = useMemo(
() => showTraceOperator && !traceOperator && hasAtLeastOneTraceQuery,
[showTraceOperator, traceOperator, hasAtLeastOneTraceQuery],
);
+ // Nothing left to add means no footer at all, rather than an empty bar under the
+ // last query.
+ const shouldShowFooter = useMemo(
+ () =>
+ (!additionalQueries.hidden || showFormula || showAddTraceOperator) &&
+ ((!showOnlyWhereClause && !isRawQuery) ||
+ (currentDataSource === DataSource.TRACES && showTraceOperator)),
+ [
+ additionalQueries.hidden,
+ showFormula,
+ showAddTraceOperator,
+ isRawQuery,
+ showTraceOperator,
+ showOnlyWhereClause,
+ currentDataSource,
+ ],
+ );
+
const handleKeyDown = useCallback(
(e: React.KeyboardEvent<HTMLDivElement>): void => {
const target = e.target as HTMLElement | null;
@@ -199,8 +220,8 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
key={currentQuery.builder.queryData[0].queryName}
index={0}
query={currentQuery.builder.queryData[0]}
- filterConfigs={queryFilterConfigs}
- queryComponents={queryComponents}
+ fieldsConfig={fieldsConfig}
+ allowedDataSources={queryDataSources}
isMultiQueryAllowed={isMultiQueryAllowed}
showTraceOperator={showTraceOperator}
hasTraceOperator={hasTraceOperator}
@@ -208,7 +229,7 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
isAvailableToDisable={false}
queryVariant={config?.queryVariant || 'dropdown'}
showOnlyWhereClause={showOnlyWhereClause}
- isListViewPanel={isListViewPanel}
+ isRawQuery={isRawQuery}
signalSource={currentQuery.builder.queryData[0].source as 'meter' | ''}
onSignalSourceChange={onSignalSourceChange || ((): void => {})}
signalSourceChangeEnabled={signalSourceChangeEnabled}
@@ -216,14 +237,14 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
savePreviousQuery={savePreviousQuery}
/>
) : (
- currentQuery.builder.queryData.map((query, index) => (
+ renderedQueries.map((query, index) => (
<QueryV2
ref={containerRef}
key={query.queryName}
index={index}
query={query}
- filterConfigs={queryFilterConfigs}
- queryComponents={queryComponents}
+ fieldsConfig={fieldsConfig}
+ allowedDataSources={queryDataSources}
version={version}
isMultiQueryAllowed={isMultiQueryAllowed}
isAvailableToDisable={false}
@@ -231,7 +252,7 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
hasTraceOperator={hasTraceOperator}
queryVariant={config?.queryVariant || 'dropdown'}
showOnlyWhereClause={showOnlyWhereClause}
- isListViewPanel={isListViewPanel}
+ isRawQuery={isRawQuery}
signalSource={query.source as 'meter' | ''}
onSignalSourceChange={onSignalSourceChange || ((): void => {})}
signalSourceChangeEnabled={signalSourceChangeEnabled}
@@ -251,14 +272,7 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
return (
<div key={formula.queryName} className="qb-formula">
- <Formula
- filterConfigs={filterConfigs}
- query={query}
- formula={formula}
- index={index}
- isAdditionalFilterEnable={false}
- isQBV2
- />
+ <Formula query={query} formula={formula} index={index} isQBV2 />
</div>
);
})}
@@ -267,8 +281,13 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
{shouldShowFooter && (
<QueryFooter
+ showAddQuery={!additionalQueries.hidden}
showAddFormula={showFormula}
+ isAddFormulaDisabled={formula.disabled}
+ addFormulaDisabledReason={formula.reason}
addNewBuilderQuery={addNewBuilderQuery}
+ isAddQueryDisabled={additionalQueries.disabled}
+ addQueryDisabledReason={additionalQueries.reason}
addNewFormula={addNewFormula}
addTraceOperator={addTraceOperator}
showAddTraceOperator={showAddTraceOperator}
@@ -277,7 +296,8 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
{hasTraceOperator && (
<TraceOperator
- isListViewPanel={isListViewPanel}
+ isRawQuery={isRawQuery}
+ fieldsConfig={resolvedConfig}
traceOperator={traceOperator as IBuilderTraceOperator}
/>
)}
@@ -285,7 +305,7 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
{showQueryList && (
<div className="query-names-section">
- {currentQuery.builder.queryData.map((query) => (
+ {renderedQueries.map((query) => (
<div key={query.queryName} className="query-name">
{query.queryName}
</div>
diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.styles.scss b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.styles.scss
index 2d43051563..c66b8b8126 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.styles.scss
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.styles.scss
@@ -23,6 +23,11 @@
align-items: center;
justify-content: center;
gap: var(--margin-2);
+
+ &--disabled {
+ opacity: 0.45;
+ cursor: not-allowed;
+ }
}
}
diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.tsx
index ae871710db..db372ffa5a 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.tsx
@@ -1,5 +1,6 @@
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { Button, Tooltip } from 'antd';
+import cx from 'classnames';
import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
import InputWithLabel from 'components/InputWithLabel/InputWithLabel';
import { PANEL_TYPES } from 'constants/queryBuilder';
@@ -14,6 +15,16 @@ import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
import { MetricAggregation } from 'types/api/v5/queryRange';
import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
+import {
+ QueryBuilderField,
+ QueryBuilderFieldsConfig,
+} from '../../queryBuilderFields.types';
+import {
+ mergeQueryBuilderFieldsConfig,
+ RAW_QUERY_FIELDS,
+ resolveQueryBuilderFields,
+} from '../../queryBuilderFields.utils';
+
import HavingFilter from './HavingFilter/HavingFilter';
import { buildDefaultLegendFromGroupBy } from './utils';
@@ -22,34 +33,37 @@ import './QueryAddOns.styles.scss';
interface AddOn {
icon: React.ReactNode;
label: string;
- key: string;
+ key: QueryBuilderField;
description?: string;
docLink?: string;
}
-const ADD_ONS_KEYS = {
- GROUP_BY: 'group_by',
- HAVING: 'having',
- ORDER_BY: 'order_by',
- LIMIT: 'limit',
- LEGEND_FORMAT: 'legend_format',
- REDUCE_TO: 'reduce_to',
-};
-
-const ADD_ONS_KEYS_TO_QUERY_PATH = {
- [ADD_ONS_KEYS.GROUP_BY]: 'groupBy',
- [ADD_ONS_KEYS.HAVING]: 'having.expression',
- [ADD_ONS_KEYS.ORDER_BY]: 'orderBy',
- [ADD_ONS_KEYS.LIMIT]: 'limit',
- [ADD_ONS_KEYS.LEGEND_FORMAT]: 'legend',
- [ADD_ONS_KEYS.REDUCE_TO]: 'reduceTo',
+/** Fields the add-on bar does not own: each has its own control elsewhere in the query. */
+type NonAddOnField =
+ | QueryBuilderField.Aggregation
+ | QueryBuilderField.StepInterval
+ | QueryBuilderField.Functions
+ | QueryBuilderField.Formula
+ | QueryBuilderField.AdditionalQueries;
+
+// Omit rather than Partial, so a field added to the enum has to be placed on one side.
+const ADD_ONS_KEYS_TO_QUERY_PATH: Omit<
+ Record<QueryBuilderField, string>,
+ NonAddOnField
+> = {
+ [QueryBuilderField.GroupBy]: 'groupBy',
+ [QueryBuilderField.Having]: 'having.expression',
+ [QueryBuilderField.OrderBy]: 'orderBy',
+ [QueryBuilderField.Limit]: 'limit',
+ [QueryBuilderField.Legend]: 'legend',
+ [QueryBuilderField.ReduceTo]: 'reduceTo',
};
-const ADD_ONS = [
+const ADD_ONS: AddOn[] = [
{
icon: <BarChart size={14} />,
label: 'Group By',
- key: ADD_ONS_KEYS.GROUP_BY,
+ key: QueryBuilderField.GroupBy,
description:
'Break down data by attributes like service name, endpoint, status code, or region. Essential for spotting patterns and comparing performance across different segments.',
docLink: 'https://signoz.io/docs/querying/aggregation-grouping/#grouping',
@@ -57,7 +71,7 @@ const ADD_ONS = [
{
icon: <ScrollText size={14} />,
label: 'Having',
- key: ADD_ONS_KEYS.HAVING,
+ key: QueryBuilderField.Having,
description:
'Filter grouped results based on aggregate conditions. Show only groups meeting specific criteria, like error rates > 5% or p99 latency > 500',
docLink:
@@ -66,7 +80,7 @@ const ADD_ONS = [
{
icon: <ScrollText size={14} />,
label: 'Order By',
- key: ADD_ONS_KEYS.ORDER_BY,
+ key: QueryBuilderField.OrderBy,
description:
'Sort results to surface what matters most. Quickly identify slowest operations, most frequent errors, or highest resource consumers.',
docLink:
@@ -75,7 +89,7 @@ const ADD_ONS = [
{
icon: <ScrollText size={14} />,
label: 'Limit',
- key: ADD_ONS_KEYS.LIMIT,
+ key: QueryBuilderField.Limit,
description:
'Show only the top/bottom N results. Perfect for focusing on outliers, reducing noise, and improving dashboard performance.',
docLink:
@@ -84,7 +98,7 @@ const ADD_ONS = [
{
icon: <ScrollText size={14} />,
label: 'Legend format',
- key: ADD_ONS_KEYS.LEGEND_FORMAT,
+ key: QueryBuilderField.Legend,
description:
'Customize series labels using variables like {{service.name}}-{{endpoint}}. Makes charts readable at a glance during incident investigation.',
docLink:
@@ -92,10 +106,10 @@ const ADD_ONS = [
},
];
-const REDUCE_TO = {
+const REDUCE_TO: AddOn = {
icon: <ScrollText size={14} />,
label: 'Reduce to',
- key: ADD_ONS_KEYS.REDUCE_TO,
+ key: QueryBuilderField.ReduceTo,
description:
'Apply mathematical operations like sum, average, min, max, or percentiles to reduce multiple time series into a single value.',
docLink:
@@ -154,26 +168,26 @@ function TooltipContent({
function QueryAddOns({
query,
version,
- isListViewPanel,
+ isRawQuery,
showReduceTo,
panelType,
index,
+ fieldsConfig,
isForTraceOperator = false,
}: {
query: IBuilderQuery;
version: string;
- isListViewPanel: boolean;
+ isRawQuery: boolean;
showReduceTo: boolean;
panelType: PANEL_TYPES | null;
index: number;
+ fieldsConfig?: QueryBuilderFieldsConfig;
isForTraceOperator?: boolean;
}): JSX.Element {
- const [addOns, setAddOns] = useState<AddOn[]>(ADD_ONS);
-
const [selectedViews, setSelectedViews] = useState<AddOn[]>([]);
const initializedRef = useRef(false);
- const prevAvailableKeysRef = useRef<Set<string> | null>(null);
+ const prevAvailableKeysRef = useRef<Set<QueryBuilderField> | null>(null);
const { handleChangeQueryData } = useQueryOperations({
index,
@@ -184,40 +198,62 @@ function QueryAddOns({
const { handleSetQueryData } = useQueryBuilder();
- useEffect(() => {
- if (isListViewPanel) {
- setAddOns([]);
-
- setSelectedViews([
- ADD_ONS.find((addOn) => addOn.key === ADD_ONS_KEYS.ORDER_BY) as AddOn,
- ]);
-
- return;
- }
+ const supportedAddOns = useMemo((): AddOn[] => {
+ let addOns: AddOn[];
- let filteredAddOns: AddOn[];
if (panelType === PANEL_TYPES.VALUE) {
- // Filter out all add-ons except legend format
- filteredAddOns = ADD_ONS.filter(
- (addOn) => addOn.key === ADD_ONS_KEYS.LEGEND_FORMAT,
- );
+ addOns = ADD_ONS.filter((addOn) => addOn.key === QueryBuilderField.Legend);
+ } else if (query.dataSource === DataSource.METRICS) {
+ // Group by for metrics is offered by MetricsAggregateSection instead.
+ addOns = ADD_ONS.filter((addOn) => addOn.key !== QueryBuilderField.GroupBy);
} else {
- filteredAddOns = Object.values(ADD_ONS);
-
- if (query.dataSource === DataSource.METRICS) {
- // Filter out group_by for metrics data source (handled in MetricsAggregateSection)
- filteredAddOns = filteredAddOns.filter(
- (addOn) => addOn.key !== ADD_ONS_KEYS.GROUP_BY,
- );
- }
+ addOns = [...ADD_ONS];
}
- if (showReduceTo) {
- filteredAddOns = [...filteredAddOns, REDUCE_TO];
- }
- setAddOns(filteredAddOns);
+ return showReduceTo ? [...addOns, REDUCE_TO] : addOns;
+ }, [panelType, query.dataSource, showReduceTo]);
+
+ const resolvedFields = useMemo(
+ () =>
+ resolveQueryBuilderFields(
+ supportedAddOns.map((addOn) => addOn.key),
+ mergeQueryBuilderFieldsConfig(
+ isRawQuery ? RAW_QUERY_FIELDS : undefined,
+ fieldsConfig,
+ ),
+ ),
+ [supportedAddOns, fieldsConfig, isRawQuery],
+ );
+
+ const offeredAddOns = useMemo(
+ () =>
+ supportedAddOns.filter((addOn) => !resolvedFields.get(addOn.key)?.hidden),
+ [supportedAddOns, resolvedFields],
+ );
+
+ const pinnedAddOns = useMemo(
+ () => offeredAddOns.filter((addOn) => resolvedFields.get(addOn.key)?.pinned),
+ [offeredAddOns, resolvedFields],
+ );
+
+ const togglableAddOns = useMemo(
+ () => offeredAddOns.filter((addOn) => !resolvedFields.get(addOn.key)?.pinned),
+ [offeredAddOns, resolvedFields],
+ );
+
+ const isPinned = useCallback(
+ (key: QueryBuilderField): boolean => Boolean(resolvedFields.get(key)?.pinned),
+ [resolvedFields],
+ );
+
+ const isDisabled = useCallback(
+ (key: QueryBuilderField): boolean =>
+ Boolean(resolvedFields.get(key)?.disabled),
+ [resolvedFields],
+ );
- const availableAddOnKeys = new Set(filteredAddOns.map((a) => a.key));
+ useEffect(() => {
+ const availableAddOnKeys = new Set(offeredAddOns.map((a) => a.key));
const previousKeys = prevAvailableKeysRef.current;
const hasAvailabilityItemsChanged =
previousKeys !== null &&
@@ -231,27 +267,39 @@ function QueryAddOns({
const activeAddOnKeys = new Set(
Object.entries(ADD_ONS_KEYS_TO_QUERY_PATH)
.filter(([, path]) => hasValue(get(query, path)))
- .map(([key]) => key),
+ .map(([key]) => key as QueryBuilderField),
);
- // Initial seeding from query values on mount
+ // Initial seeding from query values on mount. A disabled field never opens.
setSelectedViews(
- filteredAddOns.filter(
- (addOn) =>
- activeAddOnKeys.has(addOn.key) && availableAddOnKeys.has(addOn.key),
- ),
+ offeredAddOns.filter((addOn) => {
+ const resolved = resolvedFields.get(addOn.key);
+
+ return (
+ resolved?.pinned ||
+ (activeAddOnKeys.has(addOn.key) && !resolved?.disabled)
+ );
+ }),
);
return;
}
- setSelectedViews((prev) =>
- prev.filter((view) =>
- filteredAddOns.some((addOn) => addOn.key === view.key),
- ),
- );
- }, [panelType, isListViewPanel, query, showReduceTo]);
+ setSelectedViews((prev) => {
+ const kept = prev.filter((view) => availableAddOnKeys.has(view.key));
+
+ const reopenedPinned = pinnedAddOns.filter(
+ (addOn) => !kept.some((view) => view.key === addOn.key),
+ );
+
+ return [...kept, ...reopenedPinned];
+ });
+ }, [offeredAddOns, pinnedAddOns, query]);
const handleOptionClick = (clickedAddOn: AddOn): void => {
+ if (isDisabled(clickedAddOn.key)) {
+ return;
+ }
+
const isAlreadySelected = selectedViews.some(
(view) => view.key === clickedAddOn.key,
);
@@ -265,7 +313,7 @@ function QueryAddOns({
// and existing group-by keys, prefill the legend using all group-by keys.
// This keeps existing custom legends intact and only helps seed a sensible default.
if (
- clickedAddOn.key === ADD_ONS_KEYS.LEGEND_FORMAT &&
+ clickedAddOn.key === QueryBuilderField.Legend &&
isEmpty(query?.legend) &&
Array.isArray(query.groupBy) &&
query.groupBy.length > 0
@@ -310,9 +358,16 @@ function QueryAddOns({
[handleSetQueryData, index, query],
);
- const handleRemoveView = useCallback((key: string): void => {
- setSelectedViews((prev) => prev.filter((view) => view.key !== key));
- }, []);
+ const handleRemoveView = useCallback(
+ (key: QueryBuilderField): void => {
+ if (isPinned(key)) {
+ return;
+ }
+
+ setSelectedViews((prev) => prev.filter((view) => view.key !== key));
+ },
+ [isPinned],
+ );
const handleChangeQueryLegend = useCallback(
(value: string) => {
@@ -341,7 +396,7 @@ function QueryAddOns({
<div className="query-add-ons" data-testid="query-add-ons">
{selectedViews.length > 0 && (
<div className="selected-add-ons-content">
- {selectedViews.find((view) => view.key === 'group_by') && (
+ {selectedViews.find((view) => view.key === QueryBuilderField.GroupBy) && (
<div className="add-on-content" data-testid="group-by-content">
<div className="periscope-input-with-label">
<Tooltip
@@ -369,15 +424,17 @@ function QueryAddOns({
onChange={handleChangeGroupByKeys}
/>
</div>
- <Button
- className="close-btn periscope-btn ghost"
- icon={<ChevronUp size={16} />}
- onClick={(): void => handleRemoveView('group_by')}
- />
+ {!isPinned(QueryBuilderField.GroupBy) && (
+ <Button
+ className="close-btn periscope-btn ghost"
+ icon={<ChevronUp size={16} />}
+ onClick={(): void => handleRemoveView(QueryBuilderField.GroupBy)}
+ />
+ )}
</div>
</div>
)}
- {selectedViews.find((view) => view.key === 'having') && (
+ {selectedViews.find((view) => view.key === QueryBuilderField.Having) && (
<div className="add-on-content" data-testid="having-content">
<div className="periscope-input-with-label">
<Tooltip
@@ -397,11 +454,7 @@ function QueryAddOns({
</Tooltip>
<div className="input">
<HavingFilter
- onClose={(): void => {
- setSelectedViews((prev) =>
- prev.filter((view) => view.key !== 'having'),
- );
- }}
+ onClose={(): void => handleRemoveView(QueryBuilderField.Having)}
onChange={handleChangeHaving}
queryData={query}
/>
@@ -409,7 +462,7 @@ function QueryAddOns({
</div>
</div>
)}
- {selectedViews.find((view) => view.key === 'limit') && (
+ {selectedViews.find((view) => view.key === QueryBuilderField.Limit) && (
<div className="add-on-content" data-testid="limit-content">
<InputWithLabel
label="Limit"
@@ -417,16 +470,12 @@ function QueryAddOns({
onChange={handleChangeLimit}
initialValue={query?.limit ?? undefined}
placeholder="Enter limit"
- onClose={(): void => {
- setSelectedViews((prev) =>
- prev.filter((view) => view.key !== 'limit'),
- );
- }}
+ onClose={(): void => handleRemoveView(QueryBuilderField.Limit)}
closeIcon={<ChevronUp size={16} />}
/>
</div>
)}
- {selectedViews.find((view) => view.key === 'order_by') && (
+ {selectedViews.find((view) => view.key === QueryBuilderField.OrderBy) && (
<div className="add-on-content" data-testid="order-by-content">
<div className="periscope-input-with-label">
<Tooltip
@@ -449,22 +498,22 @@ function QueryAddOns({
entityVersion={version}
query={query}
onChange={handleChangeOrderByKeys}
- isListViewPanel={isListViewPanel}
+ isRawQuery={isRawQuery}
isNewQueryV2
/>
</div>
- {!isListViewPanel && (
+ {!isPinned(QueryBuilderField.OrderBy) && (
<Button
className="close-btn periscope-btn ghost"
icon={<ChevronUp size={16} />}
- onClick={(): void => handleRemoveView('order_by')}
+ onClick={(): void => handleRemoveView(QueryBuilderField.OrderBy)}
/>
)}
</div>
</div>
)}
- {selectedViews.find((view) => view.key === 'reduce_to') &&
+ {selectedViews.find((view) => view.key === QueryBuilderField.ReduceTo) &&
showReduceTo && (
<div className="add-on-content" data-testid="reduce-to-content">
<div className="periscope-input-with-label">
@@ -487,27 +536,25 @@ function QueryAddOns({
<ReduceToFilter query={query} onChange={handleChangeReduceToV5} />
</div>
- <Button
- className="close-btn periscope-btn ghost"
- icon={<ChevronUp size={16} />}
- onClick={(): void => handleRemoveView('reduce_to')}
- />
+ {!isPinned(QueryBuilderField.ReduceTo) && (
+ <Button
+ className="close-btn periscope-btn ghost"
+ icon={<ChevronUp size={16} />}
+ onClick={(): void => handleRemoveView(QueryBuilderField.ReduceTo)}
+ />
+ )}
</div>
</div>
)}
- {selectedViews.find((view) => view.key === 'legend_format') && (
+ {selectedViews.find((view) => view.key === QueryBuilderField.Legend) && (
<div className="add-on-content" data-testid="legend-format-content">
<InputWithLabel
label="Legend format"
placeholder="Write legend format"
onChange={handleChangeQueryLegend}
initialValue={isEmpty(query?.legend) ? undefined : query?.legend}
- onClose={(): void => {
- setSelectedViews((prev) =>
- prev.filter((view) => view.key !== 'legend_format'),
- );
- }}
+ onClose={(): void => handleRemoveView(QueryBuilderField.Legend)}
closeIcon={<ChevronUp size={16} />}
/>
</div>
@@ -520,42 +567,49 @@ function QueryAddOns({
className="add-ons-tabs"
value={selectedViews.map((view) => view.key)}
onChange={(newKeys: string[]): void => {
- const oldKeys = selectedViews.map((view) => view.key);
+ const oldKeys: string[] = selectedViews.map((view) => view.key);
const toggledKey =
- newKeys.find((k) => !oldKeys.includes(k)) ??
- oldKeys.find((k) => !newKeys.includes(k));
+ newKeys.find((key) => !oldKeys.includes(key)) ??
+ oldKeys.find((key) => !newKeys.includes(key));
if (!toggledKey) {
return;
}
- const clickedAddOn = addOns.find((a) => a.key === toggledKey);
+ const clickedAddOn = togglableAddOns.find((a) => a.key === toggledKey);
if (clickedAddOn) {
handleOptionClick(clickedAddOn);
}
}}
- items={addOns.map((addOn) => ({
- value: addOn.key,
- label: (
- <Tooltip
- title={
- <TooltipContent
- label={addOn.label}
- description={addOn.description}
- docLink={addOn.docLink}
- />
- }
- placement="top"
- mouseEnterDelay={0.5}
- >
- <span
- className="add-on-tab-title"
- data-testid={`query-add-on-${addOn.key}`}
+ items={togglableAddOns.map((addOn) => {
+ const resolved = resolvedFields.get(addOn.key);
+
+ return {
+ value: addOn.key,
+ label: (
+ <Tooltip
+ title={
+ <TooltipContent
+ label={addOn.label}
+ description={resolved?.reason ?? addOn.description}
+ docLink={resolved?.disabled ? undefined : addOn.docLink}
+ />
+ }
+ placement="top"
+ mouseEnterDelay={0.5}
>
- {addOn.icon}
- {addOn.label}
- </span>
- </Tooltip>
- ),
- }))}
+ <span
+ className={cx('add-on-tab-title', {
+ 'add-on-tab-title--disabled': resolved?.disabled,
+ })}
+ aria-disabled={resolved?.disabled}
+ data-testid={`query-add-on-${addOn.key}`}
+ >
+ {addOn.icon}
+ {addOn.label}
+ </span>
+ </Tooltip>
+ ),
+ };
+ })}
/>
</div>
);
diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAggregation/QueryAggregation.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAggregation/QueryAggregation.tsx
index 886c9497a7..73418d8733 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAggregation/QueryAggregation.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAggregation/QueryAggregation.tsx
@@ -8,6 +8,12 @@ import {
} from 'types/api/queryBuilder/queryBuilderData';
import { DataSource } from 'types/common/queryBuilder';
+import {
+ QueryBuilderField,
+ QueryBuilderFieldsConfig,
+} from '../../queryBuilderFields.types';
+import { resolveQueryBuilderField } from '../../queryBuilderFields.utils';
+
import QueryAggregationSelect from './QueryAggregationSelect';
import './QueryAggregation.styles.scss';
@@ -18,24 +24,32 @@ function QueryAggregationOptions({
onAggregationIntervalChange,
onChange,
queryData,
+ fieldsConfig,
}: {
dataSource: DataSource;
panelType?: string;
onAggregationIntervalChange: (value: number) => void;
onChange?: (value: string) => void;
queryData: IBuilderQuery | IBuilderTraceOperator;
+ fieldsConfig?: QueryBuilderFieldsConfig;
}): JSX.Element {
- const showAggregationInterval = useMemo(() => {
+ const stepInterval = useMemo(() => {
if (panelType === PANEL_TYPES.VALUE) {
- return false;
+ return { hidden: true, disabled: false, reason: undefined };
}
- if (dataSource === DataSource.TRACES || dataSource === DataSource.LOGS) {
- return !(panelType === PANEL_TYPES.TABLE || panelType === PANEL_TYPES.PIE);
+ const isNonMetricSource =
+ dataSource === DataSource.TRACES || dataSource === DataSource.LOGS;
+
+ if (
+ isNonMetricSource &&
+ (panelType === PANEL_TYPES.TABLE || panelType === PANEL_TYPES.PIE)
+ ) {
+ return { hidden: true, disabled: false, reason: undefined };
}
- return true;
- }, [dataSource, panelType]);
+ return resolveQueryBuilderField(QueryBuilderField.StepInterval, fieldsConfig);
+ }, [dataSource, panelType, fieldsConfig]);
const handleAggregationIntervalChange = (value: string): void => {
onAggregationIntervalChange(Number(value));
@@ -57,22 +71,24 @@ function QueryAggregationOptions({
}
/>
- {showAggregationInterval && (
+ {!stepInterval.hidden && (
<div className="query-aggregation-interval">
<Tooltip
title={
- <div>
- Set the time interval for aggregation
- <br />
- <a
- href="https://signoz.io/docs/userguide/query-builder-v5/#temporal-aggregation-within-each-time-series"
- target="_blank"
- rel="noopener noreferrer"
- style={{ color: '#1890ff', textDecoration: 'underline' }}
- >
- Learn about step intervals
- </a>
- </div>
+ stepInterval.reason ?? (
+ <div>
+ Set the time interval for aggregation
+ <br />
+ <a
+ href="https://signoz.io/docs/userguide/query-builder-v5/#temporal-aggregation-within-each-time-series"
+ target="_blank"
+ rel="noopener noreferrer"
+ style={{ color: '#1890ff', textDecoration: 'underline' }}
+ >
+ Learn about step intervals
+ </a>
+ </div>
+ )
}
placement="top"
>
@@ -92,6 +108,7 @@ function QueryAggregationOptions({
placeholder="Auto"
type="number"
onChange={handleAggregationIntervalChange}
+ disabled={stepInterval.disabled}
labelAfter
/>
</div>
@@ -105,6 +122,7 @@ function QueryAggregationOptions({
QueryAggregationOptions.defaultProps = {
panelType: null,
onChange: undefined,
+ fieldsConfig: undefined,
};
export default QueryAggregationOptions;
diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QueryFooter/QueryFooter.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/QueryFooter/QueryFooter.tsx
index b1a864b981..9349a52d92 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/QueryFooter/QueryFooter.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QueryFooter/QueryFooter.tsx
@@ -17,13 +17,13 @@ function TraceOperatorSection({
const { currentQuery, panelType } = useQueryBuilder();
const showTraceOperatorWarning = useMemo(() => {
- const isListViewPanel =
+ const isRawQueryPanel =
panelType === PANEL_TYPES.LIST || panelType === PANEL_TYPES.TRACE;
const hasMultipleQueries = currentQuery.builder.queryData.length > 1;
const hasTraceOperator =
currentQuery.builder.queryTraceOperator &&
currentQuery.builder.queryTraceOperator.length > 0;
- return isListViewPanel && hasMultipleQueries && !hasTraceOperator;
+ return isRawQueryPanel && hasMultipleQueries && !hasTraceOperator;
}, [
currentQuery?.builder?.queryData,
currentQuery?.builder?.queryTraceOperator,
@@ -77,50 +77,74 @@ export default function QueryFooter({
addNewBuilderQuery,
addNewFormula,
addTraceOperator,
+ showAddQuery = true,
showAddFormula = true,
showAddTraceOperator = false,
+ isAddQueryDisabled = false,
+ addQueryDisabledReason,
+ isAddFormulaDisabled = false,
+ addFormulaDisabledReason,
}: {
addNewBuilderQuery: () => void;
addNewFormula: () => void;
addTraceOperator?: () => void;
showAddTraceOperator: boolean;
+ showAddQuery?: boolean;
showAddFormula?: boolean;
+ isAddQueryDisabled?: boolean;
+ addQueryDisabledReason?: string;
+ isAddFormulaDisabled?: boolean;
+ addFormulaDisabledReason?: string;
}): JSX.Element {
return (
<div className="qb-footer">
<div className="qb-footer-container">
- <div className="qb-add-new-query">
- <Tooltip title={<div style={{ textAlign: 'center' }}>Add New Query</div>}>
- <Button
- className="add-new-query-button periscope-btn "
- icon={<Plus size={16} />}
- onClick={addNewBuilderQuery}
- />
- </Tooltip>
- </div>
+ {showAddQuery && (
+ <div className="qb-add-new-query">
+ <Tooltip
+ title={
+ addQueryDisabledReason ?? (
+ <div style={{ textAlign: 'center' }}>Add New Query</div>
+ )
+ }
+ >
+ <Button
+ className="add-new-query-button periscope-btn "
+ data-testid="add-new-query-button"
+ icon={<Plus size={16} />}
+ onClick={addNewBuilderQuery}
+ disabled={isAddQueryDisabled}
+ />
+ </Tooltip>
+ </div>
+ )}
{showAddFormula && (
<div className="qb-add-formula">
<Tooltip
title={
- <div style={{ textAlign: 'center' }}>
- Add New Formula
- <Typography.Link
- href="https://signoz.io/docs/querying/multi-query-analysis/#advanced-comparisons"
- target="_blank"
- style={{ textDecoration: 'underline' }}
- >
- {' '}
- <br />
- Learn more
- </Typography.Link>
- </div>
+ addFormulaDisabledReason ?? (
+ <div style={{ textAlign: 'center' }}>
+ Add New Formula
+ <Typography.Link
+ href="https://signoz.io/docs/querying/multi-query-analysis/#advanced-comparisons"
+ target="_blank"
+ style={{ textDecoration: 'underline' }}
+ >
+ {' '}
+ <br />
+ Learn more
+ </Typography.Link>
+ </div>
+ )
}
>
<Button
className="add-formula-button periscope-btn "
+ data-testid="add-formula-button"
icon={<Sigma size={16} />}
onClick={addNewFormula}
+ disabled={isAddFormulaDisabled}
>
Add Formula
</Button>
diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QueryV2.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/QueryV2.tsx
index f47cea5011..e1da4767f2 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/QueryV2.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QueryV2.tsx
@@ -20,6 +20,13 @@ import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
import { HandleChangeQueryDataV5 } from 'types/common/operations.types';
import { DataSource } from 'types/common/queryBuilder';
+import { QueryBuilderField } from '../queryBuilderFields.types';
+import {
+ mergeQueryBuilderFieldsConfig,
+ RAW_QUERY_FIELDS,
+ resolveQueryBuilderField,
+} from '../queryBuilderFields.utils';
+
import MetricsAggregateSection from './MerticsAggregateSection/MetricsAggregateSection';
import { MetricsSelect } from './MetricsSelect/MetricsSelect';
import QueryAddOns from './QueryAddOns/QueryAddOns';
@@ -31,8 +38,7 @@ export const QueryV2 = forwardRef(function QueryV2(
index,
queryVariant,
query,
- filterConfigs,
- isListViewPanel = false,
+ isRawQuery = false,
showTraceOperator = false,
hasTraceOperator = false,
version,
@@ -43,6 +49,8 @@ export const QueryV2 = forwardRef(function QueryV2(
signalSourceChangeEnabled = false,
queriesCount = 1,
savePreviousQuery = false,
+ fieldsConfig,
+ allowedDataSources,
}: QueryProps & {
onSignalSourceChange: (value: string) => void;
signalSourceChangeEnabled: boolean;
@@ -53,7 +61,7 @@ export const QueryV2 = forwardRef(function QueryV2(
): JSX.Element {
const { cloneQuery, panelType } = useQueryBuilder();
- const showFunctions = query?.functions?.length > 0;
+ const hasQueryFunctions = query?.functions?.length > 0;
const { dataSource, builderQueryType } = query;
const [isCollapsed, setIsCollapsed] = useState(false);
@@ -66,8 +74,7 @@ export const QueryV2 = forwardRef(function QueryV2(
} = useQueryOperations({
index,
query,
- filterConfigs,
- isListViewPanel,
+ isRawQuery,
entityVersion: version,
savePreviousQuery,
});
@@ -99,14 +106,31 @@ export const QueryV2 = forwardRef(function QueryV2(
[dataSource, builderQueryType],
);
+ const resolvedConfig = useMemo(
+ () =>
+ mergeQueryBuilderFieldsConfig(
+ isRawQuery ? RAW_QUERY_FIELDS : undefined,
+ fieldsConfig,
+ ),
+ [isRawQuery, fieldsConfig],
+ );
+
+ const aggregation = useMemo(
+ () => resolveQueryBuilderField(QueryBuilderField.Aggregation, resolvedConfig),
+ [resolvedConfig],
+ );
+
+ const functions = useMemo(
+ () => resolveQueryBuilderField(QueryBuilderField.Functions, resolvedConfig),
+ [resolvedConfig],
+ );
+
const showInlineQuerySearch = useMemo(() => {
if (!showTraceOperator) {
return false;
}
- return (
- dataSource === DataSource.TRACES && (hasTraceOperator || isListViewPanel)
- );
- }, [hasTraceOperator, isListViewPanel, showTraceOperator, dataSource]);
+ return dataSource === DataSource.TRACES && (hasTraceOperator || isRawQuery);
+ }, [hasTraceOperator, isRawQuery, showTraceOperator, dataSource]);
const handleChangeAggregateEvery = useCallback(
(value: IBuilderQuery['stepInterval']) => {
@@ -149,12 +173,15 @@ export const QueryV2 = forwardRef(function QueryV2(
hasTraceOperator={hasTraceOperator}
isMetricsDataSource={dataSource === DataSource.METRICS}
showFunctions={
- (version && version === ENTITY_VERSION_V4) ||
- query.dataSource === DataSource.LOGS ||
- query.dataSource === DataSource.METRICS ||
- showFunctions ||
- false
+ !functions.hidden &&
+ ((version && version === ENTITY_VERSION_V4) ||
+ query.dataSource === DataSource.LOGS ||
+ query.dataSource === DataSource.METRICS ||
+ hasQueryFunctions ||
+ false)
}
+ areFunctionsDisabled={functions.disabled}
+ functionsDisabledReason={functions.reason}
isCollapsed={isCollapsed}
showTraceOperator={showTraceOperator}
entityType="query"
@@ -167,7 +194,8 @@ export const QueryV2 = forwardRef(function QueryV2(
onQueryFunctionsUpdates={handleQueryFunctionsUpdates}
showDeleteButton={false}
showCloneOption={false}
- isListViewPanel={isListViewPanel}
+ isRawQuery={isRawQuery}
+ allowedDataSources={allowedDataSources}
index={index}
queryVariant={queryVariant}
onChangeDataSource={handleChangeDataSource}
@@ -267,7 +295,7 @@ export const QueryV2 = forwardRef(function QueryV2(
</div>
{!showOnlyWhereClause &&
- !isListViewPanel &&
+ !aggregation.hidden &&
!(hasTraceOperator && dataSource === DataSource.TRACES) &&
dataSource !== DataSource.METRICS && (
<QueryAggregation
@@ -277,6 +305,7 @@ export const QueryV2 = forwardRef(function QueryV2(
onAggregationIntervalChange={handleChangeAggregateEvery}
onChange={handleChangeAggregation}
queryData={query}
+ fieldsConfig={fieldsConfig}
/>
)}
@@ -297,9 +326,10 @@ export const QueryV2 = forwardRef(function QueryV2(
index={index}
query={query}
version="v3"
- isListViewPanel={isListViewPanel}
+ isRawQuery={isRawQuery}
showReduceTo={showReduceTo}
panelType={panelType}
+ fieldsConfig={fieldsConfig}
/>
)}
</div>
diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/TraceOperator/TraceOperator.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/TraceOperator/TraceOperator.tsx
index fb1c1aece7..36e1af4b1d 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/TraceOperator/TraceOperator.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/TraceOperator/TraceOperator.tsx
@@ -11,6 +11,7 @@ import {
} from 'types/api/queryBuilder/queryBuilderData';
import { DataSource } from 'types/common/queryBuilder';
+import { QueryBuilderFieldsConfig } from '../../queryBuilderFields.types';
import QueryAddOns from '../QueryAddOns/QueryAddOns';
import QueryAggregation from '../QueryAggregation/QueryAggregation';
import TraceOperatorEditor from './TraceOperatorEditor';
@@ -19,10 +20,12 @@ import './TraceOperator.styles.scss';
export default function TraceOperator({
traceOperator,
- isListViewPanel = false,
+ isRawQuery = false,
+ fieldsConfig,
}: {
traceOperator: IBuilderTraceOperator;
- isListViewPanel?: boolean;
+ isRawQuery?: boolean;
+ fieldsConfig?: QueryBuilderFieldsConfig;
}): JSX.Element {
const { panelType, removeTraceOperator } = useQueryBuilder();
const { handleChangeQueryData } = useQueryOperations({
@@ -58,12 +61,12 @@ export default function TraceOperator({
);
return (
- <div className={cx('qb-trace-operator', !isListViewPanel && 'non-list-view')}>
+ <div className={cx('qb-trace-operator', !isRawQuery && 'non-list-view')}>
<div className="qb-trace-operator-container">
<div
className={cx(
'qb-trace-operator-label-with-input',
- !isListViewPanel && 'qb-trace-operator-arrow',
+ !isRawQuery && 'qb-trace-operator-arrow',
)}
>
<Typography.Text className="label">Trace Operator</Typography.Text>
@@ -76,9 +79,9 @@ export default function TraceOperator({
</div>
</div>
- {!isListViewPanel && (
+ {!isRawQuery && (
<div className="qb-trace-operator-aggregation-container">
- <div className={cx(!isListViewPanel && 'qb-trace-operator-arrow')}>
+ <div className={cx(!isRawQuery && 'qb-trace-operator-arrow')}>
<QueryAggregation
dataSource={DataSource.TRACES}
key={`query-search-${traceOperator.queryName}`}
@@ -86,12 +89,13 @@ export default function TraceOperator({
onAggregationIntervalChange={handleChangeAggregateEvery}
onChange={handleChangeAggregation}
queryData={traceOperator}
+ fieldsConfig={fieldsConfig}
/>
</div>
<div
className={cx(
'qb-trace-operator-add-ons-container',
- !isListViewPanel && 'qb-trace-operator-arrow',
+ !isRawQuery && 'qb-trace-operator-arrow',
)}
>
<QueryAddOns
@@ -99,9 +103,10 @@ export default function TraceOperator({
query={traceOperator}
version="v3"
isForTraceOperator
- isListViewPanel={false}
+ isRawQuery={false}
showReduceTo={false}
panelType={panelType}
+ fieldsConfig={fieldsConfig}
/>
</div>
</div>
diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/__tests__/QueryV2.test.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/__tests__/QueryV2.test.tsx
index d5c39e5041..25fb020443 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/__tests__/QueryV2.test.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/__tests__/QueryV2.test.tsx
@@ -142,7 +142,6 @@ describe('QueryBuilderV2 + QueryV2 - base render', () => {
isMetricsDataSource: false,
operators: [],
spaceAggregationOptions: [],
- listOfAdditionalFilters: [],
handleChangeOperator: jest.fn(),
handleSpaceAggregationChange: jest.fn(),
handleChangeAggregatorAttribute: jest.fn(),
@@ -152,7 +151,6 @@ describe('QueryBuilderV2 + QueryV2 - base render', () => {
jest.fn() as unknown as ReturnType<UseQueryOperations>['handleChangeQueryData'],
handleChangeFormulaData: jest.fn(),
handleQueryFunctionsUpdates: handleQueryFunctionsUpdatesMock,
- listOfAdditionalFormulaFilters: [],
});
});
diff --git a/frontend/src/components/QueryBuilderV2/__tests__/QueryAddOns.test.tsx b/frontend/src/components/QueryBuilderV2/__tests__/QueryAddOns.test.tsx
index 94f15bb54b..d3cbfa6b2c 100644
--- a/frontend/src/components/QueryBuilderV2/__tests__/QueryAddOns.test.tsx
+++ b/frontend/src/components/QueryBuilderV2/__tests__/QueryAddOns.test.tsx
@@ -95,7 +95,7 @@ describe('QueryAddOns', () => {
<QueryAddOns
query={baseQuery()}
version="v5"
- isListViewPanel={false}
+ isRawQuery={false}
showReduceTo
panelType={PANEL_TYPES.VALUE}
index={0}
@@ -119,7 +119,7 @@ describe('QueryAddOns', () => {
groupBy: ['service.name'],
})}
version="v5"
- isListViewPanel={false}
+ isRawQuery={false}
showReduceTo={false}
panelType={PANEL_TYPES.TIME_SERIES}
index={0}
@@ -135,7 +135,7 @@ describe('QueryAddOns', () => {
<QueryAddOns
query={baseQuery()}
version="v5"
- isListViewPanel
+ isRawQuery
showReduceTo={false}
panelType={PANEL_TYPES.LIST}
index={0}
@@ -151,7 +151,7 @@ describe('QueryAddOns', () => {
<QueryAddOns
query={baseQuery({ limit: 5 })}
version="v5"
- isListViewPanel={false}
+ isRawQuery={false}
showReduceTo={false}
panelType={PANEL_TYPES.TIME_SERIES}
index={0}
@@ -176,7 +176,7 @@ describe('QueryAddOns', () => {
<QueryAddOns
query={query}
version="v5"
- isListViewPanel={false}
+ isRawQuery={false}
showReduceTo={false}
panelType={PANEL_TYPES.TIME_SERIES}
index={0}
@@ -195,7 +195,7 @@ describe('QueryAddOns', () => {
<QueryAddOns
query={baseQuery()}
version="v5"
- isListViewPanel={false}
+ isRawQuery={false}
showReduceTo
panelType={PANEL_TYPES.TIME_SERIES}
index={0}
@@ -211,7 +211,7 @@ describe('QueryAddOns', () => {
<QueryAddOns
query={baseQuery({ reduceTo: ReduceOperators.SUM })}
version="v5"
- isListViewPanel={false}
+ isRawQuery={false}
showReduceTo
panelType={PANEL_TYPES.TIME_SERIES}
index={0}
@@ -234,7 +234,7 @@ describe('QueryAddOns', () => {
<QueryAddOns
query={query}
version="v5"
- isListViewPanel={false}
+ isRawQuery={false}
showReduceTo
panelType={PANEL_TYPES.TIME_SERIES}
index={0}
@@ -286,7 +286,7 @@ describe('QueryAddOns', () => {
<QueryAddOns
query={query}
version="v5"
- isListViewPanel={false}
+ isRawQuery={false}
showReduceTo={false}
panelType={PANEL_TYPES.TIME_SERIES}
index={0}
@@ -314,7 +314,7 @@ describe('QueryAddOns', () => {
<QueryAddOns
query={query}
version="v5"
- isListViewPanel={false}
+ isRawQuery={false}
showReduceTo={false}
panelType={PANEL_TYPES.TIME_SERIES}
index={0}
diff --git a/frontend/src/components/QueryBuilderV2/__tests__/QueryFooter.test.tsx b/frontend/src/components/QueryBuilderV2/__tests__/QueryFooter.test.tsx
new file mode 100644
index 0000000000..cc9571335e
--- /dev/null
+++ b/frontend/src/components/QueryBuilderV2/__tests__/QueryFooter.test.tsx
@@ -0,0 +1,46 @@
+import { render, screen } from 'tests/test-utils';
+
+import QueryFooter from '../QueryV2/QueryFooter/QueryFooter';
+
+jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({
+ useQueryBuilder: (): {
+ currentQuery: { builder: { queryData: unknown[] } };
+ panelType: string;
+ } => ({
+ currentQuery: { builder: { queryData: [] } },
+ panelType: 'time_series',
+ }),
+}));
+
+const noop = (): void => {};
+
+describe('QueryFooter', () => {
+ it('offers both buttons by default', () => {
+ render(
+ <QueryFooter
+ addNewBuilderQuery={noop}
+ addNewFormula={noop}
+ showAddTraceOperator={false}
+ />,
+ );
+
+ expect(screen.getByTestId('add-new-query-button')).toBeInTheDocument();
+ expect(screen.getByTestId('add-formula-button')).toBeInTheDocument();
+ });
+
+ // A kind whose request takes a single query (Heatmap) hides the button outright
+ // rather than disabling it — a query it adds is one the builder cannot render.
+ it('drops the Add New Query button when the caller withholds it', () => {
+ render(
+ <QueryFooter
+ addNewBuilderQuery={noop}
+ addNewFormula={noop}
+ showAddQuery={false}
+ showAddTraceOperator={false}
+ />,
+ );
+
+ expect(screen.queryByTestId('add-new-query-button')).not.toBeInTheDocument();
+ expect(screen.getByTestId('add-formula-button')).toBeInTheDocument();
+ });
+});
diff --git a/frontend/src/components/QueryBuilderV2/__tests__/queryBuilderFields.utils.test.ts b/frontend/src/components/QueryBuilderV2/__tests__/queryBuilderFields.utils.test.ts
new file mode 100644
index 0000000000..a9d0a041f0
--- /dev/null
+++ b/frontend/src/components/QueryBuilderV2/__tests__/queryBuilderFields.utils.test.ts
@@ -0,0 +1,140 @@
+import { QueryBuilderField } from '../queryBuilderFields.types';
+import {
+ mergeQueryBuilderFieldsConfig,
+ RAW_QUERY_FIELDS,
+ resolveQueryBuilderField,
+ resolveQueryBuilderFields,
+} from '../queryBuilderFields.utils';
+
+const SUPPORTED = [
+ QueryBuilderField.GroupBy,
+ QueryBuilderField.Having,
+ QueryBuilderField.OrderBy,
+ QueryBuilderField.Limit,
+ QueryBuilderField.Legend,
+];
+
+describe('resolveQueryBuilderField', () => {
+ it('leaves an unconfigured field available', () => {
+ expect(resolveQueryBuilderField(QueryBuilderField.Having)).toStrictEqual({
+ hidden: false,
+ disabled: false,
+ pinned: false,
+ });
+ });
+
+ it('hides a field configured hidden', () => {
+ const resolved = resolveQueryBuilderField(QueryBuilderField.Having, {
+ [QueryBuilderField.Having]: { state: 'hidden' },
+ });
+
+ expect(resolved.hidden).toBe(true);
+ expect(resolved.disabled).toBe(false);
+ });
+
+ it('carries the reason through on a disabled field', () => {
+ const resolved = resolveQueryBuilderField(QueryBuilderField.Having, {
+ [QueryBuilderField.Having]: {
+ state: 'disabled',
+ reason: 'Having filters aggregated results.',
+ },
+ });
+
+ expect(resolved).toStrictEqual({
+ hidden: false,
+ disabled: true,
+ reason: 'Having filters aggregated results.',
+ pinned: false,
+ });
+ });
+
+ it('pins a field configured pinned', () => {
+ const resolved = resolveQueryBuilderField(QueryBuilderField.OrderBy, {
+ [QueryBuilderField.OrderBy]: { state: 'pinned' },
+ });
+
+ expect(resolved.pinned).toBe(true);
+ expect(resolved.hidden).toBe(false);
+ });
+
+ it('only ever resolves one state at a time', () => {
+ const resolved = resolveQueryBuilderField(QueryBuilderField.Limit, {
+ [QueryBuilderField.Limit]: { state: 'disabled', reason: 'why' },
+ });
+
+ expect([resolved.hidden, resolved.disabled, resolved.pinned]).toStrictEqual([
+ false,
+ true,
+ false,
+ ]);
+ });
+});
+
+describe('resolveQueryBuilderFields', () => {
+ it('resolves every supported field and nothing else', () => {
+ const resolved = resolveQueryBuilderFields(SUPPORTED);
+
+ expect([...resolved.keys()]).toStrictEqual(SUPPORTED);
+ });
+
+ it('cannot widen beyond what the builder supports', () => {
+ const resolved = resolveQueryBuilderFields([QueryBuilderField.Legend], {
+ [QueryBuilderField.ReduceTo]: { state: 'pinned' },
+ });
+
+ expect(resolved.has(QueryBuilderField.ReduceTo)).toBe(false);
+ });
+});
+
+describe('mergeQueryBuilderFieldsConfig', () => {
+ it('returns the override when there is no baseline', () => {
+ const override = { [QueryBuilderField.Limit]: { state: 'hidden' } } as const;
+
+ expect(mergeQueryBuilderFieldsConfig(undefined, override)).toBe(override);
+ });
+
+ it('returns the baseline when there is no override', () => {
+ expect(mergeQueryBuilderFieldsConfig(RAW_QUERY_FIELDS, undefined)).toBe(
+ RAW_QUERY_FIELDS,
+ );
+ });
+
+ it('lets the override win per field, leaving the rest of the baseline intact', () => {
+ const merged = mergeQueryBuilderFieldsConfig(RAW_QUERY_FIELDS, {
+ [QueryBuilderField.Having]: { state: 'disabled', reason: 'no aggregation' },
+ });
+
+ expect(merged?.[QueryBuilderField.Having]).toStrictEqual({
+ state: 'disabled',
+ reason: 'no aggregation',
+ });
+ expect(merged?.[QueryBuilderField.GroupBy]).toStrictEqual({
+ state: 'hidden',
+ });
+ expect(merged?.[QueryBuilderField.OrderBy]).toStrictEqual({
+ state: 'pinned',
+ });
+ });
+});
+
+describe('RAW_QUERY_FIELDS', () => {
+ it('reduces an aggregate surface to a pinned order by', () => {
+ const resolved = resolveQueryBuilderFields(SUPPORTED, RAW_QUERY_FIELDS);
+
+ const visible = [...resolved.entries()]
+ .filter(([, field]) => !field.hidden)
+ .map(([key]) => key);
+
+ expect(visible).toStrictEqual([QueryBuilderField.OrderBy]);
+ expect(resolved.get(QueryBuilderField.OrderBy)?.pinned).toBe(true);
+ });
+
+ it('leaves additional queries alone, so trace matching still allows several', () => {
+ expect(
+ resolveQueryBuilderField(
+ QueryBuilderField.AdditionalQueries,
+ RAW_QUERY_FIELDS,
+ ).hidden,
+ ).toBe(false);
+ });
+});
diff --git a/frontend/src/components/QueryBuilderV2/queryBuilderFields.types.ts b/frontend/src/components/QueryBuilderV2/queryBuilderFields.types.ts
new file mode 100644
index 0000000000..97bdf3a40b
--- /dev/null
+++ b/frontend/src/components/QueryBuilderV2/queryBuilderFields.types.ts
@@ -0,0 +1,36 @@
+/**
+ * Everything the query builder can surface.
+ *
+ * The per-query values double as the add-on identities the builder renders
+ * (`data-testid="query-add-on-<value>"`), so they are part of the DOM contract and must
+ * not be renamed to match the member names.
+ */
+export enum QueryBuilderField {
+ // Per query
+ Aggregation = 'aggregation',
+ StepInterval = 'step_interval',
+ Functions = 'functions',
+ GroupBy = 'group_by',
+ Having = 'having',
+ OrderBy = 'order_by',
+ Limit = 'limit',
+ Legend = 'legend_format',
+ ReduceTo = 'reduce_to',
+ // Builder level
+ Formula = 'formula',
+ AdditionalQueries = 'additional_queries',
+}
+
+/** `reason` is required on `disabled`: an inert control the user can see has to explain itself. */
+export type QueryBuilderFieldRule =
+ | { state: 'hidden' }
+ | { state: 'disabled'; reason: string }
+ | { state: 'pinned' };
+
+/**
+ * A caller's narrowing of the builder's surface. The builder works out which fields suit
+ * the current data source and panel type first; this can only take away from that set.
+ */
+export type QueryBuilderFieldsConfig = Partial<
+ Record<QueryBuilderField, QueryBuilderFieldRule>
+>;
diff --git a/frontend/src/components/QueryBuilderV2/queryBuilderFields.utils.ts b/frontend/src/components/QueryBuilderV2/queryBuilderFields.utils.ts
new file mode 100644
index 0000000000..25324bc36e
--- /dev/null
+++ b/frontend/src/components/QueryBuilderV2/queryBuilderFields.utils.ts
@@ -0,0 +1,92 @@
+import {
+ QueryBuilderField,
+ QueryBuilderFieldRule,
+ QueryBuilderFieldsConfig,
+} from './queryBuilderFields.types';
+
+export interface ResolvedQueryBuilderField {
+ hidden: boolean;
+ disabled: boolean;
+ reason?: string;
+ /** Rendered open, not dismissable, and kept out of the add-on toggle bar. */
+ pinned: boolean;
+}
+
+const AVAILABLE: ResolvedQueryBuilderField = {
+ hidden: false,
+ disabled: false,
+ pinned: false,
+};
+
+function fromRule(rule: QueryBuilderFieldRule): ResolvedQueryBuilderField {
+ switch (rule.state) {
+ case 'hidden':
+ return { hidden: true, disabled: false, pinned: false };
+ case 'disabled':
+ return {
+ hidden: false,
+ disabled: true,
+ reason: rule.reason,
+ pinned: false,
+ };
+ case 'pinned':
+ return { hidden: false, disabled: false, pinned: true };
+ default:
+ return AVAILABLE;
+ }
+}
+
+export function resolveQueryBuilderField(
+ field: QueryBuilderField,
+ config?: QueryBuilderFieldsConfig,
+): ResolvedQueryBuilderField {
+ const rule = config?.[field];
+
+ return rule ? fromRule(rule) : AVAILABLE;
+}
+
+/**
+ * Fields absent from `supported` are hidden whatever the config says, so a config can
+ * only ever take away.
+ */
+export function resolveQueryBuilderFields(
+ supported: readonly QueryBuilderField[],
+ config?: QueryBuilderFieldsConfig,
+): Map<QueryBuilderField, ResolvedQueryBuilderField> {
+ return new Map(
+ supported.map((field) => [field, resolveQueryBuilderField(field, config)]),
+ );
+}
+
+/**
+ * The surface a raw-row builder starts from, layered under a caller's own config.
+ * `AdditionalQueries` is deliberately absent — a raw trace builder still takes several
+ * queries when trace matching is on. Omit rather than Partial, so a field added to the
+ * enum has to be placed on one side.
+ */
+export const RAW_QUERY_FIELDS: Omit<
+ Record<QueryBuilderField, QueryBuilderFieldRule>,
+ QueryBuilderField.AdditionalQueries
+> = {
+ [QueryBuilderField.Aggregation]: { state: 'hidden' },
+ [QueryBuilderField.StepInterval]: { state: 'hidden' },
+ [QueryBuilderField.Functions]: { state: 'hidden' },
+ [QueryBuilderField.GroupBy]: { state: 'hidden' },
+ [QueryBuilderField.Having]: { state: 'hidden' },
+ [QueryBuilderField.Limit]: { state: 'hidden' },
+ [QueryBuilderField.Legend]: { state: 'hidden' },
+ [QueryBuilderField.ReduceTo]: { state: 'hidden' },
+ [QueryBuilderField.Formula]: { state: 'hidden' },
+ [QueryBuilderField.OrderBy]: { state: 'pinned' },
+};
+
+export function mergeQueryBuilderFieldsConfig(
+ baseline: QueryBuilderFieldsConfig | undefined,
+ override: QueryBuilderFieldsConfig | undefined,
+): QueryBuilderFieldsConfig | undefined {
+ if (!baseline) {
+ return override;
+ }
+
+ return override ? { ...baseline, ...override } : baseline;
+}
diff --git a/frontend/src/constants/queryBuilder.ts b/frontend/src/constants/queryBuilder.ts
index f6d92e76fc..89931e06a9 100644
--- a/frontend/src/constants/queryBuilder.ts
+++ b/frontend/src/constants/queryBuilder.ts
@@ -32,7 +32,6 @@ import {
MeterAggregateOperator,
MetricAggregateOperator,
NumberOperators,
- QueryAdditionalFilter,
QueryBuilderData,
ReduceOperators,
StringOperators,
@@ -104,43 +103,6 @@ export const metricsSpaceAggregationOperatorsByType = {
ExponentialHistogram: metricsHistogramSpaceAggregateOperatorOptions,
};
-export const mapOfQueryFilters: Record<DataSource, QueryAdditionalFilter[]> = {
- metrics: [
- { text: 'Aggregation interval', field: 'stepInterval' },
- { text: 'Having', field: 'having' },
- ],
- logs: [
- { text: 'Order by', field: 'orderBy' },
- { text: 'Limit', field: 'limit' },
- { text: 'Having', field: 'having' },
- { text: 'Aggregation interval', field: 'stepInterval' },
- ],
- traces: [
- { text: 'Order by', field: 'orderBy' },
- { text: 'Limit', field: 'limit' },
- { text: 'Having', field: 'having' },
- { text: 'Aggregation interval', field: 'stepInterval' },
- ],
-};
-
-const commonFormulaFilters: QueryAdditionalFilter[] = [
- {
- text: 'Having',
- field: 'having',
- },
- { text: 'Order by', field: 'orderBy' },
- { text: 'Limit', field: 'limit' },
-];
-
-export const mapOfFormulaToFilters: Record<
- DataSource,
- QueryAdditionalFilter[]
-> = {
- metrics: commonFormulaFilters,
- logs: commonFormulaFilters,
- traces: commonFormulaFilters,
-};
-
export const REDUCE_TO_VALUES: SelectOption<ReduceOperators, string>[] = [
{ value: ReduceOperators.LAST, label: 'Latest of values in timeframe' },
{ value: ReduceOperators.SUM, label: 'Sum of values in timeframe' },
diff --git a/frontend/src/container/LLMObservability/Explorer/QuerySection/QuerySection.tsx b/frontend/src/container/LLMObservability/Explorer/QuerySection/QuerySection.tsx
index 606c5f01dc..124767cfc8 100644
--- a/frontend/src/container/LLMObservability/Explorer/QuerySection/QuerySection.tsx
+++ b/frontend/src/container/LLMObservability/Explorer/QuerySection/QuerySection.tsx
@@ -1,35 +1,23 @@
import { memo, useMemo } from 'react';
import { QueryBuilderV2 } from 'components/QueryBuilderV2/QueryBuilderV2';
import { PANEL_TYPES } from 'constants/queryBuilder';
-import { QueryBuilderProps } from 'container/QueryBuilder/QueryBuilder.interfaces';
import { useGetPanelTypesQueryParam } from 'hooks/queryBuilder/useGetPanelTypesQueryParam';
import { DataSource } from 'types/common/queryBuilder';
function QuerySection(): JSX.Element {
const panelTypes = useGetPanelTypesQueryParam(PANEL_TYPES.LIST);
- // Only reaches the builder for timeseries/table; list/trace panels use QueryBuilderV2's listViewTracesFilterConfigs.
- const filterConfigs: QueryBuilderProps['filterConfigs'] = useMemo(
- () => ({
- stepInterval: { isHidden: false, isDisabled: false },
- limit: { isHidden: false, isDisabled: true },
- having: { isHidden: false, isDisabled: true },
- }),
- [],
- );
-
- const isListViewPanel = useMemo(
+ const isRawQuery = useMemo(
() => panelTypes === PANEL_TYPES.LIST || panelTypes === PANEL_TYPES.TRACE,
[panelTypes],
);
return (
<QueryBuilderV2
- isListViewPanel={isListViewPanel}
+ isRawQuery={isRawQuery}
config={{ initialDataSource: DataSource.TRACES, queryVariant: 'static' }}
panelType={panelTypes}
- filterConfigs={filterConfigs}
- showOnlyWhereClause={isListViewPanel}
+ showOnlyWhereClause={isRawQuery}
version="v3" // setting this to v3 as we this is rendered in logs explorer
/>
);
diff --git a/frontend/src/container/LogExplorerQuerySection/index.tsx b/frontend/src/container/LogExplorerQuerySection/index.tsx
index 2b5c08dffc..16baa0d859 100644
--- a/frontend/src/container/LogExplorerQuerySection/index.tsx
+++ b/frontend/src/container/LogExplorerQuerySection/index.tsx
@@ -1,13 +1,6 @@
-import { memo, useCallback, useMemo } from 'react';
+import { memo, useMemo } from 'react';
import { QueryBuilderV2 } from 'components/QueryBuilderV2/QueryBuilderV2';
-import {
- initialQueriesMap,
- OPERATORS,
- PANEL_TYPES,
-} from 'constants/queryBuilder';
-import ExplorerOrderBy from 'container/ExplorerOrderBy';
-import { OrderByFilterProps } from 'container/QueryBuilder/filters/OrderByFilter/OrderByFilter.interfaces';
-import { QueryBuilderProps } from 'container/QueryBuilder/QueryBuilder.interfaces';
+import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
import { useGetPanelTypesQueryParam } from 'hooks/queryBuilder/useGetPanelTypesQueryParam';
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
import { useShareBuilderUrl } from 'hooks/queryBuilder/useShareBuilderUrl';
@@ -36,42 +29,11 @@ function LogExplorerQuerySection({
useShareBuilderUrl({ defaultValue });
- const filterConfigs: QueryBuilderProps['filterConfigs'] = useMemo(() => {
- const isTable = panelTypes === PANEL_TYPES.TABLE;
- const isList = panelTypes === PANEL_TYPES.LIST;
- const config: QueryBuilderProps['filterConfigs'] = {
- stepInterval: { isHidden: isTable, isDisabled: false },
- having: { isHidden: isList, isDisabled: true },
- filters: {
- customKey: 'body',
- customOp: OPERATORS.CONTAINS,
- },
- };
-
- return config;
- }, [panelTypes]);
-
- const renderOrderBy = useCallback(
- ({ query, onChange }: OrderByFilterProps): JSX.Element => (
- <ExplorerOrderBy query={query} onChange={onChange} />
- ),
- [],
- );
-
- const queryComponents = useMemo(
- (): QueryBuilderProps['queryComponents'] => ({
- ...(panelTypes === PANEL_TYPES.LIST ? { renderOrderBy } : {}),
- }),
- [panelTypes, renderOrderBy],
- );
-
return (
<QueryBuilderV2
- isListViewPanel={panelTypes === PANEL_TYPES.LIST}
+ isRawQuery={panelTypes === PANEL_TYPES.LIST}
config={{ initialDataSource: DataSource.LOGS, queryVariant: 'static' }}
panelType={panelTypes}
- filterConfigs={filterConfigs}
- queryComponents={queryComponents}
showOnlyWhereClause={selectedView === ExplorerViews.LIST}
version="v3" // setting this to v3 as we this is rendered in logs explorer
/>
diff --git a/frontend/src/container/MeterExplorer/Explorer/Explorer.tsx b/frontend/src/container/MeterExplorer/Explorer/Explorer.tsx
index 7f155cf845..69019efbae 100644
--- a/frontend/src/container/MeterExplorer/Explorer/Explorer.tsx
+++ b/frontend/src/container/MeterExplorer/Explorer/Explorer.tsx
@@ -12,7 +12,6 @@ import { initialQueryMeterWithType, PANEL_TYPES } from 'constants/queryBuilder';
import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
import ExplorerOptionWrapper from 'container/ExplorerOptions/ExplorerOptionWrapper';
import RightToolbarActions from 'container/QueryBuilder/components/ToolbarActions/RightToolbarActions';
-import { QueryBuilderProps } from 'container/QueryBuilder/QueryBuilder.interfaces';
import DateTimeSelector from 'container/TopNav/DateTimeSelectionV2';
import { ExportDashboard } from 'hooks/dashboard/useExportDashboards';
import { useGetExportToDashboardLink } from 'hooks/dashboard/useGetExportToDashboardLink';
@@ -120,11 +119,6 @@ function Explorer(): JSX.Element {
});
}, []);
- const queryComponents = useMemo(
- (): QueryBuilderProps['queryComponents'] => ({}),
- [],
- );
-
return (
<Sentry.ErrorBoundary fallback={<ErrorBoundaryFallback />}>
<div
@@ -181,7 +175,6 @@ function Explorer(): JSX.Element {
signalSource: 'meter',
}}
panelType={PANEL_TYPES.TIME_SERIES}
- queryComponents={queryComponents}
showFunctions={false}
version="v3"
/>
diff --git a/frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx b/frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx
index 5f8b7d17f3..86757215c6 100644
--- a/frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx
+++ b/frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx
@@ -12,7 +12,6 @@ import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
import { usePageActions } from 'container/AIAssistant/pageActions/usePageActions';
import ExplorerOptionWrapper from 'container/ExplorerOptions/ExplorerOptionWrapper';
import RightToolbarActions from 'container/QueryBuilder/components/ToolbarActions/RightToolbarActions';
-import { QueryBuilderProps } from 'container/QueryBuilder/QueryBuilder.interfaces';
import DateTimeSelector from 'container/TopNav/DateTimeSelectionV2';
import { ExportDashboard } from 'hooks/dashboard/useExportDashboards';
import { useGetExportToDashboardLink } from 'hooks/dashboard/useGetExportToDashboardLink';
@@ -323,11 +322,6 @@ function Explorer(): JSX.Element {
});
}, []);
- const queryComponents = useMemo(
- (): QueryBuilderProps['queryComponents'] => ({}),
- [],
- );
-
const [warning, setWarning] = useState<Warning | undefined>();
const oneChartPerQueryDisabledTooltip = useMemo(() => {
@@ -381,7 +375,6 @@ function Explorer(): JSX.Element {
<QueryBuilderV2
config={{ initialDataSource: DataSource.METRICS, queryVariant: 'static' }}
panelType={PANEL_TYPES.TIME_SERIES}
- queryComponents={queryComponents}
showFunctions={false}
version="v3"
/>
diff --git a/frontend/src/container/QueryBuilder/QueryBuilder.interfaces.ts b/frontend/src/container/QueryBuilder/QueryBuilder.interfaces.ts
index fc486cbfd2..d4dc5ad8f6 100644
--- a/frontend/src/container/QueryBuilder/QueryBuilder.interfaces.ts
+++ b/frontend/src/container/QueryBuilder/QueryBuilder.interfaces.ts
@@ -1,22 +1,9 @@
import { ReactNode } from 'react';
+import { TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
+import { QueryBuilderFieldsConfig } from 'components/QueryBuilderV2/queryBuilderFields.types';
import { PANEL_TYPES } from 'constants/queryBuilder';
-import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
import { DataSource } from 'types/common/queryBuilder';
-import { OrderByFilterProps } from './filters/OrderByFilter/OrderByFilter.interfaces';
-
-export type WhereClauseConfig = {
- customKey: string;
- customOp: string;
-};
-
-type FilterConfigs = {
- [Key in keyof Omit<IBuilderQuery, 'filters'>]: {
- isHidden: boolean;
- isDisabled: boolean;
- };
-} & { filters: WhereClauseConfig };
-
export type QueryBuilderConfig =
| {
queryVariant: 'static';
@@ -29,9 +16,16 @@ export type QueryBuilderProps = {
config?: QueryBuilderConfig;
panelType: PANEL_TYPES;
actions?: ReactNode;
- filterConfigs?: Partial<FilterConfigs>;
- queryComponents?: { renderOrderBy?: (props: OrderByFilterProps) => ReactNode };
- isListViewPanel?: boolean;
+ fieldsConfig?: QueryBuilderFieldsConfig;
+ /**
+ * The builder edits raw rows rather than an aggregation: a single query unless trace
+ * matching is on, no formulas, data-source switches reset to the raw-query template,
+ * and order by resolves keys without an aggregate attribute. Supplies the defaults for
+ * `fieldsConfig` and `allowedDataSources`, which override it per field.
+ */
+ isRawQuery?: boolean;
+ /** Defaults to every signal. */
+ allowedDataSources?: TelemetrytypesSignalDTO[];
showFunctions?: boolean;
showOnlyWhereClause?: boolean;
showOnlyTraceOperator?: boolean;
diff --git a/frontend/src/container/QueryBuilder/components/AdditionalFiltersToggler/AdditionalFiltersToggler.interfaces.ts b/frontend/src/container/QueryBuilder/components/AdditionalFiltersToggler/AdditionalFiltersToggler.interfaces.ts
deleted file mode 100644
index 2bb8a0e1fa..0000000000
--- a/frontend/src/container/QueryBuilder/components/AdditionalFiltersToggler/AdditionalFiltersToggler.interfaces.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { ReactNode } from 'react';
-
-export type AdditionalFiltersProps = {
- listOfAdditionalFilter: string[];
- children: ReactNode;
-};
diff --git a/frontend/src/container/QueryBuilder/components/AdditionalFiltersToggler/AdditionalFiltersToggler.styled.ts b/frontend/src/container/QueryBuilder/components/AdditionalFiltersToggler/AdditionalFiltersToggler.styled.ts
deleted file mode 100644
index 2d94d2f469..0000000000
--- a/frontend/src/container/QueryBuilder/components/AdditionalFiltersToggler/AdditionalFiltersToggler.styled.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { SquareMinus, SquarePlus } from '@signozhq/icons';
-import { Color } from '@signozhq/design-tokens';
-import { Col } from 'antd';
-import { Typography } from '@signozhq/ui/typography';
-import styled, { css } from 'styled-components';
-
-const IconCss = css`
- margin-right: 0.6875rem;
- transition: all 0.2s ease;
-`;
-
-export const StyledIconOpen = styled(SquarePlus)`
- ${IconCss}
-`;
-
-export const StyledIconClose = styled(SquareMinus)`
- ${IconCss}
-`;
-
-export const StyledInner = styled(Col)`
- width: fit-content;
- display: flex;
- align-items: center;
- gap: 8px;
- margin-bottom: 0.875rem;
- min-height: 1.375rem;
- cursor: pointer;
- &:hover {
- ${StyledIconOpen}, ${StyledIconClose} {
- opacity: 0.7;
- }
- }
-`;
-
-export const StyledLink = styled(Typography.Link)`
- pointer-events: none;
- color: ${Color.BG_ROBIN_400} !important;
-`;
diff --git a/frontend/src/container/QueryBuilder/components/AdditionalFiltersToggler/AdditionalFiltersToggler.styles.scss b/frontend/src/container/QueryBuilder/components/AdditionalFiltersToggler/AdditionalFiltersToggler.styles.scss
deleted file mode 100644
index 01c4505cff..0000000000
--- a/frontend/src/container/QueryBuilder/components/AdditionalFiltersToggler/AdditionalFiltersToggler.styles.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-.filter-toggler {
- margin-right: 8px;
-}
-
-.additinal-filters-container {
- .action-btn {
- background: var(--primary-background);
- width: 16px;
- height: 16px;
- border-radius: 3px;
- display: flex;
- justify-content: center;
- align-items: center;
- }
-}
diff --git a/frontend/src/container/QueryBuilder/components/AdditionalFiltersToggler/AdditionalFiltersToggler.tsx b/frontend/src/container/QueryBuilder/components/AdditionalFiltersToggler/AdditionalFiltersToggler.tsx
deleted file mode 100644
index de0cdc32f4..0000000000
--- a/frontend/src/container/QueryBuilder/components/AdditionalFiltersToggler/AdditionalFiltersToggler.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { Fragment, memo, ReactNode, useState } from 'react';
-import { Color } from '@signozhq/design-tokens';
-import { Col, Row } from 'antd';
-import { Typography } from '@signozhq/ui/typography';
-import { Minus, Plus } from '@signozhq/icons';
-
-// ** Types
-import { AdditionalFiltersProps } from './AdditionalFiltersToggler.interfaces';
-// ** Styles
-import { StyledInner, StyledLink } from './AdditionalFiltersToggler.styled';
-
-import './AdditionalFiltersToggler.styles.scss';
-
-export const AdditionalFiltersToggler = memo(function AdditionalFiltersToggler({
- children,
- listOfAdditionalFilter,
-}: AdditionalFiltersProps): JSX.Element {
- const [isOpenedFilters, setIsOpenedFilters] = useState<boolean>(false);
-
- const handleToggleOpenFilters = (): void => {
- setIsOpenedFilters((prevState) => !prevState);
- };
-
- const filtersTexts: ReactNode = listOfAdditionalFilter?.map((str, index) => {
- const isNextLast = index + 1 === listOfAdditionalFilter.length - 1;
-
- if (index === listOfAdditionalFilter.length - 1) {
- return (
- <Fragment key={str}>
- {listOfAdditionalFilter?.length > 1 && 'and'}{' '}
- <StyledLink>{str.toUpperCase()}</StyledLink>
- </Fragment>
- );
- }
-
- return (
- <span key={str}>
- <StyledLink>{str.toUpperCase()}</StyledLink>
- {isNextLast ? ' ' : ', '}
- </span>
- );
- });
-
- return (
- <Row className="additinal-filters-container">
- <Col span={24}>
- <StyledInner onClick={handleToggleOpenFilters} style={{ marginBottom: 0 }}>
- {isOpenedFilters ? (
- <span className="action-btn">
- <Minus size={14} color={Color.BG_INK_500} />
- </span>
- ) : (
- <span className="action-btn">
- <Plus size={14} color={Color.BG_INK_500} />
- </span>
- )}
-
- {!isOpenedFilters && (
- <Typography>Add conditions for {filtersTexts}</Typography>
- )}
- </StyledInner>
- </Col>
- {isOpenedFilters && <Col span={24}>{children}</Col>}
- </Row>
- );
-});
diff --git a/frontend/src/container/QueryBuilder/components/AdditionalFiltersToggler/index.ts b/frontend/src/container/QueryBuilder/components/AdditionalFiltersToggler/index.ts
deleted file mode 100644
index d08059abdf..0000000000
--- a/frontend/src/container/QueryBuilder/components/AdditionalFiltersToggler/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { AdditionalFiltersToggler } from './AdditionalFiltersToggler';
diff --git a/frontend/src/container/QueryBuilder/components/DataSourceDropdown/DataSourceDropdown.interfaces.ts b/frontend/src/container/QueryBuilder/components/DataSourceDropdown/DataSourceDropdown.interfaces.ts
index a0d602c39c..10bcc56433 100644
--- a/frontend/src/container/QueryBuilder/components/DataSourceDropdown/DataSourceDropdown.interfaces.ts
+++ b/frontend/src/container/QueryBuilder/components/DataSourceDropdown/DataSourceDropdown.interfaces.ts
@@ -1,8 +1,10 @@
import { SelectProps } from 'antd';
+import { TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
import { DataSource } from 'types/common/queryBuilder';
export type QueryLabelProps = {
onChange: (value: DataSource) => void;
- isListViewPanel?: boolean;
+ /** Defaults to every signal. */
+ allowedDataSources?: TelemetrytypesSignalDTO[];
'data-testid'?: string;
} & Omit<SelectProps, 'onChange'>;
diff --git a/frontend/src/container/QueryBuilder/components/DataSourceDropdown/DataSourceDropdown.tsx b/frontend/src/container/QueryBuilder/components/DataSourceDropdown/DataSourceDropdown.tsx
index c5f5bf00a4..ba9670f015 100644
--- a/frontend/src/container/QueryBuilder/components/DataSourceDropdown/DataSourceDropdown.tsx
+++ b/frontend/src/container/QueryBuilder/components/DataSourceDropdown/DataSourceDropdown.tsx
@@ -1,5 +1,6 @@
import { memo } from 'react';
import { Select } from 'antd';
+import { TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
import { DataSource } from 'types/common/queryBuilder';
import { SelectOption } from 'types/common/select';
// ** Helpers
@@ -7,25 +8,24 @@ import { transformToUpperCase } from 'utils/transformToUpperCase';
// ** Types
import { QueryLabelProps } from './DataSourceDropdown.interfaces';
+import { signalsToDataSources } from './DataSourceDropdown.utils';
-const dataSourceMap = [DataSource.LOGS, DataSource.METRICS, DataSource.TRACES];
-
-const exploreDataSourceMap = [DataSource.LOGS, DataSource.TRACES];
+const ALL_SIGNALS = [
+ TelemetrytypesSignalDTO.logs,
+ TelemetrytypesSignalDTO.metrics,
+ TelemetrytypesSignalDTO.traces,
+];
export const DataSourceDropdown = memo(function DataSourceDropdown(
props: QueryLabelProps,
): JSX.Element {
- const { onChange, value, style, isListViewPanel = false } = props;
+ const { onChange, value, style, allowedDataSources = ALL_SIGNALS } = props;
- const dataSourceOptions: SelectOption<DataSource, string>[] = isListViewPanel
- ? exploreDataSourceMap.map((source) => ({
- label: transformToUpperCase(source),
- value: source,
- }))
- : dataSourceMap.map((source) => ({
- label: transformToUpperCase(source),
- value: source,
- }));
+ const dataSourceOptions: SelectOption<DataSource, string>[] =
+ signalsToDataSources(allowedDataSources).map((source) => ({
+ label: transformToUpperCase(source),
+ value: source,
+ }));
return (
<Select
diff --git a/frontend/src/container/QueryBuilder/components/DataSourceDropdown/DataSourceDropdown.utils.ts b/frontend/src/container/QueryBuilder/components/DataSourceDropdown/DataSourceDropdown.utils.ts
new file mode 100644
index 0000000000..16b54b3dce
--- /dev/null
+++ b/frontend/src/container/QueryBuilder/components/DataSourceDropdown/DataSourceDropdown.utils.ts
@@ -0,0 +1,23 @@
+import { TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
+import { DataSource } from 'types/common/queryBuilder';
+
+// Total, not Partial, so a signal added to the generated enum has to be mapped here
+// before it compiles.
+const SIGNAL_TO_DATA_SOURCE: Record<
+ TelemetrytypesSignalDTO,
+ DataSource | undefined
+> = {
+ [TelemetrytypesSignalDTO.logs]: DataSource.LOGS,
+ [TelemetrytypesSignalDTO.metrics]: DataSource.METRICS,
+ [TelemetrytypesSignalDTO.traces]: DataSource.TRACES,
+ // The "unset" member: not a data source a query can be built against.
+ [TelemetrytypesSignalDTO['']]: undefined,
+};
+
+export function signalsToDataSources(
+ signals: readonly TelemetrytypesSignalDTO[],
+): DataSource[] {
+ return signals
+ .map((signal) => SIGNAL_TO_DATA_SOURCE[signal])
+ .filter((dataSource): dataSource is DataSource => Boolean(dataSource));
+}
diff --git a/frontend/src/container/QueryBuilder/components/FilterLabel/FilterLabel.interfaces.ts b/frontend/src/container/QueryBuilder/components/FilterLabel/FilterLabel.interfaces.ts
deleted file mode 100644
index aa1a7cf67e..0000000000
--- a/frontend/src/container/QueryBuilder/components/FilterLabel/FilterLabel.interfaces.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { CSSProperties } from 'react';
-
-export type FilterLabelProps = {
- label: string;
- style?: CSSProperties;
-};
diff --git a/frontend/src/container/QueryBuilder/components/FilterLabel/FilterLabel.styled.ts b/frontend/src/container/QueryBuilder/components/FilterLabel/FilterLabel.styled.ts
deleted file mode 100644
index 0ea8b1bc3c..0000000000
--- a/frontend/src/container/QueryBuilder/components/FilterLabel/FilterLabel.styled.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import styled from 'styled-components';
-
-interface Props {
- isDarkMode: boolean;
- children?: React.ReactNode;
-}
-
-export const StyledLabel = styled.div<Props>`
- padding: 0 0.6875rem;
- min-height: 2rem;
- min-width: 5.625rem;
- display: inline-flex;
- white-space: nowrap;
- align-items: center;
- border-radius: 0.125rem;
-`;
diff --git a/frontend/src/container/QueryBuilder/components/FilterLabel/FilterLabel.tsx b/frontend/src/container/QueryBuilder/components/FilterLabel/FilterLabel.tsx
deleted file mode 100644
index f5f475fb3a..0000000000
--- a/frontend/src/container/QueryBuilder/components/FilterLabel/FilterLabel.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { memo } from 'react';
-import { Typography } from '@signozhq/ui/typography';
-import { useIsDarkMode } from 'hooks/useDarkMode';
-
-// ** Types
-import { FilterLabelProps } from './FilterLabel.interfaces';
-// ** Styles
-import { StyledLabel } from './FilterLabel.styled';
-
-export const FilterLabel = memo(function FilterLabel({
- label,
-}: FilterLabelProps): JSX.Element {
- const isDarkMode = useIsDarkMode();
-
- return (
- <StyledLabel isDarkMode={isDarkMode}>
- <Typography
- style={{
- color: 'var(--bg-vanilla-400)',
- }}
- >
- {label}
- </Typography>
- </StyledLabel>
- );
-});
diff --git a/frontend/src/container/QueryBuilder/components/FilterLabel/index.ts b/frontend/src/container/QueryBuilder/components/FilterLabel/index.ts
deleted file mode 100644
index d8b9ef25eb..0000000000
--- a/frontend/src/container/QueryBuilder/components/FilterLabel/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { FilterLabel } from './FilterLabel';
diff --git a/frontend/src/container/QueryBuilder/components/Formula/Formula.interfaces.ts b/frontend/src/container/QueryBuilder/components/Formula/Formula.interfaces.ts
index 927bddb115..f9796aff0a 100644
--- a/frontend/src/container/QueryBuilder/components/Formula/Formula.interfaces.ts
+++ b/frontend/src/container/QueryBuilder/components/Formula/Formula.interfaces.ts
@@ -1,4 +1,3 @@
-import { QueryBuilderProps } from 'container/QueryBuilder/QueryBuilder.interfaces';
import {
IBuilderFormula,
IBuilderQuery,
@@ -8,7 +7,5 @@ export type FormulaProps = {
formula: IBuilderFormula;
index: number;
query: IBuilderQuery;
- filterConfigs: Partial<QueryBuilderProps['filterConfigs']>;
- isAdditionalFilterEnable: boolean;
isQBV2?: boolean;
};
diff --git a/frontend/src/container/QueryBuilder/components/Formula/Formula.tsx b/frontend/src/container/QueryBuilder/components/Formula/Formula.tsx
index e56dda7a2c..960315c847 100644
--- a/frontend/src/container/QueryBuilder/components/Formula/Formula.tsx
+++ b/frontend/src/container/QueryBuilder/components/Formula/Formula.tsx
@@ -2,11 +2,6 @@ import { ChangeEvent, useCallback, useMemo, useState } from 'react';
import { Col, Input, Row, Select } from 'antd';
import InputWithLabel from 'components/InputWithLabel/InputWithLabel';
import { LEGEND } from 'constants/global';
-// ** Components
-import { FilterLabel } from 'container/QueryBuilder/components';
-import HavingFilter from 'container/QueryBuilder/filters/Formula/Having/HavingFilter';
-import LimitFilter from 'container/QueryBuilder/filters/Formula/Limit/Limit';
-import OrderByFilter from 'container/QueryBuilder/filters/Formula/OrderBy/OrderByFilter';
// ** Hooks
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
import { useQueryOperations } from 'hooks/queryBuilder/useQueryBuilderOperations';
@@ -17,7 +12,6 @@ import {
import { getFormatedLegend } from 'utils/getFormatedLegend';
import { popupContainer } from 'utils/selectPopupContainer';
-import { AdditionalFiltersToggler } from '../AdditionalFiltersToggler';
import QBEntityOptions from '../QBEntityOptions/QBEntityOptions';
// ** Types
import { FormulaProps } from './Formula.interfaces';
@@ -27,22 +21,18 @@ import './Formula.styles.scss';
export function Formula({
index,
formula,
- filterConfigs,
query,
- isAdditionalFilterEnable,
isQBV2,
}: FormulaProps): JSX.Element {
const { removeQueryBuilderEntityByIndex, handleSetFormulaData } =
useQueryBuilder();
- const { listOfAdditionalFormulaFilters, handleChangeFormulaData } =
- useQueryOperations({
- index,
- query,
- filterConfigs,
- formula,
- entityVersion: '',
- });
+ const { handleChangeFormulaData } = useQueryOperations({
+ index,
+ query,
+ formula,
+ entityVersion: '',
+ });
const [isCollapse, setIsCollapsed] = useState(false);
@@ -83,20 +73,6 @@ export function Formula({
[handleChangeFormulaData],
);
- const handleChangeHavingFilter = useCallback(
- (value: IBuilderFormula['having']) => {
- handleChangeFormulaData('having', value);
- },
- [handleChangeFormulaData],
- );
-
- const handleChangeOrderByFilter = useCallback(
- (value: IBuilderFormula['orderBy']) => {
- handleChangeFormulaData('orderBy', value);
- },
- [handleChangeFormulaData],
- );
-
const handleQBV2OrderByChange = useCallback(
(value: string) => {
const [columnName, order] = value.split(' ');
@@ -122,54 +98,6 @@ export function Formula({
[formula.orderBy],
);
- const renderAdditionalFilters = useMemo(
- () => (
- <>
- <Col span={11}>
- <Row gutter={[11, 5]}>
- <Col flex="5.93rem">
- <FilterLabel label="Limit" />
- </Col>
- <Col flex="1 1 12.5rem">
- <LimitFilter formula={formula} onChange={handleChangeLimit} />
- </Col>
- </Row>
- </Col>
- <Col span={11}>
- <Row gutter={[11, 5]}>
- <Col flex="5.93rem">
- <FilterLabel label="HAVING" />
- </Col>
- <Col flex="1 1 12.5rem">
- <HavingFilter formula={formula} onChange={handleChangeHavingFilter} />
- </Col>
- </Row>
- </Col>
- <Col span={11}>
- <Row gutter={[11, 5]}>
- <Col flex="5.93rem">
- <FilterLabel label="Order by" />
- </Col>
- <Col flex="1 1 12.5rem">
- <OrderByFilter
- query={query}
- formula={formula}
- onChange={handleChangeOrderByFilter}
- />
- </Col>
- </Row>
- </Col>
- </>
- ),
- [
- formula,
- handleChangeHavingFilter,
- handleChangeLimit,
- handleChangeOrderByFilter,
- query,
- ],
- );
-
return (
<Row gutter={[0, 15]}>
<QBEntityOptions
@@ -206,17 +134,6 @@ export function Formula({
addonBefore="Legend Format"
/>
</Col>
- {isAdditionalFilterEnable && (
- <Col span={24}>
- <AdditionalFiltersToggler
- listOfAdditionalFilter={listOfAdditionalFormulaFilters}
- >
- <Row gutter={[0, 11]} justify="space-between">
- {renderAdditionalFilters}
- </Row>
- </AdditionalFiltersToggler>
- </Col>
- )}
{isQBV2 && (
<Col span={24}>
<div className="formula-qbv2-container">
diff --git a/frontend/src/container/QueryBuilder/components/QBEntityOptions/QBEntityOptions.styles.scss b/frontend/src/container/QueryBuilder/components/QBEntityOptions/QBEntityOptions.styles.scss
index 046eb5b708..221d6bdbc3 100644
--- a/frontend/src/container/QueryBuilder/components/QBEntityOptions/QBEntityOptions.styles.scss
+++ b/frontend/src/container/QueryBuilder/components/QBEntityOptions/QBEntityOptions.styles.scss
@@ -84,5 +84,14 @@
.options-group {
max-width: 100%;
}
+
+ .query-functions-container--disabled {
+ opacity: 0.45;
+ cursor: not-allowed;
+
+ > * {
+ pointer-events: none;
+ }
+ }
}
}
diff --git a/frontend/src/container/QueryBuilder/components/QBEntityOptions/QBEntityOptions.tsx b/frontend/src/container/QueryBuilder/components/QBEntityOptions/QBEntityOptions.tsx
index cb6f96b6fc..da9cab9535 100644
--- a/frontend/src/container/QueryBuilder/components/QBEntityOptions/QBEntityOptions.tsx
+++ b/frontend/src/container/QueryBuilder/components/QBEntityOptions/QBEntityOptions.tsx
@@ -1,5 +1,6 @@
import { useLocation } from 'react-router-dom';
import { Button, Col, Tooltip } from 'antd';
+import { TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
import cx from 'classnames';
import ROUTES from 'constants/routes';
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
@@ -26,6 +27,8 @@ interface QBEntityOptionsProps {
query?: IBuilderQuery;
isMetricsDataSource?: boolean;
showFunctions?: boolean;
+ areFunctionsDisabled?: boolean;
+ functionsDisabledReason?: string;
isCollapsed: boolean;
entityType: string;
entityData: any;
@@ -36,7 +39,8 @@ interface QBEntityOptionsProps {
onQueryFunctionsUpdates?: (functions: QueryFunction[]) => void;
showDeleteButton?: boolean;
showCloneOption?: boolean;
- isListViewPanel?: boolean;
+ isRawQuery?: boolean;
+ allowedDataSources?: TelemetrytypesSignalDTO[];
index?: number;
showTraceOperator?: boolean;
hasTraceOperator?: boolean;
@@ -50,12 +54,15 @@ export default function QBEntityOptions({
isMetricsDataSource,
isCollapsed,
showFunctions,
+ areFunctionsDisabled,
+ functionsDisabledReason,
entityType,
entityData,
onToggleVisibility,
onCollapseEntity,
onQueryFunctionsUpdates,
- isListViewPanel,
+ isRawQuery,
+ allowedDataSources,
onDelete,
showDeleteButton,
showCloneOption,
@@ -100,7 +107,7 @@ export default function QBEntityOptions({
value="query-builder"
className="periscope-btn visibility-toggle"
onClick={onToggleVisibility}
- disabled={isListViewPanel && !showTraceOperator}
+ disabled={isRawQuery && !showTraceOperator}
>
{entityData.disabled ? <EyeOff size={16} /> : <Eye size={16} />}
</Button>
@@ -119,7 +126,7 @@ export default function QBEntityOptions({
'periscope-btn',
entityType === 'query' ? 'query-name' : 'formula-name',
query?.dataSource === DataSource.TRACES &&
- (hasTraceOperator || (showTraceOperator && isListViewPanel))
+ (hasTraceOperator || (showTraceOperator && isRawQuery))
? 'has-trace-operator'
: '',
isLogsExplorerPage && lastUsedQuery === index ? 'sync-btn' : '',
@@ -138,24 +145,33 @@ export default function QBEntityOptions({
}}
data-testid={`query-data-source-selector-${index}`}
value={query?.dataSource || DataSource.METRICS}
- isListViewPanel={isListViewPanel}
+ allowedDataSources={allowedDataSources}
className="query-data-source-dropdown"
/>
</div>
)}
{showFunctions &&
- !isListViewPanel &&
+ !isRawQuery &&
(isMetricsDataSource || isLogsDataSource) &&
query &&
onQueryFunctionsUpdates && (
- <QueryFunctions
- query={query}
- queryFunctions={query.functions || []}
- key={query.functions?.toString()}
- onChange={onQueryFunctionsUpdates}
- maxFunctions={isLogsDataSource ? 1 : 3}
- />
+ <Tooltip title={functionsDisabledReason}>
+ <div
+ className={cx('query-functions-container', {
+ 'query-functions-container--disabled': areFunctionsDisabled,
+ })}
+ aria-disabled={areFunctionsDisabled}
+ >
+ <QueryFunctions
+ query={query}
+ queryFunctions={query.functions || []}
+ key={query.functions?.toString()}
+ onChange={onQueryFunctionsUpdates}
+ maxFunctions={isLogsDataSource ? 1 : 3}
+ />
+ </div>
+ </Tooltip>
)}
</Button.Group>
</div>
@@ -168,7 +184,7 @@ export default function QBEntityOptions({
)}
</div>
- {showDeleteButton && !isListViewPanel && (
+ {showDeleteButton && !isRawQuery && (
<Button className="periscope-btn ghost" onClick={onDelete}>
<Trash2 size={14} />
</Button>
@@ -179,11 +195,14 @@ export default function QBEntityOptions({
}
QBEntityOptions.defaultProps = {
- isListViewPanel: false,
+ isRawQuery: false,
+ allowedDataSources: undefined,
query: undefined,
isMetricsDataSource: false,
onQueryFunctionsUpdates: undefined,
showFunctions: false,
+ areFunctionsDisabled: false,
+ functionsDisabledReason: undefined,
onCloneQuery: noop,
index: 0,
onDelete: noop,
diff --git a/frontend/src/container/QueryBuilder/components/index.ts b/frontend/src/container/QueryBuilder/components/index.ts
index b739ff17bb..a435148c5f 100644
--- a/frontend/src/container/QueryBuilder/components/index.ts
+++ b/frontend/src/container/QueryBuilder/components/index.ts
@@ -1,6 +1,4 @@
-export { AdditionalFiltersToggler } from './AdditionalFiltersToggler';
export { DataSourceDropdown } from './DataSourceDropdown';
-export { FilterLabel } from './FilterLabel';
export { Formula } from './Formula';
export { HavingFilterTag } from './HavingFilterTag';
export { ListItemWrapper } from './ListItemWrapper';
diff --git a/frontend/src/container/QueryBuilder/filters/Formula/Having/HavingFilter.tsx b/frontend/src/container/QueryBuilder/filters/Formula/Having/HavingFilter.tsx
deleted file mode 100644
index 792c9ad23d..0000000000
--- a/frontend/src/container/QueryBuilder/filters/Formula/Having/HavingFilter.tsx
+++ /dev/null
@@ -1,198 +0,0 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import { Select } from 'antd';
-import { HAVING_OPERATORS, initialHavingValues } from 'constants/queryBuilder';
-import { HavingFilterTag } from 'container/QueryBuilder/components';
-import { useTagValidation } from 'hooks/queryBuilder/useTagValidation';
-import {
- transformFromStringToHaving,
- transformHavingToStringValue,
-} from 'lib/query/transformQueryBuilderData';
-import { Having, HavingForm } from 'types/api/queryBuilder/queryBuilderData';
-import { SelectOption } from 'types/common/select';
-import { useSelectPopupContainer } from 'utils/selectPopupContainer';
-
-import { getHavingObject, isValidHavingValue } from '../../utils';
-import { HavingFilterProps, HavingTagRenderProps } from './types';
-
-function HavingFilter({ formula, onChange }: HavingFilterProps): JSX.Element {
- const getPopupContainer = useSelectPopupContainer();
- const { having } = formula;
- const [searchText, setSearchText] = useState<string>('');
- const [localValues, setLocalValues] = useState<string[]>([]);
- const [currentFormValue, setCurrentFormValue] =
- useState<HavingForm>(initialHavingValues);
- const [options, setOptions] = useState<SelectOption<string, string>[]>([]);
-
- const { isMulti } = useTagValidation(
- currentFormValue.op,
- currentFormValue.value,
- );
-
- const columnName = formula.expression.replace(/ /g, '').toUpperCase();
-
- const aggregatorOptions: SelectOption<string, string>[] = useMemo(
- () => [{ label: columnName, value: columnName }],
- [columnName],
- );
-
- const handleUpdateTag = useCallback(
- (value: string) => {
- const filteredValues = localValues.filter(
- (currentValue) => currentValue !== value,
- );
- const having: Having[] = filteredValues.map(transformFromStringToHaving);
-
- onChange(having);
- setSearchText(value);
- },
- [localValues, onChange],
- );
-
- const generateOptions = useCallback(
- (currentString: string) => {
- const [aggregator = '', op = '', ...restValue] = currentString.split(' ');
- let newOptions: SelectOption<string, string>[] = [];
-
- const isAggregatorExist = columnName
- .toLowerCase()
- .includes(currentString.toLowerCase());
-
- const isAggregatorChosen = aggregator === columnName;
-
- if (isAggregatorExist || aggregator === '') {
- newOptions = aggregatorOptions;
- }
-
- if ((isAggregatorChosen && op === '') || op) {
- const filteredOperators = HAVING_OPERATORS.filter((num) =>
- num.toLowerCase().includes(op.toLowerCase()),
- );
-
- newOptions = filteredOperators.map((opt) => ({
- label: `${columnName} ${opt} ${restValue && restValue.join(' ')}`,
- value: `${columnName} ${opt} ${restValue && restValue.join(' ')}`,
- }));
- }
-
- setOptions(newOptions);
- },
- [aggregatorOptions, columnName],
- );
-
- const parseSearchText = useCallback(
- (text: string) => {
- const { columnName, op, value } = getHavingObject(text);
- setCurrentFormValue({ columnName, op, value });
-
- generateOptions(text);
- },
- [generateOptions],
- );
-
- const tagRender = ({
- label,
- value,
- closable,
- disabled,
- onClose,
- }: HavingTagRenderProps): JSX.Element => {
- const handleClose = (): void => {
- onClose();
- setSearchText('');
- };
- return (
- <HavingFilterTag
- label={label}
- value={value}
- closable={closable}
- disabled={disabled}
- onClose={handleClose}
- onUpdate={handleUpdateTag}
- />
- );
- };
-
- const handleSearch = (search: string): void => {
- const trimmedSearch = search.replace(/\s\s+/g, ' ').trimStart();
-
- const currentSearch = isMulti
- ? trimmedSearch
- : trimmedSearch.split(' ').slice(0, 3).join(' ');
-
- const isValidSearch = isValidHavingValue(currentSearch);
-
- if (isValidSearch) {
- setSearchText(currentSearch);
- }
- };
-
- useEffect(() => {
- setLocalValues(transformHavingToStringValue(having || []));
- }, [having]);
-
- useEffect(() => {
- parseSearchText(searchText);
- }, [searchText, parseSearchText]);
-
- const resetChanges = (): void => {
- setSearchText('');
- setCurrentFormValue(initialHavingValues);
- setOptions(aggregatorOptions);
- };
-
- const handleDeselect = (value: string): void => {
- const result = localValues.filter((item) => item !== value);
- const having: Having[] = result.map(transformFromStringToHaving);
- onChange(having);
- resetChanges();
- };
-
- const handleSelect = (currentValue: string): void => {
- const { columnName, op, value } = getHavingObject(currentValue);
-
- const isCompletedValue = value.every((item) => !!item);
-
- const isClearSearch = isCompletedValue && columnName && op;
-
- setSearchText(isClearSearch ? '' : currentValue);
- };
-
- const handleChange = (values: string[]): void => {
- const having: Having[] = values.map(transformFromStringToHaving);
-
- const isSelectable =
- currentFormValue.value.length > 0 &&
- currentFormValue.value.every((value) => !!value);
-
- if (isSelectable) {
- onChange(having);
- resetChanges();
- }
- };
-
- return (
- <Select
- getPopupContainer={getPopupContainer}
- autoClearSearchValue={false}
- mode="multiple"
- onSearch={handleSearch}
- searchValue={searchText}
- data-testid="havingSelectFormula"
- placeholder="Count(operation) > 5"
- style={{ width: '100%' }}
- tagRender={tagRender}
- onDeselect={handleDeselect}
- onSelect={handleSelect}
- onChange={handleChange}
- value={localValues}
- >
- {options.map((opt) => (
- <Select.Option key={opt.value} value={opt.value} title="havingOption">
- {opt.label}
- </Select.Option>
- ))}
- </Select>
- );
-}
-
-export default HavingFilter;
diff --git a/frontend/src/container/QueryBuilder/filters/Formula/Having/types.ts b/frontend/src/container/QueryBuilder/filters/Formula/Having/types.ts
deleted file mode 100644
index bf8669989b..0000000000
--- a/frontend/src/container/QueryBuilder/filters/Formula/Having/types.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { HavingFilterTagProps } from 'container/QueryBuilder/components/HavingFilterTag/HavingFilterTag.interfaces';
-import {
- Having,
- IBuilderFormula,
-} from 'types/api/queryBuilder/queryBuilderData';
-
-export type HavingFilterProps = {
- formula: IBuilderFormula;
- onChange: (having: Having[]) => void;
-};
-
-export type HavingTagRenderProps = Omit<HavingFilterTagProps, 'onUpdate'>;
diff --git a/frontend/src/container/QueryBuilder/filters/Formula/Limit/Limit.tsx b/frontend/src/container/QueryBuilder/filters/Formula/Limit/Limit.tsx
deleted file mode 100644
index 33dc8f6387..0000000000
--- a/frontend/src/container/QueryBuilder/filters/Formula/Limit/Limit.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { InputNumber } from 'antd';
-
-import { selectStyle } from '../../QueryBuilderSearchV2/config';
-import { handleKeyDownLimitFilter } from '../../utils';
-import { LimitFilterProps } from './types';
-
-function LimitFilter({ onChange, formula }: LimitFilterProps): JSX.Element {
- return (
- <InputNumber
- min={1}
- type="number"
- value={formula.limit}
- style={selectStyle}
- onChange={onChange}
- onKeyDown={handleKeyDownLimitFilter}
- />
- );
-}
-
-export default LimitFilter;
diff --git a/frontend/src/container/QueryBuilder/filters/Formula/Limit/types.ts b/frontend/src/container/QueryBuilder/filters/Formula/Limit/types.ts
deleted file mode 100644
index ca3a6635e7..0000000000
--- a/frontend/src/container/QueryBuilder/filters/Formula/Limit/types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { IBuilderFormula } from 'types/api/queryBuilder/queryBuilderData';
-
-export interface LimitFilterProps {
- onChange: (values: number | null) => void;
- formula: IBuilderFormula;
-}
diff --git a/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/OrderByFilter.tsx b/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/OrderByFilter.tsx
deleted file mode 100644
index ea843e3dd5..0000000000
--- a/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/OrderByFilter.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import { useMemo } from 'react';
-import { Select, Spin } from 'antd';
-import { useGetAggregateKeys } from 'hooks/queryBuilder/useGetAggregateKeys';
-import { MetricAggregateOperator } from 'types/common/queryBuilder';
-import { useSelectPopupContainer } from 'utils/selectPopupContainer';
-
-import { selectStyle } from '../../QueryBuilderSearchV2/config';
-import { OrderByProps } from './types';
-import { useOrderByFormulaFilter } from './useOrderByFormulaFilter';
-
-function OrderByFilter({
- formula,
- onChange,
- query,
-}: OrderByProps): JSX.Element {
- const getPopupContainer = useSelectPopupContainer();
- const {
- debouncedSearchText,
- createOptions,
- aggregationOptions,
- handleChange,
- handleSearchKeys,
- selectedValue,
- generateOptions,
- } = useOrderByFormulaFilter({
- query,
- onChange,
- formula,
- });
-
- const { data, isFetching } = useGetAggregateKeys(
- {
- aggregateAttribute: query.aggregateAttribute?.key || '',
- dataSource: query.dataSource,
- aggregateOperator: query.aggregateOperator || '',
- searchText: debouncedSearchText,
- },
- {
- enabled: !!query.aggregateAttribute?.key,
- keepPreviousData: true,
- },
- );
-
- const optionsData = useMemo(() => {
- const keyOptions = createOptions(data?.payload?.attributeKeys || []);
- const groupByOptions = createOptions(query.groupBy);
- const options =
- query.aggregateOperator === MetricAggregateOperator.NOOP
- ? keyOptions
- : [...groupByOptions, ...aggregationOptions];
-
- return generateOptions(options);
- }, [
- aggregationOptions,
- createOptions,
- data?.payload?.attributeKeys,
- generateOptions,
- query.aggregateOperator,
- query.groupBy,
- ]);
-
- const isDisabledSelect =
- !query.aggregateAttribute?.key ||
- query.aggregateOperator === MetricAggregateOperator.NOOP;
-
- return (
- <Select
- getPopupContainer={getPopupContainer}
- mode="tags"
- style={selectStyle}
- onSearch={handleSearchKeys}
- showSearch
- disabled={isDisabledSelect}
- showArrow={false}
- value={selectedValue}
- labelInValue
- filterOption={false}
- options={optionsData}
- notFoundContent={isFetching ? <Spin size="small" /> : null}
- onChange={handleChange}
- />
- );
-}
-
-export default OrderByFilter;
diff --git a/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/types.ts b/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/types.ts
deleted file mode 100644
index 0d83e4bd0e..0000000000
--- a/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/types.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import {
- IBuilderFormula,
- IBuilderQuery,
-} from 'types/api/queryBuilder/queryBuilderData';
-
-export interface OrderByProps {
- formula: IBuilderFormula;
- query: IBuilderQuery;
- onChange: (value: IBuilderFormula['orderBy']) => void;
-}
-
-export type IOrderByFormulaFilterProps = OrderByProps;
diff --git a/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/useOrderByFormulaFilter.tsx b/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/useOrderByFormulaFilter.tsx
deleted file mode 100644
index 1c8d1e23ea..0000000000
--- a/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/useOrderByFormulaFilter.tsx
+++ /dev/null
@@ -1,129 +0,0 @@
-import { useMemo, useState } from 'react';
-import { DEBOUNCE_DELAY } from 'constants/queryBuilderFilterConfig';
-import useDebounce from 'hooks/useDebounce';
-import { IOption } from 'hooks/useResourceAttribute/types';
-import isEqual from 'lodash-es/isEqual';
-import uniqWith from 'lodash-es/uniqWith';
-import { parse } from 'papaparse';
-import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { OrderByPayload } from 'types/api/queryBuilder/queryBuilderData';
-
-import { ORDERBY_FILTERS } from '../../OrderByFilter/config';
-import { SIGNOZ_VALUE } from '../../OrderByFilter/constants';
-import { UseOrderByFilterResult } from '../../OrderByFilter/useOrderByFilter';
-import {
- getLabelFromValue,
- mapLabelValuePairs,
- orderByValueDelimiter,
-} from '../../OrderByFilter/utils';
-import { getRemoveOrderFromValue } from '../../QueryBuilderSearchV2/utils';
-import { getUniqueOrderByValues, getValidOrderByResult } from '../../utils';
-import { IOrderByFormulaFilterProps } from './types';
-import { transformToOrderByStringValuesByFormula } from './utils';
-
-export const useOrderByFormulaFilter = ({
- onChange,
- formula,
-}: IOrderByFormulaFilterProps): UseOrderByFilterResult => {
- const [searchText, setSearchText] = useState<string>('');
-
- const debouncedSearchText = useDebounce(searchText, DEBOUNCE_DELAY);
-
- const handleSearchKeys = (searchText: string): void =>
- setSearchText(searchText);
-
- const handleChange = (values: IOption[]): void => {
- const validResult = getValidOrderByResult(values);
- const result = getUniqueOrderByValues(validResult);
-
- const orderByValues: OrderByPayload[] = result.map((item) => {
- const match = parse(item.value, { delimiter: orderByValueDelimiter });
-
- if (!match) {
- return {
- columnName: item.value,
- order: ORDERBY_FILTERS.ASC,
- };
- }
-
- const [columnName, order] = match.data.flat() as string[];
-
- const columnNameValue =
- columnName === SIGNOZ_VALUE ? SIGNOZ_VALUE : columnName;
-
- const orderValue = order ?? ORDERBY_FILTERS.ASC;
-
- return {
- columnName: columnNameValue,
- order: orderValue,
- };
- });
-
- setSearchText('');
- onChange(orderByValues);
- };
-
- const aggregationOptions = [
- {
- label: `${formula.expression} ${ORDERBY_FILTERS.ASC}`,
- value: `${SIGNOZ_VALUE}${orderByValueDelimiter}${ORDERBY_FILTERS.ASC}`,
- },
- {
- label: `${formula.expression} ${ORDERBY_FILTERS.DESC}`,
- value: `${SIGNOZ_VALUE}${orderByValueDelimiter}${ORDERBY_FILTERS.DESC}`,
- },
- ];
-
- const selectedValue = transformToOrderByStringValuesByFormula(formula);
-
- const createOptions = (data: BaseAutocompleteData[]): IOption[] =>
- mapLabelValuePairs(data).flat();
-
- const customValue: IOption[] = useMemo(() => {
- if (!searchText) {
- return [];
- }
-
- return [
- {
- label: `${searchText} ${ORDERBY_FILTERS.ASC}`,
- value: `${searchText}${orderByValueDelimiter}${ORDERBY_FILTERS.ASC}`,
- },
- {
- label: `${searchText} ${ORDERBY_FILTERS.DESC}`,
- value: `${searchText}${orderByValueDelimiter}${ORDERBY_FILTERS.DESC}`,
- },
- ];
- }, [searchText]);
-
- const generateOptions = (options: IOption[]): IOption[] => {
- const currentCustomValue = options.find(
- (keyOption) =>
- getRemoveOrderFromValue(keyOption.value) === debouncedSearchText,
- )
- ? []
- : customValue;
-
- const result = [...currentCustomValue, ...options];
-
- const uniqResult = uniqWith(result, isEqual);
-
- return uniqResult.filter(
- (option) =>
- !getLabelFromValue(selectedValue).includes(
- getRemoveOrderFromValue(option.value),
- ),
- );
- };
-
- return {
- searchText,
- debouncedSearchText,
- selectedValue,
- aggregationOptions,
- createOptions,
- handleChange,
- handleSearchKeys,
- generateOptions,
- };
-};
diff --git a/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/utils.ts b/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/utils.ts
deleted file mode 100644
index afe056edec..0000000000
--- a/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/utils.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { IOption } from 'hooks/useResourceAttribute/types';
-import { IBuilderFormula } from 'types/api/queryBuilder/queryBuilderData';
-
-import { SIGNOZ_VALUE } from '../../OrderByFilter/constants';
-import { orderByValueDelimiter } from '../../OrderByFilter/utils';
-
-export const transformToOrderByStringValuesByFormula = (
- formula: IBuilderFormula,
-): IOption[] => {
- const prepareSelectedValue: IOption[] =
- formula?.orderBy?.map((item) => {
- if (item.columnName === SIGNOZ_VALUE) {
- return {
- label: `${formula.expression} ${item.order}`,
- value: `${item.columnName}${orderByValueDelimiter}${item.order}`,
- };
- }
-
- return {
- label: `${item.columnName} ${item.order}`,
- value: `${item.columnName}${orderByValueDelimiter}${item.order}`,
- };
- }) || [];
-
- return prepareSelectedValue;
-};
diff --git a/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.interfaces.ts b/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.interfaces.ts
index ce8f4a4bd9..0ab051386b 100644
--- a/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.interfaces.ts
+++ b/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.interfaces.ts
@@ -6,7 +6,7 @@ import {
export type OrderByFilterProps = {
query: IBuilderQuery;
onChange: (values: OrderByPayload[]) => void;
- isListViewPanel?: boolean;
+ isRawQuery?: boolean;
entityVersion?: string;
isNewQueryV2?: boolean;
};
diff --git a/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.tsx b/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.tsx
index 2167c469b5..96a7d31df9 100644
--- a/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.tsx
+++ b/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.tsx
@@ -12,7 +12,7 @@ import { useOrderByFilter } from './useOrderByFilter';
export function OrderByFilter({
query,
onChange,
- isListViewPanel = false,
+ isRawQuery = false,
entityVersion,
isNewQueryV2 = false,
}: OrderByFilterProps): JSX.Element {
@@ -35,7 +35,7 @@ export function OrderByFilter({
searchText: debouncedSearchText,
},
{
- enabled: !!query.aggregateAttribute?.key || isListViewPanel,
+ enabled: !!query.aggregateAttribute?.key || isRawQuery,
keepPreviousData: true,
},
);
diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx
index be2afa1c6d..d2fbfdd300 100644
--- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx
+++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx
@@ -19,7 +19,6 @@ import {
QUERY_BUILDER_SEARCH_VALUES,
} from 'constants/queryBuilder';
import { DEBOUNCE_DELAY } from 'constants/queryBuilderFilterConfig';
-import type { WhereClauseConfig } from 'container/QueryBuilder/QueryBuilder.interfaces';
import { LogsExplorerShortcuts } from 'constants/shortcuts/logsExplorerShortcuts';
import { useDynamicVariableSuggestions } from 'hooks/dashboard/useDynamicVariableSuggestions';
import { useKeyboardHotkeys } from 'hooks/hotkeys/useKeyboardHotkeys';
@@ -88,7 +87,6 @@ interface CustomTagProps {
interface QueryBuilderSearchV2Props {
query: IBuilderQuery;
onChange: (value: TagFilter) => void;
- whereClauseConfig?: WhereClauseConfig;
placeholder?: string;
className?: string;
suffixIcon?: React.ReactNode;
@@ -145,7 +143,6 @@ function QueryBuilderSearchV2(
placeholder,
className,
suffixIcon,
- whereClauseConfig,
hardcodedAttributeKeys,
hasPopupContainer,
rootClassName,
@@ -477,31 +474,7 @@ function QueryBuilderSearchV2(
if (searchValue) {
const operatorType =
operatorTypeMapper[currentFilterItem?.op || ''] || 'NOT_VALID';
- // if key is added and operator is not present then convert to body CONTAINS key
if (
- currentFilterItem?.key &&
- isEmpty(currentFilterItem?.op) &&
- whereClauseConfig?.customKey === 'body' &&
- whereClauseConfig?.customOp === OPERATORS.CONTAINS
- ) {
- // eslint-disable-next-line sonarjs/no-identical-functions
- setTags((prev) => [
- ...prev,
- {
- key: {
- key: 'body',
- dataType: DataTypes.String,
- type: '',
- id: 'body--string----true',
- },
- op: OPERATORS.CONTAINS,
- value: currentFilterItem?.key?.key,
- },
- ]);
- setCurrentFilterItem(undefined);
- setSearchValue('');
- setCurrentState(DropdownState.ATTRIBUTE_KEY);
- } else if (
currentFilterItem?.op === OPERATORS.EXISTS ||
currentFilterItem?.op === OPERATORS.NOT_EXISTS
) {
@@ -543,8 +516,6 @@ function QueryBuilderSearchV2(
currentFilterItem?.op,
currentFilterItem?.value,
searchValue,
- whereClauseConfig?.customKey,
- whereClauseConfig?.customOp,
]);
// this useEffect takes care of tokenisation based on the search state
@@ -1085,7 +1056,6 @@ QueryBuilderSearchV2.defaultProps = {
placeholder: PLACEHOLDER,
className: '',
suffixIcon: null,
- whereClauseConfig: {},
hasPopupContainer: true,
rootClassName: '',
hardcodedAttributeKeys: undefined,
diff --git a/frontend/src/container/QueryBuilder/type.ts b/frontend/src/container/QueryBuilder/type.ts
index 68a1b4bca0..5f0bc915d5 100644
--- a/frontend/src/container/QueryBuilder/type.ts
+++ b/frontend/src/container/QueryBuilder/type.ts
@@ -26,7 +26,7 @@ export type QueryProps = {
isAvailableToDisable: boolean;
query: IBuilderQuery;
queryVariant?: 'static' | 'dropdown';
- isListViewPanel?: boolean;
+ isRawQuery?: boolean;
showFunctions?: boolean;
version: string;
showSpanScopeSelector?: boolean;
@@ -35,4 +35,4 @@ export type QueryProps = {
hasTraceOperator?: boolean;
signalSource?: string;
isMultiQueryAllowed?: boolean;
-} & Pick<QueryBuilderProps, 'filterConfigs' | 'queryComponents'>;
+} & Pick<QueryBuilderProps, 'fieldsConfig' | 'allowedDataSources'>;
diff --git a/frontend/src/container/TracesExplorer/QuerySection/index.tsx b/frontend/src/container/TracesExplorer/QuerySection/index.tsx
index aa664aa8b0..c7294d07ad 100644
--- a/frontend/src/container/TracesExplorer/QuerySection/index.tsx
+++ b/frontend/src/container/TracesExplorer/QuerySection/index.tsx
@@ -1,55 +1,23 @@
-import { memo, useCallback, useMemo } from 'react';
+import { memo, useMemo } from 'react';
import { QueryBuilderV2 } from 'components/QueryBuilderV2/QueryBuilderV2';
import { PANEL_TYPES } from 'constants/queryBuilder';
-import ExplorerOrderBy from 'container/ExplorerOrderBy';
-import { OrderByFilterProps } from 'container/QueryBuilder/filters/OrderByFilter/OrderByFilter.interfaces';
-import { QueryBuilderProps } from 'container/QueryBuilder/QueryBuilder.interfaces';
import { useGetPanelTypesQueryParam } from 'hooks/queryBuilder/useGetPanelTypesQueryParam';
import { DataSource } from 'types/common/queryBuilder';
function QuerySection(): JSX.Element {
const panelTypes = useGetPanelTypesQueryParam(PANEL_TYPES.LIST);
- const filterConfigs: QueryBuilderProps['filterConfigs'] = useMemo(() => {
- const isList = panelTypes === PANEL_TYPES.LIST;
- const config: QueryBuilderProps['filterConfigs'] = {
- stepInterval: { isHidden: false, isDisabled: false },
- limit: { isHidden: isList, isDisabled: true },
- having: { isHidden: isList, isDisabled: true },
- };
-
- return config;
- }, [panelTypes]);
-
- const renderOrderBy = useCallback(
- ({ query, onChange }: OrderByFilterProps) => (
- <ExplorerOrderBy query={query} onChange={onChange} />
- ),
- [],
- );
-
- const queryComponents = useMemo((): QueryBuilderProps['queryComponents'] => {
- const shouldRenderCustomOrderBy =
- panelTypes === PANEL_TYPES.LIST || panelTypes === PANEL_TYPES.TRACE;
-
- return {
- ...(shouldRenderCustomOrderBy ? { renderOrderBy } : {}),
- };
- }, [panelTypes, renderOrderBy]);
-
- const isListViewPanel = useMemo(
+ const isRawQuery = useMemo(
() => panelTypes === PANEL_TYPES.LIST || panelTypes === PANEL_TYPES.TRACE,
[panelTypes],
);
return (
<QueryBuilderV2
- isListViewPanel={isListViewPanel}
+ isRawQuery={isRawQuery}
showTraceOperator
config={{ initialDataSource: DataSource.TRACES, queryVariant: 'static' }}
- queryComponents={queryComponents}
panelType={panelTypes}
- filterConfigs={filterConfigs}
showOnlyWhereClause={
panelTypes === PANEL_TYPES.LIST || panelTypes === PANEL_TYPES.TRACE
}
diff --git a/frontend/src/container/WidgetCard/Card/FullView/index.tsx b/frontend/src/container/WidgetCard/Card/FullView/index.tsx
index 2458c7834c..a11c232ef4 100644
--- a/frontend/src/container/WidgetCard/Card/FullView/index.tsx
+++ b/frontend/src/container/WidgetCard/Card/FullView/index.tsx
@@ -316,7 +316,7 @@ function FullView({
<QueryBuilderV2
panelType={selectedPanelType}
version="v3"
- isListViewPanel={selectedPanelType === PANEL_TYPES.LIST}
+ isRawQuery={selectedPanelType === PANEL_TYPES.LIST}
signalSourceChangeEnabled
// filterConfigs={filterConfigs}
// queryComponents={queryComponents}
diff --git a/frontend/src/hooks/queryBuilder/useQueryBuilderOperations.ts b/frontend/src/hooks/queryBuilder/useQueryBuilderOperations.ts
index 4a7c6f1f3a..dcc80bfa99 100644
--- a/frontend/src/hooks/queryBuilder/useQueryBuilderOperations.ts
+++ b/frontend/src/hooks/queryBuilder/useQueryBuilderOperations.ts
@@ -14,8 +14,6 @@ import {
initialQueryBuilderFormValuesMap,
listViewInitialLogQuery,
listViewInitialTraceQuery,
- mapOfFormulaToFilters,
- mapOfQueryFilters,
PANEL_TYPES,
} from 'constants/queryBuilder';
import {
@@ -59,9 +57,8 @@ import { getFormatedLegend } from 'utils/getFormatedLegend';
export const useQueryOperations: UseQueryOperations = ({
query,
index,
- filterConfigs,
formula,
- isListViewPanel = false,
+ isRawQuery = false,
entityVersion,
isForTraceOperator = false,
savePreviousQuery = false,
@@ -105,46 +102,7 @@ export const useQueryOperations: UseQueryOperations = ({
}
}, [query]);
- const { dataSource, aggregateOperator } = query;
-
- const getNewListOfAdditionalFilters = useCallback(
- (dataSource: DataSource, isQuery: boolean): string[] => {
- const additionalFiltersKeys: (keyof Pick<
- IBuilderQuery,
- 'orderBy' | 'limit' | 'having' | 'stepInterval'
- >)[] = ['having', 'limit', 'orderBy', 'stepInterval'];
-
- const mapsOfFilters = isQuery ? mapOfQueryFilters : mapOfFormulaToFilters;
-
- const result: string[] = mapsOfFilters[dataSource]?.reduce<string[]>(
- (acc, item) => {
- if (
- filterConfigs &&
- filterConfigs[item.field as (typeof additionalFiltersKeys)[number]]
- ?.isHidden
- ) {
- return acc;
- }
-
- acc.push(item.text);
-
- return acc;
- },
- [],
- );
-
- return result;
- },
-
- [filterConfigs],
- );
-
- const [listOfAdditionalFilters, setListOfAdditionalFilters] = useState<
- string[]
- >(getNewListOfAdditionalFilters(dataSource, true));
-
- const [listOfAdditionalFormulaFilters, setListOfAdditionalFormulaFilters] =
- useState<string[]>(getNewListOfAdditionalFilters(dataSource, false));
+ const { dataSource } = query;
const handleChangeOperator = useCallback(
(value: string): void => {
@@ -460,7 +418,7 @@ export const useQueryOperations: UseQueryOperations = ({
removeKeyFromPreviousQuery(newKey);
}
- if (isListViewPanel) {
+ if (isRawQuery) {
let listPanelQuery: Query | null = null;
if (nextSource === DataSource.LOGS) {
@@ -506,7 +464,7 @@ export const useQueryOperations: UseQueryOperations = ({
handleSetQueryData(index, newQueryData);
},
[
- isListViewPanel,
+ isRawQuery,
panelType,
query,
handleSetQueryData,
@@ -625,32 +583,18 @@ export const useQueryOperations: UseQueryOperations = ({
handleMetricAggregateAtributeTypes,
]);
- useEffect(() => {
- const additionalFilters = getNewListOfAdditionalFilters(dataSource, true);
-
- setListOfAdditionalFilters(additionalFilters);
- }, [dataSource, aggregateOperator, getNewListOfAdditionalFilters]);
-
- useEffect(() => {
- const additionalFilters = getNewListOfAdditionalFilters(dataSource, false);
-
- setListOfAdditionalFormulaFilters(additionalFilters);
- }, [dataSource, aggregateOperator, getNewListOfAdditionalFilters]);
-
return {
isTracePanelType,
isMetricsDataSource,
isLogsDataSource,
operators,
spaceAggregationOptions,
- listOfAdditionalFilters,
handleChangeOperator,
handleSpaceAggregationChange,
handleChangeAggregatorAttribute,
handleChangeDataSource,
handleDeleteQuery,
handleChangeQueryData,
- listOfAdditionalFormulaFilters,
handleChangeFormulaData,
handleQueryFunctionsUpdates,
};
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/PanelEditorQueryBuilder.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/PanelEditorQueryBuilder.tsx
index 731b392533..bf78f43518 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/PanelEditorQueryBuilder.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/PanelEditorQueryBuilder.tsx
@@ -9,19 +9,17 @@ import { Atom, Terminal } from '@signozhq/icons';
import { Tabs } from 'antd';
import cx from 'classnames';
import { Typography } from '@signozhq/ui/typography';
-import type { TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
import PromQLIcon from 'assets/Dashboard/PromQl';
import { QueryBuilderV2 } from 'components/QueryBuilderV2/QueryBuilderV2';
import TextToolTip from 'components/TextToolTip';
import ClickHouseQueryContainer from 'container/QueryBuilder/rawQueryEditors/ClickHouse';
import PromQLQueryContainer from 'container/QueryBuilder/rawQueryEditors/PromQL';
import RunQueryBtn from 'container/QueryBuilder/components/RunQueryBtn/RunQueryBtn';
-import { QueryBuilderProps } from 'container/QueryBuilder/QueryBuilder.interfaces';
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
import { useIsDarkMode } from 'hooks/useDarkMode';
import { EQueryType } from 'types/common/dashboard';
-import { mergeQueryBuilderFieldRule } from '../../Panels/types/panelCapabilities';
+import { isRawRequest } from '../../Panels/types/panelCapabilities';
import type { RenderableQueryPanelDefinition } from '../../Panels/types/panelDefinition';
import { toPanelType } from '../../Panels/types/panelKind';
@@ -30,8 +28,6 @@ import styles from './PanelEditorQueryBuilder.module.scss';
interface PanelEditorQueryBuilderProps {
/** The edited kind's definition — drives supported query types + field visibility. */
panelDefinition: RenderableQueryPanelDefinition;
- /** The panel's current signal; selects per-signal query-builder field rules. */
- signal: TelemetrytypesSignalDTO;
/** Preview fetch in flight — drives the Stage & Run button's loading/cancel state. */
isLoadingQueries: boolean;
/** Run the current query (Stage & Run button / ⌘↵). Always re-runs. */
@@ -51,7 +47,6 @@ interface PanelEditorQueryBuilderProps {
*/
function PanelEditorQueryBuilder({
panelDefinition,
- signal,
isLoadingQueries,
onStageRunQuery,
onCancelQuery,
@@ -63,7 +58,7 @@ function PanelEditorQueryBuilder({
const panelType = toPanelType(panelDefinition.kind);
// Raw rows: the builder drops its aggregation controls, and with them the trace
// operator that combines aggregated trace queries (V1 parity).
- const isListViewPanel = panelDefinition.kind === 'signoz/ListPanel';
+ const isRawQuery = isRawRequest(panelDefinition.queryCapabilities);
const { currentQuery, redirectWithQueryBuilderData } = useQueryBuilder();
const isDarkMode = useIsDarkMode();
@@ -91,13 +86,6 @@ function PanelEditorQueryBuilder({
[onStageRunQuery],
);
- // Per-kind query-builder field rules from the guard (e.g. List hides step interval
- // and having), passed to QueryBuilderV2 as its `filterConfigs`.
- const filterConfigs: QueryBuilderProps['filterConfigs'] = useMemo(
- () => mergeQueryBuilderFieldRule(panelDefinition.queryBuilderFields, signal),
- [panelDefinition.queryBuilderFields, signal],
- );
-
const items = useMemo(() => {
const { supportedQueryTypes } = panelDefinition;
@@ -109,11 +97,10 @@ function PanelEditorQueryBuilder({
<div className="query-builder-v2-container">
<QueryBuilderV2
panelType={panelType}
- filterConfigs={filterConfigs}
- showTraceOperator={!isListViewPanel}
+ fieldsConfig={panelDefinition.queryBuilderFields}
+ showTraceOperator={!isRawQuery}
version="v3"
- isListViewPanel={isListViewPanel}
- queryComponents={{}}
+ isRawQuery={isRawQuery}
signalSourceChangeEnabled
savePreviousQuery
/>
@@ -146,7 +133,7 @@ function PanelEditorQueryBuilder({
),
children: queryTypeComponents[queryType].component,
}));
- }, [panelDefinition, panelType, filterConfigs, isDarkMode, isListViewPanel]);
+ }, [panelDefinition, panelType, isDarkMode, isRawQuery]);
return (
<div
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/QueryBuilderEditorPane.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/QueryBuilderEditorPane.tsx
index 9a62d78b2d..0955a37d64 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/QueryBuilderEditorPane.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/QueryBuilderEditorPane.tsx
@@ -7,7 +7,6 @@ import PanelEditorQueryBuilder from './PanelEditorQueryBuilder';
*/
function QueryBuilderEditorPane({
panelDefinition,
- signal,
isLoadingQueries,
onStageRunQuery,
onCancelQuery,
@@ -16,7 +15,6 @@ function QueryBuilderEditorPane({
return (
<PanelEditorQueryBuilder
panelDefinition={panelDefinition}
- signal={signal}
isLoadingQueries={isLoadingQueries}
onStageRunQuery={onStageRunQuery}
onCancelQuery={onCancelQuery}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/__tests__/PanelEditorQueryBuilder.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/__tests__/PanelEditorQueryBuilder.test.tsx
index 8d6c4b438b..e5f2fba8dc 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/__tests__/PanelEditorQueryBuilder.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/__tests__/PanelEditorQueryBuilder.test.tsx
@@ -1,6 +1,4 @@
import { render, screen } from '@testing-library/react';
-import { TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
-import { OPERATORS } from 'constants/queryBuilder';
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
import { EQueryType } from 'types/common/dashboard';
@@ -45,14 +43,10 @@ jest.mock('assets/Dashboard/PromQl', () => ({
const mockUseQueryBuilder = useQueryBuilder as unknown as jest.Mock;
-function renderBuilder(
- panelKind: string,
- signal: TelemetrytypesSignalDTO = TelemetrytypesSignalDTO.logs,
-): void {
+function renderBuilder(panelKind: string): void {
render(
<PanelEditorQueryBuilder
panelDefinition={requireQueryPanelDefinition(panelKind as PanelKind)}
- signal={signal}
isLoadingQueries={false}
onStageRunQuery={jest.fn()}
onCancelQuery={jest.fn()}
@@ -62,9 +56,9 @@ function renderBuilder(
function lastQueryBuilderProps(): {
panelType: string;
- isListViewPanel: boolean;
+ isRawQuery: boolean;
showTraceOperator: boolean;
- filterConfigs: unknown;
+ fieldsConfig: unknown;
} {
const calls = mockQueryBuilderV2.mock.calls;
return calls[calls.length - 1][0];
@@ -80,7 +74,7 @@ describe('PanelEditorQueryBuilder query-type tabs (driven by the capabilities gu
});
it('shows only the Query Builder tab for the List kind', () => {
- renderBuilder('signoz/ListPanel', TelemetrytypesSignalDTO.logs);
+ renderBuilder('signoz/ListPanel');
expect(screen.getByText('Query Builder')).toBeInTheDocument();
expect(screen.queryByText('ClickHouse Query')).not.toBeInTheDocument();
@@ -114,40 +108,24 @@ describe('PanelEditorQueryBuilder field visibility (driven by the capabilities g
});
it('passes empty field config + non-list flag for a non-list kind', () => {
- renderBuilder('signoz/TimeSeriesPanel', TelemetrytypesSignalDTO.metrics);
+ renderBuilder('signoz/TimeSeriesPanel');
const props = lastQueryBuilderProps();
expect(props.panelType).toBe('graph');
- expect(props.isListViewPanel).toBe(false);
+ expect(props.isRawQuery).toBe(false);
// The trace operator combines aggregated trace queries, so it rides along with
// the aggregation controls.
expect(props.showTraceOperator).toBe(true);
- expect(props.filterConfigs).toStrictEqual({});
+ expect(props.fieldsConfig).toStrictEqual({});
});
- it('hides step interval / having and sets body-contains for List + logs', () => {
- renderBuilder('signoz/ListPanel', TelemetrytypesSignalDTO.logs);
+ it('marks List raw and leaves the field surface to the raw baseline', () => {
+ renderBuilder('signoz/ListPanel');
const props = lastQueryBuilderProps();
expect(props.panelType).toBe('list');
- expect(props.isListViewPanel).toBe(true);
+ expect(props.isRawQuery).toBe(true);
expect(props.showTraceOperator).toBe(false);
- expect(props.filterConfigs).toStrictEqual({
- stepInterval: { isHidden: true, isDisabled: true },
- having: { isHidden: true, isDisabled: true },
- filters: { customKey: 'body', customOp: OPERATORS.CONTAINS },
- });
- });
-
- it('additionally hides limit for List + traces', () => {
- renderBuilder('signoz/ListPanel', TelemetrytypesSignalDTO.traces);
-
- const props = lastQueryBuilderProps();
- expect(props.filterConfigs).toStrictEqual({
- stepInterval: { isHidden: true, isDisabled: true },
- having: { isHidden: true, isDisabled: true },
- limit: { isHidden: true, isDisabled: true },
- filters: { customKey: 'body', customOp: OPERATORS.CONTAINS },
- });
+ expect(props.fieldsConfig).toStrictEqual({});
});
});
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/__tests__/panelEditorUrlQuery.promql.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/__tests__/panelEditorUrlQuery.promql.test.tsx
index c281e2788c..9ba5ce8087 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/__tests__/panelEditorUrlQuery.promql.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/__tests__/panelEditorUrlQuery.promql.test.tsx
@@ -86,7 +86,6 @@ function EditorRoute(): JSX.Element {
return (
<PanelEditorQueryBuilder
panelDefinition={requireQueryPanelDefinition('signoz/TimeSeriesPanel')}
- signal={TelemetrytypesSignalDTO.metrics}
isLoadingQueries={false}
onStageRunQuery={noop}
onCancelQuery={noop}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/__tests__/capabilities.test.ts b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/__tests__/capabilities.test.ts
index a004a37e89..f69d631184 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/__tests__/capabilities.test.ts
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/__tests__/capabilities.test.ts
@@ -2,7 +2,6 @@ import {
Querybuildertypesv5RequestTypeDTO,
TelemetrytypesSignalDTO,
} from 'api/generated/services/sigNoz.schemas';
-import { OPERATORS } from 'constants/queryBuilder';
import { EQueryType } from 'types/common/dashboard';
import { UNSUPPORTED_PANEL } from '../kinds/UnsupportedPanel/definition';
@@ -10,7 +9,6 @@ import { getPanelDefinition, isPanelKindSupported } from '../registry';
import type { PanelQueryCapabilities } from '../types/panelCapabilities';
import { NO_PANEL_ACTIONS } from '../types/panelDefinition';
import {
- getHiddenQueryBuilderFields,
getQueryPanelDefinition,
requireQueryPanelDefinition,
getSupportedQueryTypes,
@@ -144,7 +142,6 @@ describe('panel capabilities guard', () => {
expect(
isPanelCombinationValid({ kind: unknownKind, queryType: QUERY_BUILDER }),
).toBe(false);
- expect(getHiddenQueryBuilderFields(unknownKind, logs)).toStrictEqual({});
expect(getPanelDefinition(unknownKind).sections).toStrictEqual([]);
});
@@ -267,37 +264,4 @@ describe('panel capabilities guard', () => {
expect(resolveQueryType('signoz/TablePanel', PROM)).toBe(QUERY_BUILDER);
});
});
-
- describe('getHiddenQueryBuilderFields', () => {
- it('returns {} for kinds that declare no field rules', () => {
- expect(
- getHiddenQueryBuilderFields('signoz/TimeSeriesPanel', logs),
- ).toStrictEqual({});
- expect(getHiddenQueryBuilderFields('signoz/TablePanel', logs)).toStrictEqual(
- {},
- );
- });
-
- // Mirrors QueryBuilderV2's internal listViewLogFilterConfigs — the guard is the
- // single source of truth for these values.
- it('hides step interval / having and sets body-contains for List + logs', () => {
- expect(getHiddenQueryBuilderFields('signoz/ListPanel', logs)).toStrictEqual({
- stepInterval: { isHidden: true, isDisabled: true },
- having: { isHidden: true, isDisabled: true },
- filters: { customKey: 'body', customOp: OPERATORS.CONTAINS },
- });
- });
-
- // Mirrors listViewTracesFilterConfigs — traces additionally hide `limit`.
- it('additionally hides limit for List + traces', () => {
- expect(
- getHiddenQueryBuilderFields('signoz/ListPanel', traces),
- ).toStrictEqual({
- stepInterval: { isHidden: true, isDisabled: true },
- having: { isHidden: true, isDisabled: true },
- limit: { isHidden: true, isDisabled: true },
- filters: { customKey: 'body', customOp: OPERATORS.CONTAINS },
- });
- });
- });
});
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/capabilities.ts b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/capabilities.ts
index fdc4647d51..cb3ca97da7 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/capabilities.ts
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/capabilities.ts
@@ -1,19 +1,15 @@
-import type { TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
+import { type TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
import { EQueryType } from 'types/common/dashboard';
import { getPanelDefinition } from './registry';
-import {
- mergeQueryBuilderFieldRule,
- type FilterConfigsPartial,
-} from './types/panelCapabilities';
import type { RenderableQueryPanelDefinition } from './types/panelDefinition';
import type { PanelKind } from './types/panelKind';
/**
* The single deterministic guard for V2 dashboards. Every "what works with what"
- * question — panel kind × query type × signal, and which query-builder fields a kind
- * hides — is answered here by reading each kind's declared capabilities from the panel
- * registry. Adding a new kind means declaring its capabilities once in its definition;
+ * question — panel kind × query type × signal — is answered here by reading each kind's
+ * declared capabilities from the panel registry. Adding a new kind means declaring its
+ * capabilities once in its definition;
* these functions then cover it automatically. Pure and side-effect free.
*/
@@ -122,16 +118,3 @@ export function resolveQueryType(
// A query-less kind has no supported types; the builder is the neutral answer.
return supported[0] ?? EQueryType.QUERY_BUILDER;
}
-
-/**
- * Query-builder field visibility for a kind + signal: the kind's `default` rule with
- * its per-signal overrides merged over it (signal wins). `{}` when the kind hides
- * nothing, i.e. the builder shows every field.
- */
-export function getHiddenQueryBuilderFields(
- kind: PanelKind,
- signal: TelemetrytypesSignalDTO,
-): FilterConfigsPartial {
- const rule = getQueryPanelDefinition(kind)?.queryBuilderFields ?? {};
- return mergeQueryBuilderFieldRule(rule, signal);
-}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/ListEditorPane.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/ListEditorPane.tsx
index cd091ae31b..6732077039 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/ListEditorPane.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/ListEditorPane.tsx
@@ -19,7 +19,6 @@ function ListEditorPane({
return (
<PanelEditorQueryBuilder
panelDefinition={panelDefinition}
- signal={signal}
isLoadingQueries={isLoadingQueries}
onStageRunQuery={onStageRunQuery}
onCancelQuery={onCancelQuery}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/definition.ts b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/definition.ts
index a1750c8f3d..a839c496de 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/definition.ts
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/definition.ts
@@ -8,7 +8,6 @@ import {
Querybuildertypesv5RequestTypeDTO,
TelemetrytypesSignalDTO,
} from 'api/generated/services/sigNoz.schemas';
-import { OPERATORS } from 'constants/queryBuilder';
import { EQueryType } from 'types/common/dashboard';
export const definition: PanelDefinition<'signoz/ListPanel'> = {
@@ -23,21 +22,9 @@ export const definition: PanelDefinition<'signoz/ListPanel'> = {
TelemetrytypesSignalDTO.logs,
TelemetrytypesSignalDTO.traces,
],
- // Raw rows have no aggregation, so step interval / having never apply, and the
- // Where clause searches the log/span body via `body CONTAINS`. Traces additionally
- // hide `limit` (the server paginates raw spans). Mirrors QueryBuilderV2's internal
- // list configs — the capabilities guard is the single source for both.
supportedQueryTypes: [EQueryType.QUERY_BUILDER],
- queryBuilderFields: {
- default: {
- stepInterval: { isHidden: true, isDisabled: true },
- having: { isHidden: true, isDisabled: true },
- filters: { customKey: 'body', customOp: OPERATORS.CONTAINS },
- },
- [TelemetrytypesSignalDTO.traces]: {
- limit: { isHidden: true, isDisabled: true },
- },
- },
+ // No deviation from the baseline the raw request type below already implies.
+ queryBuilderFields: {},
sections,
// The only kind reading raw rows: they page server-side, and the sort needs a
// tiebreaker so a duplicated sort key can't repeat or skip a row across pages.
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/types/panelCapabilities.ts b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/types/panelCapabilities.ts
index 96a2a40ce6..d2ed5b2997 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/types/panelCapabilities.ts
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/types/panelCapabilities.ts
@@ -1,35 +1,6 @@
-import {
- Querybuildertypesv5RequestTypeDTO,
- type TelemetrytypesSignalDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import type { QueryBuilderProps } from 'container/QueryBuilder/QueryBuilder.interfaces';
+import { Querybuildertypesv5RequestTypeDTO } from 'api/generated/services/sigNoz.schemas';
-/**
- * Query-builder field-visibility config a panel kind can declare, mirroring the
- * shape `QueryBuilderV2` consumes via its `filterConfigs` prop. Derived from that
- * prop type (the underlying `FilterConfigs` isn't exported) so the two never drift.
- */
-export type FilterConfigsPartial = NonNullable<
- QueryBuilderProps['filterConfigs']
->;
-
-/**
- * Per-signal query-builder field rules for a panel kind. `default` applies to every
- * signal; a per-signal entry is merged over it (signal wins). The capabilities guard
- * resolves this into a single `FilterConfigsPartial` via `getHiddenQueryBuilderFields`.
- */
-export type QueryBuilderFieldRule = {
- default?: FilterConfigsPartial;
-} & Partial<Record<TelemetrytypesSignalDTO, FilterConfigsPartial>>;
-
-/** The kind's `default` rule with its per-signal overrides merged over it (signal wins). */
-export function mergeQueryBuilderFieldRule(
- rule: QueryBuilderFieldRule,
- signal: TelemetrytypesSignalDTO,
-): FilterConfigsPartial {
- const perSignal = signal ? rule[signal] : undefined;
- return { ...rule.default, ...perSignal };
-}
+export type { QueryBuilderFieldsConfig } from 'components/QueryBuilderV2/queryBuilderFields.types';
/**
* How a kind's query-range request is shaped. Declared per-kind in
@@ -57,3 +28,8 @@ export interface PanelQueryCapabilities {
*/
serverPaginated: boolean;
}
+
+/** Raw rows rather than an aggregated result — the single source for "is this raw?". */
+export function isRawRequest(capabilities: PanelQueryCapabilities): boolean {
+ return capabilities.requestType === Querybuildertypesv5RequestTypeDTO.raw;
+}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/types/panelDefinition.ts b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/types/panelDefinition.ts
index 83a0f2ec99..8fd58ace8e 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/types/panelDefinition.ts
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/types/panelDefinition.ts
@@ -11,7 +11,7 @@ import type { AnyPanelInteractionProps } from './interactions';
import type { PanelKind } from './panelKind';
import type {
PanelQueryCapabilities,
- QueryBuilderFieldRule,
+ QueryBuilderFieldsConfig,
} from './panelCapabilities';
import type {
BaseRendererProps,
@@ -118,8 +118,7 @@ export interface QueryPanelDefinition<
supportedSignals: TelemetrytypesSignalDTO[];
/** Query languages this kind supports (Query Builder / ClickHouse / PromQL). */
supportedQueryTypes: EQueryType[];
- /** Query-builder fields this kind hides/disables, optionally per signal (`{}` hides none). */
- queryBuilderFields: QueryBuilderFieldRule;
+ queryBuilderFields: QueryBuilderFieldsConfig;
/** How this kind's query-range request is shaped (request type, paging, result formatting). */
queryCapabilities: PanelQueryCapabilities;
}
diff --git a/frontend/src/types/common/operations.types.ts b/frontend/src/types/common/operations.types.ts
index 2a0ad4276d..3ba241338a 100644
--- a/frontend/src/types/common/operations.types.ts
+++ b/frontend/src/types/common/operations.types.ts
@@ -1,5 +1,4 @@
import { QueryProps } from 'container/QueryBuilder/type';
-import { QueryBuilderProps } from 'container/QueryBuilder/QueryBuilder.interfaces';
import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
import {
IBuilderFormula,
@@ -17,14 +16,13 @@ import { DataSource } from 'types/common/queryBuilder';
import { SelectOption } from './select';
-type UseQueryOperationsParams = Pick<QueryProps, 'index' | 'query'> &
- Pick<QueryBuilderProps, 'filterConfigs'> & {
- isForTraceOperator?: boolean;
- formula?: IBuilderFormula;
- isListViewPanel?: boolean;
- entityVersion: string;
- savePreviousQuery?: boolean;
- };
+type UseQueryOperationsParams = Pick<QueryProps, 'index' | 'query'> & {
+ isForTraceOperator?: boolean;
+ formula?: IBuilderFormula;
+ isRawQuery?: boolean;
+ entityVersion: string;
+ savePreviousQuery?: boolean;
+};
// Generic type that can work with both legacy and V5 query types
export type HandleChangeQueryData<T = IBuilderQuery> = <
@@ -64,7 +62,6 @@ export type UseQueryOperations = (params: UseQueryOperationsParams) => {
isMetricsDataSource: boolean;
operators: SelectOption<string, string>[];
spaceAggregationOptions: SelectOption<string, string>[];
- listOfAdditionalFilters: string[];
handleChangeOperator: (value: string) => void;
handleSpaceAggregationChange: (value: string) => void;
handleChangeAggregatorAttribute: (
@@ -76,5 +73,4 @@ export type UseQueryOperations = (params: UseQueryOperationsParams) => {
handleChangeQueryData: HandleChangeQueryData;
handleChangeFormulaData: HandleChangeFormulaData;
handleQueryFunctionsUpdates: (functions: QueryFunction[]) => void;
- listOfAdditionalFormulaFilters: string[];
};
diff --git a/frontend/src/types/common/queryBuilder.ts b/frontend/src/types/common/queryBuilder.ts
index 2b297e2c76..33365cc889 100644
--- a/frontend/src/types/common/queryBuilder.ts
+++ b/frontend/src/types/common/queryBuilder.ts
@@ -314,11 +314,6 @@ export type QueryBuilderContextType = {
isDefaultQuery: (props: IsDefaultQueryProps) => boolean;
};
-export type QueryAdditionalFilter = {
- field: keyof IBuilderQuery;
- text: string;
-};
-
export type IsDefaultQueryProps = {
currentQuery: Query;
sourcePage: DataSource;