Skip to content

fix: add missing error state to ModerationConsoleTable and CustomUserStatusTable #39643

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

Open
Avanish-Gupta-CSE wants to merge 2 commits into
base: develop
Choose a base branch
from
+30 −6
Open

fix: add missing error state to ModerationConsoleTable and CustomUserStatusTable #39643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b982d4a
fix: add missing error state to ModerationConsoleTable and CustomUser…
Avanish-Gupta-CSE Mar 15, 2026
c62fe28
fix: gate error state to initial-load/no-data in ModerationConsoleTable
Avanish-Gupta-CSE Mar 15, 2026
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/fix-missing-error-state-tables.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: add missing error state to ModerationConsoleTable and CustomUserStatusTable
17 changes: 14 additions & 3 deletions ...eteor/client/views/admin/customUserStatus/CustomUserStatusTable/CustomUserStatusTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Pagination } from '@rocket.chat/fuselage';
import { Pagination, States, StatesIcon, StatesActions, StatesAction, StatesTitle } from '@rocket.chat/fuselage';
import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
import { escapeRegExp } from '@rocket.chat/string-helpers';
import {
Expand All @@ -25,7 +25,6 @@ type CustomUserStatusProps = {
onClick: (id: string) => void;
};

// TODO: Missing error state
const CustomUserStatus = ({ reload, onClick }: CustomUserStatusProps): ReactElement | null => {
const { t } = useTranslation();
const [text, setText] = useState('');
Expand All @@ -47,7 +46,7 @@ const CustomUserStatus = ({ reload, onClick }: CustomUserStatusProps): ReactElem

const getCustomUserStatus = useEndpoint('GET', '/v1/custom-user-status.list');

const { data, isLoading, refetch, isFetched } = useQuery({
const { data, isLoading, refetch, isFetched, isError } = useQuery({
queryKey: ['custom-user-statuses', query],

queryFn: async () => {
Expand All @@ -63,6 +62,18 @@ const CustomUserStatus = ({ reload, onClick }: CustomUserStatusProps): ReactElem
reload.current = refetch;
}, [reload, refetch]);

if (isError && !data) {
return (
<States>
<StatesIcon name='warning' variation='danger' />
<StatesTitle>{t('Something_went_wrong')}</StatesTitle>
<StatesActions>
<StatesAction onClick={() => refetch()}>{t('Reload_page')}</StatesAction>
</StatesActions>
</States>
);
}

if (!data) {
return null;
}
Expand Down
14 changes: 11 additions & 3 deletions apps/meteor/client/views/admin/moderation/ModerationConsoleTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { IUser } from '@rocket.chat/core-typings';
import { Pagination } from '@rocket.chat/fuselage';
import { Pagination, States, StatesIcon, StatesActions, StatesAction, StatesTitle } from '@rocket.chat/fuselage';
import { useDebouncedValue, useMediaQuery, useEffectEvent } from '@rocket.chat/fuselage-hooks';
import {
GenericTable,
Expand All @@ -19,7 +19,6 @@ import ModerationConsoleTableRow from './ModerationConsoleTableRow';
import ModerationFilter from './helpers/ModerationFilter';
import GenericNoResults from '../../../components/GenericNoResults';

// TODO: Missing error state
const ModerationConsoleTable = () => {
const [text, setText] = useState('');
const router = useRouter();
Expand Down Expand Up @@ -54,7 +53,7 @@ const ModerationConsoleTable = () => {

const getReports = useEndpoint('GET', '/v1/moderation.reportsByUsers');

const { data, isLoading, isSuccess } = useQuery({
const { data, isLoading, isSuccess, isError, refetch } = useQuery({
queryKey: ['moderation', 'msgReports', 'fetchAll', query],
queryFn: async () => getReports(query),
meta: {
Expand Down Expand Up @@ -135,6 +134,15 @@ const ModerationConsoleTable = () => {
</>
)}
{isSuccess && data.reports.length === 0 && <GenericNoResults />}
{isError && !data && (
<States>
<StatesIcon name='warning' variation='danger' />
<StatesTitle>{t('Something_went_wrong')}</StatesTitle>
<StatesActions>
<StatesAction onClick={() => refetch()}>{t('Reload_page')}</StatesAction>
</StatesActions>
</States>
)}
</>
);
};
Expand Down