Namespace detail - fix Sign all

CHANGES/2308.bug

@@ -0,0 +1 @@
+Namespace detail: sign all collections only signs current repo now

src/api/collection.ts

@@ -19,7 +19,8 @@ export function findDistroBasePathByRepo(distributions, repository) {
   const distro = distributions.find(
     (distro) => distro.name === repository.name,
   );
-  return distro ? distro.base_path : distro[0].base_path;
+
+  return distro ? distro.base_path : distributions[0].base_path;
 }
 
 function filterContents(contents) {

src/api/sign-collections.ts

@@ -1,13 +1,15 @@
+import { t } from '@lingui/macro';
 import {
   AnsibleDistributionAPI,
+  AnsibleRepositoryAPI,
   CollectionVersionSearch,
-  findDistroBasePathByRepo,
 } from 'src/api';
 import { HubAPI } from './hub';
 
 interface SignNamespace {
   signing_service?: string;
-  repository: CollectionVersionSearch['repository'];
+  repository?: CollectionVersionSearch['repository'];
+  repository_name?: string;
   namespace: string;
 }
 
@@ -24,19 +26,35 @@ type SignProps = SignNamespace | SignCollection | SignVersion;
 class API extends HubAPI {
   apiPath = this.getUIPath('collection_signing/');
 
-  async sign(data: SignProps) {
-    const { repository, ...args } = data;
-    const distros = await AnsibleDistributionAPI.list({
-      repository: repository.pulp_href,
-    });
+  async sign({ repository, repository_name: name, ...args }: SignProps) {
+    if (!repository && name) {
+      repository = (await AnsibleRepositoryAPI.list({ name }))?.data
+        ?.results?.[0];
 
-    const distroBasePath = findDistroBasePathByRepo(
-      distros.data.results,
-      repository,
-    );
+      if (!repository) {
+        return Promise.reject({
+          response: { status: t`Failed to find repository ${name}` },
+        });
+      }
+    }
+
+    const distribution = (
+      await AnsibleDistributionAPI.list({
+        repository: repository?.pulp_href,
+      })
+    )?.data?.results?.[0];
+
+    if (!distribution) {
+      const name = repository.name;
+      return Promise.reject({
+        response: {
+          status: t`Failed to find a distribution for repository ${name}`,
+        },
+      });
+    }
 
     const updatedData = {
-      distro_base_path: distroBasePath,
+      distro_base_path: distribution.base_path,
       ...args,
     };
 

src/components/collection-list/collection-filter.tsx

@@ -124,11 +124,11 @@ export const CollectionFilter = (props: IProps) => {
             <ToolbarItem>
               <AppliedFilters
                 niceNames={{
-                  is_signed: t`sign state`,
-                  tags: t`tags`,
-                  keywords: t`keywords`,
-                  repository_name: t`repository`,
-                  namespace: t`namespace`,
+                  is_signed: t`Sign state`,
+                  tags: t`Tags`,
+                  keywords: t`Keywords`,
+                  repository_name: t`Repository`,
+                  namespace: t`Namespace`,
                 }}
                 niceValues={{
                   is_signed: {

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

@@ -108,6 +108,9 @@ export class NamespaceDetail extends React.Component<RouteProps, IState> {
     ]);
 
     params['namespace'] = props.routeParams.namespace;
+    if (props.routeParams.repo && !params['repository_name']) {
+      params['repository_name'] = props.routeParams.repo;
+    }
 
     this.state = {
       canSign: false,
@@ -147,19 +150,29 @@ export class NamespaceDetail extends React.Component<RouteProps, IState> {
   }
 
   componentDidUpdate(prevProps) {
-    if (prevProps.location.search !== this.props.location.search) {
-      const params = ParamHelper.parseParamString(this.props.location.search, [
-        'page',
-        'page_size',
-      ]);
+    const params = ParamHelper.parseParamString(this.props.location.search, [
+      'page',
+      'page_size',
+    ]);
 
+    if (prevProps.location.search !== this.props.location.search) {
       params['namespace'] = this.props.routeParams.namespace;
 
       this.setState({
         params,
         group: this.filterGroup(params['group'], this.state.namespace.groups),
       });
     }
+
+    if (
+      prevProps.routeParams.repo !== this.props.routeParams.repo &&
+      this.props.routeParams.repo &&
+      (!params['repository_name'] ||
+        params['repository_name'] === prevProps.routeParams.repo)
+    ) {
+      params['repository_name'] = this.props.routeParams.repo;
+      this.setState({ params });
+    }
   }
 
   filterGroup(groupId, groups) {
@@ -275,7 +288,6 @@ export class NamespaceDetail extends React.Component<RouteProps, IState> {
 
     const ignoredParams = [
       'namespace',
-      'repository__name',
       'page',
       'page_size',
       'sort',
@@ -295,6 +307,8 @@ export class NamespaceDetail extends React.Component<RouteProps, IState> {
     const tabParams = { ...params };
     delete tabParams.group;
 
+    const repository = params['repository_name'] || null;
+
     return (
       <React.Fragment>
         <AlertList alerts={alerts} closeAlert={(i) => this.closeAlert(i)} />
@@ -555,12 +569,8 @@ export class NamespaceDetail extends React.Component<RouteProps, IState> {
           <SignAllCertificatesModal
             name={this.state.namespace.name}
             isOpen={this.state.isOpenSignModal}
-            onSubmit={() => {
-              this.signAllCertificates(namespace);
-            }}
-            onCancel={() => {
-              this.setState({ isOpenSignModal: false });
-            }}
+            onSubmit={() => this.signAllCertificates(namespace, repository)}
+            onCancel={() => this.setState({ isOpenSignModal: false })}
           />
         )}
       </React.Fragment>
@@ -626,38 +636,32 @@ export class NamespaceDetail extends React.Component<RouteProps, IState> {
     );
   }
 
-  private signAllCertificates(namespace: NamespaceType) {
-    // get the repository from first collection
-    // all collections are in same repo, so this should be fine.
-    const [collection] = this.state.collections;
-
+  private signAllCertificates(namespace: NamespaceType, repository: string) {
     const errorAlert = (status: string | number = 500): AlertType => ({
       variant: 'danger',
       title: t`Failed to sign all collections.`,
       description: t`API Error: ${status}`,
     });
 
-    this.setState({
-      alerts: [
-        ...this.state.alerts,
-        {
-          id: 'loading-signing',
-          variant: 'success',
-          title: t`Signing started for all collections in namespace "${namespace.name}".`,
-        },
-      ],
-      isOpenSignModal: false,
-    });
-
-    const { name } = collection.collection_version;
-
     SignCollectionAPI.sign({
       signing_service: this.context.settings.GALAXY_COLLECTION_SIGNING_SERVICE,
-      repository: collection.repository,
+      repository_name: repository,
       namespace: namespace.name,
-      collection: name,
     })
       .then((result) => {
+        // FIXME: use taskAlert
+        this.setState({
+          alerts: [
+            ...this.state.alerts,
+            {
+              id: 'loading-signing',
+              variant: 'success',
+              title: t`Signing started for all collections in namespace "${namespace.name}".`,
+            },
+          ],
+          isOpenSignModal: false,
+        });
+
         waitForTask(result.data.task_id)
           .then(() => {
             this.load();
@@ -679,6 +683,7 @@ export class NamespaceDetail extends React.Component<RouteProps, IState> {
         // The request failed in the first place
         this.setState({
           alerts: [...this.state.alerts, errorAlert(error.response.status)],
+          isOpenSignModal: false,
         });
       });
   }
@@ -762,6 +767,7 @@ export class NamespaceDetail extends React.Component<RouteProps, IState> {
     const { can_upload_signatures } = this.context.featureFlags;
     const { ai_deny_index } = this.context.featureFlags;
     const { hasPermission } = this.context;
+    const repository = this.state.params['repository_name'] || null;
 
     const dropdownItems = [
       <DropdownItem
@@ -819,15 +825,23 @@ export class NamespaceDetail extends React.Component<RouteProps, IState> {
       />,
       canSign &&
         !can_upload_signatures &&
-        this.state.collections.length >= 1 && (
+        (repository ? (
           <DropdownItem
             key='sign-collections'
             data-cy='sign-all-collections-button'
             onClick={() => this.setState({ isOpenSignModal: true })}
+          >
+            {t`Sign all collections in ${repository}`}
+          </DropdownItem>
+        ) : (
+          <DropdownItem
+            key='sign-collections'
+            isDisabled
+            description={t`Please select a repository filter`}
           >
             {t`Sign all collections`}
           </DropdownItem>
-        ),
+        )),
       ai_deny_index && (
         <DropdownItem
           key='wisdom-settings'