From 86244b74c4b6d86c536b3561fe91682238a56abe Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 5 Mar 2025 10:03:44 +0100 Subject: [PATCH 1/2] fix: fixed select not filtering when typing --- src/pages/Zone/Card/ZoneBasicData.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue index 089208453..2f771642e 100644 --- a/src/pages/Zone/Card/ZoneBasicData.vue +++ b/src/pages/Zone/Card/ZoneBasicData.vue @@ -120,11 +120,10 @@ const setFilteredAddresses = (data) => { option-label="nickname" :options="addresses" :fields="['id', 'nickname']" - sort-by="id" + sort-by="nickname ASC" hide-selected map-options :rules="validate('data.addressFk')" - :filter-options="['id']" /> From b65a5f107624fc9c4b0a567ae45f434b729b2952 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 5 Mar 2025 13:52:57 +0100 Subject: [PATCH 2/2] fix: update Jenkinsfile to use environment variable for Docker registry credentials --- Jenkinsfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e6647a654..6261db6ee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -108,6 +108,7 @@ pipeline { } stage('E2E') { environment { + CREDS = credentials('docker-registry') COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}" COMPOSE_PARAMS = "-p ${env.COMPOSE_PROJECT} -f test/cypress/docker-compose.yml --project-directory ." } @@ -115,9 +116,10 @@ pipeline { script { sh 'rm junit/e2e-*.xml || true' env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev' - withDockerRegistry([credentialsId: 'docker-registry', url: "https://${env.REGISTRY}" ]) { - sh "docker-compose ${env.COMPOSE_PARAMS} up -d" - } + + sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY' + sh "docker-compose ${env.COMPOSE_PARAMS} up -d" + def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs') image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ") { sh 'cypress run --browser chromium || true'