From f62f72832a0a27d0762820a69855929da881cac4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 19 Feb 2025 00:03:28 +0100
Subject: [PATCH] perf: rename prop

---
 src/components/ui/VnFilterPanel.vue           | 23 +++++++++++--------
 src/pages/Ticket/TicketFilter.vue             |  2 +-
 .../integration/ticket/tickeFilter.spec.js    | 17 ++++++++++----
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 7af226bff..8f2c9f05e 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -61,9 +61,12 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
-    useSearchbar: {
-        type: [Boolean, Function],
-        default: false,
+    searchbarOptions: {
+        type: Object,
+        default: () => ({
+            use: false,
+            validateFn: null,
+        }),
     },
 });
 
@@ -99,17 +102,17 @@ defineExpose({ search, params: userParams, remove });
 
 async function search(evt) {
     try {
-        if ($props.useSearchbar) {
+        if ($props.searchbarOptions.use) {
             if (!searchbar.value) {
                 return;
             }
-            if (typeof $props.useSearchbar === 'function') {
-                $props.useSearchbar(userParams.value);
+            if (typeof $props.searchbarOptions.validateFn === 'function') {
+                $props.searchbarOptions.validateFn(userParams.value);
+            }
 
-                if (!Object.keys(userParams.value).length) {
-                    searchbar.value();
-                    return;
-                }
+            if (!Object.keys(userParams.value).length) {
+                searchbar.value();
+                return;
             }
         }
         if (evt && $props.disableSubmitEvent) return;
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 722db879d..a7205b6a6 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -76,7 +76,7 @@ function validateDateRange(params) {
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"
-        :use-searchbar="validateDateRange"
+        :searchbar-options="{ use: true, validateFn: validateDateRange }"
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
diff --git a/test/cypress/integration/ticket/tickeFilter.spec.js b/test/cypress/integration/ticket/tickeFilter.spec.js
index 59abb0164..c92bae844 100644
--- a/test/cypress/integration/ticket/tickeFilter.spec.js
+++ b/test/cypress/integration/ticket/tickeFilter.spec.js
@@ -19,16 +19,16 @@ describe('TicketFilter', () => {
         cy.on('uncaught:exception', () => {
             return false;
         });
-        cy.get('.q-field__control-container > [data-cy="From_date"]').type(
-            '14-02-2025{enter}',
-        );
+        cy.get('.q-field__control-container > [data-cy="From_date"]')
+            .type(`${today()} `)
+            .type('{enter}');
         cy.get('.q-notification').should(
             'contain',
             `The date range must have both 'from' and 'to'`,
         );
 
         cy.get('.q-field__control-container > [data-cy="To_date"]').type(
-            '16/02/2025{enter}',
+            `${today()}{enter}`,
         );
         cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketFilter');
         cy.searchBtnFilterPanel();
@@ -40,3 +40,12 @@ describe('TicketFilter', () => {
         cy.location('href').should('contain', '#/ticket/999999');
     });
 });
+function today() {
+    // return new Date().toISOString().split('T')[0];
+
+    return new Intl.DateTimeFormat('es-ES', {
+        day: '2-digit',
+        month: '2-digit',
+        year: 'numeric',
+    }).format(new Date());
+}