From 4e3ed33a48d5a67ef48f49426818c30d98c60def Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= <loikeseke@gmail.com>
Date: Wed, 15 Jan 2025 18:23:29 +0100
Subject: [PATCH] feat(ui, webserver): rename "Change status" to "Change state"
 and enhance the infos

---
 ui/src/components/executions/ChangeStatus.vue |  4 ++--
 ui/src/translations/de.json                   |  1 -
 ui/src/translations/en.json                   |  4 ++--
 ui/src/translations/es.json                   |  1 -
 ui/src/translations/fr.json                   |  1 -
 ui/src/translations/hi.json                   |  1 -
 ui/src/translations/it.json                   |  1 -
 ui/src/translations/ja.json                   |  1 -
 ui/src/translations/ko.json                   |  1 -
 ui/src/translations/pl.json                   |  1 -
 ui/src/translations/pt.json                   |  1 -
 ui/src/translations/ru.json                   |  1 -
 ui/src/translations/zh_CN.json                |  1 -
 .../controllers/api/ExecutionController.java  | 24 +++++++++----------
 14 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/ui/src/components/executions/ChangeStatus.vue b/ui/src/components/executions/ChangeStatus.vue
index ab8c231929d..69fee6276ca 100644
--- a/ui/src/components/executions/ChangeStatus.vue
+++ b/ui/src/components/executions/ChangeStatus.vue
@@ -5,7 +5,7 @@
         @click="visible = !visible"
         :disabled="!enabled"
     >
-        <span v-if="component !== 'el-button'">{{ $t('change_status') }}</span>
+        <span v-if="component !== 'el-button'">{{ $t('change state') }}</span>
 
         <el-dialog v-if="enabled && visible" v-model="visible" :id="uuid" destroy-on-close :append-to-body="true">
             <template #header>
@@ -16,7 +16,7 @@
                 <p v-html="$t('change state confirm', {id: execution.id, task: taskRun.taskId})" />
 
                 <p>
-                    Current status is : <status size="small" class="me-1" :status="taskRun.state.current" />
+                    {{ $t('change state current state') }} <status size="small" class="me-1" :status="taskRun.state.current" />
                 </p>
 
                 <el-select
diff --git a/ui/src/translations/de.json b/ui/src/translations/de.json
index 4bc8f97ea44..56e968665d1 100644
--- a/ui/src/translations/de.json
+++ b/ui/src/translations/de.json
@@ -886,7 +886,6 @@
     "concurrency": "Nebenläufigkeit",
     "open sidebar": "Seitenleiste öffnen",
     "close sidebar": "Seitenleiste schließen",
-    "change_status": "Status ändern",
     "in-our-documentation": "in unserer Dokumentation.",
     "read-more": "Mehr erfahren über",
     "flow-dependencies": "Abhängigkeiten",
diff --git a/ui/src/translations/en.json b/ui/src/translations/en.json
index 620147db228..acf9f36f98d 100644
--- a/ui/src/translations/en.json
+++ b/ui/src/translations/en.json
@@ -185,7 +185,8 @@
     "current": "current",
     "change state": "Change state",
     "change state done": "Task state has been updated",
-    "change state confirm": "Are you sure you want to change the task run state for the <code>{task}</code> task in execution <code>{id}</code>?",
+    "change state confirm": "Are you sure you want to change the task run state for the <code>{task}</code> task in execution <code>{id}</code>?<br/>It will then restart the execution from the next task and restart the parent execution if any.",
+    "change state current state": "Current status is:",
     "change state hint": {
       "WARNING": [
         "The flow will be marked as WARNING.",
@@ -975,7 +976,6 @@
     },
     "open sidebar": "open sidebar",
     "close sidebar": "close sidebar",
-    "change_status": "Change status",
     "files": "Files",
     "optional": "Optional",
     "no_data": "Looks like there's nothing here… yet!<br/>Adjust your filters, or give it another go!",
diff --git a/ui/src/translations/es.json b/ui/src/translations/es.json
index d2980f26328..bdf2118ccc9 100644
--- a/ui/src/translations/es.json
+++ b/ui/src/translations/es.json
@@ -886,7 +886,6 @@
     "concurrency": "Concurrente",
     "open sidebar": "abrir barra lateral",
     "close sidebar": "cerrar barra lateral",
-    "change_status": "Cambiar estado",
     "in-our-documentation": "en nuestra documentación.",
     "read-more": "Leer más sobre",
     "flow-dependencies": "dependencias",
diff --git a/ui/src/translations/fr.json b/ui/src/translations/fr.json
index 2e7611a2ed4..1122e77eafe 100644
--- a/ui/src/translations/fr.json
+++ b/ui/src/translations/fr.json
@@ -886,7 +886,6 @@
     "concurrency": "Concurrence",
     "open sidebar": "ouvrir la barre latérale",
     "close sidebar": "fermer la barre latérale",
-    "change_status": "Changer le statut",
     "in-our-documentation": "dans notre documentation.",
     "read-more": "En savoir plus sur",
     "flow-dependencies": "dépendances",
diff --git a/ui/src/translations/hi.json b/ui/src/translations/hi.json
index 920957aaf42..d23dc3b606d 100644
--- a/ui/src/translations/hi.json
+++ b/ui/src/translations/hi.json
@@ -886,7 +886,6 @@
     "concurrency": "समानांतरता",
     "open sidebar": "साइडबार खोलें",
     "close sidebar": "साइडबार बंद करें",
-    "change_status": "स्थिति बदलें",
     "in-our-documentation": "हमारे दस्तावेज़ में।",
     "read-more": "और अधिक पढ़ें",
     "flow-dependencies": "निर्भरता",
diff --git a/ui/src/translations/it.json b/ui/src/translations/it.json
index fe9d85e5fc3..861a799eac2 100644
--- a/ui/src/translations/it.json
+++ b/ui/src/translations/it.json
@@ -886,7 +886,6 @@
     "concurrency": "Concurrency",
     "open sidebar": "apri barra laterale",
     "close sidebar": "chiudi barra laterale",
-    "change_status": "Cambia stato",
     "in-our-documentation": "nella nostra documentazione.",
     "read-more": "Leggi di più su",
     "flow-dependencies": "dipendenze",
diff --git a/ui/src/translations/ja.json b/ui/src/translations/ja.json
index 45ae59595e2..b4fa5f00e42 100644
--- a/ui/src/translations/ja.json
+++ b/ui/src/translations/ja.json
@@ -886,7 +886,6 @@
     "concurrency": "並行性",
     "open sidebar": "サイドバーを開く",
     "close sidebar": "サイドバーを閉じる",
-    "change_status": "ステータスを変更",
     "in-our-documentation": "ドキュメント内で。",
     "read-more": "続きを読む",
     "flow-dependencies": "依存関係",
diff --git a/ui/src/translations/ko.json b/ui/src/translations/ko.json
index ae675146303..a90fd977413 100644
--- a/ui/src/translations/ko.json
+++ b/ui/src/translations/ko.json
@@ -886,7 +886,6 @@
     "concurrency": "동시성",
     "open sidebar": "사이드바 열기",
     "close sidebar": "사이드바 닫기",
-    "change_status": "상태 변경",
     "in-our-documentation": "우리의 문서에서.",
     "read-more": "자세히 알아보기",
     "flow-dependencies": "종속성",
diff --git a/ui/src/translations/pl.json b/ui/src/translations/pl.json
index 12c9de748aa..d11d20a950b 100644
--- a/ui/src/translations/pl.json
+++ b/ui/src/translations/pl.json
@@ -886,7 +886,6 @@
     "concurrency": "Współbieżność",
     "open sidebar": "otwórz pasek boczny",
     "close sidebar": "zamknij pasek boczny",
-    "change_status": "Zmień status",
     "in-our-documentation": "w naszej dokumentacji.",
     "read-more": "Czytaj więcej o",
     "flow-dependencies": "zależności",
diff --git a/ui/src/translations/pt.json b/ui/src/translations/pt.json
index 5c19efad461..9bbc0b8a663 100644
--- a/ui/src/translations/pt.json
+++ b/ui/src/translations/pt.json
@@ -886,7 +886,6 @@
     "concurrency": "Concorrência",
     "open sidebar": "abrir barra lateral",
     "close sidebar": "fechar barra lateral",
-    "change_status": "Alterar status",
     "in-our-documentation": "na nossa documentação.",
     "read-more": "Leia mais sobre",
     "flow-dependencies": "dependências",
diff --git a/ui/src/translations/ru.json b/ui/src/translations/ru.json
index b0293a14c9d..bd2c1d9a4f1 100644
--- a/ui/src/translations/ru.json
+++ b/ui/src/translations/ru.json
@@ -886,7 +886,6 @@
     "concurrency": "Конкурентность",
     "open sidebar": "открыть боковую панель",
     "close sidebar": "закрыть боковую панель",
-    "change_status": "Изменить статус",
     "in-our-documentation": "в нашей документации.",
     "read-more": "Узнать больше о",
     "flow-dependencies": "зависимости",
diff --git a/ui/src/translations/zh_CN.json b/ui/src/translations/zh_CN.json
index dc58b05b6e4..5915c9ae48e 100644
--- a/ui/src/translations/zh_CN.json
+++ b/ui/src/translations/zh_CN.json
@@ -886,7 +886,6 @@
     "concurrency": "并发",
     "open sidebar": "打开侧边栏",
     "close sidebar": "关闭侧边栏",
-    "change_status": "更改状态",
     "in-our-documentation": "在我们的文档中。",
     "read-more": "了解更多关于",
     "flow-dependencies": "依赖项",
diff --git a/webserver/src/main/java/io/kestra/webserver/controllers/api/ExecutionController.java b/webserver/src/main/java/io/kestra/webserver/controllers/api/ExecutionController.java
index 33777dbe6cf..9e3a4e680c1 100644
--- a/webserver/src/main/java/io/kestra/webserver/controllers/api/ExecutionController.java
+++ b/webserver/src/main/java/io/kestra/webserver/controllers/api/ExecutionController.java
@@ -965,13 +965,13 @@ public static class StateRequest {
 
     @ExecuteOn(TaskExecutors.IO)
     @Post(uri = "/{executionId}/change-status")
-    @Operation(tags = {"Executions"}, summary = "Change the status of an execution")
+    @Operation(tags = {"Executions"}, summary = "Change the state of an execution")
     public Execution changeStatus(
         @Parameter(description = "The execution id") @PathVariable String executionId,
-        @Parameter(description = "The new status of the execution") @NotNull @QueryValue State.Type status
+        @Parameter(description = "The new state of the execution") @NotNull @QueryValue State.Type status
     ) throws QueueException {
         if (!status.isTerminated()) {
-            throw new IllegalArgumentException("You can only change the status of an execution to a terminal state.");
+            throw new IllegalArgumentException("You can only change the state of an execution to a terminal state.");
         }
 
         Optional<Execution> execution = executionRepository.findById(tenantService.resolveTenant(), executionId);
@@ -980,7 +980,7 @@ public Execution changeStatus(
         }
 
         if (!execution.get().getState().isTerminated()) {
-            throw new IllegalArgumentException("You can only change the status of a terminated execution.");
+            throw new IllegalArgumentException("You can only change the state of a terminated execution.");
         }
 
         Execution updated = execution.get().withState(status);
@@ -993,15 +993,15 @@ public Execution changeStatus(
 
     @ExecuteOn(TaskExecutors.IO)
     @Post(uri = "/change-status/by-ids")
-    @Operation(tags = {"Executions"}, summary = "Change status of executions by id")
+    @Operation(tags = {"Executions"}, summary = "Change executions state by id")
     @ApiResponse(responseCode = "200", description = "On success", content = {@Content(schema = @Schema(implementation = BulkResponse.class))})
-    @ApiResponse(responseCode = "422", description = "Changed status with errors", content = {@Content(schema = @Schema(implementation = BulkErrorResponse.class))})
+    @ApiResponse(responseCode = "422", description = "Changed state with errors", content = {@Content(schema = @Schema(implementation = BulkErrorResponse.class))})
     public HttpResponse<?> changeStatusById(
         @Parameter(description = "The execution id") @Body List<String> executionsId,
-        @Parameter(description = "The new status of the executions") @NotNull @QueryValue State.Type newStatus
+        @Parameter(description = "The new state of the executions") @NotNull @QueryValue State.Type newStatus
     ) throws QueueException {
         if (!newStatus.isTerminated()) {
-            throw new IllegalArgumentException("You can only change the status of an execution to a terminal state.");
+            throw new IllegalArgumentException("You can only change the state of an execution to a terminal state.");
         }
 
         List<Execution> executions = new ArrayList<>();
@@ -1033,7 +1033,7 @@ public HttpResponse<?> changeStatusById(
         if (!invalids.isEmpty()) {
             return HttpResponse.badRequest(BulkErrorResponse
                 .builder()
-                .message("invalid bulk change execution status")
+                .message("invalid bulk change executions state")
                 .invalids(invalids)
                 .build()
             );
@@ -1051,9 +1051,9 @@ public HttpResponse<?> changeStatusById(
 
     @ExecuteOn(TaskExecutors.IO)
     @Post(uri = "/change-status/by-query")
-    @Operation(tags = {"Executions"}, summary = "Change executions status by query parameters")
+    @Operation(tags = {"Executions"}, summary = "Change executions state by query parameters")
     @ApiResponse(responseCode = "200", description = "On success", content = {@Content(schema = @Schema(implementation = BulkResponse.class))})
-    @ApiResponse(responseCode = "422", description = "Changed status with errors", content = {@Content(schema = @Schema(implementation = BulkErrorResponse.class))})
+    @ApiResponse(responseCode = "422", description = "Changed state with errors", content = {@Content(schema = @Schema(implementation = BulkErrorResponse.class))})
     public HttpResponse<?> changeStatusByQuery(
         @Parameter(description = "A string filter") @Nullable @QueryValue(value = "q") String query,
         @Parameter(description = "The scope of the executions to include") @Nullable @QueryValue(value = "scope") List<FlowScope> scope,
@@ -1069,7 +1069,7 @@ public HttpResponse<?> changeStatusByQuery(
         @Parameter(description = "A labels filter as a list of 'key:value'") @Nullable @QueryValue @Format("MULTI") List<String> labels,
         @Parameter(description = "The trigger execution id") @Nullable @QueryValue String triggerExecutionId,
         @Parameter(description = "A execution child filter") @Nullable @QueryValue ExecutionRepositoryInterface.ChildFilter childFilter,
-        @Parameter(description = "The new status of the executions") @NotNull @QueryValue State.Type newStatus
+        @Parameter(description = "The new state of the executions") @NotNull @QueryValue State.Type newStatus
     ) throws QueueException {
         validateTimeline(startDate, endDate);