strapi-plugin-hubspot 0.16.2 → 0.16.5

package/dist/_chunks/{index-R3ReZXF1.js → index-CG_WQzSa.js}

@@ -26,7 +26,7 @@ const index = {
       icon: icons.PaperPlane,
       intlLabel: { id: `${PLUGIN_ID}.menu.label`, defaultMessage: "HubSpot Forms" },
       permissions: [{ action: `plugin::${PLUGIN_ID}.forms`, subject: null }],
-      Component: async () => (await Promise.resolve().then(() => require("./Forms-mMNP7hc9.js"))).default
+      Component: async () => (await Promise.resolve().then(() => require("./Forms-uUN4XjhW.js"))).default
     });
     app.customFields.register({
       name: "property",
@@ -41,7 +41,7 @@ const index = {
         defaultMessage: "Picked from the portal's real properties"
       },
       components: {
-        Input: async () => Promise.resolve().then(() => require("./HubspotPropertyInput-BLZzsW08.js"))
+        Input: async () => Promise.resolve().then(() => require("./HubspotPropertyInput-CFMkbQeT.js"))
       },
       // Exposed in the Content-Type Builder. Without this, `objectField` could
       // only be set by hand-editing schema.json — which is not how anyone
@@ -104,7 +104,7 @@ const index = {
         defaultMessage: "Picked from the portal's configured objects"
       },
       components: {
-        Input: async () => Promise.resolve().then(() => require("./HubspotObjectInput-Cq1TuL_l.js"))
+        Input: async () => Promise.resolve().then(() => require("./HubspotObjectInput-CFDYW-TM.js"))
       }
     });
     app.customFields.register({
@@ -120,7 +120,7 @@ const index = {
         defaultMessage: "A form built in the HubSpot form builder, stored by slug"
       },
       components: {
-        Input: async () => Promise.resolve().then(() => require("./HubspotFormInput-DI35Aqiu.js"))
+        Input: async () => Promise.resolve().then(() => require("./HubspotFormInput-BkWat_wu.js"))
       }
     });
     app.createSettingSection(
@@ -136,7 +136,7 @@ const index = {
           // Mirrors the RBAC action registered server-side: a role without it
           // doesn't see the link at all — the routes refuse it anyway.
           permissions: [{ action: `plugin::${PLUGIN_ID}.settings`, subject: null }],
-          Component: async () => (await Promise.resolve().then(() => require("./Settings-BAsx0LGv.js"))).default
+          Component: async () => (await Promise.resolve().then(() => require("./Settings-B_hhdpHa.js"))).default
         }
       ]
     );
@@ -146,7 +146,7 @@ const index = {
     return Promise.all(
       locales.map(async (locale) => {
         try {
-          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => Promise.resolve().then(() => require("./en-sfzopB5K.js")), "./translations/fr.json": () => Promise.resolve().then(() => require("./fr-sF5Josfh.js")) }), `./translations/${locale}.json`, 3);
+          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => Promise.resolve().then(() => require("./en-CFhEtgZJ.js")), "./translations/fr.json": () => Promise.resolve().then(() => require("./fr-zdUuuV0M.js")) }), `./translations/${locale}.json`, 3);
           return { data: prefixPluginTranslations(data), locale };
         } catch {
           return { data: {}, locale };

package/dist/_chunks/{objectLabels-CW2iBOkD.js → objectLabels-BGq-Ypgn.js}

@@ -1,5 +1,5 @@
 "use strict";
-const index = require("./index-R3ReZXF1.js");
+const index = require("./index-CG_WQzSa.js");
 const STANDARD = /* @__PURE__ */ new Set([
   "contact",
   "company",

package/dist/_chunks/{objectLabels--zOmqsfm.mjs → objectLabels-CS_0QCNz.mjs}

@@ -1,4 +1,4 @@
-import { g as getTranslation } from "./index-CLAy5dVN.mjs";
+import { g as getTranslation } from "./index-BeBn7bJa.mjs";
 const STANDARD = /* @__PURE__ */ new Set([
   "contact",
   "company",

package/dist/_chunks/{useHubspotSchema-BRzzvs9t.js → useHubspotSchema-BZP2qkAu.js}

@@ -1,7 +1,7 @@
 "use strict";
 const React = require("react");
 const admin = require("@strapi/strapi/admin");
-const index = require("./index-R3ReZXF1.js");
+const index = require("./index-CG_WQzSa.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/_chunks/{useHubspotSchema-Bz2o1BU-.mjs → useHubspotSchema-CP7LRdzO.mjs}

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { useFetchClient } from "@strapi/strapi/admin";
-import { P as PLUGIN_ID } from "./index-CLAy5dVN.mjs";
+import { P as PLUGIN_ID } from "./index-BeBn7bJa.mjs";
 let cached = null;
 let inFlight = null;
 const listeners = /* @__PURE__ */ new Set();

package/dist/admin/index.js

@@ -1,4 +1,4 @@
 "use strict";
-const index = require("../_chunks/index-R3ReZXF1.js");
+const index = require("../_chunks/index-CG_WQzSa.js");
 require("@strapi/icons");
 module.exports = index.index;

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { i } from "../_chunks/index-CLAy5dVN.mjs";
+import { i } from "../_chunks/index-BeBn7bJa.mjs";
 import "@strapi/icons";
 export {
   i as default

package/dist/admin/src/builder/types.d.ts

@@ -103,7 +103,7 @@ export interface SubmissionRowDto {
     formTitle?: string | null;
     email?: string | null;
     values: Record<string, string | number | boolean>;
-    meta?: Record<string, string> | null;
+    meta?: Record<string, unknown> | null;
     locale?: string | null;
     hubspotSynced?: boolean;
     createdAt?: string;

package/dist/server/index.js

@@ -191,7 +191,8 @@ function policyFrom(stored, forms) {
   return {
     submissionMode: asSubmissionMode(stored.submissionMode) ?? asSubmissionMode(forms.submissionMode) ?? "auto",
     writeExtraProperties: asBool(stored.writeExtraProperties) ?? asBool(forms.writeExtraProperties) ?? true,
-    syncFieldsOnPublish: asBool(stored.syncFieldsOnPublish) ?? asBool(forms.syncFieldsOnPublish) ?? false
+    syncFieldsOnPublish: asBool(stored.syncFieldsOnPublish) ?? asBool(forms.syncFieldsOnPublish) ?? false,
+    timelineNote: asBool(stored.timelineNote) ?? asBool(forms.timelineNote) ?? true
   };
 }
 async function resolvePolicy(strapi) {
@@ -275,6 +276,9 @@ async function patchStoredSettings(strapi, body) {
   if ("syncFieldsOnPublish" in body && typeof body.syncFieldsOnPublish === "boolean") {
     next.syncFieldsOnPublish = body.syncFieldsOnPublish;
   }
+  if ("timelineNote" in body && typeof body.timelineNote === "boolean") {
+    next.timelineNote = body.timelineNote;
+  }
   await setStoredSettings(strapi, next);
 }
 async function clearStoredApiKey(strapi) {
@@ -1932,6 +1936,59 @@ function formFieldNames(raw) {
   }
   return names;
 }
+function formRequiredNames(raw) {
+  const names = [];
+  for (const group of raw.fieldGroups ?? []) {
+    for (const field of group.fields ?? []) {
+      if (field.name && field.required) names.push(field.name);
+    }
+  }
+  return names;
+}
+function parseFormShape(raw) {
+  const legal = raw.legalConsentOptions;
+  const hasLegalConsent = Boolean(
+    legal && typeof legal === "object" && legal.type && legal.type !== "none"
+  );
+  const communications = [];
+  for (const box of legal?.communicationsCheckboxes ?? []) {
+    const id = Number(box.subscriptionTypeId ?? box.communicationTypeId);
+    if (!Number.isFinite(id) || id <= 0) continue;
+    communications.push({
+      subscriptionTypeId: id,
+      text: String(box.label || box.text || "").trim() || "I agree to receive communications."
+    });
+  }
+  const consentToProcessText = legal?.consentToProcessText?.trim();
+  return {
+    names: new Set(formFieldNames(raw)),
+    required: new Set(formRequiredNames(raw)),
+    hasLegalConsent,
+    captcha: raw.configuration?.captchaEnabled === true,
+    ...consentToProcessText ? { consentToProcessText } : {},
+    communications
+  };
+}
+function canRetryEmailOnly(required) {
+  const names = [...required ?? []];
+  return names.length === 0 || names.every((name) => name === "email");
+}
+function buildLegalConsent(shape, given, fallbackText) {
+  if (!given) return void 0;
+  if (shape && !shape.hasLegalConsent) return void 0;
+  const consent = {
+    consentToProcess: true,
+    text: shape?.consentToProcessText?.trim() || fallbackText?.trim() || DEFAULT_CONSENT_TEXT
+  };
+  if (shape?.communications.length) {
+    consent.communications = shape.communications.map((item) => ({
+      value: true,
+      subscriptionTypeId: item.subscriptionTypeId,
+      text: item.text
+    }));
+  }
+  return { consent };
+}
 const shapeCache = /* @__PURE__ */ new Map();
 function clearFormShapeCache(formGuid) {
   if (formGuid) shapeCache.delete(formGuid);
@@ -1940,16 +1997,13 @@ function clearFormShapeCache(formGuid) {
 async function loadFormShape(apiKey, formGuid) {
   const cached = shapeCache.get(formGuid);
   if (cached && Date.now() - cached.at < SHAPE_TTL_MS) {
-    return { names: cached.names, hasLegalConsent: cached.hasLegalConsent };
+    return cached.shape;
   }
   try {
     const raw = await fetchHubspotForm(apiKey, formGuid);
-    const names = new Set(formFieldNames(raw));
-    const hasLegalConsent = Boolean(
-      raw.legalConsentOptions && typeof raw.legalConsentOptions === "object" && raw.legalConsentOptions.type && raw.legalConsentOptions.type !== "none"
-    );
-    shapeCache.set(formGuid, { at: Date.now(), names, hasLegalConsent });
-    return { names, hasLegalConsent };
+    const shape = parseFormShape(raw);
+    shapeCache.set(formGuid, { at: Date.now(), shape });
+    return shape;
   } catch {
     return null;
   }
@@ -2007,28 +2061,45 @@ async function submitMarketingForm(input) {
   if (!portalId || !isFormGuid(formGuid) || !input.fields.length) {
     return { ok: false, status: 0, error: "Missing portal, form GUID or fields" };
   }
+  if (input.shape?.captcha) {
+    return {
+      ok: false,
+      status: 0,
+      error: "HubSpot form has CAPTCHA enabled — the Forms API cannot submit it. Turn CAPTCHA off on that marketing form."
+    };
+  }
   const url = formsSubmitUrl(portalId, formGuid, input.region);
   const context = contextPayload(input.context);
+  const fields = input.fields.map((field) => ({
+    objectTypeId: field.objectTypeId || "0-1",
+    name: field.name,
+    value: field.value
+  }));
   const base = {
-    fields: input.fields,
+    fields,
     ...Object.keys(context).length ? { context } : {}
   };
-  const withConsent = input.consent?.given && input.formHasLegalConsent !== false ? {
-    ...base,
-    legalConsentOptions: {
-      consent: {
-        consentToProcess: true,
-        text: input.consent.text?.trim() || DEFAULT_CONSENT_TEXT
-      }
-    }
-  } : base;
+  const legal = buildLegalConsent(
+    input.shape,
+    input.consent?.given === true,
+    input.consent?.text
+  );
+  const withConsent = legal ? { ...base, legalConsentOptions: legal } : base;
   let result = await postForm(url, input.apiKey, withConsent);
-  if (!result.ok && result.status === 400 && withConsent !== base) {
+  const mustKeepConsent = Boolean(input.shape?.hasLegalConsent && legal);
+  if (!result.ok && result.status === 400 && withConsent !== base && !mustKeepConsent) {
     result = await postForm(url, input.apiKey, base);
   }
-  if (!result.ok && result.status === 400 && input.fields.length > 1) {
-    const email = input.fields.find((f) => f.name === "email");
-    if (email) result = await postForm(url, input.apiKey, { ...base, fields: [email] });
+  if (!result.ok && result.status === 400 && input.fields.length > 1 && canRetryEmailOnly(input.shape?.required)) {
+    const email = fields.find((f) => f.name === "email");
+    if (email) {
+      const slim = { ...base, fields: [email] };
+      result = await postForm(
+        url,
+        input.apiKey,
+        legal && mustKeepConsent ? { ...slim, legalConsentOptions: legal } : slim
+      );
+    }
   }
   return result;
 }
@@ -2410,6 +2481,7 @@ function createFormsService(strapi, _opts = {}) {
     }
     let usedFormsApi = false;
     let sentFieldNames = [];
+    let conversionError;
     if (email && apiKey) {
       const groups = groupByObject(form.definition, resolution.values);
       for (const [object, props] of Object.entries(companyGroups)) {
@@ -2445,11 +2517,11 @@ function createFormsService(strapi, _opts = {}) {
             context: {
               hutk: sanitizeHutk(meta.hutk),
               pageUri: typeof meta.pageUrl === "string" ? meta.pageUrl : void 0,
-              pageName: typeof meta.pageName === "string" && meta.pageName || (form.title || form.name) || void 0,
+              pageName: typeof meta.pageName === "string" && meta.pageName || typeof meta.originLabel === "string" && meta.originLabel || (form.title || form.name) || void 0,
               ipAddress: sanitizeIp(meta.ipAddress)
             },
             consent: { given: meta.consent === true },
-            formHasLegalConsent: shape?.hasLegalConsent
+            shape
           });
           if (submitted.ok) {
             hubspotSynced = true;
@@ -2462,10 +2534,12 @@ function createFormsService(strapi, _opts = {}) {
               );
             }
           } else {
+            conversionError = submitted.error;
             strapi.log.warn(`[hubspot] Forms API submit failed — ${submitted.error}`);
           }
         } catch (err) {
-          strapi.log.warn(`[hubspot] Forms API submit failed — ${err.message}`);
+          conversionError = err.message;
+          strapi.log.warn(`[hubspot] Forms API submit failed — ${conversionError}`);
         }
       }
       if (!usedFormsApi) {
@@ -2525,7 +2599,7 @@ function createFormsService(strapi, _opts = {}) {
           strapi.log.warn(`[hubspot] company sync failed (contact OK) — ${err.message}`);
         }
       }
-      if (contactId && config2.timelineNote && !usedFormsApi) {
+      if (contactId && policy.timelineNote) {
         try {
           await createLeadNote(apiKey, {
             contactId,
@@ -2547,7 +2621,11 @@ function createFormsService(strapi, _opts = {}) {
         formTitle: form.title || form.name,
         email,
         values: resolution.values,
-        meta,
+        meta: {
+          ...meta,
+          hubspotConversion: usedFormsApi,
+          ...conversionError ? { hubspotError: conversionError } : {}
+        },
         locale: form.locale ?? null,
         hubspotSynced,
         contactId,
@@ -2734,7 +2812,7 @@ function createFormsAdminController(strapi) {
         locale: ctx.query.locale,
         status: "published"
       });
-      ctx.body = { form: entry, published: Boolean(published) };
+      ctx.body = { form: entry, published: Boolean(published), publishedHubspotFormId: published?.hubspotFormId ?? null };
     },
     async create(ctx) {
       const body = ctx.request.body ?? {};
@@ -3334,8 +3412,8 @@ const config = {
     // Submission pipeline of the built forms:
     //  - companyFromDomain: a corporate email upserts the Company (deduped by
     //    domain) and associates it to the contact;
-    //  - timelineNote: recap note on the CRM-upsert fallback only (off when
-    //    submissions go through the marketing Forms API);
+    //  - timelineNote: recap note on the contact after a successful sync
+    //    (page URL, subject, answers) — alongside a Forms API conversion;
     //  - defaultFormId: portal-wide marketing form GUID when a builder form
     //    doesn't set its own — swap with the portal at production cutover.
     //  - submissionMode / writeExtraProperties / syncFieldsOnPublish: see

package/dist/server/index.mjs

@@ -190,7 +190,8 @@ function policyFrom(stored, forms) {
   return {
     submissionMode: asSubmissionMode(stored.submissionMode) ?? asSubmissionMode(forms.submissionMode) ?? "auto",
     writeExtraProperties: asBool(stored.writeExtraProperties) ?? asBool(forms.writeExtraProperties) ?? true,
-    syncFieldsOnPublish: asBool(stored.syncFieldsOnPublish) ?? asBool(forms.syncFieldsOnPublish) ?? false
+    syncFieldsOnPublish: asBool(stored.syncFieldsOnPublish) ?? asBool(forms.syncFieldsOnPublish) ?? false,
+    timelineNote: asBool(stored.timelineNote) ?? asBool(forms.timelineNote) ?? true
   };
 }
 async function resolvePolicy(strapi) {
@@ -274,6 +275,9 @@ async function patchStoredSettings(strapi, body) {
   if ("syncFieldsOnPublish" in body && typeof body.syncFieldsOnPublish === "boolean") {
     next.syncFieldsOnPublish = body.syncFieldsOnPublish;
   }
+  if ("timelineNote" in body && typeof body.timelineNote === "boolean") {
+    next.timelineNote = body.timelineNote;
+  }
   await setStoredSettings(strapi, next);
 }
 async function clearStoredApiKey(strapi) {
@@ -1931,6 +1935,59 @@ function formFieldNames(raw) {
   }
   return names;
 }
+function formRequiredNames(raw) {
+  const names = [];
+  for (const group of raw.fieldGroups ?? []) {
+    for (const field of group.fields ?? []) {
+      if (field.name && field.required) names.push(field.name);
+    }
+  }
+  return names;
+}
+function parseFormShape(raw) {
+  const legal = raw.legalConsentOptions;
+  const hasLegalConsent = Boolean(
+    legal && typeof legal === "object" && legal.type && legal.type !== "none"
+  );
+  const communications = [];
+  for (const box of legal?.communicationsCheckboxes ?? []) {
+    const id = Number(box.subscriptionTypeId ?? box.communicationTypeId);
+    if (!Number.isFinite(id) || id <= 0) continue;
+    communications.push({
+      subscriptionTypeId: id,
+      text: String(box.label || box.text || "").trim() || "I agree to receive communications."
+    });
+  }
+  const consentToProcessText = legal?.consentToProcessText?.trim();
+  return {
+    names: new Set(formFieldNames(raw)),
+    required: new Set(formRequiredNames(raw)),
+    hasLegalConsent,
+    captcha: raw.configuration?.captchaEnabled === true,
+    ...consentToProcessText ? { consentToProcessText } : {},
+    communications
+  };
+}
+function canRetryEmailOnly(required) {
+  const names = [...required ?? []];
+  return names.length === 0 || names.every((name) => name === "email");
+}
+function buildLegalConsent(shape, given, fallbackText) {
+  if (!given) return void 0;
+  if (shape && !shape.hasLegalConsent) return void 0;
+  const consent = {
+    consentToProcess: true,
+    text: shape?.consentToProcessText?.trim() || fallbackText?.trim() || DEFAULT_CONSENT_TEXT
+  };
+  if (shape?.communications.length) {
+    consent.communications = shape.communications.map((item) => ({
+      value: true,
+      subscriptionTypeId: item.subscriptionTypeId,
+      text: item.text
+    }));
+  }
+  return { consent };
+}
 const shapeCache = /* @__PURE__ */ new Map();
 function clearFormShapeCache(formGuid) {
   if (formGuid) shapeCache.delete(formGuid);
@@ -1939,16 +1996,13 @@ function clearFormShapeCache(formGuid) {
 async function loadFormShape(apiKey, formGuid) {
   const cached = shapeCache.get(formGuid);
   if (cached && Date.now() - cached.at < SHAPE_TTL_MS) {
-    return { names: cached.names, hasLegalConsent: cached.hasLegalConsent };
+    return cached.shape;
   }
   try {
     const raw = await fetchHubspotForm(apiKey, formGuid);
-    const names = new Set(formFieldNames(raw));
-    const hasLegalConsent = Boolean(
-      raw.legalConsentOptions && typeof raw.legalConsentOptions === "object" && raw.legalConsentOptions.type && raw.legalConsentOptions.type !== "none"
-    );
-    shapeCache.set(formGuid, { at: Date.now(), names, hasLegalConsent });
-    return { names, hasLegalConsent };
+    const shape = parseFormShape(raw);
+    shapeCache.set(formGuid, { at: Date.now(), shape });
+    return shape;
   } catch {
     return null;
   }
@@ -2006,28 +2060,45 @@ async function submitMarketingForm(input) {
   if (!portalId || !isFormGuid(formGuid) || !input.fields.length) {
     return { ok: false, status: 0, error: "Missing portal, form GUID or fields" };
   }
+  if (input.shape?.captcha) {
+    return {
+      ok: false,
+      status: 0,
+      error: "HubSpot form has CAPTCHA enabled — the Forms API cannot submit it. Turn CAPTCHA off on that marketing form."
+    };
+  }
   const url = formsSubmitUrl(portalId, formGuid, input.region);
   const context = contextPayload(input.context);
+  const fields = input.fields.map((field) => ({
+    objectTypeId: field.objectTypeId || "0-1",
+    name: field.name,
+    value: field.value
+  }));
   const base = {
-    fields: input.fields,
+    fields,
     ...Object.keys(context).length ? { context } : {}
   };
-  const withConsent = input.consent?.given && input.formHasLegalConsent !== false ? {
-    ...base,
-    legalConsentOptions: {
-      consent: {
-        consentToProcess: true,
-        text: input.consent.text?.trim() || DEFAULT_CONSENT_TEXT
-      }
-    }
-  } : base;
+  const legal = buildLegalConsent(
+    input.shape,
+    input.consent?.given === true,
+    input.consent?.text
+  );
+  const withConsent = legal ? { ...base, legalConsentOptions: legal } : base;
   let result = await postForm(url, input.apiKey, withConsent);
-  if (!result.ok && result.status === 400 && withConsent !== base) {
+  const mustKeepConsent = Boolean(input.shape?.hasLegalConsent && legal);
+  if (!result.ok && result.status === 400 && withConsent !== base && !mustKeepConsent) {
     result = await postForm(url, input.apiKey, base);
   }
-  if (!result.ok && result.status === 400 && input.fields.length > 1) {
-    const email = input.fields.find((f) => f.name === "email");
-    if (email) result = await postForm(url, input.apiKey, { ...base, fields: [email] });
+  if (!result.ok && result.status === 400 && input.fields.length > 1 && canRetryEmailOnly(input.shape?.required)) {
+    const email = fields.find((f) => f.name === "email");
+    if (email) {
+      const slim = { ...base, fields: [email] };
+      result = await postForm(
+        url,
+        input.apiKey,
+        legal && mustKeepConsent ? { ...slim, legalConsentOptions: legal } : slim
+      );
+    }
   }
   return result;
 }
@@ -2409,6 +2480,7 @@ function createFormsService(strapi, _opts = {}) {
     }
     let usedFormsApi = false;
     let sentFieldNames = [];
+    let conversionError;
     if (email && apiKey) {
       const groups = groupByObject(form.definition, resolution.values);
       for (const [object, props] of Object.entries(companyGroups)) {
@@ -2444,11 +2516,11 @@ function createFormsService(strapi, _opts = {}) {
             context: {
               hutk: sanitizeHutk(meta.hutk),
               pageUri: typeof meta.pageUrl === "string" ? meta.pageUrl : void 0,
-              pageName: typeof meta.pageName === "string" && meta.pageName || (form.title || form.name) || void 0,
+              pageName: typeof meta.pageName === "string" && meta.pageName || typeof meta.originLabel === "string" && meta.originLabel || (form.title || form.name) || void 0,
               ipAddress: sanitizeIp(meta.ipAddress)
             },
             consent: { given: meta.consent === true },
-            formHasLegalConsent: shape?.hasLegalConsent
+            shape
           });
           if (submitted.ok) {
             hubspotSynced = true;
@@ -2461,10 +2533,12 @@ function createFormsService(strapi, _opts = {}) {
               );
             }
           } else {
+            conversionError = submitted.error;
             strapi.log.warn(`[hubspot] Forms API submit failed — ${submitted.error}`);
           }
         } catch (err) {
-          strapi.log.warn(`[hubspot] Forms API submit failed — ${err.message}`);
+          conversionError = err.message;
+          strapi.log.warn(`[hubspot] Forms API submit failed — ${conversionError}`);
         }
       }
       if (!usedFormsApi) {
@@ -2524,7 +2598,7 @@ function createFormsService(strapi, _opts = {}) {
           strapi.log.warn(`[hubspot] company sync failed (contact OK) — ${err.message}`);
         }
       }
-      if (contactId && config2.timelineNote && !usedFormsApi) {
+      if (contactId && policy.timelineNote) {
         try {
           await createLeadNote(apiKey, {
             contactId,
@@ -2546,7 +2620,11 @@ function createFormsService(strapi, _opts = {}) {
         formTitle: form.title || form.name,
         email,
         values: resolution.values,
-        meta,
+        meta: {
+          ...meta,
+          hubspotConversion: usedFormsApi,
+          ...conversionError ? { hubspotError: conversionError } : {}
+        },
         locale: form.locale ?? null,
         hubspotSynced,
         contactId,
@@ -2733,7 +2811,7 @@ function createFormsAdminController(strapi) {
         locale: ctx.query.locale,
         status: "published"
       });
-      ctx.body = { form: entry, published: Boolean(published) };
+      ctx.body = { form: entry, published: Boolean(published), publishedHubspotFormId: published?.hubspotFormId ?? null };
     },
     async create(ctx) {
       const body = ctx.request.body ?? {};
@@ -3333,8 +3411,8 @@ const config = {
     // Submission pipeline of the built forms:
     //  - companyFromDomain: a corporate email upserts the Company (deduped by
     //    domain) and associates it to the contact;
-    //  - timelineNote: recap note on the CRM-upsert fallback only (off when
-    //    submissions go through the marketing Forms API);
+    //  - timelineNote: recap note on the contact after a successful sync
+    //    (page URL, subject, answers) — alongside a Forms API conversion;
     //  - defaultFormId: portal-wide marketing form GUID when a builder form
     //    doesn't set its own — swap with the portal at production cutover.
     //  - submissionMode / writeExtraProperties / syncFieldsOnPublish: see

package/dist/server/src/forms.d.ts

@@ -6,8 +6,9 @@
  * conversion (with leftover CRM writes for mapped fields the HubSpot form
  * dropped), CRM upsert only, or automatic (Forms API when a GUID is linked).
  * Company find-or-create still runs after a successful submit. Timeline notes
- * are opt-in and only used on the CRM-upsert path. The form submission is
- * the lead — a CRM outage never loses it.
+ * (page URL, subject, answers) are optional extra context on the contact,
+ * alongside a native conversion. The form submission is the lead — a CRM
+ * outage never loses it.
  */
 import type { Core } from "@strapi/strapi";
 import { type FormDefinition, type Primitive } from "./conditions";