Skip to content

feat: Adding unlimited value #1014

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 2 commits into from
Jul 20, 2021
Merged

feat: Adding unlimited value #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e1c4ec
feat: Adding unlimited value
Jul 20, 2021
e78e9eb
feat: Adding uts
Jul 20, 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
17 changes: 16 additions & 1 deletion projects/observability/src/shared/components/bar-gauge/bar-gauge.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@
@include subtitle-1($gray-9);
padding-bottom: 8px;

.unlimited-symbol {
position: relative;
top: 3px;
font-size: 28px;
line-height: 0px;
}

.units {
@include body-small($gray-5);
}
Expand All @@ -22,13 +29,21 @@
display: flex;
flex-direction: row;
justify-content: space-between;
padding: 0px 2px;

.title {
@include body-2-medium($gray-7);
}

.count {
@include body-2-regular($gray-5);

.unlimited-symbol {
font-size: 18px;
position: relative;
top: 2px;
line-height: 0px;
}
}
}
}
Expand All @@ -42,7 +57,7 @@
height: 100%;
width: 100%;
background: $gray-2;
border-radius: 4px;
border-radius: 16px;
overflow: hidden;

&.over-max-value {
Expand Down
38 changes: 37 additions & 1 deletion projects/observability/src/shared/components/bar-gauge/bar-gauge.component.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ describe('Bar Gauge component', () => {
title="Test Title"
[segments]="segments"
[maxValue]="maxValue"
[isUnlimited]="isUnlimited"
></ht-bar-gauge>
`
});
Expand All @@ -72,7 +73,8 @@ describe('Bar Gauge component', () => {
label: 'test-segment-yellow'
}
],
maxValue: 100
maxValue: 100,
isUnlimited: false
}
});
spectator.tick();
Expand All @@ -94,6 +96,7 @@ describe('Bar Gauge component', () => {
value: 33
}
]);
expect(spectator.component.isUnlimited).toEqual(false);
}));

test('assigns correct values when near full', fakeAsync(() => {
Expand Down Expand Up @@ -215,5 +218,38 @@ describe('Bar Gauge component', () => {
value: 33
}
]);
expect(spectator.query('.unlimited-symbol')).not.toExist();
}));

test('should display unlimited value', fakeAsync(() => {
spectator = createHost(undefined, {
providers: [
MockProvider(DomElementMeasurerService, {
measureHtmlElement: setMeasureHtmlElement(100)
})
],
hostProps: {
segments: [
{
value: 100,
color: 'red',
label: 'test-segment-red'
}
],
maxValue: 100,
isUnlimited: true
}
});
spectator.tick();
expect(spectator.component.totalValue).toEqual(100);
expect(spectator.component.barSegments).toEqual([
{
value: 100,
color: 'red',
percentage: 100,
label: 'test-segment-red'
}
]);
expect(spectator.query('.unlimited-symbol')).toExist();
}));
});
11 changes: 9 additions & 2 deletions projects/observability/src/shared/components/bar-gauge/bar-gauge.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,12 @@ import {
<div class="header-data" [ngClass]="this.display">
<div *ngIf="this.title" class="title">{{ this.title | htDisplayTitle }}</div>
<div class="count">
{{ this.totalValue | number }} / {{ this.maxValue | number }}
<span class="units" *ngIf="this.units">{{ this.units }}</span>
<span>{{ this.totalValue | number }}</span>
<span class="units" *ngIf="this.units && this.isUnlimited"> {{ this.units }}</span>
<span> / </span>
<span *ngIf="!this.isUnlimited">{{ this.maxValue | number }}</span>
<span class="unlimited-symbol" *ngIf="this.isUnlimited">&#8734;</span>
<span class="units" *ngIf="this.units && !this.isUnlimited"> {{ this.units }}</span>
</div>
</div>
<div class="bar">
Expand Down Expand Up @@ -84,6 +88,9 @@ export class BarGaugeComponent implements OnChanges, AfterViewInit {
@Input()
public display: BarGaugeStyle = BarGaugeStyle.Regular;

@Input()
public isUnlimited: boolean = false;

public barSegments: BarSegment[] = [];
public totalValue: number = 0;
public overMaxValue: boolean = false;
Expand Down