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

TablePanel: display multi-line text (#20210)

Browse Source 
* TablePanel: display multi-line text

* Fix tests
This commit is contained in:
michael-az
2020-01-29 14:18:34 +01:00
committed by GitHub
parent ffe0a1f975
commit 427629b4d5
2 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
public/app/plugins/panel/table/renderer.ts
View File

@@ -305,26 +305,23 @@ export class TableRenderer {
cellClasses.push('table-panel-cell-link');
columnHtml += `
<a href="${sanitizedCellLink}" target="${cellTarget}" data-link-tooltip data-original-title="${cellLinkTooltip}" data-placement="right"${cellStyle}>
${value}
</a>
`;
columnHtml += `<a href="${sanitizedCellLink}" target="${cellTarget}" data-link-tooltip data-original-title="${cellLinkTooltip}" data-placement="right"${cellStyle}>`;
columnHtml += `${value}`;
columnHtml += `</a>`;
} else {
columnHtml += value;
}
if (column.filterable) {
cellClasses.push('table-panel-cell-filterable');
columnHtml += `
<a class="table-panel-filter-link" data-link-tooltip data-original-title="Filter out value" data-placement="bottom"
data-row="${rowIndex}" data-column="${columnIndex}" data-operator="!=">
<i class="fa fa-search-minus"></i>
</a>
<a class="table-panel-filter-link" data-link-tooltip data-original-title="Filter for value" data-placement="bottom"
data-row="${rowIndex}" data-column="${columnIndex}" data-operator="=">
<i class="fa fa-search-plus"></i>
</a>`;
columnHtml += `<a class="table-panel-filter-link" data-link-tooltip data-original-title="Filter out value" data-placement="bottom"
data-row="${rowIndex}" data-column="${columnIndex}" data-operator="!=">`;
columnHtml += `<i class="fa fa-search-minus"></i>`;
columnHtml += `</a>`;
columnHtml += `<a class="table-panel-filter-link" data-link-tooltip data-original-title="Filter for value" data-placement="bottom"
data-row="${rowIndex}" data-column="${columnIndex}" data-operator="=">`;
columnHtml += `<i class="fa fa-search-plus"></i>`;
columnHtml += `</a>`;
}
if (cellClasses.length) {

9
public/app/plugins/panel/table/specs/renderer.test.ts
View File

@@ -317,12 +317,9 @@ describe('when rendering table', () => {
it('link should render as', () => {
const html = renderer.renderCell(7, 0, 'host1');
const expectedHtml = `
<td class="table-panel-cell-link">
<a href="/dashboard?param=host1&param_1=1230&param_2=40"
target="_blank" data-link-tooltip data-original-title="host1 1230 my.host.com" data-placement="right">
host1
</a>
</td>
<td class="table-panel-cell-link"><a href="/dashboard?param=host1&param_1=1230&param_2=40"
target="_blank" data-link-tooltip data-original-title="host1 1230 my.host.com"
data-placement="right">host1</a></td>
`;
expect(normalize(html)).toBe(normalize(expectedHtml));
});