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.
TypeScript apmapplication-monitoringdistributed-tracinggogood-first-issuejaegerloglogsmetricsmonitoringnextjsobservabilityopen-sourceopentelemetryprometheusreactreactjsself-hostedtracingtypescript
refactor(query-builder): drop ClientSideQBSearch & QueryBuilderSearch (#12427)
Vinicius Lourençoecf510ed6702
diff --git a/frontend/src/components/ClientSideQBSearch/ClientSideQBSearch.styles.scss b/frontend/src/components/ClientSideQBSearch/ClientSideQBSearch.styles.scssdeleted file mode 100644index bb1fa9678c..0000000000--- a/frontend/src/components/ClientSideQBSearch/ClientSideQBSearch.styles.scss+++ /dev/null@@ -1,5 +0,0 @@-.client-side-qb-search {- .ant-select-selection-search {- width: max-content !important;- }-}diff --git a/frontend/src/components/ClientSideQBSearch/ClientSideQBSearch.tsx b/frontend/src/components/ClientSideQBSearch/ClientSideQBSearch.tsxdeleted file mode 100644index 435188243b..0000000000--- a/frontend/src/components/ClientSideQBSearch/ClientSideQBSearch.tsx+++ /dev/null@@ -1,661 +0,0 @@-/* eslint-disable sonarjs/cognitive-complexity */--import {- KeyboardEvent,- useCallback,- useEffect,- useMemo,- useRef,- useState,-} from 'react';-import { Color } from '@signozhq/design-tokens';-import { Select, Tooltip } from 'antd';-import {- OPERATORS,- QUERY_BUILDER_OPERATORS_BY_TYPES,- QUERY_BUILDER_SEARCH_VALUES,-} from 'constants/queryBuilder';-import { CustomTagProps } from 'container/QueryBuilder/filters/QueryBuilderSearch';-import { selectStyle } from 'container/QueryBuilder/filters/QueryBuilderSearch/config';-import { PLACEHOLDER } from 'container/QueryBuilder/filters/QueryBuilderSearch/constant';-import { TypographyText } from 'container/QueryBuilder/filters/QueryBuilderSearch/style';-import {- checkCommaInValue,- getOperatorFromValue,- getOperatorValue,- getTagToken,- isInNInOperator,-} from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';-import {- DropdownState,- ITag,- Option,-} from 'container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2';-import Suggestions from 'container/QueryBuilder/filters/QueryBuilderSearchV2/Suggestions';-import { WhereClauseConfig } from 'hooks/queryBuilder/useAutoComplete';-import { validationMapper } from 'hooks/queryBuilder/useIsValidTag';-import { operatorTypeMapper } from 'hooks/queryBuilder/useOperatorType';-import { useIsDarkMode } from 'hooks/useDarkMode';-import { isArray, isEmpty, isEqual, isObject } from 'lodash-es';-import { ChevronDown, ChevronUp } from '@signozhq/icons';-import type { BaseSelectRef } from 'rc-select';-import {- BaseAutocompleteData,- DataTypes,-} from 'types/api/queryBuilder/queryAutocompleteResponse';-import {- IBuilderQuery,- TagFilter,-} from 'types/api/queryBuilder/queryBuilderData';-import { popupContainer } from 'utils/selectPopupContainer';-import { v4 as uuid } from 'uuid';--import './ClientSideQBSearch.styles.scss';-import { Badge } from '@signozhq/ui/badge';--export interface AttributeKey {- key: string;-}--export interface AttributeValuesMap {- [key: string]: AttributeValue;-}--interface ClientSideQBSearchProps {- filters: TagFilter;- onChange: (value: TagFilter) => void;- whereClauseConfig?: WhereClauseConfig;- placeholder?: string;- className?: string;- suffixIcon?: React.ReactNode;- attributeValuesMap?: AttributeValuesMap;- attributeKeys: AttributeKey[];-}--interface AttributeValue {- stringAttributeValues: string[] | [];- numberAttributeValues: number[] | [];- boolAttributeValues: boolean[] | [];-}--function ClientSideQBSearch(- props: ClientSideQBSearchProps,-): React.ReactElement {- const {- onChange,- placeholder,- className,- suffixIcon,- whereClauseConfig,- attributeValuesMap,- attributeKeys,- filters,- } = props;-- const isDarkMode = useIsDarkMode();-- const selectRef = useRef<BaseSelectRef>(null);-- const [isOpen, setIsOpen] = useState<boolean>(false);-- // create the tags from the initial query here, this should only be computed on the first load as post that tags and query will be always in sync.- const [tags, setTags] = useState<ITag[]>(filters.items as ITag[]);-- // this will maintain the current state of in process filter item- const [currentFilterItem, setCurrentFilterItem] = useState<ITag | undefined>();-- const [currentState, setCurrentState] = useState<DropdownState>(- DropdownState.ATTRIBUTE_KEY,- );-- // to maintain the current running state until the tokenization happens for the tag- const [searchValue, setSearchValue] = useState<string>('');-- const [dropdownOptions, setDropdownOptions] = useState<Option[]>([]);-- const attributeValues = useMemo(() => {- if (currentFilterItem?.key?.key) {- return attributeValuesMap?.[currentFilterItem.key.key];- }- return {- stringAttributeValues: [],- numberAttributeValues: [],- boolAttributeValues: [],- };- }, [attributeValuesMap, currentFilterItem?.key?.key]);-- const handleDropdownSelect = useCallback(- (value: string) => {- let parsedValue: BaseAutocompleteData | string;-- try {- parsedValue = JSON.parse(value);- } catch {- parsedValue = value;- }- if (currentState === DropdownState.ATTRIBUTE_KEY) {- setCurrentFilterItem((prev) => ({- ...prev,- key: parsedValue as BaseAutocompleteData,- op: '',- value: '',- }));- setCurrentState(DropdownState.OPERATOR);- setSearchValue((parsedValue as BaseAutocompleteData)?.key);- } else if (currentState === DropdownState.OPERATOR) {- if (value === OPERATORS.EXISTS || value === OPERATORS.NOT_EXISTS) {- setTags((prev) => [- ...prev,- {- key: currentFilterItem?.key,- op: value,- value: '',- } as ITag,- ]);- setCurrentFilterItem(undefined);- setSearchValue('');- setCurrentState(DropdownState.ATTRIBUTE_KEY);- } else {- setCurrentFilterItem((prev) => ({- key: prev?.key as BaseAutocompleteData,- op: value as string,- value: '',- }));- setCurrentState(DropdownState.ATTRIBUTE_VALUE);- setSearchValue(`${currentFilterItem?.key?.key} ${value}`);- }- } else if (currentState === DropdownState.ATTRIBUTE_VALUE) {- const operatorType =- operatorTypeMapper[currentFilterItem?.op || ''] || 'NOT_VALID';- const isMulti = operatorType === QUERY_BUILDER_SEARCH_VALUES.MULTIPLY;-- if (isMulti) {- const { tagKey, tagOperator, tagValue } = getTagToken(searchValue);- // this condition takes care of adding the IN/NIN multi values when pressed enter on an already existing value.- // not the best interaction but in sync with what we have today!- if (tagValue.includes(String(value))) {- setSearchValue('');- setCurrentState(DropdownState.ATTRIBUTE_KEY);- setCurrentFilterItem(undefined);- setTags((prev) => [- ...prev,- {- key: currentFilterItem?.key,- op: currentFilterItem?.op,- value: tagValue,- } as ITag,- ]);- return;- }- // this is for adding subsequent comma seperated values- const newSearch = [...tagValue];- newSearch[newSearch.length === 0 ? 0 : newSearch.length - 1] = value;- const newSearchValue = newSearch.join(',');- setSearchValue(`${tagKey} ${tagOperator} ${newSearchValue},`);- } else {- setSearchValue('');- setCurrentState(DropdownState.ATTRIBUTE_KEY);- setCurrentFilterItem(undefined);- setTags((prev) => [- ...prev,- {- key: currentFilterItem?.key,- op: currentFilterItem?.op,- value,- } as ITag,- ]);- }- }- },- [currentFilterItem?.key, currentFilterItem?.op, currentState, searchValue],- );-- const handleSearch = useCallback((value: string) => {- setSearchValue(value);- }, []);-- const onInputKeyDownHandler = useCallback(- (event: KeyboardEvent<Element>): void => {- if (event.key === 'Backspace' && !searchValue) {- event.stopPropagation();- setTags((prev) => prev.slice(0, -1));- }- },- [searchValue],- );-- const handleOnBlur = useCallback((): void => {- 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- ) {- 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- ) {- // is exists and not exists operator is present then convert directly to tag! no need of value here- setTags((prev) => [- ...prev,- {- key: currentFilterItem?.key,- op: currentFilterItem?.op,- value: '',- },- ]);- setCurrentFilterItem(undefined);- setSearchValue('');- setCurrentState(DropdownState.ATTRIBUTE_KEY);- } else if (- // if the current state is in sync with the kind of operator used then convert into a tag- validationMapper[operatorType]?.(- isArray(currentFilterItem?.value)- ? currentFilterItem?.value.length || 0- : 1,- )- ) {- setTags((prev) => [- ...prev,- {- key: currentFilterItem?.key as BaseAutocompleteData,- op: currentFilterItem?.op as string,- value: currentFilterItem?.value || '',- },- ]);- setCurrentFilterItem(undefined);- setSearchValue('');- setCurrentState(DropdownState.ATTRIBUTE_KEY);- }- }- }, [- currentFilterItem?.key,- currentFilterItem?.op,- currentFilterItem?.value,- searchValue,- whereClauseConfig?.customKey,- whereClauseConfig?.customOp,- ]);-- // this useEffect takes care of tokenisation based on the search state- useEffect(() => {- // if there is no search value reset to the default state- if (!searchValue) {- setCurrentFilterItem(undefined);- setCurrentState(DropdownState.ATTRIBUTE_KEY);- }-- // split the current search value based on delimiters- const { tagKey, tagOperator, tagValue } = getTagToken(searchValue);-- if (- // Case 1 - if key is defined but the search text doesn't match with the set key,- // can happen when user selects from dropdown and then deletes a few characters- currentFilterItem?.key &&- currentFilterItem?.key?.key !== tagKey.split(' ')[0]- ) {- setCurrentFilterItem(undefined);- setCurrentState(DropdownState.ATTRIBUTE_KEY);- } else if (tagOperator && isEmpty(currentFilterItem?.op)) {- // Case 2 -> key is set and now typing for the operator- if (- tagOperator === OPERATORS.EXISTS ||- tagOperator === OPERATORS.NOT_EXISTS- ) {- setTags((prev) => [- ...prev,- {- key: currentFilterItem?.key,- op: tagOperator,- value: '',- } as ITag,- ]);- setCurrentFilterItem(undefined);- setSearchValue('');- setCurrentState(DropdownState.ATTRIBUTE_KEY);- } else {- setCurrentFilterItem((prev) => ({- key: prev?.key as BaseAutocompleteData,- op: tagOperator,- value: '',- }));-- setCurrentState(DropdownState.ATTRIBUTE_VALUE);- }- } else if (- // Case 3 -> selected operator from dropdown and then erased a part of it- !isEmpty(currentFilterItem?.op) &&- tagOperator !== currentFilterItem?.op- ) {- setCurrentFilterItem((prev) => ({- key: prev?.key as BaseAutocompleteData,- op: '',- value: '',- }));- setCurrentState(DropdownState.OPERATOR);- } else if (currentState === DropdownState.ATTRIBUTE_VALUE) {- // Case 4 -> the final value state where we set the current filter values and the tokenisation happens on either- // dropdown click or blur event- const currentValue = {- key: currentFilterItem?.key as BaseAutocompleteData,- op: currentFilterItem?.op as string,- value: tagValue,- };- if (!isEqual(currentValue, currentFilterItem)) {- setCurrentFilterItem((prev) => ({- key: prev?.key as BaseAutocompleteData,- op: prev?.op as string,- value: tagValue,- }));- }- }- }, [- currentFilterItem,- currentFilterItem?.key,- currentFilterItem?.op,- searchValue,- currentState,- ]);-- // the useEffect takes care of setting the dropdown values correctly on change of the current state- useEffect(() => {- if (currentState === DropdownState.ATTRIBUTE_KEY) {- const filteredAttributeKeys = attributeKeys.filter((key) =>- key.key.startsWith(searchValue),- );- setDropdownOptions(- filteredAttributeKeys?.map(- (key) =>- ({- label: key.key,- value: key,- }) as Option,- ) || [],- );- }- if (currentState === DropdownState.OPERATOR) {- const keyOperator = searchValue.split(' ');- const partialOperator = keyOperator?.[1];- const strippedKey = keyOperator?.[0];-- let operatorOptions;- if (currentFilterItem?.key?.dataType) {- operatorOptions = QUERY_BUILDER_OPERATORS_BY_TYPES[- currentFilterItem.key- .dataType as keyof typeof QUERY_BUILDER_OPERATORS_BY_TYPES- ].map((operator) => ({- label: operator,- value: operator,- }));-- if (partialOperator) {- operatorOptions = operatorOptions.filter((op) =>- op.label.startsWith(partialOperator.toLocaleUpperCase()),- );- }- setDropdownOptions(operatorOptions);- } else if (strippedKey.endsWith('[*]') && strippedKey.startsWith('body.')) {- operatorOptions = [OPERATORS.HAS, OPERATORS.NHAS].map((operator) => ({- label: operator,- value: operator,- }));- setDropdownOptions(operatorOptions);- } else {- operatorOptions = QUERY_BUILDER_OPERATORS_BY_TYPES.universal.map(- (operator) => ({- label: operator,- value: operator,- }),- );-- if (partialOperator) {- operatorOptions = operatorOptions.filter((op) =>- op.label.startsWith(partialOperator.toLocaleUpperCase()),- );- }- setDropdownOptions(operatorOptions);- }- }-- if (currentState === DropdownState.ATTRIBUTE_VALUE) {- const values: Array<string | number | boolean> = [];- const { tagValue } = getTagToken(searchValue);- if (isArray(tagValue)) {- if (!isEmpty(tagValue[tagValue.length - 1])) {- values.push(tagValue[tagValue.length - 1]);- }- } else if (!isEmpty(tagValue)) {- values.push(tagValue);- }-- const currentAttributeValues =- attributeValues?.stringAttributeValues ||- attributeValues?.numberAttributeValues ||- attributeValues?.boolAttributeValues ||- [];-- values.push(...currentAttributeValues);-- if (attributeValuesMap) {- setDropdownOptions(- values.map(- (val) =>- ({- label: checkCommaInValue(String(val)),- value: val,- }) as Option,- ),- );- } else {- // If attributeValuesMap is not provided, don't set dropdown options- setDropdownOptions([]);- }- }- }, [- attributeValues,- currentFilterItem?.key?.dataType,- currentState,- attributeKeys,- searchValue,- attributeValuesMap,- ]);-- useEffect(() => {- const filterTags: IBuilderQuery['filters'] = {- op: 'AND',- items: [],- };- tags.forEach((tag) => {- const computedTagValue =- tag.value &&- Array.isArray(tag.value) &&- tag.value[tag.value.length - 1] === ''- ? tag.value?.slice(0, -1)- : (tag.value ?? '');- filterTags.items.push({- id: tag.id || uuid().slice(0, 8),- key: tag.key,- op: getOperatorValue(tag.op),- value: computedTagValue,- });- });-- if (!isEqual(filters, filterTags)) {- onChange(filterTags);- setTags(- filterTags.items.map((tag) => ({- ...tag,- op: getOperatorFromValue(tag.op),- })) as ITag[],- );- }- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [tags]);-- const queryTags = useMemo(- () => tags.map((tag) => `${tag.key.key} ${tag.op} ${tag.value}`),- [tags],- );-- const onTagRender = ({- value,- closable,- onClose,- }: CustomTagProps): React.ReactElement => {- const { tagOperator } = getTagToken(value);- const isInNin = isInNInOperator(tagOperator);- const chipValue = isInNin- ? value?.trim()?.replace(/,\s*$/, '')- : value?.trim();-- const indexInQueryTags = queryTags.findIndex((qTag) => isEqual(qTag, value));- const tagDetails = tags[indexInQueryTags];-- const onCloseHandler = (): void => {- onClose();- setSearchValue('');- setTags((prev) => prev.filter((t) => !isEqual(t, tagDetails)));- };-- const tagEditHandler = (value: string): void => {- setCurrentFilterItem(tagDetails);- setSearchValue(value);- setCurrentState(DropdownState.ATTRIBUTE_VALUE);- setTags((prev) => prev.filter((t) => !isEqual(t, tagDetails)));- };-- const isDisabled = !!searchValue;-- return (- <span className="qb-search-bar-tokenised-tags">- <Badge- color="vanilla"- className={tagDetails?.key?.type || ''}- closable={!searchValue && closable}- onClose={(e): void => {- e.preventDefault();- onCloseHandler();- }}- >- <Tooltip title={chipValue}>- <TypographyText- $isInNin={isInNin}- $isEnabled={!!searchValue}- $disabled={isDisabled}- onClick={(): void => {- if (!isDisabled) {- tagEditHandler(value);- }- }}- >- {chipValue}- </TypographyText>- </Tooltip>- </Badge>- </span>- );- };-- const suffixIconContent = useMemo(() => {- if (suffixIcon) {- return suffixIcon;- }- return isOpen ? (- <ChevronUp- size={14}- color={isDarkMode ? Color.TEXT_VANILLA_100 : Color.TEXT_INK_100}- />- ) : (- <ChevronDown- size={14}- color={isDarkMode ? Color.TEXT_VANILLA_100 : Color.TEXT_INK_100}- />- );- }, [isDarkMode, isOpen, suffixIcon]);-- return (- <div className="query-builder-search-v2 ">- <Select- ref={selectRef}- getPopupContainer={popupContainer}- virtual={false}- showSearch- tagRender={onTagRender}- transitionName=""- choiceTransitionName=""- filterOption={false}- open={isOpen}- suffixIcon={suffixIconContent}- onDropdownVisibleChange={setIsOpen}- autoClearSearchValue={false}- mode="multiple"- placeholder={placeholder}- value={queryTags}- searchValue={searchValue}- className={className}- rootClassName="query-builder-search client-side-qb-search"- disabled={!attributeKeys.length}- style={selectStyle}- onSearch={handleSearch}- onSelect={handleDropdownSelect}- onInputKeyDown={onInputKeyDownHandler}- notFoundContent={null}- showAction={['focus']}- onBlur={handleOnBlur}- >- {dropdownOptions.map((option) => {- let val = option.value;- try {- if (isObject(option.value)) {- val = JSON.stringify(option.value);- } else {- val = option.value;- }- } catch {- val = option.value;- }- return (- <Select.Option key={isObject(val) ? `select-option` : val} value={val}>- <Suggestions- label={option.label}- value={option.value}- option={currentState}- searchValue={searchValue}- />- </Select.Option>- );- })}- </Select>- </div>- );-}--ClientSideQBSearch.defaultProps = {- placeholder: PLACEHOLDER,- className: '',- suffixIcon: null,- whereClauseConfig: {},- attributeValuesMap: {},-};--export default ClientSideQBSearch;diff --git a/frontend/src/components/QueryBuilderV2/utils.ts b/frontend/src/components/QueryBuilderV2/utils.tsindex 4d2a01cde9..a5fee05f9c 100644--- a/frontend/src/components/QueryBuilderV2/utils.ts+++ b/frontend/src/components/QueryBuilderV2/utils.ts@@ -8,7 +8,7 @@ import {OPERATORS,QUERY_BUILDER_FUNCTIONS,} from 'constants/antlrQueryConstants';-import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';+import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearchV2/utils';import FilterQueryLexer from 'parser/FilterQueryLexer';import FilterQueryParser, {AndExpressionContext,diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/checkboxFilterQuery.ts b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/checkboxFilterQuery.tsindex 9ff528c58d..1e855557fb 100644--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/checkboxFilterQuery.ts+++ b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/checkboxFilterQuery.ts@@ -5,7 +5,7 @@ import {QuickFiltersSource,} from 'components/QuickFilters/types';import { OPERATORS } from 'constants/antlrQueryConstants';-import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';+import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearchV2/utils';import { cloneDeep, isArray } from 'lodash-es';import { Query, TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';import { v4 as uuid } from 'uuid';diff --git a/frontend/src/components/TanStackTableView/__tests__/useStableTotalCount.test.ts b/frontend/src/components/TanStackTableView/__tests__/useStableTotalCount.test.tsnew file mode 100644index 0000000000..f0ae2efd84--- /dev/null+++ b/frontend/src/components/TanStackTableView/__tests__/useStableTotalCount.test.ts@@ -0,0 +1,91 @@+import { renderHook } from '@testing-library/react';++import {+ useStableTotalCount,+ UseStableTotalCountParams,+} from '../useStableTotalCount';++function renderStableTotalCount(initial: UseStableTotalCountParams): {+ result: { current: number };+ rerender: (next: UseStableTotalCountParams) => void;+} {+ const { result, rerender } = renderHook(+ (params: UseStableTotalCountParams) => useStableTotalCount(params),+ { initialProps: initial },+ );++ return { result, rerender };+}++describe('useStableTotalCount', () => {+ it('reports the total once the load settles', () => {+ const { result } = renderStableTotalCount({+ total: 100,+ isLoading: false,+ resetKey: 'pods',+ });++ expect(result.current).toBe(100);+ });++ it('keeps the last count while the same list refetches', () => {+ const { result, rerender } = renderStableTotalCount({+ total: 100,+ isLoading: false,+ resetKey: 'pods',+ });++ rerender({ total: 0, isLoading: true, resetKey: 'pods' });++ expect(result.current).toBe(100);+ });++ it('forgets the count when the list changes', () => {+ const { result, rerender } = renderStableTotalCount({+ total: 100,+ isLoading: false,+ resetKey: 'pods',+ });++ rerender({ total: 0, isLoading: true, resetKey: 'nodes' });++ expect(result.current).toBe(0);+ });++ it('reports the new list total once it arrives', () => {+ const { result, rerender } = renderStableTotalCount({+ total: 100,+ isLoading: false,+ resetKey: 'pods',+ });++ rerender({ total: 0, isLoading: true, resetKey: 'nodes' });+ rerender({ total: 25, isLoading: false, resetKey: 'nodes' });++ expect(result.current).toBe(25);+ });++ it('reports zero for a list that is genuinely empty', () => {+ const { result } = renderStableTotalCount({+ total: 0,+ isLoading: false,+ resetKey: 'pods',+ });++ expect(result.current).toBe(0);+ });++ it('holds nothing back when no reset key is given', () => {+ const { result, rerender } = renderStableTotalCount({+ total: 100,+ isLoading: false,+ resetKey: undefined,+ });++ // Without a key there is no context to compare, so the cache behaves as it+ // always did: it survives the refetch.+ rerender({ total: 0, isLoading: true, resetKey: undefined });++ expect(result.current).toBe(100);+ });+});diff --git a/frontend/src/components/TanStackTableView/useStableTotalCount.ts b/frontend/src/components/TanStackTableView/useStableTotalCount.tsnew file mode 100644index 0000000000..560975fee4--- /dev/null+++ b/frontend/src/components/TanStackTableView/useStableTotalCount.ts@@ -0,0 +1,35 @@+import { useRef } from 'react';++export type UseStableTotalCountParams = {+ total: number | undefined;+ isLoading: boolean;+ /**+ * Identifies the list being counted. When it changes, the cached count is+ * dropped so the previous list's page count cannot outlive it.+ */+ resetKey: string | undefined;+};++/**+ * Holds on to the last non-zero total so the pagination does not flash while the+ * same list refetches, and forgets it as soon as `resetKey` moves to another list.+ */+export function useStableTotalCount({+ total,+ isLoading,+ resetKey,+}: UseStableTotalCountParams): number {+ const prevTotalRef = useRef(total || 0);+ const prevResetKeyRef = useRef(resetKey);++ if (prevResetKeyRef.current !== resetKey) {+ prevResetKeyRef.current = resetKey;+ prevTotalRef.current = 0;+ }++ if (total && total > 0) {+ prevTotalRef.current = total;+ }++ return isLoading ? prevTotalRef.current : total || 0;+}diff --git a/frontend/src/container/ExplorerOrderBy/index.tsx b/frontend/src/container/ExplorerOrderBy/index.tsxindex ebd77d4902..b0360813b0 100644--- a/frontend/src/container/ExplorerOrderBy/index.tsx+++ b/frontend/src/container/ExplorerOrderBy/index.tsx@@ -2,7 +2,7 @@ import { memo, useMemo } from 'react';import { Select, Spin } from 'antd';import { OrderByFilterProps } from 'container/QueryBuilder/filters/OrderByFilter/OrderByFilter.interfaces';import { useOrderByFilter } from 'container/QueryBuilder/filters/OrderByFilter/useOrderByFilter';-import { selectStyle } from 'container/QueryBuilder/filters/QueryBuilderSearch/config';+import { selectStyle } from 'container/QueryBuilder/filters/QueryBuilderSearchV2/config';import { useGetAggregateKeys } from 'hooks/queryBuilder/useGetAggregateKeys';import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';import { StringOperators } from 'types/common/queryBuilder';diff --git a/frontend/src/container/LogDetailedView/logAttributeActions.utils.ts b/frontend/src/container/LogDetailedView/logAttributeActions.utils.tsindex 36a3d05b93..17556e16bf 100644--- a/frontend/src/container/LogDetailedView/logAttributeActions.utils.ts+++ b/frontend/src/container/LogDetailedView/logAttributeActions.utils.ts@@ -10,7 +10,7 @@ import {RESTRICTED_SELECTED_FIELDS,} from 'container/LogsFilters/config';import { MetricsType } from 'container/MetricsApplication/constant';-import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';+import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearchV2/utils';import { chooseAutocompleteFromCustomValue } from 'lib/newQueryBuilder/chooseAutocompleteFromCustomValue';import {BaseAutocompleteData,diff --git a/frontend/src/container/MetricsExplorer/Inspect/__tests__/QueryBuilder.test.tsx b/frontend/src/container/MetricsExplorer/Inspect/__tests__/QueryBuilder.test.tsxindex 14511cfa1e..12bfa555bd 100644--- a/frontend/src/container/MetricsExplorer/Inspect/__tests__/QueryBuilder.test.tsx+++ b/frontend/src/container/MetricsExplorer/Inspect/__tests__/QueryBuilder.test.tsx@@ -42,7 +42,7 @@ jest.mock('hooks/useDebounce', () => ({}));jest.mock(- 'container/QueryBuilder/filters/QueryBuilderSearch/OptionRenderer',+ 'container/QueryBuilder/filters/OptionRenderer/OptionRenderer',() => ({__esModule: true,default: ({ value }: { value: string }): JSX.Element => <span>{value}</span>,diff --git a/frontend/src/container/QueryBuilder/QueryBuilder.interfaces.ts b/frontend/src/container/QueryBuilder/QueryBuilder.interfaces.tsindex 8acfb391f3..fc486cbfd2 100644--- a/frontend/src/container/QueryBuilder/QueryBuilder.interfaces.ts+++ b/frontend/src/container/QueryBuilder/QueryBuilder.interfaces.ts@@ -1,11 +1,15 @@import { ReactNode } from 'react';import { PANEL_TYPES } from 'constants/queryBuilder';-import { WhereClauseConfig } from 'hooks/queryBuilder/useAutoComplete';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;diff --git a/frontend/src/container/QueryBuilder/filters/AggregateEveryFilter/index.tsx b/frontend/src/container/QueryBuilder/filters/AggregateEveryFilter/index.tsxdeleted file mode 100644index f905e0422b..0000000000--- a/frontend/src/container/QueryBuilder/filters/AggregateEveryFilter/index.tsx+++ /dev/null@@ -1,45 +0,0 @@-import { useMemo } from 'react';-import { InputNumber, InputNumberProps } from 'antd';-import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';-import { DataSource } from 'types/common/queryBuilder';--import { selectStyle } from '../QueryBuilderSearch/config';--function AggregateEveryFilter({- onChange,- query,- disabled,-}: AggregateEveryFilterProps): JSX.Element {- const isMetricsDataSource = useMemo(- () => query.dataSource === DataSource.METRICS,- [query.dataSource],- );-- const onChangeHandler: InputNumberProps<number>['onChange'] = (event) => {- if (event && event >= 0) {- onChange(event);- }- };-- const isDisabled =- (isMetricsDataSource && !query.aggregateAttribute?.key) || disabled;-- return (- <InputNumber- placeholder="Enter in seconds"- disabled={isDisabled}- style={selectStyle}- value={query?.stepInterval}- onChange={onChangeHandler}- min={0}- />- );-}--interface AggregateEveryFilterProps {- onChange: (values: number) => void;- query: IBuilderQuery;- disabled: boolean;-}--export default AggregateEveryFilter;diff --git a/frontend/src/container/QueryBuilder/filters/AggregatorFilter/AggregatorFilter.tsx b/frontend/src/container/QueryBuilder/filters/AggregatorFilter/AggregatorFilter.tsxindex 83923a556a..89c5a7bc9a 100644--- a/frontend/src/container/QueryBuilder/filters/AggregatorFilter/AggregatorFilter.tsx+++ b/frontend/src/container/QueryBuilder/filters/AggregatorFilter/AggregatorFilter.tsx@@ -24,8 +24,8 @@ import { DataSource } from 'types/common/queryBuilder';import { ExtendedSelectOption } from 'types/common/select';import { useSelectPopupContainer } from 'utils/selectPopupContainer';-import { selectStyle } from '../QueryBuilderSearch/config';-import OptionRenderer from '../QueryBuilderSearch/OptionRenderer';+import { selectStyle } from '../QueryBuilderSearchV2/config';+import OptionRenderer from '../OptionRenderer/OptionRenderer';// ** Typesimport { AgregatorFilterProps } from './AggregatorFilter.intefaces';diff --git a/frontend/src/container/QueryBuilder/filters/Formula/Limit/Limit.tsx b/frontend/src/container/QueryBuilder/filters/Formula/Limit/Limit.tsxindex b279ff587a..33dc8f6387 100644--- a/frontend/src/container/QueryBuilder/filters/Formula/Limit/Limit.tsx+++ b/frontend/src/container/QueryBuilder/filters/Formula/Limit/Limit.tsx@@ -1,6 +1,6 @@import { InputNumber } from 'antd';-import { selectStyle } from '../../QueryBuilderSearch/config';+import { selectStyle } from '../../QueryBuilderSearchV2/config';import { handleKeyDownLimitFilter } from '../../utils';import { LimitFilterProps } from './types';diff --git a/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/OrderByFilter.tsx b/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/OrderByFilter.tsxindex b127520b83..ea843e3dd5 100644--- a/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/OrderByFilter.tsx+++ b/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/OrderByFilter.tsx@@ -4,7 +4,7 @@ import { useGetAggregateKeys } from 'hooks/queryBuilder/useGetAggregateKeys';import { MetricAggregateOperator } from 'types/common/queryBuilder';import { useSelectPopupContainer } from 'utils/selectPopupContainer';-import { selectStyle } from '../../QueryBuilderSearch/config';+import { selectStyle } from '../../QueryBuilderSearchV2/config';import { OrderByProps } from './types';import { useOrderByFormulaFilter } from './useOrderByFormulaFilter';diff --git a/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/useOrderByFormulaFilter.tsx b/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/useOrderByFormulaFilter.tsxindex 0f71e6560c..1c8d1e23ea 100644--- a/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/useOrderByFormulaFilter.tsx+++ b/frontend/src/container/QueryBuilder/filters/Formula/OrderBy/useOrderByFormulaFilter.tsx@@ -16,7 +16,7 @@ import {mapLabelValuePairs,orderByValueDelimiter,} from '../../OrderByFilter/utils';-import { getRemoveOrderFromValue } from '../../QueryBuilderSearch/utils';+import { getRemoveOrderFromValue } from '../../QueryBuilderSearchV2/utils';import { getUniqueOrderByValues, getValidOrderByResult } from '../../utils';import { IOrderByFormulaFilterProps } from './types';import { transformToOrderByStringValuesByFormula } from './utils';diff --git a/frontend/src/container/QueryBuilder/filters/GroupByFilter/GroupByFilter.tsx b/frontend/src/container/QueryBuilder/filters/GroupByFilter/GroupByFilter.tsxindex 239725ce82..bd60fe0db6 100644--- a/frontend/src/container/QueryBuilder/filters/GroupByFilter/GroupByFilter.tsx+++ b/frontend/src/container/QueryBuilder/filters/GroupByFilter/GroupByFilter.tsx@@ -23,8 +23,8 @@ import { DataSource } from 'types/common/queryBuilder';import { SelectOption } from 'types/common/select';import { useSelectPopupContainer } from 'utils/selectPopupContainer';-import { selectStyle } from '../QueryBuilderSearch/config';-import OptionRenderer from '../QueryBuilderSearch/OptionRenderer';+import { selectStyle } from '../QueryBuilderSearchV2/config';+import OptionRenderer from '../OptionRenderer/OptionRenderer';import { GroupByFilterProps } from './GroupByFilter.interfaces';export const GroupByFilter = memo(function GroupByFilter({diff --git a/frontend/src/container/QueryBuilder/filters/LimitFilter/LimitFilter.tsx b/frontend/src/container/QueryBuilder/filters/LimitFilter/LimitFilter.tsxdeleted file mode 100644index d87c6d4907..0000000000--- a/frontend/src/container/QueryBuilder/filters/LimitFilter/LimitFilter.tsx+++ /dev/null@@ -1,31 +0,0 @@-import { InputNumber } from 'antd';-import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';-import { DataSource } from 'types/common/queryBuilder';--import { selectStyle } from '../QueryBuilderSearch/config';-import { handleKeyDownLimitFilter } from '../utils';--function LimitFilter({ onChange, query }: LimitFilterProps): JSX.Element {- const isMetricsDataSource = query.dataSource === DataSource.METRICS;-- const isDisabled = isMetricsDataSource && !query.aggregateAttribute?.key;-- return (- <InputNumber- min={1}- type="number"- value={query.limit}- style={selectStyle}- disabled={isDisabled}- onChange={onChange}- onKeyDown={handleKeyDownLimitFilter}- />- );-}--interface LimitFilterProps {- onChange: (values: number | null) => void;- query: IBuilderQuery;-}--export default LimitFilter;diff --git a/frontend/src/container/QueryBuilder/filters/MetricNameSelector/MetricNameSelector.test.tsx b/frontend/src/container/QueryBuilder/filters/MetricNameSelector/MetricNameSelector.test.tsxindex e9c229f70e..1470a3969a 100644--- a/frontend/src/container/QueryBuilder/filters/MetricNameSelector/MetricNameSelector.test.tsx+++ b/frontend/src/container/QueryBuilder/filters/MetricNameSelector/MetricNameSelector.test.tsx@@ -31,7 +31,7 @@ jest.mock('hooks/useDebounce', () => ({default: <T,>(value: T): T => value,}));-jest.mock('../QueryBuilderSearch/OptionRenderer', () => ({+jest.mock('../OptionRenderer/OptionRenderer', () => ({__esModule: true,default: ({ value }: { value: string }): JSX.Element => <span>{value}</span>,}));diff --git a/frontend/src/container/QueryBuilder/filters/MetricNameSelector/MetricNameSelector.tsx b/frontend/src/container/QueryBuilder/filters/MetricNameSelector/MetricNameSelector.tsxindex 0cbe8d4b08..e3231d54c4 100644--- a/frontend/src/container/QueryBuilder/filters/MetricNameSelector/MetricNameSelector.tsx+++ b/frontend/src/container/QueryBuilder/filters/MetricNameSelector/MetricNameSelector.tsx@@ -16,8 +16,8 @@ import { MetricAggregation } from 'types/api/v5/queryRange';import { ExtendedSelectOption } from 'types/common/select';import { useSelectPopupContainer } from 'utils/selectPopupContainer';-import { selectStyle } from '../QueryBuilderSearch/config';-import OptionRenderer from '../QueryBuilderSearch/OptionRenderer';+import { selectStyle } from '../QueryBuilderSearchV2/config';+import OptionRenderer from '../OptionRenderer/OptionRenderer';import './MetricNameSelector.styles.scss';diff --git a/frontend/src/container/QueryBuilder/filters/OperatorsSelect/OperatorsSelect.tsx b/frontend/src/container/QueryBuilder/filters/OperatorsSelect/OperatorsSelect.tsxindex c7027fee0a..b924c83edc 100644--- a/frontend/src/container/QueryBuilder/filters/OperatorsSelect/OperatorsSelect.tsx+++ b/frontend/src/container/QueryBuilder/filters/OperatorsSelect/OperatorsSelect.tsx@@ -2,7 +2,7 @@ import { memo } from 'react';import { Select } from 'antd';// ** Types-import { selectStyle } from '../QueryBuilderSearch/config';+import { selectStyle } from '../QueryBuilderSearchV2/config';import { OperatorsSelectProps } from './OperatorsSelect.interfaces';export const OperatorsSelect = memo(function OperatorsSelect({diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/OptionRenderer.styles.scss b/frontend/src/container/QueryBuilder/filters/OptionRenderer/OptionRenderer.styles.scsssimilarity index 100%rename from frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/OptionRenderer.styles.scssrename to frontend/src/container/QueryBuilder/filters/OptionRenderer/OptionRenderer.styles.scssdiff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/OptionRenderer.tsx b/frontend/src/container/QueryBuilder/filters/OptionRenderer/OptionRenderer.tsxsimilarity index 100%rename from frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/OptionRenderer.tsxrename to frontend/src/container/QueryBuilder/filters/OptionRenderer/OptionRenderer.tsxdiff --git a/frontend/src/container/QueryBuilder/filters/OptionRenderer/style.ts b/frontend/src/container/QueryBuilder/filters/OptionRenderer/style.tsnew file mode 100644index 0000000000..6bbdfbda0c--- /dev/null+++ b/frontend/src/container/QueryBuilder/filters/OptionRenderer/style.ts@@ -0,0 +1,22 @@+import { Badge } from '@signozhq/ui/badge';+import styled from 'styled-components';++export const TagContainer = styled(Badge).attrs({+ color: 'secondary',+ variant: 'outline',+})`+ &&& {+ display: flex;+ font-weight: 300;+ font-size: 0.6rem;+ }+`;++export const TagLabel = styled.span`+ font-weight: 400;+`;++export const TagValue = styled.span`+ text-transform: capitalize;+ font-weight: 400;+`;diff --git a/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.tsx b/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.tsxindex 2f5b18080d..2167c469b5 100644--- a/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.tsx+++ b/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.tsx@@ -5,7 +5,7 @@ import { DataSource, MetricAggregateOperator } from 'types/common/queryBuilder';import { getParsedAggregationOptionsForOrderBy } from 'utils/aggregationConverter';import { useSelectPopupContainer } from 'utils/selectPopupContainer';-import { selectStyle } from '../QueryBuilderSearch/config';+import { selectStyle } from '../QueryBuilderSearchV2/config';import { OrderByFilterProps } from './OrderByFilter.interfaces';import { useOrderByFilter } from './useOrderByFilter';diff --git a/frontend/src/container/QueryBuilder/filters/OrderByFilter/useOrderByFilter.ts b/frontend/src/container/QueryBuilder/filters/OrderByFilter/useOrderByFilter.tsindex 3bc220e6c7..a5bac28e46 100644--- a/frontend/src/container/QueryBuilder/filters/OrderByFilter/useOrderByFilter.ts+++ b/frontend/src/container/QueryBuilder/filters/OrderByFilter/useOrderByFilter.ts@@ -7,7 +7,7 @@ import { parse } from 'papaparse';import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';import { OrderByPayload } from 'types/api/queryBuilder/queryBuilderData';-import { getRemoveOrderFromValue } from '../QueryBuilderSearch/utils';+import { getRemoveOrderFromValue } from '../QueryBuilderSearchV2/utils';import { getUniqueOrderByValues, getValidOrderByResult } from '../utils';import { ORDERBY_FILTERS } from './config';import { SIGNOZ_VALUE } from './constants';diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/OptionRendererForLogs.tsx b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/OptionRendererForLogs.tsxdeleted file mode 100644index 392982a007..0000000000--- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/OptionRendererForLogs.tsx+++ /dev/null@@ -1,70 +0,0 @@-import { Color } from '@signozhq/design-tokens';-import { Tooltip } from 'antd';-import { Typography } from '@signozhq/ui/typography';-import cx from 'classnames';-import { Zap } from '@signozhq/icons';--import { getOptionType } from './utils';--import './QueryBuilderSearch.styles.scss';--function OptionRendererForLogs({- label,- value,- dataType,- isIndexed,- setDynamicPlaceholder,-}: OptionRendererProps): JSX.Element {- const optionType = getOptionType(label);-- return (- <span- className="option"- onMouseEnter={(): void => setDynamicPlaceholder(value)}- onFocus={(): void => setDynamicPlaceholder(value)}- >- {optionType ? (- <Tooltip title={value} placement="topLeft">- <div className="logs-options-select">- <section className="left-section">- {isIndexed ? (- <Zap size={12} fill={Color.BG_AMBER_500} />- ) : (- <div className="dot" />- )}- <Typography.Text className="text value" truncate={1}>- {value}- </Typography.Text>- </section>- <section className="right-section">- <div className="text tags data-type-tag">{dataType}</div>- <div className={cx('text tags option-type-tag', optionType)}>- <div className="dot" />- {optionType}- </div>- </section>- </div>- </Tooltip>- ) : (- <Tooltip title={label} placement="topLeft">- <div className="without-option-type">- <div className="dot" />- <Typography.Text className="text" truncate={1}>- {label}- </Typography.Text>- </div>- </Tooltip>- )}- </span>- );-}--interface OptionRendererProps {- label: string;- value: string;- dataType: string;- isIndexed: boolean;- setDynamicPlaceholder: React.Dispatch<React.SetStateAction<string>>;-}--export default OptionRendererForLogs;diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/QueryBuilderSearch.styles.scss b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/QueryBuilderSearch.styles.scssdeleted file mode 100644index c0573415fe..0000000000--- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/QueryBuilderSearch.styles.scss+++ /dev/null@@ -1,298 +0,0 @@-.query-builder-search-container {- position: relative;- display: flex;- align-items: center;- gap: 12px;-}--.logs-popup {- &.hide-scroll {- .rc-virtual-list-holder {- height: 100px;- }- }-}--.logs-explorer-popup {- padding: 0px;- .ant-select-item-group {- padding: 12px 14px 8px 14px;- color: var(--muted-foreground);- font-family: Inter;- font-size: 11px;- font-style: normal;- font-weight: 500;- line-height: 18px; /* 163.636% */- letter-spacing: 0.88px;- text-transform: uppercase;- }-- .show-all-filter-props {- display: flex;- align-items: center;- justify-content: space-between;- margin-bottom: 13px;- width: 100%;- cursor: pointer;-- .content {- display: flex;- align-items: center;- justify-content: space-between;- width: 100%;-- .left-section {- display: flex;- align-items: center;- gap: 4px;-- .text {- color: var(--l2-foreground);- font-family: Inter;- font-size: 14px;- font-style: normal;- font-weight: 400;- line-height: 20px; /* 142.857% */- letter-spacing: -0.07px;- }-- .text:hover {- color: var(--l1-foreground);- }- }- .right-section {- display: flex;- align-items: center;- gap: 4px;- .keyboard-shortcut-slash {- width: 16px;- height: 16px;- flex-shrink: 0;- border-radius: 2.286px;- border-top: 1.143px solid var(--l1-border);- border-right: 1.143px solid var(--l1-border);- border-bottom: 2.286px solid var(--l1-border);- border-left: 1.143px solid var(--l1-border);- background: var(--l2-background);- }- }- }- }-- .show-all-filter-props:hover {- background: color-mix(- in srgb,- var(--l1-foreground) 4%,- transparent- ) !important;- }-- .example-queries {- cursor: default;- .heading {- padding: 12px 14px 8px 14px;- color: var(--muted-foreground);- font-family: Inter;- font-size: 11px;- font-style: normal;- font-weight: 500;- line-height: 18px; /* 163.636% */- letter-spacing: 0.88px;- text-transform: uppercase;- }-- .query-container {- display: flex;- flex-direction: column;- gap: 12px;- padding: 0px 12px 12px 12px;- cursor: pointer;-- .example-query {- display: flex;- padding: 4px 8px;- justify-content: center;- align-items: center;- gap: 10px;- border-radius: 2px;- background: var(--l3-background);- color: var(--l2-foreground);- font-family: Inter;- font-size: 14px;- font-style: normal;- font-weight: 400;- line-height: normal;- letter-spacing: -0.07px;- width: fit-content;- }-- .example-query:hover {- color: var(--l1-foreground);- }- }- }-- .ant-select-item-option-grouped {- padding-inline-start: 0px;- padding: 7px 13px;- }-- .keyboard-shortcuts {- display: flex;- align-items: center;- border-radius: 0px 0px 4px 4px;- border: 1px solid var(--l1-border);- background: var(--l2-background);- padding: 11px 16px;- cursor: default;-- .icons {- width: 16px;- height: 16px;- flex-shrink: 0;- border-radius: 2.286px;- border-top: 1.143px solid var(--l3-background);- border-right: 1.143px solid var(--l3-background);- border-bottom: 2.286px solid var(--l3-background);- border-left: 1.143px solid var(--l3-background);- background: var(--l2-background);- }-- .keyboard-text {- color: var(--l2-foreground);- font-family: Inter;- font-size: 12px;- font-style: normal;- font-weight: 400;- line-height: 18px; /* 142.857% */- letter-spacing: -0.07px;- }-- .navigate {- display: flex;- align-items: center;- padding-right: 12px;- gap: 4px;- border-right: 1px solid var(--l1-border);- }-- .update-query {- display: flex;- align-items: center;- margin-left: 12px;- gap: 4px;- }- }-- .without-option-type {- display: flex;- gap: 8px;- align-items: center;- .dot {- height: 5px;- width: 5px;- border-radius: 50%;- background-color: var(--l3-background);- }- }-- .logs-options-select {- display: flex;- align-items: center;- justify-content: space-between;-- .text {- color: var(--l2-foreground);- font-family: Inter;- font-size: 14px;- font-style: normal;- font-weight: 400;- line-height: 20px; /* 142.857% */- letter-spacing: -0.07px;- }-- .tags {- display: flex;- height: 20px;- padding: 4px 8px;- justify-content: center;- align-items: center;- gap: 4px;- border-radius: 20px;- }-- .dot {- height: 5px;- width: 5px;- border-radius: 50%;- flex-shrink: 0;- }-- .left-section {- display: flex;- align-items: center;- gap: 8px;- width: 90%;-- .dot {- background-color: var(--l3-background);- }-- .value {- width: 100%;- }- }-- .right-section {- display: flex;- align-items: center;- gap: 4px;-- .data-type-tag {- background: color-mix(in srgb, var(--l1-foreground) 8%, transparent);- }-- .option-type-tag {- display: flex;- gap: 4px;- align-items: center;- padding: 0px 6px;- text-transform: capitalize;- }-- .tag {- border-radius: 50px;- background: color-mix(in srgb, var(--bg-sienna-400) 10%, transparent);- color: var(--bg-sienna-400);-- .dot {- background-color: var(--bg-sienna-400);- }- }-- .resource {- border-radius: 50px;- background: color-mix(in srgb, var(--bg-sakura-400) 10%, transparent);- color: var(--bg-sakura-400);-- .dot {- background-color: var(--bg-sakura-400);- }- }- }- }-- .ant-select-item-option-active {- .logs-options-select {- .left-section {- .value {- color: var(--l1-foreground);- }- }- }- }-}--.span-scope-selector {- width: 160px;-}diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/index.tsx b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/index.tsxdeleted file mode 100644index 9c65df022b..0000000000--- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/index.tsx+++ /dev/null@@ -1,558 +0,0 @@-import {- KeyboardEvent,- ReactElement,- ReactNode,- useCallback,- useEffect,- useMemo,- useRef,- useState,-} from 'react';-import { useLocation } from 'react-router-dom';-import { Button, Select, Spin, Tooltip } from 'antd';-import { Badge } from '@signozhq/ui/badge';-import { Typography } from '@signozhq/ui/typography';-import cx from 'classnames';-import {- INFRA_LONG_TO_SHORT_OPERATOR_MAP,- OPERATORS,-} from 'constants/queryBuilder';-import ROUTES from 'constants/routes';-import { LogsExplorerShortcuts } from 'constants/shortcuts/logsExplorerShortcuts';-import { InfraMonitoringEntity } from 'container/InfraMonitoringK8sV2/constants';-import { getDataTypes } from 'container/LogDetailedView/utils';-import { useKeyboardHotkeys } from 'hooks/hotkeys/useKeyboardHotkeys';-import {- useAutoComplete,- WhereClauseConfig,-} from 'hooks/queryBuilder/useAutoComplete';-import { useFetchKeysAndValues } from 'hooks/queryBuilder/useFetchKeysAndValues';-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';-import { isEqual, isUndefined } from 'lodash-es';-import {- ArrowDown,- ArrowUp,- ChevronDown,- ChevronUp,- Command,- CornerDownLeft,- Filter,- Slash,-} from '@signozhq/icons';-import type { BaseSelectRef } from 'rc-select';-import {- BaseAutocompleteData,- DataTypes,-} from 'types/api/queryBuilder/queryAutocompleteResponse';-import {- IBuilderQuery,- TagFilter,-} from 'types/api/queryBuilder/queryBuilderData';-import { DataSource } from 'types/common/queryBuilder';-import { getUserOperatingSystem, UserOperatingSystem } from 'utils/getUserOS';-import { useSelectPopupContainer } from 'utils/selectPopupContainer';-import { v4 as uuid } from 'uuid';--import { selectStyle } from './config';-import { PLACEHOLDER } from './constant';-import ExampleQueriesRendererForLogs from './ExampleQueriesRendererForLogs';-import OptionRenderer from './OptionRenderer';-import OptionRendererForLogs from './OptionRendererForLogs';-import { StyledCheckOutlined, TypographyText } from './style';-import {- convertExampleQueriesToOptions,- getOperatorValue,- getRemovePrefixFromKey,- getTagToken,- isExistsNotExistsOperator,- isInNInOperator,-} from './utils';--import './QueryBuilderSearch.styles.scss';--function getOperatorValueForContext(- op: string,- isInfraMonitoring?: boolean,-): string {- const mappedOp =- isInfraMonitoring && INFRA_LONG_TO_SHORT_OPERATOR_MAP[op]- ? INFRA_LONG_TO_SHORT_OPERATOR_MAP[op]- : op;- return getOperatorValue(mappedOp);-}--function QueryBuilderSearch({- query,- onChange,- whereClauseConfig,- className,- placeholder,- suffixIcon,- isInfraMonitoring,- isMetricsExplorer,- disableNavigationShortcuts,- entity,-}: QueryBuilderSearchProps): JSX.Element {- const getPopupContainer = useSelectPopupContainer();- const { pathname } = useLocation();- const isLogsExplorerPage = useMemo(- () => pathname === ROUTES.LOGS_EXPLORER,- [pathname],- );-- const [isEditingTag, setIsEditingTag] = useState(false);-- const {- updateTag,- handleClearTag,- handleKeyDown,- handleOnBlur,- handleSearch,- handleSelect,- tags,- options,- searchValue,- isMulti,- isFetching,- setSearchKey,- setSearchValue,- searchKey,- key,- exampleQueries,- } = useAutoComplete(- query,- whereClauseConfig,- isLogsExplorerPage,- isInfraMonitoring,- entity,- isMetricsExplorer,- );-- const [isOpen, setIsOpen] = useState<boolean>(false);- const [showAllFilters, setShowAllFilters] = useState<boolean>(false);- const [dynamicPlacholder, setDynamicPlaceholder] = useState<string>(- placeholder || '',- );- const selectRef = useRef<BaseSelectRef>(null);-- const { sourceKeys, handleRemoveSourceKey } = useFetchKeysAndValues(- searchValue,- query,- searchKey,- isLogsExplorerPage,- isInfraMonitoring,- entity,- isMetricsExplorer,- );-- const { registerShortcut, deregisterShortcut } = useKeyboardHotkeys();-- const { handleRunQuery, currentQuery } = useQueryBuilder();-- const toggleEditMode = useCallback(- (value: boolean) => {- // Editing mode is required only in infra monitoring or metrics explorer- if (isInfraMonitoring || isMetricsExplorer) {- setIsEditingTag(value);- }- },- [isInfraMonitoring, isMetricsExplorer],- );-- const onTagRender = ({- value,- closable,- onClose,- }: CustomTagProps): ReactElement => {- const { tagOperator } = getTagToken(value);- const isInNin = isInNInOperator(tagOperator);- const chipValue = isInNin- ? value?.trim()?.replace(/,\s*$/, '')- : value?.trim();-- const onCloseHandler = (): void => {- onClose();- // Editing is done after closing a tag- toggleEditMode(false);- handleSearch('');- setSearchKey('');- };-- const tagEditHandler = (value: string): void => {- updateTag(value);- // Editing starts- toggleEditMode(true);- if (isInfraMonitoring || isMetricsExplorer) {- setSearchValue(value);- } else {- handleSearch(value);- }- };-- const isDisabled = !!searchValue;-- return (- <Badge- color="vanilla"- closable={!searchValue && closable}- onClose={(e): void => {- e.preventDefault();- onCloseHandler();- }}- >- <Tooltip title={chipValue}>- <TypographyText- $isInNin={isInNin}- $isEnabled={!!searchValue}- onClick={(): void => {- if (!isDisabled) {- tagEditHandler(value);- }- }}- >- {chipValue}- </TypographyText>- </Tooltip>- </Badge>- );- };-- const onChangeHandler = (value: string[]): void => {- if (!isMulti) {- handleSearch(value[value.length - 1]);- }- };-- const onInputKeyDownHandler = (event: KeyboardEvent<Element>): void => {- if (isMulti || event.key === 'Backspace') {- handleKeyDown(event);- }- if (isExistsNotExistsOperator(searchValue)) {- handleKeyDown(event);- }-- // Editing is done after enter key press- if (event.key === 'Enter') {- toggleEditMode(false);- }-- if (- !disableNavigationShortcuts &&- (event.ctrlKey || event.metaKey) &&- event.key === 'Enter'- ) {- event.preventDefault();- event.stopPropagation();- handleRunQuery();- setIsOpen(false);- }-- if (- !disableNavigationShortcuts &&- (event.ctrlKey || event.metaKey) &&- event.key === '/'- ) {- event.preventDefault();- event.stopPropagation();- setShowAllFilters((prev) => !prev);- }- };-- const handleDeselect = useCallback(- (deselectedItem: string) => {- handleClearTag(deselectedItem);- handleRemoveSourceKey(deselectedItem);- },- [handleClearTag, handleRemoveSourceKey],- );-- const isMetricsDataSource = useMemo(- () =>- query.dataSource === DataSource.METRICS &&- !isInfraMonitoring &&- !isMetricsExplorer,- [query.dataSource, isInfraMonitoring, isMetricsExplorer],- );-- const fetchValueDataType = (value: unknown, operator: string): DataTypes => {- if (operator === OPERATORS.HAS || operator === OPERATORS.NHAS) {- return getDataTypes([value]);- }-- return DataTypes.EMPTY;- };-- const queryTags = useMemo(() => {- if (!query.aggregateAttribute?.key && isMetricsDataSource) {- return [];- }- return tags;- }, [isMetricsDataSource, query.aggregateAttribute?.key, tags]);-- useEffect(() => {- const initialTagFilters: TagFilter = { items: [], op: 'AND' };- const initialSourceKeys = query.filters?.items?.map(- (item) => item.key as BaseAutocompleteData,- );-- initialTagFilters.items = tags.map((tag) => {- const { tagKey, tagOperator, tagValue } = getTagToken(tag);-- const filterAttribute = [- ...(initialSourceKeys || []),- ...(sourceKeys || []),- ].find((key) => key?.key === getRemovePrefixFromKey(tagKey));-- const computedTagValue =- tagValue && Array.isArray(tagValue) && tagValue[tagValue.length - 1] === ''- ? tagValue?.slice(0, -1)- : (tagValue ?? '');-- return {- id: uuid().slice(0, 8),- key: filterAttribute ?? {- key: tagKey,- dataType: fetchValueDataType(computedTagValue, tagOperator),- type: '',- },- op: getOperatorValueForContext(tagOperator, isInfraMonitoring),- value: computedTagValue,- };- });-- // If in infra monitoring or metrics explorer, only run the onChange query when editing is finsished.- if (isInfraMonitoring || isMetricsExplorer) {- if (!isEditingTag) {- onChange(initialTagFilters);- }- } else {- onChange(initialTagFilters);- }- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [sourceKeys]);-- const isLastQuery = useMemo(- () =>- isEqual(- currentQuery.builder.queryData[currentQuery.builder.queryData.length - 1],- query,- ),- [currentQuery, query],- );-- useEffect(() => {- if (isLastQuery && !disableNavigationShortcuts) {- registerShortcut(LogsExplorerShortcuts.FocusTheSearchBar, () => {- // set timeout is needed here else the select treats the hotkey as input value- setTimeout(() => {- selectRef.current?.focus();- }, 0);- });- }-- return (): void =>- deregisterShortcut(LogsExplorerShortcuts.FocusTheSearchBar);- }, [- deregisterShortcut,- disableNavigationShortcuts,- isLastQuery,- registerShortcut,- ]);-- useEffect(() => {- if (!isOpen) {- setDynamicPlaceholder(placeholder || '');- }- }, [isOpen, placeholder]);-- const userOs = getUserOperatingSystem();-- // conditional changes here to use a seperate component to render the example queries based on the option group label- const customRendererForLogsExplorer = options.map((option) => (- <Select.Option- key={`${option.label}-${option.type || ''}-${option.dataType || ''}`}- value={option.value}- >- <OptionRendererForLogs- label={option.label}- value={option.value}- dataType={option.dataType || ''}- isIndexed={option.isIndexed || false}- setDynamicPlaceholder={setDynamicPlaceholder}- />- {option.selected && <StyledCheckOutlined />}- </Select.Option>- ));-- return (- <div className="query-builder-search-container">- <Select- data-testid={'qb-search-select'}- ref={selectRef}- getPopupContainer={getPopupContainer}- transitionName=""- choiceTransitionName=""- virtual={false}- showSearch- tagRender={onTagRender}- filterOption={false}- open={isOpen}- onDropdownVisibleChange={setIsOpen}- autoClearSearchValue={false}- mode="multiple"- placeholder={dynamicPlacholder}- value={queryTags}- searchValue={searchValue}- className={cx(- className,- isLogsExplorerPage ? 'logs-popup' : '',- !showAllFilters && options.length > 3 && !key ? 'hide-scroll' : '',- )}- rootClassName="query-builder-search"- disabled={isMetricsDataSource && !query.aggregateAttribute?.key}- style={selectStyle}- onSearch={handleSearch}- onChange={onChangeHandler}- onSelect={handleSelect}- onDeselect={handleDeselect}- onInputKeyDown={onInputKeyDownHandler}- notFoundContent={isFetching ? <Spin size="small" /> : null}- suffixIcon={- !isUndefined(suffixIcon) ? (- suffixIcon- ) : isOpen ? (- <ChevronUp size={14} />- ) : (- <ChevronDown size={14} />- )- }- showAction={['focus']}- onBlur={(e: React.FocusEvent<HTMLInputElement>): void => {- handleOnBlur(e);- // Editing is done after tapping out of the input- toggleEditMode(false);- }}- popupClassName={isLogsExplorerPage ? 'logs-explorer-popup' : ''}- dropdownRender={(menu): ReactElement => (- <div>- {!searchKey && isLogsExplorerPage && (- <div className="ant-select-item-group ">Suggested Filters</div>- )}- {menu}- {isLogsExplorerPage && (- <div>- {!searchKey && tags.length === 0 && (- <div className="example-queries">- <div className="heading"> Example Queries </div>- <div className="query-container">- {convertExampleQueriesToOptions(exampleQueries).map((query) => (- <ExampleQueriesRendererForLogs- key={query.label}- label={query.label}- value={query.value}- handleAddTag={onChange}- />- ))}- </div>- </div>- )}- {!key && !isFetching && !showAllFilters && options.length > 3 && (- <Button- type="text"- className="show-all-filter-props"- onClick={(): void => {- setShowAllFilters(true);- // when clicking on the button the search bar looses the focus- selectRef?.current?.focus();- }}- >- <div className="content">- <section className="left-section">- <Filter size={14} />- <Typography.Text className="text">- Show all filters properties- </Typography.Text>- </section>- <section className="right-section">- {userOs === UserOperatingSystem.MACOS ? (- <Command size={14} className="keyboard-shortcut-slash" />- ) : (- <ChevronUp size={14} className="keyboard-shortcut-slash" />- )}- +- <Slash size={14} className="keyboard-shortcut-slash" />- </section>- </div>- </Button>- )}- <div className="keyboard-shortcuts">- <section className="navigate">- <ArrowDown size={10} className="icons" />- <ArrowUp size={10} className="icons" />- <span className="keyboard-text">to navigate</span>- </section>- <section className="update-query">- <CornerDownLeft size={10} className="icons" />- <span className="keyboard-text">to update query</span>- </section>- </div>- </div>- )}- </div>- )}- >- {isLogsExplorerPage- ? customRendererForLogsExplorer- : options.map((option) => (- <Select.Option- key={`${option.label}-${option.type || ''}-${option.dataType || ''}`}- value={option.value}- >- <OptionRenderer- label={option.label}- value={option.value}- dataType={option.dataType || ''}- type={option.type || ''}- />- {option.selected && <StyledCheckOutlined />}- </Select.Option>- ))}- </Select>- </div>- );-}--interface QueryBuilderSearchProps {- query: IBuilderQuery;- onChange: (value: TagFilter) => void;- whereClauseConfig?: WhereClauseConfig;- className?: string;- placeholder?: string;- suffixIcon?: React.ReactNode;- isInfraMonitoring?: boolean;- disableNavigationShortcuts?: boolean;- // TODO: Remove the dependency of InfraMonitoring from this code- entity?: InfraMonitoringEntity | null;- isMetricsExplorer?: boolean;-}--QueryBuilderSearch.defaultProps = {- whereClauseConfig: undefined,- className: '',- placeholder: PLACEHOLDER,- suffixIcon: undefined,- isInfraMonitoring: false,- disableNavigationShortcuts: false,- entity: null,- isMetricsExplorer: false,-};--export interface CustomTagProps {- label: ReactNode;- value: string;- disabled: boolean;- onClose: () => void;- closable: boolean;-}--export default QueryBuilderSearch;diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/ExampleQueriesRendererForLogs.tsx b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/ExampleQueriesRendererForLogs.tsxsimilarity index 92%rename from frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/ExampleQueriesRendererForLogs.tsxrename to frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/ExampleQueriesRendererForLogs.tsxindex 3aeaec4f1e..b30f8628f2 100644--- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/ExampleQueriesRendererForLogs.tsx+++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/ExampleQueriesRendererForLogs.tsx@@ -1,7 +1,5 @@import { TagFilter } from 'types/api/queryBuilder/queryBuilderData';-import './QueryBuilderSearch.styles.scss';-function ExampleQueriesRendererForLogs({label,value,diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchDropdown.tsx b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchDropdown.tsxindex 37302663a0..c1b997f92d 100644--- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchDropdown.tsx+++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchDropdown.tsx@@ -11,8 +11,8 @@ import {import { TagFilter } from 'types/api/queryBuilder/queryBuilderData';import { getUserOperatingSystem, UserOperatingSystem } from 'utils/getUserOS';-import ExampleQueriesRendererForLogs from '../QueryBuilderSearch/ExampleQueriesRendererForLogs';-import { convertExampleQueriesToOptions } from '../QueryBuilderSearch/utils';+import ExampleQueriesRendererForLogs from './ExampleQueriesRendererForLogs';+import { convertExampleQueriesToOptions } from './utils';import { ITag, Option } from './QueryBuilderSearchV2';import './QueryBuilderSearchV2.styles.scss';diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsxindex 0af4629359..8ac8debf8f 100644--- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx+++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx@@ -19,10 +19,10 @@ 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 { useDashboardVariablesByType } from 'hooks/dashboard/useDashboardVariablesByType';import { useKeyboardHotkeys } from 'hooks/hotkeys/useKeyboardHotkeys';-import { WhereClauseConfig } from 'hooks/queryBuilder/useAutoComplete';import { useGetAggregateKeys } from 'hooks/queryBuilder/useGetAggregateKeys';import { useGetAggregateValues } from 'hooks/queryBuilder/useGetAggregateValues';import { useGetAttributeSuggestions } from 'hooks/queryBuilder/useGetAttributeSuggestions';@@ -53,16 +53,16 @@ import { DataSource } from 'types/common/queryBuilder';import { useSelectPopupContainer } from 'utils/selectPopupContainer';import { v4 as uuid } from 'uuid';-import { selectStyle } from '../QueryBuilderSearch/config';-import { PLACEHOLDER } from '../QueryBuilderSearch/constant';-import { TypographyText } from '../QueryBuilderSearch/style';+import { selectStyle } from './config';+import { PLACEHOLDER } from './constant';+import { TypographyText } from './style';import {checkCommaInValue,getOperatorFromValue,getOperatorValue,getTagToken,isInNInOperator,-} from '../QueryBuilderSearch/utils';+} from './utils';import { filterByOperatorConfig } from '../utils';import QueryBuilderSearchDropdown from './QueryBuilderSearchDropdown';import SpanScopeSelector from './SpanScopeSelector';diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/Suggestions.tsx b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/Suggestions.tsxindex 263da7b401..111954a4b9 100644--- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/Suggestions.tsx+++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/Suggestions.tsx@@ -7,7 +7,7 @@ import { isEmpty, isObject } from 'lodash-es';import { Check, Zap } from '@signozhq/icons';import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';-import { getTagToken } from '../QueryBuilderSearch/utils';+import { getTagToken } from './utils';import { DropdownState } from './QueryBuilderSearchV2';import './Suggestions.styles.scss';diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/config.ts b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/config.tssimilarity index 100%rename from frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/config.tsrename to frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/config.tsdiff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/constant.ts b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/constant.tssimilarity index 100%rename from frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/constant.tsrename to frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/constant.tsdiff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/style.ts b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/style.tssimilarity index 53%rename from frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/style.tsrename to frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/style.tsindex 782846116a..80557e0502 100644--- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/style.ts+++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/style.ts@@ -1,5 +1,3 @@-import { Check } from '@signozhq/icons';-import { Badge } from '@signozhq/ui/badge';import styled from 'styled-components';export const TypographyText = styled.span<{@@ -17,27 +15,3 @@ export const TypographyText = styled.span<{padding-left: 8px;${({ $disabled }): string => ($disabled ? 'opacity: 0.6' : '')}`;--export const StyledCheckOutlined = styled(Check)`- float: right;-`;--export const TagContainer = styled(Badge).attrs({- color: 'secondary',- variant: 'outline',-})`- &&& {- display: flex;- font-weight: 300;- font-size: 0.6rem;- }-`;--export const TagLabel = styled.span`- font-weight: 400;-`;--export const TagValue = styled.span`- text-transform: capitalize;- font-weight: 400;-`;diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/utils.ts b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/utils.tssimilarity index 92%rename from frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/utils.tsrename to frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/utils.tsindex 0be5afc7a5..fcdd6279b1 100644--- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/utils.ts+++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/utils.ts@@ -1,8 +1,7 @@import { OPERATORS } from 'constants/queryBuilder';-import { MetricsType } from 'container/MetricsApplication/constant';import { queryFilterTags } from 'hooks/queryBuilder/useTag';import { parse } from 'papaparse';-import { TagFilter } from 'types/api/queryBuilder/queryBuilderData';+import type { TagFilter } from 'types/api/queryBuilder/queryBuilderData';import { orderByValueDelimiter } from '../OrderByFilter/utils';@@ -191,18 +190,6 @@ export function getRemoveOrderFromValue(tag: string): string {return tag;}-export function getOptionType(label: string): MetricsType | undefined {- let optionType;-- if (label.startsWith('tag_')) {- optionType = MetricsType.Tag;- } else if (label.startsWith('resource_')) {- optionType = MetricsType.Resource;- }-- return optionType;-}-/**** @param exampleQueries the example queries based on recommendation enginediff --git a/frontend/src/container/QueryBuilder/filters/utils.ts b/frontend/src/container/QueryBuilder/filters/utils.tsindex ea6fa0ea96..1950e95f46 100644--- a/frontend/src/container/QueryBuilder/filters/utils.ts+++ b/frontend/src/container/QueryBuilder/filters/utils.ts@@ -1,4 +1,3 @@-import { AttributeValuesMap } from 'components/ClientSideQBSearch/ClientSideQBSearch';import { OperatorConfigKeys, OPERATORS_CONFIG } from 'constants/queryBuilder';import { HAVING_FILTER_REGEXP } from 'constants/regExp';import { IOption } from 'hooks/useResourceAttribute/types';@@ -11,7 +10,7 @@ import {orderByValueDelimiter,splitOrderByFromString,} from './OrderByFilter/utils';-import { getRemoveOrderFromValue } from './QueryBuilderSearch/utils';+import { getRemoveOrderFromValue } from './QueryBuilderSearchV2/utils';export const handleKeyDownLimitFilter: React.KeyboardEventHandler<HTMLInputElement@@ -101,23 +100,6 @@ export const getValidOrderByResult = (result: IOption[]): IOption[] =>return acc;}, []);-export const transformKeyValuesToAttributeValuesMap = (- attributeValuesMap: Record<string, string[] | number[] | boolean[]>,-): AttributeValuesMap =>- Object.fromEntries(- Object.entries(attributeValuesMap || {}).map(([key, values]) => [- key,- {- stringAttributeValues:- typeof values[0] === 'string' ? (values as string[]) : [],- numberAttributeValues:- typeof values[0] === 'number' ? (values as number[]) : [],- boolAttributeValues:- typeof values[0] === 'boolean' ? (values as boolean[]) : [],- },- ]),- );-export const filterByOperatorConfig = (options: IOption[],key?: OperatorConfigKeys,diff --git a/frontend/src/container/QueryTable/Drilldown/metricsCorrelationUtils.tsx b/frontend/src/container/QueryTable/Drilldown/metricsCorrelationUtils.tsxindex 728cde2b23..6bb985e979 100644--- a/frontend/src/container/QueryTable/Drilldown/metricsCorrelationUtils.tsx+++ b/frontend/src/container/QueryTable/Drilldown/metricsCorrelationUtils.tsx@@ -3,7 +3,7 @@ import {formatValueForExpression,removeKeysFromExpression,} from 'components/QueryBuilderV2/utils';-import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';+import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearchV2/utils';import { IQueryPair } from 'types/antlrQueryTypes';import { extractQueryPairs } from 'utils/queryContextUtils';import { isQuoted, unquote } from 'utils/stringUtils';diff --git a/frontend/src/hooks/logs/useActiveLog.ts b/frontend/src/hooks/logs/useActiveLog.tsindex f0ccc72cb1..1cc1f23907 100644--- a/frontend/src/hooks/logs/useActiveLog.ts+++ b/frontend/src/hooks/logs/useActiveLog.ts@@ -9,7 +9,7 @@ import { QueryParams } from 'constants/query';import { OPERATORS, QueryBuilderKeys } from 'constants/queryBuilder';import ROUTES from 'constants/routes';import { MetricsType } from 'container/MetricsApplication/constant';-import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';+import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearchV2/utils';import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';import { useNotifications } from 'hooks/useNotifications';import useUrlQuery from 'hooks/useUrlQuery';diff --git a/frontend/src/hooks/queryBuilder/useAutoComplete.ts b/frontend/src/hooks/queryBuilder/useAutoComplete.tsdeleted file mode 100644index 604380856f..0000000000--- a/frontend/src/hooks/queryBuilder/useAutoComplete.ts+++ /dev/null@@ -1,185 +0,0 @@-import { KeyboardEvent, useCallback, useState } from 'react';-import { OPERATORS } from 'constants/queryBuilder';-import type { InfraMonitoringEntity } from 'container/InfraMonitoringK8sV2/constants';-import {- getRemovePrefixFromKey,- getTagToken,- replaceStringWithMaxLength,- tagRegexp,-} from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';-import { Option } from 'container/QueryBuilder/type';-import { parse } from 'papaparse';-import {- IBuilderQuery,- TagFilter,-} from 'types/api/queryBuilder/queryBuilderData';--import { useFetchKeysAndValues } from './useFetchKeysAndValues';-import { useOptions, WHERE_CLAUSE_CUSTOM_SUFFIX } from './useOptions';-import { useSetCurrentKeyAndOperator } from './useSetCurrentKeyAndOperator';-import { useTag } from './useTag';-import { useTagValidation } from './useTagValidation';--export type WhereClauseConfig = {- customKey: string;- customOp: string;-};--export const useAutoComplete = (- query: IBuilderQuery,- whereClauseConfig?: WhereClauseConfig,- shouldUseSuggestions?: boolean,- isInfraMonitoring?: boolean,- entity?: InfraMonitoringEntity | null,- isMetricsExplorer?: boolean,-): IAutoComplete => {- const [searchValue, setSearchValue] = useState<string>('');- const [searchKey, setSearchKey] = useState<string>('');-- const { keys, results, isFetching, exampleQueries } = useFetchKeysAndValues(- searchValue,- query,- searchKey,- shouldUseSuggestions,- isInfraMonitoring,- entity,- isMetricsExplorer,- );-- const [key, operator, result] = useSetCurrentKeyAndOperator(searchValue, keys);-- const handleSearch = (value: string): void => {- const prefixFreeValue = getRemovePrefixFromKey(getTagToken(value).tagKey);- setSearchValue(value);- setSearchKey(prefixFreeValue);- };-- const { isValidTag, isExist, isValidOperator, isMulti } = useTagValidation(- operator,- result,- );-- const { handleAddTag, handleClearTag, tags, updateTag } = useTag(- isValidTag,- handleSearch,- query,- setSearchKey,- whereClauseConfig,- isInfraMonitoring,- );-- const handleSelect = useCallback(- (value: string): void => {- if (isMulti) {- setSearchValue((prev: string) => {- const matches = prev?.matchAll(tagRegexp);- const [match] = matches ? Array.from(matches) : [];- const [, , , matchTagValue] = match;- const data = parse(matchTagValue).data.flat();- return replaceStringWithMaxLength(prev, data as string[], value);- });- }- if (!isMulti) {- handleAddTag(value);- }- },- [handleAddTag, isMulti],- );-- const handleKeyDown = useCallback(- (event: KeyboardEvent): void => {- if (- event.key === ' ' &&- (searchValue.endsWith(' ') || searchValue.length === 0)- ) {- event.preventDefault();- }-- if (event.key === 'Enter' && searchValue && isValidTag) {- if (isMulti) {- event.stopPropagation();- }- event.preventDefault();- handleAddTag(searchValue);- }-- if (event.key === 'Backspace' && !searchValue) {- event.stopPropagation();- const last = tags[tags.length - 1];- handleClearTag(last);- }- },- [handleAddTag, handleClearTag, isMulti, isValidTag, searchValue, tags],- );-- const handleOnBlur = (event: React.FocusEvent<HTMLInputElement>): void => {- event.preventDefault();- if (searchValue) {- if (- key &&- !operator &&- whereClauseConfig?.customKey === 'body' &&- whereClauseConfig.customOp === OPERATORS.CONTAINS- ) {- const value = `${searchValue}${WHERE_CLAUSE_CUSTOM_SUFFIX}`;- handleAddTag(value);- return;- }- handleAddTag(searchValue);- }- };-- const options = useOptions(- key,- keys,- operator,- searchValue,- isMulti,- isValidOperator,- isExist,- results,- result,- isFetching,- whereClauseConfig,- isInfraMonitoring,- );-- return {- updateTag,- handleSearch,- handleClearTag,- handleSelect,- handleKeyDown,- handleOnBlur,- options,- tags,- searchValue,- isMulti,- isFetching,- setSearchKey,- setSearchValue,- searchKey,- key,- exampleQueries,- };-};--interface IAutoComplete {- updateTag: (value: string) => void;- handleSearch: (value: string) => void;- handleClearTag: (value: string) => void;- handleSelect: (value: string) => void;- handleKeyDown: (event: React.KeyboardEvent) => void;- handleOnBlur: (event: React.FocusEvent<HTMLInputElement>) => void;- options: Option[];- tags: string[];- searchValue: string;- isMulti: boolean;- isFetching: boolean;- setSearchKey: (value: string) => void;- setSearchValue: (value: string) => void;- searchKey: string;- key: string;- exampleQueries: TagFilter[];- isInfraMonitoring?: boolean;-}diff --git a/frontend/src/hooks/queryBuilder/useFetchKeysAndValues.ts b/frontend/src/hooks/queryBuilder/useFetchKeysAndValues.tsdeleted file mode 100644index 89d7124d4f..0000000000--- a/frontend/src/hooks/queryBuilder/useFetchKeysAndValues.ts+++ /dev/null@@ -1,308 +0,0 @@-/* eslint-disable sonarjs/cognitive-complexity */-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';-import { useDebounce } from 'react-use';-import { getAttributesValues } from 'api/queryBuilder/getAttributesValues';-import { DATA_TYPE_VS_ATTRIBUTE_VALUES_KEY } from 'constants/queryBuilder';-import { DEBOUNCE_DELAY } from 'constants/queryBuilderFilterConfig';-import {- GetK8sEntityToAggregateAttribute,- InfraMonitoringEntity,-} from 'container/InfraMonitoringK8sV2/constants';-import {- getRemovePrefixFromKey,- getTagToken,- isInNInOperator,-} from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';-import useDebounceValue from 'hooks/useDebounce';-import { cloneDeep, isEqual, uniqWith, unset } from 'lodash-es';-import { IAttributeValuesResponse } from 'types/api/queryBuilder/getAttributesValues';-import {- BaseAutocompleteData,- DataTypes,-} from 'types/api/queryBuilder/queryAutocompleteResponse';-import {- IBuilderQuery,- TagFilter,-} from 'types/api/queryBuilder/queryBuilderData';-import { DataSource } from 'types/common/queryBuilder';--import { useGetAggregateKeys } from './useGetAggregateKeys';-import { useGetAttributeSuggestions } from './useGetAttributeSuggestions';--type IuseFetchKeysAndValues = {- keys: BaseAutocompleteData[];- results: string[];- isFetching: boolean;- sourceKeys: BaseAutocompleteData[];- handleRemoveSourceKey: (newSourceKey: string) => void;- exampleQueries: TagFilter[];-};--/**- * Custom hook to fetch attribute keys and values from an API- * @param searchValue - the search query value- * @param query - an object containing data for the query- * @returns an object containing the fetched attribute keys, results, and the status of the fetch- */--export const useFetchKeysAndValues = (- searchValue: string,- query: IBuilderQuery,- searchKey: string,- shouldUseSuggestions?: boolean,- isInfraMonitoring?: boolean,- entity?: InfraMonitoringEntity | null,- isMetricsExplorer?: boolean,-): IuseFetchKeysAndValues => {- const [keys, setKeys] = useState<BaseAutocompleteData[]>([]);- const [exampleQueries, setExampleQueries] = useState<TagFilter[]>([]);- const [sourceKeys, setSourceKeys] = useState<BaseAutocompleteData[]>([]);- const [results, setResults] = useState<string[]>([]);- const [isAggregateFetching, setAggregateFetching] = useState<boolean>(false);-- const memoizedSearchParams = useMemo(- () => [- searchKey,- query.dataSource,- query.aggregateOperator,- query.aggregateAttribute?.key,- ],- [- searchKey,- query.dataSource,- query.aggregateOperator,- query.aggregateAttribute?.key,- ],- );-- const searchParams = useDebounceValue(memoizedSearchParams, DEBOUNCE_DELAY);-- const queryFiltersWithoutId = useMemo(- () => ({- ...query.filters,- items: query.filters?.items?.map((item) => {- const filterWithoutId = cloneDeep(item);- unset(filterWithoutId, 'id');- return filterWithoutId;- }),- }),- [query.filters],- );-- const memoizedSuggestionsParams = useMemo(- () => [searchKey, query.dataSource, queryFiltersWithoutId],- [query.dataSource, queryFiltersWithoutId, searchKey],- );-- const suggestionsParams = useDebounceValue(- memoizedSuggestionsParams,- DEBOUNCE_DELAY,- );-- const isQueryEnabled = useMemo(- () =>- query.dataSource === DataSource.METRICS &&- !isInfraMonitoring &&- !isMetricsExplorer- ? !!query.dataSource && !!query.aggregateAttribute?.dataType- : true,- [- isInfraMonitoring,- isMetricsExplorer,- query.aggregateAttribute?.dataType,- query.dataSource,- ],- );-- const { data, isFetching, status } = useGetAggregateKeys(- {- searchText: searchKey,- dataSource: query.dataSource,- aggregateOperator: query.aggregateOperator || '',- aggregateAttribute:- isInfraMonitoring && entity- ? GetK8sEntityToAggregateAttribute(entity)- : query.aggregateAttribute?.key || '',- tagType: query.aggregateAttribute?.type ?? null,- },- {- queryKey: [searchParams],- enabled: isMetricsExplorer ? false : isQueryEnabled && !shouldUseSuggestions,- },- isInfraMonitoring, // isInfraMonitoring- entity, // infraMonitoringEntity- );-- const {- data: suggestionsData,- isFetching: isFetchingSuggestions,- status: fetchingSuggestionsStatus,- } = useGetAttributeSuggestions(- {- searchText: searchKey,- dataSource: query.dataSource,- filters: query.filters || { items: [], op: 'AND' },- },- {- queryKey: [suggestionsParams],- enabled: isQueryEnabled && shouldUseSuggestions,- },- );-- function isAttributeValuesResponse(- // eslint-disable-next-line @typescript-eslint/no-explicit-any- payload: any,- ): payload is IAttributeValuesResponse {- return (- payload &&- (Array.isArray(payload.stringAttributeValues) ||- payload.stringAttributeValues === null ||- Array.isArray(payload.numberAttributeValues) ||- payload.numberAttributeValues === null ||- Array.isArray(payload.boolAttributeValues) ||- payload.boolAttributeValues === null)- );- }-- /**- * Fetches the options to be displayed based on the selected value- * @param value - the selected value- * @param query - an object containing data for the query- */- const handleFetchOption = async (- value: string,- query: IBuilderQuery,- keys: BaseAutocompleteData[],- ): Promise<void> => {- if (!value) {- return;- }- const { tagKey, tagOperator, tagValue } = getTagToken(value);- const filterAttributeKey = keys.find(- (item) => item.key === getRemovePrefixFromKey(tagKey),- );- setResults([]);-- if (!tagKey || !tagOperator) {- return;- }- setAggregateFetching(true);-- try {- let payload;- if (isInfraMonitoring && entity) {- const response = await getAttributesValues({- aggregateOperator: 'noop',- dataSource: query.dataSource,- aggregateAttribute:- GetK8sEntityToAggregateAttribute(entity) ||- query.aggregateAttribute?.key ||- '',- attributeKey: filterAttributeKey?.key ?? tagKey,- filterAttributeKeyDataType:- filterAttributeKey?.dataType ?? DataTypes.EMPTY,- tagType: filterAttributeKey?.type ?? '',- searchText: isInNInOperator(tagOperator)- ? (tagValue[tagValue.length - 1]?.toString() ?? '')- : (tagValue?.toString() ?? ''),- });- payload = response.payload;- } else {- const response = await getAttributesValues({- aggregateOperator: query.aggregateOperator || '',- dataSource: query.dataSource,- aggregateAttribute: query.aggregateAttribute?.key || '',- attributeKey: filterAttributeKey?.key ?? tagKey,- filterAttributeKeyDataType:- filterAttributeKey?.dataType ?? DataTypes.EMPTY,- tagType: filterAttributeKey?.type ?? '',- searchText: isInNInOperator(tagOperator)- ? (tagValue[tagValue.length - 1]?.toString() ?? '')- : (tagValue?.toString() ?? ''),- });- payload = response.payload;- }-- if (payload && isAttributeValuesResponse(payload)) {- const dataType = filterAttributeKey?.dataType ?? DataTypes.String;- const key = DATA_TYPE_VS_ATTRIBUTE_VALUES_KEY[dataType];- setResults(key ? payload[key] || [] : []);- return;- }- } catch (e) {- console.error(e);- } finally {- setAggregateFetching(false);- }- };-- const handleRemoveSourceKey = useCallback((sourceKey: string) => {- setSourceKeys((prevState) =>- prevState.filter((item) => item.key !== sourceKey),- );- }, []);-- // creates a ref to the fetch function so that it doesn't change on every render- const clearFetcher = useRef(handleFetchOption).current;-- // debounces the fetch function to avoid excessive API calls- useDebounce(() => clearFetcher(searchValue, query, keys), 750, [- clearFetcher,- searchValue,- query,- keys,- ]);-- // update the fetched keys when the fetch status changes- useEffect(() => {- if (status === 'success' && data?.payload?.attributeKeys) {- setKeys(data.payload.attributeKeys);- setSourceKeys((prevState) =>- uniqWith([...(data.payload.attributeKeys ?? []), ...prevState], isEqual),- );- } else {- setKeys([]);- }- }, [data?.payload?.attributeKeys, status]);-- useEffect(() => {- if (- fetchingSuggestionsStatus === 'success' &&- suggestionsData?.payload?.attributes- ) {- if (!isInfraMonitoring) {- setKeys(suggestionsData.payload.attributes);- setSourceKeys((prevState) =>- uniqWith(- [...(suggestionsData.payload.attributes ?? []), ...prevState],- isEqual,- ),- );- }- } else {- setKeys([]);- }- if (- fetchingSuggestionsStatus === 'success' &&- suggestionsData?.payload?.example_queries- ) {- setExampleQueries(suggestionsData.payload.example_queries);- } else {- setExampleQueries([]);- }- }, [- suggestionsData?.payload?.attributes,- fetchingSuggestionsStatus,- suggestionsData?.payload?.example_queries,- isInfraMonitoring,- ]);-- return {- keys,- results,- isFetching: isFetching || isAggregateFetching || isFetchingSuggestions,- sourceKeys,- handleRemoveSourceKey,- exampleQueries,- };-};diff --git a/frontend/src/hooks/queryBuilder/useOperators.ts b/frontend/src/hooks/queryBuilder/useOperators.tsdeleted file mode 100644index 9392a0ad64..0000000000--- a/frontend/src/hooks/queryBuilder/useOperators.ts+++ /dev/null@@ -1,31 +0,0 @@-import { useMemo } from 'react';-import {- OPERATORS,- QUERY_BUILDER_OPERATORS_BY_TYPES,-} from 'constants/queryBuilder';-import { getRemovePrefixFromKey } from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';-import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';--type IOperators =- | typeof QUERY_BUILDER_OPERATORS_BY_TYPES.universal- | typeof QUERY_BUILDER_OPERATORS_BY_TYPES.string- | typeof QUERY_BUILDER_OPERATORS_BY_TYPES.bool- | typeof QUERY_BUILDER_OPERATORS_BY_TYPES.int64- | typeof QUERY_BUILDER_OPERATORS_BY_TYPES.float64;--export const useOperators = (- key: string,- keys: BaseAutocompleteData[],-): IOperators =>- useMemo(() => {- const currentKey = keys?.find((el) => el.key === getRemovePrefixFromKey(key));- const strippedKey = key.split(' ')[0];-- return currentKey?.dataType- ? QUERY_BUILDER_OPERATORS_BY_TYPES[- currentKey.dataType as keyof typeof QUERY_BUILDER_OPERATORS_BY_TYPES- ]- : strippedKey.endsWith('[*]') && strippedKey.startsWith('body.')- ? [OPERATORS.HAS, OPERATORS.NHAS]- : QUERY_BUILDER_OPERATORS_BY_TYPES.universal;- }, [keys, key]);diff --git a/frontend/src/hooks/queryBuilder/useOptions.ts b/frontend/src/hooks/queryBuilder/useOptions.tsdeleted file mode 100644index 067b4b43cf..0000000000--- a/frontend/src/hooks/queryBuilder/useOptions.ts+++ /dev/null@@ -1,220 +0,0 @@-import { useCallback, useEffect, useMemo, useState } from 'react';-import { INFRA_SHORT_TO_LONG_OPERATOR_MAP } from 'constants/queryBuilder';-import {- checkCommaInValue,- getTagToken,-} from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';-import { Option } from 'container/QueryBuilder/type';-import { useDashboardVariablesByType } from 'hooks/dashboard/useDashboardVariablesByType';-import { isEmpty } from 'lodash-es';-import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';--import { WhereClauseConfig } from './useAutoComplete';-import { useOperators } from './useOperators';--export const WHERE_CLAUSE_CUSTOM_SUFFIX = '-custom';--export const useOptions = (- key: string,- keys: BaseAutocompleteData[],- operator: string,- searchValue: string,- isMulti: boolean,- isValidOperator: boolean,- isExist: boolean,- results: string[],- result: string[],- isFetching: boolean,- whereClauseConfig?: WhereClauseConfig,- isInfraMonitoring?: boolean,- // eslint-disable-next-line sonarjs/cognitive-complexity-): Option[] => {- const [options, setOptions] = useState<Option[]>([]);- const operators = useOperators(key, keys);-- // get matching dynamic variables to suggest- const dashboardDynamicVariables = useDashboardVariablesByType(- 'DYNAMIC',- 'values',- );-- const variableName = dashboardDynamicVariables?.find(- (variable) => variable?.dynamicVariablesAttribute === key,- )?.name;-- const variableAsValue = variableName ? `$${variableName}` : '';-- const getLabel = useCallback(- (data: BaseAutocompleteData): Option['label'] => data?.key,- [],- );-- const getOptionsFromKeys = useCallback(- (items: BaseAutocompleteData[]): Option[] =>- items?.map((item) => ({- label: `${getLabel(item)}`,- value: item.key,- dataType: item.dataType,- isIndexed: item?.isIndexed,- type: item?.type || '',- })),- [getLabel],- );-- const getKeyOpValue = useCallback(- (items: string[]): Option[] =>- items?.map((item) => ({- label: `${key} ${operator} ${item}`,- value: `${key} ${operator} ${item}`,- })),- [key, operator],- );-- const getOptionsWithValidOperator = useCallback(- (key: string, results: string[], searchValue: string) => {- const hasAllResults = results.every((value) => result.includes(value));-- let newResults = results;- if (!isEmpty(variableAsValue)) {- newResults = [variableAsValue, ...newResults];- }-- const values = getKeyOpValue(newResults);-- return hasAllResults- ? [- {- label: searchValue,- value: searchValue,- },- ]- : [- {- label: searchValue,- value: searchValue,- },- ...values,- ];- },- [getKeyOpValue, result, variableAsValue],- );-- const getKeyOperatorOptions = useCallback(- (key: string) => {- const keyOperator = key.split(' ');- const partialOperator = keyOperator?.[1];- const partialKey = keyOperator?.[0];- const filteredOperators = !isEmpty(partialOperator)- ? operators?.filter((operator) =>- operator.startsWith(partialOperator?.toUpperCase()),- )- : operators;- const operatorsOptions = filteredOperators?.map((op) => {- const labelOp =- isInfraMonitoring && INFRA_SHORT_TO_LONG_OPERATOR_MAP[op]- ? INFRA_SHORT_TO_LONG_OPERATOR_MAP[op]- : op;- return {- value: `${partialKey} ${op} `,- label: `${partialKey} ${labelOp} `,- };- });- if (whereClauseConfig) {- return [- {- label: `${searchValue} `,- value: `${searchValue}${WHERE_CLAUSE_CUSTOM_SUFFIX}`,- },- ...operatorsOptions,- ];- }- return operatorsOptions;- },- [isInfraMonitoring, operators, searchValue, whereClauseConfig],- );-- useEffect(() => {- let newOptions: Option[] = [];-- if (!key) {- newOptions = searchValue- ? [- {- label: `${searchValue} `,- value: `${searchValue} `,- },- ...getOptionsFromKeys(keys),- ]- : getOptionsFromKeys(keys);- } else if (key && !operator) {- newOptions = getKeyOperatorOptions(key);- } else if (key && operator) {- if (isMulti) {- const resultsWithVariable = isEmpty(variableAsValue)- ? results- : [variableAsValue, ...results];- newOptions = resultsWithVariable.map((item) => ({- label: checkCommaInValue(String(item)),- value: String(item),- }));- } else if (isExist) {- newOptions = [];- } else if (isValidOperator) {- newOptions = getOptionsWithValidOperator(key, results, searchValue);- }- }- if (newOptions.length > 0) {- setOptions(newOptions);- }- if (isFetching) {- setOptions([]);- }- }, [- whereClauseConfig,- getKeyOpValue,- getOptionsFromKeys,- isExist,- isMulti,- isValidOperator,- key,- keys,- operator,- operators,- result,- results,- searchValue,- getKeyOperatorOptions,- getOptionsWithValidOperator,- isFetching,- variableAsValue,- ]);-- return useMemo(- () =>- (- options.filter(- (option, index, self) =>- index ===- self.findIndex(- (o) =>- o.label === option.label &&- o.value === option.value &&- (o.type || '') === (option.type || '') &&- (o.dataType || '') === (option.dataType || ''), // keep entries with same key but different type/dataType- ) && option.value !== '',- ) || []- ).map((option) => {- const { tagValue } = getTagToken(searchValue);- if (isMulti) {- return {- ...option,- selected: tagValue- .filter((i) => i.trim().replace(/^\s+/, '') === option.value)- .includes(option.value),- };- }- return option;- }),- [isMulti, options, searchValue],- );-};diff --git a/frontend/src/hooks/queryBuilder/useSetCurrentKeyAndOperator.ts b/frontend/src/hooks/queryBuilder/useSetCurrentKeyAndOperator.tsdeleted file mode 100644index 99c22968dd..0000000000--- a/frontend/src/hooks/queryBuilder/useSetCurrentKeyAndOperator.ts+++ /dev/null@@ -1,32 +0,0 @@-import { useMemo } from 'react';-import {- getRemovePrefixFromKey,- getTagToken,-} from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';-import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';--type ICurrentKeyAndOperator = [string, string, string[]];--export const useSetCurrentKeyAndOperator = (- value: string,- keys: BaseAutocompleteData[],-): ICurrentKeyAndOperator => {- const [key, operator, result] = useMemo(() => {- let key = '';- let operator = '';- let result: string[] = [];- const { tagKey, tagOperator, tagValue } = getTagToken(value);- const isSuggestKey = keys?.some(- (el) => el?.key === getRemovePrefixFromKey(tagKey),- );- if (isSuggestKey || keys.length === 0) {- key = tagKey || '';- operator = tagOperator || '';- result = tagValue || [];- }-- return [key, operator, result];- }, [value, keys]);-- return [key, operator, result];-};diff --git a/frontend/src/hooks/queryBuilder/useTag.ts b/frontend/src/hooks/queryBuilder/useTag.tsindex 55831d3699..482fd77a03 100644--- a/frontend/src/hooks/queryBuilder/useTag.ts+++ b/frontend/src/hooks/queryBuilder/useTag.ts@@ -1,18 +1,10 @@-import { useCallback, useEffect, useMemo, useState } from 'react';import { INFRA_SHORT_TO_LONG_OPERATOR_MAP } from 'constants/queryBuilder';import {getOperatorFromValue,- getTagToken,- isExistsNotExistsOperator,isInNInOperator,-} from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';+} from 'container/QueryBuilder/filters/QueryBuilderSearchV2/utils';import { unparse } from 'papaparse';-import {- IBuilderQuery,- TagFilter,-} from 'types/api/queryBuilder/queryBuilderData';--import { WhereClauseConfig } from './useAutoComplete';+import type { TagFilter } from 'types/api/queryBuilder/queryBuilderData';/*** Helper for formatting a TagFilter object into filter item strings@@ -42,95 +34,3 @@ export function queryFilterTags(return `${ele.key?.key} ${displayOp} ${ele.value}`;});}--type IUseTag = {- handleAddTag: (value: string) => void;- handleClearTag: (value: string) => void;- tags: string[];- updateTag: (value: string) => void;-};--/**- * A custom React hook for handling tags.- * @param {string} key - A string value to identify tags.- * @param {boolean} isValidTag - A boolean value to indicate whether the tag is valid.- * @param {function} handleSearch - A callback function to handle search.- * @returns {IUseTag} The return object containing handlers and tags.- */--export const useTag = (- isValidTag: boolean,- handleSearch: (value: string) => void,- query: IBuilderQuery,- setSearchKey: (value: string) => void,- whereClauseConfig?: WhereClauseConfig,- isInfraMonitoring?: boolean,-): IUseTag => {- const initTagsData = useMemo(- () =>- queryFilterTags(- query?.filters || { items: [], op: 'AND' },- isInfraMonitoring,- ),- [query?.filters, isInfraMonitoring],- );-- const [tags, setTags] = useState<string[]>(initTagsData);-- const updateTag = (value: string): void => {- const newTags = tags?.filter((item: string) => item !== value);- setTags(newTags);- };-- /**- * Adds a new tag to the tag list.- * @param {string} value - The tag value to be added.- */-- const handleAddTag = useCallback(- (value: string): void => {- const { tagKey } = getTagToken(value);- const parts = tagKey.split('-');- // this is done to ensure that `hello-world` also gets converted to `body CONTAINS hello-world`- let id = parts[parts.length - 1];- let key = parts.slice(0, -1).join('-');- if (parts.length === 1) {- id = '';- [key] = parts;- }-- if (id === 'custom') {- const customValue = whereClauseConfig- ? `${whereClauseConfig.customKey} ${whereClauseConfig.customOp} ${key}`- : '';- setTags((prevTags) =>- prevTags.includes(customValue) ? prevTags : [...prevTags, customValue],- );- handleSearch('');- setSearchKey('');- return;- }-- if ((value && key && isValidTag) || isExistsNotExistsOperator(value)) {- setTags((prevTags) => [...prevTags, value]);- handleSearch('');- setSearchKey('');- }- },- [whereClauseConfig, isValidTag, handleSearch, setSearchKey],- );-- /**- * Removes a tag from the tag list.- * @param {string} value - The tag value to be removed.- */- const handleClearTag = useCallback((value: string): void => {- setTags((prevTags) => prevTags.filter((v) => v !== value));- }, []);-- useEffect(() => {- setTags(initTagsData);- }, [initTagsData]);-- return { handleAddTag, handleClearTag, tags, updateTag };-};diff --git a/frontend/src/hooks/trace/useTraceActions.ts b/frontend/src/hooks/trace/useTraceActions.tsindex 172c5b566c..f9c26faca9 100644--- a/frontend/src/hooks/trace/useTraceActions.ts+++ b/frontend/src/hooks/trace/useTraceActions.ts@@ -6,7 +6,7 @@ import { convertFiltersToExpressionWithExistingQuery } from 'components/QueryBuiimport { SOMETHING_WENT_WRONG } from 'constants/api';import { QueryBuilderKeys } from 'constants/queryBuilder';import ROUTES from 'constants/routes';-import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';+import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearchV2/utils';import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';import { useNotifications } from 'hooks/useNotifications';import { chooseAutocompleteFromCustomValue } from 'lib/newQueryBuilder/chooseAutocompleteFromCustomValue';diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/SpanLogs.tsx b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/SpanLogs.tsxindex 8b7e5aa7a5..b52c88f378 100644--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/SpanLogs.tsx+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/SpanLogs.tsx@@ -16,7 +16,7 @@ import LogsError from 'container/LogsError/LogsError';import { EmptyLogsListConfig } from 'container/LogsExplorerList/utils';import { LogsLoading } from 'container/LogsLoading/LogsLoading';import { FontSize } from 'container/OptionsMenu/types';-import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';+import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearchV2/utils';import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';import createQueryParams from 'lib/createQueryParams';import { Compass } from '@signozhq/icons';diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/useSpanContextLogs.ts b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/useSpanContextLogs.tsindex b6db739fed..9648584281 100644--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/useSpanContextLogs.ts+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/useSpanContextLogs.ts@@ -4,7 +4,7 @@ import { convertFiltersToExpression } from 'components/QueryBuilderV2/utils';import { ENTITY_VERSION_V5 } from 'constants/app';import { OPERATORS } from 'constants/queryBuilder';import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';-import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';+import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearchV2/utils';import { GetMetricQueryRange } from 'lib/dashboard/getQueryResults';import { ILog } from 'types/api/logs/log';import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/hooks/useSpanAttributeActions.ts b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/hooks/useSpanAttributeActions.tsindex 3e9666c9a4..12ff2d5cd7 100644--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/hooks/useSpanAttributeActions.ts+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/hooks/useSpanAttributeActions.ts@@ -7,7 +7,7 @@ import { convertFiltersToExpressionWithExistingQuery } from 'components/QueryBuiimport { SOMETHING_WENT_WRONG } from 'constants/api';import { PANEL_TYPES, QueryBuilderKeys } from 'constants/queryBuilder';import ROUTES from 'constants/routes';-import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';+import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearchV2/utils';import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';import { chooseAutocompleteFromCustomValue } from 'lib/newQueryBuilder/chooseAutocompleteFromCustomValue';import { ArrowDownToDot, ArrowUpFromDot } from '@signozhq/icons';