Skip to content

Commit

Permalink
resolve with new split, not old one (#983)
Browse files Browse the repository at this point in the history
* resolve with new split, not old one

* handle case with number + category split in wrong order
  • Loading branch information
adrianmroz-allegro authored Dec 5, 2022
1 parent 585d2e7 commit c9447eb
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions src/common/visualization-manifests/line-chart/line-chart.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const rulesEvaluator = visualizationDependentEvaluatorBuilder
const newContinuousSplit = fixNumberSplit(numberSplit, dimension);

if (newContinuousSplit.equals(numberSplit)) return Resolve.ready(isSelectedVisualization ? 10 : 4);
return Resolve.automatic(4, { splits: new Splits({ splits: List([numberSplit]) }) });
return Resolve.automatic(4, { splits: new Splits({ splits: List([newContinuousSplit]) }) });
})

.when(Predicates.areExactSplitKinds("time", "*"))
Expand All @@ -90,13 +90,27 @@ const rulesEvaluator = visualizationDependentEvaluatorBuilder

const colorSplit = splits.getSplit(1);
const colorDimension = findDimensionByName(dataCube.dimensions, colorSplit.reference);

const newColorSplit = adjustColorSplit(colorSplit, colorDimension, series, appSettings.customization.visualizationColors);

return Resolve.automatic(8, {
splits: new Splits({ splits: List([newColorSplit, newTimeSplit]) })
});
})
.when(Predicates.areExactSplitKinds("number", "*"))
.then(({ splits, series, dataCube, appSettings }) => {
const numberSplit = splits.getSplit(0);
const dimension = findDimensionByName(dataCube.dimensions, numberSplit.reference);

const newNumberSplit = fixNumberSplit(numberSplit, dimension);

const colorSplit = splits.getSplit(1);
const colorDimension = findDimensionByName(dataCube.dimensions, colorSplit.reference);
const newColorSplit = adjustColorSplit(colorSplit, colorDimension, series, appSettings.customization.visualizationColors);

return Resolve.automatic(8, {
splits: new Splits({ splits: List([newColorSplit, newNumberSplit]) })
});
})

.when(Predicates.areExactSplitKinds("*", "time"))
.then(({ splits, series, dataCube, appSettings }) => {
Expand Down

0 comments on commit c9447eb

Please sign in to comment.