Merge branch 'develop' into feat/read-only-token

app/javascript/dashboard/api/onboarding.js

@@ -0,0 +1,14 @@
+/* global axios */
+import ApiClient from './ApiClient';
+
+class OnboardingAPI extends ApiClient {
+  constructor() {
+    super('onboarding', { accountScoped: true });
+  }
+
+  update(data) {
+    return axios.patch(this.url, data);
+  }
+}
+
+export default new OnboardingAPI();

app/javascript/dashboard/composables/useAccount.js

@@ -52,6 +52,10 @@ export function useAccount() {
     });
   };
 
+  const finishOnboarding = async data => {
+    await store.dispatch('accounts/finishOnboarding', data);
+  };
+
   return {
     accountId,
     route,
@@ -61,5 +65,6 @@ export function useAccount() {
     isCloudFeatureEnabled,
     isOnChatwootCloud,
     updateAccount,
+    finishOnboarding,
   };
 }

app/javascript/dashboard/routes/dashboard/onboarding/Index.vue

@@ -28,7 +28,7 @@ import {
 const { t } = useI18n();
 const router = useRouter();
 const store = useStore();
-const { accountId, currentAccount, updateAccount } = useAccount();
+const { accountId, currentAccount, finishOnboarding } = useAccount();
 const { enabledLanguages } = useConfig();
 const currentUser = useMapGetter('getCurrentUser');
 
@@ -195,6 +195,12 @@ const handleWebsiteEnter = () => {
   websiteInput.value?.blur();
 };
 
+const normalizeWebsiteUrl = raw => {
+  const trimmed = (raw || '').trim();
+  if (!trimmed) return '';
+  return /^https?:\/\//i.test(trimmed) ? trimmed : `https://${trimmed}`;
+};
+
 const handleSubmit = async () => {
   // Block submit while enrichment is still running so users can't bypass
   // the form with empty values — the controller would otherwise clear
@@ -211,9 +217,27 @@ const handleSubmit = async () => {
     return;
   }
 
+  // Detect which enrichable fields the user actually edited *before*
+  // normalizing — otherwise an untouched auto-filled domain
+  // (acme.com -> https://acme.com) compares unequal against the raw snapshot
+  // and gets falsely reported as changed, skewing onboarding telemetry.
+  const init = initialValues.value;
+  const enrichableFields = {
+    website: website.value,
+    company_size: companySize.value,
+    industry: industry.value,
+  };
+  const fieldsChanged = Object.entries(enrichableFields)
+    .filter(([key, val]) => val !== init[key])
+    .map(([key]) => key);
+
+  // Persist with a scheme so downstream consumers (Firecrawl, portal
+  // homepage_link) get a fully-qualified URL regardless of what the user typed.
+  website.value = normalizeWebsiteUrl(website.value);
+
   isSubmitting.value = true;
   try {
-    await updateAccount({
+    await finishOnboarding({
       name: accountName.value,
       locale: locale.value,
       website: website.value,
@@ -224,20 +248,11 @@ const handleSubmit = async () => {
       user_role: userRole.value,
     });
 
-    const init = initialValues.value;
-    const enrichableFields = {
-      website: website.value,
-      company_size: companySize.value,
-      industry: industry.value,
-    };
-
     useTrack(ONBOARDING_EVENTS.ACCOUNT_DETAILS_COMPLETED, {
       has_enriched_data: Boolean(
         currentAccount.value?.custom_attributes?.brand_info
       ),
-      fields_changed: Object.entries(enrichableFields)
-        .filter(([key, val]) => val !== init[key])
-        .map(([key]) => key),
+      fields_changed: fieldsChanged,
       user_role: userRole.value,
       company_size: companySize.value,
       industry: industry.value,

app/javascript/dashboard/store/modules/accounts.js

@@ -1,6 +1,7 @@
 import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
 import * as types from '../mutation-types';
 import AccountAPI from '../../api/account';
+import OnboardingAPI from '../../api/onboarding';
 import { differenceInDays } from 'date-fns';
 import EnterpriseAccountAPI from '../../api/enterprise/account';
 import { throwErrorMessage } from '../utils/api';
@@ -83,6 +84,15 @@ export const actions = {
       throw new Error(error);
     }
   },
+  finishOnboarding: async ({ commit }, payload) => {
+    commit(types.default.SET_ACCOUNT_UI_FLAG, { isUpdating: true });
+    try {
+      const response = await OnboardingAPI.update(payload);
+      commit(types.default.EDIT_ACCOUNT, response.data);
+    } finally {
+      commit(types.default.SET_ACCOUNT_UI_FLAG, { isUpdating: false });
+    }
+  },
   delete: async ({ commit }, { id }) => {
     commit(types.default.SET_ACCOUNT_UI_FLAG, { isUpdating: true });
     try {