From eeac9252fb9e968c2247645975f8fc30209889bf Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <fayazara@gmail.com>
Date: Wed, 17 Jul 2024 14:59:51 +0530
Subject: [PATCH] Revert "draft somewhat working validation $each"

This reverts commit 624d61913cd6f27bdbfd0544fe647948b2ca94e2.
---
 .../components/widgets/FilterInput/Index.vue  |  6 +--
 .../ConversationAdvancedFilter.vue            | 53 ++++++++-----------
 2 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/FilterInput/Index.vue b/app/javascript/dashboard/components/widgets/FilterInput/Index.vue
index 1131c4088..bbccf77bd 100644
--- a/app/javascript/dashboard/components/widgets/FilterInput/Index.vue
+++ b/app/javascript/dashboard/components/widgets/FilterInput/Index.vue
@@ -115,9 +115,8 @@
           @click="removeFilter"
         />
       </div>
-      <pre>{{ JSON.stringify(v, null, 2) }}</pre>
-      <p v-if="v.values.length > 0" class="filter-error">
-        {{ v.values[0].$message || $t('FILTER.EMPTY_VALUE_ERROR') }}
+      <p v-if="v.values.$dirty && v.values.$error" class="filter-error">
+        {{ $t('FILTER.EMPTY_VALUE_ERROR') }}
       </p>
     </div>
 
@@ -224,7 +223,6 @@ export default {
       set(value) {
         const payload = this.value || {};
         this.$emit('input', { ...payload, values: value });
-        this.$emit('validate');
       },
     },
     query_operator: {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationAdvancedFilter.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationAdvancedFilter.vue
index 95dcbf6d5..c0752a478 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.$response.$errors[i]"
+          :v="$v.appliedFilters.$each[i]"
           @resetFilter="resetFilter(i, appliedFilters[i])"
           @removeFilter="removeFilter(i)"
         />
@@ -80,8 +80,7 @@
 
 <script>
 import alertMixin from 'shared/mixins/alertMixin';
-import { useVuelidate } from '@vuelidate/core';
-import { required, requiredIf, helpers } from '@vuelidate/validators';
+import { required, requiredIf } from 'vuelidate/lib/validators';
 import FilterInputBox from '../FilterInput/Index.vue';
 import languages from './advancedFilterItems/languages';
 import countries from 'shared/constants/countries.js';
@@ -118,34 +117,26 @@ export default {
       default: false,
     },
   },
-  setup() {
-    return { v$: useVuelidate() };
-  },
-  validations() {
-    return {
-      appliedFilters: {
-        required,
-        $each: helpers.forEach({
-          values: {
-            ensureBetween0to999: helpers.withMessage(
-              'Value must be between 0 and 999',
-              (value, prop) => {
-                if (prop.filter_operator === 'days_before') {
-                  return parseInt(value, 10) > 0 && parseInt(value, 10) < 999;
-                }
-                return true;
-              }
-            ),
-            required: requiredIf(prop => {
-              return !(
-                prop.filter_operator === 'is_present' ||
-                prop.filter_operator === 'is_not_present'
-              );
-            }),
+  validations: {
+    appliedFilters: {
+      required,
+      $each: {
+        values: {
+          ensureBetween0to999(value, prop) {
+            if (prop.filter_operator === 'days_before') {
+              return parseInt(value, 10) > 0 && parseInt(value, 10) < 999;
+            }
+            return true;
           },
-        }),
+          required: requiredIf(prop => {
+            return !(
+              prop.filter_operator === 'is_present' ||
+              prop.filter_operator === 'is_not_present'
+            );
+          }),
+        },
       },
-    };
+    },
   },
   data() {
     return {
@@ -356,8 +347,8 @@ export default {
       }
     },
     submitFilterQuery() {
-      this.v$.$touch();
-      if (this.v$.$invalid) return;
+      this.$v.$touch();
+      if (this.$v.$invalid) return;
       this.$store.dispatch(
         'setConversationFilters',
         JSON.parse(JSON.stringify(this.appliedFilters))