From 123739fdb457fe54fd1c84ab52247f5dabcddf09 Mon Sep 17 00:00:00 2001
From: ryan <ryantxu@gmail.com>
Date: Wed, 6 Mar 2019 01:14:53 -0800
Subject: [PATCH] use props.replaceVariables rather than templateSrv

---
 public/app/plugins/panel/table2/TablePanel.tsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/public/app/plugins/panel/table2/TablePanel.tsx b/public/app/plugins/panel/table2/TablePanel.tsx
index 76737b672dd..691d9f988e6 100644
--- a/public/app/plugins/panel/table2/TablePanel.tsx
+++ b/public/app/plugins/panel/table2/TablePanel.tsx
@@ -12,8 +12,6 @@ import { PanelProps } from '@grafana/ui/src/types';
 import { Options, Style, Column, CellFormatter } from './types';
 import kbn from 'app/core/utils/kbn';
 
-import templateSrv from 'app/features/templating/template_srv';
-
 interface Props extends PanelProps<Options> {}
 
 export class TablePanel extends PureComponent<Props> {
@@ -252,8 +250,10 @@ export class TablePanel extends PureComponent<Props> {
       const scopedVars = this.renderRowVariables(rowIndex);
       scopedVars['__cell'] = { value: value };
 
-      const cellLink = templateSrv.replace(column.style.linkUrl, scopedVars, encodeURIComponent);
-      const cellLinkTooltip = templateSrv.replace(column.style.linkTooltip, scopedVars);
+      const { replaceVariables } = this.props;
+
+      const cellLink = replaceVariables(column.style.linkUrl, scopedVars, encodeURIComponent);
+      const cellLinkTooltip = replaceVariables(column.style.linkTooltip, scopedVars);
       const cellTarget = column.style.linkTargetBlank ? '_blank' : '';
 
       cellClasses.push('table-panel-cell-link');
@@ -342,8 +342,6 @@ export class TablePanel extends PureComponent<Props> {
           },
         };
       });
-      console.log(templateSrv);
-      console.log(rows);
     } else {
       return <div>No Table Data...</div>;
     }