Skip to content

fix: donut chart fixes #988

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
merged 8 commits into from
Jul 29, 2021
Merged

fix: donut chart fixes #988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8bf3da5
fix: donut chart fixes
itssharmasandeep Jul 13, 2021
5599c6a
Revert "fix: donut chart fixes"
itssharmasandeep Jul 13, 2021
a82fce5
fix: donut chart fixes
itssharmasandeep Jul 13, 2021
0fac303
Merge branch 'main' into donut-fixes
itssharmasandeep Jul 15, 2021
601d9eb
Merge branch 'main' into donut-fixes
itssharmasandeep Jul 21, 2021
d51f5d6
Merge remote-tracking branch 'origin/main' into donut-fixes
itssharmasandeep Jul 29, 2021
ac5f177
fix: donut and legend responsiveness issue
itssharmasandeep Jul 29, 2021
8612b01
Merge branch 'donut-fixes' of github.com:hypertrace/hypertrace-ui int…
itssharmasandeep Jul 29, 2021
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
14 changes: 12 additions & 2 deletions projects/observability/src/shared/components/donut/donut-builder.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ export class DonutBuilderService extends D3VisualizationBuilderService<
private static readonly DONUT_ARC_CLASS: string = 'donut-arc';

private static readonly DONUT_PADDING_PX: number = 10;
private static readonly MAX_FONT_SIZE_FOR_TITLE: number = 15;
private static readonly MAX_FONT_SIZE_FOR_VALUE: number = 64;

public constructor(
d3: D3UtilService,
Expand Down Expand Up @@ -69,11 +71,19 @@ export class DonutBuilderService extends D3VisualizationBuilderService<

visualizationContainer
.select(selector(DonutBuilderService.DONUT_VALUE_TITLE_CLASS))
.attr('transform', `translate(0,-${dimensions.donutInnerRadius / 2})`);
.attr('transform', `translate(0,-${dimensions.donutInnerRadius / 2})`)
.style(
'font-size',
Math.min(Math.floor(dimensions.donutInnerRadius / 8), DonutBuilderService.MAX_FONT_SIZE_FOR_TITLE)
);

visualizationContainer
.select(selector(DonutBuilderService.DONUT_VALUE_CLASS))
.attr('transform', `translate(0,-${dimensions.donutInnerRadius / 4})`);
.attr('transform', `translate(0,-${dimensions.donutInnerRadius / 4})`)
.style(
'font-size',
Math.min(Math.floor(dimensions.donutInnerRadius / 2), DonutBuilderService.MAX_FONT_SIZE_FOR_VALUE)
);
}

protected drawVisualization(
Expand Down
2 changes: 0 additions & 2 deletions projects/observability/src/shared/components/donut/donut.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@

.donut-svg {
.donut-value-title {
font-size: 15px;
dominant-baseline: hanging;
}

.donut-value {
font-size: 64px;
dominant-baseline: hanging;
}
}
Expand Down
5 changes: 3 additions & 2 deletions projects/observability/src/shared/components/legend/legend.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
.legend-entries {
display: flex;
flex-wrap: wrap;
overflow: hidden;

&.legend-row {
flex-direction: row;
Expand Down Expand Up @@ -45,14 +46,14 @@
}

.legend-label {
@include body-2-medium($gray-4);
@include chart-small-regular($gray-4);
@include ellipsis-overflow();
flex: 1;
min-width: 24px;
}

.legend-value {
@include body-2-medium($gray-9);
@include chart-small-regular($gray-9);
padding-left: 16px;
}
}
Expand Down
6 changes: 5 additions & 1 deletion projects/observability/src/shared/components/utils/d3/d3-visualization-builder.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ export abstract class D3VisualizationBuilderService<
let legendWidth = isLegendVisible
? 0
: isSideLegend
? Math.min(legendRect.width, this.getMaxLegendWidth())
? Math.min(this.getLegendWidth(outerRect.width), this.getMaxLegendWidth())
: isTopOrBottomLegend
? outerRect.width
: 0;
Expand Down Expand Up @@ -264,6 +264,10 @@ export abstract class D3VisualizationBuilderService<
});
}

private getLegendWidth(outerRectWidth: number): number {
return outerRectWidth >= 200 ? outerRectWidth * 0.35 : 0;
}

private isLegendVisible(config: ChartConfig): boolean {
return config.legend === LegendPosition.None;
}
Expand Down