Merge branch 'dev' into feature/1058-adminfront-tab-rebac-permissions

adminfront/src/features/tenants/routes/TenantListPage.tsx

@@ -107,6 +107,7 @@ import {
 } from "../utils/tenantCsvImport";
 import {
   filterTenantsByScope,
+  filterTenantViewRowsBySearch,
   getTenantSearchMatchIds,
   getTenantViewRows,
   resolveTenantSelectionIds,
@@ -1667,11 +1668,12 @@ const TenantHierarchyView: React.FC<{
 
   const flattenedRows = React.useMemo(() => {
     if (viewMode === "table") {
-      return sortItems(
+      const rows = sortItems(
         getTenantViewRows(tenants, "table", scopeTenantId, !!search),
         sortConfig,
         tenantSortResolvers,
       );
+      return filterTenantViewRowsBySearch(rows, search);
     }
 
     const result: TenantViewRow[] = [];
@@ -1692,7 +1694,7 @@ const TenantHierarchyView: React.FC<{
       }
     };
     collect(subTree, 0);
-    return result;
+    return filterTenantViewRowsBySearch(result, search);
   }, [
     expandedIds,
     scopeTenantId,