Beautiful Open-Source Form Builder
42772 condition editor error handling (#502)
Favour Olayinka90a53b4d0d9f
diff --git a/client/components/global/ErrorBoundary.vue b/client/components/global/ErrorBoundary.vueindex 0533faf73..39adbf885 100644--- a/client/components/global/ErrorBoundary.vue+++ b/client/components/global/ErrorBoundary.vue@@ -8,23 +8,26 @@/></template>- <script setup lang="ts">- const error = ref()- const emit = defineEmits(['on-error'])- function clearError() {- error.value = undefined- }- onErrorCaptured(err => {- error.value = err- emit('on-error', err)- return false- })- const route = useRoute()- watch(- () => route.fullPath,- () => {- error.value = undefined+<script setup>+ const error = ref()+ const emit = defineEmits(['on-error'])+ function clearError() {+ error.value = undefined}- )- </script>+ onErrorCaptured(err => {+ error.value = err+ emit('on-error', err)+ return false+ })+ const route = useRoute()+ watch(+ () => route.fullPath,+ () => {+ error.value = undefined+ }+ )+ defineExpose({+ clearError+ })+</script>\ No newline at end of filediff --git a/client/components/open/forms/components/FormEditorErrorHandler.vue b/client/components/open/forms/components/FormEditorErrorHandler.vueindex 2073903ee..045ce0fe0 100644--- a/client/components/open/forms/components/FormEditorErrorHandler.vue+++ b/client/components/open/forms/components/FormEditorErrorHandler.vue@@ -37,6 +37,7 @@clearError()}const onFormEditorError = (error) => {+ console.error('Form Editor Error Handled', error)crisp.pauseChatBot()const eventData = {message: error.message,diff --git a/client/components/open/forms/components/form-logic-components/ConditionEditor.client.vue b/client/components/open/forms/components/form-logic-components/ConditionEditor.client.vueindex 8cb5b0649..296c989dc 100644--- a/client/components/open/forms/components/form-logic-components/ConditionEditor.client.vue+++ b/client/components/open/forms/components/form-logic-components/ConditionEditor.client.vue@@ -1,40 +1,42 @@<template>- <query-builder- v-model="query"- :rules="rules"- :config="config"- @update:model-value="onChange"- >- <template #groupOperator="props">- <div- class="query-builder-group-slot__group-selection flex items-center px-5 border-b py-1 mb-1 flex"- >- <p class="mr-2 font-semibold">- Operator- </p>- <select-input- wrapper-class="relative"- :model-value="props.currentOperator"- :options="props.operators"- emit-key="identifier"- option-key="identifier"- name="operator-input"- margin-bottom=""- @update:model-value="props.updateCurrentOperator($event)"+ <ErrorBoundary @on-error="handleError" ref="error_boundary">+ <query-builder+ v-model="query"+ :rules="rules"+ :config="config"+ @update:model-value="onChange"+ >+ <template #groupOperator="props">+ <div+ class="query-builder-group-slot__group-selection flex items-center px-5 border-b py-1 mb-1 flex"+ >+ <p class="mr-2 font-semibold">+ Operator+ </p>+ <select-input+ wrapper-class="relative"+ :model-value="props.currentOperator"+ :options="props.operators"+ emit-key="identifier"+ option-key="identifier"+ name="operator-input"+ margin-bottom=""+ @update:model-value="props.updateCurrentOperator($event)"+ />+ </div>+ </template>+ <template #groupControl="props">+ <group-control-slot :group-ctrl="props" />+ </template>+ <template #rule="ruleCtrl">+ <component+ :is="ruleCtrl.ruleComponent"+ :model-value="ruleCtrl.ruleData"+ @update:model-value="ruleCtrl.updateRuleData"/>- </div>- </template>- <template #groupControl="props">- <group-control-slot :group-ctrl="props" />- </template>- <template #rule="ruleCtrl">- <component- :is="ruleCtrl.ruleComponent"- :model-value="ruleCtrl.ruleData"- @update:model-value="ruleCtrl.updateRuleData"- />- </template>- </query-builder>+ </template>+ </query-builder>+ </ErrorBoundary></template><script>@@ -130,7 +132,16 @@ export default {onChange() {this.$emit("update:modelValue", this.query)},- },+ // If there was some changes to the structure, causing an issue, we clear the condition+ handleError (error) {+ this.$nextTick(() => {+ console.error('Error with condition - clearing previous value', error)+ this.query = null+ this.onChange()+ this.$refs['error_boundary'].clearError()+ })+ }+ }}</script><style src="query-builder-vue-3/dist/style.css" />