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.

Improve partner analytics export CSV formatting

Kiran K0bad9f22bd22
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts
index 6c0da14221..090d5dbe15 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts
@@ -6,6 +6,7 @@ import {
getFirstFilterValue,
hasExactlyOneLinkIdFilter,
} from "@/lib/analytics/filter-helpers";
+import { formatPartnerAnalyticsForExport } from "@/lib/analytics/utils/format-analytics-export";
import { DubApiError } from "@/lib/api/errors";
import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
import { withPartnerProfile } from "@/lib/auth/partner";
@@ -122,6 +123,7 @@ export const GET = withPartnerProfile(
useComposite: true,
skipEndpoints: PARTNER_PROFILE_SKIP_ENDPOINTS,
skipTopLinksForSingleLink: hasExactlyOneLinkIdFilter(parsedParams.linkId),
+ formatRows: formatPartnerAnalyticsForExport,
getAnalyticsParams: () =>
parsedParams.linkId
? { linkId: parsedParams.linkId }
diff --git a/apps/web/app/api/analytics/export/route.ts b/apps/web/app/api/analytics/export/route.ts
index b1724f72f1..a144ab8dce 100644
--- a/apps/web/app/api/analytics/export/route.ts
+++ b/apps/web/app/api/analytics/export/route.ts
@@ -3,7 +3,7 @@ import {
getFirstFilterValue,
hasExactlyOneLinkIdFilter,
} from "@/lib/analytics/filter-helpers";
-import { formatProgramAnalyticsForExport } from "@/lib/analytics/utils/format-program-analytics-for-export";
+import { formatProgramAnalyticsForExport } from "@/lib/analytics/utils/format-analytics-export";
import { DubApiError } from "@/lib/api/errors";
import { getLinkOrThrow } from "@/lib/api/links/get-link-or-throw";
import { throwIfClicksUsageExceeded } from "@/lib/api/links/usage-checks";
diff --git a/apps/web/lib/analytics/utils/convert-to-csv.ts b/apps/web/lib/analytics/utils/convert-to-csv.ts
index 20ba9314e3..6e8dfbe062 100644
--- a/apps/web/lib/analytics/utils/convert-to-csv.ts
+++ b/apps/web/lib/analytics/utils/convert-to-csv.ts
@@ -3,9 +3,14 @@ import { json2csv } from "json-2-csv";
export const convertToCSV = (data: object[]) => {
return json2csv(data, {
parseValue(fieldValue, defaultParser) {
+ if (fieldValue == null) {
+ return "";
+ }
+
if (fieldValue instanceof Date) {
return fieldValue.toISOString();
}
+
return defaultParser(fieldValue);
},
});
diff --git a/apps/web/lib/analytics/utils/format-analytics-export.ts b/apps/web/lib/analytics/utils/format-analytics-export.ts
new file mode 100644
index 0000000000..5fa8864a5d
--- /dev/null
+++ b/apps/web/lib/analytics/utils/format-analytics-export.ts
@@ -0,0 +1,29 @@
+export function formatProgramAnalyticsForExport(rows: Record<string, any>[]) {
+ return rows.map(({ groupByField, ...row }) => {
+ if (row.partner) {
+ row.partner = {
+ name: row.partner.name,
+ email: row.partner.email,
+ country: row.partner.country,
+ };
+ }
+
+ if (row.group) {
+ row.group = {
+ name: row.group.name,
+ };
+ }
+
+ if (row.partnerTag) {
+ row.partnerTag = {
+ name: row.partnerTag.name,
+ };
+ }
+
+ return row;
+ });
+}
+
+export function formatPartnerAnalyticsForExport(rows: Record<string, any>[]) {
+ return rows.map(({ groupByField, link, folderId, partnerId, ...row }) => row);
+}
diff --git a/apps/web/lib/analytics/utils/format-program-analytics-for-export.ts b/apps/web/lib/analytics/utils/format-program-analytics-for-export.ts
deleted file mode 100644
index bf1a140236..0000000000
--- a/apps/web/lib/analytics/utils/format-program-analytics-for-export.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export function formatProgramAnalyticsForExport(rows: Record<string, any>[]) {
- return rows.map(({ groupByField: _groupByField, ...row }) => {
- if (row.partner) {
- row.partner = {
- name: row.partner.name,
- email: row.partner.email,
- country: row.partner.country,
- };
- }
-
- if (row.group) {
- row.group = { name: row.group.name };
- }
-
- if (row.partnerTag) {
- row.partnerTag = { name: row.partnerTag.name };
- }
-
- return row;
- });
-}
diff --git a/apps/web/lib/analytics/utils/index.ts b/apps/web/lib/analytics/utils/index.ts
index 6351fb90be..a73228b2c6 100644
--- a/apps/web/lib/analytics/utils/index.ts
+++ b/apps/web/lib/analytics/utils/index.ts
@@ -1,5 +1,5 @@
export * from "./convert-to-csv";
export * from "./edit-query-string";
-export * from "./format-program-analytics-for-export";
+export * from "./format-analytics-export";
export * from "./get-interval-data";
export * from "./valid-date-range-for-plan";