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
95aef824
Unverified
Commit
95aef824
authored
Jun 04, 2018
by
David
Committed by
GitHub
Jun 04, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12146 from grafana/12144-new-variable-save
added if to check if new variable has been added
parents
09a0a49c
89238b4a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
53 additions
and
9 deletions
+53
-9
public/app/features/dashboard/save_modal.ts
+12
-6
public/app/features/dashboard/specs/save_modal.jest.ts
+41
-3
No files found.
public/app/features/dashboard/save_modal.ts
View file @
95aef824
...
...
@@ -16,13 +16,13 @@ const template = `
<form name="ctrl.saveForm" ng-submit="ctrl.save()" class="modal-content" novalidate>
<div class="p-t-1">
<div class="gf-form-group" ng-if="ctrl.timeChange || ctrl.variableChange">
<div class="gf-form-group" ng-if="ctrl.timeChange || ctrl.variable
Value
Change">
<gf-form-switch class="gf-form"
label="Save current time range" ng-if="ctrl.timeChange" label-class="width-12" switch-class="max-width-6"
checked="ctrl.saveTimerange" on-change="buildUrl()">
</gf-form-switch>
<gf-form-switch class="gf-form"
label="Save current variables" ng-if="ctrl.variableChange" label-class="width-12" switch-class="max-width-6"
label="Save current variables" ng-if="ctrl.variable
Value
Change" label-class="width-12" switch-class="max-width-6"
checked="ctrl.saveVariables" on-change="buildUrl()">
</gf-form-switch>
</div>
...
...
@@ -70,7 +70,7 @@ export class SaveDashboardModalCtrl {
saveForm
:
any
;
dismiss
:
()
=>
void
;
timeChange
=
false
;
variableChange
=
false
;
variable
Value
Change
=
false
;
/** @ngInject */
constructor
(
private
dashboardSrv
)
{
...
...
@@ -91,18 +91,24 @@ export class SaveDashboardModalCtrl {
}
compareTemplating
()
{
//checks if variables has been added or removed, if so variables will be saved automatically
if
(
this
.
dashboardSrv
.
dash
.
originalTemplating
.
length
!==
this
.
dashboardSrv
.
dash
.
templating
.
list
.
length
)
{
return
(
this
.
variableValueChange
=
false
);
}
//checks if variable value has changed
if
(
this
.
dashboardSrv
.
dash
.
templating
.
list
.
length
>
0
)
{
for
(
let
i
=
0
;
i
<
this
.
dashboardSrv
.
dash
.
templating
.
list
.
length
;
i
++
)
{
if
(
this
.
dashboardSrv
.
dash
.
templating
.
list
[
i
].
current
.
text
!==
this
.
dashboardSrv
.
dash
.
originalTemplating
[
i
].
current
.
text
)
{
return
(
this
.
variableChange
=
true
);
return
(
this
.
variable
Value
Change
=
true
);
}
}
return
(
this
.
variableChange
=
false
);
return
(
this
.
variable
Value
Change
=
false
);
}
else
{
return
(
this
.
variableChange
=
false
);
return
(
this
.
variable
Value
Change
=
false
);
}
}
...
...
public/app/features/dashboard/specs/save_modal.jest.ts
View file @
95aef824
...
...
@@ -43,7 +43,7 @@ describe('SaveDashboardModal', () => {
let
modal
=
new
SaveDashboardModalCtrl
(
fakeDashboardSrv
);
expect
(
modal
.
timeChange
).
toBe
(
true
);
expect
(
modal
.
variableChange
).
toBe
(
true
);
expect
(
modal
.
variable
Value
Change
).
toBe
(
true
);
});
it
(
'should hide checkboxes'
,
()
=>
{
...
...
@@ -54,7 +54,6 @@ describe('SaveDashboardModal', () => {
{
current
:
{
selected
:
true
,
//tags: Array(0),
text
:
'server_002'
,
value
:
'server_002'
,
},
...
...
@@ -84,7 +83,46 @@ describe('SaveDashboardModal', () => {
};
let
modal
=
new
SaveDashboardModalCtrl
(
fakeDashboardSrv
);
expect
(
modal
.
timeChange
).
toBe
(
false
);
expect
(
modal
.
variableChange
).
toBe
(
false
);
expect
(
modal
.
variableValueChange
).
toBe
(
false
);
});
it
(
'should hide variable checkboxes'
,
()
=>
{
let
fakeDashboardSrv
=
{
dash
:
{
templating
:
{
list
:
[
{
current
:
{
selected
:
true
,
text
:
'server_002'
,
value
:
'server_002'
,
},
name
:
'Server'
,
},
{
current
:
{
selected
:
true
,
text
:
'web_002'
,
value
:
'web_002'
,
},
name
:
'Web'
,
},
],
},
originalTemplating
:
[
{
current
:
{
selected
:
true
,
text
:
'server_002'
,
value
:
'server_002'
,
},
name
:
'Server'
,
},
],
},
};
let
modal
=
new
SaveDashboardModalCtrl
(
fakeDashboardSrv
);
expect
(
modal
.
variableValueChange
).
toBe
(
false
);
});
});
});
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