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.

Use shared WorkflowCondition instead of per-workflow aliases.

Kiran K72f4c3a55038
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/utils.ts b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/utils.ts
index 2c54b3f02d..355dc4cb99 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/utils.ts
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/utils.ts
@@ -1,8 +1,8 @@
import { SEND_CAMPAIGN_ATTRIBUTES } from "@/lib/api/workflows/send-campaign/schema";
-import type { SendCampaignCondition } from "@/lib/api/workflows/send-campaign/types";
+import type { WorkflowCondition } from "@/lib/api/workflows/types";
export function isValidTriggerCondition(
- triggerCondition: SendCampaignCondition | null | undefined,
+ triggerCondition: WorkflowCondition | null | undefined,
): boolean {
// Null/undefined is valid (no trigger condition set)
if (!triggerCondition) {
diff --git a/apps/web/lib/api/workflows/award-bounty/types.ts b/apps/web/lib/api/workflows/award-bounty/types.ts
deleted file mode 100644
index c97edf46b4..0000000000
--- a/apps/web/lib/api/workflows/award-bounty/types.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import type { WorkflowCondition } from "@/lib/api/workflows/types";
-
-export type AwardBountyCondition = WorkflowCondition;
diff --git a/apps/web/lib/api/workflows/send-campaign/execute.ts b/apps/web/lib/api/workflows/send-campaign/execute.ts
index d17435bbe4..12b363c710 100644
--- a/apps/web/lib/api/workflows/send-campaign/execute.ts
+++ b/apps/web/lib/api/workflows/send-campaign/execute.ts
@@ -1,5 +1,5 @@
import { evaluateWorkflowConditions } from "@/lib/api/workflows/evaluate-workflow-conditions";
-import { WorkflowContext } from "@/lib/api/workflows/types";
+import { WorkflowCondition, WorkflowContext } from "@/lib/api/workflows/types";
import { aggregatePartnerLinksStats } from "@/lib/partners/aggregate-partner-links-stats";
import { constructPartnerLink } from "@/lib/partners/construct-partner-link";
import { prisma } from "@/lib/prisma";
@@ -15,7 +15,6 @@ import { validateCampaignFromAddress } from "../../campaigns/validate-campaign";
import { createId } from "../../create-id";
import { WorkflowAttributeKey } from "../attribute-definitions";
import { parseWorkflowConfig } from "../parse-workflow-config";
-import type { SendCampaignCondition } from "./types";
export const executeSendCampaignWorkflow = async ({
workflow,
@@ -71,7 +70,7 @@ export const executeSendCampaignWorkflow = async ({
programId,
partnerId,
groupIds: campaign.groups.map(({ groupId }) => groupId),
- condition: condition as SendCampaignCondition,
+ condition: condition as WorkflowCondition,
});
if (programEnrollments.length === 0) {
@@ -249,7 +248,7 @@ async function getProgramEnrollments({
programId: string;
partnerId?: string;
groupIds: string[];
- condition: SendCampaignCondition;
+ condition: WorkflowCondition;
}) {
if (partnerId) {
const { attribute } = condition;
@@ -349,7 +348,7 @@ async function getProgramEnrollments({
return [programEnrollment];
}
- const startDate = subDays(new Date(), condition.value);
+ const startDate = subDays(new Date(), condition.value as number);
// add 12 hours to the start date since we run the partnerEnrolled workflow every 12 hours
const endDate = addHours(startDate, 12);
diff --git a/apps/web/lib/api/workflows/send-campaign/types.ts b/apps/web/lib/api/workflows/send-campaign/types.ts
deleted file mode 100644
index 1483e4b19d..0000000000
--- a/apps/web/lib/api/workflows/send-campaign/types.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import type { WorkflowCondition } from "@/lib/api/workflows/types";
-
-export type SendCampaignCondition = WorkflowCondition;
diff --git a/apps/web/lib/bounty/api/generate-performance-bounty-name.ts b/apps/web/lib/bounty/api/generate-performance-bounty-name.ts
index 4a7aa764bd..b70691ec71 100644
--- a/apps/web/lib/bounty/api/generate-performance-bounty-name.ts
+++ b/apps/web/lib/bounty/api/generate-performance-bounty-name.ts
@@ -1,4 +1,4 @@
-import { AwardBountyCondition } from "@/lib/api/workflows/award-bounty/types";
+import { WorkflowCondition } from "@/lib/api/workflows/types";
import { isCurrencyAttribute } from "@/lib/api/workflows/utils";
import { currencyFormatter, nFormatter } from "@dub/utils";
import { PERFORMANCE_BOUNTY_SCOPE_ATTRIBUTES } from "./performance-bounty-scope-attributes";
@@ -8,7 +8,7 @@ export const generatePerformanceBountyName = ({
condition,
}: {
rewardAmount: number;
- condition: AwardBountyCondition;
+ condition: WorkflowCondition;
}) => {
const isCurrency = isCurrencyAttribute(condition.attribute);
const attributeLabel =