diff --git a/app/javascript/dashboard/components/widgets/FilterInput/Index.vue b/app/javascript/dashboard/components/widgets/FilterInput/Index.vue
index bbccf77bd..5bf1df37b 100644
--- a/app/javascript/dashboard/components/widgets/FilterInput/Index.vue
+++ b/app/javascript/dashboard/components/widgets/FilterInput/Index.vue
@@ -3,7 +3,7 @@
-
- {{ $t('FILTER.EMPTY_VALUE_ERROR') }}
+
+ {{ errorMessage }}
@@ -173,10 +173,6 @@ export default {
type: Boolean,
default: false,
},
- v: {
- type: Object,
- default: () => null,
- },
showUserInput: {
type: Boolean,
default: true,
@@ -193,6 +189,10 @@ export default {
type: String,
default: '',
},
+ errorMessage: {
+ type: String,
+ default: '',
+ },
},
computed: {
attributeKey: {
@@ -271,8 +271,8 @@ export default {
resetFilter() {
this.$emit('resetFilter');
},
- getInputErrorClass(isDirty, hasError) {
- return isDirty && hasError
+ getInputErrorClass(errorMessage) {
+ return errorMessage
? 'bg-red-50 dark:bg-red-800/50 border-red-100 dark:border-red-700/50'
: 'bg-slate-50 dark:bg-slate-800 border-slate-75 dark:border-slate-700/50';
},
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationAdvancedFilter.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationAdvancedFilter.vue
index c0752a478..0f72ab627 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationAdvancedFilter.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationAdvancedFilter.vue
@@ -41,7 +41,7 @@
:show-query-operator="i !== appliedFilters.length - 1"
:show-user-input="showUserInput(appliedFilters[i].filter_operator)"
:grouped-filters="true"
- :v="$v.appliedFilters.$each[i]"
+ :error-message="validationErrors[`filter_${i}`]"
@resetFilter="resetFilter(i, appliedFilters[i])"
@removeFilter="removeFilter(i)"
/>
@@ -80,7 +80,6 @@