Skip to content
This repository was archived by the owner on Apr 18, 2023. It is now read-only.

ui: Hide organization settings when user is not admin #161

Open
jonathankingfc wants to merge 3 commits into
base: main
Choose a base branch
from
Open

ui: Hide organization settings when user is not admin #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7de5bdd
ui: Hide organization settings when user is not admin
jonathankingfc Dec 16, 2022
60db721
Merge branch 'main' into hide_settings_for_non_admin
jonathankingfc Apr 17, 2023
4300305
add visibility for robot accounts
jonathankingfc Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/resources/OrganizationResource.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export interface IOrganization {
can_create_repo?: boolean;
public?: boolean;
is_org_admin?: boolean;
is_admin?: boolean;
preferred_namespace?: boolean;
teams?: string[];
}
Expand Down
26 changes: 17 additions & 9 deletions src/routes/OrganizationsList/Organization/Organization.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@ import {useCallback, useState} from 'react';
import RepositoriesList from 'src/routes/RepositoriesList/RepositoriesList';
import Settings from './Tabs/Settings/Settings';
import {QuayBreadcrumb} from 'src/components/breadcrumb/Breadcrumb';
import {useOrganization} from 'src/hooks/UseOrganization';
import RobotAccountsList from 'src/routes/RepositoriesList/RobotAccountsList';

export default function Organization() {
const location = useLocation();
const orgName = location.pathname.split('/')[2];
const [searchParams, setSearchParams] = useSearchParams();

const {organization} = useOrganization(repositoryName);

const [activeTabKey, setActiveTabKey] = useState<string>(
searchParams.get('tab') || 'Repositories',
);
Expand All @@ -35,14 +38,17 @@ export default function Organization() {
{
name: 'Repositories',
component: <RepositoriesList />,
visible: true,
},
{
name: 'Robot accounts',
component: <RobotAccountsList orgName={orgName} />,
visible: organization.is_org_admin || organization.is_admin,
},
{
name: 'Settings',
component: <Settings />,
visible: organization.is_org_admin || organization.is_admin,
},
];

Expand All @@ -62,15 +68,17 @@ export default function Organization() {
padding={{default: 'noPadding'}}
>
<Tabs activeKey={activeTabKey} onSelect={onTabSelect}>
{repositoriesSubNav.map((nav) => (
<Tab
key={nav.name}
eventKey={nav.name}
title={<TabTitleText>{nav.name}</TabTitleText>}
>
{nav.component}
</Tab>
))}
{repositoriesSubNav.map((nav) => {
nav.visible && (
<Tab
key={nav.name}
eventKey={nav.name}
title={<TabTitleText>{nav.name}</TabTitleText>}
>
{nav.component}
</Tab>
);
})}
</Tabs>
</PageSection>
</Page>
Expand Down