RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8459 from prometheus/fix-labelname-style-bug 

Fix label name leak into class name
This commit is contained in:
Julien Pivotto 2021-02-08 23:56:29 +01:00 committed by GitHub
parent 860f08532a b6544c9048
commit f2c5c230f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/ui/react-app/src/pages/targets/EndpointLink.test.tsx
View File

@ -24,10 +24,10 @@ describe('EndpointLink', () => {
expect(anchor.children().text()).toEqual('http://100.99.128.71:9115/probe'); expect(anchor.children().text()).toEqual('http://100.99.128.71:9115/probe');
expect(endpointLink.find('br')).toHaveLength(1); expect(endpointLink.find('br')).toHaveLength(1);
expect(badges).toHaveLength(2); expect(badges).toHaveLength(2);
const moduleLabel = badges.filterWhere(badge => badge.hasClass('module')); const moduleLabel = badges.filterWhere(badge => badge.children().text() === 'module="http_2xx"');
expect(moduleLabel.children().text()).toEqual('module="http_2xx"'); expect(moduleLabel.length).toEqual(1);
const targetLabel = badges.filterWhere(badge => badge.hasClass('target')); const targetLabel = badges.filterWhere(badge => badge.children().text() === 'target="http://some-service"');
expect(targetLabel.children().text()).toEqual('target="http://some-service"'); expect(targetLabel.length).toEqual(1);
}); });
it('renders an alert if url is invalid', () => { it('renders an alert if url is invalid', () => {
@ -37,7 +37,7 @@ describe('EndpointLink', () => {
}); });
it('handles params with multiple values correctly', () => { it('handles params with multiple values correctly', () => {
const consoleSpy = jest.spyOn(console, "warn"); const consoleSpy = jest.spyOn(console, 'warn');
const endpoint = `http://example.com/federate?match[]={__name__="name1"}&match[]={__name__="name2"}&match[]={__name__="name3"}`; const endpoint = `http://example.com/federate?match[]={__name__="name1"}&match[]={__name__="name2"}&match[]={__name__="name3"}`;
const globalURL = 'http://example.com/federate'; const globalURL = 'http://example.com/federate';
const endpointLink = mount(<EndpointLink endpoint={endpoint} globalUrl={globalURL} />); const endpointLink = mount(<EndpointLink endpoint={endpoint} globalUrl={globalURL} />);

2
web/ui/react-app/src/pages/targets/EndpointLink.tsx
View File

@ -27,7 +27,7 @@ const EndpointLink: FC<EndpointLinkProps> = ({ endpoint, globalUrl }) => {
{params.length > 0 ? <br /> : null} {params.length > 0 ? <br /> : null}
{params.map(([labelName, labelValue]: [string, string]) => { {params.map(([labelName, labelValue]: [string, string]) => {
return ( return (
<Badge color="primary" className={`mr-1 ${labelName}`} key={`${labelName}/${labelValue}`}> <Badge color="primary" className="mr-1" key={`${labelName}/${labelValue}`}>
{`${labelName}="${labelValue}"`} {`${labelName}="${labelValue}"`}
</Badge> </Badge>
); );