From 2a6759430b276ca33e15d984ca0673c751760f8a Mon Sep 17 00:00:00 2001
From: Heikki Hellgren <heikki.hellgren@op.fi>
Date: Tue, 15 Oct 2024 10:16:57 +0300
Subject: [PATCH] fix: use default catalog toolbar for offset catalog table

mostly to get debounce working the same way with the entity text filter

Signed-off-by: Heikki Hellgren <heikki.hellgren@op.fi>
---
 .changeset/curvy-poems-joke.md                 |  5 +++++
 .../OffsetPaginatedCatalogTable.tsx            | 18 +++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/curvy-poems-joke.md

diff --git a/.changeset/curvy-poems-joke.md b/.changeset/curvy-poems-joke.md
new file mode 100644
index 0000000000..0ec6706ed4
--- /dev/null
+++ b/.changeset/curvy-poems-joke.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog': patch
+---
+
+Use default `CatalogTableToolbar` for offset paginated catalog table
diff --git a/plugins/catalog/src/components/CatalogTable/OffsetPaginatedCatalogTable.tsx b/plugins/catalog/src/components/CatalogTable/OffsetPaginatedCatalogTable.tsx
index a86dd60b50..7febfc2d32 100644
--- a/plugins/catalog/src/components/CatalogTable/OffsetPaginatedCatalogTable.tsx
+++ b/plugins/catalog/src/components/CatalogTable/OffsetPaginatedCatalogTable.tsx
@@ -18,10 +18,8 @@ import React, { useEffect } from 'react';
 
 import { Table, TableProps } from '@backstage/core-components';
 import { CatalogTableRow } from './types';
-import {
-  EntityTextFilter,
-  useEntityList,
-} from '@backstage/plugin-catalog-react';
+import { useEntityList } from '@backstage/plugin-catalog-react';
+import { CatalogTableToolbar } from './CatalogTableToolbar';
 
 /**
  * @internal
@@ -30,8 +28,8 @@ export function OffsetPaginatedCatalogTable(
   props: TableProps<CatalogTableRow>,
 ) {
   const { columns, data, isLoading, options } = props;
-  const { updateFilters, setLimit, setOffset, limit, totalItems, offset } =
-    useEntityList();
+  const { setLimit, setOffset, limit, totalItems, offset } = useEntityList();
+
   const [page, setPage] = React.useState(
     offset && limit ? Math.floor(offset / limit) : 0,
   );
@@ -55,11 +53,9 @@ export function OffsetPaginatedCatalogTable(
         emptyRowsWhenPaging: false,
         ...options,
       }}
-      onSearchChange={(searchText: string) =>
-        updateFilters({
-          text: searchText ? new EntityTextFilter(searchText) : undefined,
-        })
-      }
+      components={{
+        Toolbar: CatalogTableToolbar,
+      }}
       page={page}
       onPageChange={newPage => {
         setPage(newPage);