From adde47f07648fe238dfa3939dd6e8c5df986c645 Mon Sep 17 00:00:00 2001
From: Julien <julien.hery@ext.adeo.com>
Date: Fri, 25 Oct 2024 11:27:34 +0200
Subject: [PATCH] fix(plugin-catalog): add searchable column for displayName

Signed-off-by: Julien <julien.hery@ext.adeo.com>
---
 .../catalog/src/components/CatalogTable/columns.tsx    | 10 ++++++++++
 .../CatalogTable/defaultCatalogTableColumnsFunc.tsx    | 10 +++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/plugins/catalog/src/components/CatalogTable/columns.tsx b/plugins/catalog/src/components/CatalogTable/columns.tsx
index d5362badda..fc804fc22f 100644
--- a/plugins/catalog/src/components/CatalogTable/columns.tsx
+++ b/plugins/catalog/src/components/CatalogTable/columns.tsx
@@ -180,6 +180,16 @@ export const columnFactories = Object.freeze({
       searchable: true,
     };
   },
+  createDisplayNameColumn(options?: {
+    hidden?: boolean;
+  }): TableColumn<CatalogTableRow> {
+    return {
+      title: 'Display Name',
+      field: 'entity.spec.profile.displayName',
+      hidden: options?.hidden,
+      searchable: true,
+    };
+  },
   createLabelColumn(
     key: string,
     options?: { title?: string; defaultValue?: string },
diff --git a/plugins/catalog/src/components/CatalogTable/defaultCatalogTableColumnsFunc.tsx b/plugins/catalog/src/components/CatalogTable/defaultCatalogTableColumnsFunc.tsx
index 54dd701770..f5f41c1e32 100644
--- a/plugins/catalog/src/components/CatalogTable/defaultCatalogTableColumnsFunc.tsx
+++ b/plugins/catalog/src/components/CatalogTable/defaultCatalogTableColumnsFunc.tsx
@@ -46,11 +46,19 @@ export const defaultCatalogTableColumnsFunc: CatalogTableColumnsFunc = ({
     ];
     switch (filters.kind?.value) {
       case 'user':
-        return [...descriptionTagColumns];
+        return [
+          columnFactories.createDisplayNameColumn({ hidden: true }),
+          ...descriptionTagColumns,
+        ];
       case 'domain':
       case 'system':
         return [columnFactories.createOwnerColumn(), ...descriptionTagColumns];
       case 'group':
+        return [
+          columnFactories.createDisplayNameColumn({ hidden: true }),
+          columnFactories.createSpecTypeColumn({ hidden: !showTypeColumn }),
+          ...descriptionTagColumns,
+        ];
       case 'template':
         return [
           columnFactories.createSpecTypeColumn({ hidden: !showTypeColumn }),