diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d8e19ac89b0f3247a1db748402cb03f9400385a1..9414946154b77adb93c1dd292c203c6b55717922 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ docker-build: - docker build --pull -t "$DOCKER_IMAGE_NAME" . - docker push "$DOCKER_IMAGE_NAME" - | - if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then + if [[ "$CI_COMMIT_BRANCH" == "release" ]]; then docker tag "$DOCKER_IMAGE_NAME" "$CI_REGISTRY_IMAGE:latest" docker push "$CI_REGISTRY_IMAGE:latest" fi diff --git a/src/services/presetStore.ts b/src/services/presetStore.ts index 4190c7489691caf830efaf3a8150c7a37f812db5..d8de7ef4b3305c8a87190509a065d71240e35f4d 100644 --- a/src/services/presetStore.ts +++ b/src/services/presetStore.ts @@ -67,7 +67,7 @@ export const usePresetStore = defineStore('presets', () => { table_creation: {operation: 'raw', typed_query: view} } as VirtualViewCreation)) - const concept_mappings = [...Object.values(mapping.currentMappings)] + const concept_mappings = [...Object.values(mapping.currentMappings).map(cm => cm.mapping)] const presetEntry: PresetEntry = { props: {title: name.toLocaleUpperCase(), value: name},