From 5411fc70f8e6327c7a276b4ff5e150e657edd629 Mon Sep 17 00:00:00 2001
From: Kuba <78603704+jakub-tldr@users.noreply.github.com>
Date: Fri, 17 Apr 2026 15:00:30 +0200
Subject: [PATCH 1/3] tweak bulk assign

---
 .../pages/UsersOverviewPage/UsersTable.tsx    | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/web/src/pages/UsersOverviewPage/UsersTable.tsx b/web/src/pages/UsersOverviewPage/UsersTable.tsx
index 9305d8876..0b4ec8f07 100644
--- a/web/src/pages/UsersOverviewPage/UsersTable.tsx
+++ b/web/src/pages/UsersOverviewPage/UsersTable.tsx
@@ -715,22 +715,25 @@ export const UsersTable = () => {
   return (
     <>
       <TableTop text={m.users_header_title()}>
-        {Object.keys(selected).length > 0 && isPresent(groups) && (
-          <Button
-            variant="outlined"
-            text={m.users_bulk_assign_to_groups()}
-            iconLeft="add-group"
-            testId="bulk-assign"
-            onClick={() => {
-              const userIds = Object.keys(selected).map(Number);
-              openModal(ModalName.AssignGroupsToUsers, {
-                groups,
-                users: userIds,
-                onSuccess: () => setSelected({}),
-              });
-            }}
-          />
-        )}
+        {table.getFilteredSelectedRowModel().rows.length > 0 &&
+          isPresent(groups) && (
+            <Button
+              variant="outlined"
+              text={m.users_bulk_assign_to_groups()}
+              iconLeft="add-group"
+              testId="bulk-assign"
+              onClick={() => {
+                const selectedUsers = table
+                  .getFilteredSelectedRowModel()
+                  .rows.map((row) => row.original.id);
+                openModal(ModalName.AssignGroupsToUsers, {
+                  groups,
+                  users: selectedUsers,
+                  onSuccess: () => table.resetRowSelection(),
+                });
+              }}
+            />
+          )}
         <Search
           placeholder={m.users_search_placeholder()}
           initialValue={search}

From 37c3190123f16db1ea180619d8b168edf4c1f714 Mon Sep 17 00:00:00 2001
From: Kuba <78603704+jakub-tldr@users.noreply.github.com>
Date: Fri, 17 Apr 2026 15:24:50 +0200
Subject: [PATCH 2/3] always render table header, show empty state on no
 matching users (group filter)

---
 web/src/pages/UsersOverviewPage/UsersTable.tsx | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/web/src/pages/UsersOverviewPage/UsersTable.tsx b/web/src/pages/UsersOverviewPage/UsersTable.tsx
index 0b4ec8f07..8e19bb3dc 100644
--- a/web/src/pages/UsersOverviewPage/UsersTable.tsx
+++ b/web/src/pages/UsersOverviewPage/UsersTable.tsx
@@ -741,20 +741,18 @@ export const UsersTable = () => {
         />
         <Button {...addButtonProps} />
       </TableTop>
-      {rows.length === 0 && search.length > 0 && (
+      <TableBody
+        table={table}
+        renderExpandedRow={renderExpanded}
+        expandedHeaders={expandedHeader}
+      />
+      {rows.length === 0 && (search.length > 0 || columnFilters.length > 0) && (
         <EmptyStateFlexible
           icon="search"
           title={m.search_empty_common_title()}
           subtitle={m.search_empty_common_subtitle()}
         />
       )}
-      {rows.length > 0 && (
-        <TableBody
-          table={table}
-          renderExpandedRow={renderExpanded}
-          expandedHeaders={expandedHeader}
-        />
-      )}
     </>
   );
 };

From 73e784823cabd508fa42085725ab2187b813981e Mon Sep 17 00:00:00 2001
From: Kuba <78603704+jakub-tldr@users.noreply.github.com>
Date: Fri, 17 Apr 2026 15:30:09 +0200
Subject: [PATCH 3/3] linter

---
 .../pages/UsersOverviewPage/UsersTable.tsx    | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/web/src/pages/UsersOverviewPage/UsersTable.tsx b/web/src/pages/UsersOverviewPage/UsersTable.tsx
index 8e19bb3dc..02db2a2d4 100644
--- a/web/src/pages/UsersOverviewPage/UsersTable.tsx
+++ b/web/src/pages/UsersOverviewPage/UsersTable.tsx
@@ -715,25 +715,24 @@ export const UsersTable = () => {
   return (
     <>
       <TableTop text={m.users_header_title()}>
-        {table.getFilteredSelectedRowModel().rows.length > 0 &&
-          isPresent(groups) && (
-            <Button
-              variant="outlined"
-              text={m.users_bulk_assign_to_groups()}
-              iconLeft="add-group"
-              testId="bulk-assign"
-              onClick={() => {
-                const selectedUsers = table
-                  .getFilteredSelectedRowModel()
-                  .rows.map((row) => row.original.id);
-                openModal(ModalName.AssignGroupsToUsers, {
-                  groups,
-                  users: selectedUsers,
-                  onSuccess: () => table.resetRowSelection(),
-                });
-              }}
-            />
-          )}
+        {table.getFilteredSelectedRowModel().rows.length > 0 && isPresent(groups) && (
+          <Button
+            variant="outlined"
+            text={m.users_bulk_assign_to_groups()}
+            iconLeft="add-group"
+            testId="bulk-assign"
+            onClick={() => {
+              const selectedUsers = table
+                .getFilteredSelectedRowModel()
+                .rows.map((row) => row.original.id);
+              openModal(ModalName.AssignGroupsToUsers, {
+                groups,
+                users: selectedUsers,
+                onSuccess: () => table.resetRowSelection(),
+              });
+            }}
+          />
+        )}
         <Search
           placeholder={m.users_search_placeholder()}
           initialValue={search}