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.

Drop GroupMoveCondition alias in favor of WorkflowCondition.

Kiran Kfe7fcfa6f81f
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-move-rules.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-move-rules.tsx
index f4f56e2783..d49595d6c1 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-move-rules.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-move-rules.tsx
@@ -7,9 +7,9 @@ import {
import type {
GroupMoveAttribute,
GroupMoveAttributeKey,
- GroupMoveCondition,
GroupMoveRules as GroupMoveRulesForm,
} from "@/lib/api/workflows/move-group/types";
+import { WorkflowCondition } from "@/lib/api/workflows/types";
import { getPlanCapabilities } from "@/lib/plan-capabilities";
import useGroup from "@/lib/swr/use-group";
import useWorkspace from "@/lib/swr/use-workspace";
@@ -125,7 +125,7 @@ export function GroupMoveRules() {
attribute: undefined,
operator: "gte",
value: undefined,
- } as unknown as GroupMoveCondition);
+ } as unknown as WorkflowCondition);
}}
disabled={disableAddRuleButton}
disabledTooltip={
@@ -146,8 +146,8 @@ function GroupRule({
index,
availableAttributes,
}: {
- rule: GroupMoveCondition;
- onUpdate: (updates: Partial<GroupMoveCondition>) => void;
+ rule: WorkflowCondition;
+ onUpdate: (updates: Partial<WorkflowCondition>) => void;
onRemove: () => void;
index: number;
availableAttributes: GroupMoveAttributeKey[];
@@ -367,10 +367,10 @@ function ValueInput({
onUpdate,
}: {
index: number;
- rule: GroupMoveCondition;
+ rule: WorkflowCondition;
attributeType: GroupMoveAttribute["inputType"];
part: "min" | "max";
- onUpdate: (updates: Partial<GroupMoveCondition>) => void;
+ onUpdate: (updates: Partial<WorkflowCondition>) => void;
}) {
const { control } = useFormContext<{
moveRules?: GroupMoveRulesForm;
@@ -453,7 +453,7 @@ const handleClearValue = (
const handleUpdateMinValue = (
currentFieldValue: ValueType,
convertedValue: number,
- operator: GroupMoveCondition["operator"],
+ operator: WorkflowCondition["operator"],
): ValueType => {
if (operator === "between" && isRangeValue(currentFieldValue)) {
const rangeValue = currentFieldValue as RangeValue;
@@ -465,8 +465,8 @@ const handleUpdateMinValue = (
const handleUpdateMaxValue = (
currentFieldValue: ValueType,
convertedValue: number,
- onUpdate: (updates: Partial<GroupMoveCondition>) => void,
- ruleOperator: GroupMoveCondition["operator"],
+ onUpdate: (updates: Partial<WorkflowCondition>) => void,
+ ruleOperator: WorkflowCondition["operator"],
): ValueType => {
if (isRangeValue(currentFieldValue)) {
const rangeValue = currentFieldValue as RangeValue;
diff --git a/apps/web/lib/api/groups/find-groups-with-matching-rules.ts b/apps/web/lib/api/groups/find-groups-with-matching-rules.ts
index 20c93e5c95..6cbb3d9c0c 100644
--- a/apps/web/lib/api/groups/find-groups-with-matching-rules.ts
+++ b/apps/web/lib/api/groups/find-groups-with-matching-rules.ts
@@ -1,9 +1,7 @@
-import type {
- GroupMoveCondition,
- GroupMoveRules,
-} from "@/lib/api/workflows/move-group/types";
+import type { GroupMoveRules } from "@/lib/api/workflows/move-group/types";
import { groupRulesSchema } from "@/lib/zod/schemas/groups";
import * as z from "zod/v4";
+import { WorkflowCondition } from "../workflows/types";
export const findGroupsWithMatchingRules = ({
groups,
@@ -40,12 +38,12 @@ const doRuleSetsOverlap = (
rules1: GroupMoveRules,
rules2: GroupMoveRules,
): boolean => {
- const rules1ByAttribute = new Map<string, GroupMoveCondition>();
+ const rules1ByAttribute = new Map<string, WorkflowCondition>();
for (const rule of rules1) {
rules1ByAttribute.set(rule.attribute, rule);
}
- const rules2ByAttribute = new Map<string, GroupMoveCondition>();
+ const rules2ByAttribute = new Map<string, WorkflowCondition>();
for (const rule of rules2) {
rules2ByAttribute.set(rule.attribute, rule);
}
@@ -81,7 +79,7 @@ const doRuleSetsOverlap = (
};
const conditionToInterval = (
- condition: GroupMoveCondition,
+ condition: WorkflowCondition,
): { min: number; max: number } | null => {
switch (condition.operator) {
case "gte":
@@ -108,8 +106,8 @@ const conditionToInterval = (
};
const doConditionsOverlap = (
- condition1: GroupMoveCondition,
- condition2: GroupMoveCondition,
+ condition1: WorkflowCondition,
+ condition2: WorkflowCondition,
): boolean => {
// Conditions must be for the same attribute to overlap
if (condition1.attribute !== condition2.attribute) {
diff --git a/apps/web/lib/api/workflows/move-group/types.ts b/apps/web/lib/api/workflows/move-group/types.ts
index 6b21775fc7..62e4950da1 100644
--- a/apps/web/lib/api/workflows/move-group/types.ts
+++ b/apps/web/lib/api/workflows/move-group/types.ts
@@ -1,8 +1,6 @@
import type { WorkflowCondition } from "@/lib/api/workflows/types";
import type { GROUP_MOVE_ATTRIBUTES } from "./schema";
-export type GroupMoveCondition = WorkflowCondition;
-
export type GroupMoveRules = WorkflowCondition[];
export type GroupMoveAttributeKey = keyof typeof GROUP_MOVE_ATTRIBUTES;