Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

resolve forgotten merge conflict

pull/10616/head
Iris Scholten 2018-02-09 11:52:35 -08:00
parent 5f0ef591ea
commit ee90260d92
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/src/admin/components/chronograf/AdminTabs.js
View File

@ -9,23 +9,13 @@ import {
import {Tab, Tabs, TabPanel, TabPanels, TabList} from 'shared/components/Tabs'
import OrganizationsPage from 'src/admin/containers/chronograf/OrganizationsPage'
import UsersPage from 'src/admin/containers/chronograf/UsersPage'
<<<<<<< HEAD
import ProvidersPage from 'src/admin/containers/ProvidersPage'
||||||| merged common ancestors
=======
import AllUsersPage from 'src/admin/containers/chronograf/AllUsersPage'
>>>>>>> master
const ORGANIZATIONS_TAB_NAME = 'Organizations'
<<<<<<< HEAD
const USERS_TAB_NAME = 'Users'
const PROVIDERS_TAB_NAME = 'Providers'
||||||| merged common ancestors
const USERS_TAB_NAME = 'Users'
=======
const CURRENT_ORG_USERS_TAB_NAME = 'Current Org Users'
const ALL_USERS_TAB_NAME = 'All Users'
>>>>>>> master
const AdminTabs = ({
me: {currentOrganization: meCurrentOrganization, role: meRole, id: meID},
@ -45,20 +35,16 @@ const AdminTabs = ({
<UsersPage meID={meID} meCurrentOrganization={meCurrentOrganization} />
),
},
<<<<<<< HEAD
{
requiredRole: SUPERADMIN_ROLE,
type: PROVIDERS_TAB_NAME,
component: <ProvidersPage />,
},
||||||| merged common ancestors
=======
{
requiredRole: SUPERADMIN_ROLE,
type: ALL_USERS_TAB_NAME,
component: <AllUsersPage meID={meID} />,
},
>>>>>>> master
].filter(t => isUserAuthorized(meRole, t.requiredRole))
return (