From 5ba8a153169542d3efab62d0c11d612f4c1af7ff Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 8 Jun 2023 10:25:25 +0200
Subject: [PATCH] refs #5809 deploy 232401 dev in test

---
 CHANGELOG.md                                  |  6 ++---
 Dockerfile                                    |  4 +--
 Jenkinsfile                                   |  8 +++---
 .../00-ticket_warehouse.sql                   |  0
 e2e/paths/06-claim/05_summary.spec.js         |  6 ++++-
 .../order/front/catalog-search-panel/index.js |  4 +--
 modules/order/front/catalog/index.html        | 26 +++++++++----------
 package-lock.json                             |  4 +--
 webpack.config.js                             |  2 +-
 9 files changed, 32 insertions(+), 28 deletions(-)
 rename db/changes/{232201 => 232401}/00-ticket_warehouse.sql (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92c4ee3aa..4f2c0e6e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,11 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [2324.01] - 2023-06-08
 
 ### Added
--
-
+- (Tickets -> Abono) Al abonar permite crear el ticket abono con almacén o sin almmacén
+- (General -> Desplegables) Mejorada eficiencia de carga de datos
 
 ### Changed
--
+- (General -> Permisos) Mejorada seguridad
 
 ### Fixed
 -
diff --git a/Dockerfile b/Dockerfile
index ee87cd0d0..e1173ad73 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,9 +11,9 @@ RUN apt-get update \
         ca-certificates \
         gnupg2 \
         graphicsmagick \
-    && curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
+    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     && apt-get install -y --no-install-recommends nodejs \
-    && npm install -g npm@8.19.2
+    && npm install -g npm@9.6.6
 
 # Puppeteer
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 5f329ee61..cf9b8cd67 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,7 +39,7 @@ pipeline {
                 NODE_ENV = ""
             }
             steps {
-                nodejs('node-v14') {
+                nodejs('node-v20') {
                     sh 'npm install --no-audit --prefer-offline'
                     sh 'gulp install --ci'
                 }
@@ -57,14 +57,14 @@ pipeline {
             parallel {
                 stage('Frontend') {
                     steps {
-                        nodejs('node-v14') {
+                        nodejs('node-v20') {
                             sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=2'
                         }
                     }
                 }
                 stage('Backend') {
                     steps {
-                        nodejs('node-v14') {
+                        nodejs('node-v20') {
                             sh 'npm run test:back:ci'
                         }
                     }
@@ -80,7 +80,7 @@ pipeline {
                 CREDENTIALS = credentials('docker-registry')
             }
             steps {
-                nodejs('node-v14') {
+                nodejs('node-v20') {
                     sh 'gulp build'
                 }
 
diff --git a/db/changes/232201/00-ticket_warehouse.sql b/db/changes/232401/00-ticket_warehouse.sql
similarity index 100%
rename from db/changes/232201/00-ticket_warehouse.sql
rename to db/changes/232401/00-ticket_warehouse.sql
diff --git a/e2e/paths/06-claim/05_summary.spec.js b/e2e/paths/06-claim/05_summary.spec.js
index 9656ea656..1333ed01a 100644
--- a/e2e/paths/06-claim/05_summary.spec.js
+++ b/e2e/paths/06-claim/05_summary.spec.js
@@ -49,7 +49,11 @@ describe('Claim summary path', () => {
     });
 
     it(`should click on the first sale ID making the item descriptor visible`, async() => {
-        await page.waitToClick(selectors.claimSummary.firstSaleItemId);
+        const firstItem = selectors.claimSummary.firstSaleItemId;
+        await page.evaluate(selectors => {
+            document.querySelector(selectors).scrollIntoView();
+        }, firstItem);
+        await page.click(firstItem);
         await page.waitImgLoad(selectors.claimSummary.firstSaleDescriptorImage);
         const visible = await page.isVisible(selectors.claimSummary.itemDescriptorPopover);
 
diff --git a/modules/order/front/catalog-search-panel/index.js b/modules/order/front/catalog-search-panel/index.js
index ed0af1d6e..21c0c50fa 100644
--- a/modules/order/front/catalog-search-panel/index.js
+++ b/modules/order/front/catalog-search-panel/index.js
@@ -23,7 +23,7 @@ class Controller extends SearchPanel {
 
     addValue() {
         this.filter.values.push({});
-        setTimeout(() => this.popover.relocate());
+        setTimeout(() => this.parentPopover.relocate());
     }
 
     changeTag() {
@@ -36,7 +36,7 @@ ngModule.vnComponent('vnOrderCatalogSearchPanel', {
     controller: Controller,
     bindings: {
         onSubmit: '&?',
-        popover: '<?',
+        parentPopover: '<?',
         resultTags: '<?'
     }
 });
diff --git a/modules/order/front/catalog/index.html b/modules/order/front/catalog/index.html
index 2862f3f9d..0f7928c8b 100644
--- a/modules/order/front/catalog/index.html
+++ b/modules/order/front/catalog/index.html
@@ -18,7 +18,7 @@
     </vn-searchbar>
 </vn-portal>
 <vn-order-catalog-view
-    model="model" 
+    model="model"
     order="$ctrl.order">
 </vn-order-catalog-view>
 <vn-side-menu side="right">
@@ -31,7 +31,7 @@
             label="Category">
         </vn-autocomplete>
         <vn-one ng-repeat="category in categories">
-            <vn-icon 
+            <vn-icon
                 ng-class="{'active': $ctrl.categoryId == category.id}"
                 icon="{{::category.icon}}"
                 vn-tooltip="{{::category.name}}"
@@ -83,7 +83,7 @@
         </div>
     </vn-vertical>
     <vn-vertical class="input vn-pt-md">
-        <vn-textfield vn-one 
+        <vn-textfield vn-one
             vn-id="search"
             ng-keyUp="$ctrl.onSearchByTag($event)"
             label="Search tag">
@@ -104,20 +104,20 @@
         on-close="$ctrl.onPopoverClose()">
         <vn-order-catalog-search-panel
             on-submit="$ctrl.onPanelSubmit($filter)"
-            popover="popover"
+            parent-popover="popover"
             result-tags="$ctrl.resultTags">
         </vn-order-catalog-search-panel>
     </vn-popover>
     <div class="chips">
-        <vn-chip 
+        <vn-chip
             ng-if="$ctrl.itemId"
             removable="true"
             vn-tooltip="Item id"
             on-remove="$ctrl.removeItemId()"
-            class="colored"> 
+            class="colored">
             <span>Id: {{$ctrl.itemId}}</span>
         </vn-chip>
-        <vn-chip 
+        <vn-chip
             ng-if="$ctrl.itemName"
             removable="true"
             vn-tooltip="Item"
@@ -130,20 +130,20 @@
                 <span>{{$ctrl.itemName}}</span>
             </div>
         </vn-chip>
-        <vn-chip 
+        <vn-chip
             ng-if="category.selection"
             removable="true"
             vn-tooltip="Category"
             on-remove="$ctrl.categoryId = null"
-            class="colored"> 
+            class="colored">
             <span translate>{{category.selection.name}}</span>
         </vn-chip>
-        <vn-chip 
+        <vn-chip
             ng-if="type.selection"
             removable="true"
             vn-tooltip="Type"
             on-remove="$ctrl.typeId = null"
-            class="colored"> 
+            class="colored">
             <span translate>{{type.selection.name}}</span>
         </vn-chip>
         <vn-chip
@@ -151,7 +151,7 @@
             removable="true"
             on-remove="$ctrl.remove($index)"
             vn-tooltip="{{::$ctrl.formatTooltip(tagGroup)}}"
-            class="colored"> 
+            class="colored">
             <div>
                 <span ng-if="::tagGroup.tagFk">
                     <span translate>{{::tagGroup.tagSelection.name}}</span>:
@@ -163,4 +163,4 @@
             </div>
         </vn-chip>
     </div>
-</vn-side-menu>
\ No newline at end of file
+</vn-side-menu>
diff --git a/package-lock.json b/package-lock.json
index a224c4bb3..4ed50e256 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "salix-back",
-    "version": "23.22.01",
+    "version": "23.24.01",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "salix-back",
-            "version": "23.22.01",
+            "version": "23.24.01",
             "license": "GPL-3.0",
             "dependencies": {
                 "axios": "^1.2.2",
diff --git a/webpack.config.js b/webpack.config.js
index 7a94b993d..a102b838e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -9,7 +9,7 @@ let mode = env == 'development' ? env : 'production';
 
 let baseConfig = {
     entry: {salix: 'salix'},
-    mode: mode,
+    mode,
     output: {
         path: path.join(__dirname, 'dist'),
         publicPath: '/'