diff --git a/src/pages/Organizations/components/OrganizationDetail.jsx b/src/pages/Organizations/components/OrganizationDetail.jsx index 458ae73736..159030c8de 100644 --- a/src/pages/Organizations/components/OrganizationDetail.jsx +++ b/src/pages/Organizations/components/OrganizationDetail.jsx @@ -18,7 +18,7 @@ import getTabName from '../utils'; import '../tabs.scss'; -const DetailTab = ({ location, match, tab, currentTab, children, breadcrumb }) => { +const Tab = ({ location, match, tab, currentTab, children, breadcrumb }) => { const tabClasses = () => { let classes = 'pf-c-tabs__item'; if (tab === currentTab) { @@ -93,13 +93,13 @@ const OrganizationDetail = ({ ); - const detailTabs = (tabs) => ( + const tabList = (tabs) => ( {({ i18n }) => (
@@ -120,7 +120,7 @@ const OrganizationDetail = ({ - {detailTabs(['details', 'users', 'teams', 'admins', 'notifications'])} + {tabList(['details', 'access', 'teams', 'notifications'])} {(currentTab && currentTab !== 'details') ? ( diff --git a/src/pages/Organizations/components/OrganizationListItem.jsx b/src/pages/Organizations/components/OrganizationListItem.jsx index d28f158126..161b8274a2 100644 --- a/src/pages/Organizations/components/OrganizationListItem.jsx +++ b/src/pages/Organizations/components/OrganizationListItem.jsx @@ -14,7 +14,6 @@ export default ({ name, userCount, teamCount, - adminCount, isSelected, onSelect, detailUrl, @@ -46,7 +45,7 @@ export default ({
- + Users @@ -62,14 +61,6 @@ export default ({ {teamCount} {' '} - - Admins - - - {' '} - {adminCount} - {' '} -
diff --git a/src/pages/Organizations/utils.jsx b/src/pages/Organizations/utils.jsx index 4db8f0627d..154faeb383 100644 --- a/src/pages/Organizations/utils.jsx +++ b/src/pages/Organizations/utils.jsx @@ -2,12 +2,10 @@ const getTabName = (tab) => { let tabName = ''; if (tab === 'details') { tabName = 'Details'; - } else if (tab === 'users') { - tabName = 'Users'; + } else if (tab === 'access') { + tabName = 'Access'; } else if (tab === 'teams') { tabName = 'Teams'; - } else if (tab === 'admins') { - tabName = 'Admins'; } else if (tab === 'notifications') { tabName = 'Notifications'; } diff --git a/src/pages/Organizations/views/Organizations.list.jsx b/src/pages/Organizations/views/Organizations.list.jsx index 6c3715d999..5784f7f3b8 100644 --- a/src/pages/Organizations/views/Organizations.list.jsx +++ b/src/pages/Organizations/views/Organizations.list.jsx @@ -225,7 +225,6 @@ class Organizations extends Component { parentBreadcrumb={parentBreadcrumb} userCount={o.summary_fields.related_field_counts.users} teamCount={o.summary_fields.related_field_counts.teams} - adminCount={o.summary_fields.related_field_counts.admins} isSelected={selected.includes(o.id)} onSelect={() => this.onSelect(o.id)} />