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

fix: Respecting max/min opacities, and adding tests. #20555

Merged
merged 9 commits into from
Jun 30, 2022
Merged

fix: Respecting max/min opacities, and adding tests. #20555

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
849bc04
Respecting max/min opacities, and adding tests.
rusackas Jun 30, 2022
012f922
revising tests
rusackas Jun 30, 2022
71b786d
Adding missing test case for maximum coverage :)
rusackas Jun 30, 2022
48996ae
removing unnecessary logic and test
rusackas Jun 30, 2022
65c2d08
adding another unit test for (hopefully) full coverage.
rusackas Jun 30, 2022
282f683
no more ternary operator
rusackas Jun 30, 2022
27365d4
New approach with Math.min - take THAT codecov.
rusackas Jun 30, 2022
1101a55
one more stab at making codecov happy... ignoring the file next.
rusackas Jun 30, 2022
0dd7d4a
lint fixes
rusackas Jun 30, 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
28 changes: 18 additions & 10 deletions superset-frontend/packages/superset-ui-chart-controls/src/utils/getColorFormatters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,24 @@ export const getOpacity = (
extremeValue: number,
minOpacity = MIN_OPACITY_BOUNDED,
maxOpacity = MAX_OPACITY,
) =>
extremeValue === cutoffPoint
? maxOpacity
: round(
Math.abs(
((maxOpacity - minOpacity) / (extremeValue - cutoffPoint)) *
(value - cutoffPoint),
) + minOpacity,
2,
);
) => {
if (extremeValue === cutoffPoint) {
return maxOpacity;
}
const result = round(
Math.abs(
((maxOpacity - minOpacity) / (extremeValue - cutoffPoint)) *
(value - cutoffPoint),
) + minOpacity,
2,
);

if (result < minOpacity) {
return minOpacity;
}

return result > maxOpacity ? maxOpacity : result;
};

export const getColorFunction = (
{
Expand Down
2 changes: 2 additions & 0 deletions superset-frontend/packages/superset-ui-chart-controls/test/utils/getColorFormatters.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ describe('getOpacity', () => {
expect(getOpacity(100, 100, 50)).toEqual(0.05);
expect(getOpacity(100, 100, 100, 0, 0.8)).toEqual(0.8);
expect(getOpacity(100, 100, 50, 0, 1)).toEqual(0);
expect(getOpacity(999, 100, 50, 0, 1)).toEqual(1);
expect(getOpacity(-999, 100, 50, 0, 1)).toEqual(0.05);
Copy link
Member

Choose a reason for hiding this comment

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

Math.abs inside the function will make sure result is never negative. We can replace this test with one that passes a high minOpacity like 0.9 and parameters that make result be less than this value to test result < minOpacity

Suggested change
expect(getOpacity(-999, 100, 50, 0, 1)).toEqual(0.05);

});
});

Expand Down