diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.test.tsx b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.test.tsx index 7b15cfc923c..9c420d2a158 100644 --- a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.test.tsx @@ -5,7 +5,7 @@ import React from 'react'; import { of } from 'rxjs'; import { selectOptionInTest } from 'test/helpers/selectOptionInTest'; -import { ArrayVector, CoreApp } from '@grafana/data'; +import { CoreApp } from '@grafana/data'; import createMockDatasource from '../../__mocks__/datasource'; import createMockQuery from '../../__mocks__/query'; @@ -51,9 +51,6 @@ const addFilter = async ( rerender: (ui: React.ReactElement) => void ) => { const { property, operation, index } = filter; - const resultVector = new ArrayVector([ - `{"${property}":[${filter.filters.map(({ count, value }) => `{"${property}":"${value}", "count":${count}}`)}]}`, - ]); mockDatasource.azureLogAnalyticsDatasource.query = jest.fn().mockReturnValue( of({ data: [ @@ -82,7 +79,11 @@ const addFilter = async ( }, ], }, - values: resultVector, + values: [ + `{"${property}":[${filter.filters.map( + ({ count, value }) => `{"${property}":"${value}", "count":${count}}` + )}]}`, + ], entities: {}, }, ], diff --git a/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx b/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx index 7594d3df6de..4183fff2f38 100644 --- a/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx +++ b/public/app/plugins/panel/datagrid/DataGridPanel.test.tsx @@ -1,7 +1,7 @@ import { render, screen, fireEvent, act, waitFor } from '@testing-library/react'; import * as React from 'react'; -import { ArrayVector, DataFrame, dateTime, EventBus, Field, FieldType, LoadingState } from '@grafana/data'; +import { DataFrame, dateTime, EventBus, Field, FieldType, LoadingState } from '@grafana/data'; import { DataGridPanel, DataGridProps } from './DataGridPanel'; import * as utils from './utils'; @@ -312,7 +312,7 @@ describe('DataGrid', () => { expect.objectContaining({ name: 'newColumn', type: 'string', - values: new ArrayVector(['', '', '', '']), + values: ['', '', '', ''], }), ]), }), diff --git a/public/app/plugins/panel/timeseries/utils.ts b/public/app/plugins/panel/timeseries/utils.ts index 871cf62b599..c60865ce666 100644 --- a/public/app/plugins/panel/timeseries/utils.ts +++ b/public/app/plugins/panel/timeseries/utils.ts @@ -1,5 +1,4 @@ import { - ArrayVector, DataFrame, Field, FieldType, @@ -22,7 +21,7 @@ type ScaleKey = string; // this will re-enumerate all enum fields on the same scale to create one ordinal progression // e.g. ['a','b'][0,1,0] + ['c','d'][1,0,1] -> ['a','b'][0,1,0] + ['c','d'][3,2,3] -function reEnumFields(frames: DataFrame[]) { +function reEnumFields(frames: DataFrame[]): DataFrame[] { let allTextsByKey: Map = new Map(); let frames2: DataFrame[] = frames.map((frame) => { @@ -55,7 +54,7 @@ function reEnumFields(frames: DataFrame[]) { return { ...field, - values: new ArrayVector(idxs), + values: idxs, }; // TODO: update displayProcessor?