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.

small touchups

Steven Tey63f62d73dbca
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
index aad941f3de..da4ed5d7a1 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
@@ -79,8 +79,8 @@ const partnersColumns = {
all: [
"partner",
"group",
- "createdAt",
"tags",
+ "createdAt",
"status",
"location",
"totalClicks",
@@ -166,7 +166,7 @@ export function PartnersTable() {
const { groups } = useGroups();
const { columnVisibility, setColumnVisibility } = useColumnVisibility(
- "partners-table-columns-v2",
+ "partners-table-columns-v3",
partnersColumns,
);
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx
index d1eb05054f..2286873aaf 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx
@@ -3,7 +3,7 @@
import { clientAccessCheck } from "@/lib/client-access-check";
import { MEGA_WORKSPACE_LINKS_LIMIT } from "@/lib/constants/misc";
import useGroupsCount from "@/lib/swr/use-groups-count";
-import useTagsCount from "@/lib/swr/use-tags-count";
+import { useLinkTagsCount } from "@/lib/swr/use-link-tags-count";
import { useUsageTimeseries } from "@/lib/swr/use-usage-timeseries";
import useWorkspace from "@/lib/swr/use-workspace";
import useWorkspaceUsers from "@/lib/swr/use-workspace-users";
@@ -88,7 +88,7 @@ export default function PlanUsage() {
const { StartPaidPlanModal, setShowStartPaidPlanModal } =
useStartPaidPlanModal();
- const { data: tags } = useTagsCount();
+ const { data: tags } = useLinkTagsCount();
const { users } = useWorkspaceUsers();
const { groupsCount } = useGroupsCount();
@@ -367,21 +367,21 @@ export default function PlanUsage() {
)}
>
<UsageCategory
- title="Custom Domains"
+ title="Custom domains"
icon={Globe}
usage={domains?.length}
usageLimit={domainsLimit}
href={`/${slug}/settings/domains`}
/>
<UsageCategory
- title="Folders"
+ title="Link folders"
icon={Folder5}
usage={foldersUsage}
usageLimit={foldersLimit}
href={`/${slug}/settings/library/folders`}
/>
<UsageCategory
- title="Tags"
+ title="Link tags"
icon={Tag}
usage={tags}
usageLimit={tagsLimit}
@@ -404,7 +404,7 @@ export default function PlanUsage() {
href={`/${slug}/program/partners`}
/>
<UsageCategory
- title="Partner Groups"
+ title="Partner groups"
icon={Users6}
usage={groupsCount ?? 0}
usageLimit={groupsLimit}
@@ -416,7 +416,7 @@ export default function PlanUsage() {
usage={payoutsUsage}
usageLimit={payoutsLimit}
unit="$"
- href={`/${slug}/program/payouts`}
+ href={`/${slug}/program/payouts?status=pending`}
/>
<UsageCategory
title="Payout fees"
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/links/tags/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/links/tags/page-client.tsx
index eb6efe1cbf..e46148d3fd 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/links/tags/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/links/tags/page-client.tsx
@@ -1,7 +1,7 @@
"use client";
+import { useLinkTagsCount } from "@/lib/swr/use-link-tags-count";
import useTags from "@/lib/swr/use-tags";
-import useTagsCount from "@/lib/swr/use-tags-count";
import { TAGS_MAX_PAGE_SIZE } from "@/lib/zod/schemas/tags";
import { useAddEditTagModal } from "@/ui/modals/add-edit-tag-modal";
import { AnimatedEmptyState } from "@/ui/shared/animated-empty-state";
@@ -40,7 +40,7 @@ export default function WorkspaceTagsClient() {
},
includeLinksCount: true,
});
- const { data: tagsCount } = useTagsCount({
+ const { data: tagsCount } = useLinkTagsCount({
query: { search: search ?? "" },
});
diff --git a/apps/web/lib/swr/use-tags-count.ts b/apps/web/lib/swr/use-link-tags-count.ts
similarity index 94%
rename from apps/web/lib/swr/use-tags-count.ts
rename to apps/web/lib/swr/use-link-tags-count.ts
index 4c003f28f5..1e34d07dc6 100644
--- a/apps/web/lib/swr/use-tags-count.ts
+++ b/apps/web/lib/swr/use-link-tags-count.ts
@@ -6,7 +6,7 @@ import useWorkspace from "./use-workspace";
const partialQuerySchema = getTagsCountQuerySchema.partial();
-export default function useTagsCount({
+export function useLinkTagsCount({
query,
}: { query?: z.infer<typeof partialQuerySchema> } = {}) {
const { id: workspaceId } = useWorkspace();
diff --git a/apps/web/ui/links/link-builder/tag-select.tsx b/apps/web/ui/links/link-builder/tag-select.tsx
index cd7c9bde1d..61b4f37264 100644
--- a/apps/web/ui/links/link-builder/tag-select.tsx
+++ b/apps/web/ui/links/link-builder/tag-select.tsx
@@ -1,5 +1,5 @@
+import { useLinkTagsCount } from "@/lib/swr/use-link-tags-count";
import useTags from "@/lib/swr/use-tags";
-import useTagsCount from "@/lib/swr/use-tags-count";
import useWorkspace from "@/lib/swr/use-workspace";
import { TagProps } from "@/lib/types";
import { TAGS_MAX_PAGE_SIZE } from "@/lib/zod/schemas/tags";
@@ -43,7 +43,7 @@ export const TagSelect = memo(() => {
const [search, setSearch] = useState("");
const [debouncedSearch] = useDebounce(search, 500);
- const { data: tagsCount } = useTagsCount();
+ const { data: tagsCount } = useLinkTagsCount();
const useAsync = tagsCount && tagsCount > TAGS_MAX_PAGE_SIZE;
const { tags: availableTags, loading: loadingTags } = useTags({
diff --git a/apps/web/ui/links/use-link-filters.tsx b/apps/web/ui/links/use-link-filters.tsx
index 69bf43955d..8ff2cddf0d 100644
--- a/apps/web/ui/links/use-link-filters.tsx
+++ b/apps/web/ui/links/use-link-filters.tsx
@@ -1,7 +1,7 @@
import useCurrentFolderId from "@/lib/swr/use-current-folder-id";
+import { useLinkTagsCount } from "@/lib/swr/use-link-tags-count";
import useLinksCount from "@/lib/swr/use-links-count";
import useTags from "@/lib/swr/use-tags";
-import useTagsCount from "@/lib/swr/use-tags-count";
import useWorkspaceUsers from "@/lib/swr/use-workspace-users";
import { TagProps } from "@/lib/types";
import { TAGS_MAX_PAGE_SIZE } from "@/lib/zod/schemas/tags";
@@ -197,7 +197,7 @@ function useTagFilterOptions({
[searchParamsObj.tagIds],
);
- const { data: tagsCount } = useTagsCount();
+ const { data: tagsCount } = useLinkTagsCount();
const tagsAsync = Boolean(tagsCount && tagsCount > TAGS_MAX_PAGE_SIZE);
const { tags, loading: loadingTags } = useTags({
query: { search: tagsAsync ? search : "" },
diff --git a/packages/utils/src/constants/pricing/pricing-plan-compare-features.tsx b/packages/utils/src/constants/pricing/pricing-plan-compare-features.tsx
index 8bbb5e62d3..31c896f86d 100644
--- a/packages/utils/src/constants/pricing/pricing-plan-compare-features.tsx
+++ b/packages/utils/src/constants/pricing/pricing-plan-compare-features.tsx
@@ -296,6 +296,27 @@ export const PRICING_PLAN_COMPARE_FEATURES: {
),
href: "https://dub.co/help/article/partner-groups",
},
+ {
+ check: {
+ default: false,
+ business: true,
+ advanced: true,
+ enterprise: true,
+ },
+ text: ({ plan }) => (
+ <>
+ <strong>
+ {plan.limits.partnerTags === 0
+ ? "No"
+ : plan.limits.partnerTags === INFINITY_NUMBER
+ ? "Unlimited"
+ : nFormatter(plan.limits.partnerTags)}
+ </strong>{" "}
+ partner tags
+ </>
+ ),
+ href: "https://dub.co/help/article/partner-groups",
+ },
{
check: {
default: false,