fix: no-code for plugin ai.ChatAutocompletion (#14945)

Author: elevatebart

ui/src/components/no-code/components/TaskEditor.vue

@@ -26,6 +26,7 @@
             @update:model-value="onTaskInput"
             :schema
             :properties
+            filterType
         />
     </div>
 </template>
@@ -122,8 +123,6 @@
         $ref: "",
     }));
 
-
-
     const properties = computed(() => {
         if(!resolvedProperties.value){
             return undefined;
@@ -207,7 +206,19 @@
                         }
                     }
 
-                    const typeAsConst = resolvedItem?.properties?.type?.const
+                    const typeField = resolvedItem?.properties?.type
+                    if(!typeField){
+                        return acc;
+                    }
+
+                    if(typeField.enum){
+                        for(const typeAsEnum of typeField.enum){
+                            acc[typeAsEnum] = acc[typeAsEnum] || [];
+                            acc[typeAsEnum].push(removeRefPrefix(item.$ref));
+                        }
+                    }
+
+                    const typeAsConst = typeField?.const
 
                     if (typeAsConst) {
                         acc[typeAsConst] = acc[typeAsConst] || [];

ui/src/components/no-code/components/tasks/TaskList.vue

@@ -10,7 +10,7 @@
                 <template #icon>
                     <Creation
                         :parentPathComplete
-                        :refPath="elements?.length ? elements.length - 1 : undefined"
+                        :refPath="elements?.length ? elements.length - 1 : -1"
                         :blockSchemaPath
                     />
                 </template>

ui/src/components/no-code/components/tasks/TaskObject.vue

@@ -86,6 +86,7 @@
         required?: boolean;
         schema?: Schema;
         root?: string;
+        filterType?: boolean;
     }>();
 
     const emit = defineEmits<{
@@ -145,12 +146,9 @@
 
     const filteredProperties = computed<Entry[]>(() => {
         const propertiesProc = (props.properties ?? props.schema?.properties);
-        const isOutputsContext = props.root?.startsWith("outputs[") || false;
         return propertiesProc
             ? (Object.entries(propertiesProc) as Entry[]).filter(([key, value]) => {
-                // Allow "type" field for outputs context, filter it out for other contexts
-                const shouldFilterType = key === "type" && !isOutputsContext;
-                return value && !shouldFilterType && !Array.isArray(value);
+                return value && !(props.filterType && key === "type") && !Array.isArray(value);
             })
             : [];
     });

ui/src/components/no-code/components/tasks/TaskTask.vue

@@ -3,11 +3,11 @@
         <Element
             :section="root"
             :parentPathComplete="parentPathComplete"
-            :blockSchemaPath="[blockSchemaPath, 'properties', root.split('.').pop()].join('/')"
-            :element="{
-                id: model?.id ?? 'Set a task',
+            :blockSchemaPath
+            :element="Object.keys(model).length > 0 ? {
+                id: (localSchema?.properties?.id ? model?.id : undefined),
                 type: model?.type,
-            }"
+            } : {id: fieldTitle}"
             typeFieldSchema="type"
             @remove-element="removeElement()"
         />
@@ -20,9 +20,12 @@
         PARENT_PATH_INJECTION_KEY,
         REF_PATH_INJECTION_KEY,
         CREATING_TASK_INJECTION_KEY,
-        BLOCK_SCHEMA_PATH_INJECTION_KEY
+        BLOCK_SCHEMA_PATH_INJECTION_KEY,
+        FULL_SCHEMA_INJECTION_KEY
     } from "../../injectionKeys";
     import Element from "./taskList/Element.vue";
+    import {getValueAtJsonPath} from "../../../../utils/utils";
+
 
     const model = defineModel({
         type: Object,
@@ -36,10 +39,36 @@
         },
     });
 
+    defineOptions({
+        inheritAttrs: false
+    })
+
     const parentPath = inject(PARENT_PATH_INJECTION_KEY, "");
     const refPath = inject(REF_PATH_INJECTION_KEY, undefined);
     const creatingTask = inject(CREATING_TASK_INJECTION_KEY, false);
-    const blockSchemaPath = inject(BLOCK_SCHEMA_PATH_INJECTION_KEY, ref())
+    const blockSchemaPathInjected = inject(BLOCK_SCHEMA_PATH_INJECTION_KEY, ref())
+    const fullSchema = inject(FULL_SCHEMA_INJECTION_KEY, ref({}))
+
+    const blockSchemaPath = computed(() => {
+        return [blockSchemaPathInjected.value, "properties", props.root.split(".").pop()].join("/")
+    })
+
+    const localSchema = computed(() => getValueAtJsonPath(fullSchema.value,  blockSchemaPath.value))
+
+    const fieldTitle = computed(() => {
+        const schema = localSchema.value;
+
+        if(schema?.anyOf && Array.isArray(schema.anyOf)){
+            // find all the title fields in the anyOf
+            const titles: string[] = schema.anyOf.map((s: any) => s.allOf?.find((a: any) => a.title)?.title ?? s.title);
+
+            // if all the titles are the same, return that title
+            if(titles.every((t) => t === titles[0])){
+                return titles[0];
+            }
+        }
+        return "Set a task"
+    })
 
     const parentPathComplete = computed(() => {
         return `${[

ui/src/components/no-code/components/tasks/taskList/Element.vue

@@ -5,19 +5,20 @@
         </div>
 
         <div class="flex-grow-1 label">
-            {{ identifier }}
+            {{ title ?? identifier }}
         </div>
 
         <button v-if="playgroundStore.enabled && element.id && isTask" @click.stop="playgroundStore.runUntilTask(element.id)" type="button" class="playground-run-task">
             <PlayIcon />
         </button>
 
-        <el-button
+        <button
+            class="delete-element"
+            type="button"
             @click.prevent.stop="emits('removeElement')"
-            :icon="DeleteOutline"
-            size="small"
-            class="border-0"
-        />
+        >
+            <DeleteOutline />
+        </button>
         <div v-if="elementIndex !== undefined" class="d-flex flex-column">
             <ChevronUp @click.prevent.stop="emits('moveElement', 'up')" />
             <ChevronDown @click.prevent.stop="emits('moveElement', 'down')" />
@@ -56,6 +57,7 @@
         elementIndex?: number;
         typeFieldSchema: "on" | "type";
         moved?: boolean;
+        title?: string
     }>();
 
     const pluginsStore = usePluginsStore();
@@ -122,12 +124,9 @@
         border: none;
     }
 
-    :deep(.el-button) {
+    .delete-element {        color: $base-white;
+        border: none;
         background-color: transparent;
-
-        &:hover {
-            color: var(--ks-content-alert);
-        }
     }
 }
 </style>

ui/src/components/plugins/PluginSelect.vue

@@ -83,27 +83,6 @@
     }) || []);
 
     const taskModelsSets = computed(() => {
-        if (blockType === "pluginDefaults" || isPluginBlock) {
-            const models = new Map<string, string>();
-            const pluginKeySection = (["tasks", "conditions", "triggers", "taskRunners"] as const)
-                .filter(s => blockType === "pluginDefaults" || s === blockType);
-
-            for (const plugin of pluginsStore.plugins || []) {
-                for (const curSection of pluginKeySection) {
-                    const entries = plugin[curSection] as {cls: string, title?: string, deprecated?: boolean}[] | undefined;
-                    if (entries) {
-                        for (const {cls, title} of entries.filter(({deprecated}) => !deprecated)) {
-                            if (cls) {
-                                models.set(cls, title ?? cls);
-                            }
-                        }
-                    }
-                }
-            }
-
-            return models;
-        }
-
         return allRefs.value.reduce((acc: Map<string, string>, item: string) => {
             const def = rootDefinitions.value?.[item]
 
@@ -118,6 +97,12 @@
             if (consolidatedType?.const) {
                 acc.set(consolidatedType.const, def.title ?? consolidatedType.const);
             }
+
+            if (consolidatedType?.enum) {
+                const val = consolidatedType.enum[0];
+                    
+                acc.set(val, def.title ?? val);
+            }
             return acc
         }, new Map<string, string>());
     })

ui/src/translations/en.json

@@ -1377,7 +1377,8 @@
           "listeners": "Listeners",
           "taskDefaults": "Task Defaults",
           "workerGroup": "Worker Group",
-          "checks": "Checks"
+          "checks": "Checks",
+          "updated": "Updated"
         }
       },
       "select": {

ui/tests/storybook/components/no-code/components/tasks/TaskObject.stories.tsx

@@ -43,6 +43,7 @@ const AppTableBlockRender = () => ({
                     schema={schema}
                     modelValue={model.value}
                     onUpdate:modelValue={(value) => model.value = value}
+                    filterType
                 />
             </div>
             <div style={{width: "500px"}}>