From 2d5c16c5a223522b6d989e30c66b6d25dfa0e1c8 Mon Sep 17 00:00:00 2001 From: Steven Tey Date: Thu, 22 May 2025 10:58:32 -0700 Subject: [PATCH] fix timezone issues admin --- apps/web/app/(ee)/api/admin/commissions/route.ts | 5 +++-- apps/web/app/(ee)/api/admin/payouts/route.ts | 5 +++-- apps/web/app/api/callback/plain/route.ts | 14 +------------- apps/web/app/api/callback/plain/utils.ts | 2 +- 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/apps/web/app/(ee)/api/admin/commissions/route.ts b/apps/web/app/(ee)/api/admin/commissions/route.ts index 94175313ee3..3d85a85009b 100644 --- a/apps/web/app/(ee)/api/admin/commissions/route.ts +++ b/apps/web/app/(ee)/api/admin/commissions/route.ts @@ -1,6 +1,7 @@ import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates"; import { withAdmin } from "@/lib/auth"; import { THE_BEGINNING_OF_TIME } from "@dub/utils"; +import { endOfDay, startOfDay } from "date-fns"; import { NextResponse } from "next/server"; import { getCommissionsTimeseries, getTopProgramsByCommissions } from "./utils"; @@ -9,8 +10,8 @@ export const GET = withAdmin(async ({ searchParams }) => { const { startDate, endDate, granularity } = getStartEndDates({ interval, - start, - end, + start: start ? startOfDay(new Date(start)) : undefined, + end: end ? endOfDay(new Date(end)) : undefined, dataAvailableFrom: THE_BEGINNING_OF_TIME, }); diff --git a/apps/web/app/(ee)/api/admin/payouts/route.ts b/apps/web/app/(ee)/api/admin/payouts/route.ts index 63166f58312..cb9c1954246 100644 --- a/apps/web/app/(ee)/api/admin/payouts/route.ts +++ b/apps/web/app/(ee)/api/admin/payouts/route.ts @@ -3,6 +3,7 @@ import { withAdmin } from "@/lib/auth"; import { sqlGranularityMap } from "@/lib/planetscale/granularity"; import { prisma } from "@dub/prisma"; import { ACME_PROGRAM_ID } from "@dub/utils"; +import { endOfDay, startOfDay } from "date-fns"; import { DateTime } from "luxon"; import { NextResponse } from "next/server"; @@ -21,8 +22,8 @@ export const GET = withAdmin(async ({ searchParams }) => { const { startDate, endDate, granularity } = getStartEndDates({ interval, - start, - end, + start: start ? startOfDay(new Date(start)) : undefined, + end: end ? endOfDay(new Date(end)) : undefined, }); // Fetch invoices diff --git a/apps/web/app/api/callback/plain/route.ts b/apps/web/app/api/callback/plain/route.ts index 1f1607fadd8..2594b81a30d 100644 --- a/apps/web/app/api/callback/plain/route.ts +++ b/apps/web/app/api/callback/plain/route.ts @@ -81,7 +81,6 @@ export async function POST(req: NextRequest) { _count: { select: { domains: true, - tags: true, users: true, }, }, @@ -123,7 +122,7 @@ export async function POST(req: NextRequest) { domainsLimit, tagsLimit, usersLimit, - _count: { domains, tags, users }, + _count: { domains, users }, } = topWorkspace; if (plainCustomer.data) { @@ -259,17 +258,6 @@ export async function POST(req: NextRequest) { spacerSize: "M", }, }, - plainUsageSection({ - usage: tags, - usageLimit: tagsLimit, - label: "Total Tags", - color: "RED", - }), - { - componentSpacer: { - spacerSize: "M", - }, - }, plainUsageSection({ usage: users, usageLimit: usersLimit, diff --git a/apps/web/app/api/callback/plain/utils.ts b/apps/web/app/api/callback/plain/utils.ts index 84564850f53..be97ef2b140 100644 --- a/apps/web/app/api/callback/plain/utils.ts +++ b/apps/web/app/api/callback/plain/utils.ts @@ -6,7 +6,7 @@ export const plainDivider = { }, }; -export const plainEmptyContainer = (text: string) => ({ +export const plainEmptyContainer = () => ({ componentContainer: { containerContent: [ {