From 7d51465e0372d095486d47b6afd206e18dffa4a8 Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 17 Apr 2025 15:02:35 +0200 Subject: [PATCH 1/3] fix(VnSelect): warning and error isLoading --- src/components/common/VnSelect.vue | 2 +- src/composables/useArrayData.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue index edbee94b2..c019fbd15 100644 --- a/src/components/common/VnSelect.vue +++ b/src/components/common/VnSelect.vue @@ -184,7 +184,7 @@ onMounted(() => { if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300); }); -const someIsLoading = computed(() => isLoading.value || arrayData?.isLoading?.value); +const someIsLoading = computed(() => isLoading.value || !!arrayData?.isLoading?.value); function findKeyInOptions() { if (!$props.options) return; return filter($props.modelValue, $props.options)?.length; diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js index 2e880a16d..9828b35ae 100644 --- a/src/composables/useArrayData.js +++ b/src/composables/useArrayData.js @@ -1,4 +1,4 @@ -import { onMounted, computed } from 'vue'; +import { onMounted, computed, ref } from 'vue'; import { useRouter, useRoute } from 'vue-router'; import axios from 'axios'; import { useArrayDataStore } from 'stores/useArrayDataStore'; @@ -346,7 +346,7 @@ export function useArrayData(key, userOptions) { } const totalRows = computed(() => (store.data && store.data.length) || 0); - const isLoading = computed(() => store.isLoading || false); + const isLoading = ref(store.isLoading || false); return { fetch, From 5fa5776ee71d7b25f6054c31abbbb247a2b831aa Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 17 Apr 2025 15:08:30 +0200 Subject: [PATCH 2/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 3/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}'"