diff --git a/packages/web_ui/src/components/InputModPack.tsx b/packages/web_ui/src/components/InputModPack.tsx index 2267ef9f..be40e7e1 100644 --- a/packages/web_ui/src/components/InputModPack.tsx +++ b/packages/web_ui/src/components/InputModPack.tsx @@ -5,7 +5,7 @@ import { useModPacks } from "../model/mod_pack"; import { InputComponentProps } from "../BaseWebPlugin"; export default function InputModPack(props: InputComponentProps) { - const [modPacks] = useModPacks(); + const [modPacks, synced] = useModPacks(); return ; } diff --git a/packages/web_ui/src/components/UsersTable.tsx b/packages/web_ui/src/components/UsersTable.tsx index a553bc6f..ca5eb10c 100644 --- a/packages/web_ui/src/components/UsersTable.tsx +++ b/packages/web_ui/src/components/UsersTable.tsx @@ -36,12 +36,12 @@ export interface UsersTableProps { const strcmp = new Intl.Collator(undefined, { numeric: true, sensitivity: "base" }).compare; export default function UsersTable({ instanceId, onlyOnline = false, pagination, size }: UsersTableProps) { - const [roles] = useRoles(); + const [roles, rolesSynced] = useRoles(); + const [users, usersSynced] = useUsers(); const navigate = useNavigate(); const {filterDropdown, filterDropdownProps} = useUserFilter(true); - const [users] = useUsers(); const data = [...users.values()]; // Determine online predicate based on instanceId @@ -154,7 +154,8 @@ export default function UsersTable({ instanceId, onlyOnline = false, pagination, : null), // eslint-disable-next-line max-len sorter: (a: lib.UserDetails, b: lib.UserDetails) => (a.playerStats?.onlineTimeMs ?? 0) - (b.playerStats?.onlineTimeMs ?? 0), - responsive: ["lg"], + // Responsive breaks defaultFilteredValue, see: https://github.com/ant-design/ant-design/issues/32847 + // responsive: ["lg"], }, { title: "First seen", @@ -223,6 +224,7 @@ export default function UsersTable({ instanceId, onlyOnline = false, pagination, pagination={defaultPagination} size={size} scroll={{ x: "max-content" }} + loading={!usersSynced || !rolesSynced} onRow={(user) => ({ onClick: (event) => { if ((event.target as HTMLElement).closest("a")) {