Skip to content

Beautiful Open-Source Form Builder

Fix payment editor crash when rendering numeric amounts (#1307)

Julien Nahum48d07b0ae883
diff --git a/client/components/forms/heavy/MentionInput.vue b/client/components/forms/heavy/MentionInput.vue
index 3501d601a..b6ea19f57 100644
--- a/client/components/forms/heavy/MentionInput.vue
+++ b/client/components/forms/heavy/MentionInput.vue
@@ -175,6 +175,10 @@ const getPlainText = (html) => {
return temp.textContent.trim()
}
+function getHtmlValue(value) {
+ return value === null || value === undefined ? '' : String(value)
+}
+
const updateCompVal = () => {
const html = editableDiv.value.innerHTML
const plainText = getPlainText(html)
@@ -188,14 +192,15 @@ const onInput = () => {
}
onMounted(() => {
- if (compVal.value) {
- editableDiv.value.innerHTML = compVal.value
+ if (compVal.value !== null && compVal.value !== undefined) {
+ editableDiv.value.innerHTML = getHtmlValue(compVal.value)
}
})
watch(compVal, (newVal) => {
- if (editableDiv.value && editableDiv.value.innerHTML !== newVal) {
- editableDiv.value.innerHTML = newVal
+ const htmlValue = getHtmlValue(newVal)
+ if (editableDiv.value && editableDiv.value.innerHTML !== htmlValue) {
+ editableDiv.value.innerHTML = htmlValue
}
})
diff --git a/client/components/open/forms/BlockRenderer.vue b/client/components/open/forms/BlockRenderer.vue
index bd0120203..8d0e98905 100644
--- a/client/components/open/forms/BlockRenderer.vue
+++ b/client/components/open/forms/BlockRenderer.vue
@@ -285,7 +285,7 @@ const processMention = (content, { asText = false } = {}) => {
if (!processed) return content
if (!asText) return processed
// Strip HTML tags to get plain text
- return processed.replace(/<[^>]*>/g, '')
+ return String(processed).replace(/<[^>]*>/g, '')
}
// Process mentions in placeholder and help text
diff --git a/client/test/nuxt/block-renderer-payment.spec.ts b/client/test/nuxt/block-renderer-payment.spec.ts
new file mode 100644
index 000000000..699637642
--- /dev/null
+++ b/client/test/nuxt/block-renderer-payment.spec.ts
@@ -0,0 +1,82 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { flushPromises, mount } from '@vue/test-utils'
+import { defineComponent, h, ref } from 'vue'
+import { mockNuxtImport } from '@nuxt/test-utils/runtime'
+import BlockRenderer from '~/components/open/forms/BlockRenderer.vue'
+import { useParseMention } from '~/composables/components/useParseMention'
+
+const mocks = vi.hoisted(() => ({ loadMentionParser: vi.fn() }))
+vi.mock('~/lib/forms/mention-parser-loader.js', () => mocks)
+mockNuxtImport('useNuxtApp', () => () => ({ runWithContext: (fn) => fn() }))
+
+vi.mock('~/composables/components/useComponentRegistry', () => ({
+ useComponentRegistry: () => ({
+ getFormComponent: () => ({ component: 'PaymentInput', clientOnly: true }),
+ }),
+}))
+
+const PaymentInput = defineComponent({
+ props: ['amount'],
+ setup: (props) => () => h('div', { 'data-testid': 'payment-amount' }, String(props.amount)),
+})
+
+function renderPayment(amount, extra = {}) {
+ const block = { id: 'payment', type: 'payment', name: 'Payment', currency: 'USD', amount, ...extra }
+ return mount(BlockRenderer, {
+ props: {
+ block,
+ formManager: {
+ config: ref({ properties: [block] }),
+ form: { data: () => ({}) },
+ strategy: ref({ admin: { showAdminControls: true } }),
+ },
+ },
+ global: {
+ components: { PaymentInput },
+ stubs: {
+ ClientOnlyWrapper: { template: '<div><slot /></div>' },
+ USkeleton: true,
+ LazyEmbedMedia: true,
+ },
+ },
+ })
+}
+
+describe('BlockRenderer payment amounts', () => {
+ beforeEach(() => {
+ mocks.loadMentionParser.mockReset()
+ })
+
+ it.each([5, 10, 12.5, 0, '5', null, undefined])('renders amount %s without loading the mention parser', (amount) => {
+ const wrapper = renderPayment(amount)
+
+ expect(wrapper.get('[data-testid="payment-amount"]').text()).toBe(String(amount ?? 0))
+ expect(mocks.loadMentionParser).not.toHaveBeenCalled()
+ wrapper.unmount()
+ })
+
+ it('renders a numeric amount while the parser loads for a different field property', async () => {
+ let resolveParser
+ mocks.loadMentionParser.mockImplementation(() => new Promise(resolve => { resolveParser = resolve }))
+ const wrapper = renderPayment(5, {
+ help: '<span mention-field-id="missing" mention-fallback="Order">Order</span>',
+ })
+
+ expect(wrapper.get('[data-testid="payment-amount"]').text()).toBe('5')
+ expect(mocks.loadMentionParser).toHaveBeenCalledOnce()
+ resolveParser(useParseMention)
+ await flushPromises()
+ expect(wrapper.get('[data-testid="payment-amount"]').text()).toBe('5')
+ wrapper.unmount()
+ })
+
+ it('resolves a mention amount after the parser loads', async () => {
+ mocks.loadMentionParser.mockResolvedValue(useParseMention)
+ const wrapper = renderPayment('<span mention="true" mention-field-id="missing" mention-fallback="25">Order total</span>')
+
+ await flushPromises()
+
+ expect(wrapper.get('[data-testid="payment-amount"]').text()).toBe('25')
+ wrapper.unmount()
+ })
+})
diff --git a/client/test/nuxt/mention-input.spec.ts b/client/test/nuxt/mention-input.spec.ts
new file mode 100644
index 000000000..0e84ea6f1
--- /dev/null
+++ b/client/test/nuxt/mention-input.spec.ts
@@ -0,0 +1,72 @@
+import { describe, expect, it, vi } from 'vitest'
+import { mount } from '@vue/test-utils'
+import { mockNuxtImport } from '@nuxt/test-utils/runtime'
+import MentionInput from '~/components/forms/heavy/MentionInput.vue'
+
+mockNuxtImport('useAppModals', () => () => ({ openSubscriptionModal: vi.fn() }))
+
+describe('MentionInput', () => {
+ function createWrapper(props = {}) {
+ return mount(MentionInput, {
+ props: {
+ name: 'amount',
+ ...props,
+ },
+ global: {
+ stubs: {
+ InputWrapper: {
+ template: '<div><slot name="label" /><slot /><slot name="help" /><slot name="error" /></div>',
+ },
+ MentionDropdown: {
+ template: '<div><slot /></div>',
+ },
+ UButton: true,
+ },
+ provide: {
+ form: undefined,
+ },
+ },
+ })
+ }
+
+ it('renders and edits a numeric form value without throwing', async () => {
+ const form = { amount: 5 }
+ const wrapper = createWrapper({ form })
+ const editableDiv = wrapper.find('[contenteditable="true"]')
+
+ expect(editableDiv.html()).toContain('5')
+ expect(form.amount).toBe(5)
+
+ editableDiv.element.innerHTML = '7'
+ await editableDiv.trigger('input')
+
+ expect(form.amount).toBe('7')
+ })
+
+ it('preserves mention HTML values', () => {
+ const mention = '<span mention="true" class="mention-item">Order total</span>'
+ const wrapper = createWrapper({ modelValue: mention })
+
+ expect(wrapper.find('[contenteditable="true"]').element.innerHTML).toBe(mention)
+ })
+
+ it('renders zero on mount', () => {
+ const wrapper = createWrapper({ modelValue: 0 })
+
+ expect(wrapper.find('[contenteditable="true"]').text()).toBe('0')
+ })
+
+ it('updates numeric values and clears nullish values', async () => {
+ const wrapper = createWrapper({ modelValue: 5 })
+ const editableDiv = wrapper.find('[contenteditable="true"]')
+
+ await wrapper.setProps({ modelValue: 10 })
+ expect(editableDiv.text()).toBe('10')
+ await wrapper.setProps({ modelValue: null })
+ expect(editableDiv.text()).toBe('')
+ await wrapper.setProps({ modelValue: 0 })
+ expect(editableDiv.text()).toBe('0')
+ await wrapper.setProps({ modelValue: undefined })
+ expect(editableDiv.text()).toBe('')
+ })
+})