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
3b9105e1
Commit
3b9105e1
authored
Feb 12, 2019
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
enable testing provsioned datasources
closes #12164
parent
c4fa64e6
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
3 deletions
+30
-3
public/app/features/datasources/settings/ButtonRow.test.tsx
+1
-0
public/app/features/datasources/settings/ButtonRow.tsx
+7
-1
public/app/features/datasources/settings/DataSourceSettingsPage.tsx
+11
-2
public/app/features/datasources/settings/__snapshots__/ButtonRow.test.tsx.snap
+7
-0
public/app/features/datasources/settings/__snapshots__/DataSourceSettingsPage.test.tsx.snap
+4
-0
No files found.
public/app/features/datasources/settings/ButtonRow.test.tsx
View file @
3b9105e1
...
...
@@ -7,6 +7,7 @@ const setup = (propOverrides?: object) => {
isReadOnly
:
true
,
onSubmit
:
jest
.
fn
(),
onDelete
:
jest
.
fn
(),
onTest
:
jest
.
fn
(),
};
Object
.
assign
(
props
,
propOverrides
);
...
...
public/app/features/datasources/settings/ButtonRow.tsx
View file @
3b9105e1
...
...
@@ -4,14 +4,20 @@ export interface Props {
isReadOnly
:
boolean
;
onDelete
:
()
=>
void
;
onSubmit
:
(
event
)
=>
void
;
onTest
:
(
event
)
=>
void
;
}
const
ButtonRow
:
FC
<
Props
>
=
({
isReadOnly
,
onDelete
,
onSubmit
})
=>
{
const
ButtonRow
:
FC
<
Props
>
=
({
isReadOnly
,
onDelete
,
onSubmit
,
onTest
})
=>
{
return
(
<
div
className=
"gf-form-button-row"
>
<
button
type=
"submit"
className=
"btn btn-success"
disabled=
{
isReadOnly
}
onClick=
{
event
=>
onSubmit
(
event
)
}
>
Save
&
Test
</
button
>
{
isReadOnly
&&
(
<
button
type=
"submit"
className=
"btn btn-success"
onClick=
{
onTest
}
>
Test
</
button
>
)
}
<
button
type=
"submit"
className=
"btn btn-danger"
disabled=
{
isReadOnly
}
onClick=
{
onDelete
}
>
Delete
</
button
>
...
...
public/app/features/datasources/settings/DataSourceSettingsPage.tsx
View file @
3b9105e1
...
...
@@ -72,6 +72,12 @@ export class DataSourceSettingsPage extends PureComponent<Props, State> {
this
.
testDataSource
();
};
onTest
=
async
(
evt
:
React
.
FormEvent
<
HTMLFormElement
>
)
=>
{
evt
.
preventDefault
();
this
.
testDataSource
();
};
onDelete
=
()
=>
{
appEvents
.
emit
(
'confirm-modal'
,
{
title
:
'Delete'
,
...
...
@@ -180,7 +186,8 @@ export class DataSourceSettingsPage extends PureComponent<Props, State> {
return
(
<
Page
navModel=
{
navModel
}
>
<
Page
.
Contents
isLoading=
{
!
this
.
hasDataSource
}
>
{
this
.
hasDataSource
&&
<
div
className=
"page-container page-body"
>
{
this
.
hasDataSource
&&
(
<
div
className=
"page-container page-body"
>
<
div
>
<
form
onSubmit=
{
this
.
onSubmit
}
>
{
this
.
isReadOnly
()
&&
this
.
renderIsReadOnlyMessage
()
}
...
...
@@ -222,10 +229,12 @@ export class DataSourceSettingsPage extends PureComponent<Props, State> {
onSubmit=
{
event
=>
this
.
onSubmit
(
event
)
}
isReadOnly=
{
this
.
isReadOnly
()
}
onDelete=
{
this
.
onDelete
}
onTest=
{
event
=>
this
.
onTest
(
event
)
}
/>
</
form
>
</
div
>
</
div
>
}
</
div
>
)
}
</
Page
.
Contents
>
</
Page
>
);
...
...
public/app/features/datasources/settings/__snapshots__/ButtonRow.test.tsx.snap
View file @
3b9105e1
...
...
@@ -13,6 +13,13 @@ exports[`Render should render component 1`] = `
Save & Test
</button>
<button
className="btn btn-success"
onClick={[MockFunction]}
type="submit"
>
Test
</button>
<button
className="btn btn-danger"
disabled={true}
onClick={[MockFunction]}
...
...
public/app/features/datasources/settings/__snapshots__/DataSourceSettingsPage.test.tsx.snap
View file @
3b9105e1
...
...
@@ -97,6 +97,7 @@ exports[`Render should render alpha info text 1`] = `
isReadOnly={false}
onDelete={[Function]}
onSubmit={[Function]}
onTest={[Function]}
/>
</form>
</div>
...
...
@@ -202,6 +203,7 @@ exports[`Render should render beta info text 1`] = `
isReadOnly={false}
onDelete={[Function]}
onSubmit={[Function]}
onTest={[Function]}
/>
</form>
</div>
...
...
@@ -302,6 +304,7 @@ exports[`Render should render component 1`] = `
isReadOnly={false}
onDelete={[Function]}
onSubmit={[Function]}
onTest={[Function]}
/>
</form>
</div>
...
...
@@ -407,6 +410,7 @@ exports[`Render should render is ready only message 1`] = `
isReadOnly={true}
onDelete={[Function]}
onSubmit={[Function]}
onTest={[Function]}
/>
</form>
</div>
...
...
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