Skip to content

Commit cc1c98f

Browse files
committed
namespace detail respect namespace permissions
1 parent 03ca109 commit cc1c98f

File tree

5 files changed

+4
-8
lines changed

5 files changed

+4
-8
lines changed

src/components/collection-detail/collection-dropdown.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,9 @@ export const CollectionDropdown = ({
4242
can_create_signatures,
4343
can_upload_signatures,
4444
display_repositories,
45-
display_signatures,
4645
},
4746
hasPermission,
48-
user: { is_superuser },
47+
user: { is_anonymous, is_superuser },
4948
} = useContext();
5049

5150
const hasObjectPermission = (permission) =>
@@ -56,7 +55,7 @@ export const CollectionDropdown = ({
5655
hasObjectPermission(permission) ||
5756
is_superuser;
5857

59-
const canCopy = display_repositories;
58+
const canCopy = display_repositories && !is_anonymous;
6059
const canDelete =
6160
hasPerm('ansible.delete_collection') || hasPerm('galaxy.change_namespace');
6261
const canDeprecate = hasPerm('galaxy.change_namespace');

src/components/headers/collection-header.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ import {
4646
RepoSelector,
4747
SignAllCertificatesModal,
4848
SignSingleCertificateModal,
49-
StatefulDropdown,
5049
UploadSingCertificateModal,
5150
closeAlertMixin,
5251
} from 'src/components';

src/containers/namespace-detail/namespace-detail.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ export class NamespaceDetail extends React.Component<RouteProps, IState> {
10101010
}
10111011

10121012
private renderCollectionControls(collection: CollectionVersionSearch) {
1013-
const { showControls } = this.state;
1013+
const { namespace, showControls } = this.state;
10141014
const { hasPermission } = this.context;
10151015

10161016
const canUpload = hasPermission('galaxy.upload_to_namespace');
@@ -1036,6 +1036,7 @@ export class NamespaceDetail extends React.Component<RouteProps, IState> {
10361036
dropdownMenu: (
10371037
<CollectionDropdown
10381038
collection={collection}
1039+
namespace={namespace}
10391040
onDelete={() =>
10401041
DeleteCollectionUtils.tryOpenDeleteModalWithConfirm({
10411042
addAlert: (alert) => this.addAlert(alert),

src/containers/search/search.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { t } from '@lingui/macro';
22
import { Button, DataList, Switch } from '@patternfly/react-core';
3-
import cx from 'classnames';
43
import React from 'react';
54
import { Navigate } from 'react-router-dom';
65
import {
@@ -27,7 +26,6 @@ import {
2726
ImportModal,
2827
LoadingPageSpinner,
2928
Pagination,
30-
StatefulDropdown,
3129
closeAlertMixin,
3230
} from 'src/components';
3331
import { Constants } from 'src/constants';

src/utilities/delete-collection.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { Trans, t } from '@lingui/macro';
2-
import { DropdownItem } from '@patternfly/react-core';
32
import React from 'react';
43
import {
54
CollectionAPI,

0 commit comments

Comments
 (0)