fix collections versions list api

pulp · Oct 24, 2024 · f6b840b · f6b840b
1 parent 4a841f8
commit f6b840b
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 78 deletions.
diff --git a/src/actions/ansible-repository-collection-version-add.tsx b/src/actions/ansible-repository-collection-version-add.tsx
@@ -94,24 +94,7 @@ const AddCollectionVersionModal = ({
   };
 
   // @ts-expect-error: TS2525: Initializer provides no value for this binding element and the binding element has no default value.
-  const query = ({ params } = {}) => {
-    const newParams = { ...params };
-    newParams.ordering = newParams.sort;
-    delete newParams.sort;
-
-    return CollectionVersionAPI.list({
-      ...newParams,
-    }).then(
-      ({
-        data: {
-          meta: { count },
-          data: results,
-        },
-      }) => ({
-        data: { count, results },
-      }),
-    );
-  };
+  const query = ({ params } = {}) => CollectionVersionAPI.list(params);
 
   const [modalState, setModalState] = useState({});
 

diff --git a/src/api/collection-version.ts b/src/api/collection-version.ts
@@ -1,9 +1,7 @@
 import { PulpAPI } from './pulp';
 
 const base = new PulpAPI();
-base.sortParam = 'order_by'; // FIXME
 
-// FIXME HubAPI
 export const CollectionVersionAPI = {
   copy: (
     namespace: string,
@@ -12,6 +10,7 @@ export const CollectionVersionAPI = {
     source_base_path: string,
     destination_base_path: string,
   ) =>
+    // FIXME HubAPI
     base.http.post(
       `v3/collections/${namespace}/${name}/versions/${version}/copy/${source_base_path}/${destination_base_path}/`,
       {},
@@ -21,13 +20,13 @@ export const CollectionVersionAPI = {
     base.http.get(`content/ansible/collection_versions/${id}/`),
 
   getUsedDependenciesByCollection: (namespace, collection, params = {}) =>
+    // FIXME HubAPI
     base.list(
       `v3/plugin/ansible/search/collection-versions/?dependency=${namespace}.${collection}`,
       params,
     ),
 
-  list: (params?) =>
-    base.list(`v3/plugin/ansible/search/collection-versions/`, params),
+  list: (params?) => base.list(`content/ansible/collection_versions/`, params),
 
   move: (
     namespace: string,
@@ -36,6 +35,7 @@ export const CollectionVersionAPI = {
     source_base_path: string,
     destination_base_path: string,
   ) =>
+    // FIXME HubAPI
     base.http.post(
       `v3/collections/${namespace}/${name}/versions/${version}/move/${source_base_path}/${destination_base_path}/`,
       {},

diff --git a/src/api/collection.ts b/src/api/collection.ts
@@ -32,7 +32,8 @@ export const CollectionAPI = {
     ),
 
   getContent: (namespace, name, version) =>
-    base.list(`pulp/api/v3/content/ansible/collection_versions/`, {
+    // pulp
+    base.list(`content/ansible/collection_versions/`, {
       namespace,
       name,
       version,
@@ -77,6 +78,7 @@ export const CollectionAPI = {
   }: CollectionVersionSearch): Promise<{ data: { task: string } }> =>
     repositoryBasePath(repository.name, repository.pulp_href).then(
       (distroBasePath) =>
+        // FIXME content/ansible/collection_deprecations/...
         base.http.patch(
           `v3/plugin/ansible/content/${distroBasePath}/collections/index/${namespace}/${name}/`,
           {

diff --git a/src/components/collection-header.tsx b/src/components/collection-header.tsx
@@ -653,8 +653,8 @@ export const CollectionHeader = ({
       ...modalPagination,
     })
       .then(({ data }) => data)
-      .catch(() => ({ data: [] }))
-      .then(({ data: modalCollections }) =>
+      .catch(() => ({ results: [] }))
+      .then(({ results: modalCollections }) =>
         setModalCollections(modalCollections),
       );
   }

diff --git a/src/components/multi-repo-modal.tsx b/src/components/multi-repo-modal.tsx
@@ -51,22 +51,15 @@ export const MultiRepoModal = ({
       page_size: 100,
       ...(pipeline ? { repository_label: pipeline } : {}),
     })
-      .then(
-        ({
-          data: {
-            data,
-            meta: { count },
-          },
-        }) => {
-          setDisabledRepos(data.map(({ repository: { name } }) => name));
-          if (count > 100) {
-            addAlert({
-              variant: 'warning',
-              title: t`The collection exists in too many repositories. Some repositories may not be disabled and preselected correctly.`,
-            });
-          }
-        },
-      )
+      .then(({ data: { results: data, count } }) => {
+        setDisabledRepos(data.map(({ repository: { name } }) => name));
+        if (count > 100) {
+          addAlert({
+            variant: 'warning',
+            title: t`The collection exists in too many repositories. Some repositories may not be disabled and preselected correctly.`,
+          });
+        }
+      })
       .catch(() =>
         addAlert({
           variant: 'danger',

diff --git a/src/containers/ansible-repository/tab-collection-versions.tsx b/src/containers/ansible-repository/tab-collection-versions.tsx
@@ -38,16 +38,9 @@ export const CollectionVersionsTab = ({
     return CollectionVersionAPI.list({
       repository,
       ...newParams,
-    }).then(
-      ({
-        data: {
-          meta: { count },
-          data: results,
-        },
-      }) => ({
-        data: { count, results },
-      }),
-    );
+    }).then(({ data: { count, results } }) => ({
+      data: { count, results },
+    }));
   };
 
   const [modalState, setModalState] = useState({ repository: item });

diff --git a/src/containers/approvals/approvals.tsx b/src/containers/approvals/approvals.tsx
@@ -567,7 +567,7 @@ class Approvals extends Component<RouteProps, IState> {
       repository: parsePulpIDFromURL(repositories.rejected.pulp_href),
       version,
     })
-      .then((result) => !!result.data.meta.count)
+      .then((result) => !!result.data.count)
       .catch(() => false);
   }
 
@@ -587,8 +587,8 @@ class Approvals extends Component<RouteProps, IState> {
     return CollectionVersionAPI.list(updatedParams)
       .then((result) => {
         this.setState({
-          versions: result.data.data,
-          itemCount: result.data.meta.count,
+          versions: result.data.results,
+          itemCount: result.data.count,
         });
         if (handleLoading) {
           this.setState({

diff --git a/src/containers/collection-detail/base.ts b/src/containers/collection-detail/base.ts
@@ -75,8 +75,8 @@ export function loadCollection({
   const currentVersion = (
     version
       ? CollectionVersionAPI.list({ ...requestParams, version })
-      : CollectionVersionAPI.list({ ...requestParams, is_highest: true })
-  ).then(({ data }) => data.data[0]);
+      : CollectionVersionAPI.list({ ...requestParams /* is_highest: true */ })
+  ).then(({ data }) => data.results[0]);
 
   const content = currentVersion
     .then((collection) =>
@@ -97,7 +97,7 @@ export function loadCollection({
     page_size: 10,
   })
     .then(({ data }) => data)
-    .catch(() => ({ data: [], meta: { count: 0 } }));
+    .catch(() => ({ results: [], count: 0 }));
 
   const actuallyCollection = repositoryBasePath(repo)
     .then((basePath) => CollectionAPI.getDetail(basePath, namespace, name))
@@ -110,10 +110,7 @@ export function loadCollection({
     actuallyCollection,
   ]).then(
     ([
-      {
-        data: collections,
-        meta: { count: collectionsCount },
-      },
+      { results: collections, count: collectionsCount },
       collection,
       content,
       actuallyCollection,

diff --git a/src/containers/collection-detail/collection-dependencies.tsx b/src/containers/collection-detail/collection-dependencies.tsx
@@ -230,7 +230,7 @@ class CollectionDependencies extends Component<RouteProps, IState> {
       page_size: 1,
     })
       .then((result) => {
-        const [collection] = result.data.data;
+        const [collection] = result.data.results;
 
         dependency_repo.repo = collection.repository.name;
         dependency_repo.path = formatPath(Paths.ansible.collection.detail, {

diff --git a/src/containers/my-imports/my-imports.tsx b/src/containers/my-imports/my-imports.tsx
@@ -322,9 +322,9 @@ class MyImports extends Component<RouteProps, IState> {
                 version,
               })
                 .then((result) => {
-                  if (result.data.meta.count === 1) {
+                  if (result.data.count === 1) {
                     this.setState({
-                      collection: result.data.data[0],
+                      collection: result.data.results[0],
                     });
                   }
                 })

diff --git a/src/containers/namespace-detail/namespace-detail.tsx b/src/containers/namespace-detail/namespace-detail.tsx
@@ -766,9 +766,9 @@ export class NamespaceDetail extends Component<RouteProps, IState> {
   private loadAllCollections(params) {
     return CollectionVersionAPI.list({
       ...params,
-      is_highest: true,
+      //is_highest: true,
       namespace: this.props.routeParams.namespace,
-      repository_label: '!hide_from_search',
+      //repository_label: '!hide_from_search',
     });
   }
 
@@ -777,8 +777,8 @@ export class NamespaceDetail extends Component<RouteProps, IState> {
       ParamHelper.getReduced(this.state.params, ['tab', 'group', 'user']),
     ).then((result) => {
       this.setState({
-        collections: result.data.data,
-        filteredCount: result.data.meta.count,
+        collections: result.data.results,
+        filteredCount: result.data.count,
       });
     });
   }
@@ -806,9 +806,7 @@ export class NamespaceDetail extends Component<RouteProps, IState> {
         ([
           _collections,
           {
-            data: {
-              meta: { count: unfilteredCount },
-            },
+            data: { count: unfilteredCount },
           },
           { data: namespace },
           //myNamespace,

diff --git a/src/containers/search/multi-search.tsx b/src/containers/search/multi-search.tsx
@@ -85,8 +85,8 @@ const MultiSearch = (props: RouteProps) => {
     const shared = { page_size: 10 };
 
     setCollections(loading);
-    CollectionVersionAPI.list({ ...shared, keywords, is_highest: true })
-      .then(({ data: { data } }) => setCollections(data || []))
+    CollectionVersionAPI.list({ ...shared, keywords /* is_highest: true */ })
+      .then(({ data: { results } }) => setCollections(results || []))
       .catch(
         handleHttpError(
           t`Failed to search collections (${keywords})`,

diff --git a/src/containers/search/search.tsx b/src/containers/search/search.tsx
@@ -476,13 +476,13 @@ class Search extends Component<RouteProps, IState> {
     this.setState({ loading: true }, () => {
       CollectionVersionAPI.list({
         ...ParamHelper.getReduced(this.state.params, ['view_type']),
-        is_deprecated: false,
-        repository_label: '!hide_from_search',
-        is_highest: true,
+        //is_deprecated: false,
+        //repository_label: '!hide_from_search',
+        //is_highest: true,
       }).then((result) => {
         this.setState({
-          collections: result.data.data,
-          count: result.data.meta.count,
+          collections: result.data.results,
+          count: result.data.count,
           loading: false,
         });
       });