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
d426981d
Commit
d426981d
authored
Jan 14, 2019
by
Johannes Schill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: Add Pages component to Plugins and TeamList
parent
b2961a4b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
25 deletions
+25
-25
public/app/features/plugins/PluginListPage.tsx
+18
-19
public/app/features/teams/TeamList.tsx
+7
-6
No files found.
public/app/features/plugins/PluginListPage.tsx
View file @
d426981d
import
React
,
{
PureComponent
}
from
'react'
;
import
{
hot
}
from
'react-hot-loader'
;
import
{
connect
}
from
'react-redux'
;
import
Page
Header
from
'app/core/components/PageHeader/PageHeader
'
;
import
Page
from
'app/core/components/Page/Page
'
;
import
OrgActionBar
from
'app/core/components/OrgActionBar/OrgActionBar'
;
import
PageLoader
from
'app/core/components/PageLoader/PageLoader'
;
import
PluginList
from
'./PluginList'
;
import
{
NavModel
,
Plugin
}
from
'app/types'
;
import
{
loadPlugins
,
setPluginsLayoutMode
,
setPluginsSearchQuery
}
from
'./state/actions'
;
...
...
@@ -48,23 +47,23 @@ export class PluginListPage extends PureComponent<Props> {
};
return
(
<
div
>
<
PageHeader
model=
{
navModel
}
/>
<
div
className=
"page-container page-body"
>
<
OrgActionBar
searchQuery=
{
searchQuery
}
layoutMode=
{
layoutMode
}
onSetLayoutMode=
{
mode
=>
setPluginsLayoutMode
(
mode
)
}
setSearchQuery=
{
query
=>
setPluginsSearchQuery
(
query
)
}
linkButton=
{
linkButton
}
/>
{
hasFetched
?
(
plugins
&&
<
PluginList
plugins=
{
plugins
}
layoutMode=
{
layoutMode
}
/>
)
:
(
<
PageLoader
pageName=
"Plugins"
/>
)
}
</
div
>
</
div
>
<
Page
title=
"Configuration: Plugins"
>
<
Page
.
Header
model=
{
navModel
}
/>
<
Page
.
Contents
isLoading=
{
!
hasFetched
}
>
<
>
<
OrgActionBar
searchQuery=
{
searchQuery
}
layoutMode=
{
layoutMode
}
onSetLayoutMode=
{
mode
=>
setPluginsLayoutMode
(
mode
)
}
setSearchQuery=
{
query
=>
setPluginsSearchQuery
(
query
)
}
linkButton=
{
linkButton
}
/>
{
hasFetched
&&
plugins
&&
(
plugins
&&
<
PluginList
plugins=
{
plugins
}
layoutMode=
{
layoutMode
}
/>
)
}
</>
</
Page
.
Contents
>
</
Page
>
);
}
}
...
...
public/app/features/teams/TeamList.tsx
View file @
d426981d
import
React
,
{
PureComponent
}
from
'react'
;
import
{
connect
}
from
'react-redux'
;
import
{
hot
}
from
'react-hot-loader'
;
import
Page
Header
from
'app/core/components/PageHeader/PageHeader
'
;
import
Page
from
'app/core/components/Page/Page
'
;
import
{
DeleteButton
}
from
'@grafana/ui'
;
import
EmptyListCTA
from
'app/core/components/EmptyListCTA/EmptyListCTA'
;
import
PageLoader
from
'app/core/components/PageLoader/PageLoader'
;
import
{
NavModel
,
Team
}
from
'../../types'
;
import
{
loadTeams
,
deleteTeam
,
setSearchQuery
}
from
'./state/actions'
;
import
{
getSearchQuery
,
getTeams
,
getTeamsCount
}
from
'./state/selectors'
;
...
...
@@ -141,10 +140,12 @@ export class TeamList extends PureComponent<Props, any> {
const
{
hasFetched
,
navModel
}
=
this
.
props
;
return
(
<
div
>
<
PageHeader
model=
{
navModel
}
/>
{
hasFetched
?
this
.
renderList
()
:
<
PageLoader
pageName=
"Teams"
/>
}
</
div
>
<
Page
title=
"Configuration: Teams"
>
<
Page
.
Header
model=
{
navModel
}
/>
<
Page
.
Contents
isLoading=
{
!
hasFetched
}
>
{
hasFetched
&&
this
.
renderList
()
}
</
Page
.
Contents
>
</
Page
>
);
}
}
...
...
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