From 27288d011d33ca100c03579e5d9f0399fd3c8653 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 21 Dec 2022 15:01:05 +0100
Subject: [PATCH 1/2] fix(searchBar): applyParams

---
 ..._smartTable_searchBar_integrations.spec.js | 32 +++++++++++++++++--
 front/core/components/searchbar/searchbar.js  |  6 ++--
 .../components/searchbar/searchbar.spec.js    |  4 +--
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js b/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js
index 4fc280209..f5897da2c 100644
--- a/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js
+++ b/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js
@@ -1,7 +1,7 @@
 import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';
 
-describe('SmartTable SearchBar integration', () => {
+fdescribe('SmartTable SearchBar integration', () => {
     let browser;
     let page;
     beforeAll(async() => {
@@ -15,7 +15,7 @@ describe('SmartTable SearchBar integration', () => {
         await browser.close();
     });
 
-    describe('as filters', () => {
+    describe('as filters in smart-table section', () => {
         it('should search by type in searchBar', async() => {
             await page.waitToClick(selectors.itemsIndex.openAdvancedSearchButton);
             await page.autocompleteSearch(selectors.itemsIndex.advancedSearchItemType, 'Anthurium');
@@ -47,6 +47,34 @@ describe('SmartTable SearchBar integration', () => {
         });
     });
 
+    describe('as filters in section without smart-table', () => {
+        it('go to zone section', async() => {
+            await page.loginAndModule('salesPerson', 'zone');
+            await page.waitToClick(selectors.globalItems.searchButton);
+        });
+
+        it('should search in searchBar first time', async() => {
+            await page.doSearch('A');
+            const count = await page.countElement(selectors.zoneIndex.searchResult);
+
+            expect(count).toEqual(7);
+        });
+
+        it('should search in searchBar second time', async() => {
+            await page.doSearch('A');
+            const count = await page.countElement(selectors.zoneIndex.searchResult);
+
+            expect(count).toEqual(7);
+        });
+
+        it('should search in searchBar third time', async() => {
+            await page.doSearch('A');
+            const count = await page.countElement(selectors.zoneIndex.searchResult);
+
+            expect(count).toEqual(7);
+        });
+    });
+
     describe('as orders', () => {
         it('should order by first id', async() => {
             await page.loginAndModule('developer', 'item');
diff --git a/front/core/components/searchbar/searchbar.js b/front/core/components/searchbar/searchbar.js
index f2855d711..aefa89b5b 100644
--- a/front/core/components/searchbar/searchbar.js
+++ b/front/core/components/searchbar/searchbar.js
@@ -308,7 +308,7 @@ export default class Searchbar extends Component {
 
         this.tableQ = null;
 
-        const hasParams = this.$params.q && Object.keys(JSON.parse(this.$params.q)).length;
+        const hasParams = this.$params.q && JSON.parse(this.$params.q).tableQ;
         if (hasParams) {
             const stateFilter = JSON.parse(this.$params.q);
             for (let param in stateFilter) {
@@ -325,8 +325,8 @@ export default class Searchbar extends Component {
             for (let param in stateFilter.tableQ)
                 params[param] = stateFilter.tableQ[param];
 
-            Object.assign(stateFilter, params);
-            return this.model.applyParams(params)
+            const newParams = Object.assign(stateFilter, params);
+            return this.model.applyParams(newParams)
                 .then(() => this.model.data);
         }
 
diff --git a/front/core/components/searchbar/searchbar.spec.js b/front/core/components/searchbar/searchbar.spec.js
index ed8fd9d07..9998e7a7c 100644
--- a/front/core/components/searchbar/searchbar.spec.js
+++ b/front/core/components/searchbar/searchbar.spec.js
@@ -174,14 +174,12 @@ describe('Component vnSearchbar', () => {
             jest.spyOn(controller, 'doSearch');
             controller.model = {
                 refresh: jest.fn(),
+                applyFilter: jest.fn().mockReturnValue(Promise.resolve()),
                 userParams: {
                     id: 1
                 }
             };
 
-            controller.model.applyParams = jest.fn().mockReturnValue(Promise.resolve());
-            jest.spyOn(controller.model, 'applyParams');
-
             controller.filter = filter;
             controller.removeParam(0);
 

From 186a64f7fa8676ee6f1942ac39d29ee44c4596f0 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 22 Dec 2022 07:46:06 +0100
Subject: [PATCH 2/2] unfocus

---
 e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js b/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js
index f5897da2c..ad558ace2 100644
--- a/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js
+++ b/e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js
@@ -1,7 +1,7 @@
 import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';
 
-fdescribe('SmartTable SearchBar integration', () => {
+describe('SmartTable SearchBar integration', () => {
     let browser;
     let page;
     beforeAll(async() => {