chore: update version to v0.18.1

Fixes #4604

.github/dependabot.yml

@@ -22,12 +22,20 @@ updates:
       - "dependency-upgrade"
     open-pull-requests-limit: 50
 
-  # Maintain dependencies for Npm modules
+  # Maintain dependencies for NPM modules
   - package-ecosystem: "npm"
     directory: "/ui"
     schedule:
-      # Check for updates to Npm modules every week
       interval: "weekly"
+      day: "sunday"
+      time: "09:00"
+    open-pull-requests-limit: 50
     labels:
       - "dependency-upgrade"
-    open-pull-requests-limit: 50
+    ignore:
+      # Ignore updates of version 1.x, as we're using beta of 2.x
+      - dependency-name: "vue-virtual-scroller"
+        versions: ["1.x"]
+      # Ignore major versions greater than 8, as it's still known to be flaky
+      - dependency-name: "eslint"
+        versions: [">8"]

.github/workflows/main.yml

@@ -117,10 +117,12 @@ jobs:
         uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
+        if: ${{ github.event.inputs.skip-test == 'false' || github.event.inputs.skip-test == '' }}
         uses: docker/setup-buildx-action@v3
 
       # Docker Build
       - name: Build & Export Docker Image
+        if: ${{ github.event.inputs.skip-test == 'false' || github.event.inputs.skip-test == '' }}
         uses: docker/build-push-action@v6
         with:
           context: .
@@ -275,7 +277,7 @@ jobs:
   release:
     name: Github Release
     runs-on: ubuntu-latest
-    needs: [ check, check-e2e ]
+    needs: build-artifacts
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
       # Download Exec
@@ -367,7 +369,7 @@ jobs:
   maven:
     name: Publish to Maven
     runs-on: ubuntu-latest
-    needs: [check, check-e2e]
+    needs: [check]
     if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags/v')
     steps:
       - uses: actions/checkout@v4

core/src/main/java/io/kestra/core/models/executions/LogEntry.java

@@ -61,14 +61,13 @@ public class LogEntry implements DeletedInterface, TenantInterface {
     @Builder.Default
     boolean deleted = false;
 
-    public static List<String> findLevelsByMin(Level minLevel) {
+    public static List<Level> findLevelsByMin(Level minLevel) {
         if (minLevel == null) {
-            return Arrays.stream(Level.values()).map(Enum::name).toList();
+            return Arrays.asList(Level.values());
         }
 
         return Arrays.stream(Level.values())
             .filter(level -> level.toInt() >= minLevel.toInt())
-            .map(Enum::name)
             .toList();
     }
 

core/src/main/java/io/kestra/core/runners/DefaultRunContext.java

@@ -144,18 +144,16 @@ public class DefaultRunContext extends RunContext {
     @Override
     public DefaultRunContext clone() {
         DefaultRunContext runContext = new DefaultRunContext();
-        runContext.variableRenderer = this.variableRenderer;
-        runContext.applicationContext = this.applicationContext;
-        runContext.storageInterface = this.storageInterface;
-        runContext.storage = this.storage;
         runContext.variables = new HashMap<>(this.variables);
-        runContext.metrics = new ArrayList<>();
-        runContext.meterRegistry = this.meterRegistry;
         runContext.workingDir = this.workingDir;
         runContext.logger = this.logger;
+        runContext.metrics = new ArrayList<>();
+        runContext.storage = this.storage;
         runContext.pluginConfiguration = this.pluginConfiguration;
-        runContext.version = version;
+        if (this.isInitialized.get()) {
-        runContext.isInitialized.set(this.isInitialized.get());
+            //Inject all services
+            runContext.init(applicationContext);
+        }
         return runContext;
     }
 

core/src/main/java/io/kestra/core/runners/pebble/Extension.java

@@ -61,6 +61,7 @@ public class Extension extends AbstractExtension {
         return operators;
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public Map<String, Filter> getFilters() {
         Map<String, Filter> filters = new HashMap<>();
@@ -104,6 +105,7 @@ public class Extension extends AbstractExtension {
         return tests;
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public Map<String, Function> getFunctions() {
         Map<String, Function> functions = new HashMap<>();

core/src/main/java/io/kestra/core/runners/pebble/filters/JsonFilter.java

@@ -10,11 +10,8 @@ import java.util.Map;
 @Slf4j
 @Deprecated
 public class JsonFilter extends ToJsonFilter {
-
     @Override
     public Object apply(Object input, Map<String, Object> args, PebbleTemplate self, EvaluationContext context, int lineNumber) throws PebbleException {
-        log.warn("The 'json' filter is deprecated, please use 'toJson' instead");
-
         return super.apply(input, args, self, context, lineNumber);
     }
 }

core/src/main/java/io/kestra/core/runners/pebble/functions/JsonFunction.java

@@ -9,11 +9,8 @@ import java.util.Map;
 @Slf4j
 @Deprecated
 public class JsonFunction extends FromJsonFunction {
-
     @Override
     public Object execute(Map<String, Object> args, PebbleTemplate self, EvaluationContext context, int lineNumber) {
-        log.warn("The 'json' function is deprecated, please use 'fromJson' instead");
-
         return super.execute(args, self, context, lineNumber);
     }
 }

core/src/test/java/io/kestra/core/repositories/AbstractLogRepositoryTest.java

@@ -149,7 +149,7 @@ public abstract class AbstractLogRepositoryTest {
 
         logRepository.save(log1);
 
-        logRepository.deleteByQuery(null, "io.kestra.unittest", "flowId", null, null, ZonedDateTime.now().plusMinutes(1));
+        logRepository.deleteByQuery(null, "io.kestra.unittest", "flowId", List.of(Level.TRACE, Level.DEBUG, Level.INFO), null, ZonedDateTime.now().plusMinutes(1));
 
         find = logRepository.findByExecutionId(null, log1.getExecutionId(), null, Pageable.from(1, 50));
         assertThat(find.size(), is(0));

gradle.properties

@@ -1,4 +1,4 @@
-version=0.18.0-SNAPSHOT
+version=0.18.1
 
 org.gradle.parallel=true
 org.gradle.caching=true

jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresLogRepository.java

@@ -10,6 +10,7 @@ import org.jooq.impl.DSL;
 import org.slf4j.event.Level;
 
 import java.util.Collections;
+import java.util.List;
 import java.util.stream.Collectors;
 
 
@@ -27,10 +28,9 @@ public class PostgresLogRepository extends AbstractJdbcLogRepository {
     }
 
     @Override
-    protected Condition minLevel(Level minLevel) {
+    protected Condition levelsCondition(List<Level> levels) {
         return DSL.condition("level in (" +
-            LogEntry
+            levels
-                .findLevelsByMin(minLevel)
                 .stream()
                 .map(s -> "'" + s + "'::log_level")
                 .collect(Collectors.joining(", ")) +

jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcLogRepository.java

@@ -441,7 +441,7 @@ public abstract class AbstractJdbcLogRepository extends AbstractJdbcRepository i
                 }
 
                 if (logLevels != null) {
-                    delete = delete.and(field("level").in(logLevels));
+                    delete = delete.and(levelsCondition(logLevels));
                 }
 
                 return delete.execute();
@@ -493,7 +493,11 @@ public abstract class AbstractJdbcLogRepository extends AbstractJdbcRepository i
             });
     }
 
-    protected Condition minLevel(Level minLevel) {
+    private Condition minLevel(Level minLevel) {
-        return field("level").in(LogEntry.findLevelsByMin(minLevel));
+        return levelsCondition(LogEntry.findLevelsByMin(minLevel));
+    }
+
+    protected Condition levelsCondition(List<Level> levels) {
+        return field("level").in(levels.stream().map(level -> level.name()).toList());
     }
 }

ui/.eslintignore

@@ -1,5 +1,2 @@
-public/vscode/
-public/vscode-web/
-
 node/
 node_modules/

ui/package.json

@@ -1,8 +1,9 @@
 {
   "name": "kestra",
-  "version": "0.1.0",
+  "version": "0.18.0",
   "private": true,
-  "packageManager": "npm@9.8.1",
+  "type": "module",
+  "packageManager": "npm@9.9.3",
   "scripts": {
     "dev": "vite --host",
     "build": "vite build --emptyOutDir",
@@ -12,17 +13,17 @@
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix"
   },
   "dependencies": {
-    "@kestra-io/ui-libs": "^0.0.53",
+    "@kestra-io/ui-libs": "^0.0.57",
     "@vue-flow/background": "^1.3.0",
     "@vue-flow/controls": "^1.1.2",
-    "@vue-flow/core": "^1.39.1",
+    "@vue-flow/core": "^1.39.3",
     "ansi-to-html": "^0.7.2",
-    "axios": "^1.7.2",
+    "axios": "^1.7.3",
     "bootstrap": "^5.3.3",
     "buffer": "^6.0.3",
     "chart.js": "^4.4.3",
     "chartjs-chart-treemap": "^2.3.1",
-    "core-js": "^3.37.1",
+    "core-js": "^3.38.0",
     "cronstrue": "^2.50.0",
     "dagre": "^0.8.5",
     "element-plus": "^2.7.8",
@@ -39,20 +40,18 @@
     "moment": "^2.30.1",
     "moment-range": "4.0.2",
     "moment-timezone": "^0.5.45",
-    "node-modules-polyfill": "^0.1.4",
     "nprogress": "^0.2.0",
     "pdfjs-dist": "^4.5.136",
-    "posthog-js": "^1.150.1",
+    "posthog-js": "^1.154.5",
     "throttle-debounce": "^5.0.2",
-    "vite-plugin-eslint": "^1.8.1",
+    "vue": "^3.4.36",
-    "vue": "^3.4.34",
     "vue-axios": "3.5.2",
     "vue-chartjs": "^5.3.1",
     "vue-gtag": "^2.0.1",
     "vue-i18n": "^9.13.1",
     "vue-material-design-icons": "^5.3.0",
-    "vue-router": "^4.4.0",
+    "vue-router": "^4.4.3",
-    "vue-sidebar-menu": "^5.4.0",
+    "vue-sidebar-menu": "^5.4.1",
     "vue-virtual-scroller": "^2.0.0-beta.8",
     "vue3-popper": "^1.5.0",
     "vue3-runtime-template": "^1.0.2",
@@ -62,10 +61,11 @@
     "yaml": "^2.5.0"
   },
   "devDependencies": {
+    "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
     "@rushstack/eslint-patch": "^1.10.4",
-    "@shikijs/markdown-it": "^1.6.3",
+    "@shikijs/markdown-it": "^1.12.1",
-    "@typescript-eslint/parser": "^7.17.0",
+    "@typescript-eslint/parser": "^8.0.1",
-    "@vitejs/plugin-vue": "^5.1.1",
+    "@vitejs/plugin-vue": "^5.1.2",
     "@vue/eslint-config-prettier": "^9.0.0",
     "@vue/test-utils": "^2.4.6",
     "decompress": "^4.2.1",
@@ -77,13 +77,14 @@
     "prettier": "^3.3.3",
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-visualizer": "^5.12.0",
-    "sass": "^1.77.4",
+    "sass": "^1.77.8",
     "typescript": "^5.5.4",
     "vite": "^5.3.5",
-    "vitest": "^2.0.4"
+    "vite-plugin-eslint": "^1.8.1",
+    "vitest": "^2.0.5"
   },
   "optionalDependencies": {
-    "@rollup/rollup-linux-x64-gnu": "^4.19.0"
+    "@rollup/rollup-linux-x64-gnu": "^4.20.0"
   },
   "overrides": {
     "bootstrap": {

ui/plugins/commit.ts

@@ -0,0 +1,30 @@
+import type {Plugin} from "vite";
+import {execSync} from "child_process";
+
+const getInfo = (formats: string[]): string[] => formats.map(format => execSync(`git log -1 --format=${format}`).toString().trim());
+
+const comment = (message: string, author: string, date: string): string => `
+<!--
+
+    Last Commit: 
+
+    ${message}
+    ----------
+    Author: ${author}
+    Date: ${date}
+
+-->`;
+
+export const commit = (): Plugin => {
+    const [message, author, date] = getInfo(["%s", "%an", "%cd"]);
+
+    return {
+        name: "commit",
+        transformIndexHtml: {
+            order: "pre",
+            handler(html: string): string {
+                return comment(message, author, date) + html;
+            },
+        },
+    };
+};

ui/plugins/details.ts

@@ -1,29 +0,0 @@
-import type {Plugin} from "vite";
-import {execSync} from "child_process";
-
-const comment = (hash: string, date: string): string => {
-    return `
-<!--
-
-    Last Commit: 
-      
-    URL: https://github.com/kestra-io/kestra/commit/${hash}
-    Date: ${date}
-
--->`;
-};
-
-export const details = (): Plugin => {
-    const hash: string = execSync("git rev-parse --short HEAD").toString().trim();
-    const date: string = execSync("git log -1 --format=%cd").toString().trim();
-
-    return {
-        name: "details",
-        transformIndexHtml: {
-            order: "pre",
-            handler(html: string): string {
-                return comment(hash, date) + html;
-            },
-        },
-    };
-};

ui/src/components/layout/TopNavBar.vue

@@ -124,6 +124,7 @@
         },
         computed: {
             ...mapState("api", ["version"]),
+            ...mapState("core", ["tutorialFlows"]),
             ...mapGetters("core", ["guidedProperties"]),
             ...mapGetters("auth", ["user"]),
             displayNavBar() {
@@ -131,7 +132,7 @@
             },
             tourEnabled(){
                 // Temporary solution to not showing the tour menu item for EE
-                return !Object.keys(this.user).length
+                return this.tutorialFlows?.length && !Object.keys(this.user).length
             }
         },
         methods: {

ui/src/components/logs/LogsWrapper.vue

@@ -56,7 +56,7 @@
                         </div>
                     </el-card>
 
-                    <el-button v-if="!isLogsListing && logs !== undefined && logs.length > 0" @click="deleteLogs()" class="mb-3 delete-logs-btn">
+                    <el-button v-if="shouldDisplayDeleteButton && logs !== undefined && logs.length > 0" @click="deleteLogs()" class="mb-3 delete-logs-btn">
                         <TrashCan class="me-2" />
                         <span>{{ $t("delete logs") }}</span>                     
                     </el-button>
@@ -153,8 +153,8 @@
             isFlowEdit() {
                 return this.$route.name === "flows/update"
             },
-            isLogsListing() {
+            shouldDisplayDeleteButton() {
-                return this.$route.name === "logs/list"
+                return this.$route.name === "flows/update"
             },
             isNamespaceEdit() {
                 return this.$route.name === "namespaces/update"

ui/src/components/onboarding/VueTour.vue

@@ -27,7 +27,7 @@
                         <div
                             v-if="currentStep(tour).title"
                             class="title"
-                            :class="{dark: currentStep(tour).keepDark}"
+                            :class="{dark: currentStep(tour).keepDark, empty: !flows.length}"
                         >
                             <div v-if="currentStep(tour).icon">
                                 <img
@@ -35,7 +35,7 @@
                                     :class="{jump: currentStep(tour).jump}"
                                 >
                             </div>
-                            <span v-html="currentStep(tour).title" />
+                            <span v-html="tour.currentStep === 1 && !flows.length ? t('onboarding.no_flows') : currentStep(tour).title" />
                         </div>
                     </template>
                     <template #content>
@@ -99,6 +99,7 @@
                                     ![0, 1].includes(tour.currentStep) ||
                                         !tour.isLast
                                 "
+                                :disabled="tour.currentStep === 1 && !flows.length"
                                 @click="
                                     tour.isLast
                                         ? finishTour(tour.currentStep)
@@ -147,7 +148,6 @@
 
     import Finish from "./components/buttons/Finish.vue";
 
-    import {apiUrl} from "override/utils/route";
     import {pageFromRoute} from "../../utils/eventsRouter";
 
     import TaskIcon from "@kestra-io/ui-libs/src/components/misc/TaskIcon.vue";
@@ -208,7 +208,7 @@
     };
 
     const activeFlow = ref(0);
-    const flows = ref([]);
+    const flows = computed(() => store.state.core.tutorialFlows);
 
     const allTasks = (tasks) => {
         const uniqueTypes = new Set();
@@ -300,7 +300,7 @@
                     name: "flows/update",
                     params: {
                         namespace: "tutorial",
-                        id: flows.value[activeFlow.value].id,
+                        id: flows.value[activeFlow.value]?.id,
                         tab: "editor",
                     },
                 });
@@ -312,7 +312,7 @@
                 store.commit("editor/updateOnboarding"),
                 store.commit("core/setGuidedProperties", {
                     tourStarted: true,
-                    template: flows.value[activeFlow.value].id,
+                    template: flows.value[activeFlow.value]?.id,
                 });
 
                 wait(1);
@@ -422,11 +422,7 @@
     };
 
     onMounted(() => {
-        const HTTP = getCurrentInstance()?.appContext.config.globalProperties.$http;
+        store.dispatch("core/readTutorialFlows");
-
-        HTTP.get(`${apiUrl(this)}/flows/tutorial`).then(
-            (response) => (flows.value = response.data),
-        );
     });
 </script>
 
@@ -530,6 +526,11 @@ $flow-image-size-container: 36px;
         font-weight: 500;
         color: $color;
 
+        &.empty {
+            font-size: 1.2rem;
+            margin-bottom: 0;
+        }
+
         & div {
             height: 2rem;
             margin-bottom: 1rem;

ui/src/stores/core.js

@@ -1,3 +1,5 @@
+import {apiUrl} from "override/utils/route";
+
 export default {
     namespaced: true,
     state: {
@@ -10,7 +12,8 @@ export default {
             template: undefined,
         },
         monacoYamlConfigured: false,
-        autocompletionSource: undefined
+        autocompletionSource: undefined,
+        tutorialFlows: []
     },
     actions: {
         showMessage({commit}, message) {
@@ -21,7 +24,10 @@ export default {
         },
         isUnsaved({commit}, unsavedChange) {
             commit("setUnsavedChange", unsavedChange)
-        }
+        },
+        readTutorialFlows({commit}) {
+            return this.$http.get(`${apiUrl(this)}/flows/tutorial`).then((response) => commit("setTutorialFlows", response.data))
+        },
     },
     mutations: {
         setMessage(state, message) {
@@ -41,7 +47,10 @@ export default {
         },
         setAutocompletionSource(state, autocompletionSource) {
             state.autocompletionSource = autocompletionSource
-        }
+        },
+        setTutorialFlows(state, flows) {
+            state.tutorialFlows = flows
+        },
     },
     getters: {
         unsavedChange(state) {

ui/src/translations/en.json

@@ -790,6 +790,7 @@
       "previous": "Previous",
       "finish": "Finish",
       "skip": "Skip Tutorial",
+      "no_flows": "No flows available under tutorial namespace.",
       "steps": {
         "0": {
           "title": "Welcome to Kestra!",

ui/src/translations/fr.json

@@ -767,6 +767,7 @@
       "previous": "Précédent",
       "finish": "Finir",
       "skip": "Passer le tutoriel",
+      "no_flows": "Aucun flux disponible dans l'espace de noms du tutoriel.",
       "steps": {
         "0": {
           "title": "Bienvenue chez Kestra!",

ui/src/utils/charts.js

@@ -74,7 +74,7 @@ export function chartClick(moment, router, route, event) {
     const query = {};
 
     if (event.date) {
-        const formattedDate = moment(event.date, "DD/MM/YYYY");
+        const formattedDate = moment(event.date, moment.localeData().longDateFormat("L"));
         query.startDate = formattedDate.toISOString(true);
         query.endDate = formattedDate.add(1, "d").toISOString(true);
     }

ui/src/utils/init.js

@@ -3,7 +3,7 @@ import {createRouter, createWebHistory} from "vue-router";
 import VueGtag from "vue-gtag";
 import {createI18n} from "vue-i18n";
 import moment from "moment-timezone";
-import "moment/locale/fr"
+import "moment/dist/locale/fr"
 import {extendMoment} from "moment-range";
 import VueSidebarMenu from "vue-sidebar-menu";
 import {

ui/src/utils/markdown.js

@@ -3,49 +3,43 @@ import mark from "markdown-it-mark";
 import meta from "markdown-it-meta";
 import anchor from "markdown-it-anchor";
 import container from "markdown-it-container";
-import {fromHighlighter} from "@shikijs/markdown-it/core"
+import {fromHighlighter} from "@shikijs/markdown-it/core";
-import {getHighlighterCore} from "shiki/core"
+import {createHighlighterCore} from "shiki/core";
 import githubDark from "shiki/themes/github-dark.mjs";
 import githubLight from "shiki/themes/github-light.mjs";
 import {linkTag} from "./markdown_plugins/link";
 
+let highlighter = null;
+
+async function getHighlighter() {
+    if (!highlighter) {
+        highlighter = createHighlighterCore({
+            langs: [import("shiki/langs/yaml.mjs"), import("shiki/langs/python.mjs"), import("shiki/langs/javascript.mjs")],
+            themes: [githubDark, githubLight],
+            loadWasm: import("shiki/wasm"),
+        });
+    }
+    return highlighter;
+}
+
 export default class Markdown {
     static async render(markdown, options) {
+        const highlighter = await getHighlighter();
+
         githubDark["colors"]["editor.background"] = "var(--bs-gray-500)";
         githubLight["colors"]["editor.background"] = "var(--bs-white)";
 
-        const highlighter = await getHighlighterCore({
+        options = options || {};
-            themes: [
-                githubDark,
-                githubLight
-            ],
-            langs: [
-                import("shiki/langs/yaml.mjs"),
-                import("shiki/langs/python.mjs"),
-                import("shiki/langs/javascript.mjs")
-            ],
-            loadWasm: import("shiki/wasm")
-        })
-
-        options = options || {}
 
         const darkTheme = document.getElementsByTagName("html")[0].className.indexOf("dark") >= 0;
 
-        // noinspection JSPotentiallyInvalidConstructorUsage
+        let md = new markdownIt()
-        let md = new markdownIt() // jshint ignore:line
             .use(mark)
             .use(meta)
-            .use(anchor, {
+            .use(anchor, {permalink: options.permalink ? anchor.permalink.ariaHidden({placement: "before"}) : undefined})
-                permalink: options.permalink ? anchor.permalink.ariaHidden({
-                    placement: "before"
-                }) : undefined
-            })
-            // if more alert types are used inside the task documentation, they need to be configured here also
             .use(container, "warning")
             .use(container, "info")
-            .use(fromHighlighter(highlighter, {
+            .use(fromHighlighter(highlighter, {theme: darkTheme ? "github-dark" : "github-light"}))
-                theme: darkTheme ? "github-dark" : "github-light",
-            }))
             .use(linkTag);
 
         md.set({
@@ -56,12 +50,10 @@ export default class Markdown {
             typographer: true,
             langPrefix: "language-",
             quotes: "“”‘’",
-        })
+        });
 
-        md.renderer.rules.table_open = () => "<table class=\"table\">\n"
+        md.renderer.rules.table_open = () => "<table class=\"table\">\n";
 
-        return md.render(
+        return md.render(markdown);
-            markdown
-        );
     }
 }

ui/vite.config.js

@@ -3,9 +3,10 @@ import {defineConfig} from "vite";
 import vue from "@vitejs/plugin-vue";
 import {visualizer} from "rollup-plugin-visualizer";
 import eslintPlugin from "vite-plugin-eslint";
+import * as sass from "sass"
 
 import {filename} from "./plugins/filename"
-import {details} from "./plugins/details"
+import {commit} from "./plugins/commit"
 
 export default defineConfig({
     base: "",
@@ -22,16 +23,18 @@ export default defineConfig({
     plugins: [
         vue(),
         visualizer(),
-        eslintPlugin({
+        eslintPlugin({failOnWarning: true, failOnError: true}),
-            failOnWarning: true,
-            failOnError: true
-        }),
         filename(),
-        details()
+        commit()
     ],
     assetsInclude: ["**/*.md"],
     css: {
-        devSourcemap: true
+        devSourcemap: true,
+        preprocessorOptions: {
+            scss: {
+                logger: sass.Logger.silent
+            },
+        }
     },
     optimizeDeps: {
         include: [

webserver/src/main/java/io/kestra/webserver/controllers/api/LogController.java

@@ -126,7 +126,7 @@ public class LogController {
         @Parameter(description = "The min log level filter") @Nullable @QueryValue Level minLevel
     ) {
         AtomicReference<Runnable> cancel = new AtomicReference<>();
-        List<String> levels = LogEntry.findLevelsByMin(minLevel);
+        List<String> levels = LogEntry.findLevelsByMin(minLevel).stream().map(level -> level.name()).toList();
 
         return Flux
             .<Event<LogEntry>>create(emitter -> {