From 7003e3a03b887b8e1f0b8022c4c388cc333c124c Mon Sep 17 00:00:00 2001
From: jsers <xqing9024@gmail.com>
Date: Wed, 17 Jun 2020 11:10:19 +0800
Subject: [PATCH] fix: graph legend is not available

---
 web/src/components/Graph/Graph/Legend.tsx     | 21 ++++++++++---------
 web/src/components/Graph/Graph/index.tsx      |  8 +++----
 .../components/Graph/util/normalizeSeries.tsx |  7 ++++---
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/web/src/components/Graph/Graph/Legend.tsx b/web/src/components/Graph/Graph/Legend.tsx
index ee1de7eb..a0ad69c5 100644
--- a/web/src/components/Graph/Graph/Legend.tsx
+++ b/web/src/components/Graph/Graph/Legend.tsx
@@ -3,7 +3,7 @@ import { Table, Input, Button, Modal } from 'antd';
 import { ColumnProps, TableRowSelection } from 'antd/es/table';
 import Color from 'color';
 import _ from 'lodash';
-import { injectIntl } from 'react-intl';
+import { injectIntl, WrappedComponentProps } from 'react-intl';
 import clipboard from '@common/clipboard';
 import ContextMenu from '@cpts/ContextMenu';
 import { SerieInterface, PointInterface } from '../interface';
@@ -13,7 +13,8 @@ type SelectedKeys = 'normal' | string[];
 interface Props {
   style: any,
   series: SerieInterface[],
-  onSelectedChange: (selectedKeys: string | string[], highlightedKeysClone: string[]) => void,
+  comparisonOptions: any[],
+  onSelectedChange: (selectedKeys: string[], highlightedKeysClone: string[]) => void,
 }
 
 interface State {
@@ -36,7 +37,7 @@ interface LegendDataItem extends SerieInterface {
   last: number | null,
 }
 
-class Legend extends Component<Props, State> {
+class Legend extends Component<Props & WrappedComponentProps, State> {
   static defaultProps = {
     style: {},
     series: [],
@@ -111,7 +112,7 @@ class Legend extends Component<Props, State> {
     }
 
     this.setState({ highlightedKeys: highlightedKeysClone }, () => {
-      this.props.onSelectedChange(selectedKeys, highlightedKeysClone);
+      this.props.onSelectedChange(selectedKeys as string[], highlightedKeysClone);
     });
   }
 
@@ -129,7 +130,7 @@ class Legend extends Component<Props, State> {
     const { comparisonOptions, onSelectedChange } = this.props;
     const { searchText, selectedKeys, highlightedKeys } = this.state;
     const counterSelectedKeys = highlightedKeys;
-    const data = this.filterData();
+    const data = this.filterData() as any;
     const firstData = data[0];
     const columns: ColumnProps<LegendDataItem>[] = [
       {
@@ -216,9 +217,9 @@ class Legend extends Component<Props, State> {
 
     const newRowSelection: TableRowSelection<LegendDataItem> = {
       selectedRowKeys: selectedKeys === 'normal' ? _.map(data, o => o.id) : selectedKeys,
-      onChange: (selectedRowKeys: string[]) => {
-        this.setState({ selectedKeys: selectedRowKeys }, () => {
-          onSelectedChange(selectedRowKeys, highlightedKeys);
+      onChange: (selectedRowKeys: (string | number)[]) => {
+        this.setState({ selectedKeys: selectedRowKeys as string[] }, () => {
+          onSelectedChange(selectedRowKeys as string[], highlightedKeys);
         });
       },
     };
@@ -238,11 +239,11 @@ class Legend extends Component<Props, State> {
         margin: '0 5px 5px 5px',
       }}>
         <Table
-          rowKey={record => `${record.id}-${record.comparison}`}
+          rowKey={record => record.id}
           size="middle"
           rowSelection={newRowSelection}
           columns={columns}
-          dataSource={data}
+          dataSource={data as any}
           pagination={false}
           scroll={{ y: 220 }}
         />
diff --git a/web/src/components/Graph/Graph/index.tsx b/web/src/components/Graph/Graph/index.tsx
index 89425de0..47f7ccbe 100644
--- a/web/src/components/Graph/Graph/index.tsx
+++ b/web/src/components/Graph/Graph/index.tsx
@@ -305,9 +305,9 @@ export default class Graph extends Component<Props, State> {
   }
 
   handleLegendRowSelectedChange = (selectedKeys: string[], highlightedKeys: string[]) => {
-    const { series } = this.state;
+    const series = this.getZoomedSeries()
 
-    const newSeries = _.map(series, (serie, i) => {
+    this.series = _.map(series, (serie, i) => {
       const oldColor = _.get(serie, 'oldColor', serie.color);
       return {
         ...serie,
@@ -318,9 +318,7 @@ export default class Graph extends Component<Props, State> {
       };
     });
 
-    this.setState({ series: newSeries }, () => {
-      this.updateHighcharts();
-    });
+    this.updateHighcharts();
   }
 
   render() {
diff --git a/web/src/components/Graph/util/normalizeSeries.tsx b/web/src/components/Graph/util/normalizeSeries.tsx
index e3433678..1dbf00f2 100644
--- a/web/src/components/Graph/util/normalizeSeries.tsx
+++ b/web/src/components/Graph/util/normalizeSeries.tsx
@@ -16,11 +16,12 @@ export default function normalizeSeries(data: any[], graphConfig: GraphDataInter
       counter = `,${o.counter.substring(o.counter.indexOf('/') + 1)}`;
     }
 
-    const id = `${endpoint}${counter}`;
+    const id = `${endpoint}${counter}-${comparison}`;
+    const name = `${endpoint}${counter}`;
     const serie = {
       id,
-      name: id,
-      tags: id,
+      name: name,
+      tags: name,
       data: o.values,
       lineWidth: 2,
       color,