From dcd192d5249e77ccb99c09c86a3a0475172e2bc1 Mon Sep 17 00:00:00 2001 From: Sunandadadi Date: Wed, 3 May 2023 16:56:44 -0400 Subject: [PATCH] UI: Using organizationName variable and using isHidden to hide tabs (PROJQUAY-4553) (#1862) * UI: Using organizationName variable and using isHidden to hide tabs (PROJQUAY-4553) * replacing visible with hidden for uniformity --- .../Organization/Organization.tsx | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/web/src/routes/OrganizationsList/Organization/Organization.tsx b/web/src/routes/OrganizationsList/Organization/Organization.tsx index ac1421783..feb67b6ca 100644 --- a/web/src/routes/OrganizationsList/Organization/Organization.tsx +++ b/web/src/routes/OrganizationsList/Organization/Organization.tsx @@ -20,7 +20,7 @@ export default function Organization() { const {organizationName} = useParams(); const [searchParams, setSearchParams] = useSearchParams(); - const {organization} = useOrganization(orgName) + const {organization} = useOrganization(organizationName); const [activeTabKey, setActiveTabKey] = useState( searchParams.get('tab') || 'Repositories', @@ -38,18 +38,18 @@ export default function Organization() { { name: 'Repositories', component: , - visible: true, + hidden: false, }, { name: 'Robot accounts', component: , - visible: organization.is_org_admin || organization.is_admin, + hidden: !(organization.is_org_admin || organization.is_admin), }, { name: 'Settings', component: , - visible: organization.is_org_admin || organization.is_admin, + hidden: !(organization.is_org_admin || organization.is_admin), }, ]; @@ -69,17 +69,16 @@ export default function Organization() { padding={{default: 'noPadding'}} > - {repositoriesSubNav.map((nav) => { - nav.visible && ( - {nav.name}} - > - {nav.component} - - ); - })} + {repositoriesSubNav.map((nav) => ( + {nav.name}} + isHidden={nav.hidden} + > + {nav.component} + + ))}