From a2010b776016db994c4d3a9ba3d9df87880d1467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= <loikeseke@gmail.com>
Date: Tue, 22 Oct 2024 17:16:22 +0200
Subject: [PATCH 1/3] feat(cli,webserver): hidden labels

---
 cli/src/main/resources/application.yml                   | 5 +++++
 .../webserver/controllers/api/ExecutionController.java   | 2 +-
 .../kestra/webserver/controllers/api/MiscController.java | 9 ++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/cli/src/main/resources/application.yml b/cli/src/main/resources/application.yml
index ac1e695eeb..1576eb9083 100644
--- a/cli/src/main/resources/application.yml
+++ b/cli/src/main/resources/application.yml
@@ -188,3 +188,8 @@ kestra:
     uri: https://api.kestra.io/v1/reports/usages
     initial-delay: 5m
     fixed-delay: 1h
+
+  hidden-labels:
+    prefixes:
+      - system_
+      - internal_
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 8499affaa9..8d0ad8e299 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
@@ -686,7 +686,7 @@ public static ExecutionResponse fromExecution(Execution execution, URI url) {
     }
 
     protected Pair<List<Label>, List<Label>> parseLabels(List<String> labels) {
-        // We allow passing the correlation id from the API but only this one, other system labels will go throught and fail at execution creation.
+        // We allow passing the correlation id from the API but only this one, other system labels will go through and fail at execution creation.
         List<Label> parsedLabels =  labels == null ? Collections.emptyList() : RequestUtils.toMap(labels).entrySet().stream()
             .map(entry -> new Label(entry.getKey(), entry.getValue()))
             .toList();
diff --git a/webserver/src/main/java/io/kestra/webserver/controllers/api/MiscController.java b/webserver/src/main/java/io/kestra/webserver/controllers/api/MiscController.java
index 8304bbf130..1372a31d08 100644
--- a/webserver/src/main/java/io/kestra/webserver/controllers/api/MiscController.java
+++ b/webserver/src/main/java/io/kestra/webserver/controllers/api/MiscController.java
@@ -23,6 +23,7 @@
 import lombok.extern.slf4j.Slf4j;
 
 import java.time.ZonedDateTime;
+import java.util.List;
 import java.util.Optional;
 
 @Slf4j
@@ -69,6 +70,9 @@ public class MiscController {
     @io.micronaut.context.annotation.Value("${kestra.server.preview.max-rows:5000}")
     private Integer maxPreviewRows;
 
+    @io.micronaut.context.annotation.Value("${kestra.hidden-labels.prefixes:}")
+    private List<String> hiddenLabelsPrefixes;
+
 
     @Get("{/tenant}/configs")
     @ExecuteOn(TaskExecutors.IO)
@@ -88,7 +92,8 @@ public Configuration configuration() throws JsonProcessingException {
                 .max(this.maxPreviewRows)
                 .build()
             ).isBasicAuthEnabled(basicAuthService.isEnabled())
-            .systemNamespace(namespaceUtils.getSystemFlowNamespace());
+            .systemNamespace(namespaceUtils.getSystemFlowNamespace())
+            .hiddenLabelsPrefixes(hiddenLabelsPrefixes);
 
         if (this.environmentName != null || this.environmentColor != null) {
             builder.environment(
@@ -148,6 +153,8 @@ public static class Configuration {
         Boolean isBasicAuthEnabled;
 
         String systemNamespace;
+
+        List<String> hiddenLabelsPrefixes;
     }
 
     @Value

From a07f5e483156243b1ee7989865d96cee6658c281 Mon Sep 17 00:00:00 2001
From: MilosPaunovic <paun992@hotmail.com>
Date: Wed, 23 Oct 2024 10:57:26 +0200
Subject: [PATCH 2/3] feat(ui): filter execution list to ignore labels
 containing hidden prefixes

---
 ui/src/components/executions/Executions.vue | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/ui/src/components/executions/Executions.vue b/ui/src/components/executions/Executions.vue
index 9eba7437e0..1cee0d58e6 100644
--- a/ui/src/components/executions/Executions.vue
+++ b/ui/src/components/executions/Executions.vue
@@ -143,7 +143,7 @@
             <template #table v-if="executions.length">
                 <select-table
                     ref="selectTable"
-                    :data="executions"
+                    :data="filteredExecutions"
                     :default-sort="{prop: 'state.startDate', order: 'descending'}"
                     stripe
                     table-layout="auto"
@@ -438,7 +438,7 @@
 </script>
 
 <script>
-    import {mapState} from "vuex";
+    import {mapState, mapGetters} from "vuex";
     import DataTable from "../layout/DataTable.vue";
     import TextSearch from "vue-material-design-icons/TextSearch.vue";
     import Status from "../Status.vue";
@@ -629,6 +629,19 @@
             ...mapState("stat", ["daily"]),
             ...mapState("auth", ["user"]),
             ...mapState("flow", ["flow"]),
+            ...mapGetters("misc", ["configs"]),
+            filteredExecutions() {
+                const toIgnore = this.configs.hiddenLabelsPrefixes || [];
+                // Extract only the keys from the route query labels
+                const allowedLabels = this.$route.query.labels ? this.$route.query.labels.map(label => label.split(":")[0]) : [];
+
+                return this.executions.filter(execution => {
+                    return !execution.labels?.some(label => {
+                        // Check if the label key matches any prefix, but allow if it's in the query
+                        return toIgnore.some(prefix => label.key.startsWith(prefix)) && !allowedLabels.includes(label.key);
+                    });
+                });
+            },
             routeInfo() {
                 return {
                     title: this.$t("executions")

From 181719b6fa01a7f7f1aff85fdfbef5e0c0f2a449 Mon Sep 17 00:00:00 2001
From: MilosPaunovic <paun992@hotmail.com>
Date: Wed, 23 Oct 2024 11:14:47 +0200
Subject: [PATCH 3/3] feat(ui): filter only labels on execution list

---
 ui/src/components/executions/Executions.vue | 27 ++++++++++-----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/ui/src/components/executions/Executions.vue b/ui/src/components/executions/Executions.vue
index 1cee0d58e6..0292ed9569 100644
--- a/ui/src/components/executions/Executions.vue
+++ b/ui/src/components/executions/Executions.vue
@@ -143,7 +143,7 @@
             <template #table v-if="executions.length">
                 <select-table
                     ref="selectTable"
-                    :data="filteredExecutions"
+                    :data="executions"
                     :default-sort="{prop: 'state.startDate', order: 'descending'}"
                     stripe
                     table-layout="auto"
@@ -301,7 +301,7 @@
 
                         <el-table-column v-if="displayColumn('labels')" :label="$t('labels')">
                             <template #default="scope">
-                                <labels :labels="scope.row.labels" />
+                                <labels :labels="filteredLabels(scope.row.labels)" />
                             </template>
                         </el-table-column>
 
@@ -630,18 +630,6 @@
             ...mapState("auth", ["user"]),
             ...mapState("flow", ["flow"]),
             ...mapGetters("misc", ["configs"]),
-            filteredExecutions() {
-                const toIgnore = this.configs.hiddenLabelsPrefixes || [];
-                // Extract only the keys from the route query labels
-                const allowedLabels = this.$route.query.labels ? this.$route.query.labels.map(label => label.split(":")[0]) : [];
-
-                return this.executions.filter(execution => {
-                    return !execution.labels?.some(label => {
-                        // Check if the label key matches any prefix, but allow if it's in the query
-                        return toIgnore.some(prefix => label.key.startsWith(prefix)) && !allowedLabels.includes(label.key);
-                    });
-                });
-            },
             routeInfo() {
                 return {
                     title: this.$t("executions")
@@ -722,6 +710,17 @@
             });
         },
         methods: {
+            filteredLabels(labels) {
+                const toIgnore = this.configs.hiddenLabelsPrefixes || [];
+
+                // Extract only the keys from the route query labels
+                const allowedLabels = this.$route.query.labels ? this.$route.query.labels.map(label => label.split(":")[0]) : [];
+
+                return labels?.filter(label => {
+                    // Check if the label key matches any prefix but allow it if it's in the query
+                    return !toIgnore.some(prefix => label.key.startsWith(prefix)) || allowedLabels.includes(label.key);
+                });
+            },
             executionParams(row) {
                 return {
                     namespace: row.namespace,