Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
80da1901
Commit
80da1901
authored
Jan 23, 2019
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved share modal
parent
720fa87b
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
7 additions
and
8 deletions
+7
-8
public/app/core/services/keybindingSrv.ts
+1
-1
public/app/features/dashboard/components/DashNav/DashNavCtrl.ts
+1
-1
public/app/features/dashboard/components/SaveModals/SaveProvisionedDashboardModalCtrl.test.ts
+1
-1
public/app/features/dashboard/components/SaveModals/SaveProvisionedDashboardModalCtrl.ts
+0
-0
public/app/features/dashboard/components/ShareModal/ShareModalCtrl.test.ts
+1
-2
public/app/features/dashboard/components/ShareModal/ShareModalCtrl.ts
+0
-0
public/app/features/dashboard/components/ShareModal/index.ts
+1
-0
public/app/features/dashboard/components/ShareModal/template.html
+0
-0
public/app/features/dashboard/index.ts
+1
-2
public/app/features/dashboard/utils/panel.ts
+1
-1
No files found.
public/app/core/services/keybindingSrv.ts
View file @
80da1901
...
@@ -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
,
});
});
}
}
...
...
public/app/features/dashboard/components/DashNav/DashNavCtrl.ts
View file @
80da1901
...
@@ -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
,
});
});
}
}
...
...
public/app/features/dashboard/
specs/save_provisioned_moda
l.test.ts
→
public/app/features/dashboard/
components/SaveModals/SaveProvisionedDashboardModalCtr
l.test.ts
View file @
80da1901
import
{
SaveProvisionedDashboardModalCtrl
}
from
'.
./save_provisioned_moda
l'
;
import
{
SaveProvisionedDashboardModalCtrl
}
from
'.
/SaveProvisionedDashboardModalCtr
l'
;
describe
(
'SaveProvisionedDashboardModalCtrl'
,
()
=>
{
describe
(
'SaveProvisionedDashboardModalCtrl'
,
()
=>
{
const
json
=
{
const
json
=
{
...
...
public/app/features/dashboard/
save_provisioned_moda
l.ts
→
public/app/features/dashboard/
components/SaveModals/SaveProvisionedDashboardModalCtr
l.ts
View file @
80da1901
File moved
public/app/features/dashboard/
specs/share_modal_c
trl.test.ts
→
public/app/features/dashboard/
components/ShareModal/ShareModalC
trl.test.ts
View file @
80da1901
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
=
{
...
...
public/app/features/dashboard/
s
hareModalCtrl.ts
→
public/app/features/dashboard/
components/ShareModal/S
hareModalCtrl.ts
View file @
80da1901
File moved
public/app/features/dashboard/components/ShareModal/index.ts
0 → 100644
View file @
80da1901
export
{
ShareModalCtrl
}
from
'./ShareModalCtrl'
;
public/app/features/dashboard/
partials/shareModal
.html
→
public/app/features/dashboard/
components/ShareModal/template
.html
View file @
80da1901
File moved
public/app/features/dashboard/index.ts
View file @
80da1901
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'
;
...
...
public/app/features/dashboard/utils/panel.ts
View file @
80da1901
...
@@ -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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment