(this.element = element)} />;
- }
-}
diff --git a/public/app/features/dashboard/components/SubMenu/DashboardLinks.tsx b/public/app/features/dashboard/components/SubMenu/DashboardLinks.tsx
new file mode 100644
index 00000000000..39092e48806
--- /dev/null
+++ b/public/app/features/dashboard/components/SubMenu/DashboardLinks.tsx
@@ -0,0 +1,43 @@
+import React, { FC } from 'react';
+import { Icon, IconName, Tooltip } from '@grafana/ui';
+import { sanitize, sanitizeUrl } from '@grafana/data/src/text/sanitize';
+import { DashboardsDropdown } from './DashboardsDropdown';
+import { getLinkSrv } from '../../../panel/panellinks/link_srv';
+
+import { DashboardModel } from '../../state';
+import { DashboardLink } from '../../state/DashboardModel';
+import { iconMap } from '../DashLinks/DashLinksEditorCtrl';
+
+export interface Props {
+ dashboard: DashboardModel;
+}
+
+export const DashboardLinks: FC
= ({ dashboard }) => {
+ return (
+ dashboard.links.length > 0 && (
+ <>
+ {dashboard.links.map((link: DashboardLink, index: number) => {
+ const linkInfo = getLinkSrv().getAnchorInfo(link);
+ const key = `${link.title}-$${index}`;
+
+ if (link.asDropdown) {
+ return ;
+ }
+
+ const linkElement = (
+
+
+ {sanitize(linkInfo.title)}
+
+ );
+
+ return (
+
+ {link.tooltip ? {linkElement} : linkElement}
+
+ );
+ })}
+
+ )
+ );
+};
diff --git a/public/app/features/dashboard/components/SubMenu/DashboardsDropdown.tsx b/public/app/features/dashboard/components/SubMenu/DashboardsDropdown.tsx
new file mode 100644
index 00000000000..08fc46d0324
--- /dev/null
+++ b/public/app/features/dashboard/components/SubMenu/DashboardsDropdown.tsx
@@ -0,0 +1,71 @@
+import React, { PureComponent } from 'react';
+import { Icon } from '@grafana/ui';
+import { sanitize, sanitizeUrl } from '@grafana/data/src/text/sanitize';
+import { getBackendSrv } from 'app/core/services/backend_srv';
+import { DashboardSearchHit } from 'app/features/search/types';
+import { getLinkSrv } from '../../../panel/panellinks/link_srv';
+import { DashboardLink } from '../../state/DashboardModel';
+
+interface Props {
+ link: DashboardLink;
+ linkInfo: { title: string; href: string };
+ dashboardId: any;
+}
+
+interface State {
+ searchHits: DashboardSearchHit[];
+}
+
+export class DashboardsDropdown extends PureComponent {
+ state = { searchHits: [] as DashboardSearchHit[] };
+ onDropDownClick = async () => {
+ const { dashboardId, link } = this.props;
+
+ const limit = 7;
+ const dashboards = await getBackendSrv().search({ tag: link.tags, limit });
+ const processed = dashboards
+ .filter(dash => dash.id !== dashboardId)
+ .map(dash => {
+ return {
+ ...dash,
+ url: getLinkSrv().getLinkUrl(dash),
+ };
+ });
+
+ this.setState({
+ searchHits: processed,
+ });
+ };
+
+ render() {
+ const { link, linkInfo } = this.props;
+ const { searchHits } = this.state;
+
+ return (
+
+ );
+ }
+}
diff --git a/public/app/features/dashboard/components/SubMenu/SubMenu.tsx b/public/app/features/dashboard/components/SubMenu/SubMenu.tsx
index a3a3f92ab5f..45ce7ea9c31 100644
--- a/public/app/features/dashboard/components/SubMenu/SubMenu.tsx
+++ b/public/app/features/dashboard/components/SubMenu/SubMenu.tsx
@@ -4,7 +4,7 @@ import { StoreState } from '../../../../types';
import { getVariables } from '../../../variables/state/selectors';
import { VariableHide, VariableModel } from '../../../templating/types';
import { DashboardModel } from '../../state';
-import { AngularDashboardLinks } from './AngularDashboardLinks';
+import { DashboardLinks } from './DashboardLinks';
import { Annotations } from './Annotations';
import { SubMenuItems } from './SubMenuItems';
@@ -49,19 +49,17 @@ class SubMenuUnConnected extends PureComponent {
};
render() {
+ const { dashboard, variables } = this.props;
if (!this.isSubMenuVisible()) {
return null;
}
return (
-
-
+
+
-
+ {dashboard &&
}
- {!editPanel && !featureToggles.newVariables &&
}
+ {!featureToggles.newVariables &&
}
{!editPanel && featureToggles.newVariables &&
}
(link: DataLink, scopedVars: ScopedVars, origin: T) => LinkModel;
+ getAnchorInfo: (link: any) => any;
+ getLinkUrl: (link: any) => string;
}
export class LinkSrv implements LinkService {