Merge pull request #26683 from bforbis/catalog-table-location-columns

Catalog table location columns

.changeset/chilled-dolphins-join.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog': minor
+---
+
+Updated default columns for location entities to remove description and tags from the catalog table view.

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',

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,
+            ];
     }
   }
 };