Skip to content

fix: Refactor handling of empty chart data in ChartWidget #37009

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

Merged
rahulbarwal merged 3 commits into from
Oct 23, 2024
Merged

fix: Refactor handling of empty chart data in ChartWidget #37009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3da5cb5
refactor: Update ChartWidget to handle empty chart data more efficiently
rahulbarwal Oct 22, 2024
fa0a700
refactor: Improve handling of empty chart data in ChartWidget tests
rahulbarwal Oct 22, 2024
08602d3
refactor: Update emptyChartData function in ChartWidget to handle emp…
rahulbarwal Oct 23, 2024
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
9 changes: 9 additions & 0 deletions app/client/src/widgets/ChartWidget/widget/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,15 @@ describe("emptyChartData", () => {
expect(emptyChartData(props)).toEqual(true);
});

it("returns true if each series is null or undefined", () => {
const props = JSON.parse(JSON.stringify(basicEChartProps));
Copy link
Contributor

@jsartisan jsartisan Oct 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I know you are just following what the previous developer did in this test, but why are we doing stringify and parse the JS object? 🤔 Just curious about it...What's the point?

Copy link
Contributor Author

@rahulbarwal rahulbarwal Oct 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Basically creating a (deep)clone of the object. We change some nested properties of this object in the test.


props.chartData.seriesID1 = { data: undefined };
props.chartData.seriesID2 = { data: null };

expect(emptyChartData(props)).toEqual(true);
});

it("returns true if no series is present", () => {
const props = JSON.parse(JSON.stringify(basicEChartProps));

Expand Down
5 changes: 4 additions & 1 deletion app/client/src/widgets/ChartWidget/widget/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ export const emptyChartData = (props: ChartWidgetProps) => {
const builder = new EChartsDatasetBuilder(props.chartType, props.chartData);

for (const seriesID in builder.filteredChartData) {
if (Object.keys(props.chartData[seriesID].data).length > 0) {
if (
Array.isArray(props.chartData[seriesID].data) &&
props.chartData[seriesID].data.length > 0
) {
return false;
}
}
Expand Down