Skip to content

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

chore(quick-filters): remove the old checkbox filter (#13262)

Aditya Singh1e89b49ecfea
diff --git a/frontend/src/api/querySuggestions/getValueSuggestion.ts b/frontend/src/api/querySuggestions/getValueSuggestion.ts
deleted file mode 100644
index 60fd37e6b4..0000000000
--- a/frontend/src/api/querySuggestions/getValueSuggestion.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import axios from 'api';
-import { AxiosResponse } from 'axios';
-import {
- QueryKeyValueRequestProps,
- QueryKeyValueSuggestionsResponseProps,
-} from 'types/api/querySuggestions/types';
-
-/**
- * @deprecated Use the generated `useGetFieldsValues` hook (or `getFieldsValues` fetcher) from
- * `api/generated/services/fields` instead. This hand-written client targets the
- * same endpoint and will be removed once call sites migrate.
- *
- * Part of https://github.com/SigNoz/engineering-pod/issues/5289, add a comment or update when removing this method.
- */
-export const getValueSuggestions = (
- props: QueryKeyValueRequestProps,
-): Promise<AxiosResponse<QueryKeyValueSuggestionsResponseProps>> => {
- const { signal, key, searchText, signalSource, metricName } = props;
-
- const encodedSignal = encodeURIComponent(signal);
- const encodedKey = encodeURIComponent(key);
- const encodedMetricName = encodeURIComponent(metricName || '');
- const encodedSearchText = encodeURIComponent(searchText);
- const encodedSource = encodeURIComponent(signalSource || '');
-
- return axios.get(
- `/fields/values?signal=${encodedSignal}&name=${encodedKey}&searchText=${encodedSearchText}&metricName=${encodedMetricName}&source=${encodedSource}`,
- );
-};
diff --git a/frontend/src/assets/CustomIcons/EmptyQuickFilterIcon.tsx b/frontend/src/assets/CustomIcons/EmptyQuickFilterIcon.tsx
deleted file mode 100644
index 89ab66896d..0000000000
--- a/frontend/src/assets/CustomIcons/EmptyQuickFilterIcon.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-interface EmptyQuickFilterIconProps {
- width?: number;
- height?: number;
- className?: string;
-}
-
-function EmptyQuickFilterIcon({
- width = 32,
- height = 32,
- className,
-}: EmptyQuickFilterIconProps): JSX.Element {
- return (
- <svg
- width={width}
- height={height}
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- className={className}
- >
- <path
- d="M17.948 6.906h-6.62V6.24h6.62v.667ZM17.948 10.293h-6.62v-.667h6.62v.667Z"
- fill="#616161"
- />
- <path
- d="M16.175 29.403H13.62V3.442s.238-.554 1.278-.554 1.278.554 1.278.554v25.96h-.002Z"
- fill="#9E9E9E"
- />
- <path
- d="M15.52 2.971v20.974H13.62v1.91c.323.001.614.04.876.097a1.3 1.3 0 0 1 1.024 1.269v2.182h.656V3.442c-.002 0-.14-.318-.658-.471Z"
- fill="#757575"
- />
- <path
- d="M22.363 2.737a5.382 5.382 0 0 0-5.382 5.402 5.365 5.365 0 0 0 5.382 5.382 5.378 5.378 0 0 0 5.382-5.382c0-2.975-2.407-5.402-5.382-5.402Z"
- fill="#2196F3"
- />
- <path
- d="M24.714 4.749c-.338-.085-1.01-.174-2.349-.174-1.337 0-2.01.087-2.348.174-.2.05-.87.328-.87 1.077v4.618c0 .253.205.46.46.46h.17v.51c0 .15.12.27.268.27h.545c.149 0 .269-.12.269-.27v-.51h3.008v.51c0 .15.12.27.27.27h.544c.149 0 .269-.12.269-.27v-.51h.173a.46.46 0 0 0 .46-.46V5.826c0-.717-.669-1.029-.869-1.077Zm-3.802.366c0-.113.091-.204.205-.204h2.493c.113 0 .204.09.204.204v.362a.204.204 0 0 1-.204.205h-2.493a.204.204 0 0 1-.205-.205v-.362Zm.042 4.864a.138.138 0 0 1-.137.138h-.55a.469.469 0 0 1-.468-.469v-.246c0-.076.062-.138.138-.138h.548c.258 0 .47.209.47.469v.246Zm3.973-.33a.469.469 0 0 1-.468.468h-.55a.138.138 0 0 1-.137-.138v-.246c0-.258.209-.47.469-.47h.549c.075 0 .137.063.137.139v.246Zm.125-2.007c0 .297-.645.817-2.689.817-2.046 0-2.689-.482-2.689-.817V6.277c0-.089.09-.31.311-.31h4.791c.223 0 .276.224.276.31v1.365Z"
- fill="#fff"
- />
- <path
- d="M18.861 24.652h-7.926a.506.506 0 0 1-.507-.507V14.99c0-.28.227-.507.507-.507h7.924c.28 0 .507.227.507.507v9.155c0 .28-.227.507-.505.507Z"
- fill="#F5F5F5"
- />
- <path
- opacity=".8"
- d="M18.006 23.139H11.79l-.017-7.236h6.217l.016 7.236Z"
- fill="#82AEC0"
- />
- <path d="M14.66 23.234v-7.33h.444v7.33h-.445Z" fill="#F5F5F5" />
- <path d="M14.66 15.903h-2.887v.605h2.886v-.605Z" fill="#616161" />
- <path
- d="M18.03 21.878h-6.264v-.222h6.264v.223ZM18.03 20.412h-6.264v-.222h6.264v.222ZM17.99 18.945h-6.217v-.222h6.217v.222ZM17.99 17.481h-6.224v-.222h6.224v.222Z"
- fill="#F5F5F5"
- />
- <path
- d="M17.988 18.534H15.1v.605h2.887v-.605ZM14.672 19.999h-2.877v.604h2.877V20Z"
- fill="#616161"
- />
- <path
- d="M10.935 14.817a.173.173 0 0 0-.173.173v9.155c0 .096.077.174.173.174h7.926a.173.173 0 0 0 .171-.174V14.99a.173.173 0 0 0-.173-.173h-7.924Zm-.84.173a.84.84 0 0 1 .84-.84h7.924a.84.84 0 0 1 .84.84v9.155a.84.84 0 0 1-.838.84h-7.926a.84.84 0 0 1-.84-.84V14.99Z"
- fill="#9E9E9E"
- />
- <path
- d="M10.968 24.323c-.344.031-.344-.195-.344-.258V15.1c0-.251.204-.455.455-.455h7.693c.21 0 .305.126.262.384 0 0-.026-.165-.226-.165h-7.726a.237.237 0 0 0-.236.236v8.968c0 .21.122.256.122.256Z"
- fill="#757575"
- />
- <path d="M12.268 4.933H4.695v6.577h7.573V4.933Z" fill="#FFCA28" />
- <path
- d="M11.846 4.933c.233 0 .422.189.422.422v5.733a.422.422 0 0 1-.422.422H5.12a.422.422 0 0 1-.423-.422V5.355c0-.233.19-.422.423-.422h6.726Zm0-.445H5.12a.868.868 0 0 0-.867.867v5.733c0 .478.389.867.867.867h6.726a.868.868 0 0 0 .867-.867V5.355a.866.866 0 0 0-.867-.867Z"
- fill="#9E9E9E"
- />
- <path
- d="M12.27 7.308H4.696v-.444h7.575v.444ZM12.27 9.579H4.696v-.444h7.575v.444Z"
- fill="#FFFDE7"
- />
- <path
- d="M7.066 5.664H5.162v.502h1.904v-.502ZM6.597 10.27H5.162v.503h1.435v-.502ZM11.648 10.27h-1.435v.503h1.435v-.502ZM11.648 5.664h-1.435v.502h1.435v-.502ZM10.302 7.968h-.827v.502h.827v-.502ZM11.648 7.968h-.826v.502h.826v-.502ZM7.802 7.968h-2.64v.502h2.64v-.502Z"
- fill="#757575"
- />
- </svg>
- );
-}
-
-EmptyQuickFilterIcon.defaultProps = {
- width: 32,
- height: 32,
- className: '',
-};
-
-export default EmptyQuickFilterIcon;
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.styles.scss b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.styles.scss
deleted file mode 100644
index 090c50c5f9..0000000000
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.styles.scss
+++ /dev/null
@@ -1,230 +0,0 @@
-.checkbox-filter {
- display: flex;
- flex-direction: column;
- padding: 12px;
- gap: 12px;
- border-bottom: 1px solid var(--l1-border);
-
- .search {
- input {
- --input-background: var(--l2-background);
- --input-hover-background: var(--l2-background);
- --input-focus-background: var(--l2-background);
- &::placeholder {
- color: var(--l3-foreground);
- }
- --input-font-size: 14px;
- --input-border-color: var(--l1-border);
- --input-focus-border-color: var(--primary-background);
- --input-focus-outline-width: 0;
- --input-focus-outline-offset: 0;
- }
- }
-
- .filter-header-checkbox {
- display: flex;
- align-items: center;
- justify-content: space-between;
- cursor: pointer;
-
- .left-action {
- display: flex;
- align-items: center;
- gap: 6px;
-
- .title {
- color: var(--l2-foreground);
- font-family: Inter;
- font-size: 14px;
- font-style: normal;
- font-weight: 400;
- line-height: 18px;
- letter-spacing: -0.07px;
- text-transform: capitalize;
- }
- }
-
- .right-action {
- display: flex;
- align-items: center;
- min-width: 48px;
-
- .clear-all {
- font-size: 12px;
- color: var(--accent-primary);
- cursor: pointer;
- }
- }
- }
-
- .values {
- display: flex;
- flex-direction: column;
- gap: 8px;
-
- .filter-separator {
- height: 1px;
- background-color: var(--l1-border);
- margin: 4px 0;
- }
-
- .value {
- display: flex;
- align-items: center;
- gap: 8px;
- min-height: 24px;
-
- .checkbox-value-section {
- display: flex;
- align-items: center;
- gap: 4px;
- width: calc(100% - 24px);
- cursor: pointer;
-
- .value-string {
- width: 100%;
- }
-
- &.filter-disabled {
- cursor: not-allowed;
-
- .value-string {
- color: var(--l3-foreground);
- }
-
- .only-btn,
- .toggle-btn {
- cursor: not-allowed;
- color: var(--l3-foreground);
- }
- }
-
- // Stack "Only"/"All" and "Toggle" in a single cell so revealing
- // one swaps in place instead of shifting the row layout.
- .value-actions {
- display: grid;
- align-items: center;
- justify-items: end;
-
- > * {
- grid-area: 1 / 1;
- }
- }
-
- .only-btn,
- .toggle-btn {
- display: none;
- align-items: center;
- justify-content: center;
- height: 21px;
- opacity: 0;
- transform: translateX(4px);
- // `display` is animated as a discrete property so the button
- // stays mounted through its fade-out on exit.
- transition:
- opacity 0.16s ease,
- transform 0.16s ease,
- display 0.16s allow-discrete;
-
- &:hover {
- background-color: unset;
- }
- }
- }
-
- // Hovering the label/value area reveals the "Only"/"All" action.
- .checkbox-value-section:hover .only-btn {
- display: flex;
- opacity: 1;
- transform: translateX(0);
-
- // Entry animation start state (fires on the display switch).
- @starting-style {
- opacity: 0;
- transform: translateX(4px);
- }
- }
-
- // Hovering the checkbox reveals the "Toggle" action.
- [data-slot='checkbox']:hover ~ .checkbox-value-section .toggle-btn {
- display: flex;
- opacity: 1;
- transform: translateX(0);
-
- @starting-style {
- opacity: 0;
- transform: translateX(4px);
- }
- }
- }
-
- @media (prefers-reduced-motion: reduce) {
- .only-btn,
- .toggle-btn {
- transition: none;
- }
- }
- }
-
- .no-data {
- align-self: center;
- }
-
- .show-more {
- display: flex;
- align-items: center;
- justify-content: center;
-
- .show-more-text {
- color: var(--accent-primary);
- cursor: pointer;
- }
- }
- .go-to-docs {
- display: flex;
- flex-direction: column;
- gap: 44px;
- &__container {
- display: flex;
- flex-direction: column;
- gap: 4px;
- margin-top: 4px;
-
- &-message {
- color: var(--l2-foreground);
- font-size: 14px;
- line-height: 20px; /* 142.857% */
- letter-spacing: -0.07px;
- }
- }
- &__button {
- display: flex;
- align-items: center;
- gap: 4px;
- cursor: pointer;
- margin: 0 0 4px;
- padding: 0;
- &-text {
- color: var(--bg-robin-400);
- font-family: Inter;
- font-size: 14px;
- line-height: 20px; /* 142.857% */
- letter-spacing: -0.07px;
- }
- }
- }
-}
-
-.label-false {
- width: 2px;
- height: 11px;
- border-radius: 2px;
- background: var(--danger-background);
-}
-
-.label-true {
- width: 2px;
- height: 11px;
- border-radius: 2px;
- background: var(--bg-forest-500);
-}
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.test.tsx b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.test.tsx
deleted file mode 100644
index 3e686d54da..0000000000
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.test.tsx
+++ /dev/null
@@ -1,476 +0,0 @@
-import { UseQueryResult } from 'react-query';
-import userEvent from '@testing-library/user-event';
-import { FiltersType, QuickFiltersSource } from 'components/QuickFilters/types';
-import { useGetAggregateValues } from 'hooks/queryBuilder/useGetAggregateValues';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { useGetQueryKeyValueSuggestions } from 'hooks/querySuggestions/useGetQueryKeyValueSuggestions';
-import { quickFiltersAttributeValuesResponse } from 'mocks-server/__mockdata__/customQuickFilters';
-import { rest, server } from 'mocks-server/server';
-import { render, screen, waitFor } from 'tests/test-utils';
-import { SuccessResponse } from 'types/api';
-import { IAttributeValuesResponse } from 'types/api/queryBuilder/getAttributesValues';
-import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { DataSource } from 'types/common/queryBuilder';
-
-import CheckboxFilter from './Checkbox';
-
-// Mock the query builder hook
-jest.mock('hooks/queryBuilder/useQueryBuilder');
-const mockUseQueryBuilder = jest.mocked(useQueryBuilder);
-
-// Mock the aggregate values hook
-jest.mock('hooks/queryBuilder/useGetAggregateValues');
-
-const mockUseGetAggregateValues = jest.mocked(useGetAggregateValues);
-
-// Mock the key value suggestions hook
-jest.mock('hooks/querySuggestions/useGetQueryKeyValueSuggestions');
-
-const mockUseGetQueryKeyValueSuggestions = jest.mocked(
- useGetQueryKeyValueSuggestions,
-);
-
-interface MockFilterConfig {
- title: string;
- attributeKey: {
- key: string;
- dataType: DataTypes;
- type: string;
- };
- dataSource: DataSource;
- defaultOpen: boolean;
- type: FiltersType;
-}
-
-const SERVICE_NAME_KEY = 'service.name';
-const OTEL_DEMO = 'otel-demo';
-const SAMPLE_FLASK = 'sample-flask';
-const OTLP_PYTHON = 'otlp-python';
-const MQ_KAFKA = 'mq-kafka';
-
-const MOCK_SERVICE_NAMES = [MQ_KAFKA, OTEL_DEMO, OTLP_PYTHON, SAMPLE_FLASK];
-
-const createMockFilter = (
- overrides: Partial<MockFilterConfig> = {},
-): MockFilterConfig => ({
- title: 'Service Name',
- attributeKey: {
- key: SERVICE_NAME_KEY,
- dataType: DataTypes.String,
- type: 'resource',
- },
- dataSource: DataSource.LOGS,
- defaultOpen: false,
- type: FiltersType.CHECKBOX,
- ...overrides,
-});
-
-const createMockQueryBuilderData = (hasActiveFilters = false): any => ({
- lastUsedQuery: 0,
- currentQuery: {
- builder: {
- queryData: [
- {
- filters: {
- items: hasActiveFilters
- ? [
- {
- key: {
- key: SERVICE_NAME_KEY,
- dataType: DataTypes.String,
- type: 'resource',
- },
- op: 'in',
- value: [OTEL_DEMO, SAMPLE_FLASK],
- },
- ]
- : [],
- },
- },
- ],
- },
- },
- redirectWithQueryBuilderData: jest.fn(),
-});
-
-describe('CheckboxFilter - User Flows', () => {
- beforeEach(() => {
- // Reset all mocks
- jest.clearAllMocks();
-
- // Default mock implementations for useGetAggregateValues
- mockUseGetAggregateValues.mockReturnValue({
- data: {
- payload: {
- stringAttributeValues: MOCK_SERVICE_NAMES,
- },
- },
- isLoading: false,
- refetch: jest.fn(),
- } as unknown as UseQueryResult<SuccessResponse<IAttributeValuesResponse>>);
-
- // Default mock implementations for useGetQueryKeyValueSuggestions
- // Returns data in the format expected by the hook
- mockUseGetQueryKeyValueSuggestions.mockReturnValue({
- data: {
- data: {
- data: {
- values: {
- stringValues: MOCK_SERVICE_NAMES,
- numberValues: [],
- },
- },
- },
- },
- isLoading: false,
- refetch: jest.fn(),
- } as any);
-
- // Setup MSW server for API calls
- server.use(
- rest.get('*/api/v3/autocomplete/attribute_values', (_req, res, ctx) =>
- res(ctx.status(200), ctx.json(quickFiltersAttributeValuesResponse)),
- ),
- );
- });
-
- it('should auto-open filter and prioritize checked items with visual separator when user opens page with active filters', async () => {
- // Mock query builder with active filters
- mockUseQueryBuilder.mockReturnValue(createMockQueryBuilderData(true) as any);
-
- const mockFilter = createMockFilter({ defaultOpen: false });
-
- render(
- <CheckboxFilter
- filter={mockFilter}
- source={QuickFiltersSource.LOGS_EXPLORER}
- />,
- );
-
- // User should see the filter is automatically opened (not collapsed)
- expect(screen.getByText('Service Name')).toBeInTheDocument();
- await waitFor(() => {
- expect(screen.getByPlaceholderText('Filter values')).toBeInTheDocument();
- });
-
- // User should see visual separator between checked and unchecked items
- expect(screen.getByTestId('filter-separator')).toBeInTheDocument();
-
- // User should see checked items at the top
- await waitFor(() => {
- const checkboxes = screen.getAllByRole('checkbox');
- expect(checkboxes).toHaveLength(4); // Ensure we have exactly 4 checkboxes
- expect(checkboxes[0]).toBeChecked(); // otel-demo should be first and checked
- expect(checkboxes[1]).toBeChecked(); // sample-flask should be second and checked
- expect(checkboxes[2]).not.toBeChecked(); // mq-kafka should be unchecked
- expect(checkboxes[3]).not.toBeChecked(); // otlp-python should be unchecked
- });
- });
-
- it('should respect user preference when user manually toggles filter over auto-open behavior', async () => {
- const user = userEvent.setup({ pointerEventsCheck: 0 });
-
- // Mock query builder with active filters
- mockUseQueryBuilder.mockReturnValue(createMockQueryBuilderData(true) as any);
-
- const mockFilter = createMockFilter({ defaultOpen: false });
-
- render(
- <CheckboxFilter
- filter={mockFilter}
- source={QuickFiltersSource.LOGS_EXPLORER}
- />,
- );
-
- // Initially auto-opened due to active filters
- await waitFor(() => {
- expect(screen.getByPlaceholderText('Filter values')).toBeInTheDocument();
- });
-
- // User manually closes the filter
- await user.click(screen.getByText('Service Name'));
-
- // User should see filter is now closed (respecting user preference)
- expect(
- screen.queryByPlaceholderText('Filter values'),
- ).not.toBeInTheDocument();
-
- // User manually opens the filter again
- await user.click(screen.getByText('Service Name'));
-
- // User should see filter is now open (respecting user preference)
- await waitFor(() => {
- expect(screen.getByPlaceholderText('Filter values')).toBeInTheDocument();
- });
- });
-
- it('should update query filters when a checkbox is clicked', async () => {
- const redirectWithQueryBuilderData = jest.fn();
-
- // Start with no active filters so clicking a checkbox creates one
- mockUseQueryBuilder.mockReturnValue({
- ...createMockQueryBuilderData(false),
- redirectWithQueryBuilderData,
- } as any);
-
- const mockFilter = createMockFilter({ defaultOpen: true });
-
- render(
- <CheckboxFilter
- filter={mockFilter}
- source={QuickFiltersSource.LOGS_EXPLORER}
- />,
- );
-
- // Wait for checkboxes to render
- await waitFor(() => {
- expect(screen.getAllByRole('checkbox')).toHaveLength(4);
- });
-
- const checkboxes = screen.getAllByRole('checkbox');
-
- // User unchecks the first value (`mq-kafka`)
- await userEvent.click(checkboxes[0]);
-
- // Composite query params (query builder data) should be updated via redirectWithQueryBuilderData
- expect(redirectWithQueryBuilderData).toHaveBeenCalledTimes(1);
-
- const [updatedQuery] = redirectWithQueryBuilderData.mock.calls[0];
- const updatedFilters = updatedQuery.builder.queryData[0].filters;
-
- expect(updatedFilters.items).toHaveLength(1);
- expect(updatedFilters.items[0].key.key).toBe(SERVICE_NAME_KEY);
- // When unchecking from an "all selected" state, we use a NOT_IN filter for that value
- expect(updatedFilters.items[0].op).toBe('not in');
- expect(updatedFilters.items[0].value).toBe('mq-kafka');
- });
-
- it('should set an IN filter with only the clicked value when using Only', async () => {
- const redirectWithQueryBuilderData = jest.fn();
-
- // Existing filter: service.name IN ['mq-kafka', 'otel-demo']
- mockUseQueryBuilder.mockReturnValue({
- lastUsedQuery: 0,
- currentQuery: {
- builder: {
- queryData: [
- {
- filters: {
- items: [
- {
- key: {
- key: SERVICE_NAME_KEY,
- dataType: DataTypes.String,
- type: 'resource',
- },
- op: 'in',
- value: ['mq-kafka', 'otel-demo'],
- },
- ],
- op: 'AND',
- },
- },
- ],
- },
- },
- redirectWithQueryBuilderData,
- } as any);
-
- const mockFilter = createMockFilter({ defaultOpen: true });
-
- render(
- <CheckboxFilter
- filter={mockFilter}
- source={QuickFiltersSource.LOGS_EXPLORER}
- />,
- );
-
- // Wait for values to render
- await waitFor(() => {
- expect(screen.getByText('mq-kafka')).toBeInTheDocument();
- });
-
- // Click on the value label to trigger the "Only" behavior
- await userEvent.click(screen.getByText('mq-kafka'));
-
- expect(redirectWithQueryBuilderData).toHaveBeenCalledTimes(1);
- const [updatedQuery] = redirectWithQueryBuilderData.mock.calls[0];
- const updatedFilters = updatedQuery.builder.queryData[0].filters;
-
- expect(updatedFilters.items).toHaveLength(1);
- expect(updatedFilters.items[0].key.key).toBe(SERVICE_NAME_KEY);
- expect(updatedFilters.items[0].op).toBe('in');
- expect(updatedFilters.items[0].value).toBe('mq-kafka');
- });
-
- it('should clear filters for the attribute when using All', async () => {
- const redirectWithQueryBuilderData = jest.fn();
-
- // Existing filter: service.name IN ['mq-kafka']
- mockUseQueryBuilder.mockReturnValue({
- lastUsedQuery: 0,
- currentQuery: {
- builder: {
- queryData: [
- {
- filters: {
- items: [
- {
- key: {
- key: SERVICE_NAME_KEY,
- dataType: DataTypes.String,
- type: 'resource',
- },
- op: 'in',
- value: ['mq-kafka'],
- },
- ],
- op: 'AND',
- },
- },
- ],
- },
- },
- redirectWithQueryBuilderData,
- } as any);
-
- const mockFilter = createMockFilter({ defaultOpen: true });
-
- render(
- <CheckboxFilter
- filter={mockFilter}
- source={QuickFiltersSource.LOGS_EXPLORER}
- />,
- );
-
- await waitFor(() => {
- expect(screen.getByText('mq-kafka')).toBeInTheDocument();
- });
-
- // Only one value is selected, so clicking it should switch to "All" (no filter for this key)
- await userEvent.click(screen.getByText('mq-kafka'));
-
- expect(redirectWithQueryBuilderData).toHaveBeenCalledTimes(1);
- const [updatedQuery] = redirectWithQueryBuilderData.mock.calls[0];
- const updatedFilters = updatedQuery.builder.queryData[0].filters;
-
- const filtersForServiceName = updatedFilters.items.filter(
- (item: any) => item.key?.key === SERVICE_NAME_KEY,
- );
-
- expect(filtersForServiceName).toHaveLength(0);
- });
-
- it('should match filter when query uses resource. prefix (resource.service.name matches service.name)', async () => {
- // Filter config uses unprefixed key (service.name)
- // Query has filter with resource. prefix (resource.service.name)
- // Checkbox should recognize the match and show checked state
- mockUseQueryBuilder.mockReturnValue({
- lastUsedQuery: 0,
- currentQuery: {
- builder: {
- queryData: [
- {
- filters: {
- items: [
- {
- key: {
- key: 'resource.service.name',
- dataType: DataTypes.String,
- type: 'resource',
- },
- op: 'in',
- value: [OTEL_DEMO],
- },
- ],
- op: 'AND',
- },
- },
- ],
- },
- },
- redirectWithQueryBuilderData: jest.fn(),
- } as any);
-
- const mockFilter = createMockFilter({ defaultOpen: false });
-
- render(
- <CheckboxFilter
- filter={mockFilter}
- source={QuickFiltersSource.LOGS_EXPLORER}
- />,
- );
-
- // Filter should auto-open because it has active filters (key match via prefix stripping)
- await waitFor(() => {
- expect(screen.getByPlaceholderText('Filter values')).toBeInTheDocument();
- });
-
- // otel-demo should be checked (filter uses resource.service.name IN [otel-demo])
- // Checked items are sorted to the top, so otel-demo is first
- const checkboxes = screen.getAllByRole('checkbox');
- expect(checkboxes[0]).toBeChecked();
- expect(screen.getByText(OTEL_DEMO)).toBeInTheDocument();
- });
-
- it('should extend an existing IN filter when checking an additional value', async () => {
- const redirectWithQueryBuilderData = jest.fn();
-
- // Existing filter: service.name IN 'mq-kafka'
- mockUseQueryBuilder.mockReturnValue({
- lastUsedQuery: 0,
- currentQuery: {
- builder: {
- queryData: [
- {
- filters: {
- items: [
- {
- key: {
- key: SERVICE_NAME_KEY,
- dataType: DataTypes.String,
- type: 'resource',
- },
- op: 'in',
- value: 'mq-kafka',
- },
- ],
- op: 'AND',
- },
- },
- ],
- },
- },
- redirectWithQueryBuilderData,
- } as any);
-
- const mockFilter = createMockFilter({ defaultOpen: true });
-
- render(
- <CheckboxFilter
- filter={mockFilter}
- source={QuickFiltersSource.LOGS_EXPLORER}
- />,
- );
-
- // Wait for checkboxes to render
- await waitFor(() => {
- expect(screen.getAllByRole('checkbox')).toHaveLength(4);
- });
-
- const checkboxes = screen.getAllByRole('checkbox');
-
- // First checkbox corresponds to 'mq-kafka' (already selected),
- // second will be 'otel-demo' which we now select additionally.
- await userEvent.click(checkboxes[1]);
-
- expect(redirectWithQueryBuilderData).toHaveBeenCalledTimes(1);
- const [updatedQuery] = redirectWithQueryBuilderData.mock.calls[0];
- const updatedFilters = updatedQuery.builder.queryData[0].filters;
- const [filterForServiceName] = updatedFilters.items;
-
- expect(filterForServiceName.key.key).toBe(SERVICE_NAME_KEY);
- expect(filterForServiceName.op).toBe('in');
- expect(filterForServiceName.value).toStrictEqual(['mq-kafka', 'otel-demo']);
- });
-});
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.tsx b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.tsx
deleted file mode 100644
index c41154ef08..0000000000
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.tsx
+++ /dev/null
@@ -1,177 +0,0 @@
-/* eslint-disable sonarjs/no-identical-functions */
-import { Fragment, useMemo, useState } from 'react';
-import { Input } from '@signozhq/ui/input';
-import { Skeleton } from 'antd';
-import { Typography } from '@signozhq/ui/typography';
-import {
- IQuickFiltersConfig,
- QuickFilterChangeEventData,
- QuickFiltersSource,
-} from 'components/QuickFilters/types';
-import { DEBOUNCE_DELAY } from 'constants/queryBuilderFilterConfig';
-import useDebouncedFn from 'hooks/useDebouncedFunction';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-
-import CheckboxFilterHeader from './CheckboxFilterHeader';
-import CheckboxValueRow from './CheckboxValueRow';
-import LogsQuickFilterEmptyState from './LogsQuickFilterEmptyState';
-import useActiveQueryIndex from 'components/QuickFilters/hooks/useActiveQueryIndex';
-import useCheckboxDisclosure from './useCheckboxDisclosure';
-import useCheckboxFilterActions from './useCheckboxFilterActions';
-import useCheckboxFilterState, {
- FILTER_DISABLED_REASON,
-} from './useCheckboxFilterState';
-import useCheckboxFilterValues from './useCheckboxFilterValues';
-
-import './Checkbox.styles.scss';
-
-const SOURCES_WITH_EMPTY_STATE_ENABLED = [QuickFiltersSource.LOGS_EXPLORER];
-
-interface ICheckboxProps {
- filter: IQuickFiltersConfig;
- source: QuickFiltersSource;
- onFilterChange?: (query: Query) => void;
- onQuickFilterChange?: (data: QuickFilterChangeEventData) => void;
-}
-
-// eslint-disable-next-line sonarjs/cognitive-complexity
-export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
- const { source, filter, onFilterChange, onQuickFilterChange } = props;
- const [searchText, setSearchText] = useState<string>('');
-
- const activeQueryIndex = useActiveQueryIndex(source);
-
- const {
- isOpen,
- isSomeFilterPresentForCurrentAttribute,
- visibleItemsCount,
- onToggleOpen,
- onShowMore,
- } = useCheckboxDisclosure({ filter, activeQueryIndex });
-
- const { attributeValues, isLoading } = useCheckboxFilterValues({
- filter,
- source,
- searchText,
- isOpen,
- });
-
- const { currentFilterState, isFilterDisabled, isMultipleValuesTrueForTheKey } =
- useCheckboxFilterState({ filter, attributeValues, activeQueryIndex });
-
- const { onChange, onClear } = useCheckboxFilterActions({
- filter,
- source,
- attributeValues,
- activeQueryIndex,
- onFilterChange,
- onQuickFilterChange,
- });
-
- const setSearchTextDebounced = useDebouncedFn((...args) => {
- setSearchText(args[0] as string);
- }, DEBOUNCE_DELAY);
-
- // Sort checked items to the top, then unchecked items
- const currentAttributeKeys = useMemo(() => {
- const checkedValues = attributeValues.filter(
- (val) => currentFilterState[val],
- );
- const uncheckedValues = attributeValues.filter(
- (val) => !currentFilterState[val],
- );
- return [...checkedValues, ...uncheckedValues].slice(0, visibleItemsCount);
- }, [attributeValues, currentFilterState, visibleItemsCount]);
-
- // Count of checked values in the currently visible items
- const checkedValuesCount = useMemo(
- () => currentAttributeKeys.filter((val) => currentFilterState[val]).length,
- [currentAttributeKeys, currentFilterState],
- );
-
- const isEmptyStateWithDocsEnabled =
- SOURCES_WITH_EMPTY_STATE_ENABLED.includes(source) &&
- !searchText &&
- !attributeValues.length;
-
- return (
- <div className="checkbox-filter">
- <CheckboxFilterHeader
- title={filter.title}
- isOpen={isOpen}
- showClearAll={!!attributeValues.length}
- onToggleOpen={onToggleOpen}
- onClear={onClear}
- />
- {isOpen && isLoading && !attributeValues.length && (
- <section className="loading">
- <Skeleton paragraph={{ rows: 4 }} />
- </section>
- )}
- {isOpen && !isLoading && (
- <>
- {!isEmptyStateWithDocsEnabled && (
- <section className="search">
- <Input
- placeholder="Filter values"
- onChange={(e): void => setSearchTextDebounced(e.target.value)}
- disabled={isFilterDisabled}
- />
- </section>
- )}
- {attributeValues.length > 0 ? (
- <section className="values">
- {currentAttributeKeys.map((value: string, index: number) => (
- <Fragment key={value}>
- {index === checkedValuesCount && checkedValuesCount > 0 && (
- <div
- key="separator"
- className="filter-separator"
- data-testid="filter-separator"
- />
- )}
- <CheckboxValueRow
- value={value}
- checked={currentFilterState[value]}
- disabled={isFilterDisabled}
- disabledTooltip={FILTER_DISABLED_REASON}
- title={filter.title}
- onlyButtonLabel={
- isSomeFilterPresentForCurrentAttribute
- ? currentFilterState[value] && !isMultipleValuesTrueForTheKey
- ? 'All'
- : 'Only'
- : 'Only'
- }
- customRendererForValue={filter.customRendererForValue}
- onCheckboxChange={(checked): void => onChange(value, checked, false)}
- onOnlyOrAllClick={(): void =>
- onChange(value, currentFilterState[value], true)
- }
- />
- </Fragment>
- ))}
- </section>
- ) : isEmptyStateWithDocsEnabled ? (
- <LogsQuickFilterEmptyState attributeKey={filter.attributeKey.key} />
- ) : (
- <section className="no-data">
- <Typography.Text>No values found</Typography.Text>{' '}
- </section>
- )}
- {visibleItemsCount < attributeValues?.length && (
- <section className="show-more">
- <Typography.Text className="show-more-text" onClick={onShowMore}>
- Show More...
- </Typography.Text>
- </section>
- )}
- </>
- )}
- </div>
- );
-}
-
-CheckboxFilter.defaultProps = {
- onFilterChange: null,
-};
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/CheckboxFilterHeader.tsx b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/CheckboxFilterHeader.tsx
deleted file mode 100644
index 55245ee583..0000000000
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/CheckboxFilterHeader.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Typography } from '@signozhq/ui/typography';
-import { ChevronDown, ChevronRight } from '@signozhq/icons';
-
-interface CheckboxFilterHeaderProps {
- title: string;
- isOpen: boolean;
- showClearAll: boolean;
- onToggleOpen: () => void;
- onClear: () => void;
-}
-
-function CheckboxFilterHeader({
- title,
- isOpen,
- showClearAll,
- onToggleOpen,
- onClear,
-}: CheckboxFilterHeaderProps): JSX.Element {
- return (
- <section className="filter-header-checkbox" onClick={onToggleOpen}>
- <section className="left-action">
- {isOpen ? (
- <ChevronDown size={13} cursor="pointer" />
- ) : (
- <ChevronRight size={13} cursor="pointer" />
- )}
- <Typography.Text className="title">{title}</Typography.Text>
- </section>
- <section className="right-action">
- {isOpen && showClearAll && (
- <Typography.Text
- className="clear-all"
- onClick={(e): void => {
- e.stopPropagation();
- e.preventDefault();
- onClear();
- }}
- >
- Clear All
- </Typography.Text>
- )}
- </section>
- </section>
- );
-}
-
-export default CheckboxFilterHeader;
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/CheckboxValueRow.tsx b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/CheckboxValueRow.tsx
deleted file mode 100644
index 9dbf768eed..0000000000
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/CheckboxValueRow.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import { Button } from 'antd';
-import { Checkbox } from '@signozhq/ui/checkbox';
-import { Typography } from '@signozhq/ui/typography';
-import cx from 'classnames';
-import { Tooltip } from '@signozhq/ui/tooltip';
-
-interface CheckboxValueRowProps {
- value: string;
- checked: boolean;
- disabled: boolean;
- disabledTooltip?: string;
- title: string;
- onlyButtonLabel: string;
- customRendererForValue?: (value: string) => JSX.Element;
- onCheckboxChange: (checked: boolean) => void;
- onOnlyOrAllClick: () => void;
-}
-
-function CheckboxValueRow({
- value,
- checked,
- disabled,
- disabledTooltip,
- title,
- onlyButtonLabel,
- customRendererForValue,
- onCheckboxChange,
- onOnlyOrAllClick,
-}: CheckboxValueRowProps): JSX.Element {
- return (
- <div className="value">
- <Checkbox
- color="primary"
- disabledTooltip={disabledTooltip}
- onChange={(isChecked): void => onCheckboxChange(isChecked === true)}
- value={checked}
- disabled={disabled}
- />
-
- <div
- className={cx('checkbox-value-section', disabled ? 'filter-disabled' : '')}
- onClick={(): void => {
- if (disabled) {
- return;
- }
- onOnlyOrAllClick();
- }}
- >
- <div className={`${title} label-${value}`} />
- {customRendererForValue ? (
- customRendererForValue(value)
- ) : (
- <Tooltip title={String(value)} side="top" align="start">
- <Typography.Text className="value-string" truncate={1}>
- {String(value)}
- </Typography.Text>
- </Tooltip>
- )}
- <div className="value-actions">
- <Button type="text" className="only-btn">
- {onlyButtonLabel}
- </Button>
- <Button type="text" className="toggle-btn">
- Toggle
- </Button>
- </div>
- </div>
- </div>
- );
-}
-
-CheckboxValueRow.defaultProps = {
- disabledTooltip: undefined,
- customRendererForValue: undefined,
-};
-
-export default CheckboxValueRow;
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/LogsQuickFilterEmptyState.tsx b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/LogsQuickFilterEmptyState.tsx
deleted file mode 100644
index fc87d7d3a3..0000000000
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/LogsQuickFilterEmptyState.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { Color } from '@signozhq/design-tokens';
-import { Button } from 'antd';
-import EmptyQuickFilterIcon from 'assets/CustomIcons/EmptyQuickFilterIcon';
-import { ArrowUpRight } from '@signozhq/icons';
-
-const QUICK_FILTER_DOC_PATHS: Record<string, string> = {
- severity_text: 'severity-text',
- 'deployment.environment': 'environment',
- 'service.name': 'service-name',
- 'host.name': 'hostname',
- 'k8s.cluster.name': 'k8s-cluster-name',
- 'k8s.deployment.name': 'k8s-deployment-name',
- 'k8s.namespace.name': 'k8s-namespace-name',
- 'k8s.pod.name': 'k8s-pod-name',
-};
-
-function LogsQuickFilterEmptyState({
- attributeKey,
-}: {
- attributeKey: string;
-}): JSX.Element {
- const handleLearnMoreClick = (): void => {
- const section = QUICK_FILTER_DOC_PATHS[attributeKey];
-
- window.open(
- `https://signoz.io/docs/logs-management/features/logs-quick-filters#${section}`,
- '_blank',
- );
- };
- return (
- <section className="go-to-docs">
- <div className="go-to-docs__container">
- <div className="go-to-docs__container-icon">
- <EmptyQuickFilterIcon />
- </div>
- <div className="go-to-docs__container-message">
- {`You'd need to parse out this attribute to start getting them as a fast
- filter.`}
- </div>
- </div>
- <Button
- type="link"
- className="go-to-docs__button"
- onClick={handleLearnMoreClick}
- >
- <div className="go-to-docs__button-text">Learn more</div>
- <ArrowUpRight size={14} color={Color.BG_ROBIN_400} />
- </Button>
- </section>
- );
-}
-
-export default LogsQuickFilterEmptyState;
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/useCheckboxFilterValues.tsx b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/useCheckboxFilterValues.tsx
deleted file mode 100644
index 041d042547..0000000000
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/useCheckboxFilterValues.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import { useMemo } from 'react';
-import {
- IQuickFiltersConfig,
- QuickFiltersSource,
-} from 'components/QuickFilters/types';
-import { DATA_TYPE_VS_ATTRIBUTE_VALUES_KEY } from 'constants/queryBuilder';
-import { useGetAggregateValues } from 'hooks/queryBuilder/useGetAggregateValues';
-import { useGetQueryKeyValueSuggestions } from 'hooks/querySuggestions/useGetQueryKeyValueSuggestions';
-import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { DataSource } from 'types/common/queryBuilder';
-
-interface UseCheckboxFilterValuesProps {
- filter: IQuickFiltersConfig;
- source: QuickFiltersSource;
- searchText: string;
- isOpen: boolean;
-}
-
-interface UseCheckboxFilterValuesReturn {
- attributeValues: string[];
- isLoading: boolean;
-}
-
-function useCheckboxFilterValues({
- filter,
- source,
- searchText,
- isOpen,
-}: UseCheckboxFilterValuesProps): UseCheckboxFilterValuesReturn {
- const { data, isLoading } = useGetAggregateValues(
- {
- aggregateOperator: filter.aggregateOperator || 'noop',
- dataSource: filter.dataSource || DataSource.LOGS,
- aggregateAttribute: filter.aggregateAttribute || '',
- attributeKey: filter.attributeKey.key,
- filterAttributeKeyDataType: filter.attributeKey.dataType || DataTypes.EMPTY,
- tagType: filter.attributeKey.type || '',
- searchText: searchText ?? '',
- },
- {
- enabled: isOpen && source !== QuickFiltersSource.METER_EXPLORER,
- keepPreviousData: true,
- },
- );
-
- const { data: keyValueSuggestions, isLoading: isLoadingKeyValueSuggestions } =
- useGetQueryKeyValueSuggestions({
- key: filter.attributeKey.key,
- signal: filter.dataSource || DataSource.LOGS,
- signalSource: 'meter',
- options: {
- enabled: isOpen && source === QuickFiltersSource.METER_EXPLORER,
- keepPreviousData: true,
- },
- });
-
- const attributeValues: string[] = useMemo(() => {
- const dataType = filter.attributeKey.dataType || DataTypes.String;
-
- if (source === QuickFiltersSource.METER_EXPLORER && keyValueSuggestions) {
- // Process the response data
- const responseData = keyValueSuggestions?.data as any;
- const values = responseData.data?.values || {};
- const stringValues = values.stringValues || [];
- const numberValues = values.numberValues || [];
-
- // Generate options from string values - explicitly handle empty strings
- const stringOptions = stringValues
- // Strict filtering for empty string - we'll handle it as a special case if needed
- .filter(
- (value: string | null | undefined): value is string =>
- value !== null && value !== undefined && value !== '',
- );
-
- // Generate options from number values
- const numberOptions = numberValues
- .filter(
- (value: number | null | undefined): value is number =>
- value !== null && value !== undefined,
- )
- .map((value: number) => value.toString());
-
- // Combine all options and make sure we don't have duplicate labels
- return [...stringOptions, ...numberOptions];
- }
-
- const key = DATA_TYPE_VS_ATTRIBUTE_VALUES_KEY[dataType];
- return (data?.payload?.[key] || []).filter(
- (val) => val !== undefined && val !== null,
- );
- }, [data?.payload, filter.attributeKey.dataType, keyValueSuggestions, source]);
-
- return {
- attributeValues,
- isLoading: isLoading || isLoadingKeyValueSuggestions,
- };
-}
-
-export default useCheckboxFilterValues;
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/__tests__/CheckboxFilterV2.interactions.test.tsx b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/__tests__/CheckboxFilterV2.interactions.test.tsx
index 854016386f..e249b50bb6 100644
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/__tests__/CheckboxFilterV2.interactions.test.tsx
+++ b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/__tests__/CheckboxFilterV2.interactions.test.tsx
@@ -18,6 +18,25 @@ import {
setupServer();
+const activeEnvironmentFilter = buildQueryBuilderOverrides({
+ builder: {
+ queryData: [
+ {
+ filters: {
+ items: [
+ {
+ key: { key: 'deployment.environment' },
+ op: 'in',
+ value: ['production'],
+ },
+ ],
+ op: 'AND',
+ },
+ },
+ ],
+ },
+});
+
describe('CheckboxFilterV2 - interactions', () => {
describe('search functionality', () => {
it('filters values based on search text', async () => {
@@ -425,6 +444,63 @@ describe('CheckboxFilterV2 - interactions', () => {
expect(header).toHaveAttribute('data-state', 'open');
await screen.findByTestId('checkbox-value-row-production');
});
+
+ it('opens a closed filter when the query filters on its key', async () => {
+ mockFieldsValuesAPI({
+ stringValues: ['production', 'staging'],
+ });
+
+ render(
+ <CheckboxFilterV2
+ filter={{ ...DEFAULT_FILTER, defaultOpen: false }}
+ source={QuickFiltersSource.TRACES_EXPLORER}
+ useFieldApis={DEFAULT_USE_FIELD_APIS}
+ />,
+ undefined,
+ { queryBuilderOverrides: activeEnvironmentFilter },
+ );
+
+ expect(screen.getByTestId('checkbox-filter-header')).toHaveAttribute(
+ 'data-state',
+ 'open',
+ );
+ await expect(
+ screen.findByTestId('checkbox-value-row-production'),
+ ).resolves.toHaveAttribute('data-state', 'checked');
+ });
+
+ it('keeps the user toggle over the auto-open', async () => {
+ const user = userEvent.setup();
+
+ mockFieldsValuesAPI({
+ stringValues: ['production'],
+ });
+
+ render(
+ <CheckboxFilterV2
+ filter={{ ...DEFAULT_FILTER, defaultOpen: false }}
+ source={QuickFiltersSource.TRACES_EXPLORER}
+ useFieldApis={DEFAULT_USE_FIELD_APIS}
+ />,
+ undefined,
+ { queryBuilderOverrides: activeEnvironmentFilter },
+ );
+
+ const header = screen.getByTestId('checkbox-filter-header');
+ await screen.findByTestId('checkbox-value-row-production');
+
+ await user.click(header);
+
+ expect(header).toHaveAttribute('data-state', 'closed');
+ expect(
+ screen.queryByTestId('checkbox-value-row-production'),
+ ).not.toBeInTheDocument();
+
+ await user.click(header);
+
+ expect(header).toHaveAttribute('data-state', 'open');
+ await screen.findByTestId('checkbox-value-row-production');
+ });
});
describe('show more functionality', () => {
diff --git a/frontend/src/components/QuickFilters/QuickFilters.tsx b/frontend/src/components/QuickFilters/QuickFilters.tsx
index 58176cdf1f..edca0b0b43 100644
--- a/frontend/src/components/QuickFilters/QuickFilters.tsx
+++ b/frontend/src/components/QuickFilters/QuickFilters.tsx
@@ -34,7 +34,6 @@ import {
import { isFunction } from 'lodash-es';
import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import Checkbox from './FilterRenderers/Checkbox/Checkbox';
import useActiveQueryIndex from './hooks/useActiveQueryIndex';
import CheckboxV2 from './FilterRenderers/Checkbox/v2/CheckboxFilterV2';
import Duration from './FilterRenderers/Duration/Duration';
@@ -310,25 +309,6 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
<section className="filters">
{filterConfig.map((filter) => {
switch (filter.type) {
- case FiltersType.CHECKBOX:
- return useFieldApis ? (
- <CheckboxV2
- key={filter.attributeKey.key}
- source={source}
- filter={filter}
- onFilterChange={onFilterChange}
- onQuickFilterChange={onQuickFilterChange}
- useFieldApis={useFieldApis}
- />
- ) : (
- <Checkbox
- key={filter.attributeKey.key}
- source={source}
- filter={filter}
- onFilterChange={onFilterChange}
- onQuickFilterChange={onQuickFilterChange}
- />
- );
case FiltersType.DURATION:
return (
<Duration
@@ -340,9 +320,8 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
);
case FiltersType.SLIDER:
return <Slider key={filter.attributeKey.key} />;
- // eslint-disable-next-line sonarjs/no-duplicated-branches
default:
- return useFieldApis ? (
+ return (
<CheckboxV2
key={filter.attributeKey.key}
source={source}
@@ -351,14 +330,6 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
onQuickFilterChange={onQuickFilterChange}
useFieldApis={useFieldApis}
/>
- ) : (
- <Checkbox
- key={filter.attributeKey.key}
- source={source}
- filter={filter}
- onFilterChange={onFilterChange}
- onQuickFilterChange={onQuickFilterChange}
- />
);
}
})}
@@ -440,5 +411,4 @@ QuickFilters.defaultProps = {
config: [],
showFilterCollapse: true,
showQueryName: true,
- useFieldApis: undefined,
};
diff --git a/frontend/src/components/QuickFilters/QuickFiltersLayout/__tests__/QuickFiltersLayout.test.tsx b/frontend/src/components/QuickFilters/QuickFiltersLayout/__tests__/QuickFiltersLayout.test.tsx
index ec8911eb25..5b6b2cd45e 100644
--- a/frontend/src/components/QuickFilters/QuickFiltersLayout/__tests__/QuickFiltersLayout.test.tsx
+++ b/frontend/src/components/QuickFilters/QuickFiltersLayout/__tests__/QuickFiltersLayout.test.tsx
@@ -63,6 +63,7 @@ jest.mock('../../QuickFilters', () => ({
const quickFilterProps = {
source: QuickFiltersSource.TRACES_EXPLORER,
+ useFieldApis: { startUnixMilli: 0, endUnixMilli: 0 },
};
const savedViewProps = { source: SavedviewtypesSourceDTO.traces };
diff --git a/frontend/src/components/QuickFilters/stories/QuickFilters.stories.mocks.tsx b/frontend/src/components/QuickFilters/stories/QuickFilters.stories.mocks.tsx
index 9eb55244ea..12ed72af0a 100644
--- a/frontend/src/components/QuickFilters/stories/QuickFilters.stories.mocks.tsx
+++ b/frontend/src/components/QuickFilters/stories/QuickFilters.stories.mocks.tsx
@@ -11,11 +11,13 @@ import {
import { rest, type RequestHandler } from 'msw';
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { attributeValuesResponse } from '@/storybook/msw/__story_mockdata__/attributes';
-import { fieldKeysResponse } from '@/storybook/msw/__story_mockdata__/fields';
+import {
+ fieldKeysResponse,
+ fieldValuesResponse,
+} from '@/storybook/msw/__story_mockdata__/fields';
import { quickFiltersResponse } from '@/storybook/msw/__story_mockdata__/quickFilters';
-import { FiltersType } from '../types';
+import { FiltersType, QuickFilterCheckboxUseFieldApis } from '../types';
const customFilters = [
{
@@ -61,13 +63,15 @@ export const checkboxConfig = [
},
];
-export const attributeValuesHandler = (
- values: readonly string[],
-): RequestHandler =>
- rest.get(
- 'http://localhost/api/v3/autocomplete/attribute_values',
- (_req, res, ctx) =>
- res(ctx.status(200), ctx.json(attributeValuesResponse(values))),
+export const fieldApis: QuickFilterCheckboxUseFieldApis = {
+ startUnixMilli: 1700000000000,
+ endUnixMilli: 1700003600000,
+ existingQuery: null,
+};
+
+export const fieldValuesHandler = (values: readonly string[]): RequestHandler =>
+ rest.get('http://localhost/api/v1/fields/values', (_req, res, ctx) =>
+ res(ctx.status(200), ctx.json(fieldValuesResponse(values))),
);
export const handlers = [
@@ -82,7 +86,7 @@ export const handlers = [
rest.get('http://localhost/api/v1/fields/keys', (_req, res, ctx) =>
res(ctx.status(200), ctx.json(fieldKeysResponse(['k8s.namespace.name']))),
),
- attributeValuesHandler(['checkout', 'frontend', 'payments']),
+ fieldValuesHandler(['checkout', 'frontend', 'payments']),
];
export const loadingFiltersHandlers = [
diff --git a/frontend/src/components/QuickFilters/stories/QuickFilters.stories.tsx b/frontend/src/components/QuickFilters/stories/QuickFilters.stories.tsx
index 5807c152da..0d67e13485 100644
--- a/frontend/src/components/QuickFilters/stories/QuickFilters.stories.tsx
+++ b/frontend/src/components/QuickFilters/stories/QuickFilters.stories.tsx
@@ -7,8 +7,9 @@ import type { GlobalMockArgs } from '@/storybook/globals';
import QuickFilters from '../QuickFilters';
import {
- attributeValuesHandler,
checkboxConfig,
+ fieldApis,
+ fieldValuesHandler,
handlers,
LONG_FILTER_VALUES,
loadingFiltersHandlers,
@@ -34,6 +35,7 @@ const meta = {
handleFilterVisibilityChange: (): void => undefined,
signal: SignalType.LOGS,
source: QuickFiltersSource.LOGS_EXPLORER,
+ useFieldApis: fieldApis,
},
parameters: {
msw: { handlers },
@@ -114,7 +116,7 @@ export const SelectedExpandedCheckbox: Story = {
export const Tooltips: TooltipsStory = {
args: { signal: undefined, tooltipsOpen: true },
parameters: {
- msw: { handlers: [attributeValuesHandler(LONG_FILTER_VALUES), ...handlers] },
+ msw: { handlers: [fieldValuesHandler(LONG_FILTER_VALUES), ...handlers] },
},
};
diff --git a/frontend/src/components/QuickFilters/tests/QuickFilters.authz.test.tsx b/frontend/src/components/QuickFilters/tests/QuickFilters.authz.test.tsx
index 4b80f1083e..aca327ad8d 100644
--- a/frontend/src/components/QuickFilters/tests/QuickFilters.authz.test.tsx
+++ b/frontend/src/components/QuickFilters/tests/QuickFilters.authz.test.tsx
@@ -16,7 +16,7 @@ import {
} from 'lib/authz/utils/authz-test-utils';
import {
otherFiltersResponse,
- quickFiltersAttributeValuesResponse,
+ quickFiltersFieldValuesResponse,
quickFiltersListResponse,
} from 'mocks-server/__mockdata__/customQuickFilters';
import { server } from 'mocks-server/server';
@@ -25,7 +25,7 @@ import { render, screen, userEvent, waitFor } from 'tests/test-utils';
import QuickFilters from '../QuickFilters';
import { QuickFiltersSource, SignalType } from '../types';
-import { QuickFiltersConfig } from './constants';
+import { QuickFiltersConfig, QuickFiltersFieldApis } from './constants';
jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({
useQueryBuilder: jest.fn(),
@@ -38,7 +38,6 @@ const BASE_URL = ENVIRONMENT.baseURL;
const SIGNAL = SignalType.LOGS;
const quickFiltersListURL = `${BASE_URL}/api/v2/quick_filters/${SIGNAL}`;
const fieldsKeysURL = `${BASE_URL}/api/v1/fields/keys`;
-const attributeValuesURL = `${BASE_URL}/api/v3/autocomplete/attribute_values`;
const fieldsValuesURL = `${BASE_URL}/api/v1/fields/values`;
const NOT_AUTHORIZED_TEXT = /is not authorized to perform/i;
@@ -71,11 +70,8 @@ beforeEach(() => {
rest.get(fieldsKeysURL, (_req, res, ctx) =>
res(ctx.status(200), ctx.json(otherFiltersResponse)),
),
- rest.get(attributeValuesURL, (_req, res, ctx) =>
- res(ctx.status(200), ctx.json(quickFiltersAttributeValuesResponse)),
- ),
rest.get(fieldsValuesURL, (_req, res, ctx) =>
- res(ctx.status(200), ctx.json(quickFiltersAttributeValuesResponse)),
+ res(ctx.status(200), ctx.json(quickFiltersFieldValuesResponse)),
),
);
});
@@ -91,6 +87,7 @@ function renderWithSignal(): void {
source={QuickFiltersSource.LOGS_EXPLORER}
signal={SIGNAL}
handleFilterVisibilityChange={jest.fn()}
+ useFieldApis={QuickFiltersFieldApis}
/>,
);
}
@@ -101,6 +98,7 @@ function renderStaticConfig(): void {
source={QuickFiltersSource.EXCEPTIONS}
config={QuickFiltersConfig}
handleFilterVisibilityChange={jest.fn()}
+ useFieldApis={QuickFiltersFieldApis}
/>,
);
}
diff --git a/frontend/src/components/QuickFilters/tests/QuickFilters.test.tsx b/frontend/src/components/QuickFilters/tests/QuickFilters.test.tsx
index bf8bafe61a..2422ff0791 100644
--- a/frontend/src/components/QuickFilters/tests/QuickFilters.test.tsx
+++ b/frontend/src/components/QuickFilters/tests/QuickFilters.test.tsx
@@ -6,7 +6,7 @@ import {
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
import {
otherFiltersResponse,
- quickFiltersAttributeValuesResponse,
+ quickFiltersFieldValuesResponse,
quickFiltersListResponse,
} from 'mocks-server/__mockdata__/customQuickFilters';
import { server } from 'mocks-server/server';
@@ -17,7 +17,7 @@ import '@testing-library/jest-dom';
import QuickFilters from '../QuickFilters';
import { IQuickFiltersConfig, QuickFiltersSource, SignalType } from '../types';
-import { QuickFiltersConfig } from './constants';
+import { QuickFiltersConfig, QuickFiltersFieldApis } from './constants';
jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({
useQueryBuilder: jest.fn(),
@@ -37,7 +37,6 @@ const SIGNAL = SignalType.LOGS;
const quickFiltersListURL = `${BASE_URL}/api/v2/quick_filters/${SIGNAL}`;
const saveQuickFiltersURL = `${BASE_URL}/api/v2/quick_filters/${SIGNAL}`;
const quickFiltersSuggestionsURL = `${BASE_URL}/api/v1/fields/keys`;
-const quickFiltersAttributeValuesURL = `${BASE_URL}/api/v3/autocomplete/attribute_values`;
const fieldsValuesURL = `${BASE_URL}/api/v1/fields/values`;
const FILTER_OS_DESCRIPTION = 'os.description';
@@ -62,11 +61,8 @@ const setupServer = (): void => {
putHandler(await req.json());
return res(ctx.status(200), ctx.json({}));
}),
- rest.get(quickFiltersAttributeValuesURL, (_req, res, ctx) =>
- res(ctx.status(200), ctx.json(quickFiltersAttributeValuesResponse)),
- ),
rest.get(fieldsValuesURL, (_req, res, ctx) =>
- res(ctx.status(200), ctx.json(quickFiltersAttributeValuesResponse)),
+ res(ctx.status(200), ctx.json(quickFiltersFieldValuesResponse)),
),
);
};
@@ -83,6 +79,7 @@ function TestQuickFilters({
source={QuickFiltersSource.EXCEPTIONS}
config={config}
handleFilterVisibilityChange={handleFilterVisibilityChange}
+ useFieldApis={QuickFiltersFieldApis}
signal={signal}
/>
);
@@ -105,6 +102,7 @@ function TestQuickFiltersApiMonitoring({
source={QuickFiltersSource.API_MONITORING}
config={config}
handleFilterVisibilityChange={handleFilterVisibilityChange}
+ useFieldApis={QuickFiltersFieldApis}
signal={signal}
/>
);
diff --git a/frontend/src/components/QuickFilters/tests/constants.ts b/frontend/src/components/QuickFilters/tests/constants.ts
index 4fb808d90c..f60ddf037a 100644
--- a/frontend/src/components/QuickFilters/tests/constants.ts
+++ b/frontend/src/components/QuickFilters/tests/constants.ts
@@ -1,6 +1,6 @@
import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { FiltersType } from '../types';
+import { FiltersType, QuickFilterCheckboxUseFieldApis } from '../types';
export const QuickFiltersConfig = [
{
@@ -24,3 +24,9 @@ export const QuickFiltersConfig = [
defaultOpen: false,
},
];
+
+export const QuickFiltersFieldApis: QuickFilterCheckboxUseFieldApis = {
+ startUnixMilli: 1700000000000,
+ endUnixMilli: 1700003600000,
+ existingQuery: null,
+};
diff --git a/frontend/src/components/QuickFilters/types.ts b/frontend/src/components/QuickFilters/types.ts
index 867a0fff2a..db0d32e24e 100644
--- a/frontend/src/components/QuickFilters/types.ts
+++ b/frontend/src/components/QuickFilters/types.ts
@@ -61,7 +61,7 @@ export interface IQuickFiltersProps {
className?: string;
showFilterCollapse?: boolean;
showQueryName?: boolean;
- useFieldApis?: QuickFilterCheckboxUseFieldApis;
+ useFieldApis: QuickFilterCheckboxUseFieldApis;
savedViewsHeader?: ReactNode;
}
@@ -75,9 +75,6 @@ export enum QuickFiltersSource {
AI_OBSERVABILITY = 'ai-observability',
}
-/**
- * Opt-in: fetch values from the /v1/fields/values API instead of /v3/autocomplete/attribute_values
- */
export type QuickFilterCheckboxUseFieldApis = {
startUnixMilli: number;
endUnixMilli: number;
diff --git a/frontend/src/container/InfraMonitoringHostsV2/InfraMonitoringHosts.module.scss b/frontend/src/container/InfraMonitoringHostsV2/InfraMonitoringHosts.module.scss
index 29ee798b60..85c0b08ad7 100644
--- a/frontend/src/container/InfraMonitoringHostsV2/InfraMonitoringHosts.module.scss
+++ b/frontend/src/container/InfraMonitoringHostsV2/InfraMonitoringHosts.module.scss
@@ -57,10 +57,6 @@
:global(.ant-collapse-content-box) {
padding: 0 !important;
padding-block: 0 !important;
-
- :global(.quick-filters .checkbox-filter) {
- padding-left: 18px;
- }
}
}
diff --git a/frontend/src/hooks/querySuggestions/useGetQueryKeyValueSuggestions.ts b/frontend/src/hooks/querySuggestions/useGetQueryKeyValueSuggestions.ts
deleted file mode 100644
index 224f80205f..0000000000
--- a/frontend/src/hooks/querySuggestions/useGetQueryKeyValueSuggestions.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { useQuery, UseQueryOptions, UseQueryResult } from 'react-query';
-import { getValueSuggestions } from 'api/querySuggestions/getValueSuggestion';
-import { AxiosError, AxiosResponse } from 'axios';
-import { QueryKeyValueSuggestionsResponseProps } from 'types/api/querySuggestions/types';
-
-export const useGetQueryKeyValueSuggestions = ({
- key,
- signal,
- searchText,
- signalSource,
- metricName,
- options,
-}: {
- key: string;
- signal: 'traces' | 'logs' | 'metrics';
- searchText?: string;
- signalSource?: 'meter' | '';
- options?: UseQueryOptions<
- AxiosResponse<QueryKeyValueSuggestionsResponseProps>,
- AxiosError
- >;
- metricName?: string;
-}): UseQueryResult<
- AxiosResponse<QueryKeyValueSuggestionsResponseProps>,
- AxiosError
-> =>
- useQuery<AxiosResponse<QueryKeyValueSuggestionsResponseProps>, AxiosError>({
- queryKey: [
- 'queryKeyValueSuggestions',
- key,
- signal,
- searchText,
- signalSource,
- metricName,
- ],
- queryFn: () =>
- getValueSuggestions({
- signal,
- key,
- searchText: searchText || '',
- signalSource: signalSource as 'meter' | '',
- metricName: metricName || '',
- }),
- ...options,
- });
diff --git a/frontend/src/mocks-server/__mockdata__/customQuickFilters.ts b/frontend/src/mocks-server/__mockdata__/customQuickFilters.ts
index bfed9b0fac..633fc3a421 100644
--- a/frontend/src/mocks-server/__mockdata__/customQuickFilters.ts
+++ b/frontend/src/mocks-server/__mockdata__/customQuickFilters.ts
@@ -86,16 +86,12 @@ export const otherFiltersResponse = {
},
};
-export const quickFiltersAttributeValuesResponse = {
+export const quickFiltersFieldValuesResponse = {
status: 'success',
data: {
- stringAttributeValues: [
- 'mq-kafka',
- 'otel-demo',
- 'otlp-python',
- 'sample-flask',
- ],
- numberAttributeValues: null,
- boolAttributeValues: null,
+ complete: true,
+ values: {
+ stringValues: ['mq-kafka', 'otel-demo', 'otlp-python', 'sample-flask'],
+ },
},
};
diff --git a/frontend/src/types/api/querySuggestions/types.ts b/frontend/src/types/api/querySuggestions/types.ts
index b5b16c0727..3ce4475783 100644
--- a/frontend/src/types/api/querySuggestions/types.ts
+++ b/frontend/src/types/api/querySuggestions/types.ts
@@ -37,22 +37,4 @@ export interface QueryKeyRequestProps {
signalSource?: 'meter' | '';
}
-export interface QueryKeyValueSuggestionsProps {
- id: string;
- name: string;
-}
-
-export interface QueryKeyValueSuggestionsResponseProps {
- status: string;
- data: QueryKeyValueSuggestionsProps[];
-}
-
-export interface QueryKeyValueRequestProps {
- signal: 'traces' | 'logs' | 'metrics';
- key: string;
- searchText: string;
- signalSource?: 'meter' | '';
- metricName?: string;
-}
-
export type SignalType = 'traces' | 'logs' | 'metrics';