Skip to content

fix: Users table header displaying when no results #36883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 7 commits into from
Sep 9, 2025
Merged

fix: Users table header displaying when no results #36883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d3052c1
fix: empty rendering
dougfabris Sep 8, 2025
79af15d
Merge branch 'develop' into fix/userTable-headers
dougfabris Sep 8, 2025
3389395
fix: ui issue
dougfabris Sep 8, 2025
dab7904
test: update snapshot
dougfabris Sep 8, 2025
3ba4b3b
chore: changeset
dougfabris Sep 9, 2025
99dfb60
Merge branch 'develop' into fix/userTable-headers
MartinSchoeler Sep 9, 2025
094c895
Merge branch 'develop' into fix/userTable-headers
kodiakhq[bot] Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/two-planes-call.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes an issue where users table headers are being displayed when there's no results
4 changes: 1 addition & 3 deletions apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ const UsersTable = ({
return (
<>
<UsersTableFilters roleData={roleData} setUsersFilters={setUserFilters} />

{isLoading && (
<GenericTable>
<GenericTableHeader>{headers}</GenericTableHeader>
Expand All @@ -168,7 +167,6 @@ const UsersTable = ({
</GenericTableBody>
</GenericTable>
)}

{isError && (
<GenericNoResults icon='warning' title={t('Something_went_wrong')} buttonTitle={t('Reload_page')} buttonAction={onReload} />
)}
Expand All @@ -184,7 +182,7 @@ const UsersTable = ({
/>
)}

{isSuccess && !!users && (
{isSuccess && users.length > 0 && (
<>
<GenericTable>
<GenericTableHeader>{headers}</GenericTableHeader>
Expand Down
236 changes: 0 additions & 236 deletions apps/meteor/client/views/admin/users/UsersTable/__snapshots__/UsersTable.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1528,242 +1528,6 @@ exports[`renders NoResults without crashing 1`] = `
</div>
</div>
</div>
<div
class="rcx-box rcx-box--full rcx-css-qcmk2x"
>
<div
class="rcx-box rcx-box--full rcx-css-pln26h rcx-css-1cb6i7s"
data-overlayscrollbars="host"
>
<div
class="os-size-observer"
>
<div
class="os-size-observer-listener"
/>
</div>
<div
class=""
data-overlayscrollbars-viewport="scrollbarHidden overflowXHidden overflowYHidden"
style="margin-right: 0px; margin-bottom: 0px; margin-left: 0px; top: 0px; left: 0px; width: calc(100% + 0px); padding: 0px 0px 0px 0px;"
tabindex="-1"
>
<div
class="rcx-box rcx-box--full rcx-table__wrapper"
>
<table
class="rcx-box rcx-box--full rcx-table--sticky rcx-table--fixed rcx-table"
>
<thead
class="rcx-box rcx-box--full rcx-table__head"
>
<tr
class="rcx-box rcx-box--full rcx-table__row"
>
<th
class="rcx-box rcx-box--full rcx-table__cell--clickable rcx-table__cell--header rcx-table__cell"
>
<div
class="rcx-box rcx-box--full rcx-css-127j9mz"
wrap="no-wrap"
>
Name
<svg
class="rcx-box rcx-box--full rcx-css-13s9wy"
fill="none"
viewBox="0 0 16 16"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M5.33337 5.99999L8.00004 3.33333L10.6667 5.99999"
stroke="#E4E7EA"
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="1.33333"
/>
<path
d="M5.33337 10L8.00004 12.6667L10.6667 10"
stroke="#E4E7EA"
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="1.33333"
/>
</svg>
</div>
</th>
<th
class="rcx-box rcx-box--full rcx-table__cell--clickable rcx-table__cell--header rcx-table__cell"
>
<div
class="rcx-box rcx-box--full rcx-css-127j9mz"
wrap="no-wrap"
>
Username
<svg
class="rcx-box rcx-box--full rcx-css-13s9wy"
fill="none"
viewBox="0 0 16 16"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M5.33337 5.99999L8.00004 3.33333L10.6667 5.99999"
stroke="#E4E7EA"
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="1.33333"
/>
<path
d="M5.33337 10L8.00004 12.6667L10.6667 10"
stroke="#E4E7EA"
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="1.33333"
/>
</svg>
</div>
</th>
<th
class="rcx-box rcx-box--full rcx-table__cell--header rcx-table__cell rcx-css-1nngkbl"
>
<div
class="rcx-box rcx-box--full rcx-css-127j9mz"
wrap="no-wrap"
>
Actions
</div>
</th>
</tr>
</thead>
<tbody
class="rcx-box rcx-box--full rcx-table__body"
/>
</table>
</div>
</div>
<div
class="os-scrollbar os-scrollbar-horizontal os-theme-dark os-scrollbar-auto-hide os-scrollbar-auto-hide-hidden os-scrollbar-handle-interactive os-scrollbar-cornerless os-scrollbar-unusable"
style="--os-scroll-percent: 0; --os-viewport-percent: 0; --os-scroll-direction: 0;"
>
<div
class="os-scrollbar-track"
>
<div
class="os-scrollbar-handle"
/>
</div>
</div>
<div
class="os-scrollbar os-scrollbar-vertical os-theme-dark os-scrollbar-auto-hide os-scrollbar-auto-hide-hidden os-scrollbar-handle-interactive os-scrollbar-cornerless os-scrollbar-unusable"
style="--os-scroll-percent: 0; --os-viewport-percent: 0; --os-scroll-direction: 0;"
>
<div
class="os-scrollbar-track"
>
<div
class="os-scrollbar-handle"
/>
</div>
</div>
</div>
</div>
<nav
class="rcx-box rcx-box--full rcx-pagination--divider rcx-pagination"
>
<div
class="rcx-box rcx-box--full rcx-pagination__left"
>
<span
class="rcx-box rcx-box--full rcx-pagination__label"
>
Items per page:
</span>
<ol
class="rcx-box rcx-box--full rcx-pagination__list"
>
<li
class="rcx-box rcx-box--full rcx-pagination__list-item"
>
<button
class="rcx-box rcx-box--full rcx-pagination__link"
disabled=""
tabindex="-1"
>
25
</button>
</li>
<li
class="rcx-box rcx-box--full rcx-pagination__list-item"
>
<button
class="rcx-box rcx-box--full rcx-pagination__link"
tabindex="0"
>
50
</button>
</li>
<li
class="rcx-box rcx-box--full rcx-pagination__list-item"
>
<button
class="rcx-box rcx-box--full rcx-pagination__link"
tabindex="0"
>
100
</button>
</li>
</ol>
</div>
<div
class="rcx-box rcx-box--full rcx-pagination__right"
>
<span
class="rcx-box rcx-box--full rcx-pagination__label"
>
Showing results 1 - 0 of 0
</span>
<ol
class="rcx-box rcx-box--full rcx-pagination__list"
>
<li
class="rcx-box rcx-box--full rcx-pagination__list-item"
>
<button
class="rcx-box rcx-box--full rcx-pagination__back"
disabled=""
>
<span
class="rcx-box rcx-box--full rcx-chevron--left rcx-chevron"
>
<i
aria-hidden="true"
class="rcx-box rcx-box--full rcx-icon--name-chevron-down rcx-icon rcx-css-1g87xs3"
>
</i>
</span>
</button>
</li>
<li
class="rcx-box rcx-box--full rcx-pagination__list-item"
>
<button
class="rcx-box rcx-box--full rcx-pagination__forward"
>
<span
class="rcx-box rcx-box--full rcx-chevron--right rcx-chevron"
>
<i
aria-hidden="true"
class="rcx-box rcx-box--full rcx-icon--name-chevron-down rcx-icon rcx-css-1g87xs3"
>
</i>
</span>
</button>
</li>
</ol>
</div>
</nav>
</div>
</body>
`;
Loading