From ac8e9cbfd25e2391627943e0ab50990438886b87 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 29 Jan 2025 12:43:02 +0100
Subject: [PATCH 1/9] refactor: refs #7414 update VnLog component to change
 display order value changes on update action

---
 src/components/common/VnLog.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index fdf2e52ee..d1d8d8360 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -641,16 +641,7 @@ watch(
                                                     >
                                                         {{ prop.nameI18n }}:
                                                     </span>
-                                                    <VnJsonValue :value="prop.val.val" />
-                                                    <span
-                                                        v-if="prop.val.id"
-                                                        class="id-value"
-                                                    >
-                                                        #{{ prop.val.id }}
-                                                    </span>
-                                                    <span v-if="log.action == 'update'">
-                                                        ←
-                                                        <VnJsonValue
+                                                    <VnJsonValue
                                                             :value="prop.old.val"
                                                         />
                                                         <span
@@ -659,6 +650,15 @@ watch(
                                                         >
                                                             #{{ prop.old.id }}
                                                         </span>
+                                                    <span v-if="log.action == 'update'">
+                                                        →
+                                                        <VnJsonValue :value="prop.val.val" />
+                                                            <span
+                                                                v-if="prop.val.id"
+                                                                class="id-value"
+                                                            >
+                                                        #{{ prop.val.id }}
+                                                    </span>
                                                     </span>
                                                 </div>
                                             </span>

From 3172ce8cecad5659239f2c7f66e4f86f43dff21b Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Mon, 10 Feb 2025 09:40:43 +0100
Subject: [PATCH 2/9] fix: refs #7414 updated default value rendering for
 non-update scenarios

---
 src/components/common/VnLog.vue | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index a90766c84..5a70edf6c 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -641,24 +641,20 @@ watch(
                                                     >
                                                         {{ prop.nameI18n }}:
                                                     </span>
-                                                    <VnJsonValue
-                                                            :value="prop.old.val"
-                                                        />
-                                                        <span
-                                                            v-if="prop.old.id"
-                                                            class="id-value"
-                                                        >
-                                                            #{{ prop.old.id }}
-                                                        </span>
                                                     <span v-if="log.action == 'update'">
+                                                        <VnJsonValue :value="prop.old.val" />
+                                                        <span v-if="prop.old.id" class="id-value">
+                                                                #{{ prop.old.id }}
+                                                        </span>
                                                         →
                                                         <VnJsonValue :value="prop.val.val" />
-                                                            <span
-                                                                v-if="prop.val.id"
-                                                                class="id-value"
-                                                            >
-                                                        #{{ prop.val.id }}
+                                                        <span v-if="prop.val.id" class="id-value">
+                                                            #{{ prop.val.id }}
+                                                        </span>
                                                     </span>
+                                                    <span v-else="prop.old.val">
+                                                        <VnJsonValue :value="prop.val.val" />
+                                                        <span v-if="prop.old.id" class="id-value">#{{ prop.old.id }}</span>
                                                     </span>
                                                 </div>
                                             </span>

From 12aeb63f27ad9e10e844a55a8bee4b5396db249e Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 12 Feb 2025 12:27:57 +0100
Subject: [PATCH 3/9] fix: refs #7414 update VnLog.vue to correctly display log
 actions and values

---
 src/components/common/VnLog.vue | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index a90766c84..8f106a9f1 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -641,7 +641,8 @@ watch(
                                                     >
                                                         {{ prop.nameI18n }}:
                                                     </span>
-                                                    <VnJsonValue
+                                                    <span v-if="log.action == 'update'">
+                                                        <VnJsonValue
                                                             :value="prop.old.val"
                                                         />
                                                         <span
@@ -650,15 +651,26 @@ watch(
                                                         >
                                                             #{{ prop.old.id }}
                                                         </span>
-                                                    <span v-if="log.action == 'update'">
                                                         →
-                                                        <VnJsonValue :value="prop.val.val" />
-                                                            <span
-                                                                v-if="prop.val.id"
-                                                                class="id-value"
-                                                            >
-                                                        #{{ prop.val.id }}
+                                                        <VnJsonValue
+                                                            :value="prop.val.val"
+                                                        />
+                                                        <span
+                                                            v-if="prop.val.id"
+                                                            class="id-value"
+                                                        >
+                                                            #{{ prop.val.id }}
+                                                        </span>
                                                     </span>
+                                                    <span v-else="prop.old.val">
+                                                        <VnJsonValue
+                                                            :value="prop.val.val"
+                                                        />
+                                                        <span
+                                                            v-if="prop.old.id"
+                                                            class="id-value"
+                                                            >#{{ prop.old.id }}</span
+                                                        >
                                                     </span>
                                                 </div>
                                             </span>

From c3b9a4f719ca6c6b58e1952d05d0613b21b2342a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 1 Mar 2025 02:23:47 +0100
Subject: [PATCH 4/9] feat: add --browser chromium

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e78b0cf3c..fc7f9c15d 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
         "resetDatabase": "cd ../salix && gulp docker",
         "lint": "eslint --ext .js,.vue ./",
         "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
-        "test:e2e": "cypress open",
-        "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
+        "test:e2e": "cypress open --browser chromium",
+        "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run --browser chromium",
         "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
         "test:unit": "vitest",
         "test:unit:ci": "vitest run",

From e97c499e399e435fac2cac4f7a5690ca6ee69942 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 1 Mar 2025 02:23:59 +0100
Subject: [PATCH 5/9] feat: rename test:unit by test:front

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index fc7f9c15d..709d17f40 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,8 @@
         "test:e2e": "cypress open --browser chromium",
         "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run --browser chromium",
         "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
-        "test:unit": "vitest",
-        "test:unit:ci": "vitest run",
+        "test:front": "vitest",
+        "test:front:ci": "vitest run",
         "commitlint": "commitlint --edit",
         "prepare": "npx husky install",
         "addReferenceTag": "node .husky/addReferenceTag.js",

From 1e9158b723f4df57b30d5f7ab14b81b5cbae8ae3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 1 Mar 2025 09:46:02 +0100
Subject: [PATCH 6/9] revert: browser chromium package.json

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 709d17f40..1361d1fd8 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
         "resetDatabase": "cd ../salix && gulp docker",
         "lint": "eslint --ext .js,.vue ./",
         "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
-        "test:e2e": "cypress open --browser chromium",
-        "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run --browser chromium",
+        "test:e2e": "cypress open",
+        "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
         "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
         "test:front": "vitest",
         "test:front:ci": "vitest run",

From 15969eff43befda19e24ea03a91e96784f736e69 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 1 Mar 2025 09:46:21 +0100
Subject: [PATCH 7/9] ci: replace test:unit by test:front

---
 Jenkinsfile | 2 +-
 README.md   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a52a9e91d..ea3f1b439 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -94,7 +94,7 @@ pipeline {
             parallel {
                 stage('Unit') {
                     steps {
-                        sh 'pnpm run test:unit:ci'
+                        sh 'pnpm run test:front:ci'
                     }
                     post {
                         always {
diff --git a/README.md b/README.md
index e87a84d60..262e12e58 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ quasar dev
 ### Run unit tests
 
 ```bash
-pnpm run test:unit
+pnpm run test:front
 ```
 
 ### Run e2e tests

From 2d316b3721ac2a53560818800f6856c06fb98bc7 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Sat, 1 Mar 2025 20:57:03 +0100
Subject: [PATCH 8/9] feat: refs #8697 enable data-cy attribute for VnTable,
 update test cases to remove skips and adjust selectors

---
 src/components/VnTable/VnTable.vue                 | 1 +
 src/pages/Entry/Card/EntryBuys.vue                 | 1 -
 test/cypress/integration/entry/entryList.spec.js   | 2 +-
 test/cypress/integration/entry/stockBought.spec.js | 4 ++--
 test/cypress/integration/ticket/ticketList.spec.js | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index dd2cefd89..7e9f7aae0 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -681,6 +681,7 @@ const rowCtrlClickFunction = computed(() => {
                 @update:selected="emit('update:selected', $event)"
                 @selection="(details) => handleSelection(details, rows)"
                 :hide-selected-banner="true"
+                :data-cy="$props.dataCy ?? 'vnTable'"
             >
                 <template #top-left v-if="!$props.withoutHeader">
                     <slot name="top-left"> </slot>
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 6e67c31ed..684ed5f59 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -656,7 +656,6 @@ onMounted(() => {
         :without-header="!editableMode"
         :with-filters="editableMode"
         :right-search="editableMode"
-        :right-search-icon="true"
         :row-click="false"
         :columns="columns"
         :beforeSaveFn="beforeSave"
diff --git a/test/cypress/integration/entry/entryList.spec.js b/test/cypress/integration/entry/entryList.spec.js
index bdaa66f79..d43ec895a 100644
--- a/test/cypress/integration/entry/entryList.spec.js
+++ b/test/cypress/integration/entry/entryList.spec.js
@@ -1,4 +1,4 @@
-describe.skip('Entry', () => {
+describe('Entry', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('buyer');
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
index 87cbb3f9c..2a8431cf0 100644
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -16,9 +16,9 @@ describe.skip('EntryStockBought', () => {
         cy.get('input[aria-label="Reserve"]').type('1');
         cy.get('input[aria-label="Date"]').eq(1).clear();
         cy.get('input[aria-label="Date"]').eq(1).type('01-01');
-        cy.get('input[aria-label="Buyer"]').type('buyerBossNick');
+        cy.get('input[aria-label="Buyer"]').type('itNick');
         cy.get('div[role="listbox"] > div > div[role="option"]')
-            .eq(0)
+            .eq(1)
             .should('be.visible')
             .click();
 
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 1c96b027f..593021e6e 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe.skip('TicketList', () => {
+describe('TicketList', () => {
     const firstRow = 'tbody > :nth-child(1)';
 
     beforeEach(() => {

From e4f83de123732449b6f3d8757fff4f4ce7db5deb Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Sun, 2 Mar 2025 00:15:24 +0100
Subject: [PATCH 9/9] test: refs #8697 enable EntryStockBought test suite by
 removing skip

---
 test/cypress/integration/entry/stockBought.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
index 2a8431cf0..91e0d507e 100644
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -1,4 +1,4 @@
-describe.skip('EntryStockBought', () => {
+describe('EntryStockBought', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('buyer');