payload-plugin-newsletter 0.17.4 → 0.18.0

package/dist/index.js

@@ -4172,6 +4172,86 @@ var createTestBroadcastEndpoint = (config, collectionSlug) => {
 };
 
 // src/endpoints/broadcasts/preview.ts
+async function populateMediaFields(content, payload, config) {
+  if (!content || typeof content !== "object") return content;
+  if (content.root?.children) {
+    for (const child of content.root.children) {
+      await populateBlockMediaFields(child, payload, config);
+    }
+  }
+  return content;
+}
+async function populateBlockMediaFields(node, payload, config) {
+  if (node.type === "block" && node.fields) {
+    const blockType = node.fields.blockType || node.fields.blockName;
+    const customBlocks = config.customizations?.broadcasts?.customBlocks || [];
+    const blockConfig = customBlocks.find((b) => b.slug === blockType);
+    if (blockConfig && blockConfig.fields) {
+      for (const field of blockConfig.fields) {
+        if (field.type === "upload" && field.relationTo && node.fields[field.name]) {
+          const fieldValue = node.fields[field.name];
+          if (typeof fieldValue === "string" && fieldValue.match(/^[a-f0-9]{24}$/i)) {
+            try {
+              const media = await payload.findByID({
+                collection: field.relationTo,
+                id: fieldValue,
+                depth: 0
+              });
+              if (media) {
+                node.fields[field.name] = media;
+                payload.logger?.info(`Populated ${field.name} for block ${blockType}:`, {
+                  mediaId: fieldValue,
+                  mediaUrl: media.url,
+                  filename: media.filename
+                });
+              }
+            } catch (error) {
+              payload.logger?.error(`Failed to populate ${field.name} for block ${blockType}:`, error);
+            }
+          }
+        }
+        if (field.type === "array" && field.fields) {
+          const arrayValue = node.fields[field.name];
+          if (Array.isArray(arrayValue)) {
+            for (const arrayItem of arrayValue) {
+              if (arrayItem && typeof arrayItem === "object") {
+                for (const arrayField of field.fields) {
+                  if (arrayField.type === "upload" && arrayField.relationTo && arrayItem[arrayField.name]) {
+                    const arrayFieldValue = arrayItem[arrayField.name];
+                    if (typeof arrayFieldValue === "string" && arrayFieldValue.match(/^[a-f0-9]{24}$/i)) {
+                      try {
+                        const media = await payload.findByID({
+                          collection: arrayField.relationTo,
+                          id: arrayFieldValue,
+                          depth: 0
+                        });
+                        if (media) {
+                          arrayItem[arrayField.name] = media;
+                          payload.logger?.info(`Populated array ${arrayField.name} for block ${blockType}:`, {
+                            mediaId: arrayFieldValue,
+                            mediaUrl: media.url,
+                            filename: media.filename
+                          });
+                        }
+                      } catch (error) {
+                        payload.logger?.error(`Failed to populate array ${arrayField.name} for block ${blockType}:`, error);
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (node.children) {
+    for (const child of node.children) {
+      await populateBlockMediaFields(child, payload, config);
+    }
+  }
+}
 var createBroadcastPreviewEndpoint = (config, _collectionSlug) => {
   return {
     path: "/preview",
@@ -4187,7 +4267,9 @@ var createBroadcastPreviewEndpoint = (config, _collectionSlug) => {
           }, { status: 400 });
         }
         const mediaUrl = req.payload.config.serverURL ? `${req.payload.config.serverURL}/api/media` : "/api/media";
-        const htmlContent = await convertToEmailSafeHtml(content, {
+        req.payload.logger?.info("Populating media fields for email preview...");
+        const populatedContent = await populateMediaFields(content, req.payload, config);
+        const htmlContent = await convertToEmailSafeHtml(populatedContent, {
           wrapInTemplate: true,
           preheader,
           mediaUrl,
@@ -4486,8 +4568,9 @@ var createBroadcastsCollection = (pluginConfig) => {
               }
               const { BroadcastApiProvider: BroadcastApiProvider2 } = await Promise.resolve().then(() => (init_broadcast2(), broadcast_exports));
               const provider = new BroadcastApiProvider2(providerConfig);
-              req.payload.logger.info("Converting content to HTML...");
-              const htmlContent = await convertToEmailSafeHtml(doc.contentSection?.content, {
+              req.payload.logger.info("Populating media fields and converting content to HTML...");
+              const populatedContent = await populateMediaFields(doc.contentSection?.content, req.payload, pluginConfig);
+              const htmlContent = await convertToEmailSafeHtml(populatedContent, {
                 customBlockConverter: pluginConfig.customizations?.broadcasts?.customBlockConverter
               });
               if (!htmlContent || htmlContent.trim() === "") {
@@ -4586,7 +4669,8 @@ var createBroadcastsCollection = (pluginConfig) => {
                   return doc;
                 }
                 req.payload.logger.info("Creating broadcast in provider (deferred from initial create)...");
-                const htmlContent = await convertToEmailSafeHtml(doc.contentSection?.content, {
+                const populatedContent = await populateMediaFields(doc.contentSection?.content, req.payload, pluginConfig);
+                const htmlContent = await convertToEmailSafeHtml(populatedContent, {
                   customBlockConverter: pluginConfig.customizations?.broadcasts?.customBlockConverter
                 });
                 if (!htmlContent || htmlContent.trim() === "") {
@@ -4647,7 +4731,8 @@ var createBroadcastsCollection = (pluginConfig) => {
                     updates.preheader = doc.contentSection?.preheader;
                   }
                   if (JSON.stringify(doc.contentSection?.content) !== JSON.stringify(previousDoc?.contentSection?.content)) {
-                    updates.content = await convertToEmailSafeHtml(doc.contentSection?.content, {
+                    const populatedContent = await populateMediaFields(doc.contentSection?.content, req.payload, pluginConfig);
+                    updates.content = await convertToEmailSafeHtml(populatedContent, {
                       customBlockConverter: pluginConfig.customizations?.broadcasts?.customBlockConverter
                     });
                   }