Commit 80da1901 by Torkel Ödegaard

Moved share modal

parent 720fa87b
...@@ -236,7 +236,7 @@ export class KeybindingSrv { ...@@ -236,7 +236,7 @@ export class KeybindingSrv {
shareScope.dashboard = dashboard; shareScope.dashboard = dashboard;
appEvents.emit('show-modal', { appEvents.emit('show-modal', {
src: 'public/app/features/dashboard/partials/shareModal.html', src: 'public/app/features/dashboard/components/ShareModal/template.html',
scope: shareScope, scope: shareScope,
}); });
} }
......
...@@ -60,7 +60,7 @@ export class DashNavCtrl { ...@@ -60,7 +60,7 @@ export class DashNavCtrl {
modalScope.dashboard = this.dashboard; modalScope.dashboard = this.dashboard;
appEvents.emit('show-modal', { appEvents.emit('show-modal', {
src: 'public/app/features/dashboard/partials/shareModal.html', src: 'public/app/features/dashboard/components/ShareModal/template.html',
scope: modalScope, scope: modalScope,
}); });
} }
......
import { SaveProvisionedDashboardModalCtrl } from '../save_provisioned_modal'; import { SaveProvisionedDashboardModalCtrl } from './SaveProvisionedDashboardModalCtrl';
describe('SaveProvisionedDashboardModalCtrl', () => { describe('SaveProvisionedDashboardModalCtrl', () => {
const json = { const json = {
......
import '../shareModalCtrl';
import { ShareModalCtrl } from '../shareModalCtrl';
import config from 'app/core/config'; import config from 'app/core/config';
import { LinkSrv } from 'app/features/dashboard/panellinks/link_srv'; import { LinkSrv } from 'app/features/dashboard/panellinks/link_srv';
import { ShareModalCtrl } from './ShareModalCtrl';
describe('ShareModalCtrl', () => { describe('ShareModalCtrl', () => {
const ctx = { const ctx = {
......
export { ShareModalCtrl } from './ShareModalCtrl';
import './dashboard_ctrl'; import './dashboard_ctrl';
import './save_provisioned_modal';
import './shareModalCtrl';
import './share_snapshot_ctrl'; import './share_snapshot_ctrl';
import './dashboard_srv'; import './dashboard_srv';
import './validation_srv'; import './validation_srv';
...@@ -29,6 +27,7 @@ import './components/SubMenu'; ...@@ -29,6 +27,7 @@ import './components/SubMenu';
import './components/TimePicker'; import './components/TimePicker';
import './components/UnsavedChangesModal'; import './components/UnsavedChangesModal';
import './components/SaveModals'; import './components/SaveModals';
import './components/ShareModal';
import DashboardPermissions from './components/DashboardPermissions/DashboardPermissions'; import DashboardPermissions from './components/DashboardPermissions/DashboardPermissions';
......
...@@ -80,7 +80,7 @@ export const editPanelJson = (dashboard: DashboardModel, panel: PanelModel) => { ...@@ -80,7 +80,7 @@ export const editPanelJson = (dashboard: DashboardModel, panel: PanelModel) => {
export const sharePanel = (dashboard: DashboardModel, panel: PanelModel) => { export const sharePanel = (dashboard: DashboardModel, panel: PanelModel) => {
appEvents.emit('show-modal', { appEvents.emit('show-modal', {
src: 'public/app/features/dashboard/partials/shareModal.html', src: 'public/app/features/dashboard/components/ShareModal/template.html',
model: { model: {
dashboard: dashboard, dashboard: dashboard,
panel: panel, panel: panel,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment