Skip to content

Commit

Permalink
feat(ui): suggest latest revision when replaying (#963)
Browse files Browse the repository at this point in the history
close #925
  • Loading branch information
Skraye authored Feb 7, 2023
1 parent 277cdd7 commit c0c7f7f
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 17 deletions.
36 changes: 19 additions & 17 deletions ui/src/components/executions/Restart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,30 +19,26 @@
<el-button @click="isOpen = false">
Cancel
</el-button>
<el-button @click="restartLastRevision()">
{{ $t('replay latest revision') }}
</el-button>
<el-button type="primary" @click="restart()">
OK
</el-button>
</template>

<p v-html="$t(replayOrRestart + ' confirm', {id: execution.id})" />

<el-form class="text-muted">
<p>{{ $t("restart change revision") }}</p>
<el-form>
<p class="text-muted">{{ $t("restart change revision") }}</p>
<el-form-item :label="$t('revisions')">
<el-select
v-model="revisionsSelected"
filterable
:persistent="false"
:placeholder="$t('revisions')"
>
<el-select v-model="revisionsSelected">
<el-option
v-for="item in revisionsOptions"
:key="item.value"
:label="item.text"
:value="item.value"
>
{{ item.value }}
</el-option>
/>
</el-select>
</el-form-item>
</el-form>
Expand Down Expand Up @@ -107,6 +103,10 @@
id: this.execution.flowId
})
},
restartLastRevision() {
this.revisionsSelected = this.revisions[this.revisions.length - 1].revision;
this.restart();
},
restart() {
this.isOpen = false
Expand Down Expand Up @@ -145,12 +145,14 @@
return this.isReplay ? "replay" : "restart";
},
revisionsOptions() {
return (this.revisions || []).map((revision) => {
return {
value: revision.revision,
text: revision.revision + (this.sameRevision(revision.revision) ? " (" + this.$t("current") + ")" : ""),
};
});
return (this.revisions || [])
.map((revision) => {
return {
value: revision.revision,
text: revision.revision + (this.sameRevision(revision.revision) ? " (" + this.$t("current") + ")" : ""),
};
})
.reverse();
},
enabled() {
if (this.isReplay && !(this.user && this.user.isAllowed(permission.EXECUTION, action.CREATE, this.execution.namespace))) {
Expand Down
3 changes: 3 additions & 0 deletions ui/src/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
"restart confirm": "Are you sure to restart execution <code>{id}</code>?",
"restart change revision": "You can change the revision that will be used for the new execution.",
"replay": "Replay",
"replay latest revision": "Replay using latest revision",
"replayed": "Execution is replayed",
"replay confirm": "Are you sure to replay this execution <code>{id}</code> and create a new one?",
"current": "current",
Expand Down Expand Up @@ -372,6 +373,7 @@
"restart confirm": "Êtes-vous sur de vouloir relancer <code>{id}</code> ?",
"restart change revision": "Vous pouvez changer la révision qui sera utilisé pour la nouvelle execution relancée.",
"replay": "Rejouer",
"replay latest revision": "Rejouer avec la dernière révision",
"replayed": "Execution est rejouée",
"replay confirm": "Êtes-vous sur de vouloir relancer l'exécution <code>{-id}</code> et créer une nouvelle execution ?",
"current": "actuel",
Expand Down Expand Up @@ -644,6 +646,7 @@
"restart confirm": "Möchten Sie die Ausführung <code>{id}</code> wirklich neu starten?",
"restart change revision": "Sie können die Revision ändern, diese wird für die neue Ausführung verwendet werden.",
"replay": "Wiederholen",
"replay latest revision": "Replay using latest revision",
"replayed": "Ausführung wurde wiederholt",
"replay confirm": "Möchten Sie diese Ausführung <code>{id}</code> wirklich wiederholen und eine neue erstellen?",
"current": "aktuell",
Expand Down

0 comments on commit c0c7f7f

Please sign in to comment.