Skip to content
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

Jump to bottom

resolve with new split, not old one #983

Merged
merged 2 commits into from
Dec 5, 2022
Merged

resolve with new split, not old one #983

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
580ba0e
resolve with new split, not old one
adrianmroz-allegro Dec 1, 2022
ddd167c
handle case with number + category split in wrong order
adrianmroz-allegro Dec 2, 2022
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
18 changes: 16 additions & 2 deletions src/common/visualization-manifests/line-chart/line-chart.ts
View file
Open in desktop
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 }) => {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same logic as in then from line 85. With small adjustments between time and number split types.

Maybe we could extract some common code but i think it's futile. Let's push forward refactor of visualisation controls and remove resolvers altogether.

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