The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
improve limit handling
Steven Tey4d9131314958
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsxindex 4af66beb71..c2425260d1 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx@@ -1,7 +1,9 @@"use client";import { clientAccessCheck } from "@/lib/client-access-check";+import { exceededLimitError } from "@/lib/exceeded-limit-error";import useWorkspace from "@/lib/swr/use-workspace";+import useWorkspaceUsers from "@/lib/swr/use-workspace-users";import { WorkspaceUserProps } from "@/lib/types";import {getAvailableRolesForPlan,@@ -51,9 +53,10 @@ export default function WorkspaceMembersPage() {const { setShowInviteCodeModal, InviteCodeModal } = useInviteCodeModal();- const { role, plan } = useWorkspace();+ const { role, plan, usersLimit } = useWorkspace();const { data: session } = useSession();const { id: workspaceId } = useWorkspace();+ const { users: workspaceUsers } = useWorkspaceUsers();const { queryParams, searchParams } = useRouterStuff();const { pagination, setPagination } = usePagination();@@ -86,6 +89,26 @@ export default function WorkspaceMembersPage() {);const inviteCount = invitesForCount?.length ?? 0;+ const activeUserCount =+ workspaceUsers?.filter((user) => !user.isMachine).length ?? 0;++ const isAtUserLimit =+ usersLimit != null &&+ workspaceUsers != null &&+ invitesForCount != null &&+ activeUserCount + inviteCount >= usersLimit;++ const invitePermissionError = clientAccessCheck({+ action: "workspaces.write",+ role,+ customPermissionDescription: "invite new teammates",+ }).error;++ const inviteUserLimitError =+ isAtUserLimit && plan+ ? exceededLimitError({ plan, limit: usersLimit, type: "users" })+ : undefined;+const availableRolesForPlan = useMemo(() => {return getAvailableRolesForPlan(plan);}, [plan]);@@ -143,7 +166,9 @@ export default function WorkspaceMembersPage() {return filters;}, [status, roleFilter]);- useKeyboardShortcut("m", () => setShowInviteWorkspaceUserModal(true));+ useKeyboardShortcut("m", () => setShowInviteWorkspaceUserModal(true), {+ enabled: !invitePermissionError && !isAtUserLimit,+ });const columns = useMemo<ColumnDef<WorkspaceUserProps>[]>(() => [@@ -260,11 +285,7 @@ export default function WorkspaceMembersPage() {className="h-9 w-fit"shortcut="M"disabledTooltip={- clientAccessCheck({- action: "workspaces.write",- role,- customPermissionDescription: "invite new teammates",- }).error || undefined+ invitePermissionError || inviteUserLimitError || undefined}/><Buttondiff --git a/apps/web/scripts/send-risk-center-change-announcement.ts b/apps/web/scripts/send-risk-center-change-announcement.tsindex 0646d7dcc2..42f6259bdf 100644--- a/apps/web/scripts/send-risk-center-change-announcement.ts+++ b/apps/web/scripts/send-risk-center-change-announcement.ts@@ -3,7 +3,6 @@ import "dotenv-flow/config";import type RiskCenterChangeAnnouncement from "@dub/email/templates/broadcasts/risk-center-change-announcement";import { prisma } from "@dub/prisma";import { FRAUD_RULES_BY_TYPE } from "../lib/api/fraud/constants";-import { getWorkspaceUsers } from "../lib/api/get-workspace-users";import { queueBatchEmail } from "../lib/email/queue-batch-email";const BATCH_SIZE = 50;@@ -32,6 +31,23 @@ async function main() {workspace: {select: {slug: true,+ users: {+ select: {+ user: {+ select: {+ email: true,+ },+ },+ },+ where: {+ user: {+ isMachine: false,+ email: {+ not: null,+ },+ },+ },+ },},},fraudEventGroups: {@@ -76,10 +92,7 @@ async function main() {continue;}- const { users } = await getWorkspaceUsers({- programId: program.id,- role: "owner",- });+ const users = program.workspace.users.map(({ user }) => user);if (users.length === 0) {console.log(`No owners found for program ${program.name}, skipping.`);@@ -97,12 +110,12 @@ async function main() {await queueBatchEmail<typeof RiskCenterChangeAnnouncement>(users.map((user) => ({- to: user.email,+ to: user.email!,subject: `[Action Required]: Review unresolved risk events for ${program.name}`,variant: "notifications",templateName: "RiskCenterChangeAnnouncement",templateProps: {- email: user.email,+ email: user.email!,workspace: program.workspace,program: {name: program.name,@@ -116,7 +129,7 @@ async function main() {);console.log(- `Queued emails for program ${program.name} (${users.length} owner(s))`,+ `Queued emails for program ${program.name} (${users.length} users(s))`,);} catch (error) {console.error(