From dbfdc5cab3a0c9e4103e0ec79abad503e41af1d7 Mon Sep 17 00:00:00 2001
From: Leah Tacke genannt Unterberg <leah.tgu@pads.rwth-aachen.de>
Date: Wed, 30 Oct 2024 17:21:50 +0100
Subject: [PATCH] fixed two tiny things
---
.gitlab-ci.yml | 2 +-
src/services/presetStore.ts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8e19ac..9414946 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 4190c74..d8de7ef 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},
--
GitLab