Skip to content

Commit 832e406

Browse files
🐛 Fix: Broken logic in Org. member loading state (#18555)
1 parent e56e2f7 commit 832e406

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

components/dashboard/src/teams/Members.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import searchIcon from "../icons/search.svg";
1919
import { teamsService } from "../service/public-api";
2020
import { useCurrentUser } from "../user-context";
2121
import { SpinnerLoader } from "../components/Loader";
22+
import { Delayed } from "../components/Delayed";
2223
import { InputField } from "../components/forms/InputField";
2324
import { InputWithCopy } from "../components/InputWithCopy";
2425

@@ -74,6 +75,15 @@ export default function MembersPage() {
7475
return !!owners?.some((o) => o.userId === user?.id);
7576
}, [org.data?.members, user?.id]);
7677

78+
// Note: We would hardly get here, but just in case. We should show a loader instead of blank section.
79+
if (org.isLoading) {
80+
return (
81+
<Delayed>
82+
<SpinnerLoader />
83+
</Delayed>
84+
);
85+
}
86+
7787
const filteredMembers =
7888
org.data?.members.filter((m) => {
7989
if (!!roleFilter && m.role !== roleFilter) {
@@ -163,7 +173,7 @@ export default function MembersPage() {
163173
</ItemField>
164174
</Item>
165175
{filteredMembers.length === 0 ? (
166-
<SpinnerLoader />
176+
<p className="pt-16 text-center">No members found</p>
167177
) : (
168178
filteredMembers.map((m) => (
169179
<Item className="grid grid-cols-3" key={m.userId}>

0 commit comments

Comments
 (0)