Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 30 additions & 3 deletions ui/src/components/channel/__tests__/members-panel.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe, it, expect, vi, beforeEach } from "vitest";
import { render, screen, fireEvent, waitFor } from "@testing-library/react";
import { render, screen, fireEvent, waitFor, within } from "@testing-library/react";
import { MemoryRouter } from "react-router-dom";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { MembersPanel } from "../members-panel";
Expand Down Expand Up @@ -28,15 +28,21 @@ function user(id: string, name: string, role: User["role"] = "member"): User {

const alice = user("usr_alice", "Alice");
const bob = user("usr_bob", "Bob");

const quietBob = {
...user("usr_quiet", "Quiet Bob"),
doNotDisturbUntil: new Date(Date.now() + 60_000).toISOString(),
};
const mo = user("usr_mo", "Mo");
const gus = user("usr_gus", "Gus", "guest");
const dana = user("usr_dana", "Dana");
const everyone = [alice, bob, mo, gus, dana];
const everyone = [alice, bob, quietBob, mo, gus, dana];

const members: ChannelMember[] = [
{ userId: "usr_alice", role: "owner", joinedAt: "" },
{ userId: "usr_mo", role: "moderator", joinedAt: "" },
{ userId: "usr_bob", role: "member", joinedAt: "" },
{ userId: "usr_quiet", role: "member", joinedAt: "" },
{ userId: "usr_gus", role: "member", joinedAt: "" },
];

Expand All @@ -53,7 +59,7 @@ async function open(as: User, kind: Channel["kind"] = "private") {
</MemoryRouter>
</QueryClientProvider>,
);
await screen.findByText(/Members \(4\)/);
await screen.findByText(/Members \(5\)/);
}

const q = (name: string) => screen.queryByRole("button", { name });
Expand Down Expand Up @@ -146,3 +152,24 @@ describe("the members panel acts through the API", () => {
expect(await screen.findByRole("alert")).toHaveProperty("textContent", "Insufficient permissions");
});
});

describe("do-not-disturb indicators", () => {
beforeEach(() => {
vi.clearAllMocks();
vi.mocked(api.listMembers).mockResolvedValue(members);
});

it("shows the do-not-disturb indicator for quiet members", async () => {
await open(alice);

const quietMember = screen.getByText("Quiet Bob", { exact: true }).closest("li");
const normalMember = screen.getByText("Bob", { exact: true }).closest("li");

expect(quietMember).not.toBeNull();
expect(normalMember).not.toBeNull();

expect(within(quietMember!).getByRole("img", { name: /do not disturb until/i })).toBeTruthy();
expect(within(normalMember!).queryByRole("img", { name: /do not disturb until/i })).toBeNull();
});
});

14 changes: 11 additions & 3 deletions ui/src/components/channel/members-panel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import { useState } from "react";
import { useNavigate } from "react-router-dom";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import { Users, X, UserPlus } from "lucide-react";
import { DndIndicator } from "../ui/dnd-indicator";

import {
addMember,
archiveChannel,
Expand Down Expand Up @@ -184,12 +186,18 @@ export function MembersPanel({
<li key={m.userId} className="group flex items-center gap-2 rounded px-2 py-1">
<Avatar name={name} src={u?.avatarUrl} size="sm" />
<span className="min-w-0 flex-1 text-sm text-gray-900 dark:text-gray-100">
<span className="block truncate">
{name}
{isMe && <span className="text-gray-400"> (you)</span>}
<span className="flex items-center gap-1">
<span className="truncate">
{name}
{isMe && <span className="text-gray-400"> (you)</span>}
</span>
<DndIndicator userId={m.userId} user={u} />
</span>

<UserStatusLine userId={m.userId} />

</span>

{label && (
<span className="rounded bg-gray-100 px-1.5 py-0.5 text-xs text-gray-600 dark:bg-gray-800 dark:text-gray-300">
{label}
Expand Down