jprdonnelly/redash
1
0
Fork 0
mirror of https://github.com/getredash/redash.git synced 2025-12-19 17:37:19 -05:00
Code Issues Projects Releases Wiki Activity

Map() implementation fix for chart labels (#7022)

Browse Source 
Co-authored-by: Ezra Odio <eodio@starfishstorage.com>
Co-authored-by: Eric Radman <eradman@starfishstorage.com>
This commit is contained in:
Ezra Odio
2024-06-18 14:05:37 -04:00
committed by GitHub
parent a6c728b99c
commit 4cb32fc1c3
2 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
viz-lib/src/visualizations/chart/plotly/prepareDefaultData.ts
View File

@@ -92,9 +92,7 @@ function prepareSeries(series: any, options: any, additionalOptions: any) {
const sourceData = new Map();
//we hold the labels and values in a dictionary so that we can aggregate multiple values for a single label
//once we reach the end of the data, we'll convert the dictionary to separate arrays for labels and values
const labelsValuesDict: { [key: string]: any } = {};
const labelsValuesMap = new Map();
const yErrorValues: any = [];
each(data, row => {
@@ -102,13 +100,12 @@ function prepareSeries(series: any, options: any, additionalOptions: any) {
const y = cleanYValue(row.y, seriesYAxis === "y2" ? options.yAxis[1].type : options.yAxis[0].type); // depends on series type!
const yError = cleanNumber(row.yError); // always number
const size = cleanNumber(row.size); // always number
if (x in labelsValuesDict){
labelsValuesDict[x] += y;
if (labelsValuesMap.has(x)) {
labelsValuesMap.set(x, labelsValuesMap.get(x) + y);
} else {
labelsValuesMap.set(x, y);
}
else{
labelsValuesDict[x] = y;
}
const aggregatedY = labelsValuesDict[x];
const aggregatedY = labelsValuesMap.get(x);
sourceData.set(x, {
x,
@@ -121,8 +118,8 @@ function prepareSeries(series: any, options: any, additionalOptions: any) {
yErrorValues.push(yError);
});
const xValues = Object.keys(labelsValuesDict);
const yValues = Object.values(labelsValuesDict);
const xValues = Array.from(labelsValuesMap.keys());
const yValues = Array.from(labelsValuesMap.values());
const plotlySeries = {
visible: true,

20
viz-lib/src/visualizations/chart/plotly/preparePieData.ts
View File

@@ -41,9 +41,7 @@ function prepareSeries(series: any, options: any, additionalOptions: any) {
const xPosition = (index % cellsInRow) * cellWidth;
const yPosition = Math.floor(index / cellsInRow) * cellHeight;
//we hold the labels and values in a dictionary so that we can aggregate multiple values for a single label
//once we reach the end of the data, we'll convert the dictionary to separate arrays for labels and values
const labelsValuesDict: { [key: string]: any } = {};
const labelsValuesMap = new Map();
const sourceData = new Map();
const seriesTotal = reduce(
@@ -58,13 +56,13 @@ function prepareSeries(series: any, options: any, additionalOptions: any) {
const x = hasX ? normalizeValue(row.x, options.xAxis.type) : `Slice ${index}`;
const y = cleanNumber(row.y);
if (x in labelsValuesDict){
labelsValuesDict[x] += y;
if (labelsValuesMap.has(x)) {
labelsValuesMap.set(x, labelsValuesMap.get(x) + y);
} else {
labelsValuesMap.set(x, y);
}
else{
labelsValuesDict[x] = y;
}
const aggregatedY = labelsValuesDict[x];
const aggregatedY = labelsValuesMap.get(x);
sourceData.set(x, {
x,
@@ -77,8 +75,8 @@ function prepareSeries(series: any, options: any, additionalOptions: any) {
const markerColors = map(Array.from(sourceData.values()), data => getValueColor(data.row.x));
const textColors = map(markerColors, c => chooseTextColorForBackground(c));
const labels = Object.keys(labelsValuesDict);
const values = Object.values(labelsValuesDict);
const labels = Array.from(labelsValuesMap.keys());
const values = Array.from(labelsValuesMap.values());
return {
visible: true,