From 771dd371daf702acbce778fb7dc4186b440a6c90 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Mon, 26 Jun 2023 10:07:21 -0400
Subject: [PATCH 01/30] update ns type interface

---
 frontend/hub/namespaces/HubNamespace.tsx | 33 +++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/frontend/hub/namespaces/HubNamespace.tsx b/frontend/hub/namespaces/HubNamespace.tsx
index dc7d3f8152..d0d0215a7e 100644
--- a/frontend/hub/namespaces/HubNamespace.tsx
+++ b/frontend/hub/namespaces/HubNamespace.tsx
@@ -1,17 +1,44 @@
+export interface LinksType {
+  name: string;
+  url: string;
+}
+
+export interface LatestMetadataType {
+  pulp_href: string;
+  name: string;
+  company: string;
+  email: string;
+  description: string;
+  resources: string;
+  links: LinksType[];
+  avatar_sha256: string | null;
+  avatar_url: string | null;
+  metadata_sha256: string;
+  groups: string[];
+  task: string | null;
+}
+
 export interface HubNamespace {
   pulp_href: string;
+  pulp_created: string;
   id: number;
   name: string;
   company: string;
   email: string;
   avatar_url: string;
   description: string;
+  num_collections: number;
   groups: [
     {
       id: number;
       name: string;
-      object_roles: string[];
-    },
+      object_permissions: string[];
+      pulp_href?: string;
+    }
   ];
-  related_fields: object;
+  resources: string;
+  owners: string[];
+  links: LinksType[];
+  my_permissions: string[];
+  latest_metadata: LatestMetadataType;
 }

From e3b3a24231c858f383432585ea2a0081b4171cc9 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Mon, 26 Jun 2023 10:09:54 -0400
Subject: [PATCH 02/30] implement new api for list view.

---
 frontend/hub/namespaces/HubNamespaces.tsx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/frontend/hub/namespaces/HubNamespaces.tsx b/frontend/hub/namespaces/HubNamespaces.tsx
index 05d1bbbb96..42a7cf8d60 100644
--- a/frontend/hub/namespaces/HubNamespaces.tsx
+++ b/frontend/hub/namespaces/HubNamespaces.tsx
@@ -2,13 +2,12 @@ import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import { PageHeader, PageLayout, PageTab, PageTable, PageTabs } from '../../../framework';
 import { RouteObj } from '../../Routes';
-import { useHubView } from '../useHubView';
+import { idKeyFn, usePulpView } from '../usePulpView';
 import { HubNamespace } from './HubNamespace';
 import { useHubNamespaceActions } from './hooks/useHubNamespaceActions';
 import { useHubNamespaceFilters } from './hooks/useHubNamespaceFilters';
 import { useHubNamespaceToolbarActions } from './hooks/useHubNamespaceToolbarActions';
 import { useHubNamespacesColumns } from './hooks/useHubNamespacesColumns';
-import { hubAPI } from '../api/utils';
 import { idKeyFn } from '../../common/utils/nameKeyFn';
 
 export function Namespaces() {
@@ -44,11 +43,13 @@ export function Namespaces() {
 }
 
 export function AllNamespaces() {
-  return <CommonNamespaces url={hubAPI`/_ui/v1/namespaces/`} />;
+  return <CommonNamespaces url="/api/automation-hub/pulp/api/v3/pulp_ansible/namespaces/" />;
 }
 
 export function MyNamespaces() {
-  return <CommonNamespaces url={hubAPI`/_ui/v1/my-namespaces/`} />;
+  return (
+    <CommonNamespaces url="/api/automation-hub/pulp/api/v3/pulp_ansible/namespaces/?my_permissions=ansible.change_ansiblenamespace" />
+  );
 }
 
 export function CommonNamespaces({ url }: { url: string }) {
@@ -58,7 +59,7 @@ export function CommonNamespaces({ url }: { url: string }) {
   const tableColumns = useHubNamespacesColumns();
   const toolbarActions = useHubNamespaceToolbarActions();
   const rowActions = useHubNamespaceActions();
-  const view = useHubView<HubNamespace>({ url, keyFn: idKeyFn, toolbarFilters, tableColumns });
+  const view = usePulpView<HubNamespace>({ url, keyFn: idKeyFn, toolbarFilters, tableColumns });
   return (
     <PageTable<HubNamespace>
       toolbarFilters={toolbarFilters}

From d072c9b119aeb8206c3fa8f3536a77aecb3e8011 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Mon, 26 Jun 2023 10:29:14 -0400
Subject: [PATCH 03/30] fix icontains filter

---
 frontend/hub/namespaces/hooks/useHubNamespaceFilters.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/hub/namespaces/hooks/useHubNamespaceFilters.tsx b/frontend/hub/namespaces/hooks/useHubNamespaceFilters.tsx
index 6ed6c1be6e..e363ac3878 100644
--- a/frontend/hub/namespaces/hooks/useHubNamespaceFilters.tsx
+++ b/frontend/hub/namespaces/hooks/useHubNamespaceFilters.tsx
@@ -7,10 +7,10 @@ export function useHubNamespaceFilters() {
   const toolbarFilters = useMemo<IToolbarFilter[]>(
     () => [
       {
-        key: 'keywords',
+        key: 'name__icontains',
         label: t('Name'),
-        type: ToolbarFilterType.Text,
-        query: 'keywords',
+        type: 'string',
+        query: 'name__icontains',
         comparison: 'contains',
       },
     ],

From 2579075f41143f50d2b5999d6ebd59d611904fc9 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Mon, 26 Jun 2023 11:00:18 -0400
Subject: [PATCH 04/30] rebase

---
 frontend/hub/namespaces/HubNamespaces.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/hub/namespaces/HubNamespaces.tsx b/frontend/hub/namespaces/HubNamespaces.tsx
index 42a7cf8d60..7ea8585054 100644
--- a/frontend/hub/namespaces/HubNamespaces.tsx
+++ b/frontend/hub/namespaces/HubNamespaces.tsx
@@ -2,7 +2,7 @@ import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import { PageHeader, PageLayout, PageTab, PageTable, PageTabs } from '../../../framework';
 import { RouteObj } from '../../Routes';
-import { idKeyFn, usePulpView } from '../usePulpView';
+import { usePulpView } from '../usePulpView';
 import { HubNamespace } from './HubNamespace';
 import { useHubNamespaceActions } from './hooks/useHubNamespaceActions';
 import { useHubNamespaceFilters } from './hooks/useHubNamespaceFilters';
@@ -59,6 +59,7 @@ export function CommonNamespaces({ url }: { url: string }) {
   const tableColumns = useHubNamespacesColumns();
   const toolbarActions = useHubNamespaceToolbarActions();
   const rowActions = useHubNamespaceActions();
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
   const view = usePulpView<HubNamespace>({ url, keyFn: idKeyFn, toolbarFilters, tableColumns });
   return (
     <PageTable<HubNamespace>

From 4c34801c1fdc7f46d877add2d193663bae7d6597 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Mon, 26 Jun 2023 13:55:47 -0400
Subject: [PATCH 05/30] use pulpAI in place of hubAPI

---
 frontend/hub/namespaces/HubNamespaces.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/hub/namespaces/HubNamespaces.tsx b/frontend/hub/namespaces/HubNamespaces.tsx
index 7ea8585054..0a3b89980f 100644
--- a/frontend/hub/namespaces/HubNamespaces.tsx
+++ b/frontend/hub/namespaces/HubNamespaces.tsx
@@ -9,6 +9,7 @@ import { useHubNamespaceFilters } from './hooks/useHubNamespaceFilters';
 import { useHubNamespaceToolbarActions } from './hooks/useHubNamespaceToolbarActions';
 import { useHubNamespacesColumns } from './hooks/useHubNamespacesColumns';
 import { idKeyFn } from '../../common/utils/nameKeyFn';
+import { pulpAPI } from '../api/utils';
 
 export function Namespaces() {
   const { t } = useTranslation();
@@ -48,7 +49,9 @@ export function AllNamespaces() {
 
 export function MyNamespaces() {
   return (
-    <CommonNamespaces url="/api/automation-hub/pulp/api/v3/pulp_ansible/namespaces/?my_permissions=ansible.change_ansiblenamespace" />
+    <CommonNamespaces
+      url={pulpAPI`pulp_ansible/namespaces/?my_permissions=ansible.change_ansiblenamespace`}
+    />
   );
 }
 

From b365800b4d0a2ed90a642ea116766afb24e83ecc Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Mon, 26 Jun 2023 14:06:40 -0400
Subject: [PATCH 06/30] use pulpAPI prefix in api call

---
 frontend/hub/namespaces/HubNamespaces.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/hub/namespaces/HubNamespaces.tsx b/frontend/hub/namespaces/HubNamespaces.tsx
index 0a3b89980f..a79dcbe1dd 100644
--- a/frontend/hub/namespaces/HubNamespaces.tsx
+++ b/frontend/hub/namespaces/HubNamespaces.tsx
@@ -44,7 +44,7 @@ export function Namespaces() {
 }
 
 export function AllNamespaces() {
-  return <CommonNamespaces url="/api/automation-hub/pulp/api/v3/pulp_ansible/namespaces/" />;
+  return <CommonNamespaces url={pulpAPI`pulp_ansible/namespaces/`} />;
 }
 
 export function MyNamespaces() {

From 1e0e26095abb6f98597f464b7862be14b509e4f6 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Mon, 26 Jun 2023 14:45:43 -0400
Subject: [PATCH 07/30] add spot for queryParams

---
 frontend/hub/namespaces/HubNamespaces.tsx | 27 ++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/frontend/hub/namespaces/HubNamespaces.tsx b/frontend/hub/namespaces/HubNamespaces.tsx
index a79dcbe1dd..b14316ff62 100644
--- a/frontend/hub/namespaces/HubNamespaces.tsx
+++ b/frontend/hub/namespaces/HubNamespaces.tsx
@@ -13,6 +13,7 @@ import { pulpAPI } from '../api/utils';
 
 export function Namespaces() {
   const { t } = useTranslation();
+
   return (
     <PageLayout>
       <PageHeader
@@ -44,26 +45,42 @@ export function Namespaces() {
 }
 
 export function AllNamespaces() {
-  return <CommonNamespaces url={pulpAPI`pulp_ansible/namespaces/`} />;
+  return <CommonNamespaces url={pulpAPI`/pulp_ansible/namespaces/`} queryParams={undefined} />;
 }
 
 export function MyNamespaces() {
   return (
     <CommonNamespaces
-      url={pulpAPI`pulp_ansible/namespaces/?my_permissions=ansible.change_ansiblenamespace`}
+      url={pulpAPI`/pulp_ansible/namespaces/`}
+      queryParams={{ my_permissions: 'ansible.change_ansiblenamespace' }}
     />
   );
 }
 
-export function CommonNamespaces({ url }: { url: string }) {
+export function CommonNamespaces({
+  url,
+  queryParams,
+}: {
+  url: string;
+  queryParams:
+    | {
+        [key: string]: string;
+      }
+    | undefined;
+}) {
   const { t } = useTranslation();
   const navigate = useNavigate();
   const toolbarFilters = useHubNamespaceFilters();
   const tableColumns = useHubNamespacesColumns();
   const toolbarActions = useHubNamespaceToolbarActions();
   const rowActions = useHubNamespaceActions();
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-  const view = usePulpView<HubNamespace>({ url, keyFn: idKeyFn, toolbarFilters, tableColumns });
+  const view = usePulpView<HubNamespace>({
+    url,
+    keyFn: idKeyFn,
+    toolbarFilters,
+    tableColumns,
+    queryParams,
+  });
   return (
     <PageTable<HubNamespace>
       toolbarFilters={toolbarFilters}

From e96c4bafb87aeaf4f2c7e70cba26312a22815e7f Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Mon, 26 Jun 2023 17:07:25 -0400
Subject: [PATCH 08/30] disable tsc for the time-being

---
 .../hub/namespaces/HubNamespaceDetails.tsx    | 84 ++++++++++++++++---
 1 file changed, 72 insertions(+), 12 deletions(-)

diff --git a/frontend/hub/namespaces/HubNamespaceDetails.tsx b/frontend/hub/namespaces/HubNamespaceDetails.tsx
index f1bef88351..4c96c4aed6 100644
--- a/frontend/hub/namespaces/HubNamespaceDetails.tsx
+++ b/frontend/hub/namespaces/HubNamespaceDetails.tsx
@@ -1,25 +1,48 @@
 import { DropdownPosition } from '@patternfly/react-core';
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import { useTranslation } from 'react-i18next';
-import { useParams } from 'react-router-dom';
-import { PageActions, PageHeader, PageLayout, PageTab, PageTabs } from '../../../framework';
-import { PageDetailsFromColumns } from '../../../framework/PageDetails/PageDetailsFromColumns';
+import { useParams, useNavigate } from 'react-router-dom';
+import {
+  PageActions,
+  PageHeader,
+  PageTable,
+  PageLayout,
+  PageTab,
+  PageTabs,
+} from '../../../framework';
+import { PageDetailsFromColumns } from '../../../framework';
 import { RouteObj } from '../../Routes';
 import { useGet } from '../../common/crud/useGet';
 import { hubAPI } from '../api/utils';
 import { HubItemsResponse } from '../useHubView';
 import { HubNamespace } from './HubNamespace';
+import { useHubView } from '../useHubView';
 import { useHubNamespaceActions } from './hooks/useHubNamespaceActions';
 import { useHubNamespacesColumns } from './hooks/useHubNamespacesColumns';
+import { useCollectionFilters } from '../collections/hooks/useCollectionFilters';
+import { useCollectionsActions } from '../collections/hooks/useCollectionsActions';
+import { useCollectionColumns } from '../collections/hooks/useCollectionColumns';
+import { useCollectionActions } from '../collections/hooks/useCollectionActions';
+import { Collection } from '../collections/Collection';
+import { idKeyFn, hubAPI } from '../api';
+
+import { DropdownPosition } from '@patternfly/react-core';
 
 export function NamespaceDetails() {
   const { t } = useTranslation();
   const params = useParams<{ id: string }>();
   const { data } = useGet<HubItemsResponse<HubNamespace>>(
-    hubAPI`/_ui/v1/namespaces/?limit=1&name=${params.id ?? ''}`
+    `/api/automation-hub/pulp/api/v3/pulp_ansible/namespaces/?limit=1&name=${params.id ?? ''}`
   );
   let namespace: HubNamespace | undefined = undefined;
-  if (data && data.data && data.data.length > 0) {
-    namespace = data.data[0];
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  if (data && data.results && data.count > 0) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    namespace = data.results[0];
   }
 
   const pageActions = useHubNamespaceActions();
@@ -27,10 +50,7 @@ export function NamespaceDetails() {
     <PageLayout>
       <PageHeader
         title={namespace?.name}
-        breadcrumbs={[
-          { label: t('Namespaces'), to: RouteObj.Namespaces },
-          { label: namespace?.name },
-        ]}
+        breadcrumbs={[{ label: t('Namespaces'), to: RouteObj.Namespaces }, { label: params.id }]}
         headerActions={
           <PageActions<HubNamespace>
             actions={pageActions}
@@ -40,8 +60,11 @@ export function NamespaceDetails() {
         }
       />
       <PageTabs>
-        <PageTab label={t('Details')}>
-          <NamespaceDetailsTab namespace={namespace} />
+        <PageTab label={t('Collections')}>
+          <CollectionsTab namespace={namespace} />
+        </PageTab>
+        <PageTab label={t('Namespace Details')}>
+          <NamespaceDetailsTab />
         </PageTab>
       </PageTabs>
     </PageLayout>
@@ -53,3 +76,40 @@ function NamespaceDetailsTab(props: { namespace?: HubNamespace }) {
   const tableColumns = useHubNamespacesColumns();
   return <PageDetailsFromColumns item={namespace} columns={tableColumns} />;
 }
+
+function CollectionsTab(props: { namespace?: HubNamespace }) {
+  const { t } = useTranslation();
+  const toolbarFilters = useCollectionFilters();
+  const tableColumns = useCollectionColumns();
+  const view = useHubView<Collection>({
+    url: hubAPI`/_ui/v1/repo/published/`,
+    keyFn: idKeyFn,
+    toolbarFilters,
+    tableColumns,
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    queryParams: { namespace: props?.namespace?.name },
+  });
+  const toolbarActions = useCollectionsActions(view.unselectItemsAndRefresh);
+  const rowActions = useCollectionActions(view.unselectItemsAndRefresh);
+  const navigate = useNavigate();
+
+  return (
+    <PageLayout>
+      <PageTable<Collection>
+        toolbarFilters={toolbarFilters}
+        toolbarActions={toolbarActions}
+        tableColumns={tableColumns}
+        rowActions={rowActions}
+        errorStateTitle={t('Error loading collections')}
+        emptyStateTitle={t('No collections yet')}
+        emptyStateDescription={t('To get started, upload a collection.')}
+        emptyStateButtonText={t('Upload collection')}
+        emptyStateButtonClick={() => navigate(RouteObj.UploadCollection)}
+        {...view}
+        defaultTableView="list"
+        defaultSubtitle={t('Collection')}
+      />
+    </PageLayout>
+  );
+}

From 1c76994613a325320fde140af870c8369e892e77 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Thu, 29 Jun 2023 10:43:52 -0400
Subject: [PATCH 09/30] create a namespace metadata type file

---
 frontend/hub/namespaces/HubMetaDataType.tsx | 31 +++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 frontend/hub/namespaces/HubMetaDataType.tsx

diff --git a/frontend/hub/namespaces/HubMetaDataType.tsx b/frontend/hub/namespaces/HubMetaDataType.tsx
new file mode 100644
index 0000000000..92a05e1bf3
--- /dev/null
+++ b/frontend/hub/namespaces/HubMetaDataType.tsx
@@ -0,0 +1,31 @@
+export interface HubNamespaceMetadata {
+  metadata: {
+    pulp_href: string;
+    name: string;
+    company: string;
+    email: string;
+    description: string;
+    resources: string;
+    links: string[];
+    avatar_sha256: null;
+    avatar_url: null;
+    metadata_sha256: string;
+    groups: [];
+    task: null;
+  };
+  repository: {
+    pulp_href: string;
+    pulp_created: string;
+    versions_href: string;
+    pulp_labels: {
+      pipeline: string;
+    };
+    latest_version_href: string;
+    name: string;
+    description: string;
+    retain_repo_versions: number;
+    remote: null;
+  };
+  in_latest_repo_version: true;
+  in_old_repo_version: false;
+}

From 26d5db4b9b03a047659368d34b8dd17c785743cf Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Mon, 10 Jul 2023 15:14:54 -0400
Subject: [PATCH 10/30] add new HubNamespaceResponse and fix type errors

---
 frontend/hub/namespaces/HubNamespaceDetails.tsx | 9 +--------
 frontend/hub/useHubView.tsx                     | 5 +++++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/frontend/hub/namespaces/HubNamespaceDetails.tsx b/frontend/hub/namespaces/HubNamespaceDetails.tsx
index 4c96c4aed6..2f4fe4f755 100644
--- a/frontend/hub/namespaces/HubNamespaceDetails.tsx
+++ b/frontend/hub/namespaces/HubNamespaceDetails.tsx
@@ -14,7 +14,6 @@ import { PageDetailsFromColumns } from '../../../framework';
 import { RouteObj } from '../../Routes';
 import { useGet } from '../../common/crud/useGet';
 import { hubAPI } from '../api/utils';
-import { HubItemsResponse } from '../useHubView';
 import { HubNamespace } from './HubNamespace';
 import { useHubView } from '../useHubView';
 import { useHubNamespaceActions } from './hooks/useHubNamespaceActions';
@@ -31,17 +30,11 @@ import { DropdownPosition } from '@patternfly/react-core';
 export function NamespaceDetails() {
   const { t } = useTranslation();
   const params = useParams<{ id: string }>();
-  const { data } = useGet<HubItemsResponse<HubNamespace>>(
+  const { data } = useGet<HubNamespaceResponse<HubNamespace>>(
     `/api/automation-hub/pulp/api/v3/pulp_ansible/namespaces/?limit=1&name=${params.id ?? ''}`
   );
   let namespace: HubNamespace | undefined = undefined;
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
   if (data && data.results && data.count > 0) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     namespace = data.results[0];
   }
 
diff --git a/frontend/hub/useHubView.tsx b/frontend/hub/useHubView.tsx
index c6f792b071..9a6ec09179 100644
--- a/frontend/hub/useHubView.tsx
+++ b/frontend/hub/useHubView.tsx
@@ -22,6 +22,11 @@ export interface HubItemsResponse<T extends object> {
   };
 }
 
+export interface HubNamespaceResponse<T extends object> {
+  count: number;
+  results: T[];
+}
+
 export type IHubView<T extends object> = IView &
   ISelected<T> & {
     itemCount: number | undefined;

From d873a301ef17d5ade64c88362789949faecd8b67 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Tue, 11 Jul 2023 16:10:18 -0400
Subject: [PATCH 11/30] update Collection type to CollectionVersionSearch

---
 .../hooks/useCollectionColumns.tsx            | 45 ++++++++++++-------
 .../hub/namespaces/HubNamespaceDetails.tsx    | 12 ++---
 2 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/frontend/hub/collections/hooks/useCollectionColumns.tsx b/frontend/hub/collections/hooks/useCollectionColumns.tsx
index 11e8139301..7972ce2a70 100644
--- a/frontend/hub/collections/hooks/useCollectionColumns.tsx
+++ b/frontend/hub/collections/hooks/useCollectionColumns.tsx
@@ -8,7 +8,7 @@ import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ITableColumn, TextCell } from '../../../../framework';
 import { RouteObj } from '../../../Routes';
-import { CollectionVersionSearch } from '../Collection';
+import { CollectionVersionSearch } from '../CollectionVersionSearch';
 
 export function useCollectionColumns(_options?: { disableSort?: boolean; disableLinks?: boolean }) {
   const { t } = useTranslation();
@@ -16,19 +16,11 @@ export function useCollectionColumns(_options?: { disableSort?: boolean; disable
     () => [
       {
         header: t('Name'),
-        value: (collection) => collection.collection_version.name,
+        value: (collection) => collection.collection_version?.name,
         cell: (collection) => (
           <TextCell
-            text={collection.collection_version.name}
-            to={
-              RouteObj.CollectionDetails +
-              '?name=' +
-              collection.collection_version.name +
-              '&namespace=' +
-              collection.collection_version.namespace +
-              '&repository=' +
-              collection.repository.name
-            }
+            text={collection.collection_version?.name}
+            to={RouteObj.CollectionDetails.replace(':id', collection.collection_version?.name)}
           />
         ),
         card: 'name',
@@ -45,7 +37,6 @@ export function useCollectionColumns(_options?: { disableSort?: boolean; disable
         header: t('Namespace'),
         type: 'text',
         value: (collection) => collection.collection_version.namespace,
-        sort: 'namespace',
       },
       {
         header: t('Description'),
@@ -60,6 +51,23 @@ export function useCollectionColumns(_options?: { disableSort?: boolean; disable
         value: (collection) =>
           collection.collection_version.contents.filter((c) => c.content_type === 'module').length,
       },
+      {
+        header: t('Roles'),
+        type: 'count',
+        value: (collection) =>
+          collection.collection_version.contents.filter((c) => c.content_type === 'TODO').length,
+      },
+      {
+        header: t('Plugins'),
+        type: 'count',
+        value: (collection) =>
+          collection.collection_version.contents.filter((c) => c.content_type === 'TODO').length,
+      },
+      {
+        header: t('Dependencies'),
+        type: 'count',
+        value: (collection) => Object.keys(collection.collection_version.dependencies).length,
+      },
       {
         header: t('Updated'),
         type: 'datetime',
@@ -78,14 +86,14 @@ export function useCollectionColumns(_options?: { disableSort?: boolean; disable
       {
         header: t('Signed state'),
         cell: (collection) => {
-          switch (collection.is_signed) {
-            case true:
+          switch (collection.collection_version.is_signed) {
+            case 'true':
               return (
                 <Label icon={<CheckCircleIcon />} variant="outline" color="green">
                   {t('Signed')}
                 </Label>
               );
-            case false:
+            case 'false':
               return (
                 <Label icon={<ExclamationTriangleIcon />} variant="outline" color="orange">
                   {t('Unsigned')}
@@ -96,6 +104,11 @@ export function useCollectionColumns(_options?: { disableSort?: boolean; disable
         list: 'secondary',
         value: (collection) => collection.is_signed,
       },
+      {
+        header: t('Tags'),
+        type: 'labels',
+        value: (collection) => collection.collection_version.tags.sort(),
+      },
     ],
     [t]
   );
diff --git a/frontend/hub/namespaces/HubNamespaceDetails.tsx b/frontend/hub/namespaces/HubNamespaceDetails.tsx
index 2f4fe4f755..0ed9fb3c27 100644
--- a/frontend/hub/namespaces/HubNamespaceDetails.tsx
+++ b/frontend/hub/namespaces/HubNamespaceDetails.tsx
@@ -22,8 +22,8 @@ import { useCollectionFilters } from '../collections/hooks/useCollectionFilters'
 import { useCollectionsActions } from '../collections/hooks/useCollectionsActions';
 import { useCollectionColumns } from '../collections/hooks/useCollectionColumns';
 import { useCollectionActions } from '../collections/hooks/useCollectionActions';
-import { Collection } from '../collections/Collection';
-import { idKeyFn, hubAPI } from '../api';
+import { CollectionVersionSearch } from '../collections/CollectionVersionSearch';
+import { hubAPI } from '../api';
 
 import { DropdownPosition } from '@patternfly/react-core';
 
@@ -74,9 +74,9 @@ function CollectionsTab(props: { namespace?: HubNamespace }) {
   const { t } = useTranslation();
   const toolbarFilters = useCollectionFilters();
   const tableColumns = useCollectionColumns();
-  const view = useHubView<Collection>({
-    url: hubAPI`/_ui/v1/repo/published/`,
-    keyFn: idKeyFn,
+  const view = useHubView<CollectionVersionSearch>({
+    url: hubAPI`/v3/plugin/ansible/search/collection-versions/`,
+    keyFn: (item) => item.collection_version.pulp_href + ':' + item.repository.name,
     toolbarFilters,
     tableColumns,
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -89,7 +89,7 @@ function CollectionsTab(props: { namespace?: HubNamespace }) {
 
   return (
     <PageLayout>
-      <PageTable<Collection>
+      <PageTable<CollectionVersionSearch>
         toolbarFilters={toolbarFilters}
         toolbarActions={toolbarActions}
         tableColumns={tableColumns}

From 73fed346e9b8908a2553562cdcd9a5989fd61d79 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Wed, 12 Jul 2023 11:09:48 -0400
Subject: [PATCH 12/30] use CollectionVersionSearch in place of Collection

---
 frontend/hub/collections/CollectionDetails.tsx | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/frontend/hub/collections/CollectionDetails.tsx b/frontend/hub/collections/CollectionDetails.tsx
index 5eb6ba7d5c..c4bdd13823 100644
--- a/frontend/hub/collections/CollectionDetails.tsx
+++ b/frontend/hub/collections/CollectionDetails.tsx
@@ -52,7 +52,7 @@ import { StatusCell } from '../../common/Status';
 import { useGet } from '../../common/crud/useGet';
 import { hubAPI } from '../api/utils';
 import { HubItemsResponse } from '../useHubView';
-import { CollectionVersionSearch } from './Collection';
+import { CollectionVersionSearch } from './CollectionVersionSearch';
 import { useCollectionActions } from './hooks/useCollectionActions';
 import { useCollectionColumns } from './hooks/useCollectionColumns';
 
@@ -312,7 +312,11 @@ function CollectionDocumentationTabContent(props: {
                       <div>{option.name}</div>
                       <small style={{ opacity: 0.7 }}>{option.type}</small>
                     </Td>
-                    <Td>{option.choices?.map((choice) => <p key={choice}>{choice}</p>)}</Td>
+                    <Td>
+                      {option.choices?.map((choice) => (
+                        <p key={choice}>{choice}</p>
+                      ))}
+                    </Td>
                     <Td>{option.description}</Td>
                   </Tr>
                 ))}
@@ -325,7 +329,9 @@ function CollectionDocumentationTabContent(props: {
         <PageSection variant="light">
           <Stack hasGutter>
             <Title headingLevel="h2">{t('Notes')}</Title>
-            {content?.doc_strings?.doc.notes?.map((note, index) => <p key={index}>{note}</p>)}
+            {content?.doc_strings?.doc.notes?.map((note, index) => (
+              <p key={index}>{note}</p>
+            ))}
           </Stack>
         </PageSection>
       )}
@@ -428,9 +434,9 @@ function CollectionImportLogTab(props: { collection?: CollectionVersionSearch })
               variant="danger"
               title={
                 <Stack>
-                  {collectionImport?.error?.description
-                    .split('\n')
-                    .map((line, index) => <StackItem key={index}>{line}</StackItem>)}
+                  {collectionImport?.error?.description.split('\n').map((line, index) => (
+                    <StackItem key={index}>{line}</StackItem>
+                  ))}
                 </Stack>
               }
               isInline

From 86bc059ab5b3179866ddcae0b562fd001f846755 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Wed, 12 Jul 2023 11:33:42 -0400
Subject: [PATCH 13/30] reset files to origin

---
 .../hub/collections/CollectionDetails.tsx     | 10 ++---
 .../hooks/useCollectionColumns.tsx            | 39 ++++++++++---------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/frontend/hub/collections/CollectionDetails.tsx b/frontend/hub/collections/CollectionDetails.tsx
index c4bdd13823..b3eb726fb6 100644
--- a/frontend/hub/collections/CollectionDetails.tsx
+++ b/frontend/hub/collections/CollectionDetails.tsx
@@ -52,7 +52,7 @@ import { StatusCell } from '../../common/Status';
 import { useGet } from '../../common/crud/useGet';
 import { hubAPI } from '../api/utils';
 import { HubItemsResponse } from '../useHubView';
-import { CollectionVersionSearch } from './CollectionVersionSearch';
+import { Collection } from './Collection';
 import { useCollectionActions } from './hooks/useCollectionActions';
 import { useCollectionColumns } from './hooks/useCollectionColumns';
 
@@ -64,7 +64,7 @@ export function CollectionDetails() {
       params.namespace || ''
     }&repository=${params.repository || ''} }`
   );
-  let collection: CollectionVersionSearch | undefined = undefined;
+  let collection: Collection | undefined = undefined;
   if (data && data.data && data.data.length > 0) {
     collection = data.data[0];
   }
@@ -72,10 +72,10 @@ export function CollectionDetails() {
   return (
     <PageLayout>
       <PageHeader
-        title={collection?.collection_version.name}
+        title={collection?.name}
         breadcrumbs={[
           { label: t('Collections'), to: RouteObj.Collections },
-          { label: collection?.collection_version.name },
+          { label: collection?.name },
         ]}
         headerActions={
           <PageActions<CollectionVersionSearch>
@@ -109,7 +109,7 @@ export function CollectionDetails() {
   );
 }
 
-function CollectionDetailsTab(props: { collection?: CollectionVersionSearch }) {
+function CollectionDetailsTab(props: { collection?: Collection }) {
   const { collection } = props;
   const tableColumns = useCollectionColumns();
   return <PageDetailsFromColumns item={collection} columns={tableColumns} />;
diff --git a/frontend/hub/collections/hooks/useCollectionColumns.tsx b/frontend/hub/collections/hooks/useCollectionColumns.tsx
index 7972ce2a70..e8d2da02bd 100644
--- a/frontend/hub/collections/hooks/useCollectionColumns.tsx
+++ b/frontend/hub/collections/hooks/useCollectionColumns.tsx
@@ -8,19 +8,19 @@ import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ITableColumn, TextCell } from '../../../../framework';
 import { RouteObj } from '../../../Routes';
-import { CollectionVersionSearch } from '../CollectionVersionSearch';
+import { Collection } from '../Collection';
 
 export function useCollectionColumns(_options?: { disableSort?: boolean; disableLinks?: boolean }) {
   const { t } = useTranslation();
-  return useMemo<ITableColumn<CollectionVersionSearch>[]>(
+  return useMemo<ITableColumn<Collection>[]>(
     () => [
       {
         header: t('Name'),
-        value: (collection) => collection.collection_version?.name,
+        value: (collection) => collection.name,
         cell: (collection) => (
           <TextCell
-            text={collection.collection_version?.name}
-            to={RouteObj.CollectionDetails.replace(':id', collection.collection_version?.name)}
+            text={collection.name}
+            to={RouteObj.CollectionDetails.replace(':id', collection.name)}
           />
         ),
         card: 'name',
@@ -36,12 +36,12 @@ export function useCollectionColumns(_options?: { disableSort?: boolean; disable
       {
         header: t('Namespace'),
         type: 'text',
-        value: (collection) => collection.collection_version.namespace,
+        value: (collection) => collection.namespace.name,
       },
       {
         header: t('Description'),
         type: 'description',
-        value: (collection) => collection.collection_version.description,
+        value: (collection) => collection.latest_version.metadata.description,
         card: 'description',
         list: 'description',
       },
@@ -49,36 +49,39 @@ export function useCollectionColumns(_options?: { disableSort?: boolean; disable
         header: t('Modules'),
         type: 'count',
         value: (collection) =>
-          collection.collection_version.contents.filter((c) => c.content_type === 'module').length,
+          collection.latest_version.metadata.contents.filter((c) => c.content_type === 'module')
+            .length,
       },
       {
         header: t('Roles'),
         type: 'count',
         value: (collection) =>
-          collection.collection_version.contents.filter((c) => c.content_type === 'TODO').length,
+          collection.latest_version.metadata.contents.filter((c) => c.content_type === 'TODO')
+            .length,
       },
       {
         header: t('Plugins'),
         type: 'count',
         value: (collection) =>
-          collection.collection_version.contents.filter((c) => c.content_type === 'TODO').length,
+          collection.latest_version.metadata.contents.filter((c) => c.content_type === 'TODO')
+            .length,
       },
       {
         header: t('Dependencies'),
         type: 'count',
-        value: (collection) => Object.keys(collection.collection_version.dependencies).length,
+        value: (collection) => Object.keys(collection.latest_version.metadata.dependencies).length,
       },
       {
         header: t('Updated'),
         type: 'datetime',
-        value: (collection) => collection.collection_version.pulp_created,
+        value: (collection) => collection.latest_version.created_at,
         card: 'hidden',
         list: 'secondary',
       },
       {
         header: t('Version'),
         type: 'text',
-        value: (collection) => collection.collection_version.version,
+        value: (collection) => collection.latest_version.version,
         card: 'hidden',
         list: 'secondary',
         sort: 'version',
@@ -86,14 +89,14 @@ export function useCollectionColumns(_options?: { disableSort?: boolean; disable
       {
         header: t('Signed state'),
         cell: (collection) => {
-          switch (collection.collection_version.is_signed) {
-            case 'true':
+          switch (collection.latest_version.sign_state) {
+            case 'signed':
               return (
                 <Label icon={<CheckCircleIcon />} variant="outline" color="green">
                   {t('Signed')}
                 </Label>
               );
-            case 'false':
+            case 'unsigned':
               return (
                 <Label icon={<ExclamationTriangleIcon />} variant="outline" color="orange">
                   {t('Unsigned')}
@@ -102,12 +105,12 @@ export function useCollectionColumns(_options?: { disableSort?: boolean; disable
           }
         },
         list: 'secondary',
-        value: (collection) => collection.is_signed,
+        value: (collection) => collection.latest_version.sign_state,
       },
       {
         header: t('Tags'),
         type: 'labels',
-        value: (collection) => collection.collection_version.tags.sort(),
+        value: (collection) => collection.latest_version.metadata.tags.sort(),
       },
     ],
     [t]

From a6d550adbee17e731bafc6bf4483c2362f6c75b7 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Thu, 13 Jul 2023 10:19:03 -0400
Subject: [PATCH 14/30] use collection search for collections tab

---
 frontend/hub/namespaces/HubNamespaceForm.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/hub/namespaces/HubNamespaceForm.tsx b/frontend/hub/namespaces/HubNamespaceForm.tsx
index 35210a1262..01c98ba649 100644
--- a/frontend/hub/namespaces/HubNamespaceForm.tsx
+++ b/frontend/hub/namespaces/HubNamespaceForm.tsx
@@ -13,13 +13,14 @@ import { usePatchRequest } from '../../common/crud/usePatchRequest';
 import { usePostRequest } from '../../common/crud/usePostRequest';
 import { hubAPI } from '../api/utils';
 import { HubNamespace } from './HubNamespace';
+import { hubAPI, pulpAPI } from '../api/utils';
 
 export function CreateHubNamespace() {
   const { t } = useTranslation();
   const navigate = useNavigate();
   const postRequest = usePostRequest<HubNamespace>();
   const onSubmit: PageFormSubmitHandler<HubNamespace> = async (namespace) => {
-    const createdNamespace = await postRequest(hubAPI`/_ui/v1/namespaces/`, namespace);
+    const createdNamespace = await postRequest(pulpAPI`/pulp_ansible/namespaces/`, namespace);
     navigate(RouteObj.NamespaceDetails.replace(':id', createdNamespace.name.toString()));
   };
   return (
@@ -35,7 +36,9 @@ export function CreateHubNamespace() {
         submitText={t('Create namespace')}
         onSubmit={onSubmit}
         onCancel={() => navigate(-1)}
-        defaultValue={{ groups: [] }}
+        defaultValue={{
+          latest_metadata: { groups: [] },
+        }}
       >
         <HubNamespaceInputs />
       </PageForm>

From 63a92a1ef0c0f0cc2bd3b181db09f2c959c0df90 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Thu, 13 Jul 2023 14:48:00 -0400
Subject: [PATCH 15/30] fix HubNamespace type

---
 frontend/hub/namespaces/HubNamespace.tsx      | 19 +------------------
 .../hub/namespaces/HubNamespaceDetails.tsx    |  9 +++------
 frontend/hub/namespaces/HubNamespaceForm.tsx  |  6 +++---
 3 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/frontend/hub/namespaces/HubNamespace.tsx b/frontend/hub/namespaces/HubNamespace.tsx
index d0d0215a7e..1eccf3abbf 100644
--- a/frontend/hub/namespaces/HubNamespace.tsx
+++ b/frontend/hub/namespaces/HubNamespace.tsx
@@ -14,31 +14,14 @@ export interface LatestMetadataType {
   avatar_sha256: string | null;
   avatar_url: string | null;
   metadata_sha256: string;
-  groups: string[];
   task: string | null;
+  groups: string[];
 }
 
 export interface HubNamespace {
   pulp_href: string;
   pulp_created: string;
-  id: number;
   name: string;
-  company: string;
-  email: string;
-  avatar_url: string;
-  description: string;
-  num_collections: number;
-  groups: [
-    {
-      id: number;
-      name: string;
-      object_permissions: string[];
-      pulp_href?: string;
-    }
-  ];
-  resources: string;
-  owners: string[];
-  links: LinksType[];
   my_permissions: string[];
   latest_metadata: LatestMetadataType;
 }
diff --git a/frontend/hub/namespaces/HubNamespaceDetails.tsx b/frontend/hub/namespaces/HubNamespaceDetails.tsx
index 0ed9fb3c27..aced46e633 100644
--- a/frontend/hub/namespaces/HubNamespaceDetails.tsx
+++ b/frontend/hub/namespaces/HubNamespaceDetails.tsx
@@ -23,7 +23,7 @@ import { useCollectionsActions } from '../collections/hooks/useCollectionsAction
 import { useCollectionColumns } from '../collections/hooks/useCollectionColumns';
 import { useCollectionActions } from '../collections/hooks/useCollectionActions';
 import { CollectionVersionSearch } from '../collections/CollectionVersionSearch';
-import { hubAPI } from '../api';
+import { hubAPI, idKeyFn } from '../api';
 
 import { DropdownPosition } from '@patternfly/react-core';
 
@@ -75,12 +75,9 @@ function CollectionsTab(props: { namespace?: HubNamespace }) {
   const toolbarFilters = useCollectionFilters();
   const tableColumns = useCollectionColumns();
   const view = useHubView<CollectionVersionSearch>({
-    url: hubAPI`/v3/plugin/ansible/search/collection-versions/`,
-    keyFn: (item) => item.collection_version.pulp_href + ':' + item.repository.name,
-    toolbarFilters,
+    url: hubAPI`/_ui/v1/repo/published/`,
+    keyFn: idKeyFn,
     tableColumns,
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
     queryParams: { namespace: props?.namespace?.name },
   });
   const toolbarActions = useCollectionsActions(view.unselectItemsAndRefresh);
diff --git a/frontend/hub/namespaces/HubNamespaceForm.tsx b/frontend/hub/namespaces/HubNamespaceForm.tsx
index 01c98ba649..ecc3700e09 100644
--- a/frontend/hub/namespaces/HubNamespaceForm.tsx
+++ b/frontend/hub/namespaces/HubNamespaceForm.tsx
@@ -102,17 +102,17 @@ function HubNamespaceInputs() {
         isRequired
       />
       <PageFormTextInput<HubNamespace>
-        name="description"
+        name="latest_metadata.description"
         label={t('Description')}
         placeholder={t('Enter description')}
       />
       <PageFormTextInput<HubNamespace>
-        name="company"
+        name="latest_metadata.company"
         label={t('Company')}
         placeholder={t('Enter company')}
       />
       <PageFormTextInput<HubNamespace>
-        name="avatar_url"
+        name="latest_metadata.avatar_url"
         label={t('Logo URL')}
         placeholder={t('Enter logo URL')}
       />

From e8e8b7a1276bec01f35f8793fba0d706be6f86f9 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Mon, 17 Jul 2023 11:35:49 -0400
Subject: [PATCH 16/30] add collectionversionsearch

---
 .../hooks/useCollectionVersionColumns.tsx     | 94 +++++++++++++++++++
 .../hub/namespaces/HubNamespaceDetails.tsx    | 18 ++--
 2 files changed, 100 insertions(+), 12 deletions(-)
 create mode 100644 frontend/hub/collections/hooks/useCollectionVersionColumns.tsx

diff --git a/frontend/hub/collections/hooks/useCollectionVersionColumns.tsx b/frontend/hub/collections/hooks/useCollectionVersionColumns.tsx
new file mode 100644
index 0000000000..0099282995
--- /dev/null
+++ b/frontend/hub/collections/hooks/useCollectionVersionColumns.tsx
@@ -0,0 +1,94 @@
+import { Label } from '@patternfly/react-core';
+import {
+  AnsibleTowerIcon,
+  CheckCircleIcon,
+  ExclamationTriangleIcon,
+} from '@patternfly/react-icons';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { ITableColumn, TextCell } from '../../../../framework';
+import { RouteObj } from '../../../Routes';
+import { CollectionVersionSearch } from '../CollectionVersionSearch';
+
+export function useCollectionVersionColumns(_options?: {
+  disableSort?: boolean;
+  disableLinks?: boolean;
+}) {
+  const { t } = useTranslation();
+  return useMemo<ITableColumn<CollectionVersionSearch>[]>(
+    () => [
+      {
+        header: t('Name'),
+        value: (collection) => collection.collection_version.name,
+        cell: (collection) => (
+          <TextCell
+            text={collection.collection_version.name}
+            to={RouteObj.CollectionDetails.replace(':id', collection.collection_version.name)}
+          />
+        ),
+        card: 'name',
+        list: 'name',
+        icon: () => <AnsibleTowerIcon />,
+      },
+      {
+        header: t('Repository'),
+        type: 'text',
+        value: (collection) => collection.repository.name,
+      },
+      {
+        header: t('Namespace'),
+        type: 'text',
+        value: (collection) => collection.collection_version.namespace,
+      },
+      {
+        header: t('Description'),
+        type: 'description',
+        value: (collection) => collection.collection_version.description,
+        card: 'description',
+        list: 'description',
+      },
+      {
+        header: t('Modules'),
+        type: 'count',
+        value: (collection) =>
+          collection.collection_version.contents.filter((c) => c.content_type === 'module').length,
+      },
+      {
+        header: t('Updated'),
+        type: 'datetime',
+        value: (collection) => collection.collection_version.pulp_created,
+        card: 'hidden',
+        list: 'secondary',
+      },
+      {
+        header: t('Version'),
+        type: 'text',
+        value: (collection) => collection.collection_version.version,
+        card: 'hidden',
+        list: 'secondary',
+      },
+      {
+        header: t('Signed state'),
+        cell: (collection) => {
+          switch (collection.is_signed) {
+            case true:
+              return (
+                <Label icon={<CheckCircleIcon />} variant="outline" color="green">
+                  {t('Signed')}
+                </Label>
+              );
+            case false:
+              return (
+                <Label icon={<ExclamationTriangleIcon />} variant="outline" color="orange">
+                  {t('Unsigned')}
+                </Label>
+              );
+          }
+        },
+        list: 'secondary',
+        value: (collection) => collection.is_signed,
+      },
+    ],
+    [t]
+  );
+}
diff --git a/frontend/hub/namespaces/HubNamespaceDetails.tsx b/frontend/hub/namespaces/HubNamespaceDetails.tsx
index aced46e633..cc0d4d81b9 100644
--- a/frontend/hub/namespaces/HubNamespaceDetails.tsx
+++ b/frontend/hub/namespaces/HubNamespaceDetails.tsx
@@ -19,12 +19,9 @@ import { useHubView } from '../useHubView';
 import { useHubNamespaceActions } from './hooks/useHubNamespaceActions';
 import { useHubNamespacesColumns } from './hooks/useHubNamespacesColumns';
 import { useCollectionFilters } from '../collections/hooks/useCollectionFilters';
-import { useCollectionsActions } from '../collections/hooks/useCollectionsActions';
-import { useCollectionColumns } from '../collections/hooks/useCollectionColumns';
-import { useCollectionActions } from '../collections/hooks/useCollectionActions';
+import { useCollectionVersionColumns } from '../collections/hooks/useCollectionVersionColumns';
 import { CollectionVersionSearch } from '../collections/CollectionVersionSearch';
-import { hubAPI, idKeyFn } from '../api';
-
+import { hubAPI } from '../api';
 import { DropdownPosition } from '@patternfly/react-core';
 
 export function NamespaceDetails() {
@@ -66,6 +63,7 @@ export function NamespaceDetails() {
 
 function NamespaceDetailsTab(props: { namespace?: HubNamespace }) {
   const { namespace } = props;
+  // eslint-disable-next-line no-console
   const tableColumns = useHubNamespacesColumns();
   return <PageDetailsFromColumns item={namespace} columns={tableColumns} />;
 }
@@ -73,24 +71,20 @@ function NamespaceDetailsTab(props: { namespace?: HubNamespace }) {
 function CollectionsTab(props: { namespace?: HubNamespace }) {
   const { t } = useTranslation();
   const toolbarFilters = useCollectionFilters();
-  const tableColumns = useCollectionColumns();
+  const tableColumns = useCollectionVersionColumns();
   const view = useHubView<CollectionVersionSearch>({
-    url: hubAPI`/_ui/v1/repo/published/`,
-    keyFn: idKeyFn,
+    url: hubAPI`/v3/plugin/ansible/search/collection-versions/`,
+    keyFn: (item) => item.collection_version.pulp_href + ':' + item.repository.name,
     tableColumns,
     queryParams: { namespace: props?.namespace?.name },
   });
-  const toolbarActions = useCollectionsActions(view.unselectItemsAndRefresh);
-  const rowActions = useCollectionActions(view.unselectItemsAndRefresh);
   const navigate = useNavigate();
 
   return (
     <PageLayout>
       <PageTable<CollectionVersionSearch>
         toolbarFilters={toolbarFilters}
-        toolbarActions={toolbarActions}
         tableColumns={tableColumns}
-        rowActions={rowActions}
         errorStateTitle={t('Error loading collections')}
         emptyStateTitle={t('No collections yet')}
         emptyStateDescription={t('To get started, upload a collection.')}

From c4cd163ced6fbc8c9c2313b47001960884ffc5ad Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Mon, 17 Jul 2023 14:38:57 -0400
Subject: [PATCH 17/30] dealing with tsc errors

---
 frontend/hub/api.tsx                          | 103 ++++++++++++++++++
 .../hooks/useCollectionVersionColumns.tsx     |   5 +-
 frontend/hub/namespaces/HubNamespace.tsx      |   2 +
 frontend/hub/namespaces/HubNamespaces.tsx     |   4 +-
 4 files changed, 108 insertions(+), 6 deletions(-)
 create mode 100644 frontend/hub/api.tsx

diff --git a/frontend/hub/api.tsx b/frontend/hub/api.tsx
new file mode 100644
index 0000000000..634021e6da
--- /dev/null
+++ b/frontend/hub/api.tsx
@@ -0,0 +1,103 @@
+import { AutomationServerType } from '../automation-servers/AutomationServer';
+import { activeAutomationServer } from '../automation-servers/AutomationServersProvider';
+
+function apiTag(strings: TemplateStringsArray, ...values: string[]) {
+  if (strings[0]?.[0] !== '/') {
+    throw new Error('Invalid URL');
+  }
+
+  let url = '';
+  strings.forEach((fragment, index) => {
+    url += fragment;
+    if (index !== strings.length - 1) {
+      url += encodeURIComponent(`${values.shift() ?? ''}`);
+    }
+  });
+
+  return url;
+}
+
+export function hubAPI(strings: TemplateStringsArray, ...values: string[]) {
+  let base = process.env.HUB_API_BASE_PATH;
+  if (!base) {
+    if (activeAutomationServer?.type === AutomationServerType.Galaxy) {
+      base = '/api/galaxy';
+    } else {
+      base = '/api/automation-hub';
+    }
+  }
+  return base + apiTag(strings, ...values);
+}
+
+export function pulpAPI(strings: TemplateStringsArray, ...values: string[]) {
+  let base = process.env.HUB_API_BASE_PATH;
+  if (!base) {
+    if (activeAutomationServer?.type === AutomationServerType.Galaxy) {
+      base = '/api/galaxy';
+    } else {
+      base = '/api/automation-hub';
+    }
+  }
+  return base + '/pulp/api/v3' + apiTag(strings, ...values);
+}
+
+export type QueryParams = {
+  [key: string]: string | undefined;
+};
+
+export function getQueryString(queryParams: QueryParams) {
+  return Object.entries(queryParams)
+    .map(([key, value = '']) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
+    .join('&');
+}
+
+const UUIDRegEx = /\b[0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12}\b/i;
+
+export function parsePulpIDFromURL(url: string): string | null {
+  for (const section of url.split('/')) {
+    if (section.match(UUIDRegEx)) {
+      return section;
+    }
+  }
+
+  return null;
+}
+
+// pulp next links currently include full url - with the wrong server
+// "http://localhost:5001/api/page/next?what#ever" -> "/api/page/next?what#ever"
+// also has to handle hub links (starting with /api/) and undefined
+export function serverlessURL(url?: string) {
+  if (!url || url.startsWith('/')) {
+    return url;
+  }
+
+  const { pathname, search, hash } = new URL(url);
+  return `${pathname}${search}${hash}`;
+}
+
+export function pulpIdKeyFn(item: { pulp_id: string }) {
+  return item.pulp_id;
+}
+
+export function pulpHrefKeyFn(item: { pulp_href: string }) {
+  return item.pulp_href;
+}
+
+export function nameKeyFn(item: { name: string }) {
+  return item.name;
+}
+
+export function idKeyFn(item: { id: number | string }) {
+  return item.id;
+}
+
+export function collectionKeyFn(item: {
+  collection_version: { pulp_href: string };
+  repository: { name: string };
+}) {
+  return item.collection_version.pulp_href + '_' + item.repository.name;
+}
+
+export function appendTrailingSlash(url: string) {
+  return url.endsWith('/') ? url : url + '/';
+}
diff --git a/frontend/hub/collections/hooks/useCollectionVersionColumns.tsx b/frontend/hub/collections/hooks/useCollectionVersionColumns.tsx
index 0099282995..11aef09556 100644
--- a/frontend/hub/collections/hooks/useCollectionVersionColumns.tsx
+++ b/frontend/hub/collections/hooks/useCollectionVersionColumns.tsx
@@ -10,10 +10,7 @@ import { ITableColumn, TextCell } from '../../../../framework';
 import { RouteObj } from '../../../Routes';
 import { CollectionVersionSearch } from '../CollectionVersionSearch';
 
-export function useCollectionVersionColumns(_options?: {
-  disableSort?: boolean;
-  disableLinks?: boolean;
-}) {
+export function useCollectionVersionColumns() {
   const { t } = useTranslation();
   return useMemo<ITableColumn<CollectionVersionSearch>[]>(
     () => [
diff --git a/frontend/hub/namespaces/HubNamespace.tsx b/frontend/hub/namespaces/HubNamespace.tsx
index 1eccf3abbf..2c4652e364 100644
--- a/frontend/hub/namespaces/HubNamespace.tsx
+++ b/frontend/hub/namespaces/HubNamespace.tsx
@@ -19,6 +19,8 @@ export interface LatestMetadataType {
 }
 
 export interface HubNamespace {
+  description?: string;
+  company?: string;
   pulp_href: string;
   pulp_created: string;
   name: string;
diff --git a/frontend/hub/namespaces/HubNamespaces.tsx b/frontend/hub/namespaces/HubNamespaces.tsx
index b14316ff62..88503be640 100644
--- a/frontend/hub/namespaces/HubNamespaces.tsx
+++ b/frontend/hub/namespaces/HubNamespaces.tsx
@@ -8,7 +8,7 @@ import { useHubNamespaceActions } from './hooks/useHubNamespaceActions';
 import { useHubNamespaceFilters } from './hooks/useHubNamespaceFilters';
 import { useHubNamespaceToolbarActions } from './hooks/useHubNamespaceToolbarActions';
 import { useHubNamespacesColumns } from './hooks/useHubNamespacesColumns';
-import { idKeyFn } from '../../common/utils/nameKeyFn';
+import { nameKeyFn } from '../../common/utils/nameKeyFn';
 import { pulpAPI } from '../api/utils';
 
 export function Namespaces() {
@@ -76,7 +76,7 @@ export function CommonNamespaces({
   const rowActions = useHubNamespaceActions();
   const view = usePulpView<HubNamespace>({
     url,
-    keyFn: idKeyFn,
+    keyFn: nameKeyFn,
     toolbarFilters,
     tableColumns,
     queryParams,

From bd140cfb0915bc9b577d726b66c5e18778d08921 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Tue, 25 Jul 2023 15:28:34 -0400
Subject: [PATCH 18/30] use ToolBarFilterType for filter

---
 frontend/hub/namespaces/hooks/useHubNamespaceFilters.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/hub/namespaces/hooks/useHubNamespaceFilters.tsx b/frontend/hub/namespaces/hooks/useHubNamespaceFilters.tsx
index e363ac3878..8c6d594e14 100644
--- a/frontend/hub/namespaces/hooks/useHubNamespaceFilters.tsx
+++ b/frontend/hub/namespaces/hooks/useHubNamespaceFilters.tsx
@@ -9,7 +9,7 @@ export function useHubNamespaceFilters() {
       {
         key: 'name__icontains',
         label: t('Name'),
-        type: 'string',
+        type: ToolbarFilterType.Text,
         query: 'name__icontains',
         comparison: 'contains',
       },

From 01cfea024620068ce7a41df3b66edeeda3746bc3 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Tue, 25 Jul 2023 15:36:11 -0400
Subject: [PATCH 19/30] use v3/namespaces api for delete method

---
 frontend/hub/namespaces/hooks/useDeleteHubNamespaces.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/hub/namespaces/hooks/useDeleteHubNamespaces.tsx b/frontend/hub/namespaces/hooks/useDeleteHubNamespaces.tsx
index 1598d34ce7..86b9f8483b 100644
--- a/frontend/hub/namespaces/hooks/useDeleteHubNamespaces.tsx
+++ b/frontend/hub/namespaces/hooks/useDeleteHubNamespaces.tsx
@@ -3,7 +3,7 @@ import { compareStrings, useBulkConfirmation } from '../../../../framework';
 import { requestDelete } from '../../../common/crud/Data';
 import { HubNamespace } from '../HubNamespace';
 import { useHubNamespacesColumns } from './useHubNamespacesColumns';
-import { hubAPI } from '../../api/utils';
+import { pulpAPI } from '../../api/utils';
 import { nameKeyFn } from '../../../common/utils/nameKeyFn';
 
 export function useDeleteHubNamespaces(onComplete: (namespaces: HubNamespace[]) => void) {
@@ -26,7 +26,7 @@ export function useDeleteHubNamespaces(onComplete: (namespaces: HubNamespace[])
       onComplete,
       alertPrompts: [t('Deleting a namespace will delete all collections in the namespace.')],
       actionFn: (namespace: HubNamespace) =>
-        requestDelete(hubAPI`/_ui/v1/namespaces/${namespace.name}/`),
+        requestDelete(pulpAPI`/pulp_ansible/namespaces/${namespace.name}`),
     });
   };
   return deleteHubNamespaces;

From 9de23e0dc025f8795b820b17355f32f47b8b0b77 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Thu, 27 Jul 2023 11:50:09 -0400
Subject: [PATCH 20/30] ns metadata tab in ns details

---
 frontend/hub/namespaces/HubMetaDataType.tsx   | 31 -----------
 .../hub/namespaces/HubNamespaceDetails.tsx    | 31 ++++++++---
 .../namespaces/HubNamespaceMetadataType.tsx   | 33 ++++++++++++
 .../hooks/useHubNamespaceMetadataColumns.tsx  | 53 +++++++++++++++++++
 4 files changed, 110 insertions(+), 38 deletions(-)
 delete mode 100644 frontend/hub/namespaces/HubMetaDataType.tsx
 create mode 100644 frontend/hub/namespaces/HubNamespaceMetadataType.tsx
 create mode 100644 frontend/hub/namespaces/hooks/useHubNamespaceMetadataColumns.tsx

diff --git a/frontend/hub/namespaces/HubMetaDataType.tsx b/frontend/hub/namespaces/HubMetaDataType.tsx
deleted file mode 100644
index 92a05e1bf3..0000000000
--- a/frontend/hub/namespaces/HubMetaDataType.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-export interface HubNamespaceMetadata {
-  metadata: {
-    pulp_href: string;
-    name: string;
-    company: string;
-    email: string;
-    description: string;
-    resources: string;
-    links: string[];
-    avatar_sha256: null;
-    avatar_url: null;
-    metadata_sha256: string;
-    groups: [];
-    task: null;
-  };
-  repository: {
-    pulp_href: string;
-    pulp_created: string;
-    versions_href: string;
-    pulp_labels: {
-      pipeline: string;
-    };
-    latest_version_href: string;
-    name: string;
-    description: string;
-    retain_repo_versions: number;
-    remote: null;
-  };
-  in_latest_repo_version: true;
-  in_old_repo_version: false;
-}
diff --git a/frontend/hub/namespaces/HubNamespaceDetails.tsx b/frontend/hub/namespaces/HubNamespaceDetails.tsx
index cc0d4d81b9..0972d70f18 100644
--- a/frontend/hub/namespaces/HubNamespaceDetails.tsx
+++ b/frontend/hub/namespaces/HubNamespaceDetails.tsx
@@ -10,14 +10,14 @@ import {
   PageTab,
   PageTabs,
 } from '../../../framework';
-import { PageDetailsFromColumns } from '../../../framework';
 import { RouteObj } from '../../Routes';
 import { useGet } from '../../common/crud/useGet';
 import { hubAPI } from '../api/utils';
 import { HubNamespace } from './HubNamespace';
 import { useHubView } from '../useHubView';
 import { useHubNamespaceActions } from './hooks/useHubNamespaceActions';
-import { useHubNamespacesColumns } from './hooks/useHubNamespacesColumns';
+import { HubNamespaceMetadataType } from './HubNamespaceMetadataType';
+import { useHubNamespaceMetadataColumns } from './hooks/useHubNamespaceMetadataColumns';
 import { useCollectionFilters } from '../collections/hooks/useCollectionFilters';
 import { useCollectionVersionColumns } from '../collections/hooks/useCollectionVersionColumns';
 import { CollectionVersionSearch } from '../collections/CollectionVersionSearch';
@@ -54,7 +54,7 @@ export function NamespaceDetails() {
           <CollectionsTab namespace={namespace} />
         </PageTab>
         <PageTab label={t('Namespace Details')}>
-          <NamespaceDetailsTab />
+          <NamespaceDetailsTab namespace={namespace} />
         </PageTab>
       </PageTabs>
     </PageLayout>
@@ -62,10 +62,27 @@ export function NamespaceDetails() {
 }
 
 function NamespaceDetailsTab(props: { namespace?: HubNamespace }) {
-  const { namespace } = props;
-  // eslint-disable-next-line no-console
-  const tableColumns = useHubNamespacesColumns();
-  return <PageDetailsFromColumns item={namespace} columns={tableColumns} />;
+  const { t } = useTranslation();
+  const tableColumns = useHubNamespaceMetadataColumns();
+  const view = useHubView<HubNamespaceMetadataType>({
+    url: hubAPI`/v3/plugin/ansible/search/namespace-metadata/`,
+    keyFn: (item) => item.metadata.pulp_href + ':' + item.repository.name,
+    tableColumns,
+    sortKey: 'order_by',
+    queryParams: { name: props?.namespace?.name },
+  });
+  return (
+    <PageLayout>
+      <PageTable<HubNamespaceMetadataType>
+        tableColumns={tableColumns}
+        errorStateTitle={t('Error loading collections')}
+        emptyStateTitle={t('No collections yet')}
+        {...view}
+        defaultTableView="list"
+        defaultSubtitle={t('Namespace details')}
+      />
+    </PageLayout>
+  );
 }
 
 function CollectionsTab(props: { namespace?: HubNamespace }) {
diff --git a/frontend/hub/namespaces/HubNamespaceMetadataType.tsx b/frontend/hub/namespaces/HubNamespaceMetadataType.tsx
new file mode 100644
index 0000000000..c83120eac9
--- /dev/null
+++ b/frontend/hub/namespaces/HubNamespaceMetadataType.tsx
@@ -0,0 +1,33 @@
+export interface Metadata {
+  pulp_href: string;
+  name: string;
+  company?: string;
+  email?: string;
+  description?: string;
+  resources?: string;
+  links: [];
+  avatar_sha256: null | string;
+  avatar_url: null | string;
+  metadata_sha256: string;
+  groups: [];
+  task: string | null;
+}
+
+export interface Repository {
+  pulp_href: string;
+  pulp_created: string;
+  versions_href: string;
+  pulp_labels: { pipeline: string };
+  latest_version_href: string;
+  name: string;
+  description: string;
+  retain_repo_versions: number;
+  remote: null | string;
+}
+
+export interface HubNamespaceMetadataType {
+  metadata: Metadata;
+  repository: Repository;
+  in_latest_repo_version: boolean;
+  in_old_repo_version: boolean;
+}
diff --git a/frontend/hub/namespaces/hooks/useHubNamespaceMetadataColumns.tsx b/frontend/hub/namespaces/hooks/useHubNamespaceMetadataColumns.tsx
new file mode 100644
index 0000000000..e1797cb91c
--- /dev/null
+++ b/frontend/hub/namespaces/hooks/useHubNamespaceMetadataColumns.tsx
@@ -0,0 +1,53 @@
+import { RedhatIcon } from '@patternfly/react-icons';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { ITableColumn, TextCell } from '../../../../framework';
+// routeobj will be used to direct to the edit ns metadata form.
+// import { RouteObj } from '../../../Routes';
+import { HubNamespaceMetadataType } from '../HubNamespaceMetadataType';
+export function useHubNamespaceMetadataColumns(_options?: {
+  disableSort?: boolean;
+  disableLinks?: boolean;
+}) {
+  const { t } = useTranslation();
+  const tableColumns = useMemo<ITableColumn<HubNamespaceMetadataType>[]>(
+    () => [
+      {
+        header: t('Name'),
+        cell: (namespace) => (
+          <TextCell
+            text={namespace.metadata.name}
+            // eventually this routes to the edit form for ns metadata.
+            // to={RouteObj.NamespaceDetails.replace(':id', namespace.name)}
+          />
+        ),
+        value: (namespace) => namespace.metadata.name,
+        sort: 'name',
+        card: 'name',
+        list: 'name',
+        icon: () => <RedhatIcon />,
+      },
+      {
+        header: t('Repository'),
+        type: 'text',
+        value: (namespace) => namespace.repository.name ?? undefined,
+        list: 'secondary',
+      },
+      {
+        header: t('Description'),
+        type: 'description',
+        value: (namespace) => namespace.metadata.description ?? undefined,
+        card: 'description',
+        list: 'description',
+      },
+      {
+        header: t('Links'),
+        type: 'text',
+        value: (namespace) => namespace.metadata.links ?? undefined,
+        list: 'secondary',
+      },
+    ],
+    [t]
+  );
+  return tableColumns;
+}

From 8cf081c97fef37969a225306e29d27f67855483f Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Thu, 3 Aug 2023 10:22:07 -0400
Subject: [PATCH 21/30] add namespace details tab info

---
 .../hub/namespaces/HubNamespaceDetails.tsx    |  11 +-
 .../hooks/useHubNamespaceMetadataColumns.tsx  |  12 +-
 .../hub/namespaces/hooks/useHubNamespaces.tsx |   6 +-
 frontend/hub/useHubView.tsx                   |  26 +---
 frontend/hub/usePulpSearchView.tsx            | 145 ++++++++++++++++++
 5 files changed, 166 insertions(+), 34 deletions(-)
 create mode 100644 frontend/hub/usePulpSearchView.tsx

diff --git a/frontend/hub/namespaces/HubNamespaceDetails.tsx b/frontend/hub/namespaces/HubNamespaceDetails.tsx
index 0972d70f18..1419e2f00b 100644
--- a/frontend/hub/namespaces/HubNamespaceDetails.tsx
+++ b/frontend/hub/namespaces/HubNamespaceDetails.tsx
@@ -15,6 +15,7 @@ import { useGet } from '../../common/crud/useGet';
 import { hubAPI } from '../api/utils';
 import { HubNamespace } from './HubNamespace';
 import { useHubView } from '../useHubView';
+import { usePulpSearchView } from '../usePulpSearchView';
 import { useHubNamespaceActions } from './hooks/useHubNamespaceActions';
 import { HubNamespaceMetadataType } from './HubNamespaceMetadataType';
 import { useHubNamespaceMetadataColumns } from './hooks/useHubNamespaceMetadataColumns';
@@ -64,7 +65,7 @@ export function NamespaceDetails() {
 function NamespaceDetailsTab(props: { namespace?: HubNamespace }) {
   const { t } = useTranslation();
   const tableColumns = useHubNamespaceMetadataColumns();
-  const view = useHubView<HubNamespaceMetadataType>({
+  const view = usePulpSearchView<HubNamespaceMetadataType>({
     url: hubAPI`/v3/plugin/ansible/search/namespace-metadata/`,
     keyFn: (item) => item.metadata.pulp_href + ':' + item.repository.name,
     tableColumns,
@@ -73,13 +74,13 @@ function NamespaceDetailsTab(props: { namespace?: HubNamespace }) {
   });
   return (
     <PageLayout>
-      <PageTable<HubNamespaceMetadataType>
+      <PageTable
         tableColumns={tableColumns}
-        errorStateTitle={t('Error loading collections')}
-        emptyStateTitle={t('No collections yet')}
+        errorStateTitle={t('Error loading namespaces')}
+        emptyStateTitle={t('No namespaces yet')}
         {...view}
         defaultTableView="list"
-        defaultSubtitle={t('Namespace details')}
+        defaultSubtitle={t('Namespace')}
       />
     </PageLayout>
   );
diff --git a/frontend/hub/namespaces/hooks/useHubNamespaceMetadataColumns.tsx b/frontend/hub/namespaces/hooks/useHubNamespaceMetadataColumns.tsx
index e1797cb91c..ce375da5c2 100644
--- a/frontend/hub/namespaces/hooks/useHubNamespaceMetadataColumns.tsx
+++ b/frontend/hub/namespaces/hooks/useHubNamespaceMetadataColumns.tsx
@@ -27,12 +27,6 @@ export function useHubNamespaceMetadataColumns(_options?: {
         list: 'name',
         icon: () => <RedhatIcon />,
       },
-      {
-        header: t('Repository'),
-        type: 'text',
-        value: (namespace) => namespace.repository.name ?? undefined,
-        list: 'secondary',
-      },
       {
         header: t('Description'),
         type: 'description',
@@ -40,11 +34,15 @@ export function useHubNamespaceMetadataColumns(_options?: {
         card: 'description',
         list: 'description',
       },
+      {
+        header: t('Repository'),
+        type: 'text',
+        value: (namespace) => namespace.repository.name ?? undefined,
+      },
       {
         header: t('Links'),
         type: 'text',
         value: (namespace) => namespace.metadata.links ?? undefined,
-        list: 'secondary',
       },
     ],
     [t]
diff --git a/frontend/hub/namespaces/hooks/useHubNamespaces.tsx b/frontend/hub/namespaces/hooks/useHubNamespaces.tsx
index d50f5ec6a5..8acbe279e6 100644
--- a/frontend/hub/namespaces/hooks/useHubNamespaces.tsx
+++ b/frontend/hub/namespaces/hooks/useHubNamespaces.tsx
@@ -1,9 +1,9 @@
 import { useGet } from '../../../common/crud/useGet';
-import { hubAPI } from '../../api/utils';
 import { HubItemsResponse } from '../../useHubView';
 import { HubNamespace } from '../HubNamespace';
+import { pulpAPI } from '../../api/utils';
 
 export function useHubNamespaces() {
-  const t = useGet<HubItemsResponse<HubNamespace>>(hubAPI`/_ui/v1/namespaces/`);
-  return t.data?.data;
+  const t = useGet<HubItemsResponse<HubNamespace>>(pulpAPI`/pulp_ansible/namespaces/`);
+  return t.data?.results;
 }
diff --git a/frontend/hub/useHubView.tsx b/frontend/hub/useHubView.tsx
index 9a6ec09179..c3dc078a92 100644
--- a/frontend/hub/useHubView.tsx
+++ b/frontend/hub/useHubView.tsx
@@ -22,6 +22,13 @@ export interface HubItemsResponse<T extends object> {
   };
 }
 
+export interface HubItemsResponse2<T> {
+  count: number;
+  next?: string | null;
+  previous?: string | null;
+  results: T[];
+}
+
 export interface HubNamespaceResponse<T extends object> {
   count: number;
   results: T[];
@@ -153,22 +160,3 @@ export function useHubView<T extends object>({
     };
   }, [data?.data, error, refresh, selection, unselectItemsAndRefresh, view]);
 }
-
-export async function getAwxError(err: unknown) {
-  if (err instanceof HTTPError) {
-    try {
-      const response = (await err.response.json()) as { __all__?: string[] };
-      if ('__all__' in response && Array.isArray(response.__all__)) {
-        return JSON.stringify(response.__all__[0]);
-      } else {
-        return JSON.stringify(response);
-      }
-    } catch {
-      return err.message;
-    }
-  } else if (err instanceof Error) {
-    return err.message;
-  } else {
-    return 'unknown error';
-  }
-}
diff --git a/frontend/hub/usePulpSearchView.tsx b/frontend/hub/usePulpSearchView.tsx
new file mode 100644
index 0000000000..b397f103db
--- /dev/null
+++ b/frontend/hub/usePulpSearchView.tsx
@@ -0,0 +1,145 @@
+import { HTTPError } from 'ky';
+import { useCallback, useMemo, useRef } from 'react';
+import useSWR from 'swr';
+import {
+  ISelected,
+  ITableColumn,
+  IToolbarFilter,
+  IView,
+  useSelected,
+  useView,
+} from '../../framework';
+import { useFetcher } from '../common/crud/Data';
+import { QueryParams, getQueryString, serverlessURL } from './api';
+
+export interface PulpSearchItemsResponse<T> {
+  count: number;
+  next?: string | null;
+  previous?: string | null;
+  results: T[];
+}
+
+export type IHubView<T extends object> = IView &
+  ISelected<T> & {
+    itemCount: number | undefined;
+    pageItems: T[] | undefined;
+    refresh: () => Promise<PulpSearchItemsResponse<T> | undefined>;
+    unselectItemsAndRefresh: (items: T[]) => void;
+  };
+
+export function usePulpSearchView<T extends object>({
+  url,
+  keyFn,
+  toolbarFilters,
+  tableColumns,
+  disableQueryString,
+  queryParams,
+  sortKey,
+  defaultFilters,
+}: {
+  url: string;
+  keyFn: (item: T) => string | number;
+  toolbarFilters?: IToolbarFilter[];
+  tableColumns?: ITableColumn<T>[];
+  disableQueryString?: boolean;
+  queryParams?: QueryParams;
+  sortKey?: string;
+  defaultFilters?: Record<string, string[]>;
+}): IHubView<T> {
+  const view = useView({
+    defaultValues: {
+      sort: tableColumns && tableColumns.length ? tableColumns[0].sort : undefined,
+      filters: defaultFilters,
+    },
+    disableQueryString,
+  });
+  const itemCountRef = useRef<{ itemCount: number | undefined }>({ itemCount: undefined });
+
+  const { page, perPage, sort, sortDirection, filters } = view;
+
+  let queryString = queryParams ? `?${getQueryString(queryParams)}` : '';
+
+  if (filters) {
+    for (const key in filters) {
+      const toolbarFilter = toolbarFilters?.find((filter) => filter.key === key);
+      if (toolbarFilter) {
+        const values = filters[key];
+        if (values.length > 0) {
+          queryString ? (queryString += '&') : (queryString += '?');
+          if (values.length > 1) {
+            queryString += values.map((value) => `or__${toolbarFilter.query}=${value}`).join('&');
+          } else {
+            queryString += `${toolbarFilter.query}=${values.join(',')}`;
+          }
+        }
+      }
+    }
+  }
+
+  if (sort) {
+    if (!sortKey) {
+      sortKey = 'sort';
+    }
+    queryString ? (queryString += '&') : (queryString += '?');
+    if (sortDirection === 'desc') {
+      queryString += `${sortKey}=-${sort}`;
+    } else {
+      queryString += `${sortKey}=${sort}`;
+    }
+  }
+
+  queryString ? (queryString += '&') : (queryString += '?');
+  queryString += `offset=${(page - 1) * perPage}`;
+
+  queryString ? (queryString += '&') : (queryString += '?');
+  queryString += `limit=${perPage}`;
+
+  url += queryString;
+  const fetcher = useFetcher();
+  const response = useSWR<PulpSearchItemsResponse<T>>(url, fetcher, {
+    dedupingInterval: 0,
+    refreshInterval: 30000,
+  });
+  const { data, mutate } = response;
+  const refresh = useCallback(() => mutate(), [mutate]);
+
+  const nextPage = serverlessURL(data?.next);
+  useSWR<PulpSearchItemsResponse<T>>(nextPage, fetcher, {
+    dedupingInterval: 0,
+  });
+
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+  let error: Error | undefined = response.error;
+  if (error instanceof HTTPError) {
+    if (error.response.status === 404 && view.page > 1) {
+      view.setPage(1);
+      error = undefined;
+    }
+  }
+
+  const selection = useSelected(data?.results ?? [], keyFn);
+
+  if (data?.count !== undefined) {
+    itemCountRef.current.itemCount = data?.count;
+  }
+
+  const unselectItemsAndRefresh = useCallback(
+    (items: T[]) => {
+      selection.unselectItems(items);
+      void refresh();
+    },
+    [refresh, selection]
+  );
+
+  return useMemo(() => {
+    return {
+      refresh,
+      itemCount: itemCountRef.current.itemCount,
+      pageItems: data?.results,
+      error,
+      ...view,
+      ...selection,
+      unselectItemsAndRefresh,
+    };
+  }, [data?.results, error, refresh, selection, unselectItemsAndRefresh, view]);
+}

From 70769790954d1c459c6036ff6a87cb724a771621 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Mon, 7 Aug 2023 16:00:25 -0400
Subject: [PATCH 22/30] namespace name on edit page should be readonly

---
 frontend/hub/namespaces/HubNamespaceForm.tsx | 24 ++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/frontend/hub/namespaces/HubNamespaceForm.tsx b/frontend/hub/namespaces/HubNamespaceForm.tsx
index ecc3700e09..2b972b6062 100644
--- a/frontend/hub/namespaces/HubNamespaceForm.tsx
+++ b/frontend/hub/namespaces/HubNamespaceForm.tsx
@@ -11,9 +11,9 @@ import { RouteObj } from '../../Routes';
 import { useGet } from '../../common/crud/useGet';
 import { usePatchRequest } from '../../common/crud/usePatchRequest';
 import { usePostRequest } from '../../common/crud/usePostRequest';
-import { hubAPI } from '../api/utils';
 import { HubNamespace } from './HubNamespace';
-import { hubAPI, pulpAPI } from '../api/utils';
+import { pulpAPI } from '../api/utils';
+import { ItemsResponse } from '../../common/crud/Data';
 
 export function CreateHubNamespace() {
   const { t } = useTranslation();
@@ -40,7 +40,7 @@ export function CreateHubNamespace() {
           latest_metadata: { groups: [] },
         }}
       >
-        <HubNamespaceInputs />
+        <HubNamespaceInputs isReadOnly={false} />
       </PageForm>
     </PageLayout>
   );
@@ -51,19 +51,22 @@ export function EditHubNamespace() {
   const navigate = useNavigate();
   const params = useParams<{ id?: string }>();
   const name = params.id;
-  const { data: namespace } = useGet<HubNamespace>(hubAPI`/_ui/v1/namespaces/${name ?? ''}/`);
+  const { data: namespacesResponse } = useGet<ItemsResponse<HubNamespace>>(
+    pulpAPI`/pulp_ansible/namespaces/?name=${name ?? ''}`
+  );
   const patchRequest = usePatchRequest<HubNamespace, HubNamespace>();
   const onSubmit: PageFormSubmitHandler<HubNamespace> = async (namespace) => {
-    await patchRequest(hubAPI`/_ui/v1/namespaces/`, namespace);
+    await patchRequest(pulpAPI`/pulp_ansible/namespaces/`, namespace);
     navigate(-1);
   };
-  if (!namespace) {
+  if (!namespacesResponse || namespacesResponse.results.length === 0) {
     return (
       <PageLayout>
         <PageHeader
           breadcrumbs={[
             { label: t('Namespaces'), to: RouteObj.Namespaces },
             { label: t('Edit Namespace') },
+            { label: params.id },
           ]}
         />
       </PageLayout>
@@ -76,6 +79,7 @@ export function EditHubNamespace() {
         breadcrumbs={[
           { label: t('Namespaces'), to: RouteObj.Namespaces },
           { label: t('Edit Namespace') },
+          { label: params.id },
         ]}
       />
 
@@ -83,16 +87,17 @@ export function EditHubNamespace() {
         submitText={t('Save namespace')}
         onSubmit={onSubmit}
         onCancel={() => navigate(-1)}
-        defaultValue={namespace}
+        defaultValue={namespacesResponse.results[0]}
       >
-        <HubNamespaceInputs />
+        <HubNamespaceInputs isReadOnly={true} />
       </PageForm>
     </PageLayout>
   );
 }
 
-function HubNamespaceInputs() {
+function HubNamespaceInputs(props: { isReadOnly?: boolean }) {
   const { t } = useTranslation();
+  const { isReadOnly } = props;
   return (
     <>
       <PageFormTextInput<HubNamespace>
@@ -100,6 +105,7 @@ function HubNamespaceInputs() {
         label={t('Name')}
         placeholder={t('Enter name')}
         isRequired
+        isReadOnly={isReadOnly}
       />
       <PageFormTextInput<HubNamespace>
         name="latest_metadata.description"

From cf0cc8217becf8e212d6364c8fa1d2dffe6ffb37 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Tue, 15 Aug 2023 09:51:31 -0400
Subject: [PATCH 23/30] edit forms for namespaces and sub-namespaces

---
 frontend/Routes.ts                            |  2 +-
 frontend/hub/HubRouter.tsx                    |  5 ++
 .../hub/namespaces/HubNamespaceDetails.tsx    |  4 +
 frontend/hub/namespaces/HubNamespaceForm.tsx  | 15 ----
 .../namespaces/HubNamespaceMetadataForm.tsx   | 89 +++++++++++++++++++
 .../hooks/useHubNamespaceMetadataActions.tsx  | 40 +++++++++
 6 files changed, 139 insertions(+), 16 deletions(-)
 create mode 100644 frontend/hub/namespaces/HubNamespaceMetadataForm.tsx
 create mode 100644 frontend/hub/namespaces/hooks/useHubNamespaceMetadataActions.tsx

diff --git a/frontend/Routes.ts b/frontend/Routes.ts
index b36f105fa5..ce81e0d768 100644
--- a/frontend/Routes.ts
+++ b/frontend/Routes.ts
@@ -212,7 +212,7 @@ export const RouteObj = {
   NamespaceDetails: `${hubRoutePrefix}/namespaces/:id`,
   CreateNamespace: `${hubRoutePrefix}/namespaces/create`,
   EditNamespace: `${hubRoutePrefix}/namespaces/:id/edit`,
-
+  EditNamespaceDetails: `${hubRoutePrefix}/namespaces/:id/edit-details`,
   Approvals: `${hubRoutePrefix}/approvals`,
   ApprovalDetails: `${hubRoutePrefix}/approvals/details/:id`,
 
diff --git a/frontend/hub/HubRouter.tsx b/frontend/hub/HubRouter.tsx
index cc96f69e16..37c8b930e8 100644
--- a/frontend/hub/HubRouter.tsx
+++ b/frontend/hub/HubRouter.tsx
@@ -9,6 +9,7 @@ import { HubDashboard } from './dashboard/Dashboard';
 import { ExecutionEnvironments } from './execution-environments/ExecutionEnvironments';
 import { NamespaceDetails } from './namespaces/HubNamespaceDetails';
 import { CreateHubNamespace, EditHubNamespace } from './namespaces/HubNamespaceForm';
+import { EditHubNamespaceMetadata } from './namespaces/HubNamespaceMetadataForm';
 import { CreateRemote } from './remotes/RemoteForm';
 import { Namespaces } from './namespaces/HubNamespaces';
 import { RemoteRegistries } from './remote-registries/RemoteRegistries';
@@ -34,6 +35,10 @@ export function HubRouter() {
       <Route path={RouteObjWithoutPrefix.CreateNamespace} element={<CreateHubNamespace />} />
       <Route path={RouteObjWithoutPrefix.EditNamespace} element={<EditHubNamespace />} />
       <Route path={RouteObjWithoutPrefix.NamespaceDetails} element={<NamespaceDetails />} />
+      <Route
+        path={RouteObjWithoutPrefix.EditNamespaceDetails}
+        element={<EditHubNamespaceMetadata />}
+      />
 
       <Route path={RouteObjWithoutPrefix.Repositories} element={<Repositories />} />
       <Route path={RouteObjWithoutPrefix.Approvals} element={<Approvals />} />
diff --git a/frontend/hub/namespaces/HubNamespaceDetails.tsx b/frontend/hub/namespaces/HubNamespaceDetails.tsx
index 1419e2f00b..bde0ac2d89 100644
--- a/frontend/hub/namespaces/HubNamespaceDetails.tsx
+++ b/frontend/hub/namespaces/HubNamespaceDetails.tsx
@@ -17,6 +17,8 @@ import { HubNamespace } from './HubNamespace';
 import { useHubView } from '../useHubView';
 import { usePulpSearchView } from '../usePulpSearchView';
 import { useHubNamespaceActions } from './hooks/useHubNamespaceActions';
+import { useHubNamespaceMetadataActions } from './hooks/useHubNamespaceMetadataActions';
+
 import { HubNamespaceMetadataType } from './HubNamespaceMetadataType';
 import { useHubNamespaceMetadataColumns } from './hooks/useHubNamespaceMetadataColumns';
 import { useCollectionFilters } from '../collections/hooks/useCollectionFilters';
@@ -65,6 +67,7 @@ export function NamespaceDetails() {
 function NamespaceDetailsTab(props: { namespace?: HubNamespace }) {
   const { t } = useTranslation();
   const tableColumns = useHubNamespaceMetadataColumns();
+  const rowActions = useHubNamespaceMetadataActions();
   const view = usePulpSearchView<HubNamespaceMetadataType>({
     url: hubAPI`/v3/plugin/ansible/search/namespace-metadata/`,
     keyFn: (item) => item.metadata.pulp_href + ':' + item.repository.name,
@@ -76,6 +79,7 @@ function NamespaceDetailsTab(props: { namespace?: HubNamespace }) {
     <PageLayout>
       <PageTable
         tableColumns={tableColumns}
+        rowActions={rowActions}
         errorStateTitle={t('Error loading namespaces')}
         emptyStateTitle={t('No namespaces yet')}
         {...view}
diff --git a/frontend/hub/namespaces/HubNamespaceForm.tsx b/frontend/hub/namespaces/HubNamespaceForm.tsx
index 2b972b6062..b29fb9faad 100644
--- a/frontend/hub/namespaces/HubNamespaceForm.tsx
+++ b/frontend/hub/namespaces/HubNamespaceForm.tsx
@@ -107,21 +107,6 @@ function HubNamespaceInputs(props: { isReadOnly?: boolean }) {
         isRequired
         isReadOnly={isReadOnly}
       />
-      <PageFormTextInput<HubNamespace>
-        name="latest_metadata.description"
-        label={t('Description')}
-        placeholder={t('Enter description')}
-      />
-      <PageFormTextInput<HubNamespace>
-        name="latest_metadata.company"
-        label={t('Company')}
-        placeholder={t('Enter company')}
-      />
-      <PageFormTextInput<HubNamespace>
-        name="latest_metadata.avatar_url"
-        label={t('Logo URL')}
-        placeholder={t('Enter logo URL')}
-      />
     </>
   );
 }
diff --git a/frontend/hub/namespaces/HubNamespaceMetadataForm.tsx b/frontend/hub/namespaces/HubNamespaceMetadataForm.tsx
new file mode 100644
index 0000000000..4c155f975e
--- /dev/null
+++ b/frontend/hub/namespaces/HubNamespaceMetadataForm.tsx
@@ -0,0 +1,89 @@
+import { useTranslation } from 'react-i18next';
+import { useNavigate, useParams } from 'react-router-dom';
+import {
+  PageForm,
+  PageFormSubmitHandler,
+  PageFormTextInput,
+  PageHeader,
+  PageLayout,
+} from '../../../framework';
+import { RouteObj } from '../../Routes';
+import { useGet } from '../../common/crud/useGet';
+import { usePatchRequest } from '../../common/crud/usePatchRequest';
+import { HubNamespaceMetadataType } from './HubNamespaceMetadataType';
+import { hubAPI } from '../api';
+import { ItemsResponse } from '../../common/crud/Data';
+
+export function EditHubNamespaceMetadata() {
+  const { t } = useTranslation();
+  const navigate = useNavigate();
+  const params = useParams<{ id?: string }>();
+  const name = params.id;
+  const { data: namespacesResponse } = useGet<ItemsResponse<HubNamespaceMetadataType>>(
+    hubAPI`/v3/plugin/ansible/search/namespace-metadata/?name=${name ?? ''}`
+  );
+  const patchRequest = usePatchRequest<HubNamespaceMetadataType>();
+  const onSubmit: PageFormSubmitHandler<HubNamespaceMetadataType> = async (namespace) => {
+    await patchRequest(hubAPI`/v3/plugin/ansible/search/namespace-metadata/`, namespace);
+    navigate(-1);
+  };
+  if (!namespacesResponse || namespacesResponse.results.length === 0) {
+    return (
+      <PageLayout>
+        <PageHeader
+          breadcrumbs={[
+            { label: t('Namespaces'), to: RouteObj.Namespaces },
+            { label: t('Edit Namespace Details') },
+            { label: params.id },
+          ]}
+        />
+      </PageLayout>
+    );
+  }
+  return (
+    <PageLayout>
+      <PageHeader
+        title={t('Edit Namespace Details')}
+        breadcrumbs={[
+          { label: t('Namespaces'), to: RouteObj.Namespaces },
+          { label: t('Edit Namespace Details') },
+          { label: params.id },
+        ]}
+      />
+
+      <PageForm<HubNamespaceMetadataType>
+        submitText={t('Save namespace')}
+        onSubmit={onSubmit}
+        onCancel={() => navigate(-1)}
+        defaultValue={namespacesResponse.results[0]}
+      >
+        <HubNamespaceMetadataInputs />
+      </PageForm>
+    </PageLayout>
+  );
+}
+
+function HubNamespaceMetadataInputs() {
+  const { t } = useTranslation();
+  return (
+    <>
+      <PageFormTextInput<HubNamespaceMetadataType>
+        name="metadata.name"
+        label={t('Name')}
+        placeholder={t('Enter name')}
+        isRequired
+        isReadOnly
+      />
+      <PageFormTextInput<HubNamespaceMetadataType>
+        name="metadata.description"
+        label={t('Description')}
+        placeholder={t('Enter description')}
+      />
+      <PageFormTextInput<HubNamespaceMetadataType>
+        name="metadata.company"
+        label={t('Company')}
+        placeholder={t('Enter company')}
+      />
+    </>
+  );
+}
diff --git a/frontend/hub/namespaces/hooks/useHubNamespaceMetadataActions.tsx b/frontend/hub/namespaces/hooks/useHubNamespaceMetadataActions.tsx
new file mode 100644
index 0000000000..6a2c5ada2c
--- /dev/null
+++ b/frontend/hub/namespaces/hooks/useHubNamespaceMetadataActions.tsx
@@ -0,0 +1,40 @@
+import { ButtonVariant } from '@patternfly/react-core';
+import { EditIcon, TrashIcon } from '@patternfly/react-icons';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
+import { IPageAction, PageActionSelection, PageActionType } from '../../../../framework';
+import { RouteObj } from '../../../Routes';
+import { HubNamespaceMetadataType } from '../HubNamespaceMetadataType';
+import { useDeleteHubNamespaces } from './useDeleteHubNamespaces';
+
+export function useHubNamespaceMetadataActions() {
+  const { t } = useTranslation();
+  const navigate = useNavigate();
+  const deleteHubNamespaces = useDeleteHubNamespaces(() => null);
+  return useMemo(() => {
+    const actions: IPageAction<HubNamespaceMetadataType>[] = [
+      {
+        type: PageActionType.Button,
+        selection: PageActionSelection.Single,
+        variant: ButtonVariant.primary,
+        isPinned: true,
+        icon: EditIcon,
+        label: t('Edit namespace details'),
+        onClick: (namespace) => {
+          navigate(RouteObj.EditNamespaceDetails.replace(':id', namespace.metadata.name));
+        },
+      },
+      { type: PageActionType.Seperator },
+      {
+        type: PageActionType.Button,
+        selection: PageActionSelection.Single,
+        icon: TrashIcon,
+        label: t('Delete namespace'),
+        onClick: (namespace) => deleteHubNamespaces([namespace]),
+        isDanger: true,
+      },
+    ];
+    return actions;
+  }, [deleteHubNamespaces, navigate, t]);
+}

From 232e646c99a76e23d66bb200a825655d224e18b1 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Tue, 15 Aug 2023 13:39:54 -0400
Subject: [PATCH 24/30] update sorting and filters

---
 .../hub/namespaces/HubNamespaceDetails.tsx    | 12 ++++--
 .../namespaces/HubNamespaceMetadataForm.tsx   |  5 +++
 .../hooks/useHubNamespaceDetailsFilters.tsx   | 20 ++++++++++
 .../useHubNamespaceDetailsToolbarActions.tsx  | 37 +++++++++++++++++++
 4 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 frontend/hub/namespaces/hooks/useHubNamespaceDetailsFilters.tsx
 create mode 100644 frontend/hub/namespaces/hooks/useHubNamespaceDetailsToolbarActions.tsx

diff --git a/frontend/hub/namespaces/HubNamespaceDetails.tsx b/frontend/hub/namespaces/HubNamespaceDetails.tsx
index bde0ac2d89..0523ea2700 100644
--- a/frontend/hub/namespaces/HubNamespaceDetails.tsx
+++ b/frontend/hub/namespaces/HubNamespaceDetails.tsx
@@ -14,14 +14,15 @@ import { RouteObj } from '../../Routes';
 import { useGet } from '../../common/crud/useGet';
 import { hubAPI } from '../api/utils';
 import { HubNamespace } from './HubNamespace';
+import { HubNamespaceMetadataType } from './HubNamespaceMetadataType';
 import { useHubView } from '../useHubView';
 import { usePulpSearchView } from '../usePulpSearchView';
+import { useHubNamespaceDetailsToolbarActions } from './hooks/useHubNamespaceDetailsToolbarActions';
 import { useHubNamespaceActions } from './hooks/useHubNamespaceActions';
 import { useHubNamespaceMetadataActions } from './hooks/useHubNamespaceMetadataActions';
-
-import { HubNamespaceMetadataType } from './HubNamespaceMetadataType';
 import { useHubNamespaceMetadataColumns } from './hooks/useHubNamespaceMetadataColumns';
 import { useCollectionFilters } from '../collections/hooks/useCollectionFilters';
+import { useHubNamespaceDetailsFilters } from '../namespaces/hooks/useHubNamespaceDetailsFilters';
 import { useCollectionVersionColumns } from '../collections/hooks/useCollectionVersionColumns';
 import { CollectionVersionSearch } from '../collections/CollectionVersionSearch';
 import { hubAPI } from '../api';
@@ -45,7 +46,7 @@ export function NamespaceDetails() {
         title={namespace?.name}
         breadcrumbs={[{ label: t('Namespaces'), to: RouteObj.Namespaces }, { label: params.id }]}
         headerActions={
-          <PageActions<HubNamespace>
+          <PageActions<HubNamespaceMetadataType>
             actions={pageActions}
             position={DropdownPosition.right}
             selectedItem={namespace}
@@ -66,12 +67,15 @@ export function NamespaceDetails() {
 
 function NamespaceDetailsTab(props: { namespace?: HubNamespace }) {
   const { t } = useTranslation();
+  const toolbarFilters = useHubNamespaceDetailsFilters();
+  const toolbarActions = useHubNamespaceDetailsToolbarActions();
   const tableColumns = useHubNamespaceMetadataColumns();
   const rowActions = useHubNamespaceMetadataActions();
   const view = usePulpSearchView<HubNamespaceMetadataType>({
     url: hubAPI`/v3/plugin/ansible/search/namespace-metadata/`,
     keyFn: (item) => item.metadata.pulp_href + ':' + item.repository.name,
     tableColumns,
+    toolbarFilters,
     sortKey: 'order_by',
     queryParams: { name: props?.namespace?.name },
   });
@@ -80,6 +84,8 @@ function NamespaceDetailsTab(props: { namespace?: HubNamespace }) {
       <PageTable
         tableColumns={tableColumns}
         rowActions={rowActions}
+        toolbarActions={toolbarActions}
+        toolbarFilters={toolbarFilters}
         errorStateTitle={t('Error loading namespaces')}
         emptyStateTitle={t('No namespaces yet')}
         {...view}
diff --git a/frontend/hub/namespaces/HubNamespaceMetadataForm.tsx b/frontend/hub/namespaces/HubNamespaceMetadataForm.tsx
index 4c155f975e..1db3574ef9 100644
--- a/frontend/hub/namespaces/HubNamespaceMetadataForm.tsx
+++ b/frontend/hub/namespaces/HubNamespaceMetadataForm.tsx
@@ -84,6 +84,11 @@ function HubNamespaceMetadataInputs() {
         label={t('Company')}
         placeholder={t('Enter company')}
       />
+      <PageFormTextInput<HubNamespaceMetadataType>
+        name="metadata.avatar_url"
+        label={t('Logo')}
+        placeholder={t('Enter logo url')}
+      />
     </>
   );
 }
diff --git a/frontend/hub/namespaces/hooks/useHubNamespaceDetailsFilters.tsx b/frontend/hub/namespaces/hooks/useHubNamespaceDetailsFilters.tsx
new file mode 100644
index 0000000000..8f834b7cb1
--- /dev/null
+++ b/frontend/hub/namespaces/hooks/useHubNamespaceDetailsFilters.tsx
@@ -0,0 +1,20 @@
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { IToolbarFilter, ToolbarFilterType } from '../../../../framework';
+
+export function useHubNamespaceDetailsFilters() {
+  const { t } = useTranslation();
+  const toolbarFilters = useMemo<IToolbarFilter[]>(
+    () => [
+      {
+        key: 'repository_name__icontains',
+        label: t('Repository'),
+        type: ToolbarFilterType.Text,
+        query: 'repository_name__icontains',
+        comparison: 'contains',
+      },
+    ],
+    [t]
+  );
+  return toolbarFilters;
+}
diff --git a/frontend/hub/namespaces/hooks/useHubNamespaceDetailsToolbarActions.tsx b/frontend/hub/namespaces/hooks/useHubNamespaceDetailsToolbarActions.tsx
new file mode 100644
index 0000000000..6dfd1cc183
--- /dev/null
+++ b/frontend/hub/namespaces/hooks/useHubNamespaceDetailsToolbarActions.tsx
@@ -0,0 +1,37 @@
+import { ButtonVariant } from '@patternfly/react-core';
+import { PlusIcon, TrashIcon } from '@patternfly/react-icons';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { IPageAction, PageActionSelection, PageActionType } from '../../../../framework';
+import { RouteObj } from '../../../Routes';
+import { HubNamespaceMetadataType } from '../HubNamespaceMetadataType';
+import { useDeleteHubNamespaces } from './useDeleteHubNamespaces';
+
+export function useHubNamespaceDetailsToolbarActions() {
+  const { t } = useTranslation();
+  const deleteHubNamespaces = useDeleteHubNamespaces(() => null);
+
+  return useMemo<IPageAction<HubNamespaceMetadataType>[]>(
+    () => [
+      {
+        type: PageActionType.Link,
+        selection: PageActionSelection.None,
+        isPinned: true,
+        variant: ButtonVariant.primary,
+        icon: PlusIcon,
+        label: t('Create namespace'),
+        href: RouteObj.CreateNamespace,
+      },
+      { type: PageActionType.Seperator },
+      {
+        type: PageActionType.Button,
+        selection: PageActionSelection.Multiple,
+        icon: TrashIcon,
+        label: t('Delete selected namesapces'),
+        onClick: deleteHubNamespaces,
+        isDanger: true,
+      },
+    ],
+    [deleteHubNamespaces, t]
+  );
+}

From c3110ffec2c3458961e11ec1bd8c617893fea719 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Tue, 15 Aug 2023 15:16:52 -0400
Subject: [PATCH 25/30] remove create button from ns details page

---
 .../hooks/useHubNamespaceDetailsToolbarActions.tsx | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/frontend/hub/namespaces/hooks/useHubNamespaceDetailsToolbarActions.tsx b/frontend/hub/namespaces/hooks/useHubNamespaceDetailsToolbarActions.tsx
index 6dfd1cc183..ee15a96a2e 100644
--- a/frontend/hub/namespaces/hooks/useHubNamespaceDetailsToolbarActions.tsx
+++ b/frontend/hub/namespaces/hooks/useHubNamespaceDetailsToolbarActions.tsx
@@ -1,9 +1,7 @@
-import { ButtonVariant } from '@patternfly/react-core';
-import { PlusIcon, TrashIcon } from '@patternfly/react-icons';
+import { TrashIcon } from '@patternfly/react-icons';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { IPageAction, PageActionSelection, PageActionType } from '../../../../framework';
-import { RouteObj } from '../../../Routes';
 import { HubNamespaceMetadataType } from '../HubNamespaceMetadataType';
 import { useDeleteHubNamespaces } from './useDeleteHubNamespaces';
 
@@ -13,16 +11,6 @@ export function useHubNamespaceDetailsToolbarActions() {
 
   return useMemo<IPageAction<HubNamespaceMetadataType>[]>(
     () => [
-      {
-        type: PageActionType.Link,
-        selection: PageActionSelection.None,
-        isPinned: true,
-        variant: ButtonVariant.primary,
-        icon: PlusIcon,
-        label: t('Create namespace'),
-        href: RouteObj.CreateNamespace,
-      },
-      { type: PageActionType.Seperator },
       {
         type: PageActionType.Button,
         selection: PageActionSelection.Multiple,

From a4fedec2e146b872bc81fac3c32b1c0b985191e9 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Wed, 16 Aug 2023 14:47:59 -0400
Subject: [PATCH 26/30] fix repo filter

---
 frontend/hub/usePulpSearchView.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/hub/usePulpSearchView.tsx b/frontend/hub/usePulpSearchView.tsx
index b397f103db..dd5b6e5162 100644
--- a/frontend/hub/usePulpSearchView.tsx
+++ b/frontend/hub/usePulpSearchView.tsx
@@ -49,21 +49,21 @@ export function usePulpSearchView<T extends object>({
   const view = useView({
     defaultValues: {
       sort: tableColumns && tableColumns.length ? tableColumns[0].sort : undefined,
-      filters: defaultFilters,
+      filterState: defaultFilters,
     },
     disableQueryString,
   });
   const itemCountRef = useRef<{ itemCount: number | undefined }>({ itemCount: undefined });
 
-  const { page, perPage, sort, sortDirection, filters } = view;
+  const { page, perPage, sort, sortDirection, filterState } = view;
 
   let queryString = queryParams ? `?${getQueryString(queryParams)}` : '';
 
-  if (filters) {
-    for (const key in filters) {
+  if (filterState) {
+    for (const key in filterState) {
       const toolbarFilter = toolbarFilters?.find((filter) => filter.key === key);
       if (toolbarFilter) {
-        const values = filters[key];
+        const values = filterState[key];
         if (values.length > 0) {
           queryString ? (queryString += '&') : (queryString += '?');
           if (values.length > 1) {

From 72eab4943d64bcc45c0f9f7a5a40ffd70a443376 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Thu, 17 Aug 2023 10:37:47 -0400
Subject: [PATCH 27/30] change ns details edit route name

---
 frontend/Routes.ts         | 2 +-
 frontend/hub/HubRouter.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/Routes.ts b/frontend/Routes.ts
index ce81e0d768..eb7c694368 100644
--- a/frontend/Routes.ts
+++ b/frontend/Routes.ts
@@ -212,7 +212,7 @@ export const RouteObj = {
   NamespaceDetails: `${hubRoutePrefix}/namespaces/:id`,
   CreateNamespace: `${hubRoutePrefix}/namespaces/create`,
   EditNamespace: `${hubRoutePrefix}/namespaces/:id/edit`,
-  EditNamespaceDetails: `${hubRoutePrefix}/namespaces/:id/edit-details`,
+  EditNamespaceMetadataDetails: `${hubRoutePrefix}/namespaces/:id/edit-details`,
   Approvals: `${hubRoutePrefix}/approvals`,
   ApprovalDetails: `${hubRoutePrefix}/approvals/details/:id`,
 
diff --git a/frontend/hub/HubRouter.tsx b/frontend/hub/HubRouter.tsx
index 37c8b930e8..e42a63b80a 100644
--- a/frontend/hub/HubRouter.tsx
+++ b/frontend/hub/HubRouter.tsx
@@ -36,7 +36,7 @@ export function HubRouter() {
       <Route path={RouteObjWithoutPrefix.EditNamespace} element={<EditHubNamespace />} />
       <Route path={RouteObjWithoutPrefix.NamespaceDetails} element={<NamespaceDetails />} />
       <Route
-        path={RouteObjWithoutPrefix.EditNamespaceDetails}
+        path={RouteObjWithoutPrefix.EditNamespaceMetadataDetails}
         element={<EditHubNamespaceMetadata />}
       />
 

From ff89ec9228f0ed79548d22bac40bb00478708d4d Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Tue, 22 Aug 2023 09:47:55 -0400
Subject: [PATCH 28/30] fix tsc error

---
 frontend/hub/namespaces/HubNamespaceDetails.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/hub/namespaces/HubNamespaceDetails.tsx b/frontend/hub/namespaces/HubNamespaceDetails.tsx
index 0523ea2700..fe05baf303 100644
--- a/frontend/hub/namespaces/HubNamespaceDetails.tsx
+++ b/frontend/hub/namespaces/HubNamespaceDetails.tsx
@@ -46,7 +46,7 @@ export function NamespaceDetails() {
         title={namespace?.name}
         breadcrumbs={[{ label: t('Namespaces'), to: RouteObj.Namespaces }, { label: params.id }]}
         headerActions={
-          <PageActions<HubNamespaceMetadataType>
+          <PageActions<HubNamespace>
             actions={pageActions}
             position={DropdownPosition.right}
             selectedItem={namespace}

From f64622959011a1189f0646959065afba4096fb33 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Tue, 22 Aug 2023 10:22:20 -0400
Subject: [PATCH 29/30] fix rebase issues

---
 frontend/hub/namespaces/HubNamespaceDetails.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/hub/namespaces/HubNamespaceDetails.tsx b/frontend/hub/namespaces/HubNamespaceDetails.tsx
index fe05baf303..9ee9600d55 100644
--- a/frontend/hub/namespaces/HubNamespaceDetails.tsx
+++ b/frontend/hub/namespaces/HubNamespaceDetails.tsx
@@ -25,8 +25,6 @@ import { useCollectionFilters } from '../collections/hooks/useCollectionFilters'
 import { useHubNamespaceDetailsFilters } from '../namespaces/hooks/useHubNamespaceDetailsFilters';
 import { useCollectionVersionColumns } from '../collections/hooks/useCollectionVersionColumns';
 import { CollectionVersionSearch } from '../collections/CollectionVersionSearch';
-import { hubAPI } from '../api';
-import { DropdownPosition } from '@patternfly/react-core';
 
 export function NamespaceDetails() {
   const { t } = useTranslation();

From a0af763d854c1e35d800994fc4967064e4295450 Mon Sep 17 00:00:00 2001
From: Shaiah Emigh-Doyle <semighdo@redhat.com>
Date: Tue, 22 Aug 2023 13:12:17 -0400
Subject: [PATCH 30/30] fix some eslint errors

---
 frontend/hub/collections/CollectionDetails.tsx | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/frontend/hub/collections/CollectionDetails.tsx b/frontend/hub/collections/CollectionDetails.tsx
index b3eb726fb6..12a5b17cc2 100644
--- a/frontend/hub/collections/CollectionDetails.tsx
+++ b/frontend/hub/collections/CollectionDetails.tsx
@@ -312,11 +312,7 @@ function CollectionDocumentationTabContent(props: {
                       <div>{option.name}</div>
                       <small style={{ opacity: 0.7 }}>{option.type}</small>
                     </Td>
-                    <Td>
-                      {option.choices?.map((choice) => (
-                        <p key={choice}>{choice}</p>
-                      ))}
-                    </Td>
+                    <Td>{option.choices?.map((choice) => <p key={choice}>{choice}</p>)}</Td>
                     <Td>{option.description}</Td>
                   </Tr>
                 ))}
@@ -329,9 +325,7 @@ function CollectionDocumentationTabContent(props: {
         <PageSection variant="light">
           <Stack hasGutter>
             <Title headingLevel="h2">{t('Notes')}</Title>
-            {content?.doc_strings?.doc.notes?.map((note, index) => (
-              <p key={index}>{note}</p>
-            ))}
+            {content?.doc_strings?.doc.notes?.map((note, index) => <p key={index}>{note}</p>)}
           </Stack>
         </PageSection>
       )}
@@ -434,9 +428,9 @@ function CollectionImportLogTab(props: { collection?: CollectionVersionSearch })
               variant="danger"
               title={
                 <Stack>
-                  {collectionImport?.error?.description.split('\n').map((line, index) => (
-                    <StackItem key={index}>{line}</StackItem>
-                  ))}
+                  {collectionImport?.error?.description
+                    .split('\n')
+                    .map((line, index) => <StackItem key={index}>{line}</StackItem>)}
                 </Stack>
               }
               isInline