Skip to content

feat: adding inherit color from text input to entity #826

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
May 7, 2021
Merged

feat: adding inherit color from text input to entity #826

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bbff69
feat: adding inherit color from text input to entity
anandtiwary May 6, 2021
ffac7ae
Merge branch 'main' into inherit-colors-entity
anandtiwary May 6, 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
7 changes: 6 additions & 1 deletion projects/observability/src/shared/components/entity-renderer/entity-renderer.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
@import 'font';

.ht-entity-renderer {
@include body-1-regular(currentColor);
display: flex;
flex-direction: row;
align-items: center;
font-weight: inherit;
@include body-1-regular();
color: $gray-9;

.icon {
padding-right: 12px;
Expand All @@ -20,3 +21,7 @@
.navigable {
@include link-hover();
}

.inherit-text-color {
@include body-1-regular(inherit);
}
28 changes: 28 additions & 0 deletions ...cts/observability/src/shared/components/entity-renderer/entity-renderer.component.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,32 @@ describe('Entity Renderer Component', () => {
});
expect(spectator.query(IconComponent)?.icon).toEqual(IconType.Add);
});

test('should inherit text color when enabled', () => {
const entity = {
[entityIdKey]: 'test-id',
[entityTypeKey]: ObservabilityEntityType.Api,
name: 'test api'
};

spectator = createHost(
`<ht-entity-renderer [entity]="entity" [inheritTextColor]="inheritTextColor">
</ht-entity-renderer>`,
{
hostProps: {
entity: entity,
inheritTextColor: false
}
}
);

expect(spectator.query('.inherit-text-color')).not.toExist();

spectator.setHostInput({
inheritTextColor: true
});
expect(spectator.query('.inherit-text-color')).toExist();

expect(spectator.query('.ht-entity-renderer')).toEqual(spectator.query('.inherit-text-color'));
});
});
5 changes: 4 additions & 1 deletion projects/observability/src/shared/components/entity-renderer/entity-renderer.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { EntityNavigationService } from '../../services/navigation/entity/entity
<div
*ngIf="this.name"
class="ht-entity-renderer"
[ngClass]="{ navigable: this.navigable }"
[ngClass]="{ navigable: this.navigable, 'inherit-text-color': this.inheritTextColor }"
[htTooltip]="this.name"
(click)="this.navigable && this.onClickNavigate()"
>
Expand Down Expand Up @@ -41,6 +41,9 @@ export class EntityRendererComponent implements OnChanges {
@Input()
public showIcon: boolean = false;

@Input()
public inheritTextColor: boolean = false;

public name?: string;
public entityIconType?: string;

Expand Down