fix(cloud): harden survey validity and other-answer handling

- Stop auto-advancing on a cleared single-select and re-clamp stepIndex so a
  backend showWhen that hides an earlier field can't strand an empty step
- Detect "other" for multi-select too across validity, schema, and payload, and
  reject whitespace-only free-text

Author: MaanilVerma

src/platform/cloud/onboarding/survey/DynamicSurveyForm.vue

@@ -112,6 +112,7 @@ import {
   buildSubmissionPayload,
   buildZodSchema,
   hasNonEmptyValue,
+  isOtherValue,
   prepareSurvey,
   visibleFields
 } from './surveySchema'
@@ -216,24 +217,31 @@ const isCurrentValid = computed(() => {
   const value = values[field.id]
   if (!hasNonEmptyValue(value)) return !field.required
 
-  if (field.allowOther && field.otherFieldId && value === 'other') {
+  if (field.allowOther && field.otherFieldId && isOtherValue(value)) {
     const other = values[field.otherFieldId]
     return typeof other === 'string' && other.trim().length > 0
   }
   return true
 })
 
 const isAutoAdvanceValue = (field: OnboardingSurveyField, value: unknown) =>
-  field.type === 'single' && typeof value === 'string' && value !== 'other'
+  field.type === 'single' &&
+  typeof value === 'string' &&
+  value !== '' &&
+  value !== 'other'
 
 const markTouched = (id: string) => {
   touched.value = new Set(touched.value).add(id)
 }
 
 const onFieldChange = async (id: string, value: string | string[]) => {
+  if (isAdvancing.value) return
   markTouched(id)
   setFieldValue(id, value)
   liveValues.value = { ...liveValues.value, [id]: value }
+  if (stepIndex.value > visible.value.length - 1) {
+    stepIndex.value = Math.max(0, visible.value.length - 1)
+  }
 
   const field = currentField.value
   if (field?.id === id && isAutoAdvanceValue(field, value)) {

src/platform/cloud/onboarding/survey/surveySchema.test.ts

@@ -324,3 +324,84 @@ describe('hasNonEmptyValue', () => {
     expect(hasNonEmptyValue(value)).toBe(expected)
   })
 })
+
+describe('multi-select allowOther', () => {
+  const multiOtherSurvey: OnboardingSurvey = {
+    version: 1,
+    fields: [
+      {
+        id: 'making',
+        type: 'multi',
+        required: true,
+        allowOther: true,
+        otherFieldId: 'makingOther',
+        options: [
+          { value: 'a', labelKey: 'a' },
+          { value: 'other', labelKey: 'other' }
+        ]
+      }
+    ]
+  }
+
+  it('requires the free-text when a multi field includes "other"', () => {
+    const schema = buildZodSchema(multiOtherSurvey, {
+      making: ['a', 'other'],
+      makingOther: ''
+    })
+    expect(
+      schema.safeParse({ making: ['a', 'other'], makingOther: '' }).success
+    ).toBe(false)
+    expect(
+      schema.safeParse({ making: ['a', 'other'], makingOther: 'Comics' })
+        .success
+    ).toBe(true)
+  })
+
+  it('does not require the free-text when "other" is not among the choices', () => {
+    const schema = buildZodSchema(multiOtherSurvey, {
+      making: ['a'],
+      makingOther: ''
+    })
+    expect(schema.safeParse({ making: ['a'], makingOther: '' }).success).toBe(
+      true
+    )
+  })
+
+  it('keeps the array and surfaces the trimmed free-text separately', () => {
+    const payload = buildSubmissionPayload(multiOtherSurvey, {
+      making: ['a', 'other'],
+      makingOther: '  Comics  '
+    })
+    expect(payload.making).toEqual(['a', 'other'])
+    expect(payload.makingOther).toBe('Comics')
+  })
+})
+
+describe('other free-text validation', () => {
+  const otherSurvey: OnboardingSurvey = {
+    version: 1,
+    fields: [
+      {
+        id: 'source',
+        type: 'single',
+        required: true,
+        allowOther: true,
+        otherFieldId: 'sourceOther',
+        options: [
+          { value: 'search', labelKey: 'search' },
+          { value: 'other', labelKey: 'other' }
+        ]
+      }
+    ]
+  }
+
+  it('rejects a whitespace-only "other" answer', () => {
+    const schema = buildZodSchema(otherSurvey, {
+      source: 'other',
+      sourceOther: '   '
+    })
+    expect(
+      schema.safeParse({ source: 'other', sourceOther: '   ' }).success
+    ).toBe(false)
+  })
+})

src/platform/cloud/onboarding/survey/surveySchema.ts

@@ -17,6 +17,9 @@ export const hasNonEmptyValue = (
   return true
 }
 
+export const isOtherValue = (current: string | string[] | undefined): boolean =>
+  Array.isArray(current) ? current.includes('other') : current === 'other'
+
 const conditionMatches = (
   condition: OnboardingSurveyFieldCondition | undefined,
   values: SurveyValues
@@ -89,11 +92,14 @@ export const buildZodSchema = (
     if (
       field.allowOther &&
       field.otherFieldId &&
-      values[field.id] === 'other'
+      isOtherValue(values[field.id])
     ) {
-      shape[field.otherFieldId] = z.string().min(1, {
-        message: t('cloudOnboarding.survey.errors.describeAnswer')
-      })
+      shape[field.otherFieldId] = z
+        .string()
+        .trim()
+        .min(1, {
+          message: t('cloudOnboarding.survey.errors.describeAnswer')
+        })
     } else if (field.otherFieldId) {
       shape[field.otherFieldId] = z.string().optional()
     }
@@ -122,17 +128,23 @@ export const buildSubmissionPayload = (
       continue
     }
     const value = values[field.id]
-    const otherRaw = field.otherFieldId ? values[field.otherFieldId] : undefined
-    if (
+    const otherFieldId = field.otherFieldId
+    const otherRaw = otherFieldId ? values[otherFieldId] : undefined
+    const otherText =
       field.allowOther &&
-      field.otherFieldId &&
-      value === 'other' &&
+      otherFieldId &&
+      isOtherValue(value) &&
       typeof otherRaw === 'string'
-    ) {
-      const other = otherRaw.trim()
-      payload[field.id] = other || 'other'
+        ? otherRaw.trim()
+        : undefined
+
+    if (otherText !== undefined && field.type !== 'multi') {
+      payload[field.id] = otherText || 'other'
     } else {
       payload[field.id] = field.type === 'multi' ? (value ?? []) : (value ?? '')
+      if (otherText !== undefined && otherFieldId) {
+        payload[otherFieldId] = otherText
+      }
     }
   }
   return payload