diff --git a/public/app/features/logs/components/LogDetails.test.tsx b/public/app/features/logs/components/LogDetails.test.tsx index 0512aec6f26..1aefc0e0c95 100644 --- a/public/app/features/logs/components/LogDetails.test.tsx +++ b/public/app/features/logs/components/LogDetails.test.tsx @@ -11,6 +11,7 @@ import { FieldType, createDataFrame, DataFrameType, + CoreApp, } from '@grafana/data'; import { LogDetails, Props } from './LogDetails'; @@ -32,6 +33,7 @@ const setup = (propOverrides?: Partial, rowOverrides?: Partial {}, theme, styles, + app: CoreApp.Explore, ...(propOverrides || {}), }; diff --git a/public/app/features/logs/components/LogDetailsRow.test.tsx b/public/app/features/logs/components/LogDetailsRow.test.tsx index bcaab5cd40e..b168cf1f521 100644 --- a/public/app/features/logs/components/LogDetailsRow.test.tsx +++ b/public/app/features/logs/components/LogDetailsRow.test.tsx @@ -1,6 +1,8 @@ import { fireEvent, render, screen } from '@testing-library/react'; import React, { ComponentProps } from 'react'; +import { CoreApp } from '@grafana/data'; + import { LogDetailsRow } from './LogDetailsRow'; import { createLogRow } from './__mocks__/logRow'; @@ -20,6 +22,7 @@ const setup = (propOverrides?: Partial) => { displayedFields: [], row: createLogRow(), disableActions: false, + app: CoreApp.Explore, }; Object.assign(props, propOverrides); diff --git a/public/app/features/logs/components/LogDetailsRow.tsx b/public/app/features/logs/components/LogDetailsRow.tsx index 37fab48ce9b..9f9f8ffcf78 100644 --- a/public/app/features/logs/components/LogDetailsRow.tsx +++ b/public/app/features/logs/components/LogDetailsRow.tsx @@ -261,6 +261,7 @@ class UnThemedLogDetailsRow extends PureComponent { onClickFilterOutLabel, disableActions, row, + app, } = this.props; const { showFieldsStats, fieldStats, fieldCount } = this.state; const styles = getStyles(theme); @@ -268,7 +269,7 @@ class UnThemedLogDetailsRow extends PureComponent { const singleKey = parsedKeys == null ? false : parsedKeys.length === 1; const singleVal = parsedValues == null ? false : parsedValues.length === 1; const hasFilteringFunctionality = !disableActions && onClickFilterLabel && onClickFilterOutLabel; - const refIdTooltip = row.dataFrame?.refId ? ` in query ${row.dataFrame?.refId}` : ''; + const refIdTooltip = app === CoreApp.Explore && row.dataFrame?.refId ? ` in query ${row.dataFrame?.refId}` : ''; const isMultiParsedValueWithNoContent = !singleVal && parsedValues != null && !parsedValues.every((val) => val === ''); diff --git a/public/app/plugins/panel/logs/LogsPanel.test.tsx b/public/app/plugins/panel/logs/LogsPanel.test.tsx index f462094b27b..7cb4124fe43 100644 --- a/public/app/plugins/panel/logs/LogsPanel.test.tsx +++ b/public/app/plugins/panel/logs/LogsPanel.test.tsx @@ -374,9 +374,9 @@ describe('LogsPanel', () => { expect(await screen.findByRole('row')).toBeInTheDocument(); await userEvent.click(screen.getByText('logline text')); - await userEvent.click(screen.getByLabelText('Filter for value in query A')); + await userEvent.click(screen.getByLabelText('Filter for value')); expect(filterForMock).toHaveBeenCalledTimes(1); - await userEvent.click(screen.getByLabelText('Filter out value in query A')); + await userEvent.click(screen.getByLabelText('Filter out value')); expect(filterOutMock).toHaveBeenCalledTimes(1); expect(isFilterLabelActiveMock).toHaveBeenCalledTimes(1); @@ -399,8 +399,8 @@ describe('LogsPanel', () => { await userEvent.click(screen.getByText('logline text')); - expect(screen.queryByLabelText('Filter for value in query A')).not.toBeInTheDocument(); - expect(screen.queryByLabelText('Filter out value in query A')).not.toBeInTheDocument(); + expect(screen.queryByLabelText('Filter for value')).not.toBeInTheDocument(); + expect(screen.queryByLabelText('Filter out value')).not.toBeInTheDocument(); }); it('shows the controls if onAddAdHocFilter is defined', async () => { jest.spyOn(grafanaUI, 'usePanelContext').mockReturnValue({ @@ -421,8 +421,8 @@ describe('LogsPanel', () => { expect(await screen.findByText('common_app')).toBeInTheDocument(); - expect(screen.getByLabelText('Filter for value in query A')).toBeInTheDocument(); - expect(screen.getByLabelText('Filter out value in query A')).toBeInTheDocument(); + expect(screen.getByLabelText('Filter for value')).toBeInTheDocument(); + expect(screen.getByLabelText('Filter out value')).toBeInTheDocument(); }); }); });