Skip to content

Commit

Permalink
fix(ui): ExecutionRoot marge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Skraye committed Mar 12, 2024
1 parent 93feaa7 commit fd9c986
Showing 1 changed file with 23 additions and 14 deletions.
37 changes: 23 additions & 14 deletions ui/src/components/executions/ExecutionRoot.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<li v-if="isAllowedEdit">
<a :href="`${finalApiUrl}/executions/${execution.id}`" target="_blank">
<el-button :icon="Api">
{{ $t('api') }}
{{ $t("api") }}
</el-button>
</a>
</li>
<li v-if="canDelete">
<el-button :icon="Delete" @click="deleteExecution">
{{ $t('delete') }}
{{ $t("delete") }}
</el-button>
</li>
<li v-if="isAllowedEdit">
Expand All @@ -20,14 +20,17 @@
</el-button>
</li>
<li v-if="isAllowedTrigger">
<trigger-flow type="primary" :flow-id="$route.params.flowId" :namespace="$route.params.namespace" />
<trigger-flow type="primary" :flow-id="$route.params.flowId" :namespace="$route.params.namespace"/>
</li>
</ul>
</template>
</top-nav-bar>
<div class="full-space" v-loading="!ready">
<tabs :route-name="$route.params && $route.params.id ? 'executions/update': ''" @follow="follow" :tabs="tabs" v-if="ready" />
</div>
<template v-if="ready">
<tabs :route-name="$route.params && $route.params.id ? 'executions/update': ''" @follow="follow" :tabs="tabs"
/>
</template>
<div v-else class="full-space" v-loading="!ready"/>
</template>
<script setup>
Expand Down Expand Up @@ -71,7 +74,7 @@
this.follow();
window.addEventListener("popstate", this.follow)
},
mounted () {
mounted() {
this.previousExecutionId = this.$route.params.id
},
watch: {
Expand Down Expand Up @@ -105,7 +108,11 @@
) {
this.$store.dispatch(
"flow/loadFlow",
{namespace: execution.namespace, id: execution.flowId, revision: execution.flowRevision}
{
namespace: execution.namespace,
id: execution.flowId,
revision: execution.flowRevision
}
);
this.$store.dispatch("flow/loadRevisions", {
namespace: execution.namespace,
Expand Down Expand Up @@ -169,12 +176,14 @@
];
},
editFlow() {
this.$router.push({name:"flows/update", params: {
namespace: this.$route.params.namespace,
id: this.$route.params.flowId,
tab: "editor",
tenant: this.$route.params.tenant
}})
this.$router.push({
name: "flows/update", params: {
namespace: this.$route.params.namespace,
id: this.$route.params.flowId,
tab: "editor",
tenant: this.$route.params.tenant
}
})
},
deleteExecution() {
if (this.execution) {
Expand Down

0 comments on commit fd9c986

Please sign in to comment.