payload-plugin-newsletter 0.25.8 → 0.25.11

package/dist/collections.js

@@ -741,25 +741,8 @@ var createEmailSafeFeatures = (additionalBlocks) => {
     ItalicFeature(),
     UnderlineFeature(),
     StrikethroughFeature(),
-    // Links with enhanced configuration
-    LinkFeature({
-      fields: [
-        {
-          name: "url",
-          type: "text",
-          required: true,
-          admin: {
-            description: "Enter the full URL (including https://)"
-          }
-        },
-        {
-          name: "newTab",
-          type: "checkbox",
-          label: "Open in new tab",
-          defaultValue: false
-        }
-      ]
-    }),
+    // Links - use default fields to ensure drawer UI works correctly
+    LinkFeature(),
     // Lists
     OrderedListFeature(),
     UnorderedListFeature(),
@@ -815,25 +798,8 @@ var createEmailLexicalEditor = (customBlocks = []) => {
       ItalicFeature(),
       UnderlineFeature(),
       StrikethroughFeature(),
-      // Links with enhanced configuration
-      LinkFeature({
-        fields: [
-          {
-            name: "url",
-            type: "text",
-            required: true,
-            admin: {
-              description: "Enter the full URL (including https://)"
-            }
-          },
-          {
-            name: "newTab",
-            type: "checkbox",
-            label: "Open in new tab",
-            defaultValue: false
-          }
-        ]
-      }),
+      // Links - use default fields to ensure drawer UI works correctly
+      LinkFeature(),
       // Lists
       OrderedListFeature(),
       UnorderedListFeature(),
@@ -1401,7 +1367,7 @@ async function getBroadcastConfig(req, pluginConfig) {
     }
     return pluginConfig.providers?.broadcast || null;
   } catch (error) {
-    req.payload.logger.error("Failed to get broadcast config from settings:", error);
+    req.payload.logger.error({ error: String(error) }, "Failed to get broadcast config from settings");
     return pluginConfig.providers?.broadcast || null;
   }
 }
@@ -1798,23 +1764,24 @@ async function populateBlockMediaFields(node, payload, config) {
       for (const field of blockConfig.fields) {
         if (field.type === "upload" && field.relationTo && node.fields[field.name]) {
           const fieldValue = node.fields[field.name];
+          const collectionName = Array.isArray(field.relationTo) ? field.relationTo[0] : field.relationTo;
           if (typeof fieldValue === "string" && fieldValue.match(/^[a-f0-9]{24}$/i)) {
             try {
               const media = await payload.findByID({
-                collection: field.relationTo,
+                collection: collectionName,
                 id: fieldValue,
                 depth: 0
               });
               if (media) {
                 node.fields[field.name] = media;
-                payload.logger?.info(`Populated ${field.name} for block ${blockType}:`, {
+                payload.logger?.info({
                   mediaId: fieldValue,
                   mediaUrl: media.url,
                   filename: media.filename
-                });
+                }, `Populated ${field.name} for block ${blockType}`);
               }
             } catch (error) {
-              payload.logger?.error(`Failed to populate ${field.name} for block ${blockType}:`, error);
+              payload.logger?.error({ error: String(error) }, `Failed to populate ${field.name} for block ${blockType}`);
             }
           }
         }
@@ -1826,23 +1793,24 @@ async function populateBlockMediaFields(node, payload, config) {
                 for (const arrayField of field.fields) {
                   if (arrayField.type === "upload" && arrayField.relationTo && arrayItem[arrayField.name]) {
                     const arrayFieldValue = arrayItem[arrayField.name];
+                    const arrayCollectionName = Array.isArray(arrayField.relationTo) ? arrayField.relationTo[0] : arrayField.relationTo;
                     if (typeof arrayFieldValue === "string" && arrayFieldValue.match(/^[a-f0-9]{24}$/i)) {
                       try {
                         const media = await payload.findByID({
-                          collection: arrayField.relationTo,
+                          collection: arrayCollectionName,
                           id: arrayFieldValue,
                           depth: 0
                         });
                         if (media) {
                           arrayItem[arrayField.name] = media;
-                          payload.logger?.info(`Populated array ${arrayField.name} for block ${blockType}:`, {
+                          payload.logger?.info({
                             mediaId: arrayFieldValue,
                             mediaUrl: media.url,
                             filename: media.filename
-                          });
+                          }, `Populated array ${arrayField.name} for block ${blockType}`);
                         }
                       } catch (error) {
-                        payload.logger?.error(`Failed to populate array ${arrayField.name} for block ${blockType}:`, error);
+                        payload.logger?.error({ error: String(error) }, `Failed to populate array ${arrayField.name} for block ${blockType}`);
                       }
                     }
                   }
@@ -1886,14 +1854,14 @@ async function populateRichTextUploads(content, payload) {
         });
         if (media) {
           node.value = media;
-          payload.logger?.info(`Populated rich text upload node:`, {
+          payload.logger?.info({
             mediaId: node.value,
             mediaUrl: media.url,
             filename: media.filename
-          });
+          }, "Populated rich text upload node");
         }
       } catch (error) {
-        payload.logger?.error(`Failed to populate rich text upload ${node.value}:`, error);
+        payload.logger?.error({ error: String(error) }, `Failed to populate rich text upload ${node.value}`);
       }
     }
     if (node.children && Array.isArray(node.children)) {
@@ -2293,93 +2261,19 @@ var createBroadcastsCollection = (pluginConfig) => {
         async ({ doc, operation, req, previousDoc }) => {
           if (!hasProviders) return doc;
           if (operation === "create") {
-            try {
-              req.payload.logger.info("Broadcast afterChange CREATE hook (sync) - doc info:", {
-                docId: doc.id,
-                docIdType: typeof doc.id,
-                hasDoc: !!doc,
-                operation,
-                status: doc._status,
-                hasExternalId: !!doc.externalId,
-                hasProviderId: !!doc.providerId
-              });
-              if (doc.externalId || doc.providerId) {
-                req.payload.logger.info("Broadcast already has provider IDs, skipping creation", {
-                  externalId: doc.externalId,
-                  providerId: doc.providerId
-                });
-                return doc;
-              }
-              const providerConfig = await getBroadcastConfig(req, pluginConfig);
-              if (!providerConfig || !providerConfig.token) {
-                req.payload.logger.error("Broadcast provider not configured in Newsletter Settings or environment variables");
-                return doc;
-              }
-              const { BroadcastApiProvider: BroadcastApiProvider2 } = await Promise.resolve().then(() => (init_broadcast2(), broadcast_exports));
-              const provider = new BroadcastApiProvider2(providerConfig);
-              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: subject,
-                // Use subject as name
-                subject,
-                preheader: doc.contentSection?.preheader || "",
-                content: htmlContent,
-                trackOpens: doc.settings?.trackOpens ?? true,
-                trackClicks: doc.settings?.trackClicks ?? true,
-                replyTo: doc.settings?.replyTo || providerConfig.replyTo,
-                audienceIds: doc.audienceIds?.map((a) => a.audienceId) || []
-              };
-              req.payload.logger.info("Creating broadcast in provider with minimal data to establish association", {
-                subject: createData.subject,
-                hasActualContent: !!doc.contentSection?.content
-              });
-              const providerBroadcast = await provider.create(createData);
-              req.payload.logger.info("Provider broadcast created:", {
-                providerBroadcastId: providerBroadcast.id,
-                providerBroadcastIdType: typeof providerBroadcast.id,
-                docId: doc.id,
-                docIdType: typeof doc.id
-              });
-              req.payload.logger.info(`Broadcast ${doc.id} created in provider with ID ${providerBroadcast.id}`);
-              return {
-                ...doc,
-                providerId: providerBroadcast.id,
-                externalId: providerBroadcast.id,
-                // Include externalId in return value
-                providerData: providerBroadcast.providerData
-              };
-            } catch (error) {
-              req.payload.logger.error("Failed to create broadcast in provider during initial creation:");
-              if (error instanceof Error) {
-                req.payload.logger.error("Error details:", {
-                  message: error.message,
-                  stack: error.stack,
-                  name: error.name
-                });
-              } else {
-                req.payload.logger.error("Raw error:", error);
-              }
-              return doc;
-            }
+            req.payload.logger.info("Broadcast created in Payload, provider sync will happen on first update with content");
+            return doc;
           }
           if (operation === "update") {
-            req.payload.logger.info("Broadcast afterChange update hook triggered", {
+            req.payload.logger.info({
               operation,
               hasProviderId: !!doc.providerId,
+              hasExternalId: !!doc.externalId,
               sendStatus: doc.sendStatus,
-              publishStatus: doc._status
-            });
+              publishStatus: doc._status,
+              hasSubject: !!doc.subject,
+              hasContent: !!doc.contentSection?.content
+            }, "Broadcast afterChange update hook triggered");
             try {
               const providerConfig = await getBroadcastConfig(req, pluginConfig);
               if (!providerConfig || !providerConfig.token) {
@@ -2388,8 +2282,40 @@ var createBroadcastsCollection = (pluginConfig) => {
               }
               const { BroadcastApiProvider: BroadcastApiProvider2 } = await Promise.resolve().then(() => (init_broadcast2(), broadcast_exports));
               const provider = new BroadcastApiProvider2(providerConfig);
+              if (!doc.providerId && !doc.externalId && doc.subject && doc.contentSection?.content) {
+                req.payload.logger.info("Creating broadcast in provider on first update with content");
+                const htmlContent = 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: doc.subject,
+                    documentData: doc,
+                    customBlockConverter: pluginConfig.customizations?.broadcasts?.customBlockConverter
+                  }
+                );
+                const createData = {
+                  name: doc.subject,
+                  subject: doc.subject,
+                  preheader: doc.contentSection?.preheader || "",
+                  content: htmlContent,
+                  trackOpens: doc.settings?.trackOpens ?? true,
+                  trackClicks: doc.settings?.trackClicks ?? true,
+                  replyTo: doc.settings?.replyTo || providerConfig.replyTo,
+                  audienceIds: doc.audienceIds?.map((a) => a.audienceId) || []
+                };
+                const providerBroadcast = await provider.create(createData);
+                req.payload.logger.info(`Broadcast ${doc.id} created in provider with ID ${providerBroadcast.id}`);
+                return {
+                  ...doc,
+                  providerId: providerBroadcast.id,
+                  externalId: providerBroadcast.id,
+                  providerData: providerBroadcast.providerData
+                };
+              }
               if (!doc.providerId) {
-                req.payload.logger.warn(`Broadcast ${doc.id} has no providerId - provider sync skipped. This shouldn't happen with immediate creation.`);
+                req.payload.logger.info(`Broadcast ${doc.id} has no providerId and insufficient content for creation - skipping sync`);
                 return doc;
               }
               if (doc.providerId) {
@@ -2434,10 +2360,10 @@ var createBroadcastsCollection = (pluginConfig) => {
                   if (JSON.stringify(doc.audienceIds) !== JSON.stringify(previousDoc?.audienceIds)) {
                     updates.audienceIds = doc.audienceIds?.map((a) => a.audienceId);
                   }
-                  req.payload.logger.info("Syncing broadcast updates to provider", {
+                  req.payload.logger.info({
                     providerId: doc.providerId,
                     updates
-                  });
+                  }, "Syncing broadcast updates to provider");
                   await provider.update(doc.providerId, updates);
                   req.payload.logger.info(`Broadcast ${doc.id} synced to provider successfully`);
                 } else {
@@ -2459,18 +2385,18 @@ var createBroadcastsCollection = (pluginConfig) => {
                   ...error.statusText
                 });
               } else if (typeof error === "string") {
-                req.payload.logger.error("Error is a string:", error);
+                req.payload.logger.error({ errorValue: error }, "Error is a string");
               } else if (error && typeof error === "object") {
-                req.payload.logger.error("Error is an object:", JSON.stringify(error, null, 2));
+                req.payload.logger.error({ errorValue: JSON.stringify(error, null, 2) }, "Error is an object");
               } else {
-                req.payload.logger.error("Unknown error type:", typeof error);
+                req.payload.logger.error({ errorType: typeof error }, "Unknown error type");
               }
-              req.payload.logger.error("Failed broadcast document (update operation):", {
+              req.payload.logger.error({
                 id: doc.id,
                 subject: doc.subject,
                 hasContent: !!doc.contentSection?.content,
                 contentType: doc.contentSection?.content ? typeof doc.contentSection.content : "none"
-              });
+              }, "Failed broadcast document (update operation)");
             }
           }
           return doc;
@@ -2516,7 +2442,7 @@ var createBroadcastsCollection = (pluginConfig) => {
                   ...error.details
                 });
               } else {
-                req.payload.logger.error(`Failed to send broadcast ${doc.id}:`, error);
+                req.payload.logger.error({ error: String(error) }, `Failed to send broadcast ${doc.id}`);
               }
               await req.payload.update({
                 collection: "broadcasts",
@@ -2559,7 +2485,7 @@ var createBroadcastsCollection = (pluginConfig) => {
                 ...error.details
               });
             } else {
-              req.payload.logger.error("Failed to delete broadcast from provider:", error);
+              req.payload.logger.error({ error: String(error) }, "Failed to delete broadcast from provider");
             }
           }
           return doc;