strapi-plugin-hubspot 0.14.0 → 0.16.0

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 ## Unreleased
 
+## 0.16.0 — 2026-09-22
+
+### Added — submission policies
+The plugin no longer assumes one HubSpot workflow. **Settings → HubSpot**
+(and `forms.*` in `config/plugins.ts`) now expose three independent choices:
+
+- **`submissionMode`** (`auto` / `forms` / `crm`): native marketing-form
+  conversions when a GUID is linked, CRM upsert only, or automatic.
+- **`writeExtraProperties`** (default `true`): after a Forms API conversion,
+  leftover mapped contact fields still land on the contact via CRM upsert.
+- **`syncFieldsOnPublish`** (default `false`): on publish, PATCH missing
+  mapped contact fields onto the linked HubSpot form. Off so HubSpot-first
+  installs aren't mutated. CRM properties are never created.
+
+## 0.15.0 — 2026-09-21
+
+### Added — account settings in the admin
+- **Settings → HubSpot** now holds the portal id, region (`eu1` / `na1`) and
+  the default marketing form (picked from the connected portal), not just the
+  private app token. Values saved here override `config/plugins.ts` and env.
+  Switching test → production is an admin change, not a deploy.
+
 ## 0.14.0 — 2026-09-21
 
 ### Changed — native HubSpot form conversions

package/README.md

@@ -44,14 +44,25 @@ Permissions**):
 | `GET` | `/api/hubspot/forms/:slug?locale=` | The published form — meta, steps, fields, conditions. The CRM mapping is stripped: the browser never learns your property names |
 | `POST` | `/api/hubspot/forms/:slug/submit` | Validates (bounds, conditions, required), maps server-side, syncs HubSpot, stores the submission |
 
-The submit pipeline, in order: HubSpot **Forms API** (native conversion —
-Original Source, workflows, lead-center notifications) when a marketing form
-GUID is set on the builder form or via `forms.defaultFormId`; the visitor's
-`hutk` is forwarded so attribution sticks. Then the contact is looked up by
-email and, when the address is on a corporate domain, the company is
-found-or-created and associated. A CRM contact upsert is the **fallback**
-when no GUID is configured — it does not count as a form conversion.
-Timeline notes are opt-in and only used on that fallback.
+The submit pipeline is a **policy**, not a single path. Settings → HubSpot
+(or `forms.*` in `config/plugins.ts`) pick how this install talks to HubSpot —
+so a portal that wants native conversions and a portal that only wants CRM
+upserts can share the same plugin:
+
+| Setting | Default | What it does |
+|---|---|---|
+| `forms.submissionMode` | `auto` | `auto`: Forms API when a marketing GUID is linked, else CRM upsert. `forms`: always try the Forms API. `crm`: never count as a conversion |
+| `forms.writeExtraProperties` | `true` | After a conversion, CRM-write mapped contact fields the HubSpot form dropped (they 400 the Forms API) |
+| `forms.syncFieldsOnPublish` | `false` | On publish, PATCH missing mapped **contact** fields onto the HubSpot form. Off by default so HubSpot-first installs aren't mutated |
+
+The visitor's `hutk` is forwarded so attribution sticks. Then the contact is
+looked up by email and, when the address is on a corporate domain, the company
+is found-or-created and associated. Timeline notes are opt-in and only used
+on the CRM-upsert path.
+
+CRM properties are **never created**. Map to properties that already exist in
+the portal; opting into field sync only adds form fields that point at those
+properties.
 
 Portal id, region and form GUIDs are configuration. A test portal today,
 production tomorrow: swap `portalId` / `region` / the GUID, no code change.
@@ -66,6 +77,9 @@ hubspot: {
       companyFromDomain: true, // Company by corporate domain + association
       timelineNote: false,     // recap note on the CRM-upsert fallback only
       defaultFormId: env("HUBSPOT_DEFAULT_FORM_ID", ""),
+      submissionMode: "auto",  // auto | forms | crm
+      writeExtraProperties: true,
+      syncFieldsOnPublish: false,
     },
   },
 }
@@ -365,10 +379,18 @@ its equivalent per object you send to).
 
 ### A settings screen
 
-**Settings → HubSpot** holds the private app token. It is stored server-side and
-never returned to the browser: the UI only receives whether a key exists, where
-it comes from, and its last four characters. A "Test connection" button
-round-trips to HubSpot and reports how many properties it can read.
+**Settings → HubSpot** holds the private app token, the HubSpot account that
+receives conversions (portal id, region, default marketing form), **and** the
+submission policy: conversion vs CRM upsert, leftover contact writes, form
+field sync on publish. Values saved here override `config/plugins.ts` and env
+— switching test → production, or switching HubSpot-first ↔ Strapi-first, is
+an admin change, not a deploy.
+
+The token is stored server-side and never returned to the browser: the UI only
+receives whether a key exists, where it comes from, and its last four
+characters. Portal id / region / form GUID are not secrets and round-trip so
+they can be edited. A "Test connection" button round-trips to HubSpot and
+reports how many properties it can read.
 
 Access is gated by a dedicated RBAC permission — **Settings →
 Roles → Plugins → Hubspot**. A role without it neither sees the settings link
@@ -479,11 +501,13 @@ lives on `app-eu1.hubspot.com` and submits to `api-eu1.hsforms.com`. Set
 `config.region` (`eu1`, `na1`, …) to match. Deep links are built from the
 `uiDomain` HubSpot reports for your portal rather than a hardcoded host.
 
-The key is resolved in this order, first match wins:
+The key, portal id, region and default form GUID are resolved in this order,
+first match wins:
 
 1. saved from **Settings → HubSpot**
-2. `config.apiKey` in `config/plugins.ts`
-3. the `HUBSPOT_API_KEY` environment variable
+2. `config/plugins.ts` (`apiKey`, `portalId`, `region`, `forms.defaultFormId`)
+3. environment variables (`HUBSPOT_API_KEY`, `HUBSPOT_PORTAL_ID`,
+   `HUBSPOT_REGION`, `HUBSPOT_DEFAULT_FORM_ID`)
 
 ## Migrating an existing field
 

package/dist/_chunks/{Forms-ws6d8rdC.mjs → Forms-6EoEYzAc.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-CPVfElYB.mjs";
+import { g as getTranslation, P as PLUGIN_ID } from "./index-7cL9PRh1.mjs";
 import { useSensors, useSensor, PointerSensor, KeyboardSensor, DndContext, closestCenter } from "@dnd-kit/core";
 import { sortableKeyboardCoordinates, SortableContext, verticalListSortingStrategy, useSortable, arrayMove } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
-import { o as objectLabel } from "./objectLabels-6OUnIDB5.mjs";
-import { u as useHubspotSchema } from "./useHubspotSchema-qCUs2gIX.mjs";
+import { o as objectLabel } from "./objectLabels-Dnj14fsp.mjs";
+import { u as useHubspotSchema } from "./useHubspotSchema-BsmQgJgx.mjs";
 const OPERATORS = [
   "eq",
   "neq",
@@ -774,11 +774,32 @@ const FormEditor = () => {
     setBusy(true);
     setFeedback(null);
     try {
-      await post(`/${PLUGIN_ID}/builder/forms/${documentId}/publish${query}`);
+      const { data } = await post(`/${PLUGIN_ID}/builder/forms/${documentId}/publish${query}`);
       setPublished(true);
       setErrors([]);
       setProblems([]);
-      setFeedback({ tone: "success", text: t("editor.published", "Form published.") });
+      const added = Array.isArray(data?.addedFields) ? data.addedFields.length : 0;
+      if (data?.syncWarning) {
+        setFeedback({
+          tone: "success",
+          text: t(
+            "editor.published-sync-warn",
+            "Form published. HubSpot field sync failed: {error}",
+            { error: data.syncWarning }
+          )
+        });
+      } else if (added) {
+        setFeedback({
+          tone: "success",
+          text: t(
+            "editor.published-synced",
+            "Form published. {count, plural, one {# field added} other {# fields added}} to the HubSpot form.",
+            { count: added }
+          )
+        });
+      } else {
+        setFeedback({ tone: "success", text: t("editor.published", "Form published.") });
+      }
     } catch (err) {
       const data = err.response?.data;
       setErrors(data?.errors ?? []);

package/dist/_chunks/{Forms-Cch-7zei.js → Forms-BW_zGc1P.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-BlaG8oIq.js");
+const index$1 = require("./index-CodpLKZx.js");
 const core = require("@dnd-kit/core");
 const sortable = require("@dnd-kit/sortable");
 const utilities = require("@dnd-kit/utilities");
-const objectLabels = require("./objectLabels-CPc21Tdd.js");
-const useHubspotSchema = require("./useHubspotSchema-0MvCM1AC.js");
+const objectLabels = require("./objectLabels-CSWGIgNb.js");
+const useHubspotSchema = require("./useHubspotSchema-DiRN3HrN.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
@@ -794,11 +794,32 @@ const FormEditor = () => {
     setBusy(true);
     setFeedback(null);
     try {
-      await post(`/${index$1.PLUGIN_ID}/builder/forms/${documentId}/publish${query}`);
+      const { data } = await post(`/${index$1.PLUGIN_ID}/builder/forms/${documentId}/publish${query}`);
       setPublished(true);
       setErrors([]);
       setProblems([]);
-      setFeedback({ tone: "success", text: t("editor.published", "Form published.") });
+      const added = Array.isArray(data?.addedFields) ? data.addedFields.length : 0;
+      if (data?.syncWarning) {
+        setFeedback({
+          tone: "success",
+          text: t(
+            "editor.published-sync-warn",
+            "Form published. HubSpot field sync failed: {error}",
+            { error: data.syncWarning }
+          )
+        });
+      } else if (added) {
+        setFeedback({
+          tone: "success",
+          text: t(
+            "editor.published-synced",
+            "Form published. {count, plural, one {# field added} other {# fields added}} to the HubSpot form.",
+            { count: added }
+          )
+        });
+      } else {
+        setFeedback({ tone: "success", text: t("editor.published", "Form published.") });
+      }
     } catch (err) {
       const data = err.response?.data;
       setErrors(data?.errors ?? []);

package/dist/_chunks/{HubspotFormInput-18pWTITT.mjs → HubspotFormInput-V5w4y1fb.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-CPVfElYB.mjs";
+import { P as PLUGIN_ID, g as getTranslation } from "./index-7cL9PRh1.mjs";
 const HubspotFormInput = React.forwardRef(
   ({ name, value, onChange, disabled, error, required, label, hint, labelAction }, ref) => {
     const { formatMessage } = useIntl();

package/dist/_chunks/{HubspotFormInput-M2l_8w_e.js → HubspotFormInput-oMhm1UJm.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-BlaG8oIq.js");
+const index$1 = require("./index-CodpLKZx.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/_chunks/{HubspotObjectInput-BDO99qXs.js → HubspotObjectInput-Bmo6YQgs.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-BlaG8oIq.js");
-const objectLabels = require("./objectLabels-CPc21Tdd.js");
-const useHubspotSchema = require("./useHubspotSchema-0MvCM1AC.js");
+const index$1 = require("./index-CodpLKZx.js");
+const objectLabels = require("./objectLabels-CSWGIgNb.js");
+const useHubspotSchema = require("./useHubspotSchema-DiRN3HrN.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/_chunks/{HubspotObjectInput-DshusXZP.mjs → HubspotObjectInput-DhsnSguG.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-CPVfElYB.mjs";
-import { o as objectLabel } from "./objectLabels-6OUnIDB5.mjs";
-import { u as useHubspotSchema } from "./useHubspotSchema-qCUs2gIX.mjs";
+import { g as getTranslation } from "./index-7cL9PRh1.mjs";
+import { o as objectLabel } from "./objectLabels-Dnj14fsp.mjs";
+import { u as useHubspotSchema } from "./useHubspotSchema-BsmQgJgx.mjs";
 const HubspotObjectInput = React.forwardRef(
   ({ name, value, onChange, disabled, error, required, label, hint, labelAction }, ref) => {
     const intl = useIntl();

package/dist/_chunks/{HubspotPropertyInput-C-kHDgwx.mjs → HubspotPropertyInput-CrYP4pc0.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-CPVfElYB.mjs";
-import { o as objectLabel } from "./objectLabels-6OUnIDB5.mjs";
-import { u as useHubspotSchema } from "./useHubspotSchema-qCUs2gIX.mjs";
+import { g as getTranslation } from "./index-7cL9PRh1.mjs";
+import { o as objectLabel } from "./objectLabels-Dnj14fsp.mjs";
+import { u as useHubspotSchema } from "./useHubspotSchema-BsmQgJgx.mjs";
 const oneLine = {
   display: "block",
   whiteSpace: "nowrap",

package/dist/_chunks/{HubspotPropertyInput-XGnH2tHn.js → HubspotPropertyInput-luFfnxqy.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-BlaG8oIq.js");
-const objectLabels = require("./objectLabels-CPc21Tdd.js");
-const useHubspotSchema = require("./useHubspotSchema-0MvCM1AC.js");
+const index$1 = require("./index-CodpLKZx.js");
+const objectLabels = require("./objectLabels-CSWGIgNb.js");
+const useHubspotSchema = require("./useHubspotSchema-DiRN3HrN.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/_chunks/{Settings-CRnsu6ob.js → Settings-B3A22i7Z.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-BlaG8oIq.js");
+const index$1 = require("./index-CodpLKZx.js");
 const reactRouterDom = require("react-router-dom");
-const objectLabels = require("./objectLabels-CPc21Tdd.js");
+const objectLabels = require("./objectLabels-CSWGIgNb.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
@@ -192,19 +192,37 @@ const FailuresSection = ({ configured }) => {
     ) : null
   ] });
 };
+const REGIONS = ["eu1", "na1"];
 const HubspotSettings = () => {
   const { formatMessage } = index.useIntl();
   const { get, put, del } = admin.useFetchClient();
   const [settings, setSettings] = React__namespace.useState(null);
   const [apiKey, setApiKey] = React__namespace.useState("");
+  const [portalId, setPortalId] = React__namespace.useState("");
+  const [region, setRegion] = React__namespace.useState("eu1");
+  const [defaultFormId, setDefaultFormId] = React__namespace.useState("");
+  const [submissionMode, setSubmissionMode] = React__namespace.useState("auto");
+  const [writeExtraProperties, setWriteExtraProperties] = React__namespace.useState(true);
+  const [syncFieldsOnPublish, setSyncFieldsOnPublish] = React__namespace.useState(false);
+  const [forms, setForms] = React__namespace.useState([]);
   const [busy, setBusy] = React__namespace.useState(false);
   const [feedback, setFeedback] = React__namespace.useState(
     null
   );
   const t = (id, defaultMessage, values) => formatMessage({ id: index$1.getTranslation(id), defaultMessage }, values);
+  const apply = (data) => {
+    setSettings(data);
+    setPortalId(data.portalId ?? "");
+    setRegion(data.region || "eu1");
+    setDefaultFormId(data.defaultFormId ?? "");
+    setSubmissionMode(data.submissionMode === "crm" || data.submissionMode === "forms" ? data.submissionMode : "auto");
+    setWriteExtraProperties(data.writeExtraProperties !== false);
+    setSyncFieldsOnPublish(data.syncFieldsOnPublish === true);
+    setForms(Array.isArray(data.forms) ? data.forms : []);
+  };
   const load = React__namespace.useCallback(async () => {
     const { data } = await get(`/${index$1.PLUGIN_ID}/settings`);
-    setSettings(data);
+    apply(data);
   }, [get]);
   React__namespace.useEffect(() => {
     load().catch(
@@ -215,12 +233,20 @@ const HubspotSettings = () => {
     setBusy(true);
     setFeedback(null);
     try {
-      const { data } = await put(`/${index$1.PLUGIN_ID}/settings`, { apiKey });
-      setSettings(data);
+      await put(`/${index$1.PLUGIN_ID}/settings`, {
+        ...apiKey.trim() ? { apiKey: apiKey.trim() } : {},
+        portalId,
+        region,
+        defaultFormId,
+        submissionMode,
+        writeExtraProperties,
+        syncFieldsOnPublish
+      });
       setApiKey("");
-      setFeedback({ tone: "success", text: t("settings.saved", "Key saved.") });
+      await load();
+      setFeedback({ tone: "success", text: t("settings.saved", "Settings saved.") });
     } catch {
-      setFeedback({ tone: "danger", text: t("settings.save-error", "Could not save the key.") });
+      setFeedback({ tone: "danger", text: t("settings.save-error", "Could not save settings.") });
     } finally {
       setBusy(false);
     }
@@ -229,9 +255,9 @@ const HubspotSettings = () => {
     setBusy(true);
     setFeedback(null);
     try {
-      const { data } = await del(`/${index$1.PLUGIN_ID}/settings`);
-      setSettings(data);
+      await del(`/${index$1.PLUGIN_ID}/settings`);
       setApiKey("");
+      await load();
       setFeedback({ tone: "success", text: t("settings.removed", "Key removed.") });
     } catch {
       setFeedback({ tone: "danger", text: t("settings.remove-error", "Could not remove the key.") });
@@ -254,6 +280,7 @@ const HubspotSettings = () => {
           })
         } : { tone: "danger", text: t("settings.test-no-key", "No key configured.") }
       );
+      if (data.configured) await load();
     } catch {
       setFeedback({
         tone: "danger",
@@ -271,44 +298,186 @@ const HubspotSettings = () => {
     config: t("settings.source.config", "config/plugins.ts"),
     env: t("settings.source.env", "environment variable")
   };
+  const sourceHint = (source) => source && source !== "settings" ? /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "pi", textColor: "neutral600", children: t("settings.source", "source: {source}", { source: sourceLabel[source] }) }) : null;
+  const regionOptions = REGIONS.includes(region) ? [...REGIONS] : [region, ...REGIONS];
   return /* @__PURE__ */ jsxRuntime.jsx(designSystem.Box, { padding: 8, children: /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { direction: "column", alignItems: "stretch", gap: 6, children: [
     /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { direction: "column", alignItems: "flex-start", gap: 2, children: [
       /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "alpha", children: "HubSpot" }),
       /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "epsilon", textColor: "neutral600", children: t(
         "settings.subtitle",
-        "The private app token used to read the portal's properties and validate form mappings."
+        "Private app token and the HubSpot account that receives form conversions. Switch test → production here — nothing is hardcoded."
       ) })
     ] }),
     /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { gap: 2, alignItems: "center", children: [
       /* @__PURE__ */ jsxRuntime.jsx(designSystem.Badge, { active: settings.configured, children: settings.configured ? t("settings.configured", "Configured {hint}", { hint: settings.hint }) : t("settings.not-configured", "Not configured") }),
       settings.keySource ? /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "pi", textColor: "neutral600", children: t("settings.source", "source: {source}", { source: sourceLabel[settings.keySource] }) }) : null
     ] }),
-    /* @__PURE__ */ jsxRuntime.jsx(designSystem.Box, { maxWidth: "32rem", children: /* @__PURE__ */ jsxRuntime.jsxs(
-      designSystem.Field.Root,
-      {
-        name: "apiKey",
-        hint: t(
-          "settings.key.hint",
-          "A key entered here overrides the ones from config/plugins.ts and HUBSPOT_API_KEY."
+    /* @__PURE__ */ jsxRuntime.jsx(designSystem.Box, { maxWidth: "32rem", children: /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { direction: "column", alignItems: "stretch", gap: 4, children: [
+      /* @__PURE__ */ jsxRuntime.jsxs(
+        designSystem.Field.Root,
+        {
+          name: "apiKey",
+          hint: t(
+            "settings.key.hint",
+            "A key entered here overrides config/plugins.ts and HUBSPOT_API_KEY."
+          ),
+          children: [
+            /* @__PURE__ */ jsxRuntime.jsx(designSystem.Field.Label, { children: t("settings.key.label", "Private app token") }),
+            /* @__PURE__ */ jsxRuntime.jsx(
+              designSystem.Field.Input,
+              {
+                type: "password",
+                value: apiKey,
+                autoComplete: "off",
+                placeholder: settings.configured ? t("settings.key.placeholder.set", "•••••••• (leave empty to keep)") : t("settings.key.placeholder.empty", "pat-eu1-…"),
+                onChange: (e) => setApiKey(e.target.value)
+              }
+            ),
+            /* @__PURE__ */ jsxRuntime.jsx(designSystem.Field.Hint, {})
+          ]
+        }
+      ),
+      /* @__PURE__ */ jsxRuntime.jsxs(
+        designSystem.Field.Root,
+        {
+          name: "portalId",
+          hint: t(
+            "settings.portal.hint",
+            "HubSpot account id (Settings → Account → Account setup). Test portal today, production later."
+          ),
+          children: [
+            /* @__PURE__ */ jsxRuntime.jsx(designSystem.Field.Label, { children: t("settings.portal.label", "Portal ID") }),
+            /* @__PURE__ */ jsxRuntime.jsx(
+              designSystem.Field.Input,
+              {
+                type: "text",
+                value: portalId,
+                autoComplete: "off",
+                placeholder: "148991818",
+                onChange: (e) => setPortalId(e.target.value)
+              }
+            ),
+            /* @__PURE__ */ jsxRuntime.jsx(designSystem.Field.Hint, {}),
+            sourceHint(settings.portalSource)
+          ]
+        }
+      ),
+      /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Field.Root, { name: "region", children: [
+        /* @__PURE__ */ jsxRuntime.jsx(designSystem.Field.Label, { children: t("settings.region.label", "Region") }),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          designSystem.SingleSelect,
+          {
+            value: region,
+            onChange: (value) => setRegion(String(value)),
+            children: regionOptions.map((r) => /* @__PURE__ */ jsxRuntime.jsx(designSystem.SingleSelectOption, { value: r, children: r === "eu1" ? t("settings.region.eu1", "Europe (eu1)") : r === "na1" ? t("settings.region.na1", "North America (na1)") : r }, r))
+          }
         ),
-        children: [
-          /* @__PURE__ */ jsxRuntime.jsx(designSystem.Field.Label, { children: t("settings.key.label", "Private app token") }),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            designSystem.Field.Input,
-            {
-              type: "password",
-              value: apiKey,
-              autoComplete: "off",
-              placeholder: settings.configured ? t("settings.key.placeholder.set", "•••••••• (leave empty to keep)") : t("settings.key.placeholder.empty", "pat-eu1-…"),
-              onChange: (e) => setApiKey(e.target.value)
-            }
+        sourceHint(settings.regionSource)
+      ] }),
+      /* @__PURE__ */ jsxRuntime.jsxs(
+        designSystem.Field.Root,
+        {
+          name: "defaultFormId",
+          hint: t(
+            "settings.form.hint",
+            "Marketing form that receives submissions when a builder form doesn't pick its own. Create the form in HubSpot, then pick it here."
           ),
-          /* @__PURE__ */ jsxRuntime.jsx(designSystem.Field.Hint, {})
-        ]
-      }
-    ) }),
+          children: [
+            /* @__PURE__ */ jsxRuntime.jsx(designSystem.Field.Label, { children: t("settings.form.label", "Default marketing form") }),
+            forms.length ? /* @__PURE__ */ jsxRuntime.jsxs(
+              designSystem.SingleSelect,
+              {
+                value: defaultFormId,
+                placeholder: t("settings.form.placeholder", "Pick a form of the connected portal"),
+                onChange: (value) => setDefaultFormId(String(value)),
+                children: [
+                  /* @__PURE__ */ jsxRuntime.jsx(designSystem.SingleSelectOption, { value: "", children: t("settings.form.none", "None — CRM upsert only") }),
+                  defaultFormId && !forms.some((f) => f.id === defaultFormId) && /* @__PURE__ */ jsxRuntime.jsx(designSystem.SingleSelectOption, { value: defaultFormId, children: defaultFormId }),
+                  forms.map((f) => /* @__PURE__ */ jsxRuntime.jsx(designSystem.SingleSelectOption, { value: f.id, children: f.name }, f.id))
+                ]
+              }
+            ) : /* @__PURE__ */ jsxRuntime.jsx(
+              designSystem.Field.Input,
+              {
+                type: "text",
+                value: defaultFormId,
+                autoComplete: "off",
+                placeholder: "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+                onChange: (e) => setDefaultFormId(e.target.value.trim())
+              }
+            ),
+            /* @__PURE__ */ jsxRuntime.jsx(designSystem.Field.Hint, {}),
+            sourceHint(settings.formSource)
+          ]
+        }
+      ),
+      /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "delta", children: t("settings.policy.title", "How submissions reach HubSpot") }),
+      /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "pi", textColor: "neutral600", children: t(
+        "settings.policy.hint",
+        "Pick the policy that matches this portal. Defaults stay safe for every install: conversions when a form is linked, leftover answers still written on the contact, HubSpot forms never mutated unless you ask."
+      ) }),
+      /* @__PURE__ */ jsxRuntime.jsxs(
+        designSystem.Field.Root,
+        {
+          name: "submissionMode",
+          hint: t(
+            "settings.mode.hint",
+            "Automatic uses the marketing form when one is linked, otherwise a CRM upsert. CRM-only never counts as a conversion. Forms-only prefers the Forms API and falls back to the CRM if HubSpot refuses the submit."
+          ),
+          children: [
+            /* @__PURE__ */ jsxRuntime.jsx(designSystem.Field.Label, { children: t("settings.mode.label", "Submission path") }),
+            /* @__PURE__ */ jsxRuntime.jsxs(
+              designSystem.SingleSelect,
+              {
+                value: submissionMode,
+                onChange: (value) => {
+                  const next = String(value);
+                  if (next === "crm" || next === "forms" || next === "auto") setSubmissionMode(next);
+                },
+                children: [
+                  /* @__PURE__ */ jsxRuntime.jsx(designSystem.SingleSelectOption, { value: "auto", children: t("settings.mode.auto", "Automatic — form conversion if linked, else CRM") }),
+                  /* @__PURE__ */ jsxRuntime.jsx(designSystem.SingleSelectOption, { value: "forms", children: t("settings.mode.forms", "Marketing form — native HubSpot conversions") }),
+                  /* @__PURE__ */ jsxRuntime.jsx(designSystem.SingleSelectOption, { value: "crm", children: t("settings.mode.crm", "CRM only — upsert the contact, no form conversion") })
+                ]
+              }
+            ),
+            /* @__PURE__ */ jsxRuntime.jsx(designSystem.Field.Hint, {})
+          ]
+        }
+      ),
+      /* @__PURE__ */ jsxRuntime.jsx(
+        designSystem.Checkbox,
+        {
+          checked: writeExtraProperties,
+          onCheckedChange: (checked) => setWriteExtraProperties(checked === true),
+          children: t(
+            "settings.extra.label",
+            "After a conversion, also write mapped contact fields that the HubSpot form doesn't have"
+          )
+        }
+      ),
+      /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "pi", textColor: "neutral600", children: t(
+        "settings.extra.hint",
+        "The Forms API drops unknown fields (they 400 the submit). With this on, leftovers still land on the contact. Turn it off if HubSpot must only receive what the marketing form declares."
+      ) }),
+      /* @__PURE__ */ jsxRuntime.jsx(
+        designSystem.Checkbox,
+        {
+          checked: syncFieldsOnPublish,
+          onCheckedChange: (checked) => setSyncFieldsOnPublish(checked === true),
+          children: t(
+            "settings.sync.label",
+            "On publish, add mapped contact fields that are missing on the HubSpot form"
+          )
+        }
+      ),
+      /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "pi", textColor: "neutral600", children: t(
+        "settings.sync.hint",
+        "Strapi-first installs: a field added here appears on the HubSpot form next publish. HubSpot-first installs should leave this off — importing a form already carries its fields. Properties themselves are never created; map to ones that exist in the portal."
+      ) })
+    ] }) }),
     /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { gap: 2, children: [
-      /* @__PURE__ */ jsxRuntime.jsx(designSystem.Button, { onClick: save, loading: busy, disabled: !apiKey.trim(), children: t("settings.save", "Save") }),
+      /* @__PURE__ */ jsxRuntime.jsx(designSystem.Button, { onClick: save, loading: busy, children: t("settings.save", "Save") }),
       /* @__PURE__ */ jsxRuntime.jsx(designSystem.Button, { variant: "secondary", onClick: test, loading: busy, disabled: !settings.configured, children: t("settings.test", "Test connection") }),
       /* @__PURE__ */ jsxRuntime.jsx(
         designSystem.Button,
@@ -317,7 +486,7 @@ const HubspotSettings = () => {
           onClick: remove,
           loading: busy,
           disabled: settings.keySource !== "settings",
-          children: t("settings.remove", "Remove")
+          children: t("settings.remove", "Remove key")
         }
       )
     ] }),
@@ -331,7 +500,7 @@ const HubspotSettings = () => {
     ) : null,
     /* @__PURE__ */ jsxRuntime.jsx(designSystem.Box, { paddingTop: 4, children: /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "pi", textColor: "neutral600", children: t(
       "settings.scopes",
-      "The token needs the crm.schemas.contacts.read and crm.schemas.companies.read scopes to list properties. It is never returned to the browser: only its existence, its source and its last four characters are."
+      "The token needs crm.schemas.contacts.read, crm.schemas.companies.read and forms (to list and submit marketing forms). The token is never returned to the browser."
     ) }) }),
     /* @__PURE__ */ jsxRuntime.jsx(AuditSection, { configured: settings.configured }),
     /* @__PURE__ */ jsxRuntime.jsx(FailuresSection, { configured: settings.configured })