Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Hide the Overview Tasks card when no action is needed

Rafidfec731c3a69
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/tasks-card.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/tasks-card.tsx
index 5779319b32..56c882b582 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/tasks-card.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/tasks-card.tsx
@@ -5,7 +5,6 @@ import { useProgramMessagesCount } from "@/lib/messages/hooks/use-program-messag
import useProgramEnrollmentsCount from "@/lib/swr/use-program-enrollments-count";
import { type Icon } from "@dub/ui";
import { Msgs, UserCheck } from "@dub/ui/icons";
-import { cn } from "@dub/utils";
import Link from "next/link";
import { OverviewCard } from "./overview-card";
@@ -18,21 +17,33 @@ export function TasksCard() {
status: "invited",
});
+ const tasks = [
+ {
+ icon: Msgs,
+ label: "Respond to programs",
+ href: "/messages",
+ count: unreadMessagesCount,
+ },
+ {
+ icon: UserCheck,
+ label: "Review new invitations",
+ href: "/programs/invitations",
+ count: invitationsCount,
+ },
+ ].filter((task): task is typeof task & { count: number } => !!task.count);
+
+ // hide the card when no action is needed (and while the counts load), so
+ // that Recent payouts fills the column
+ if (tasks.length === 0) {
+ return null;
+ }
+
return (
<OverviewCard title="Tasks" testId={testIds.partnerOverview.tasks}>
<div className="flex flex-col px-2 pb-2">
- <TaskRow
- icon={Msgs}
- label="Respond to programs"
- href="/messages"
- count={unreadMessagesCount}
- />
- <TaskRow
- icon={UserCheck}
- label="Review new invitations"
- href="/programs/invitations"
- count={invitationsCount}
- />
+ {tasks.map((task) => (
+ <TaskRow key={task.href} {...task} />
+ ))}
</div>
</OverviewCard>
);
@@ -47,7 +58,7 @@ function TaskRow({
icon: Icon;
label: string;
href: string;
- count?: number;
+ count: number;
}) {
return (
<Link
@@ -60,20 +71,9 @@ function TaskRow({
<span className="text-content-emphasis min-w-0 grow truncate text-sm font-semibold">
{label}
</span>
- {count === undefined ? (
- <div className="size-8 shrink-0 animate-pulse rounded-lg bg-neutral-200" />
- ) : (
- <div
- className={cn(
- "flex h-8 min-w-8 shrink-0 items-center justify-center rounded-lg px-1.5 text-sm font-semibold",
- count > 0
- ? "bg-blue-50 text-blue-600"
- : "bg-neutral-100 text-neutral-400",
- )}
- >
- {count}
- </div>
- )}
+ <div className="flex h-8 min-w-8 shrink-0 items-center justify-center rounded-lg bg-blue-50 px-1.5 text-sm font-semibold text-blue-600">
+ {count}
+ </div>
</Link>
);
}
diff --git a/apps/web/playwright/partners/overview.spec.ts b/apps/web/playwright/partners/overview.spec.ts
index 3e3072476c..250c22acf0 100644
--- a/apps/web/playwright/partners/overview.spec.ts
+++ b/apps/web/playwright/partners/overview.spec.ts
@@ -26,20 +26,56 @@ async function logIn(page: Page, email: string, password: string) {
await page.waitForURL((url) => !url.pathname.startsWith("/login"));
}
+async function createPartnerUser({
+ email,
+ password,
+}: {
+ email: string;
+ password: string;
+}) {
+ const partner = await prisma.partner.create({
+ data: {
+ id: createId({ prefix: "pn_" }),
+ name: "Overview Test Partner",
+ email,
+ country: "US",
+ },
+ });
+
+ const user = await prisma.user.create({
+ data: {
+ id: createId({ prefix: "user_" }),
+ email,
+ emailVerified: new Date(),
+ passwordHash: hashSync(password, 10),
+ defaultPartnerId: partner.id,
+ partners: {
+ create: {
+ partnerId: partner.id,
+ role: "owner",
+ },
+ },
+ },
+ });
+
+ return { partnerId: partner.id, userId: user.id };
+}
+
test.describe("Partner All programs Overview", () => {
test("renders every Overview card", async ({ page }) => {
await logIn(page, env.E2E_PARTNER_EMAIL, env.E2E_PARTNER_PASSWORD);
await page.goto("/overview");
- for (const testId of Object.values(testIds.partnerOverview)) {
+ // Tasks shows only when an action is needed, see the next test
+ const { tasks: _, ...cards } = testIds.partnerOverview;
+
+ for (const testId of Object.values(cards)) {
await expect(page.getByTestId(testId)).toBeVisible();
}
});
- test("lands on /programs without an approved program, and on /overview with one", async ({
- page,
- }) => {
- const email = `overview-landing-${nanoid(8).toLowerCase()}@dub-internal-test.com`;
+ test("shows Tasks only when an action is needed", async ({ page }) => {
+ const email = `overview-tasks-${nanoid(8).toLowerCase()}@dub-internal-test.com`;
const password = "Password123";
let partnerId: string | undefined;
let userId: string | undefined;
@@ -50,32 +86,70 @@ test.describe("Partner All programs Overview", () => {
select: { id: true, defaultGroupId: true },
});
- const partner = await prisma.partner.create({
+ ({ partnerId, userId } = await createPartnerUser({ email, password }));
+
+ const enrollment = await prisma.programEnrollment.create({
data: {
- id: createId({ prefix: "pn_" }),
- name: "Overview Landing Partner",
- email,
- country: "US",
+ id: createId({ prefix: "pge_" }),
+ partnerId,
+ programId: program.id,
+ groupId: program.defaultGroupId,
+ status: "invited",
},
});
- partnerId = partner.id;
- const user = await prisma.user.create({
- data: {
- id: createId({ prefix: "user_" }),
- email,
- emailVerified: new Date(),
- passwordHash: hashSync(password, 10),
- defaultPartnerId: partner.id,
- partners: {
- create: {
- partnerId: partner.id,
- role: "owner",
- },
- },
- },
+ await logIn(page, email, password);
+ await page.goto("/overview");
+
+ const tasks = page.getByTestId(testIds.partnerOverview.tasks);
+ await expect(tasks).toBeVisible();
+ await expect(tasks.getByText("Review new invitations")).toBeVisible();
+ await expect(tasks.getByText("Respond to programs")).toHaveCount(0);
+
+ await prisma.programEnrollment.update({
+ where: { id: enrollment.id },
+ data: { status: "approved" },
});
- userId = user.id;
+
+ // the card is also hidden while the counts load, so wait for them
+ const countsLoaded = Promise.all([
+ page.waitForResponse((res) =>
+ res
+ .url()
+ .includes("/api/partner-profile/programs/count?status=invited"),
+ ),
+ page.waitForResponse((res) =>
+ res.url().includes("/api/partner-profile/messages/count?unread=true"),
+ ),
+ ]);
+ await page.reload();
+ await countsLoaded;
+
+ await expect(
+ page.getByTestId(testIds.partnerOverview.recentPayouts),
+ ).toBeVisible();
+ await expect(tasks).toHaveCount(0);
+ } finally {
+ if (userId) await prisma.user.delete({ where: { id: userId } });
+ await deletePartner(partnerId);
+ }
+ });
+
+ test("lands on /programs without an approved program, and on /overview with one", async ({
+ page,
+ }) => {
+ const email = `overview-landing-${nanoid(8).toLowerCase()}@dub-internal-test.com`;
+ const password = "Password123";
+ let partnerId: string | undefined;
+ let userId: string | undefined;
+
+ try {
+ const program = await prisma.program.findUniqueOrThrow({
+ where: { slug: TEST_WORKSPACE.workspace.slug },
+ select: { id: true, defaultGroupId: true },
+ });
+
+ ({ partnerId, userId } = await createPartnerUser({ email, password }));
await logIn(page, email, password);
await expect(page).toHaveURL("/programs");
@@ -83,7 +157,7 @@ test.describe("Partner All programs Overview", () => {
await prisma.programEnrollment.create({
data: {
id: createId({ prefix: "pge_" }),
- partnerId: partner.id,
+ partnerId,
programId: program.id,
groupId: program.defaultGroupId,
status: "approved",