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.

add percentage changes

Steven Tey49378e0194be
diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/revenue/page.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/revenue/page.tsx
index 84d09a611a..37346ef676 100644
--- a/apps/web/app/(ee)/admin.dub.co/(dashboard)/revenue/page.tsx
+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/revenue/page.tsx
@@ -58,6 +58,46 @@ function RevenuePageClient() {
keepPreviousData: true,
});
+ const previousPeriodQueryString = useMemo(() => {
+ if (!timeseries || timeseries.length === 0) {
+ return null;
+ }
+
+ const getUtcMonthStart = (date: Date) =>
+ new Date(Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), 1));
+
+ const currentStartOfMonth = getUtcMonthStart(new Date(timeseries[0].date));
+ const previousEnd = new Date(currentStartOfMonth.getTime() - 1);
+ const previousStart = getUtcMonthStart(previousEnd);
+
+ const toDateParam = (date: Date) => date.toISOString().slice(0, 10);
+
+ return getQueryString({
+ start: toDateParam(previousStart),
+ end: toDateParam(previousEnd),
+ });
+ }, [getQueryString, timeseries]);
+
+ const {
+ data: { timeseries: previousPeriodTimeseries } = {},
+ isLoading: isPreviousPeriodLoading,
+ } = useSWR<{
+ timeseries: {
+ date: Date;
+ mrr: number;
+ payoutFees: number;
+ totalRevenue: number;
+ }[];
+ }>(
+ previousPeriodQueryString
+ ? `/api/admin/revenue${previousPeriodQueryString}`
+ : null,
+ fetcher,
+ {
+ keepPreviousData: true,
+ },
+ );
+
const chartData =
timeseries?.map(({ date, ...values }) => ({
date: new Date(date),
@@ -77,18 +117,24 @@ function RevenuePageClient() {
const percentChanges = useMemo(() => {
const getPercentChange = (key: RevenueTab) => {
- if (!timeseries || timeseries.length === 0) {
+ if (!timeseries || timeseries.length === 0 || isPreviousPeriodLoading) {
return null;
}
- const first = timeseries[0]?.[key] ?? 0;
- const last = timeseries[timeseries.length - 1]?.[key] ?? 0;
+ if (!previousPeriodTimeseries || previousPeriodTimeseries.length === 0) {
+ return null;
+ }
- if (first === 0) {
- return last === 0 ? 0 : null;
+ const previousFinal =
+ previousPeriodTimeseries[previousPeriodTimeseries.length - 1]?.[key] ??
+ 0;
+ const currentFinal = timeseries[timeseries.length - 1]?.[key] ?? 0;
+
+ if (previousFinal === 0) {
+ return currentFinal === 0 ? 0 : null;
}
- return (last / first - 1) * 100;
+ return (currentFinal / previousFinal - 1) * 100;
};
return {
@@ -96,7 +142,7 @@ function RevenuePageClient() {
mrr: getPercentChange("mrr"),
payoutFees: getPercentChange("payoutFees"),
};
- }, [timeseries]);
+ }, [isPreviousPeriodLoading, previousPeriodTimeseries, timeseries]);
return (
<div className="mx-auto flex w-full max-w-screen-xl flex-col space-y-6 p-6">
@@ -149,17 +195,16 @@ function RevenuePageClient() {
{percentChanges[id] !== null ? (
<Badge
variant={
- (percentChanges[id] ?? 0) >= 0 ? "green" : "gray"
+ percentChanges[id] >= 0
+ ? "green"
+ : percentChanges[id] < 0
+ ? "red"
+ : "neutral"
}
- className={cn(
- "rounded-md px-2 py-1 text-xs",
- (percentChanges[id] ?? 0) >= 0
- ? "text-green-700"
- : "text-red-700",
- )}
+ className="rounded-md px-2 py-1 text-xs"
>
- {(percentChanges[id] ?? 0) >= 0 ? "+" : ""}
- {(percentChanges[id] ?? 0).toFixed(1)}%
+ {percentChanges[id] >= 0 ? "+" : ""}
+ {percentChanges[id].toFixed(1)}%
</Badge>
) : null}
</div>
diff --git a/apps/web/app/(ee)/api/admin/revenue/route.ts b/apps/web/app/(ee)/api/admin/revenue/route.ts
index fc9bf9a5d9..197ee6317f 100644
--- a/apps/web/app/(ee)/api/admin/revenue/route.ts
+++ b/apps/web/app/(ee)/api/admin/revenue/route.ts
@@ -2,7 +2,7 @@ import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";
import { withAdmin } from "@/lib/auth";
import { analyticsQuerySchema } from "@/lib/zod/schemas/analytics";
import { DUB_FOUNDING_DATE } from "@dub/utils";
-import { differenceInDays, endOfDay, startOfDay } from "date-fns";
+import { differenceInDays } from "date-fns";
import { NextResponse } from "next/server";
import * as z from "zod/v4";
import { getPayoutsTimeseries } from "../payouts/get-payouts-timeseries";
@@ -24,8 +24,8 @@ export const GET = withAdmin(async ({ searchParams }) => {
const timezone = "UTC";
const { startDate, endDate, granularity } = getStartEndDates({
interval,
- start: start ? startOfDay(new Date(start)) : undefined,
- end: end ? endOfDay(new Date(end)) : undefined,
+ start,
+ end,
dataAvailableFrom: DUB_FOUNDING_DATE,
timezone,
});
diff --git a/packages/ui/src/badge.tsx b/packages/ui/src/badge.tsx
index d8c6ac69c1..c88d6cb3ef 100644
--- a/packages/ui/src/badge.tsx
+++ b/packages/ui/src/badge.tsx
@@ -10,6 +10,7 @@ const badgeVariants = cva(
violet: "border-violet-600 bg-violet-600 text-white",
blue: "border-blue-500 bg-blue-500 text-white",
green: "border-green-100 bg-green-100 text-green-900",
+ red: "border-red-100 bg-red-100 text-red-800",
sky: "border-sky-900 bg-sky-900 text-white",
black: "border-black bg-black text-white",
gray: "border-neutral-200 bg-neutral-100 text-neutral-800",