IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

use props.replaceVariables rather than templateSrv

Browse Source
This commit is contained in:
ryan 2019-03-06 01:14:53 -08:00
parent ea5db92996
commit 123739fdb4
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/plugins/panel/table2/TablePanel.tsx
View File

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