Beautiful Open-Source Form Builder
Fix submission table columns and checkbox labels (#1092)
Julien Nahumbeab8f62bf48
diff --git a/client/components/forms/core/CheckboxInput.vue b/client/components/forms/core/CheckboxInput.vueindex c8cd1f9e5..d3858ce92 100644--- a/client/components/forms/core/CheckboxInput.vue+++ b/client/components/forms/core/CheckboxInput.vue@@ -32,6 +32,7 @@:label="label":required="required":theme="theme"+ :native-for="id ? id : name"/></slot><slotdiff --git a/client/components/open/forms/FormExportModal.vue b/client/components/open/forms/FormExportModal.vueindex d2878abac..89e336438 100644--- a/client/components/open/forms/FormExportModal.vue+++ b/client/components/open/forms/FormExportModal.vue@@ -132,6 +132,25 @@ const animationFrame = ref(null)const lastApiCall = ref(null)const progressStartTime = ref(null)+const normalizeColumnList = (columns) => {+ if (Array.isArray(columns)) return columns+ if (columns && typeof columns === 'object') return Object.values(columns)+ return []+}++const exportColumns = computed(() => {+ if (props.columns && Object.keys(props.columns).length > 0) {+ return props.columns+ }++ return normalizeColumnList(props.form?.properties).reduce((columns, property) => {+ if (property?.id) {+ columns[property.id] = true+ }+ return columns+ }, { created_at: true })+})+const startExport = () => {if (isExporting.value) return@@ -145,7 +164,7 @@ const startExport = () => {progressStartTime.value = Date.now()const payload = {- columns: props.columns+ columns: exportColumns.value}if (props.selectedIds.length > 0) {@@ -388,4 +407,4 @@ onUnmounted(() => {stopPolling()stopProgressAnimation()})-</script>\ No newline at end of file+</script>diff --git a/client/composables/components/tables/useTableState.js b/client/composables/components/tables/useTableState.jsindex 6c9327d54..391e1eb12 100644--- a/client/composables/components/tables/useTableState.js+++ b/client/composables/components/tables/useTableState.js@@ -2,6 +2,18 @@ import { computed } from 'vue'import { useTableColumnPreferences } from './useTableColumnPreferences'import debounce from 'debounce'+const normalizeColumnList = (columns) => {+ if (Array.isArray(columns)) {+ return columns+ }++ if (columns && typeof columns === 'object') {+ return Object.values(columns)+ }++ return []+}+// Provides a composable for managing the state of a table component, including column visibility, pinning, sizing, and wrapping.// It synchronizes table state with user preferences (such as column order and visibility) and supports dynamic updates based on form structure and workspace context.@@ -12,6 +24,7 @@ export function useTableState(form, withActions = false) {)const { getColumnPreference, setColumnPreference } = columnPreferences+ const { hasFeature } = usePlanFeatures()/* -------------------------------------------------------------------------- *//* Column config */@@ -20,9 +33,11 @@ export function useTableState(form, withActions = false) {// Computed column configurations (base definition for every column)const columnConfigurations = computed(() => {try {- if (!form.value?.properties || !Array.isArray(form.value.properties)) return []+ const properties = normalizeColumnList(form.value?.properties)+ const removedProperties = normalizeColumnList(form.value?.removed_properties)+ if (properties.length === 0) return []- const baseColumns = form.value.properties+ const baseColumns = properties.filter((field) => {return field.type && typeof field.type === 'string' && !field.type.startsWith('nf-')})@@ -42,8 +57,8 @@ export function useTableState(form, withActions = false) {})// Add removed properties- if (form.value?.removed_properties) {- form.value.removed_properties.forEach(property => {+ if (removedProperties.length > 0) {+ removedProperties.forEach(property => {const { columns: matrixColumns, ...rest } = propertybaseColumns.push({...(property.type === 'matrix' ? { ...rest, matrix_columns: matrixColumns } : { ...rest }),@@ -71,8 +86,6 @@ export function useTableState(form, withActions = false) {})}- const { hasFeature } = usePlanFeatures()-if (hasFeature('enable_partial_submissions') && (form.value?.enable_partial_submissions ?? false)) {if (!baseColumns.find(property => property.id === 'status')) {baseColumns.push({@@ -443,4 +456,4 @@ export function useTableState(form, withActions = false) {toggleColumnPin: toggleColumnPin,handleColumnResize,}-}\ No newline at end of file+}diff --git a/client/composables/query/forms/useForms.js b/client/composables/query/forms/useForms.jsindex 1242bdf45..209db162d 100644--- a/client/composables/query/forms/useForms.js+++ b/client/composables/query/forms/useForms.js@@ -9,21 +9,30 @@ export function useForms() {const { isAuthenticated } = useIsAuthenticated()const formsListCache = useFormsListCache()+ const detailKey = (scope, slug) => ['forms', scope, 'slug', slug]+ const detailByIdKey = (scope, id) => ['forms', scope, id]+ const scopeFor = (usePrivate) => usePrivate ? 'private' : 'public'+ const isQueryEnabled = (id, optionEnabled, usePrivate) => computed(() => {+ return !!toValue(id) && !!toValue(optionEnabled) && (!usePrivate || isAuthenticated.value)+ })+const detail = (slug, options = {}) => {- const { usePrivate = false, ...queryOptions } = options+ const { usePrivate = false, enabled = true, ...queryOptions } = options+ const scope = scopeFor(usePrivate)return useQuery({- queryKey: ['forms', 'slug', slug],+ queryKey: detailKey(scope, slug),queryFn: () => {- if (usePrivate && isAuthenticated.value) {- return formsApi.get(slug, options)+ if (usePrivate) {+ return formsApi.get(slug, queryOptions)}- return formsApi.publicGet(slug, options)+ return formsApi.publicGet(slug, queryOptions)},- enabled: !!slug,+ enabled: isQueryEnabled(slug, enabled, usePrivate),onSuccess: (form) => {if (form) {queryClient.setQueryData(['forms', form.id], form)+ queryClient.setQueryData(detailKey(scope, form.slug), form)}},...queryOptions,@@ -31,20 +40,23 @@ export function useForms() {}const detailById = (id, options = {}) => {- const { usePrivate = false, ...queryOptions } = options+ const { usePrivate = false, enabled = true, ...queryOptions } = options+ const scope = scopeFor(usePrivate)return useQuery({- queryKey: ['forms', id],+ queryKey: detailByIdKey(scope, id),queryFn: () => {- if (usePrivate && isAuthenticated.value) {- return formsApi.getById(id, options)+ if (usePrivate) {+ return formsApi.getById(id, queryOptions)}- return formsApi.publicGetById(id, options)+ return formsApi.publicGetById(id, queryOptions)},- enabled: !!id,+ enabled: isQueryEnabled(id, enabled, usePrivate),onSuccess: (form) => {if (form) {- queryClient.setQueryData(['forms', 'slug', form.slug], form)+ queryClient.setQueryData(['forms', form.id], form)+ queryClient.setQueryData(detailByIdKey(scope, form.id), form)+ queryClient.setQueryData(detailKey(scope, form.slug), form)}},...queryOptions,@@ -60,7 +72,7 @@ export function useForms() {formsListCache.add(newForm.workspace_id, newForm)// Cache the new formqueryClient.setQueryData(['forms', newForm.id], newForm)- queryClient.setQueryData(['forms', 'slug', newForm.slug], newForm)+ queryClient.setQueryData(detailKey('private', newForm.slug), newForm)},...options})@@ -76,7 +88,7 @@ export function useForms() {// Update individual form cachequeryClient.setQueryData(['forms', currentFormId], form)if (form.slug) {- queryClient.setQueryData(['forms', 'slug', form.slug], form)+ queryClient.setQueryData(detailKey('private', form.slug), form)}// Update in workspace lists@@ -111,7 +123,7 @@ export function useForms() {formsListCache.add(duplicatedForm.workspace_id, duplicatedForm)// Cache the duplicated formqueryClient.setQueryData(['forms', duplicatedForm.id], duplicatedForm)- queryClient.setQueryData(['forms', 'slug', duplicatedForm.slug], duplicatedForm)+ queryClient.setQueryData(detailKey('private', duplicatedForm.slug), duplicatedForm)},...options})@@ -125,7 +137,7 @@ export function useForms() {return old ? { ...old, ...updatedForm } : updatedForm})if (updatedForm.slug) {- queryClient.setQueryData(['forms', 'slug', updatedForm.slug], (old) => {+ queryClient.setQueryData(detailKey('private', updatedForm.slug), (old) => {return old ? { ...old, ...updatedForm } : updatedForm})}@@ -144,7 +156,7 @@ export function useForms() {// Update form cachequeryClient.setQueryData(['forms', id], updatedForm)if (updatedForm.slug) {- queryClient.setQueryData(['forms', 'slug', updatedForm.slug], updatedForm)+ queryClient.setQueryData(detailKey('private', updatedForm.slug), updatedForm)}// Remove from old workspace list@@ -189,9 +201,12 @@ export function useForms() {const invalidateDetail = (form) => {if (form.id) {queryClient.removeQueries({ queryKey: ['forms', form.id] })+ queryClient.removeQueries({ queryKey: detailByIdKey('public', form.id) })+ queryClient.removeQueries({ queryKey: detailByIdKey('private', form.id) })}if (form.slug) {- queryClient.removeQueries({ queryKey: ['forms', 'slug', form.slug] })+ queryClient.removeQueries({ queryKey: detailKey('public', form.slug) })+ queryClient.removeQueries({ queryKey: detailKey('private', form.slug) })}}@@ -217,4 +232,4 @@ export function useForms() {invalidateAll,invalidateDetail}-}\ No newline at end of file+}diff --git a/client/test/nuxt/checkbox-input.spec.ts b/client/test/nuxt/checkbox-input.spec.tsnew file mode 100644index 000000000..3d1aeb711--- /dev/null+++ b/client/test/nuxt/checkbox-input.spec.ts@@ -0,0 +1,50 @@+import { describe, expect, it } from 'vitest'+import { mount } from '@vue/test-utils'+import CheckboxInput from '../../components/forms/core/CheckboxInput.vue'++describe('CheckboxInput', () => {+ const createWrapper = (props = {}) => {+ return mount(CheckboxInput, {+ props: {+ name: 'terms',+ label: 'I accept the terms',+ modelValue: false,+ ...props,+ },+ global: {+ stubs: {+ InputWrapper: {+ props: ['inputStyle'],+ template: '<div :style="inputStyle"><slot name="label" /><slot /><slot name="help" /><slot name="error" /></div>',+ },+ Icon: true,+ },+ provide: {+ form: undefined,+ },+ },+ })+ }++ it('associates the visible label with the checkbox input', () => {+ const wrapper = createWrapper({ id: 'terms-checkbox' })++ const input = wrapper.find('input[type="checkbox"]')+ const labels = wrapper.findAll('label')+ const visibleLabel = labels.find(label => label.text().includes('I accept the terms'))++ expect(input.attributes('id')).toBe('terms-checkbox')+ expect(visibleLabel?.attributes('for')).toBe('terms-checkbox')+ })++ it('falls back to the field name when no id is provided', () => {+ const wrapper = createWrapper()++ const input = wrapper.find('input[type="checkbox"]')+ const labels = wrapper.findAll('label')+ const visibleLabel = labels.find(label => label.text().includes('I accept the terms'))++ expect(input.attributes('id')).toBe('terms')+ expect(visibleLabel?.attributes('for')).toBe('terms')+ })+})