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
46e12967
Commit
46e12967
authored
Jan 29, 2018
by
Marcus Efraimsson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboards: return uid in response to creating/updating a dashboard. #7883
parent
e229f8ae
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
1 deletions
+23
-1
pkg/api/dashboard.go
+1
-1
pkg/api/dashboard_test.go
+22
-0
No files found.
pkg/api/dashboard.go
View file @
46e12967
...
...
@@ -226,7 +226,7 @@ func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) Response {
}
c
.
TimeRequest
(
metrics
.
M_Api_Dashboard_Save
)
return
Json
(
200
,
util
.
DynMap
{
"status"
:
"success"
,
"slug"
:
dashboard
.
Slug
,
"version"
:
dashboard
.
Version
,
"id"
:
dashboard
.
Id
})
return
Json
(
200
,
util
.
DynMap
{
"status"
:
"success"
,
"slug"
:
dashboard
.
Slug
,
"version"
:
dashboard
.
Version
,
"id"
:
dashboard
.
Id
,
"uid"
:
dashboard
.
Uid
})
}
func
GetHomeDashboard
(
c
*
middleware
.
Context
)
Response
{
...
...
pkg/api/dashboard_test.go
View file @
46e12967
...
...
@@ -135,6 +135,11 @@ func TestDashboardApiEndpoint(t *testing.T) {
postDashboardScenario
(
"When calling POST on"
,
"/api/dashboards"
,
"/api/dashboards"
,
role
,
cmd
,
func
(
sc
*
scenarioContext
)
{
CallPostDashboard
(
sc
)
So
(
sc
.
resp
.
Code
,
ShouldEqual
,
200
)
result
:=
sc
.
ToJson
()
So
(
result
.
Get
(
"status"
)
.
MustString
(),
ShouldEqual
,
"success"
)
So
(
result
.
Get
(
"id"
)
.
MustInt64
(),
ShouldBeGreaterThan
,
0
)
So
(
result
.
Get
(
"uid"
)
.
MustString
(),
ShouldNotBeNil
)
So
(
result
.
Get
(
"slug"
)
.
MustString
(),
ShouldNotBeNil
)
})
Convey
(
"When saving a dashboard folder in another folder"
,
func
()
{
...
...
@@ -306,6 +311,11 @@ func TestDashboardApiEndpoint(t *testing.T) {
postDashboardScenario
(
"When calling POST on"
,
"/api/dashboards"
,
"/api/dashboards"
,
role
,
cmd
,
func
(
sc
*
scenarioContext
)
{
CallPostDashboard
(
sc
)
So
(
sc
.
resp
.
Code
,
ShouldEqual
,
200
)
result
:=
sc
.
ToJson
()
So
(
result
.
Get
(
"status"
)
.
MustString
(),
ShouldEqual
,
"success"
)
So
(
result
.
Get
(
"id"
)
.
MustInt64
(),
ShouldBeGreaterThan
,
0
)
So
(
result
.
Get
(
"uid"
)
.
MustString
(),
ShouldNotBeNil
)
So
(
result
.
Get
(
"slug"
)
.
MustString
(),
ShouldNotBeNil
)
})
})
...
...
@@ -378,6 +388,11 @@ func TestDashboardApiEndpoint(t *testing.T) {
postDashboardScenario
(
"When calling POST on"
,
"/api/dashboards"
,
"/api/dashboards"
,
role
,
cmd
,
func
(
sc
*
scenarioContext
)
{
CallPostDashboard
(
sc
)
So
(
sc
.
resp
.
Code
,
ShouldEqual
,
200
)
result
:=
sc
.
ToJson
()
So
(
result
.
Get
(
"status"
)
.
MustString
(),
ShouldEqual
,
"success"
)
So
(
result
.
Get
(
"id"
)
.
MustInt64
(),
ShouldBeGreaterThan
,
0
)
So
(
result
.
Get
(
"uid"
)
.
MustString
(),
ShouldNotBeNil
)
So
(
result
.
Get
(
"slug"
)
.
MustString
(),
ShouldNotBeNil
)
})
})
...
...
@@ -519,3 +534,10 @@ func postDashboardScenario(desc string, url string, routePattern string, role m.
fn
(
sc
)
})
}
func
(
sc
*
scenarioContext
)
ToJson
()
*
simplejson
.
Json
{
var
result
*
simplejson
.
Json
err
:=
json
.
NewDecoder
(
sc
.
resp
.
Body
)
.
Decode
(
&
result
)
So
(
err
,
ShouldBeNil
)
return
result
}
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