From cb373befaf5769974029072d6ad2caa8b0a629c9 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Fri, 23 Apr 2021 15:27:24 +0300 Subject: [PATCH] Enable search on catalog (#2600) Signed-off-by: Jari Kolehmainen --- src/renderer/components/+catalog/catalog-entity.store.ts | 9 +++++++++ src/renderer/components/+catalog/catalog.tsx | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/renderer/components/+catalog/catalog-entity.store.ts b/src/renderer/components/+catalog/catalog-entity.store.ts index 49043fed70..2e0e034743 100644 --- a/src/renderer/components/+catalog/catalog-entity.store.ts +++ b/src/renderer/components/+catalog/catalog-entity.store.ts @@ -44,6 +44,15 @@ export class CatalogEntityItem implements ItemObject { return this.entity.metadata.source || "unknown"; } + get searchFields() { + return [ + this.name, + this.id, + this.phase, + ...this.labels.map((value, key) => `${key}=${value}`) + ]; + } + onRun(ctx: CatalogEntityActionContext) { this.entity.onRun(ctx); } diff --git a/src/renderer/components/+catalog/catalog.tsx b/src/renderer/components/+catalog/catalog.tsx index 478a282698..d5b4216ab0 100644 --- a/src/renderer/components/+catalog/catalog.tsx +++ b/src/renderer/components/+catalog/catalog.tsx @@ -163,9 +163,12 @@ export class Catalog extends React.Component { [sortBy.source]: (item: CatalogEntityItem) => item.source, [sortBy.status]: (item: CatalogEntityItem) => item.phase, }} + searchFilters={[ + (entity: CatalogEntityItem) => entity.searchFields, + ]} renderTableHeader={[ { title: "Name", className: "name", sortBy: sortBy.name }, - { title: "Source", className: "source" }, + { title: "Source", className: "source", sortBy: sortBy.source }, { title: "Labels", className: "labels" }, { title: "Status", className: "status", sortBy: sortBy.status }, ]}