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
7f6e9790
Unverified
Commit
7f6e9790
authored
Sep 14, 2020
by
Torkel Ödegaard
Committed by
GitHub
Sep 14, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes typescript issues (#27565)
parent
b37e132c
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
10 deletions
+5
-10
packages/grafana-data/src/types/dataLink.ts
+1
-1
public/app/features/panel/panellinks/link_srv.ts
+1
-1
public/app/plugins/panel/table-old/editor.ts
+2
-2
public/app/plugins/panel/table-old/specs/renderer.test.ts
+1
-1
public/test/mocks/datasource_srv.ts
+0
-5
No files found.
packages/grafana-data/src/types/dataLink.ts
View file @
7f6e9790
...
@@ -6,7 +6,7 @@ import { DataQuery } from './datasource';
...
@@ -6,7 +6,7 @@ import { DataQuery } from './datasource';
*/
*/
export
interface
DataLinkClickEvent
<
T
=
any
>
{
export
interface
DataLinkClickEvent
<
T
=
any
>
{
origin
:
T
;
origin
:
T
;
scopedVars
:
ScopedVars
;
scopedVars
?
:
ScopedVars
;
e
?:
any
;
// mouse|react event
e
?:
any
;
// mouse|react event
}
}
...
...
public/app/features/panel/panellinks/link_srv.ts
View file @
7f6e9790
...
@@ -283,7 +283,7 @@ export class LinkSrv implements LinkService {
...
@@ -283,7 +283,7 @@ export class LinkSrv implements LinkService {
/**
/**
* Returns LinkModel which is basically a DataLink with all values interpolated through the templateSrv.
* Returns LinkModel which is basically a DataLink with all values interpolated through the templateSrv.
*/
*/
getDataLinkUIModel
=
<
T
>
(
link
:
DataLink
,
scopedVars
:
ScopedVars
,
origin
:
T
):
LinkModel
<
T
>
=>
{
getDataLinkUIModel
=
<
T
>
(
link
:
DataLink
,
scopedVars
:
ScopedVars
|
undefined
,
origin
:
T
):
LinkModel
<
T
>
=>
{
const
params
:
KeyValue
=
{};
const
params
:
KeyValue
=
{};
const
timeRangeUrl
=
urlUtil
.
toUrlParams
(
this
.
timeSrv
.
timeRangeForUrl
());
const
timeRangeUrl
=
urlUtil
.
toUrlParams
(
this
.
timeSrv
.
timeRangeForUrl
());
...
...
public/app/plugins/panel/table-old/editor.ts
View file @
7f6e9790
...
@@ -9,8 +9,8 @@ export class TablePanelEditorCtrl {
...
@@ -9,8 +9,8 @@ export class TablePanelEditorCtrl {
fontSizes
:
any
;
fontSizes
:
any
;
addColumnSegment
:
any
;
addColumnSegment
:
any
;
getColumnNames
:
any
;
getColumnNames
:
any
;
canSetColumns
:
boolean
;
canSetColumns
=
false
;
columnsHelpMessage
:
string
;
columnsHelpMessage
=
''
;
/** @ngInject */
/** @ngInject */
constructor
(
$scope
:
any
,
private
uiSegmentSrv
:
any
)
{
constructor
(
$scope
:
any
,
private
uiSegmentSrv
:
any
)
{
...
...
public/app/plugins/panel/table-old/specs/renderer.test.ts
View file @
7f6e9790
...
@@ -477,7 +477,7 @@ describe('when rendering table with different patterns', () => {
...
@@ -477,7 +477,7 @@ describe('when rendering table with different patterns', () => {
});
});
describe
(
'when rendering cells with different alignment options'
,
()
=>
{
describe
(
'when rendering cells with different alignment options'
,
()
=>
{
const
cases
=
[
const
cases
:
Array
<
[
string
,
boolean
,
string
|
null
,
string
]
>
=
[
//align, preserve fmt, color mode, expected
//align, preserve fmt, color mode, expected
[
''
,
false
,
null
,
'<td>42</td>'
],
[
''
,
false
,
null
,
'<td>42</td>'
],
[
'invalid_option'
,
false
,
null
,
'<td>42</td>'
],
[
'invalid_option'
,
false
,
null
,
'<td>42</td>'
],
...
...
public/test/mocks/datasource_srv.ts
View file @
7f6e9790
...
@@ -25,7 +25,6 @@ export class DatasourceSrvMock {
...
@@ -25,7 +25,6 @@ export class DatasourceSrvMock {
export
class
MockDataSourceApi
extends
DataSourceApi
{
export
class
MockDataSourceApi
extends
DataSourceApi
{
result
:
DataQueryResponse
=
{
data
:
[]
};
result
:
DataQueryResponse
=
{
data
:
[]
};
queryResolver
:
Promise
<
DataQueryResponse
>
;
constructor
(
name
?:
string
,
result
?:
DataQueryResponse
,
meta
?:
any
,
private
error
:
string
|
null
=
null
)
{
constructor
(
name
?:
string
,
result
?:
DataQueryResponse
,
meta
?:
any
,
private
error
:
string
|
null
=
null
)
{
super
({
name
:
name
?
name
:
'MockDataSourceApi'
}
as
DataSourceInstanceSettings
);
super
({
name
:
name
?
name
:
'MockDataSourceApi'
}
as
DataSourceInstanceSettings
);
...
@@ -37,10 +36,6 @@ export class MockDataSourceApi extends DataSourceApi {
...
@@ -37,10 +36,6 @@ export class MockDataSourceApi extends DataSourceApi {
}
}
query
(
request
:
DataQueryRequest
):
Promise
<
DataQueryResponse
>
{
query
(
request
:
DataQueryRequest
):
Promise
<
DataQueryResponse
>
{
if
(
this
.
queryResolver
)
{
return
this
.
queryResolver
;
}
if
(
this
.
error
)
{
if
(
this
.
error
)
{
return
Promise
.
reject
(
this
.
error
);
return
Promise
.
reject
(
this
.
error
);
}
}
...
...
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