Skip to content

fix html rendering of tree legend #7643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ankurjuneja wants to merge 1 commit into
base: release26.3-SNAPSHOT
Choose a base branch
from
+28 −22
Open

fix html rendering of tree legend #7643

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 28 additions & 22 deletions core/webapp/vis/src/plot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2272,31 +2272,37 @@ boxPlot.render();
};
}

// Issue 23626: map line/point color based on legend data
if (config.legendData && config.properties.color && !config.properties.colorRange) {
var legendColorMap = {};
for (var i = 0; i < config.legendData.length; i++) {
if (config.legendData[i].name) {
legendColorMap[config.legendData[i].name] = config.legendData[i].color;
// Issue 23626: map line/point color based on explicit colorMap property or legendData name entries
if (config.properties.color && !config.properties.colorRange) {
var legendColorMap;
if (config.properties.colorMap) {
legendColorMap = config.properties.colorMap;
} else if (config.legendData) {
legendColorMap = {};
for (var i = 0; i < config.legendData.length; i++) {
if (config.legendData[i].name) {
legendColorMap[config.legendData[i].name] = config.legendData[i].color;
}
}
}

if (config.qcPlotType === LABKEY.vis.TrendingLinePlotType.CUSUM) {
config.scales.color = {
scale: function(group) {
var normalizedGroup = group.replace('CUSUMmN', 'CUSUMm').replace('CUSUMmP', 'CUSUMm');
normalizedGroup = normalizedGroup.replace('CUSUMvN', 'CUSUMv').replace('CUSUMvP', 'CUSUMv');
return legendColorMap[normalizedGroup];
}
};
}
else
{
config.scales.color = {
scale: function(group) {
return legendColorMap[group];
}
};
if (legendColorMap) {
if (config.qcPlotType === LABKEY.vis.TrendingLinePlotType.CUSUM) {
config.scales.color = {
scale: function(group) {
var normalizedGroup = group.replace('CUSUMmN', 'CUSUMm').replace('CUSUMmP', 'CUSUMm');
normalizedGroup = normalizedGroup.replace('CUSUMvN', 'CUSUMv').replace('CUSUMvP', 'CUSUMv');
return legendColorMap[normalizedGroup];
}
};
}
else {
config.scales.color = {
scale: function(group) {
return legendColorMap[group];
}
};
}
}
}

Expand Down
Loading