Skip to content

Commit 054d25d

Browse files
committed
Adjust to v3 data response
1 parent ad7856b commit 054d25d

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/QueryEditor.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ const QueryEditor: React.FC<Props> = ({ datasource, query, range, onChange, onRu
5555
const { spaceId, roomId, nodes: allNodes, dimensions, groupBy, contextId, filterBy, filterValue } = query;
5656

5757
const mySubscriber = (msg: any, data: any) => {
58-
setTotalNodes(data.data.nodes.length);
59-
setTotalInstances(data.data.nodes.reduce((acc: number, node: any) => acc + node.chartIDs.length, 0));
58+
setTotalNodes(data.data.summary.nodes.length);
59+
//setTotalInstances(data.data.summary.nodes.reduce((acc: number, node: any) => acc + node.chartIDs.length, 0));
60+
setTotalInstances(data.data.summary.instances.length);
6061
};
6162

6263
const isGroupFunctionAvailable = React.useCallback(() => {

src/datasource.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
6161
const frame = new MutableDataFrame({
6262
refId,
6363
fields: response.data.result.labels.map((id: string, i: number) => {
64-
const node = response.data.nodes.find((n: any) => n.id === id);
64+
const node = response.data.summary.nodes.find((n: any) => n.nd === id);
6565
return {
6666
name: node?.name || id,
6767
type: i === 0 ? FieldType.time : FieldType.number,
@@ -70,7 +70,8 @@ export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
7070
});
7171

7272
response.data.result.data.forEach((point: any) => {
73-
frame.appendRow([...point]);
73+
const [timestamp, ...rest] = point;
74+
frame.appendRow([timestamp, ...rest.map((r: Array<any>) => r[0])]);
7475
});
7576

7677
return frame;

src/shared/hooks/useGetChartData.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ export const useGetChartData = async ({
3131
dimensions = [],
3232
from,
3333
to,
34-
...rest
3534
}: UseGetChartDataType) => {
3635
let metrics = [];
3736

0 commit comments

Comments
 (0)