diff --git a/Jenkinsfile b/Jenkinsfile index 7d2957a1c..7cad5ef41 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -54,7 +54,6 @@ pipeline { } environment { PROJECT_NAME = 'lilium' - STACK_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}" } stages { stage('Install') { @@ -104,15 +103,18 @@ pipeline { when { expression { PROTECTED_BRANCH } } - environment { - DOCKER_HOST = "${env.SWARM_HOST}" - } steps { script { def packageJson = readJSON file: 'package.json' env.VERSION = packageJson.version } - sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}" + withKubeConfig([ + serverUrl: "$KUBERNETES_API", + credentialsId: 'kubernetes', + namespace: 'lilium' + ]) { + sh 'kubectl set image deployment/lilium-$BRANCH_NAME lilium-$BRANCH_NAME=$REGISTRY/salix-frontend:$VERSION' + } } } } diff --git a/docker-compose.yml b/docker-compose.yml index 6494739f2..df793fc75 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,17 +1,7 @@ version: '3.7' services: main: - image: registry.verdnatura.es/salix-frontend:${BRANCH_NAME:?} + image: registry.verdnatura.es/salix-frontend:${VERSION:?} build: context: . dockerfile: ./Dockerfile - ports: - - 4000 - deploy: - replicas: ${FRONT_REPLICAS:?} - placement: - constraints: - - node.role == worker - resources: - limits: - memory: 1G diff --git a/package.json b/package.json index 38a1d06a3..742fbf276 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "salix-front", - "version": "24.24.0", + "version": "24.24.1", "description": "Salix frontend", "productName": "Salix", "author": "Verdnatura", diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue index 57d1cb19a..ae9a43578 100644 --- a/src/components/ui/CardSummary.vue +++ b/src/components/ui/CardSummary.vue @@ -56,11 +56,20 @@ async function fetch() { } const showRedirectToSummaryIcon = computed(() => { - const routeExists = route.matched.some( - (route) => route.name === `${route.meta.moduleName}Summary` - ); - return !isSummary.value && route.meta.moduleName && routeExists; + const exist = existSummary(route.matched); + return !isSummary.value && route.meta.moduleName && exist; }); + +function existSummary(routes) { + const hasSummary = routes.some((r) => r.name === `${route.meta.moduleName}Summary`); + if (hasSummary) return hasSummary; + for (const current of routes) { + if (current.path != '/' && current.children) { + const exist = existSummary(current.children); + if (exist) return exist; + } + } +}