fix(ui): task runner can be filled through low code editor

closes kestra-io/kestra-ee#1477
kestra-io · Aug 29, 2024 · 7061eef · 7061eef
1 parent 3c35c8a
commit 7061eef
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 4 deletions.
diff --git a/core/src/main/java/io/kestra/core/docs/AbstractClassDocumentation.java b/core/src/main/java/io/kestra/core/docs/AbstractClassDocumentation.java
@@ -2,6 +2,7 @@
 
 import com.google.common.base.CaseFormat;
 import io.kestra.core.models.tasks.retrys.AbstractRetry;
+import io.kestra.core.models.tasks.runners.TaskRunner;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -144,6 +145,10 @@ private Boolean isTypeToKeep(String key){
             if (AbstractRetry.class.isAssignableFrom(Class.forName(key))) {
                 return true;
             }
+
+            if (TaskRunner.class.isAssignableFrom(Class.forName(key))) {
+                return true;
+            }
         } catch (ClassNotFoundException ignored) {
             log.debug(ignored.getMessage(), ignored);
         }

diff --git a/ui/src/components/flows/TaskEditor.vue b/ui/src/components/flows/TaskEditor.vue
@@ -109,7 +109,7 @@
                     type: this.selectedTaskType
                 };
 
-                if (this.section !== SECTIONS.TRIGGERS) {
+                if (this.section !== SECTIONS.TRIGGERS && this.section !== SECTIONS.TASK_RUNNERS) {
                     value["id"] = this.taskObject && this.taskObject.id ? this.taskObject.id : "";
                 }
 

diff --git a/ui/src/components/flows/tasks/Task.js b/ui/src/components/flows/tasks/Task.js
@@ -49,6 +49,10 @@ export default {
                     return "condition"
                 }
 
+                if (property.$ref.includes("tasks.runners.TaskRunner")) {
+                    return "task-runner"
+                }
+
                 return "complex";
             }
 

diff --git a/ui/src/components/flows/tasks/TaskTask.vue b/ui/src/components/flows/tasks/TaskTask.vue
@@ -19,7 +19,7 @@
             <task-editor
                 ref="editor"
                 :model-value="taskYaml"
-                :section="SECTIONS.TASKS"
+                :section="section"
                 @update:model-value="onInput"
             />
         </el-form>
@@ -34,19 +34,25 @@
 <script setup>
     import TextSearch from "vue-material-design-icons/TextSearch.vue";
     import ContentSave from "vue-material-design-icons/ContentSave.vue";
-    import {SECTIONS} from "../../../utils/constants.js";
 </script>
 
 <script>
     import Task from "./Task"
     import YamlUtils from "../../../utils/yamlUtils";
     import TaskEditor from "../TaskEditor.vue"
     import Drawer from "../../Drawer.vue"
+    import {SECTIONS as SECTION} from "../../../utils/constants.js";
 
     export default {
         mixins: [Task],
         components: {TaskEditor, Drawer},
         emits: ["update:modelValue"],
+        props: {
+            section: {
+                type: String,
+                default: SECTION.TASKS
+            },
+        },
         data() {
             return {
                 isOpen: false,

diff --git a/ui/src/components/flows/tasks/TaskTaskRunner.vue b/ui/src/components/flows/tasks/TaskTaskRunner.vue
@@ -0,0 +1,9 @@
+<template>
+    <task-task @update:model-value="$emit('update:modelValue', $event)" v-bind="$attrs" :section="SECTION.TASK_RUNNERS" />
+</template>
+<script setup>
+    import {SECTIONS as SECTION} from "../../../utils/constants.js";
+    import TaskTask from "./TaskTask.vue";
+
+    defineEmits(["update:modelValue"]);
+</script>
diff --git a/ui/src/components/plugins/PluginSelect.vue b/ui/src/components/plugins/PluginSelect.vue
@@ -55,12 +55,17 @@
             taskModels() {
                 const taskModels = [];
                 for (const plugin of this.plugins || []) {
-                    taskModels.push.apply(taskModels, plugin[this.section.toLowerCase()]);
+                    taskModels.push.apply(taskModels, plugin[this.upperSnakeToCamelCase(this.section)]);
                 }
                 return taskModels;
             },
         },
         methods: {
+            upperSnakeToCamelCase(str) {
+                return str.toLowerCase().replaceAll(/_([a-z])/g, function (g) {
+                    return g[1].toUpperCase();
+                });
+            },
             onInput(value) {
                 this.$emit("update:modelValue", value);
             },

diff --git a/ui/src/utils/constants.js b/ui/src/utils/constants.js
@@ -1,6 +1,7 @@
 export const SECTIONS = {
     TASKS: "TASKS",
     TRIGGERS: "TRIGGERS",
+    TASK_RUNNERS: "TASK_RUNNERS",
 }
 
 export const stateGlobalChartTypes = {

diff --git a/ui/src/utils/init.js b/ui/src/utils/init.js
@@ -50,6 +50,7 @@ import TaskSubflowInputs from "../components/flows/tasks/TaskSubflowInputs.vue";
 import LeftMenuLink from "../components/LeftMenuLink.vue";
 import RouterMd from "../components/utils/RouterMd.vue";
 import Utils from "./utils";
+import TaskTaskRunner from "../components/flows/tasks/TaskTaskRunner.vue";
 
 export default (app, routes, stores, translations) => {
     // charts
@@ -151,6 +152,7 @@ export default (app, routes, stores, translations) => {
     app.component("TaskSubflowNamespace", TaskSubflowNamespace)
     app.component("TaskSubflowId", TaskSubflowId)
     app.component("TaskSubflowInputs", TaskSubflowInputs)
+    app.component("TaskTaskRunner", TaskTaskRunner)
     app.component("LeftMenuLink", LeftMenuLink)
     app.component("RouterMd", RouterMd)