From 7f2c2a913ea5ac3c7ff9b4ee1a467b23f4429a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 27 Jan 2019 17:33:13 +0100 Subject: [PATCH] Moving a few things from dashboard folder --- .../dashboard/components/ShareModal/ShareModalCtrl.test.ts | 2 +- .../dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx | 2 +- public/app/features/dashboard/index.ts | 2 -- public/app/features/panel/all.ts | 2 ++ public/app/features/{dashboard => panel}/panellinks/link_srv.ts | 0 public/app/features/{dashboard => panel}/panellinks/module.html | 0 public/app/features/{dashboard => panel}/panellinks/module.ts | 0 .../{dashboard => panel}/panellinks/specs/link_srv.test.ts | 0 .../{dashboard/repeat_option => panel}/repeat_option.ts | 0 9 files changed, 4 insertions(+), 4 deletions(-) rename public/app/features/{dashboard => panel}/panellinks/link_srv.ts (100%) rename public/app/features/{dashboard => panel}/panellinks/module.html (100%) rename public/app/features/{dashboard => panel}/panellinks/module.ts (100%) rename public/app/features/{dashboard => panel}/panellinks/specs/link_srv.test.ts (100%) rename public/app/features/{dashboard/repeat_option => panel}/repeat_option.ts (100%) diff --git a/public/app/features/dashboard/components/ShareModal/ShareModalCtrl.test.ts b/public/app/features/dashboard/components/ShareModal/ShareModalCtrl.test.ts index dd8dac31dde..3181231cb53 100644 --- a/public/app/features/dashboard/components/ShareModal/ShareModalCtrl.test.ts +++ b/public/app/features/dashboard/components/ShareModal/ShareModalCtrl.test.ts @@ -1,5 +1,5 @@ import config from 'app/core/config'; -import { LinkSrv } from 'app/features/dashboard/panellinks/link_srv'; +import { LinkSrv } from 'app/features/panel/panellinks/link_srv'; import { ShareModalCtrl } from './ShareModalCtrl'; describe('ShareModalCtrl', () => { diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx index 6b6f81fc579..01f790f73ee 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx @@ -3,7 +3,7 @@ import Remarkable from 'remarkable'; import { Tooltip } from '@grafana/ui'; import { PanelModel } from 'app/features/dashboard/panel_model'; import templateSrv from 'app/features/templating/template_srv'; -import { LinkSrv } from 'app/features/dashboard/panellinks/link_srv'; +import { LinkSrv } from 'app/features/panel/panellinks/link_srv'; import { getTimeSrv, TimeSrv } from 'app/features/dashboard/time_srv'; enum InfoModes { diff --git a/public/app/features/dashboard/index.ts b/public/app/features/dashboard/index.ts index b9173695362..efa54f0ee07 100644 --- a/public/app/features/dashboard/index.ts +++ b/public/app/features/dashboard/index.ts @@ -1,8 +1,6 @@ import './dashboard_ctrl'; import './time_srv'; -import './repeat_option/repeat_option'; import './dashgrid/DashboardGridDirective'; -import './panellinks/module'; // Services import './services/DashboardViewStateSrv'; diff --git a/public/app/features/panel/all.ts b/public/app/features/panel/all.ts index d461b491897..8bc2822a77c 100644 --- a/public/app/features/panel/all.ts +++ b/public/app/features/panel/all.ts @@ -4,3 +4,5 @@ import './solo_panel_ctrl'; import './query_ctrl'; import './panel_editor_tab'; import './query_editor_row'; +import './repeat_option'; +import './panellinks/module'; diff --git a/public/app/features/dashboard/panellinks/link_srv.ts b/public/app/features/panel/panellinks/link_srv.ts similarity index 100% rename from public/app/features/dashboard/panellinks/link_srv.ts rename to public/app/features/panel/panellinks/link_srv.ts diff --git a/public/app/features/dashboard/panellinks/module.html b/public/app/features/panel/panellinks/module.html similarity index 100% rename from public/app/features/dashboard/panellinks/module.html rename to public/app/features/panel/panellinks/module.html diff --git a/public/app/features/dashboard/panellinks/module.ts b/public/app/features/panel/panellinks/module.ts similarity index 100% rename from public/app/features/dashboard/panellinks/module.ts rename to public/app/features/panel/panellinks/module.ts diff --git a/public/app/features/dashboard/panellinks/specs/link_srv.test.ts b/public/app/features/panel/panellinks/specs/link_srv.test.ts similarity index 100% rename from public/app/features/dashboard/panellinks/specs/link_srv.test.ts rename to public/app/features/panel/panellinks/specs/link_srv.test.ts diff --git a/public/app/features/dashboard/repeat_option/repeat_option.ts b/public/app/features/panel/repeat_option.ts similarity index 100% rename from public/app/features/dashboard/repeat_option/repeat_option.ts rename to public/app/features/panel/repeat_option.ts