Torkel Ödegaard преди 7 години
родител
ревизия
80da19010e

+ 1 - 1
public/app/core/services/keybindingSrv.ts

@@ -236,7 +236,7 @@ export class KeybindingSrv {
         shareScope.dashboard = dashboard;
 
         appEvents.emit('show-modal', {
-          src: 'public/app/features/dashboard/partials/shareModal.html',
+          src: 'public/app/features/dashboard/components/ShareModal/template.html',
           scope: shareScope,
         });
       }

+ 1 - 1
public/app/features/dashboard/components/DashNav/DashNavCtrl.ts

@@ -60,7 +60,7 @@ export class DashNavCtrl {
     modalScope.dashboard = this.dashboard;
 
     appEvents.emit('show-modal', {
-      src: 'public/app/features/dashboard/partials/shareModal.html',
+      src: 'public/app/features/dashboard/components/ShareModal/template.html',
       scope: modalScope,
     });
   }

+ 1 - 1
public/app/features/dashboard/specs/save_provisioned_modal.test.ts → public/app/features/dashboard/components/SaveModals/SaveProvisionedDashboardModalCtrl.test.ts

@@ -1,4 +1,4 @@
-import { SaveProvisionedDashboardModalCtrl } from '../save_provisioned_modal';
+import { SaveProvisionedDashboardModalCtrl } from './SaveProvisionedDashboardModalCtrl';
 
 describe('SaveProvisionedDashboardModalCtrl', () => {
   const json = {

+ 0 - 0
public/app/features/dashboard/save_provisioned_modal.ts → public/app/features/dashboard/components/SaveModals/SaveProvisionedDashboardModalCtrl.ts


+ 1 - 2
public/app/features/dashboard/specs/share_modal_ctrl.test.ts → public/app/features/dashboard/components/ShareModal/ShareModalCtrl.test.ts

@@ -1,7 +1,6 @@
-import '../shareModalCtrl';
-import { ShareModalCtrl } from '../shareModalCtrl';
 import config from 'app/core/config';
 import { LinkSrv } from 'app/features/dashboard/panellinks/link_srv';
+import { ShareModalCtrl } from './ShareModalCtrl';
 
 describe('ShareModalCtrl', () => {
   const ctx = {

+ 0 - 0
public/app/features/dashboard/shareModalCtrl.ts → public/app/features/dashboard/components/ShareModal/ShareModalCtrl.ts


+ 1 - 0
public/app/features/dashboard/components/ShareModal/index.ts

@@ -0,0 +1 @@
+export { ShareModalCtrl } from './ShareModalCtrl';

+ 0 - 0
public/app/features/dashboard/partials/shareModal.html → public/app/features/dashboard/components/ShareModal/template.html


+ 1 - 2
public/app/features/dashboard/index.ts

@@ -1,6 +1,4 @@
 import './dashboard_ctrl';
-import './save_provisioned_modal';
-import './shareModalCtrl';
 import './share_snapshot_ctrl';
 import './dashboard_srv';
 import './validation_srv';
@@ -29,6 +27,7 @@ import './components/SubMenu';
 import './components/TimePicker';
 import './components/UnsavedChangesModal';
 import './components/SaveModals';
+import './components/ShareModal';
 
 import DashboardPermissions from './components/DashboardPermissions/DashboardPermissions';
 

+ 1 - 1
public/app/features/dashboard/utils/panel.ts

@@ -80,7 +80,7 @@ export const editPanelJson = (dashboard: DashboardModel, panel: PanelModel) => {
 
 export const sharePanel = (dashboard: DashboardModel, panel: PanelModel) => {
   appEvents.emit('show-modal', {
-    src: 'public/app/features/dashboard/partials/shareModal.html',
+    src: 'public/app/features/dashboard/components/ShareModal/template.html',
     model: {
       dashboard: dashboard,
       panel: panel,