Skip to content

Commit d389a25

Browse files
committed
add signing service error check
Issue: AAH-2255
1 parent 3d08a04 commit d389a25

File tree

2 files changed

+25
-14
lines changed

2 files changed

+25
-14
lines changed

src/components/copy-collection-to-repository-modal/copy-collection-to-repository-modal.tsx

+15-5
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,21 @@ export const CopyCollectionToRepositoryModal = (props: IProps) => {
124124
const signingServiceName =
125125
context.settings.GALAXY_COLLECTION_SIGNING_SERVICE;
126126

127-
const signingList = await SigningServiceAPI.list({
128-
name: signingServiceName,
129-
});
130-
131-
const signingService = signingList.data.results[0].pulp_href;
127+
let signingService = null;
128+
try {
129+
const signingList = await SigningServiceAPI.list({
130+
name: signingServiceName,
131+
});
132+
signingService = signingList.data.results[0].pulp_href;
133+
} catch {
134+
setLoading(false);
135+
props.addAlert({
136+
title: t`Failed to copy collection version.`,
137+
variant: 'danger',
138+
description: t`Signing service ${signingServiceName} not found`,
139+
});
140+
return;
141+
}
132142

133143
const repoHrefs = repositoryList
134144
.filter((repo) => selectedRepos.includes(repo.name))

src/components/headers/collection-header.tsx

+10-9
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ export class CollectionHeader extends React.Component<IProps, IState> {
197197

198198
const latestVersion = collection.collection_version.pulp_created;
199199

200-
const { display_signatures, can_upload_signatures } =
200+
const { display_signatures, can_upload_signatures, display_repositories } =
201201
this.context.featureFlags;
202202

203203
const signedString = () => {
@@ -216,7 +216,6 @@ export class CollectionHeader extends React.Component<IProps, IState> {
216216
: ''
217217
}`;
218218
};
219-
220219
const { collection_version, namespace_metadata: namespace } = collection;
221220
const { name: collectionName, version } = collection_version;
222221

@@ -287,13 +286,15 @@ export class CollectionHeader extends React.Component<IProps, IState> {
287286
>
288287
{t`Upload new version`}
289288
</DropdownItem>,
290-
<DropdownItem
291-
key='copy-collection-version-to-repository-dropdown'
292-
onClick={() => this.copyToRepository(collection)}
293-
data-cy='copy-collection-version-to-repository-dropdown'
294-
>
295-
{t`Copy version ${version} to repositories`}
296-
</DropdownItem>,
289+
display_repositories && (
290+
<DropdownItem
291+
key='copy-collection-version-to-repository-dropdown'
292+
onClick={() => this.copyToRepository(collection)}
293+
data-cy='copy-collection-version-to-repository-dropdown'
294+
>
295+
{t`Copy version ${version} to repositories`}
296+
</DropdownItem>
297+
),
297298
].filter(Boolean);
298299

299300
const issueUrl =

0 commit comments

Comments
 (0)