payload-plugin-newsletter 0.25.1 → 0.25.3

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [0.25.3] - 2025-08-16
+
+### Added
+- Media population support for upload nodes within rich text fields in custom blocks
+- Rich text fields in custom blocks now properly populate nested image uploads for email rendering
+
+### Fixed
+- Images inserted in rich text editors within custom blocks now render correctly in email previews
+
+## [0.25.2] - 2025-08-15
+
+### Fixed
+- Fixed issue where editing draft broadcasts created duplicate entries in the provider instead of updating the existing broadcast
+- Broadcasts now immediately sync to provider on creation with minimal data to establish the association
+
 ## [0.25.1] - 2025-08-09
 
 ### Fixed

package/dist/collections.cjs

@@ -1514,7 +1514,7 @@ var createSendBroadcastEndpoint = (config, collectionSlug) => {
   return {
     path: "/:id/send",
     method: "post",
-    handler: async (req) => {
+    handler: (async (req) => {
       try {
         const auth = await requireAdmin(req, config);
         if (!auth.authorized) {
@@ -1588,7 +1588,7 @@ var createSendBroadcastEndpoint = (config, collectionSlug) => {
           error: "Failed to send broadcast"
         }, { status: 500 });
       }
-    }
+    })
   };
 };
 
@@ -1598,7 +1598,7 @@ var createScheduleBroadcastEndpoint = (config, collectionSlug) => {
   return {
     path: "/:id/schedule",
     method: "post",
-    handler: async (req) => {
+    handler: (async (req) => {
       try {
         const auth = await requireAdmin(req, config);
         if (!auth.authorized) {
@@ -1692,7 +1692,7 @@ var createScheduleBroadcastEndpoint = (config, collectionSlug) => {
           error: "Failed to schedule broadcast"
         }, { status: 500 });
       }
-    }
+    })
   };
 };
 
@@ -1701,7 +1701,7 @@ var createTestBroadcastEndpoint = (config, collectionSlug) => {
   return {
     path: "/:id/test",
     method: "post",
-    handler: async (req) => {
+    handler: (async (req) => {
       try {
         const auth = await requireAdmin(req, config);
         if (!auth.authorized) {
@@ -1775,7 +1775,7 @@ var createTestBroadcastEndpoint = (config, collectionSlug) => {
           error: "Failed to send test email"
         }, { status: 500 });
       }
-    }
+    })
   };
 };
 
@@ -1851,6 +1851,10 @@ async function populateBlockMediaFields(node, payload, config) {
             }
           }
         }
+        if (field.type === "richText" && node.fields[field.name]) {
+          await populateRichTextUploads(node.fields[field.name], payload);
+          payload.logger?.info(`Processed rich text field ${field.name} for upload nodes`);
+        }
       }
     }
   }
@@ -1860,11 +1864,51 @@ async function populateBlockMediaFields(node, payload, config) {
     }
   }
 }
+async function populateRichTextUploads(content, payload) {
+  if (!content || typeof content !== "object") return;
+  if (content.root?.children) {
+    await processNodeArray(content.root.children);
+  }
+  if (Array.isArray(content)) {
+    await processNodeArray(content);
+  }
+  async function processNodeArray(nodes) {
+    await Promise.all(nodes.map(processNode));
+  }
+  async function processNode(node) {
+    if (!node || typeof node !== "object") return;
+    if (node.type === "upload" && node.relationTo === "media" && typeof node.value === "string" && node.value.match(/^[a-f0-9]{24}$/i)) {
+      try {
+        const media = await payload.findByID({
+          collection: "media",
+          id: node.value,
+          depth: 0
+        });
+        if (media) {
+          node.value = media;
+          payload.logger?.info(`Populated rich text upload node:`, {
+            mediaId: node.value,
+            mediaUrl: media.url,
+            filename: media.filename
+          });
+        }
+      } catch (error) {
+        payload.logger?.error(`Failed to populate rich text upload ${node.value}:`, error);
+      }
+    }
+    if (node.children && Array.isArray(node.children)) {
+      await processNodeArray(node.children);
+    }
+    if (node.root?.children && Array.isArray(node.root.children)) {
+      await processNodeArray(node.root.children);
+    }
+  }
+}
 var createBroadcastPreviewEndpoint = (config, _collectionSlug) => {
   return {
     path: "/preview",
     method: "post",
-    handler: async (req) => {
+    handler: (async (req) => {
       try {
         const data = await (req.json?.() || Promise.resolve({}));
         const { content, preheader, subject, documentData } = data;
@@ -1904,7 +1948,7 @@ var createBroadcastPreviewEndpoint = (config, _collectionSlug) => {
           error: "Failed to generate email preview"
         }, { status: 500 });
       }
-    }
+    })
   };
 };
 
@@ -2249,10 +2293,6 @@ var createBroadcastsCollection = (pluginConfig) => {
         async ({ doc, operation, req, previousDoc }) => {
           if (!hasProviders) return doc;
           if (operation === "create") {
-            if (!doc.subject || !doc.contentSection?.content) {
-              req.payload.logger.info("Skipping provider sync - broadcast has no subject or content yet");
-              return doc;
-            }
             try {
               const providerConfig = await getBroadcastConfig(req, pluginConfig);
               if (!providerConfig || !providerConfig.token) {
@@ -2261,45 +2301,32 @@ var createBroadcastsCollection = (pluginConfig) => {
               }
               const { BroadcastApiProvider: BroadcastApiProvider2 } = await Promise.resolve().then(() => (init_broadcast2(), broadcast_exports));
               const provider = new BroadcastApiProvider2(providerConfig);
-              req.payload.logger.info("Populating media fields and converting content to HTML...");
-              const populatedContent = await populateMediaFields(doc.contentSection?.content, req.payload, pluginConfig);
-              const emailPreviewConfig = pluginConfig.customizations?.broadcasts?.emailPreview;
-              const htmlContent = await convertToEmailSafeHtml(populatedContent, {
-                wrapInTemplate: emailPreviewConfig?.wrapInTemplate ?? true,
-                customWrapper: emailPreviewConfig?.customWrapper,
-                preheader: doc.contentSection?.preheader,
-                subject: doc.subject,
-                documentData: doc,
-                // Pass entire document
-                customBlockConverter: pluginConfig.customizations?.broadcasts?.customBlockConverter
-              });
-              if (!htmlContent || htmlContent.trim() === "") {
-                req.payload.logger.info("Skipping provider sync - content is empty after conversion");
-                return doc;
-              }
+              const subject = doc.subject || `Draft Broadcast ${(/* @__PURE__ */ new Date()).toISOString()}`;
+              const htmlContent = doc.contentSection?.content ? await convertToEmailSafeHtml(
+                await populateMediaFields(doc.contentSection.content, req.payload, pluginConfig),
+                {
+                  wrapInTemplate: pluginConfig.customizations?.broadcasts?.emailPreview?.wrapInTemplate ?? true,
+                  customWrapper: pluginConfig.customizations?.broadcasts?.emailPreview?.customWrapper,
+                  preheader: doc.contentSection?.preheader,
+                  subject,
+                  documentData: doc,
+                  customBlockConverter: pluginConfig.customizations?.broadcasts?.customBlockConverter
+                }
+              ) : "<p>Draft content - to be updated</p>";
               const createData = {
-                name: doc.subject,
-                // Use subject as name since we removed the name field
-                subject: doc.subject,
-                preheader: doc.contentSection?.preheader,
+                name: subject,
+                // Use subject as name
+                subject,
+                preheader: doc.contentSection?.preheader || "",
                 content: htmlContent,
-                trackOpens: doc.settings?.trackOpens,
-                trackClicks: doc.settings?.trackClicks,
+                trackOpens: doc.settings?.trackOpens ?? true,
+                trackClicks: doc.settings?.trackClicks ?? true,
                 replyTo: doc.settings?.replyTo || providerConfig.replyTo,
-                audienceIds: doc.audienceIds?.map((a) => a.audienceId)
+                audienceIds: doc.audienceIds?.map((a) => a.audienceId) || []
               };
-              req.payload.logger.info("Creating broadcast with data:", {
-                name: createData.name,
+              req.payload.logger.info("Creating broadcast in provider with minimal data to establish association", {
                 subject: createData.subject,
-                preheader: createData.preheader || "NONE",
-                contentLength: htmlContent ? htmlContent.length : 0,
-                contentPreview: htmlContent ? htmlContent.substring(0, 100) + "..." : "EMPTY",
-                trackOpens: createData.trackOpens,
-                trackClicks: createData.trackClicks,
-                replyTo: createData.replyTo,
-                audienceIds: createData.audienceIds || [],
-                apiUrl: providerConfig.apiUrl,
-                hasToken: !!providerConfig.token
+                hasActualContent: !!doc.contentSection?.content
               });
               const providerBroadcast = await provider.create(createData);
               await req.payload.update({
@@ -2311,40 +2338,14 @@ var createBroadcastsCollection = (pluginConfig) => {
                 },
                 req
               });
+              req.payload.logger.info(`Broadcast ${doc.id} created in provider with ID ${providerBroadcast.id}`);
               return {
                 ...doc,
                 providerId: providerBroadcast.id,
                 providerData: providerBroadcast.providerData
               };
             } catch (error) {
-              req.payload.logger.error("Raw error from broadcast provider:");
-              req.payload.logger.error(error);
-              if (error instanceof Error) {
-                req.payload.logger.error("Error is instance of Error:", {
-                  message: error.message,
-                  stack: error.stack,
-                  name: error.name,
-                  // If it's a BroadcastProviderError, it might have additional details
-                  ...error.details,
-                  // Check if it's a fetch response error
-                  ...error.response,
-                  ...error.data,
-                  ...error.status,
-                  ...error.statusText
-                });
-              } else if (typeof error === "string") {
-                req.payload.logger.error("Error is a string:", error);
-              } else if (error && typeof error === "object") {
-                req.payload.logger.error("Error is an object:", JSON.stringify(error, null, 2));
-              } else {
-                req.payload.logger.error("Unknown error type:", typeof error);
-              }
-              req.payload.logger.error("Failed broadcast document:", {
-                id: doc.id,
-                subject: doc.subject,
-                hasContent: !!doc.contentSection?.content,
-                contentType: doc.contentSection?.content ? typeof doc.contentSection.content : "none"
-              });
+              req.payload.logger.error("Failed to create broadcast in provider during initial creation:", error);
               return doc;
             }
           }
@@ -2364,61 +2365,8 @@ var createBroadcastsCollection = (pluginConfig) => {
               const { BroadcastApiProvider: BroadcastApiProvider2 } = await Promise.resolve().then(() => (init_broadcast2(), broadcast_exports));
               const provider = new BroadcastApiProvider2(providerConfig);
               if (!doc.providerId) {
-                if (!doc.subject || !doc.contentSection?.content) {
-                  req.payload.logger.info("Still missing required fields for provider sync");
-                  return doc;
-                }
-                req.payload.logger.info("Creating broadcast in provider (deferred from initial create)...");
-                const populatedContent = await populateMediaFields(doc.contentSection?.content, req.payload, pluginConfig);
-                const emailPreviewConfig = pluginConfig.customizations?.broadcasts?.emailPreview;
-                const htmlContent = await convertToEmailSafeHtml(populatedContent, {
-                  wrapInTemplate: emailPreviewConfig?.wrapInTemplate ?? true,
-                  customWrapper: emailPreviewConfig?.customWrapper,
-                  preheader: doc.contentSection?.preheader,
-                  subject: doc.subject,
-                  documentData: doc,
-                  // Pass entire document
-                  customBlockConverter: pluginConfig.customizations?.broadcasts?.customBlockConverter
-                });
-                if (!htmlContent || htmlContent.trim() === "") {
-                  req.payload.logger.info("Skipping provider sync - content is empty after conversion");
-                  return doc;
-                }
-                const createData = {
-                  name: doc.subject,
-                  subject: doc.subject,
-                  preheader: doc.contentSection?.preheader,
-                  content: htmlContent,
-                  trackOpens: doc.settings?.trackOpens,
-                  trackClicks: doc.settings?.trackClicks,
-                  replyTo: doc.settings?.replyTo || providerConfig.replyTo,
-                  audienceIds: doc.audienceIds?.map((a) => a.audienceId)
-                };
-                req.payload.logger.info("Creating broadcast with data:", {
-                  name: createData.name,
-                  subject: createData.subject,
-                  preheader: createData.preheader || "NONE",
-                  contentLength: htmlContent ? htmlContent.length : 0,
-                  contentPreview: htmlContent ? htmlContent.substring(0, 100) + "..." : "EMPTY",
-                  apiUrl: providerConfig.apiUrl,
-                  hasToken: !!providerConfig.token
-                });
-                const providerBroadcast = await provider.create(createData);
-                await req.payload.update({
-                  collection: "broadcasts",
-                  id: doc.id,
-                  data: {
-                    providerId: providerBroadcast.id,
-                    providerData: providerBroadcast.providerData
-                  },
-                  req
-                });
-                req.payload.logger.info(`Broadcast ${doc.id} created in provider successfully (deferred)`);
-                return {
-                  ...doc,
-                  providerId: providerBroadcast.id,
-                  providerData: providerBroadcast.providerData
-                };
+                req.payload.logger.warn(`Broadcast ${doc.id} has no providerId - provider sync skipped. This shouldn't happen with immediate creation.`);
+                return doc;
               }
               if (doc.providerId) {
                 const capabilities = provider.getCapabilities();