strapi-plugin-hubspot 0.16.1 → 0.16.3

package/dist/_chunks/{index-ciliGv0E.js → index-XEuSPuUj.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-D0QXkYAN.js"))).default
+      Component: async () => (await Promise.resolve().then(() => require("./Forms-CIJrUB_n.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-2MgIKlR_.js"))
+        Input: async () => Promise.resolve().then(() => require("./HubspotPropertyInput-C77Op1Wm.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-BTqYXJIa.js"))
+        Input: async () => Promise.resolve().then(() => require("./HubspotObjectInput-BIqC8tl2.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-4ZMYXWM_.js"))
+        Input: async () => Promise.resolve().then(() => require("./HubspotFormInput-DSTuQ_bx.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-DhiHQC6U.js"))).default
+          Component: async () => (await Promise.resolve().then(() => require("./Settings-PVhJVPqq.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-CSgFmKmM.js")), "./translations/fr.json": () => Promise.resolve().then(() => require("./fr-D_EhZS0P.js")) }), `./translations/${locale}.json`, 3);
+          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);
           return { data: prefixPluginTranslations(data), locale };
         } catch {
           return { data: {}, locale };

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

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

package/dist/_chunks/{objectLabels-BjYfdhRB.js → objectLabels-wBwfLdZt.js}

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

package/dist/_chunks/{useHubspotSchema-CE7tJgOM.mjs → useHubspotSchema-DtcHHUOb.mjs}

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

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

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

package/dist/admin/index.js

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

package/dist/admin/index.mjs

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

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) {
@@ -1778,6 +1782,65 @@ function convertHubspotForm(raw) {
     skipped
   };
 }
+function mappingKey(field) {
+  const mapping = field.hubspot ?? {};
+  const property = mapping.property?.trim();
+  if (!property) return null;
+  return `${mapping.object?.trim() || "contact"}:${property}`;
+}
+function uniqueName(base, used) {
+  if (!used.has(base)) return base;
+  let n = 2;
+  while (used.has(`${base}_${n}`)) n += 1;
+  return `${base}_${n}`;
+}
+function mergeHubspotImport(current, incoming) {
+  const steps = (current.steps ?? []).map((step) => ({
+    ...step,
+    fields: [...step.fields ?? []]
+  }));
+  if (!steps.length) {
+    steps.push({ id: makeId$1("stp"), fields: [] });
+  }
+  const byKey = /* @__PURE__ */ new Map();
+  const usedNames = /* @__PURE__ */ new Set();
+  for (const step of steps) {
+    for (const field of step.fields) {
+      usedNames.add(field.name);
+      const key = mappingKey(field);
+      if (key) byKey.set(key, field);
+    }
+  }
+  const added = [];
+  const updated = [];
+  const incomingFields = (incoming.steps ?? []).flatMap((step) => step.fields ?? []);
+  for (const next of incomingFields) {
+    const key = mappingKey(next);
+    const existing = key ? byKey.get(key) : void 0;
+    if (existing) {
+      existing.label = next.label;
+      existing.type = next.type;
+      existing.required = next.required;
+      existing.placeholder = next.placeholder;
+      existing.helpText = next.helpText;
+      if (next.options) existing.options = next.options;
+      else delete existing.options;
+      if (!existing.visibleIf && next.visibleIf) existing.visibleIf = next.visibleIf;
+      updated.push(key);
+      continue;
+    }
+    const field = {
+      ...next,
+      id: makeId$1("fld"),
+      name: uniqueName(next.name, usedNames)
+    };
+    usedNames.add(field.name);
+    if (key) byKey.set(key, field);
+    steps[steps.length - 1].fields.push(field);
+    added.push(key || field.name);
+  }
+  return { definition: { version: 1, steps }, added, updated };
+}
 async function hsGet(apiKey, path) {
   const res = await fetch(`${HS_BASE$2}${path}`, {
     headers: { Authorization: `Bearer ${apiKey}` }
@@ -2386,7 +2449,7 @@ 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 },
@@ -2466,7 +2529,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,
@@ -2895,9 +2958,9 @@ function createFormsAdminController(strapi) {
     },
     /**
      * Converts one portal form into a plugin form draft, in the current
-     * locale. Slug derived from the HubSpot name: re-importing the same form
-     * overwrites the draft — never the published version, never the portal.
-     * What the builder can't express is skipped and returned in `skipped`.
+     * locale. Matching prefers the linked HubSpot GUID, then the slug.
+     * Re-importing merges: mapped fields update in place, new ones append,
+     * Strapi steps stay. Never the published version, never the portal.
      */
     async runHubspotImport(ctx) {
       const formId = ctx.request.body?.formId;
@@ -2916,24 +2979,81 @@ function createFormsAdminController(strapi) {
       const { skipped, definition, ...meta } = converted;
       const slug = slugify(name);
       const existing = await documents().findFirst({
+        filters: { hubspotFormId: formId }
+      }) ?? await documents().findFirst({
         filters: { slug }
       });
-      let documentId;
       if (existing) {
-        await documents().update({
+        const current = await documents().findOne({
           documentId: existing.documentId,
           locale: ctx.query.locale,
-          data: { ...meta, name, definition }
+          status: "draft"
         });
-        documentId = existing.documentId;
-      } else {
-        const created = await documents().create({
+        const merged = mergeHubspotImport(current?.definition ?? EMPTY_DEFINITION, definition);
+        await documents().update({
+          documentId: existing.documentId,
           locale: ctx.query.locale,
-          data: { ...meta, name, slug, definition }
+          data: {
+            hubspotFormId: meta.hubspotFormId ?? formId,
+            definition: merged.definition
+          }
         });
-        documentId = created.documentId;
+        ctx.body = {
+          documentId: existing.documentId,
+          skipped,
+          added: merged.added,
+          updated: merged.updated
+        };
+        return;
       }
-      ctx.body = { documentId, skipped };
+      const created = await documents().create({
+        locale: ctx.query.locale,
+        data: { ...meta, name, slug, definition }
+      });
+      ctx.body = { documentId: created.documentId, skipped, added: [], updated: [] };
+    },
+    /**
+     * Pull the linked HubSpot marketing form back into this draft: mapped
+     * fields update in place, new ones append, Strapi steps and extras stay.
+     */
+    async resync(ctx) {
+      const entry = await documents().findOne({
+        documentId: ctx.params.documentId,
+        locale: ctx.query.locale,
+        status: "draft"
+      });
+      if (!entry) ctx.throw(404, "Form not found");
+      const guid = typeof entry.hubspotFormId === "string" ? entry.hubspotFormId.trim() : "";
+      if (!isFormGuid(guid)) {
+        ctx.throw(400, "This form is not linked to a HubSpot marketing form.");
+      }
+      const { apiKey } = await resolveApiKey(strapi);
+      if (!apiKey) ctx.throw(400, "No HubSpot API key configured");
+      let converted;
+      try {
+        converted = convertHubspotForm(await fetchHubspotForm(apiKey, guid));
+      } catch (err) {
+        strapi.log.warn(`[hubspot] form resync failed — ${err.message}`);
+        ctx.throw(502, err.message || "Cannot reach HubSpot");
+        return;
+      }
+      const merged = mergeHubspotImport(entry.definition ?? EMPTY_DEFINITION, converted.definition);
+      await documents().update({
+        documentId: ctx.params.documentId,
+        locale: ctx.query.locale,
+        data: { definition: merged.definition }
+      });
+      const form = await documents().findOne({
+        documentId: ctx.params.documentId,
+        locale: ctx.query.locale,
+        status: "draft"
+      });
+      ctx.body = {
+        form,
+        added: merged.added,
+        updated: merged.updated,
+        skipped: converted.skipped
+      };
     },
     /**
      * Copies a form (every locale of its draft) into a new draft document —
@@ -3218,8 +3338,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
@@ -3472,6 +3592,7 @@ const routes = {
       adminRoute("POST", "/builder/forms/:documentId/unpublish", "formsAdmin.unpublish", [FORMS_ACTION]),
       adminRoute("DELETE", "/builder/forms/:documentId", "formsAdmin.remove", [FORMS_ACTION]),
       adminRoute("POST", "/builder/forms/:documentId/duplicate", "formsAdmin.duplicate", [FORMS_ACTION]),
+      adminRoute("POST", "/builder/forms/:documentId/resync", "formsAdmin.resync", [FORMS_ACTION]),
       // No FORMS_ACTION: editors pick forms from the Content Manager, like
       // they pick properties — the builder itself stays gated.
       adminRoute("GET", "/forms-options", "formsAdmin.options"),

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) {
@@ -1777,6 +1781,65 @@ function convertHubspotForm(raw) {
     skipped
   };
 }
+function mappingKey(field) {
+  const mapping = field.hubspot ?? {};
+  const property = mapping.property?.trim();
+  if (!property) return null;
+  return `${mapping.object?.trim() || "contact"}:${property}`;
+}
+function uniqueName(base, used) {
+  if (!used.has(base)) return base;
+  let n = 2;
+  while (used.has(`${base}_${n}`)) n += 1;
+  return `${base}_${n}`;
+}
+function mergeHubspotImport(current, incoming) {
+  const steps = (current.steps ?? []).map((step) => ({
+    ...step,
+    fields: [...step.fields ?? []]
+  }));
+  if (!steps.length) {
+    steps.push({ id: makeId$1("stp"), fields: [] });
+  }
+  const byKey = /* @__PURE__ */ new Map();
+  const usedNames = /* @__PURE__ */ new Set();
+  for (const step of steps) {
+    for (const field of step.fields) {
+      usedNames.add(field.name);
+      const key = mappingKey(field);
+      if (key) byKey.set(key, field);
+    }
+  }
+  const added = [];
+  const updated = [];
+  const incomingFields = (incoming.steps ?? []).flatMap((step) => step.fields ?? []);
+  for (const next of incomingFields) {
+    const key = mappingKey(next);
+    const existing = key ? byKey.get(key) : void 0;
+    if (existing) {
+      existing.label = next.label;
+      existing.type = next.type;
+      existing.required = next.required;
+      existing.placeholder = next.placeholder;
+      existing.helpText = next.helpText;
+      if (next.options) existing.options = next.options;
+      else delete existing.options;
+      if (!existing.visibleIf && next.visibleIf) existing.visibleIf = next.visibleIf;
+      updated.push(key);
+      continue;
+    }
+    const field = {
+      ...next,
+      id: makeId$1("fld"),
+      name: uniqueName(next.name, usedNames)
+    };
+    usedNames.add(field.name);
+    if (key) byKey.set(key, field);
+    steps[steps.length - 1].fields.push(field);
+    added.push(key || field.name);
+  }
+  return { definition: { version: 1, steps }, added, updated };
+}
 async function hsGet(apiKey, path) {
   const res = await fetch(`${HS_BASE$2}${path}`, {
     headers: { Authorization: `Bearer ${apiKey}` }
@@ -2385,7 +2448,7 @@ 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 },
@@ -2465,7 +2528,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,
@@ -2894,9 +2957,9 @@ function createFormsAdminController(strapi) {
     },
     /**
      * Converts one portal form into a plugin form draft, in the current
-     * locale. Slug derived from the HubSpot name: re-importing the same form
-     * overwrites the draft — never the published version, never the portal.
-     * What the builder can't express is skipped and returned in `skipped`.
+     * locale. Matching prefers the linked HubSpot GUID, then the slug.
+     * Re-importing merges: mapped fields update in place, new ones append,
+     * Strapi steps stay. Never the published version, never the portal.
      */
     async runHubspotImport(ctx) {
       const formId = ctx.request.body?.formId;
@@ -2915,24 +2978,81 @@ function createFormsAdminController(strapi) {
       const { skipped, definition, ...meta } = converted;
       const slug = slugify(name);
       const existing = await documents().findFirst({
+        filters: { hubspotFormId: formId }
+      }) ?? await documents().findFirst({
         filters: { slug }
       });
-      let documentId;
       if (existing) {
-        await documents().update({
+        const current = await documents().findOne({
           documentId: existing.documentId,
           locale: ctx.query.locale,
-          data: { ...meta, name, definition }
+          status: "draft"
         });
-        documentId = existing.documentId;
-      } else {
-        const created = await documents().create({
+        const merged = mergeHubspotImport(current?.definition ?? EMPTY_DEFINITION, definition);
+        await documents().update({
+          documentId: existing.documentId,
           locale: ctx.query.locale,
-          data: { ...meta, name, slug, definition }
+          data: {
+            hubspotFormId: meta.hubspotFormId ?? formId,
+            definition: merged.definition
+          }
         });
-        documentId = created.documentId;
+        ctx.body = {
+          documentId: existing.documentId,
+          skipped,
+          added: merged.added,
+          updated: merged.updated
+        };
+        return;
       }
-      ctx.body = { documentId, skipped };
+      const created = await documents().create({
+        locale: ctx.query.locale,
+        data: { ...meta, name, slug, definition }
+      });
+      ctx.body = { documentId: created.documentId, skipped, added: [], updated: [] };
+    },
+    /**
+     * Pull the linked HubSpot marketing form back into this draft: mapped
+     * fields update in place, new ones append, Strapi steps and extras stay.
+     */
+    async resync(ctx) {
+      const entry = await documents().findOne({
+        documentId: ctx.params.documentId,
+        locale: ctx.query.locale,
+        status: "draft"
+      });
+      if (!entry) ctx.throw(404, "Form not found");
+      const guid = typeof entry.hubspotFormId === "string" ? entry.hubspotFormId.trim() : "";
+      if (!isFormGuid(guid)) {
+        ctx.throw(400, "This form is not linked to a HubSpot marketing form.");
+      }
+      const { apiKey } = await resolveApiKey(strapi);
+      if (!apiKey) ctx.throw(400, "No HubSpot API key configured");
+      let converted;
+      try {
+        converted = convertHubspotForm(await fetchHubspotForm(apiKey, guid));
+      } catch (err) {
+        strapi.log.warn(`[hubspot] form resync failed — ${err.message}`);
+        ctx.throw(502, err.message || "Cannot reach HubSpot");
+        return;
+      }
+      const merged = mergeHubspotImport(entry.definition ?? EMPTY_DEFINITION, converted.definition);
+      await documents().update({
+        documentId: ctx.params.documentId,
+        locale: ctx.query.locale,
+        data: { definition: merged.definition }
+      });
+      const form = await documents().findOne({
+        documentId: ctx.params.documentId,
+        locale: ctx.query.locale,
+        status: "draft"
+      });
+      ctx.body = {
+        form,
+        added: merged.added,
+        updated: merged.updated,
+        skipped: converted.skipped
+      };
     },
     /**
      * Copies a form (every locale of its draft) into a new draft document —
@@ -3217,8 +3337,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
@@ -3471,6 +3591,7 @@ const routes = {
       adminRoute("POST", "/builder/forms/:documentId/unpublish", "formsAdmin.unpublish", [FORMS_ACTION]),
       adminRoute("DELETE", "/builder/forms/:documentId", "formsAdmin.remove", [FORMS_ACTION]),
       adminRoute("POST", "/builder/forms/:documentId/duplicate", "formsAdmin.duplicate", [FORMS_ACTION]),
+      adminRoute("POST", "/builder/forms/:documentId/resync", "formsAdmin.resync", [FORMS_ACTION]),
       // No FORMS_ACTION: editors pick forms from the Content Manager, like
       // they pick properties — the builder itself stays gated.
       adminRoute("GET", "/forms-options", "formsAdmin.options"),

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";

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

@@ -50,11 +50,16 @@ export declare function createFormsAdminController(strapi: Core.Strapi): {
     listHubspotSources(ctx: Ctx): Promise<void>;
     /**
      * Converts one portal form into a plugin form draft, in the current
-     * locale. Slug derived from the HubSpot name: re-importing the same form
-     * overwrites the draft — never the published version, never the portal.
-     * What the builder can't express is skipped and returned in `skipped`.
+     * locale. Matching prefers the linked HubSpot GUID, then the slug.
+     * Re-importing merges: mapped fields update in place, new ones append,
+     * Strapi steps stay. Never the published version, never the portal.
      */
     runHubspotImport(ctx: Ctx): Promise<void>;
+    /**
+     * Pull the linked HubSpot marketing form back into this draft: mapped
+     * fields update in place, new ones append, Strapi steps and extras stay.
+     */
+    resync(ctx: Ctx): Promise<void>;
     /**
      * Copies a form (every locale of its draft) into a new draft document —
      * the quickest way to A/B a variant or to start from an existing form.

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

@@ -79,6 +79,18 @@ export interface RawHubspotForm {
     } | null;
 }
 export declare function convertHubspotForm(raw: RawHubspotForm): ConvertedHubspotForm;
+export interface HubspotMergeResult {
+    definition: FormDefinition;
+    added: string[];
+    updated: string[];
+}
+/**
+ * Fold a freshly converted HubSpot form into an existing builder definition.
+ * Mapped fields are updated in place (label, type, required, options…) so
+ * Strapi steps, ids, conditions and extra fields survive. New HubSpot fields
+ * are appended to the last step. Nothing is deleted.
+ */
+export declare function mergeHubspotImport(current: FormDefinition, incoming: FormDefinition): HubspotMergeResult;
 /** Every regular form of the portal, name-sorted. Needs the `forms` scope. */
 export declare function listHubspotForms(apiKey: string): Promise<HubspotFormSummary[]>;
 /** One form, full definition. */

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

@@ -280,6 +280,7 @@ declare const _default: {
             runImport(ctx: import("./formsAdmin").Ctx): Promise<void>;
             listHubspotSources(ctx: import("./formsAdmin").Ctx): Promise<void>;
             runHubspotImport(ctx: import("./formsAdmin").Ctx): Promise<void>;
+            resync(ctx: import("./formsAdmin").Ctx): Promise<void>;
             duplicate(ctx: import("./formsAdmin").Ctx): Promise<void>;
             remove(ctx: import("./formsAdmin").Ctx): Promise<void>;
         };
@@ -370,6 +371,7 @@ declare const _default: {
                         submissionMode?: string;
                         writeExtraProperties?: boolean;
                         syncFieldsOnPublish?: boolean;
+                        timelineNote?: boolean;
                     };
                 };
                 body: unknown;

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

@@ -24,6 +24,7 @@ export interface StoredSettings {
     submissionMode?: SubmissionMode;
     writeExtraProperties?: boolean;
     syncFieldsOnPublish?: boolean;
+    timelineNote?: boolean;
 }
 export interface HubspotPolicy {
     /** How submissions reach HubSpot. `auto` uses Forms API when a GUID is set. */
@@ -32,6 +33,8 @@ export interface HubspotPolicy {
     writeExtraProperties: boolean;
     /** On publish, PATCH missing mapped contact fields onto the HubSpot form. */
     syncFieldsOnPublish: boolean;
+    /** Recap note on the contact (page URL, subject, answers) after a successful sync. */
+    timelineNote: boolean;
 }
 export interface PublicSettings {
     configured: boolean;
@@ -48,6 +51,7 @@ export interface PublicSettings {
     submissionMode: SubmissionMode;
     writeExtraProperties: boolean;
     syncFieldsOnPublish: boolean;
+    timelineNote: boolean;
 }
 export interface HubspotAccount {
     portalId: string;
@@ -62,6 +66,7 @@ interface FormsCfg {
     submissionMode?: unknown;
     writeExtraProperties?: unknown;
     syncFieldsOnPublish?: unknown;
+    timelineNote?: unknown;
 }
 export declare function policyFrom(stored: StoredSettings, forms: FormsCfg): HubspotPolicy;
 export declare function resolvePolicy(strapi: Core.Strapi): Promise<HubspotPolicy>;
@@ -80,6 +85,7 @@ export interface SettingsPatch {
     submissionMode?: unknown;
     writeExtraProperties?: unknown;
     syncFieldsOnPublish?: unknown;
+    timelineNote?: unknown;
 }
 /** Merge a PATCH-like body into the store without dropping the saved key. */
 export declare function patchStoredSettings(strapi: Core.Strapi, body: SettingsPatch): Promise<void>;