public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Heatmap: Clean up datalink code (#72296)

Browse Source
This commit is contained in:
Nathan Marrs
2023-07-25 14:13:59 -07:00
committed by GitHub
parent 19b239fba0
commit 67a6a99e04
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/panel/heatmap/HeatmapHoverView.tsx
+10 -7
View File
@@ -125,18 +125,21 @@ const HeatmapHoverCell = ({ data, hover, showHistogram, scopedVars, replaceVars
for (const field of visibleFields ?? []) { for (const field of visibleFields ?? []) {
const hasLinks = field.config.links && field.config.links.length > 0; const hasLinks = field.config.links && field.config.links.length > 0;
if (hasLinks && data.heatmap) { if (hasLinks && data.heatmap) {
let appropriateScopedVars = scopedVars.filter( const appropriateScopedVars = scopedVars.find(
(sv) => sv && sv.__dataContext && sv.__dataContext.value.field.name === nonNumericOrdinalDisplay (scopedVar) =>
)[0]; scopedVar && scopedVar.__dataContext && scopedVar.__dataContext.value.field.name === nonNumericOrdinalDisplay
field.getLinks = getLinksSupplier(data.heatmap, field, appropriateScopedVars ?? {}, replaceVars); );
field.getLinks = getLinksSupplier(data.heatmap, field, appropriateScopedVars || {}, replaceVars);
} }
if (field.getLinks) { if (field.getLinks) {
const v = field.values[index]; const value = field.values[index];
const disp = field.display ? field.display(v) : { text: `${v}`, numeric: +v }; const display = field.display ? field.display(value) : { text: `${value}`, numeric: +value };
field.getLinks({ calculatedValue: disp, valueRowIndex: index }).forEach((link) => { field.getLinks({ calculatedValue: display, valueRowIndex: index }).forEach((link) => {
const key = `${link.title}/${link.href}`; const key = `${link.title}/${link.href}`;
if (!linkLookup.has(key)) { if (!linkLookup.has(key)) {
links.push(link); links.push(link);
public/app/plugins/panel/heatmap/HeatmapPanel.tsx
+1 -1
View File
@@ -48,7 +48,7 @@ export const HeatmapPanel = ({
for (const series of data.series) { for (const series of data.series) {
for (const field of series.fields) { for (const field of series.fields) {
if (field.state?.scopedVars) { if (field.state?.scopedVars) {
scopedVarsFromRawData.push(field.state?.scopedVars); scopedVarsFromRawData.push(field.state.scopedVars);
} }
} }
} }