Skip to content

Commit

Permalink
fix test
Browse files Browse the repository at this point in the history
  • Loading branch information
shahzad31 committed Jun 17, 2021
1 parent ebf4ec5 commit 0ecb538
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,15 @@
import { ConfigProps, DataSeries } from '../../types';
import { FieldLabels, USE_BREAK_DOWN_COLUMN } from '../constants';
import { buildPhraseFilter } from '../utils';
import {
SERVICE_NAME,
} from '../constants/elasticsearch_fieldnames';
import { SERVICE_NAME } from '../constants/elasticsearch_fieldnames';
import { MOBILE_APP, NUMBER_OF_DEVICES } from '../constants/labels';
import { MobileFields } from './mobile_fields';

export function getMobileDeviceDistributionConfig({ indexPattern }: ConfigProps): DataSeries {
return {
reportType: 'mobile-device-distribution',
defaultSeriesType: 'bar',
seriesTypes: ['bar', 'bar_horizontal' ],
seriesTypes: ['bar', 'bar_horizontal'],
xAxisColumn: {
sourceField: USE_BREAK_DOWN_COLUMN,
},
Expand All @@ -35,7 +33,7 @@ export function getMobileDeviceDistributionConfig({ indexPattern }: ConfigProps)
filters: [
...buildPhraseFilter('agent.name', 'iOS/swift', indexPattern),
...buildPhraseFilter('processor.event', 'transaction', indexPattern),
],
],
labels: {
...FieldLabels,
...MobileFields,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ describe('ExploratoryView', () => {
render(<ExploratoryView />, { initSeries });

expect(await screen.findByText(/open in lens/i)).toBeInTheDocument();
expect(await screen.findByText('Performance Distribution')).toBeInTheDocument();
expect((await screen.findAllByText('Performance distribution'))[0]).toBeInTheDocument();
expect(await screen.findByText(/Lens Embeddable Component/i)).toBeInTheDocument();

await waitFor(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export function ReportFilters({
filters={dataViewSeries.filters}
seriesId={seriesId}
isNew={true}
labels={dataViewSeries.labels}
/>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ interface Props {
filters: DataSeries['filters'];
series: DataSeries;
isNew?: boolean;
labels?: Record<string, string>;
}

export interface Field {
Expand All @@ -36,21 +37,28 @@ export interface Field {
isNegated?: boolean;
}

export function SeriesFilter({ series, isNew, seriesId, defaultFilters = [], filters }: Props) {
export function SeriesFilter({
series,
isNew,
seriesId,
defaultFilters = [],
filters,
labels,
}: Props) {
const [isPopoverVisible, setIsPopoverVisible] = useState(false);

const [selectedField, setSelectedField] = useState<Field | undefined>();

const options: Field[] = defaultFilters.map((field) => {
if (typeof field === 'string') {
return { label: FieldLabels[field], field };
return { label: labels?.[field] ?? FieldLabels[field], field };
}

return {
field: field.field,
nested: field.nested,
isNegated: field.isNegated,
label: FieldLabels[field.field],
label: labels?.[field.field] ?? FieldLabels[field.field],
};
});

Expand Down

0 comments on commit 0ecb538

Please sign in to comment.