fix(*): allow deletion of label by setting empty key or empty value (#…

…5452)
kestra-io · Oct 14, 2024 · a95d317 · a95d317
1 parent a47e293
commit a95d317
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/ui/src/components/executions/SetLabels.vue b/ui/src/components/executions/SetLabels.vue
@@ -76,7 +76,8 @@
         methods: {
             setLabels() {
                 const filtered = filterLabels(this.executionLabels)
-
+                console.log("executionLabels", this.executionLabels)
+                console.log("filtered", filtered)
                 if(filtered.error) {
                     this.$toast().error(this.$t("wrong labels"))
                     return;

diff --git a/ui/src/components/executions/utils.ts b/ui/src/components/executions/utils.ts
@@ -9,6 +9,6 @@ interface FilterResult {
 }
 
 export const filterLabels = (labels: Label[]): FilterResult => {
-    const invalid = labels.some(label => label.key === null || label.value === null);
+    const invalid = labels.some(label => label.key === null || label.value === null || label.key === "" || label.value === "");
     return invalid ? {labels, error: true} : {labels};
 };
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
@@ -1594,7 +1594,7 @@ private Execution setLabels(Execution execution, List<Label> labels) {
 
         Execution newExecution = execution
             .toBuilder()
-            .labels(newLabels.entrySet().stream().map(entry -> new Label(entry.getKey(), entry.getValue())).toList())
+            .labels(newLabels.entrySet().stream().map(entry -> new Label(entry.getKey(), entry.getValue())).filter(label -> !label.key().isEmpty() || !label.value().isEmpty()).toList())
             .build();
         eventPublisher.publishEvent(new CrudEvent<>(newExecution, execution, CrudEventType.UPDATE));