Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 86 additions & 0 deletions packages/scenes/src/querying/SceneDataTransformer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -738,6 +738,92 @@ describe('SceneDataTransformer', () => {
expect(customTransformerSpy).toHaveBeenCalledTimes(1);
expect(transformer.state.data?.state).toBe(LoadingState.Loading);
});

it('emits updated metadata when transformed frame references are unchanged', async () => {
const series = [arrayToDataFrame([1, 2, 3])];
const annotations: DataFrame[] = [];
const dataNode = new SceneDataNode({
data: {
state: LoadingState.Done,
timeRange: getDefaultTimeRange(),
request: { requestId: 'SQR100' } as DataQueryRequest,
series,
annotations,
},
});

const transformer = new SceneDataTransformer({
$data: dataNode,
transformations: [customTransformOperator],
});

const results: PanelData[] = [];
transformer.getResultsStream().subscribe((result) => {
results.push(result.data);
});

transformer.activate();

await new Promise((r) => setTimeout(r, 1));

const initialResult = results[0];

dataNode.setState({
data: {
...dataNode.state.data,
state: LoadingState.Loading,
request: { requestId: 'SQR101' } as DataQueryRequest,
},
});

await new Promise((r) => setTimeout(r, 1));

expect(customTransformerSpy).toHaveBeenCalledTimes(1);
expect(results).toHaveLength(2);
expect(results[1].state).toBe(LoadingState.Loading);
expect(results[1].request?.requestId).toBe('SQR101');
expect(results[1].series).toBe(initialResult.series);
expect(results[1].annotations).toBe(initialResult.annotations);
});

it('does not emit when transformed frame references and metadata are unchanged', async () => {
const series = [arrayToDataFrame([1, 2, 3])];
const annotations: DataFrame[] = [];
const dataNode = new SceneDataNode({
data: {
state: LoadingState.Done,
timeRange: getDefaultTimeRange(),
request: { requestId: 'SQR100' } as DataQueryRequest,
series,
annotations,
},
});

const transformer = new SceneDataTransformer({
$data: dataNode,
transformations: [customTransformOperator],
});

const results: PanelData[] = [];
transformer.getResultsStream().subscribe((result) => {
results.push(result.data);
});

transformer.activate();

await new Promise((r) => setTimeout(r, 1));

dataNode.setState({
data: {
...dataNode.state.data,
},
});

await new Promise((r) => setTimeout(r, 1));

expect(customTransformerSpy).toHaveBeenCalledTimes(1);
expect(results).toHaveLength(1);
});
});

it('interpolates transformation options before applying', () => {
Expand Down
23 changes: 21 additions & 2 deletions packages/scenes/src/querying/SceneDataTransformer.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { isEqual } from 'lodash';
import {
CustomTransformOperator,
DataFrame,
Expand Down Expand Up @@ -177,9 +178,27 @@ export class SceneDataTransformer extends SceneObjectBase<SceneDataTransformerSt
const { series, annotations } = this._prevDataFromSource;

if (data.series === series && data.annotations === annotations) {
if (this.state.data && data.state !== this.state.data.state) {
this.setState({ data: { ...this.state.data, state: data.state } });
if (this.state.data) {
const currentData = this.state.data;
const nextData: PanelData = {
...data,
series: currentData.series,
annotations: currentData.annotations,
};

const metadataChanged =
currentData.state !== nextData.state ||
currentData.request?.requestId !== nextData.request?.requestId ||
currentData.error !== nextData.error ||
!isEqual(currentData.errors, nextData.errors) ||
!isEqual(currentData.timeRange, nextData.timeRange);

if (metadataChanged) {
this.setState({ data: nextData });
this._results.next({ origin: this, data: nextData });
}
}

return true;
}

Expand Down
Loading