Skip to content

Commit 9ae9a57

Browse files
committed
Fixed email editor usage across broadcast, sequence and drip functionality
1 parent ab962f9 commit 9ae9a57

24 files changed

Lines changed: 32 additions & 1641 deletions

File tree

apps/web/app/(with-contexts)/dashboard/(sidebar)/mails/broadcast/[id]/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ export default function Page({
551551
content={content}
552552
emailEditorLink={
553553
isEditable
554-
? `/dashboard/mail/${id}/${emailId}?redirectTo=/dashboard/mails/broadcast/${id}`
554+
? `/dashboard/mail/sequence/${id}/${emailId}?redirectTo=/dashboard/mails/broadcast/${id}`
555555
: ""
556556
}
557557
/>

apps/web/app/(with-contexts)/dashboard/(sidebar)/mails/sequence/[id]/[mailId]/page.tsx

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import {
1313
BUTTON_SAVE,
1414
COMPOSE_SEQUENCE_EDIT_DELAY,
1515
TOAST_TITLE_ERROR,
16-
MAIL_PREVIEW_TITLE,
1716
MAIL_SUBJECT_PLACEHOLDER,
1817
PAGE_HEADER_EDIT_MAIL,
1918
} from "@ui-config/strings";
@@ -46,7 +45,7 @@ export default function Page({
4645
];
4746
const [delay, setDelay] = useState<number>(0);
4847
const [subject, setSubject] = useState<string>("");
49-
const [previewText, setPreviewText] = useState<string>("");
48+
// const [previewText, setPreviewText] = useState<string>("");
5049
const [content, setContent] = useState<EmailContent | null>(null);
5150
const [email, setEmail] = useState<Email | null>(null);
5251
const [published, setPublished] = useState<"unpublished" | "published">(
@@ -127,7 +126,7 @@ export default function Page({
127126
setEmail(email);
128127
setDelay(email.delayInMillis / 86400000);
129128
setSubject(email.subject);
130-
setPreviewText(email.content?.meta?.previewText || "");
129+
// setPreviewText(email.content?.meta?.previewText || "");
131130
setContent(email.content || null);
132131
setPublished(email.published ? "published" : "unpublished");
133132
}
@@ -146,7 +145,6 @@ export default function Page({
146145
$actionType: SequenceEmailActionType
147146
$actionData: String
148147
$published: Boolean
149-
$previewText: String
150148
) {
151149
sequence: updateMailInSequence(
152150
sequenceId: $sequenceId,
@@ -158,17 +156,22 @@ export default function Page({
158156
actionType: $actionType,
159157
actionData: $actionData,
160158
published: $published,
161-
previewText: $previewText
162159
) {
163160
sequenceId,
164161
title,
165162
emails {
166163
emailId,
167164
subject,
168165
delayInMillis,
169-
previewText,
170166
published,
171-
content
167+
content {
168+
content {
169+
blockType,
170+
settings
171+
},
172+
style,
173+
meta
174+
}
172175
},
173176
trigger {
174177
type,
@@ -190,10 +193,10 @@ export default function Page({
190193
sequenceId,
191194
emailId: email?.emailId,
192195
subject,
193-
content,
196+
content: JSON.stringify(content),
194197
delayInMillis: delay * 86400000,
195198
published: published === "published",
196-
previewText,
199+
// previewText,
197200
},
198201
})
199202
.build();
@@ -207,7 +210,7 @@ export default function Page({
207210
setEmail(email);
208211
setDelay(email.delayInMillis / 86400000);
209212
setSubject(email.subject);
210-
setPreviewText(email.previewText || "");
213+
// setPreviewText(email.previewText || "");
211214
setContent(email.content);
212215
setPublished(email.published ? "published" : "unpublished");
213216
}
@@ -227,7 +230,7 @@ export default function Page({
227230
content,
228231
delay,
229232
published,
230-
previewText,
233+
// previewText,
231234
]);
232235

233236
useEffect(() => {
@@ -261,9 +264,9 @@ export default function Page({
261264
(subject === email?.subject &&
262265
content === email?.content &&
263266
delay === email?.delayInMillis / 86400000 &&
264-
previewText ===
265-
(email?.content?.meta?.previewText ||
266-
"") &&
267+
// previewText ===
268+
// (email?.content?.meta?.previewText ||
269+
// "") &&
267270
published ===
268271
(email?.published
269272
? "published"
@@ -316,14 +319,14 @@ export default function Page({
316319
setSubject(e.target.value)
317320
}
318321
/>
319-
<FormField
322+
{/* <FormField
320323
value={previewText}
321324
label={MAIL_PREVIEW_TITLE}
322325
onChange={(e: ChangeEvent<HTMLInputElement>) =>
323326
setPreviewText(e.target.value)
324327
}
325328
tooltip="This text will be shown in the email client before opening the email."
326-
/>
329+
/> */}
327330
</Form>
328331
{/* <Button
329332
variant="outline"
@@ -342,7 +345,7 @@ export default function Page({
342345
</Button> */}
343346
<EmailViewer
344347
content={content}
345-
emailEditorLink={`/dashboard/mail/${sequenceId}/${mailId}?redirectTo=/dashboard/mails/sequence/${sequenceId}/${mailId}`}
348+
emailEditorLink={`/dashboard/mail/sequence/${sequenceId}/${mailId}?redirectTo=/dashboard/mails/sequence/${sequenceId}/${mailId}`}
346349
/>
347350
</div>
348351
</div>

apps/web/app/(with-contexts)/dashboard/(sidebar)/product-old/[id]/customer/new/page.tsx

Lines changed: 0 additions & 32 deletions
This file was deleted.

apps/web/app/(with-contexts)/dashboard/(sidebar)/product-old/[id]/layout.tsx

Lines changed: 0 additions & 16 deletions
This file was deleted.

apps/web/app/(with-contexts)/dashboard/(sidebar)/product-old/[id]/page.tsx

Lines changed: 0 additions & 145 deletions
This file was deleted.

apps/web/app/(with-contexts)/dashboard/(sidebar)/product-old/[id]/section/[section]/lesson/[lesson]/page.tsx

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)