From 204563530ef3be5190e749f176f6bb5c793a9d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Paunovi=C4=87?= <paun992@hotmail.com>
Date: Thu, 23 Jan 2025 15:07:05 +0100
Subject: [PATCH] feat(ui): improve the one of task section (#6903)

---
 ui/src/components/code/segments/Task.vue       | 9 ++-------
 ui/src/components/flows/tasks/OneOfContent.vue | 9 ++++++---
 ui/src/components/flows/tasks/TaskObject.vue   | 6 +++---
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/ui/src/components/code/segments/Task.vue b/ui/src/components/code/segments/Task.vue
index 59a4d95077e..8a465a291e7 100644
--- a/ui/src/components/code/segments/Task.vue
+++ b/ui/src/components/code/segments/Task.vue
@@ -91,13 +91,8 @@
         let temp = YamlUtils.parse(yaml.value);
 
         if (lastBreadcumb.value.shown) {
-            temp = {
-                ...temp,
-                [breadcrumbs.value.at(-1).label]: {
-                    ...temp[breadcrumbs.value.at(-1).label],
-                    ...task,
-                },
-            };
+            const field = breadcrumbs.value.at(-1).label;
+            temp = {...temp, [field]: task};
         }
 
         temp = YamlUtils.stringify(temp);
diff --git a/ui/src/components/flows/tasks/OneOfContent.vue b/ui/src/components/flows/tasks/OneOfContent.vue
index b60ec313c6a..129f3190494 100644
--- a/ui/src/components/flows/tasks/OneOfContent.vue
+++ b/ui/src/components/flows/tasks/OneOfContent.vue
@@ -37,10 +37,13 @@
         created() {
             this.schemas = this.schema?.oneOf ?? [];
 
-            const schema = this.schemaOptions.find(
-                (sch) => sch.id === this.modelValue.type,
+            const schema = this.schemaOptions.find((item) =>
+                typeof this.modelValue === "string"
+                    ? item.id === "string"
+                    : item.id === this.modelValue.type,
             );
-            this.onSelect(schema.value);
+
+            this.onSelect(schema?.value);
         // }
         },
         methods: {
diff --git a/ui/src/components/flows/tasks/TaskObject.vue b/ui/src/components/flows/tasks/TaskObject.vue
index eb3cdd4a3d1..33f460e727a 100644
--- a/ui/src/components/flows/tasks/TaskObject.vue
+++ b/ui/src/components/flows/tasks/TaskObject.vue
@@ -8,9 +8,9 @@
             >
                 <template #label>
                     <span v-if="required" class="me-1 text-danger">*</span>
-                    <span v-if="getKey(key)" class="label">{{
-                        getKey(key)
-                    }}</span>
+                    <span v-if="getKey(key)" class="label">
+                        {{ getKey(key) }}
+                    </span>
                     <el-tag
                         disable-transitions
                         size="small"