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
9e647590
Commit
9e647590
authored
Oct 18, 2018
by
David Kaltschmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Review feedback, increased height
parent
ff67213b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
436 deletions
+14
-436
public/app/features/explore/Explore.tsx
+1
-1
public/app/features/explore/Table.tsx
+4
-3
public/sass/_grafana.scss
+4
-2
public/sass/pages/_explore.scss
+5
-9
public/vendor/css/react-table.css
+0
-421
No files found.
public/app/features/explore/Explore.tsx
View file @
9e647590
...
...
@@ -645,7 +645,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
)
}
{
supportsTable
&&
showingTable
?
(
<
div
className=
"panel-container"
>
<
Table
className=
"m-t-3"
data=
{
tableResult
}
loading=
{
loading
}
onClickCell=
{
this
.
onClickTableCell
}
/>
<
Table
data=
{
tableResult
}
loading=
{
loading
}
onClickCell=
{
this
.
onClickTableCell
}
/>
</
div
>
)
:
null
}
{
supportsLogs
&&
showingLogs
?
<
Logs
data=
{
logsResult
}
loading=
{
loading
}
/>
:
null
}
...
...
public/app/features/explore/Table.tsx
View file @
9e647590
...
...
@@ -7,7 +7,6 @@ import TableModel from 'app/core/table_model';
const
EMPTY_TABLE
=
new
TableModel
();
interface
TableProps
{
className
?:
string
;
data
:
TableModel
;
loading
:
boolean
;
onClickCell
?:
(
columnKey
:
string
,
rowValue
:
string
)
=>
void
;
...
...
@@ -17,7 +16,7 @@ function prepareRows(rows, columnNames) {
return
rows
.
map
(
cells
=>
_
.
zipObject
(
columnNames
,
cells
));
}
export
default
class
Table
extends
PureComponent
<
TableProps
,
{}
>
{
export
default
class
Table
extends
PureComponent
<
TableProps
>
{
getCellProps
=
(
state
,
rowInfo
,
column
)
=>
{
return
{
onClick
:
()
=>
{
...
...
@@ -38,6 +37,7 @@ export default class Table extends PureComponent<TableProps, {}> {
show
:
text
!==
'Time'
,
Cell
:
row
=>
<
span
className=
{
filterable
?
'link'
:
''
}
>
{
row
.
value
}
</
span
>,
}));
const
noDataText
=
data
?
'The queries returned no data for a table.'
:
''
;
return
(
<
ReactTable
...
...
@@ -46,8 +46,9 @@ export default class Table extends PureComponent<TableProps, {}> {
getTdProps=
{
this
.
getCellProps
}
loading=
{
loading
}
minRows=
{
0
}
noDataText=
"No data returned from query."
noDataText=
{
noDataText
}
resolveData=
{
data
=>
prepareRows
(
data
,
columnNames
)
}
showPagination=
{
data
}
/>
);
}
...
...
public/sass/_grafana.scss
View file @
9e647590
// vendor
// DEPENDENCIES
@import
'../../node_modules/react-table/react-table.css'
;
// VENDOR
@import
'../vendor/css/timepicker.css'
;
@import
'../vendor/css/spectrum.css'
;
@import
'../vendor/css/rc-cascader.scss'
;
@import
'../vendor/css/react-table.css'
;
// MIXINS
@import
'mixins/mixins'
;
...
...
public/sass/pages/_explore.scss
View file @
9e647590
...
...
@@ -111,15 +111,6 @@
.link
{
text-decoration
:
underline
;
}
// React table
.explore-table-wrapper
{
margin-top
:
2
*
$panel-margin
;
}
.rt-tr
.rt-td
:last-child
{
text-align
:
right
;
}
}
.explore
+
.explore
{
...
...
@@ -201,6 +192,8 @@
.ReactTable
{
border
:
none
;
// Allow some space for the no-data text
min-height
:
120px
;
}
.ReactTable
.rt-thead.-header
{
...
...
@@ -247,3 +240,6 @@
.ReactTable
.-loading
>
div
{
color
:
$input-color
;
}
.ReactTable
.rt-tr
.rt-td
:last-child
{
text-align
:
right
;
}
public/vendor/css/react-table.css
deleted
100644 → 0
View file @
ff67213b
This diff is collapsed.
Click to expand it.
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