From 5fa5776ee71d7b25f6054c31abbbb247a2b831aa Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 17 Apr 2025 15:08:30 +0200 Subject: [PATCH 1/3] fix: ensure git fetch is executed with the correct encoding in getGitDiff function --- test/cypress/docker/find/find.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/cypress/docker/find/find.js b/test/cypress/docker/find/find.js index 4f8063c86..9570dafaa 100644 --- a/test/cypress/docker/find/find.js +++ b/test/cypress/docker/find/find.js @@ -6,6 +6,9 @@ const FINDED_PATHS = ['src', E2E_PATH]; function getGitDiff(options) { const TARGET_BRANCH = options[2] || 'dev'; + execSync(`git fetch origin ${TARGET_BRANCH}`, { + encoding: 'utf-8', + }); const diff = execSync(`git diff --name-only origin/${TARGET_BRANCH}`, { encoding: 'utf-8', }); From 83a0a1ab5d074bd26392e31da390cf422ad0b536 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 22 Apr 2025 08:25:53 +0200 Subject: [PATCH 2/3] fix: pass COMPOSE_TAG to find.js script for E2E module detection --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a9db9d369..59bf09e22 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -125,7 +125,7 @@ pipeline { sh "docker-compose ${env.COMPOSE_PARAMS} pull db" sh "docker-compose ${env.COMPOSE_PARAMS} up -d" - def modules = sh(script: 'node test/cypress/docker/find/find.js', returnStdout: true).trim() + def modules = sh(script: "node test/cypress/docker/find/find.js ${env.COMPOSE_TAG}", returnStdout: true).trim() echo "E2E MODULES: ${modules}" image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") { sh "sh test/cypress/docker/cypressParallel.sh 1 '${modules}'" From 4033dd472da54fb11a72fbf2bc201fa5e02d8528 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Tue, 22 Apr 2025 11:22:18 +0200 Subject: [PATCH 3/3] fix: change disable to readonly for loading state in VnSelect component --- src/components/common/VnSelect.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue index edbee94b2..1bc2f7d1b 100644 --- a/src/components/common/VnSelect.vue +++ b/src/components/common/VnSelect.vue @@ -368,7 +368,7 @@ function getCaption(opt) { hide-bottom-space :input-debounce="useURL ? '300' : '0'" :loading="someIsLoading" - :disable="someIsLoading" + :readonly="someIsLoading" @virtual-scroll="onScroll" @keydown="handleKeyDown" :data-cy="$attrs.dataCy ?? $attrs.label + '_select'"