Skip to content
Permalink
Browse files Browse the repository at this point in the history
Merge pull request #147 from grafana/axelav/sanitized-nav-links-8-2-3
Sanitized NavBar children links to remove angular interpolation v8.2.3
  • Loading branch information
oscarkilhed committed Oct 25, 2021
2 parents 3cb5214 + a3dc305 commit fb85ed6
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions public/app/core/components/NavBar/DropdownChild.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { css } from '@emotion/css';
import { GrafanaTheme2 } from '@grafana/data';
import { GrafanaTheme2, textUtil } from '@grafana/data';
import { Icon, IconName, Link, useTheme2 } from '@grafana/ui';

export interface Props {
Expand Down Expand Up @@ -29,13 +29,15 @@ const DropdownChild = ({ isDivider = false, icon, onClick, target, text, url }:
</button>
);
if (url) {
const sanitizedUrl = textUtil.sanitizeAngularInterpolation(url);

element =
!target && url.startsWith('/') ? (
<Link className={styles.element} onClick={onClick} href={url}>
<Link className={styles.element} onClick={onClick} href={sanitizedUrl}>
{linkContent}
</Link>
) : (
<a className={styles.element} href={url} target={target} rel="noopener" onClick={onClick}>
<a className={styles.element} href={sanitizedUrl} target={target} rel="noopener" onClick={onClick}>
{linkContent}
</a>
);
Expand Down

0 comments on commit fb85ed6

Please sign in to comment.