verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 84 Releases Wiki Activity

Merge branch 'test' into warmifx_select_scroll
gitea/salix-front/pipeline/pr-test This commit looks good Details

This commit is contained in:
Alex Moreno 2025-04-22 10:32:38 +00:00
parent 4033dd472d 2d60ed5522
commit 4da9d7b262
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -125,7 +125,7 @@ pipeline {
sh "docker-compose ${env.COMPOSE_PARAMS} pull db" sh "docker-compose ${env.COMPOSE_PARAMS} pull db"
sh "docker-compose ${env.COMPOSE_PARAMS} up -d" 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}" echo "E2E MODULES: ${modules}"
image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") { image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
sh "sh test/cypress/docker/cypressParallel.sh 1 '${modules}'" sh "sh test/cypress/docker/cypressParallel.sh 1 '${modules}'"

2
src/components/common/VnSelect.vue
View File

@ -184,7 +184,7 @@ onMounted(() => {
if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300); 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() { function findKeyInOptions() {
if (!$props.options) return; if (!$props.options) return;
return filter($props.modelValue, $props.options)?.length; return filter($props.modelValue, $props.options)?.length;

4
src/composables/useArrayData.js
View File

@ -1,4 +1,4 @@
import { onMounted, computed } from 'vue'; import { onMounted, computed, ref } from 'vue';
import { useRouter, useRoute } from 'vue-router'; import { useRouter, useRoute } from 'vue-router';
import axios from 'axios'; import axios from 'axios';
import { useArrayDataStore } from 'stores/useArrayDataStore'; import { useArrayDataStore } from 'stores/useArrayDataStore';
@ -346,7 +346,7 @@ export function useArrayData(key, userOptions) {
} }
const totalRows = computed(() => (store.data && store.data.length) || 0); const totalRows = computed(() => (store.data && store.data.length) || 0);
const isLoading = computed(() => store.isLoading || false); const isLoading = ref(store.isLoading || false);
return { return {
fetch, fetch,

3
test/cypress/docker/find/find.js
View File

@ -6,6 +6,9 @@ const FINDED_PATHS = ['src', E2E_PATH];
function getGitDiff(options) { function getGitDiff(options) {
const TARGET_BRANCH = options[2] || 'dev'; 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}`, { const diff = execSync(`git diff --name-only origin/${TARGET_BRANCH}`, {
encoding: 'utf-8', encoding: 'utf-8',
}); });