strapi-plugin-hubspot 0.16.3 → 0.16.5

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 ## Unreleased
 
+## 0.16.5 — 2026-09-23
+
+### Fixed
+- Admin TypeScript build failed on Submissions (`unknown` used as ReactNode).
+  Same conversion-fail behaviour as 0.16.4; this is the first npm publish of
+  that fix.
+
+## 0.16.4 — 2026-09-23
+
+### Fixed
+- A linked HubSpot form that refused the Forms API (GDPR communications,
+  CAPTCHA, extra required fields) silently fell back to a CRM upsert + note,
+  so the contact looked updated with no native submission. The submit now
+  sends `objectTypeId`, the form's communication consents, skips the
+  email-only retry when HubSpot requires other fields, and refuses CAPTCHA
+  forms with a stored error. Strapi Submissions distinguish **Conversion**
+  vs **Contact only**.
+
 ## 0.16.3 — 2026-09-22
 
 ### Changed

package/dist/_chunks/{Forms-BBaw53Tz.mjs → Forms-DyV6KyiO.mjs}

@@ -5,12 +5,12 @@ import { u as useIntl } from "./index-CEh8vkxY.mjs";
 import { Typography, Flex, Box, SingleSelect, SingleSelectOption, MultiSelect, MultiSelectOption, TextInput, IconButton, Button, Combobox, ComboboxOption, Field, Textarea, Checkbox, Divider, Loader, Badge, Table, Thead, Tr, Th, Tbody, Td, Modal } from "@strapi/design-system";
 import { Trash, Plus, ArrowClockwise, ArrowLeft, Drag, ArrowUp, ArrowDown, List, Duplicate, Download } from "@strapi/icons";
 import { useFetchClient } from "@strapi/strapi/admin";
-import { g as getTranslation, P as PLUGIN_ID } from "./index-B8GYi6sw.mjs";
+import { g as getTranslation, P as PLUGIN_ID } from "./index-BeBn7bJa.mjs";
 import { useSensors, useSensor, PointerSensor, KeyboardSensor, DndContext, useDroppable, closestCorners } from "@dnd-kit/core";
 import { arrayMove, sortableKeyboardCoordinates, SortableContext, verticalListSortingStrategy, useSortable } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
-import { o as objectLabel } from "./objectLabels-DybqhBdT.mjs";
-import { u as useHubspotSchema } from "./useHubspotSchema-DtcHHUOb.mjs";
+import { o as objectLabel } from "./objectLabels-CS_0QCNz.mjs";
+import { u as useHubspotSchema } from "./useHubspotSchema-CP7LRdzO.mjs";
 const OPERATORS = [
   "eq",
   "neq",
@@ -705,6 +705,7 @@ const FormEditor = () => {
   const locale = searchParams.get("locale") ?? void 0;
   const [entry, setEntry] = React.useState(null);
   const [published, setPublished] = React.useState(false);
+  const [publishedHubspotFormId, setPublishedHubspotFormId] = React.useState(null);
   const [locales, setLocales] = React.useState([]);
   const [selection, setSelection] = React.useState({ kind: "form" });
   const [dirty, setDirty] = React.useState(false);
@@ -741,6 +742,7 @@ const FormEditor = () => {
       if (cancelled) return;
       setEntry(data.form);
       setPublished(data.published);
+      setPublishedHubspotFormId(data.publishedHubspotFormId ?? null);
       setDirty(false);
     }).catch(async () => {
       if (cancelled || !locale) return;
@@ -851,6 +853,7 @@ const FormEditor = () => {
     try {
       const { data } = await post(`/${PLUGIN_ID}/builder/forms/${documentId}/publish${query}`);
       setPublished(true);
+      setPublishedHubspotFormId(entry.hubspotFormId ?? null);
       setErrors([]);
       setProblems([]);
       const added = Array.isArray(data?.addedFields) ? data.addedFields.length : 0;
@@ -1339,7 +1342,10 @@ const FormEditor = () => {
               ),
               onChange: (id) => patchEntry({ hubspotFormId: String(id) || null }),
               children: [
-                /* @__PURE__ */ jsx(SingleSelectOption, { value: "", children: t("editor.hubspot-form-none", "None — CRM upsert only") }),
+                /* @__PURE__ */ jsx(SingleSelectOption, { value: "", children: t(
+                  "editor.hubspot-form-none",
+                  "Default marketing form (Settings) — contact only if none is set"
+                ) }),
                 entry.hubspotFormId && !hsForms.some((f) => f.id === entry.hubspotFormId) && /* @__PURE__ */ jsx(SingleSelectOption, { value: entry.hubspotFormId, children: entry.hubspotFormId }),
                 hsForms.map((f) => /* @__PURE__ */ jsx(SingleSelectOption, { value: f.id, children: f.name }, f.id))
               ]
@@ -1355,6 +1361,10 @@ const FormEditor = () => {
           /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: t(
             "editor.hubspot-form-hint",
             "Submissions go through HubSpot’s Forms API so they count as conversions. After you change the form in HubSpot, use Resync from HubSpot — mapped fields update in place, new ones are appended, your steps stay."
+          ) }),
+          published && (entry.hubspotFormId || "") !== (publishedHubspotFormId || "") && /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "danger600", children: t(
+            "editor.hubspot-form-unpublished",
+            "The live site still uses the previously published HubSpot form. Publish to apply this link."
           ) })
         ] }),
         /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: t(
@@ -1764,7 +1774,7 @@ const Submissions = () => {
               /* @__PURE__ */ jsx(Td, { children: /* @__PURE__ */ jsx(Typography, { children: row.formTitle || row.form }) }),
               /* @__PURE__ */ jsx(Td, { children: /* @__PURE__ */ jsx(Typography, { fontWeight: "semiBold", children: row.email || "—" }) }),
               /* @__PURE__ */ jsx(Td, { children: /* @__PURE__ */ jsx(Typography, { textColor: "neutral600", ellipsis: true, children: preview(row.values) }) }),
-              /* @__PURE__ */ jsx(Td, { children: row.hubspotSynced ? /* @__PURE__ */ jsx(Badge, { backgroundColor: "success100", textColor: "success700", children: t("submissions.synced", "Synced") }) : /* @__PURE__ */ jsx(Badge, { backgroundColor: "warning100", textColor: "warning700", children: t("submissions.not-synced", "Not synced") }) })
+              /* @__PURE__ */ jsx(Td, { children: row.meta?.hubspotConversion === true || row.meta?.hubspotConversion === "true" ? /* @__PURE__ */ jsx(Badge, { backgroundColor: "success100", textColor: "success700", children: t("submissions.converted", "Conversion") }) : row.hubspotSynced ? /* @__PURE__ */ jsx(Badge, { backgroundColor: "warning100", textColor: "warning700", children: t("submissions.contact-only", "Contact only") }) : /* @__PURE__ */ jsx(Badge, { backgroundColor: "warning100", textColor: "warning700", children: t("submissions.not-synced", "Not synced") }) })
             ]
           },
           row.documentId
@@ -1800,9 +1810,13 @@ const Submissions = () => {
           /* @__PURE__ */ jsx(Typography, { variant: "sigma", textColor: "neutral600", tag: "p", children: key }),
           /* @__PURE__ */ jsx(Typography, { tag: "p", children: String(value) })
         ] }, key)),
-        selected.meta?.pagePath && /* @__PURE__ */ jsxs(Box, { children: [
+        typeof selected.meta?.pagePath === "string" && selected.meta.pagePath && /* @__PURE__ */ jsxs(Box, { children: [
           /* @__PURE__ */ jsx(Typography, { variant: "sigma", textColor: "neutral600", tag: "p", children: t("submissions.meta-page", "Submitted from") }),
           /* @__PURE__ */ jsx(Typography, { tag: "p", children: selected.meta.pagePath })
+        ] }),
+        typeof selected.meta?.hubspotError === "string" && selected.meta.hubspotError && /* @__PURE__ */ jsxs(Box, { children: [
+          /* @__PURE__ */ jsx(Typography, { variant: "sigma", textColor: "danger600", tag: "p", children: t("submissions.conversion-error", "Conversion failed") }),
+          /* @__PURE__ */ jsx(Typography, { tag: "p", children: selected.meta.hubspotError })
         ] })
       ] }) })
     ] }) })

package/dist/_chunks/{Forms-CIJrUB_n.js → Forms-uUN4XjhW.js}

@@ -7,12 +7,12 @@ const index = require("./index-DkTxsEqL.js");
 const designSystem = require("@strapi/design-system");
 const icons = require("@strapi/icons");
 const admin = require("@strapi/strapi/admin");
-const index$1 = require("./index-XEuSPuUj.js");
+const index$1 = require("./index-CG_WQzSa.js");
 const core = require("@dnd-kit/core");
 const sortable = require("@dnd-kit/sortable");
 const utilities = require("@dnd-kit/utilities");
-const objectLabels = require("./objectLabels-wBwfLdZt.js");
-const useHubspotSchema = require("./useHubspotSchema-WvgW3od8.js");
+const objectLabels = require("./objectLabels-BGq-Ypgn.js");
+const useHubspotSchema = require("./useHubspotSchema-BZP2qkAu.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
@@ -725,6 +725,7 @@ const FormEditor = () => {
   const locale = searchParams.get("locale") ?? void 0;
   const [entry, setEntry] = React__namespace.useState(null);
   const [published, setPublished] = React__namespace.useState(false);
+  const [publishedHubspotFormId, setPublishedHubspotFormId] = React__namespace.useState(null);
   const [locales, setLocales] = React__namespace.useState([]);
   const [selection, setSelection] = React__namespace.useState({ kind: "form" });
   const [dirty, setDirty] = React__namespace.useState(false);
@@ -761,6 +762,7 @@ const FormEditor = () => {
       if (cancelled) return;
       setEntry(data.form);
       setPublished(data.published);
+      setPublishedHubspotFormId(data.publishedHubspotFormId ?? null);
       setDirty(false);
     }).catch(async () => {
       if (cancelled || !locale) return;
@@ -871,6 +873,7 @@ const FormEditor = () => {
     try {
       const { data } = await post(`/${index$1.PLUGIN_ID}/builder/forms/${documentId}/publish${query}`);
       setPublished(true);
+      setPublishedHubspotFormId(entry.hubspotFormId ?? null);
       setErrors([]);
       setProblems([]);
       const added = Array.isArray(data?.addedFields) ? data.addedFields.length : 0;
@@ -1359,7 +1362,10 @@ const FormEditor = () => {
               ),
               onChange: (id) => patchEntry({ hubspotFormId: String(id) || null }),
               children: [
-                /* @__PURE__ */ jsxRuntime.jsx(designSystem.SingleSelectOption, { value: "", children: t("editor.hubspot-form-none", "None — CRM upsert only") }),
+                /* @__PURE__ */ jsxRuntime.jsx(designSystem.SingleSelectOption, { value: "", children: t(
+                  "editor.hubspot-form-none",
+                  "Default marketing form (Settings) — contact only if none is set"
+                ) }),
                 entry.hubspotFormId && !hsForms.some((f) => f.id === entry.hubspotFormId) && /* @__PURE__ */ jsxRuntime.jsx(designSystem.SingleSelectOption, { value: entry.hubspotFormId, children: entry.hubspotFormId }),
                 hsForms.map((f) => /* @__PURE__ */ jsxRuntime.jsx(designSystem.SingleSelectOption, { value: f.id, children: f.name }, f.id))
               ]
@@ -1375,6 +1381,10 @@ const FormEditor = () => {
           /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "pi", textColor: "neutral600", children: t(
             "editor.hubspot-form-hint",
             "Submissions go through HubSpot’s Forms API so they count as conversions. After you change the form in HubSpot, use Resync from HubSpot — mapped fields update in place, new ones are appended, your steps stay."
+          ) }),
+          published && (entry.hubspotFormId || "") !== (publishedHubspotFormId || "") && /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "pi", textColor: "danger600", children: t(
+            "editor.hubspot-form-unpublished",
+            "The live site still uses the previously published HubSpot form. Publish to apply this link."
           ) })
         ] }),
         /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "pi", textColor: "neutral600", children: t(
@@ -1784,7 +1794,7 @@ const Submissions = () => {
               /* @__PURE__ */ jsxRuntime.jsx(designSystem.Td, { children: /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { children: row.formTitle || row.form }) }),
               /* @__PURE__ */ jsxRuntime.jsx(designSystem.Td, { children: /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { fontWeight: "semiBold", children: row.email || "—" }) }),
               /* @__PURE__ */ jsxRuntime.jsx(designSystem.Td, { children: /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { textColor: "neutral600", ellipsis: true, children: preview(row.values) }) }),
-              /* @__PURE__ */ jsxRuntime.jsx(designSystem.Td, { children: row.hubspotSynced ? /* @__PURE__ */ jsxRuntime.jsx(designSystem.Badge, { backgroundColor: "success100", textColor: "success700", children: t("submissions.synced", "Synced") }) : /* @__PURE__ */ jsxRuntime.jsx(designSystem.Badge, { backgroundColor: "warning100", textColor: "warning700", children: t("submissions.not-synced", "Not synced") }) })
+              /* @__PURE__ */ jsxRuntime.jsx(designSystem.Td, { children: row.meta?.hubspotConversion === true || row.meta?.hubspotConversion === "true" ? /* @__PURE__ */ jsxRuntime.jsx(designSystem.Badge, { backgroundColor: "success100", textColor: "success700", children: t("submissions.converted", "Conversion") }) : row.hubspotSynced ? /* @__PURE__ */ jsxRuntime.jsx(designSystem.Badge, { backgroundColor: "warning100", textColor: "warning700", children: t("submissions.contact-only", "Contact only") }) : /* @__PURE__ */ jsxRuntime.jsx(designSystem.Badge, { backgroundColor: "warning100", textColor: "warning700", children: t("submissions.not-synced", "Not synced") }) })
             ]
           },
           row.documentId
@@ -1820,9 +1830,13 @@ const Submissions = () => {
           /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "sigma", textColor: "neutral600", tag: "p", children: key }),
           /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { tag: "p", children: String(value) })
         ] }, key)),
-        selected.meta?.pagePath && /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Box, { children: [
+        typeof selected.meta?.pagePath === "string" && selected.meta.pagePath && /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Box, { children: [
           /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "sigma", textColor: "neutral600", tag: "p", children: t("submissions.meta-page", "Submitted from") }),
           /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { tag: "p", children: selected.meta.pagePath })
+        ] }),
+        typeof selected.meta?.hubspotError === "string" && selected.meta.hubspotError && /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Box, { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "sigma", textColor: "danger600", tag: "p", children: t("submissions.conversion-error", "Conversion failed") }),
+          /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { tag: "p", children: selected.meta.hubspotError })
         ] })
       ] }) })
     ] }) })

package/dist/_chunks/{HubspotFormInput-DSTuQ_bx.js → HubspotFormInput-BkWat_wu.js}

@@ -5,7 +5,7 @@ const React = require("react");
 const index = require("./index-DkTxsEqL.js");
 const designSystem = require("@strapi/design-system");
 const admin = require("@strapi/strapi/admin");
-const index$1 = require("./index-XEuSPuUj.js");
+const index$1 = 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/{HubspotFormInput-DIo6hCNz.mjs → HubspotFormInput-DEXPX-6j.mjs}

@@ -3,7 +3,7 @@ import * as React from "react";
 import { u as useIntl } from "./index-CEh8vkxY.mjs";
 import { Field, Flex, Loader, Combobox, ComboboxOption } from "@strapi/design-system";
 import { useFetchClient } from "@strapi/strapi/admin";
-import { P as PLUGIN_ID, g as getTranslation } from "./index-B8GYi6sw.mjs";
+import { P as PLUGIN_ID, g as getTranslation } from "./index-BeBn7bJa.mjs";
 const HubspotFormInput = React.forwardRef(
   ({ name, value, onChange, disabled, error, required, label, hint, labelAction }, ref) => {
     const { formatMessage } = useIntl();

package/dist/_chunks/{HubspotObjectInput-BIqC8tl2.js → HubspotObjectInput-CFDYW-TM.js}

@@ -4,9 +4,9 @@ const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
 const index = require("./index-DkTxsEqL.js");
 const designSystem = require("@strapi/design-system");
-const index$1 = require("./index-XEuSPuUj.js");
-const objectLabels = require("./objectLabels-wBwfLdZt.js");
-const useHubspotSchema = require("./useHubspotSchema-WvgW3od8.js");
+const index$1 = require("./index-CG_WQzSa.js");
+const objectLabels = require("./objectLabels-BGq-Ypgn.js");
+const useHubspotSchema = require("./useHubspotSchema-BZP2qkAu.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/_chunks/{HubspotObjectInput-BA16dswz.mjs → HubspotObjectInput-DL8fYK2x.mjs}

@@ -2,9 +2,9 @@ import { jsxs, jsx } from "react/jsx-runtime";
 import * as React from "react";
 import { u as useIntl } from "./index-CEh8vkxY.mjs";
 import { Field, Flex, Loader, SingleSelect, SingleSelectOption } from "@strapi/design-system";
-import { g as getTranslation } from "./index-B8GYi6sw.mjs";
-import { o as objectLabel } from "./objectLabels-DybqhBdT.mjs";
-import { u as useHubspotSchema } from "./useHubspotSchema-DtcHHUOb.mjs";
+import { g as getTranslation } from "./index-BeBn7bJa.mjs";
+import { o as objectLabel } from "./objectLabels-CS_0QCNz.mjs";
+import { u as useHubspotSchema } from "./useHubspotSchema-CP7LRdzO.mjs";
 const HubspotObjectInput = React.forwardRef(
   ({ name, value, onChange, disabled, error, required, label, hint, labelAction }, ref) => {
     const intl = useIntl();

package/dist/_chunks/{HubspotPropertyInput-C77Op1Wm.js → HubspotPropertyInput-CFMkbQeT.js}

@@ -6,9 +6,9 @@ const index = require("./index-DkTxsEqL.js");
 const designSystem = require("@strapi/design-system");
 const icons = require("@strapi/icons");
 const admin = require("@strapi/strapi/admin");
-const index$1 = require("./index-XEuSPuUj.js");
-const objectLabels = require("./objectLabels-wBwfLdZt.js");
-const useHubspotSchema = require("./useHubspotSchema-WvgW3od8.js");
+const index$1 = require("./index-CG_WQzSa.js");
+const objectLabels = require("./objectLabels-BGq-Ypgn.js");
+const useHubspotSchema = require("./useHubspotSchema-BZP2qkAu.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/_chunks/{HubspotPropertyInput-Dsn7ikop.mjs → HubspotPropertyInput-WU5FMJj3.mjs}

@@ -4,9 +4,9 @@ import { u as useIntl } from "./index-CEh8vkxY.mjs";
 import { Field, Flex, Loader, Combobox, ComboboxOption, IconButton, Button, Typography, Link } from "@strapi/design-system";
 import { ArrowClockwise } from "@strapi/icons";
 import { useField } from "@strapi/strapi/admin";
-import { g as getTranslation } from "./index-B8GYi6sw.mjs";
-import { o as objectLabel } from "./objectLabels-DybqhBdT.mjs";
-import { u as useHubspotSchema } from "./useHubspotSchema-DtcHHUOb.mjs";
+import { g as getTranslation } from "./index-BeBn7bJa.mjs";
+import { o as objectLabel } from "./objectLabels-CS_0QCNz.mjs";
+import { u as useHubspotSchema } from "./useHubspotSchema-CP7LRdzO.mjs";
 const oneLine = {
   display: "block",
   whiteSpace: "nowrap",

package/dist/_chunks/{Settings-PVhJVPqq.js → Settings-B_hhdpHa.js}

@@ -5,9 +5,9 @@ const React = require("react");
 const index = require("./index-DkTxsEqL.js");
 const designSystem = require("@strapi/design-system");
 const admin = require("@strapi/strapi/admin");
-const index$1 = require("./index-XEuSPuUj.js");
+const index$1 = require("./index-CG_WQzSa.js");
 const reactRouterDom = require("react-router-dom");
-const objectLabels = require("./objectLabels-wBwfLdZt.js");
+const objectLabels = require("./objectLabels-BGq-Ypgn.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/_chunks/{Settings-DxX9Uh_2.mjs → Settings-CiXEps_C.mjs}

@@ -3,9 +3,9 @@ import * as React from "react";
 import { u as useIntl } from "./index-CEh8vkxY.mjs";
 import { Flex, Divider, Typography, Button, Box, Link, Badge, Loader, Field, SingleSelect, SingleSelectOption, Checkbox } from "@strapi/design-system";
 import { useFetchClient } from "@strapi/strapi/admin";
-import { g as getTranslation, P as PLUGIN_ID } from "./index-B8GYi6sw.mjs";
+import { g as getTranslation, P as PLUGIN_ID } from "./index-BeBn7bJa.mjs";
 import { Link as Link$1 } from "react-router-dom";
-import { o as objectLabel } from "./objectLabels-DybqhBdT.mjs";
+import { o as objectLabel } from "./objectLabels-CS_0QCNz.mjs";
 const AuditSection = ({ configured }) => {
   const intl = useIntl();
   const { formatMessage } = intl;

package/dist/_chunks/{en-Djd3TID0.mjs → en-BIUBYzHv.mjs}

@@ -163,8 +163,9 @@ const en = {
   "editor.form-success": "Success message",
   "editor.hubspot-form": "HubSpot marketing form",
   "editor.hubspot-form-placeholder": "Pick a form of the connected portal",
-  "editor.hubspot-form-none": "None — CRM upsert only",
+  "editor.hubspot-form-none": "Default marketing form (Settings) — contact only if none is set",
   "editor.hubspot-form-hint": "Submissions go through HubSpot’s Forms API so they count as conversions. After you change the form in HubSpot, use Resync from HubSpot — mapped fields update in place, new ones are appended, your steps stay.",
+  "editor.hubspot-form-unpublished": "The live site still uses the previously published HubSpot form. Publish to apply this link.",
   "editor.resync": "Resync from HubSpot",
   "editor.resynced": "Resynced from HubSpot — {updated, plural, one {# field updated} other {# fields updated}}, {added, plural, one {# added} other {# added}}.",
   "editor.resynced-gaps": "Resynced from HubSpot — {updated, plural, one {# updated} other {# updated}}, {added, plural, one {# added} other {# added}}, {skipped, plural, one {# skipped} other {# skipped}}.",
@@ -269,6 +270,9 @@ const en = {
   "submissions.col-answers": "Answers",
   "submissions.col-crm": "CRM",
   "submissions.synced": "Synced",
+  "submissions.converted": "Conversion",
+  "submissions.contact-only": "Contact only",
+  "submissions.conversion-error": "Conversion failed",
   "submissions.not-synced": "Not synced",
   "submissions.count": "{total, plural, one {# submission} other {# submissions}}",
   "submissions.prev": "Previous",

package/dist/_chunks/{en-sfzopB5K.js → en-CFhEtgZJ.js}

@@ -165,8 +165,9 @@ const en = {
   "editor.form-success": "Success message",
   "editor.hubspot-form": "HubSpot marketing form",
   "editor.hubspot-form-placeholder": "Pick a form of the connected portal",
-  "editor.hubspot-form-none": "None — CRM upsert only",
+  "editor.hubspot-form-none": "Default marketing form (Settings) — contact only if none is set",
   "editor.hubspot-form-hint": "Submissions go through HubSpot’s Forms API so they count as conversions. After you change the form in HubSpot, use Resync from HubSpot — mapped fields update in place, new ones are appended, your steps stay.",
+  "editor.hubspot-form-unpublished": "The live site still uses the previously published HubSpot form. Publish to apply this link.",
   "editor.resync": "Resync from HubSpot",
   "editor.resynced": "Resynced from HubSpot — {updated, plural, one {# field updated} other {# fields updated}}, {added, plural, one {# added} other {# added}}.",
   "editor.resynced-gaps": "Resynced from HubSpot — {updated, plural, one {# updated} other {# updated}}, {added, plural, one {# added} other {# added}}, {skipped, plural, one {# skipped} other {# skipped}}.",
@@ -271,6 +272,9 @@ const en = {
   "submissions.col-answers": "Answers",
   "submissions.col-crm": "CRM",
   "submissions.synced": "Synced",
+  "submissions.converted": "Conversion",
+  "submissions.contact-only": "Contact only",
+  "submissions.conversion-error": "Conversion failed",
   "submissions.not-synced": "Not synced",
   "submissions.count": "{total, plural, one {# submission} other {# submissions}}",
   "submissions.prev": "Previous",

package/dist/_chunks/{fr-C7t1elmR.mjs → fr-CMYcnFH0.mjs}

@@ -163,8 +163,9 @@ const fr = {
   "editor.form-success": "Message de succès",
   "editor.hubspot-form": "Formulaire marketing HubSpot",
   "editor.hubspot-form-placeholder": "Choisir un formulaire du portail connecté",
-  "editor.hubspot-form-none": "Aucun — upsert CRM uniquement",
+  "editor.hubspot-form-none": "Formulaire marketing par défaut (Réglages) — contact seul si aucun n'est défini",
   "editor.hubspot-form-hint": "Les envois passent par l’API Forms de HubSpot pour compter comme des conversions. Après une modification dans HubSpot, utilisez Resynchroniser — les champs mappés se mettent à jour sur place, les nouveaux s’ajoutent, vos étapes restent.",
+  "editor.hubspot-form-unpublished": "Le site live utilise encore le formulaire HubSpot précédemment publié. Publiez pour appliquer ce lien.",
   "editor.resync": "Resynchroniser depuis HubSpot",
   "editor.resynced": "Resynchronisé depuis HubSpot — {updated, plural, one {# champ mis à jour} other {# champs mis à jour}}, {added, plural, one {# ajouté} other {# ajoutés}}.",
   "editor.resynced-gaps": "Resynchronisé depuis HubSpot — {updated, plural, one {# mis à jour} other {# mis à jour}}, {added, plural, one {# ajouté} other {# ajoutés}}, {skipped, plural, one {# écarté} other {# écartés}}.",
@@ -269,6 +270,9 @@ const fr = {
   "submissions.col-answers": "Réponses",
   "submissions.col-crm": "CRM",
   "submissions.synced": "Synchronisée",
+  "submissions.converted": "Conversion",
+  "submissions.contact-only": "Contact seul",
+  "submissions.conversion-error": "Conversion échouée",
   "submissions.not-synced": "Non synchronisée",
   "submissions.count": "{total, plural, one {# soumission} other {# soumissions}}",
   "submissions.prev": "Précédent",

package/dist/_chunks/{fr-sF5Josfh.js → fr-zdUuuV0M.js}

@@ -165,8 +165,9 @@ const fr = {
   "editor.form-success": "Message de succès",
   "editor.hubspot-form": "Formulaire marketing HubSpot",
   "editor.hubspot-form-placeholder": "Choisir un formulaire du portail connecté",
-  "editor.hubspot-form-none": "Aucun — upsert CRM uniquement",
+  "editor.hubspot-form-none": "Formulaire marketing par défaut (Réglages) — contact seul si aucun n'est défini",
   "editor.hubspot-form-hint": "Les envois passent par l’API Forms de HubSpot pour compter comme des conversions. Après une modification dans HubSpot, utilisez Resynchroniser — les champs mappés se mettent à jour sur place, les nouveaux s’ajoutent, vos étapes restent.",
+  "editor.hubspot-form-unpublished": "Le site live utilise encore le formulaire HubSpot précédemment publié. Publiez pour appliquer ce lien.",
   "editor.resync": "Resynchroniser depuis HubSpot",
   "editor.resynced": "Resynchronisé depuis HubSpot — {updated, plural, one {# champ mis à jour} other {# champs mis à jour}}, {added, plural, one {# ajouté} other {# ajoutés}}.",
   "editor.resynced-gaps": "Resynchronisé depuis HubSpot — {updated, plural, one {# mis à jour} other {# mis à jour}}, {added, plural, one {# ajouté} other {# ajoutés}}, {skipped, plural, one {# écarté} other {# écartés}}.",
@@ -271,6 +272,9 @@ const fr = {
   "submissions.col-answers": "Réponses",
   "submissions.col-crm": "CRM",
   "submissions.synced": "Synchronisée",
+  "submissions.converted": "Conversion",
+  "submissions.contact-only": "Contact seul",
+  "submissions.conversion-error": "Conversion échouée",
   "submissions.not-synced": "Non synchronisée",
   "submissions.count": "{total, plural, one {# soumission} other {# soumissions}}",
   "submissions.prev": "Précédent",

package/dist/_chunks/{index-B8GYi6sw.mjs → index-BeBn7bJa.mjs}

@@ -25,7 +25,7 @@ const index = {
       icon: PaperPlane,
       intlLabel: { id: `${PLUGIN_ID}.menu.label`, defaultMessage: "HubSpot Forms" },
       permissions: [{ action: `plugin::${PLUGIN_ID}.forms`, subject: null }],
-      Component: async () => (await import("./Forms-BBaw53Tz.mjs")).default
+      Component: async () => (await import("./Forms-DyV6KyiO.mjs")).default
     });
     app.customFields.register({
       name: "property",
@@ -40,7 +40,7 @@ const index = {
         defaultMessage: "Picked from the portal's real properties"
       },
       components: {
-        Input: async () => import("./HubspotPropertyInput-Dsn7ikop.mjs")
+        Input: async () => import("./HubspotPropertyInput-WU5FMJj3.mjs")
       },
       // Exposed in the Content-Type Builder. Without this, `objectField` could
       // only be set by hand-editing schema.json — which is not how anyone
@@ -103,7 +103,7 @@ const index = {
         defaultMessage: "Picked from the portal's configured objects"
       },
       components: {
-        Input: async () => import("./HubspotObjectInput-BA16dswz.mjs")
+        Input: async () => import("./HubspotObjectInput-DL8fYK2x.mjs")
       }
     });
     app.customFields.register({
@@ -119,7 +119,7 @@ const index = {
         defaultMessage: "A form built in the HubSpot form builder, stored by slug"
       },
       components: {
-        Input: async () => import("./HubspotFormInput-DIo6hCNz.mjs")
+        Input: async () => import("./HubspotFormInput-DEXPX-6j.mjs")
       }
     });
     app.createSettingSection(
@@ -135,7 +135,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 import("./Settings-DxX9Uh_2.mjs")).default
+          Component: async () => (await import("./Settings-CiXEps_C.mjs")).default
         }
       ]
     );
@@ -145,7 +145,7 @@ const index = {
     return Promise.all(
       locales.map(async (locale) => {
         try {
-          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => import("./en-Djd3TID0.mjs"), "./translations/fr.json": () => import("./fr-C7t1elmR.mjs") }), `./translations/${locale}.json`, 3);
+          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => import("./en-BIUBYzHv.mjs"), "./translations/fr.json": () => import("./fr-CMYcnFH0.mjs") }), `./translations/${locale}.json`, 3);
           return { data: prefixPluginTranslations(data), locale };
         } catch {
           return { data: {}, locale };

package/dist/_chunks/{index-XEuSPuUj.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-CIJrUB_n.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-C77Op1Wm.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-BIqC8tl2.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-DSTuQ_bx.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-PVhJVPqq.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-wBwfLdZt.js → objectLabels-BGq-Ypgn.js}

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

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

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

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

@@ -1,7 +1,7 @@
 "use strict";
 const React = require("react");
 const admin = require("@strapi/strapi/admin");
-const index = require("./index-XEuSPuUj.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-DtcHHUOb.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-B8GYi6sw.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-XEuSPuUj.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-B8GYi6sw.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

@@ -1936,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);
@@ -1944,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;
   }
@@ -2011,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;
 }
@@ -2414,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)) {
@@ -2453,7 +2521,7 @@ function createFormsService(strapi, _opts = {}) {
               ipAddress: sanitizeIp(meta.ipAddress)
             },
             consent: { given: meta.consent === true },
-            formHasLegalConsent: shape?.hasLegalConsent
+            shape
           });
           if (submitted.ok) {
             hubspotSynced = true;
@@ -2466,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) {
@@ -2551,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,
@@ -2738,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 ?? {};

package/dist/server/index.mjs

@@ -1935,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);
@@ -1943,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;
   }
@@ -2010,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;
 }
@@ -2413,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)) {
@@ -2452,7 +2520,7 @@ function createFormsService(strapi, _opts = {}) {
               ipAddress: sanitizeIp(meta.ipAddress)
             },
             consent: { given: meta.consent === true },
-            formHasLegalConsent: shape?.hasLegalConsent
+            shape
           });
           if (submitted.ok) {
             hubspotSynced = true;
@@ -2465,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) {
@@ -2550,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,
@@ -2737,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 ?? {};

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

@@ -34,9 +34,54 @@ export declare function formFieldNames(raw: {
     fieldGroups?: {
         fields?: {
             name?: string;
+            required?: boolean;
         }[];
     }[];
 }): string[];
+export declare function formRequiredNames(raw: {
+    fieldGroups?: {
+        fields?: {
+            name?: string;
+            required?: boolean;
+        }[];
+    }[];
+}): string[];
+export interface CommunicationConsent {
+    subscriptionTypeId: number;
+    text: string;
+}
+export interface FormShape {
+    names: Set<string>;
+    required: Set<string>;
+    hasLegalConsent: boolean;
+    captcha: boolean;
+    consentToProcessText?: string;
+    communications: CommunicationConsent[];
+}
+export declare function parseFormShape(raw: {
+    fieldGroups?: {
+        fields?: {
+            name?: string;
+            required?: boolean;
+        }[];
+    }[];
+    configuration?: {
+        captchaEnabled?: boolean;
+    };
+    legalConsentOptions?: {
+        type?: string;
+        consentToProcessText?: string;
+        communicationsCheckboxes?: {
+            label?: string;
+            text?: string;
+            subscriptionTypeId?: number | string;
+            communicationTypeId?: number | string;
+        }[];
+    } | null;
+}): FormShape;
+/** Email-only retry is only safe when HubSpot doesn't require other fields. */
+export declare function canRetryEmailOnly(required: Iterable<string> | undefined): boolean;
+export declare function buildLegalConsent(shape: Pick<FormShape, "hasLegalConsent" | "communications" | "consentToProcessText"> | null | undefined, given: boolean, fallbackText?: string): Record<string, unknown> | undefined;
 export interface FormSubmitContext {
     hutk?: string;
     pageUri?: string;
@@ -51,24 +96,25 @@ export interface FormSubmitInput {
     fields: {
         name: string;
         value: string;
+        objectTypeId?: string;
     }[];
     context?: FormSubmitContext;
     consent?: {
         given: boolean;
         text?: string;
     };
-    formHasLegalConsent?: boolean;
+    shape?: FormShape | null;
 }
 export declare function clearFormShapeCache(formGuid?: string): void;
-export declare function loadFormShape(apiKey: string, formGuid: string): Promise<{
-    names: Set<string>;
-    hasLegalConsent: boolean;
-} | null>;
+export declare function loadFormShape(apiKey: string, formGuid: string): Promise<FormShape | null>;
 export declare function findContactIdByEmail(apiKey: string, email: string): Promise<string | undefined>;
 /**
  * Submit a marketing form. Extra fields HubSpot doesn't know on that form
- * 400 the whole request, so callers should filter first; we still retry
- * without legal-consent and then email-only if HubSpot refuses the payload.
+ * 400 the whole request, so callers should filter first. A GDPR block on the
+ * HubSpot form needs the matching legalConsentOptions (including
+ * communications); stripping consent to "retry" would 400 forever. Email-only
+ * retry is only used when HubSpot doesn't require other fields. CAPTCHA
+ * cannot be solved server-side.
  */
 export declare function submitMarketingForm(input: FormSubmitInput): Promise<{
     ok: boolean;

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

@@ -73,9 +73,18 @@ export interface RawHubspotForm {
             type?: string;
             value?: string;
         };
+        captchaEnabled?: boolean;
     };
     legalConsentOptions?: {
         type?: string;
+        consentToProcessText?: string;
+        communicationsCheckboxes?: {
+            required?: boolean;
+            label?: string;
+            text?: string;
+            subscriptionTypeId?: number | string;
+            communicationTypeId?: number | string;
+        }[];
     } | null;
 }
 export declare function convertHubspotForm(raw: RawHubspotForm): ConvertedHubspotForm;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-hubspot",
-  "version": "0.16.3",
+  "version": "0.16.5",
   "description": "The form builder for HubSpot in Strapi — multi-step forms with conditional fields mapped to real CRM properties, a public submit pipeline with retries, and save-time mapping validation.",
   "keywords": [
     "strapi",