Update tab content and related badge links

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 = ({
     </Fragment>
   );
 
-  const detailTabs = (tabs) => (
+  const tabList = (tabs) => (
     <I18n>
       {({ i18n }) => (
         <div className="pf-c-tabs" aria-label={i18n._(t`Organization detail tabs`)}>
           <ul className="pf-c-tabs__list">
             {tabs.map(tab => (
-              <DetailTab
+              <Tab
                 key={tab}
                 tab={tab}
                 location={location}
@@ -108,7 +108,7 @@ const OrganizationDetail = ({
                 breadcrumb={parentBreadcrumbObj}
               >
                 {getTabName(tab)}
-              </DetailTab>
+              </Tab>
             ))}
           </ul>
         </div>
@@ -120,7 +120,7 @@ const OrganizationDetail = ({
     <PageSection variant={medium}>
       <Card className="at-c-orgPane">
         <CardHeader>
-          {detailTabs(['details', 'users', 'teams', 'admins', 'notifications'])}
+          {tabList(['details', 'access', 'teams', 'notifications'])}
         </CardHeader>
         <CardBody>
           {(currentTab && currentTab !== 'details') ? (

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 ({
       </span>
     </div>
     <div className="pf-c-data-list__cell">
-      <Link to={`${detailUrl}?tab=users`}>
+      <Link to={`${detailUrl}?tab=access`}>
         <Trans>Users</Trans>
       </Link>
       <Badge isRead>
@@ -62,14 +61,6 @@ export default ({
         {teamCount}
         {' '}
       </Badge>
-      <Link to={`${detailUrl}?tab=admins`}>
-        <Trans>Admins</Trans>
-      </Link>
-      <Badge isRead>
-        {' '}
-        {adminCount}
-        {' '}
-      </Badge>
     </div>
     <div className="pf-c-data-list__cell" />
   </li>

src/pages/Organizations/utils.jsx

@@ -2,12 +2,10 @@ const getTabName = (tab) => {
   let tabName = '';
   if (tab === 'details') {
     tabName = 'Details';
-  } else if (tab === 'users') {
+  } else if (tab === 'access') {
-    tabName = 'Users';
+    tabName = 'Access';
   } else if (tab === 'teams') {
     tabName = 'Teams';
-  } else if (tab === 'admins') {
-    tabName = 'Admins';
   } else if (tab === 'notifications') {
     tabName = 'Notifications';
   }

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)}
                   />