From 7853e701099e647c2dfde4c08881ecdcd6abe89f Mon Sep 17 00:00:00 2001
From: Brian Forbis <bforbis@athenahealth.com>
Date: Sat, 14 Sep 2024 13:52:01 -0400
Subject: [PATCH] Remove description/tag from default columns for Location
 entity

Signed-off-by: Brian Forbis <bforbis@athenahealth.com>
---
 .../CatalogTable/CatalogTable.test.tsx        |  9 +--------
 .../defaultCatalogTableColumnsFunc.tsx        | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/plugins/catalog/src/components/CatalogTable/CatalogTable.test.tsx b/plugins/catalog/src/components/CatalogTable/CatalogTable.test.tsx
index 35639069df..fea2580d2f 100644
--- a/plugins/catalog/src/components/CatalogTable/CatalogTable.test.tsx
+++ b/plugins/catalog/src/components/CatalogTable/CatalogTable.test.tsx
@@ -222,14 +222,7 @@ describe('CatalogTable component', () => {
     },
     {
       kind: 'location',
-      expectedColumns: [
-        'Name',
-        'Type',
-        'Targets',
-        'Description',
-        'Tags',
-        'Actions',
-      ],
+      expectedColumns: ['Name', 'Type', 'Targets', 'Actions'],
     },
     {
       kind: 'resource',
diff --git a/plugins/catalog/src/components/CatalogTable/defaultCatalogTableColumnsFunc.tsx b/plugins/catalog/src/components/CatalogTable/defaultCatalogTableColumnsFunc.tsx
index 85f44d3f51..54dd701770 100644
--- a/plugins/catalog/src/components/CatalogTable/defaultCatalogTableColumnsFunc.tsx
+++ b/plugins/catalog/src/components/CatalogTable/defaultCatalogTableColumnsFunc.tsx
@@ -31,11 +31,13 @@ export const defaultCatalogTableColumnsFunc: CatalogTableColumnsFunc = ({
     columnFactories.createTitleColumn({ hidden: true }),
     columnFactories.createNameColumn({ defaultKind: filters.kind?.value }),
     ...createEntitySpecificColumns(),
-    columnFactories.createMetadataDescriptionColumn(),
-    columnFactories.createTagsColumn(),
   ];
 
   function createEntitySpecificColumns(): TableColumn<CatalogTableRow>[] {
+    const descriptionTagColumns = [
+      columnFactories.createMetadataDescriptionColumn(),
+      columnFactories.createTagsColumn(),
+    ];
     const baseColumns = [
       columnFactories.createSystemColumn(),
       columnFactories.createOwnerColumn(),
@@ -44,14 +46,15 @@ export const defaultCatalogTableColumnsFunc: CatalogTableColumnsFunc = ({
     ];
     switch (filters.kind?.value) {
       case 'user':
-        return [];
+        return [...descriptionTagColumns];
       case 'domain':
       case 'system':
-        return [columnFactories.createOwnerColumn()];
+        return [columnFactories.createOwnerColumn(), ...descriptionTagColumns];
       case 'group':
       case 'template':
         return [
           columnFactories.createSpecTypeColumn({ hidden: !showTypeColumn }),
+          ...descriptionTagColumns,
         ];
       case 'location':
         return [
@@ -60,8 +63,12 @@ export const defaultCatalogTableColumnsFunc: CatalogTableColumnsFunc = ({
         ];
       default:
         return entities.every(entity => entity.metadata.namespace === 'default')
-          ? baseColumns
-          : [...baseColumns, columnFactories.createNamespaceColumn()];
+          ? [...baseColumns, ...descriptionTagColumns]
+          : [
+              ...baseColumns,
+              columnFactories.createNamespaceColumn(),
+              ...descriptionTagColumns,
+            ];
     }
   }
 };