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.

revert non-ui changes

Pedro Ladeira0cebbb204961
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/send-email-preview-modal.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/send-email-preview-modal.tsx
index 536287234a..bfa2982fe3 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/send-email-preview-modal.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/send-email-preview-modal.tsx
@@ -24,8 +24,7 @@ function SendEmailPreviewModal({
const { handleKeyDown } = useEnterSubmit();
const { control } = useCampaignFormContext();
const { isSubmitting, makeRequest } = useApiMutation();
- const [emailAddresses, setEmailAddresses] = useState<string | null>(null);
- const emailAddressesValue = emailAddresses ?? user?.email ?? "";
+ const [emailAddresses, setEmailAddresses] = useState(user?.email ?? "");
const [subject, preview, bodyJson, from] = useWatch({
control,
@@ -35,7 +34,7 @@ function SendEmailPreviewModal({
const onSubmit = async (e: React.FormEvent) => {
e.preventDefault();
- if (!emailAddressesValue.trim()) {
+ if (!emailAddresses.trim()) {
toast.error("Please enter at least one email address.");
return;
}
@@ -47,7 +46,7 @@ function SendEmailPreviewModal({
return;
}
- const emails = emailAddressesValue
+ const emails = emailAddresses
.split(",")
.map((email) => email.trim())
.filter((email) => email.length > 0);
@@ -96,7 +95,7 @@ function SendEmailPreviewModal({
placeholder="Separate multiple addresses with commas"
autoFocus={!isMobile}
required
- value={emailAddressesValue}
+ value={emailAddresses}
onChange={(e) => setEmailAddresses(e.target.value)}
onKeyDown={handleKeyDown}
rows={3}
@@ -118,7 +117,7 @@ function SendEmailPreviewModal({
type="submit"
text="Send preview"
loading={isSubmitting}
- disabled={!emailAddressesValue.trim()}
+ disabled={!emailAddresses.trim()}
className="h-8 w-fit"
/>
</div>
diff --git a/apps/web/lib/actions/partners/update-partner-enrollment.ts b/apps/web/lib/actions/partners/update-partner-enrollment.ts
index accd7ee47e..7e51d6ae9c 100644
--- a/apps/web/lib/actions/partners/update-partner-enrollment.ts
+++ b/apps/web/lib/actions/partners/update-partner-enrollment.ts
@@ -16,10 +16,10 @@ import { throwIfNoPermission } from "../throw-if-no-permission";
const updatePartnerEnrollmentSchema = z.object({
workspaceId: z.string(),
partnerId: z.string(),
- tenantId: z.string().nullable().optional(),
- customerDataSharingEnabledAt: z.coerce.date().nullable().optional(),
- groupMoveDisabledAt: z.coerce.date().nullable().optional(),
- riskMonitoringDisabledAt: z.coerce.date().nullable().optional(),
+ tenantId: z.string().nullable(),
+ customerDataSharingEnabledAt: z.coerce.date().nullable(),
+ groupMoveDisabledAt: z.coerce.date().nullable(),
+ riskMonitoringDisabledAt: z.coerce.date().nullable(),
});
// Update a partner's program enrollment data
@@ -64,28 +64,22 @@ export const updatePartnerEnrollmentAction = authActionClient
}
const programEnrollment = await prisma.$transaction(async (tx) => {
- if (tenantId !== undefined) {
- await tx.link.updateMany({
- where,
- data: {
- tenantId,
- },
- });
- }
+ await tx.link.updateMany({
+ where,
+ data: {
+ tenantId,
+ },
+ });
return await tx.programEnrollment.update({
where: {
partnerId_programId: where,
},
data: {
- ...(tenantId !== undefined && { tenantId }),
- ...(customerDataSharingEnabledAt !== undefined && {
- customerDataSharingEnabledAt,
- }),
- ...(groupMoveDisabledAt !== undefined && { groupMoveDisabledAt }),
- ...(riskMonitoringDisabledAt !== undefined && {
- riskMonitoringDisabledAt,
- }),
+ tenantId,
+ customerDataSharingEnabledAt,
+ groupMoveDisabledAt,
+ riskMonitoringDisabledAt,
},
include: {
links: {
diff --git a/apps/web/ui/partners/partner-advanced-settings-modal.tsx b/apps/web/ui/partners/partner-advanced-settings-modal.tsx
index 8e5a23b03c..381c419f04 100644
--- a/apps/web/ui/partners/partner-advanced-settings-modal.tsx
+++ b/apps/web/ui/partners/partner-advanced-settings-modal.tsx
@@ -73,13 +73,7 @@ function PartnerAdvancedSettingsModal({
setValue,
setError,
handleSubmit,
- formState: {
- errors,
- isSubmitting,
- isSubmitSuccessful,
- isDirty,
- dirtyFields,
- },
+ formState: { errors, isSubmitting, isSubmitSuccessful, isDirty },
} = useForm<FormData>({
defaultValues: {
tenantId: partner.tenantId,
@@ -129,16 +123,10 @@ function PartnerAdvancedSettingsModal({
const result = await executeAsync({
workspaceId: workspaceId!,
partnerId: partner.id,
- ...(dirtyFields.tenantId && { tenantId: data.tenantId || null }),
- ...(dirtyFields.customerDataSharingEnabledAt && {
- customerDataSharingEnabledAt: data.customerDataSharingEnabledAt,
- }),
- ...(dirtyFields.groupMoveDisabledAt && {
- groupMoveDisabledAt: data.groupMoveDisabledAt,
- }),
- ...(dirtyFields.riskMonitoringDisabledAt && {
- riskMonitoringDisabledAt: data.riskMonitoringDisabledAt,
- }),
+ tenantId: data.tenantId || null,
+ customerDataSharingEnabledAt: data.customerDataSharingEnabledAt,
+ groupMoveDisabledAt: data.groupMoveDisabledAt,
+ riskMonitoringDisabledAt: data.riskMonitoringDisabledAt,
});
if (result?.serverError || result?.validationErrors) {
@@ -294,7 +282,11 @@ export function usePartnerAdvancedSettingsModal({
partner={partner}
/>
);
- }, [showPartnerAdvancedSettingsModal, setShowPartnerAdvancedSettingsModal]);
+ }, [
+ showPartnerAdvancedSettingsModal,
+ setShowPartnerAdvancedSettingsModal,
+ partner,
+ ]);
return useMemo(
() => ({