From b9566d14d20b80fb5c606086aada6d9621ff07e4 Mon Sep 17 00:00:00 2001 From: Remi PLANEL <rplanel@pasteur.fr> Date: Fri, 22 Dec 2023 11:39:49 +0100 Subject: [PATCH] handle strcture data copy in deplo --- .gitlab-ci.yml | 9 +++++++++ components/content/MolstarPdbePlugin.vue | 14 ++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e82aaa38..4d7cad01 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -468,6 +468,15 @@ load-website:prod: --set env="${ENV:-development}" --values deploy/df-wiki/values.yaml --values deploy/df-wiki/values.${ENV:-development}.yaml + - kubectl --namespace ${NAMESPACE} wait pod -l "app.kubernetes.io/name=df-wiki" --for condition=Ready --timeout=600s + - echo "Wiki pod is ready" + - WIKI_POD=$(kubectl --namespace ${NAMESPACE} get pods -l "app.kubernetes.io/name=df-wiki" --output jsonpath='{.items[0].metadata.name}') + - echo ${WIKI_POD} + - kubectl --namespace ${NAMESPACE} cp .output/public/ ${WIKI_POD}:/website + - kubectl --namespace ${NAMESPACE} cp scripts/copy-structure-data.sh ${WIKI_POD}:/structure-data/sanitized-dump + - kubectl --namespace ${NAMESPACE} exec ${WIKI_POD} -- bash -c 'cd /structure-data/sanitized-dump && bash copy-structure-data.sh' + + deploy:dev: extends: .deploy diff --git a/components/content/MolstarPdbePlugin.vue b/components/content/MolstarPdbePlugin.vue index aa034479..87903b6f 100644 --- a/components/content/MolstarPdbePlugin.vue +++ b/components/content/MolstarPdbePlugin.vue @@ -165,10 +165,12 @@ const moleculeFormat: Ref<string> = ref("pdb") </v-row> </template> <v-row v-else> - <span class="d-flex flex-wrap align-center justify-center"> - <v-select v-model="selectedPdb" label="Select PDB" :items="refinedDataUrls" hide-details="auto"> - </v-select> - </span> + <v-col> + <span class="d-flex flex-wrap align-center justify-center"> + <v-select v-model="selectedPdb" label="Select PDB" :items="refinedDataUrls" hide-details="auto"> + </v-select> + </span> + </v-col> </v-row> <v-dialog v-model="dialog" transition="dialog-bottom-transition" fullscreen :scrim="false"> <v-card flat :rounded="false"> @@ -256,12 +258,12 @@ const moleculeFormat: Ref<string> = ref("pdb") </template> -<style scoped> +<style> .msp-plugin .msp-plugin-content { color: black !important; } -.msp-layout-expanded { +div.msp-plugin-content.msp-layout-expanded { z-index: 99 !important } -- GitLab