mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Moved share modal
This commit is contained in:
@@ -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 {
|
|||||||
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,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { SaveProvisionedDashboardModalCtrl } from '../save_provisioned_modal';
|
import { SaveProvisionedDashboardModalCtrl } from './SaveProvisionedDashboardModalCtrl';
|
||||||
|
|
||||||
describe('SaveProvisionedDashboardModalCtrl', () => {
|
describe('SaveProvisionedDashboardModalCtrl', () => {
|
||||||
const json = {
|
const json = {
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
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 = {
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export { ShareModalCtrl } from './ShareModalCtrl';
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
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';
|
|||||||
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) => {
|
|||||||
|
|
||||||
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,
|
||||||
|
|||||||
Reference in New Issue
Block a user