From 61a9d35578d43b7551230b7648c0c33db40ec4e7 Mon Sep 17 00:00:00 2001
From: Paul Stoker <pstoker@spotify.com>
Date: Fri, 17 Nov 2023 09:43:18 +0100
Subject: [PATCH] Pass default columns func on prop

Signed-off-by: Paul Stoker <pstoker@spotify.com>
---
 .../components/CatalogTable/CatalogTable.tsx  | 92 ++++++++++---------
 1 file changed, 47 insertions(+), 45 deletions(-)

diff --git a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
index 9f94993cdc..7aa6d43f6c 100644
--- a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
+++ b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
@@ -86,53 +86,57 @@ const refCompare = (a: Entity, b: Entity) => {
   return toRef(a).localeCompare(toRef(b));
 };
 
+const defaultColumnsFunc: CatalogTableColumnsFunc = ({ filters, entities }) => {
+  return [
+    columnFactories.createTitleColumn({ hidden: true }),
+    columnFactories.createNameColumn({ defaultKind: filters.kind?.value }),
+    ...createEntitySpecificColumns(),
+    columnFactories.createMetadataDescriptionColumn(),
+    columnFactories.createTagsColumn(),
+  ];
+
+  function createEntitySpecificColumns(): TableColumn<CatalogTableRow>[] {
+    const baseColumns = [
+      columnFactories.createSystemColumn(),
+      columnFactories.createOwnerColumn(),
+      columnFactories.createSpecTypeColumn(),
+      columnFactories.createSpecLifecycleColumn(),
+    ];
+    switch (filters.kind?.value) {
+      case 'user':
+        return [];
+      case 'domain':
+      case 'system':
+        return [columnFactories.createOwnerColumn()];
+      case 'group':
+      case 'template':
+        return [columnFactories.createSpecTypeColumn()];
+      case 'location':
+        return [
+          columnFactories.createSpecTypeColumn(),
+          columnFactories.createSpecTargetsColumn(),
+        ];
+      default:
+        return entities.every(entity => entity.metadata.namespace === 'default')
+          ? baseColumns
+          : [...baseColumns, columnFactories.createNamespaceColumn()];
+    }
+  }
+};
+
 /** @public */
 export const CatalogTable = (props: CatalogTableProps) => {
-  const { columns, actions, tableOptions, subtitle, emptyContent } = props;
+  const {
+    columns = defaultColumnsFunc,
+    actions,
+    tableOptions,
+    subtitle,
+    emptyContent,
+  } = props;
   const { isStarredEntity, toggleStarredEntity } = useStarredEntities();
   const entityListContext = useEntityList();
   const { loading, error, entities, filters } = entityListContext;
 
-  const defaultColumns: TableColumn<CatalogTableRow>[] = useMemo(() => {
-    return [
-      columnFactories.createTitleColumn({ hidden: true }),
-      columnFactories.createNameColumn({ defaultKind: filters.kind?.value }),
-      ...createEntitySpecificColumns(),
-      columnFactories.createMetadataDescriptionColumn(),
-      columnFactories.createTagsColumn(),
-    ];
-
-    function createEntitySpecificColumns(): TableColumn<CatalogTableRow>[] {
-      const baseColumns = [
-        columnFactories.createSystemColumn(),
-        columnFactories.createOwnerColumn(),
-        columnFactories.createSpecTypeColumn(),
-        columnFactories.createSpecLifecycleColumn(),
-      ];
-      switch (filters.kind?.value) {
-        case 'user':
-          return [];
-        case 'domain':
-        case 'system':
-          return [columnFactories.createOwnerColumn()];
-        case 'group':
-        case 'template':
-          return [columnFactories.createSpecTypeColumn()];
-        case 'location':
-          return [
-            columnFactories.createSpecTypeColumn(),
-            columnFactories.createSpecTargetsColumn(),
-          ];
-        default:
-          return entities.every(
-            entity => entity.metadata.namespace === 'default',
-          )
-            ? baseColumns
-            : [...baseColumns, columnFactories.createNamespaceColumn()];
-      }
-    }
-  }, [filters.kind?.value, entities]);
-
   const overrideColumns = useMemo(() => {
     return typeof columns === 'function' ? columns(entityListContext) : columns;
   }, [columns, entityListContext]);
@@ -243,9 +247,7 @@ export const CatalogTable = (props: CatalogTableProps) => {
     };
   });
 
-  const typeColumn = (overrideColumns || defaultColumns).find(
-    c => c.title === 'Type',
-  );
+  const typeColumn = overrideColumns.find(c => c.title === 'Type');
   if (typeColumn) {
     typeColumn.hidden = !showTypeColumn;
   }
@@ -259,7 +261,7 @@ export const CatalogTable = (props: CatalogTableProps) => {
   return (
     <Table<CatalogTableRow>
       isLoading={loading}
-      columns={overrideColumns || defaultColumns}
+      columns={overrideColumns}
       options={{
         paging: showPagination,
         pageSize: 20,