diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json index 843b1973..c9a42a6f 100644 --- a/packages/toolkit/package.json +++ b/packages/toolkit/package.json @@ -1,6 +1,6 @@ { "name": "@instill-ai/toolkit", - "version": "0.69.0", + "version": "0.69.1-rc.9", "description": "Instill AI's frontend toolkit", "repository": "https://github.com/instill-ai/design-system.git", "bugs": "https://github.com/instill-ai/design-system/issues", diff --git a/packages/toolkit/src/view/data/DataComponentForm.tsx b/packages/toolkit/src/view/data/DataComponentForm.tsx index 06fc968f..99c6a778 100644 --- a/packages/toolkit/src/view/data/DataComponentForm.tsx +++ b/packages/toolkit/src/view/data/DataComponentForm.tsx @@ -10,6 +10,7 @@ import { composeEdgesFromReferences, extractReferencesFromConfiguration, recursiveReplaceNullAndEmptyStringWithUndefined, + recursiveTransformToString, usePipelineBuilderStore, validateIntillUpstreamTypes, } from "../pipeline-builder"; @@ -31,8 +32,8 @@ export const DataResourceSchema = z // Pinecone - TASK_QUERY namespace: z.string().nullable().optional(), top_k: z.string().nullable().optional(), - include_values: z.coerce.boolean().nullable().optional(), - include_metadata: z.coerce.boolean().nullable().optional(), + include_values: z.boolean().nullable().optional(), + include_metadata: z.boolean().nullable().optional(), vector: z.string().nullable().optional(), // Pinecone - TASK_UPSERT @@ -238,15 +239,7 @@ export const DataComponentForm = ({ }, }); - const { - reset, - watch, - formState: { errors }, - } = form; - - React.useEffect(() => { - console.log(errors); - }, [errors]); + const { reset, watch } = form; React.useEffect(() => { reset({ @@ -258,7 +251,9 @@ export const DataComponentForm = ({ function onSubmit(data: z.infer) { if (!selectedConnectorNodeId) return; - const modifiedData = recursiveReplaceNullAndEmptyStringWithUndefined(data); + const modifiedData = recursiveReplaceNullAndEmptyStringWithUndefined( + recursiveTransformToString(data) + ); const newNodes = nodes.map((node) => { if ( diff --git a/packages/toolkit/src/view/pipeline-builder/components/connector-node/InputPropertyItem.tsx b/packages/toolkit/src/view/pipeline-builder/components/connector-node/InputPropertyItem.tsx index 979f6daf..baabd8c5 100644 --- a/packages/toolkit/src/view/pipeline-builder/components/connector-node/InputPropertyItem.tsx +++ b/packages/toolkit/src/view/pipeline-builder/components/connector-node/InputPropertyItem.tsx @@ -54,9 +54,10 @@ const InputPropertyValue = (props: { ); if (!reference || !reference.nodeId) { - return propertyConfiguration ? ( + return propertyConfiguration !== null || + propertyConfiguration !== undefined ? (
- {propertyConfiguration} + {`${propertyConfiguration}`}
) : null; } diff --git a/packages/toolkit/src/view/pipeline-builder/lib/recursiveTransformToString.ts b/packages/toolkit/src/view/pipeline-builder/lib/recursiveTransformToString.ts index 7e588000..f044f904 100644 --- a/packages/toolkit/src/view/pipeline-builder/lib/recursiveTransformToString.ts +++ b/packages/toolkit/src/view/pipeline-builder/lib/recursiveTransformToString.ts @@ -5,6 +5,12 @@ export function recursiveTransformToString(obj: any) { return obj; } + // We directly allow boolean values, because boolean values + // can't be written in referernce syntax right now + if (typeof obj === "boolean") { + return obj; + } + if (Array.isArray(obj)) { for (const key in obj) { obj[key] = recursiveTransformToString(obj[key]) as any; diff --git a/packages/toolkit/src/view/pipeline-builder/lib/templates.ts b/packages/toolkit/src/view/pipeline-builder/lib/templates.ts index 00315d36..a05c6db0 100644 --- a/packages/toolkit/src/view/pipeline-builder/lib/templates.ts +++ b/packages/toolkit/src/view/pipeline-builder/lib/templates.ts @@ -307,6 +307,7 @@ export const templates: PipelineTemplate[] = [ }, images: "{ai_1.output.images}", }, + task: "TASK_COMMIT", }, type: "COMPONENT_TYPE_CONNECTOR_BLOCKCHAIN", definition_name: "connector-definitions/blockchain-numbers", diff --git a/packages/toolkit/src/view/pipeline-builder/use-node-output-fields/ObjectField.tsx b/packages/toolkit/src/view/pipeline-builder/use-node-output-fields/ObjectField.tsx index 7cba3c0f..a6317ca6 100644 --- a/packages/toolkit/src/view/pipeline-builder/use-node-output-fields/ObjectField.tsx +++ b/packages/toolkit/src/view/pipeline-builder/use-node-output-fields/ObjectField.tsx @@ -14,7 +14,7 @@ export const ObjectField = (props: ObjectFieldProps) => { return (
-
+          
             {JSON.stringify(object, null, 2)}
           
@@ -25,7 +25,7 @@ export const ObjectField = (props: ObjectFieldProps) => { return (
-
+        
           {JSON.stringify(object, null, 2)}
         
diff --git a/packages/toolkit/src/view/pipeline-builder/use-node-output-fields/ObjectsField.tsx b/packages/toolkit/src/view/pipeline-builder/use-node-output-fields/ObjectsField.tsx index 4b8b21e9..23619135 100644 --- a/packages/toolkit/src/view/pipeline-builder/use-node-output-fields/ObjectsField.tsx +++ b/packages/toolkit/src/view/pipeline-builder/use-node-output-fields/ObjectsField.tsx @@ -17,7 +17,7 @@ export const ObjectsField = (props: ObjectsFieldProps) => { {objects?.map((object) => (
               {JSON.stringify(object, null, 2)}
             
@@ -33,7 +33,7 @@ export const ObjectsField = (props: ObjectsFieldProps) => { {objects?.map((object) => (
             {JSON.stringify(object, null, 2)}
           
diff --git a/packages/toolkit/src/view/pipeline-builder/use-node-output-fields/TextField.tsx b/packages/toolkit/src/view/pipeline-builder/use-node-output-fields/TextField.tsx index 0e022e37..7999aedf 100644 --- a/packages/toolkit/src/view/pipeline-builder/use-node-output-fields/TextField.tsx +++ b/packages/toolkit/src/view/pipeline-builder/use-node-output-fields/TextField.tsx @@ -15,7 +15,7 @@ export const TextField = (props: TextFieldProps) => { return (
-
+          
             {text}
           
{text ? ( @@ -32,7 +32,7 @@ export const TextField = (props: TextFieldProps) => { return (
-
+        
           {text}
         
{text ? ( diff --git a/packages/toolkit/src/view/pipeline-builder/use-node-output-fields/TextsField.tsx b/packages/toolkit/src/view/pipeline-builder/use-node-output-fields/TextsField.tsx index 0304baee..4714b636 100644 --- a/packages/toolkit/src/view/pipeline-builder/use-node-output-fields/TextsField.tsx +++ b/packages/toolkit/src/view/pipeline-builder/use-node-output-fields/TextsField.tsx @@ -19,7 +19,7 @@ export const TextsField = (props: TextsFieldProps) => { key={`${title}-${text}-field`} className="flex w-full p-2 relative border rounded-sm border-semantic-bg-line flex-row justify-between gap-x-2" > -
+            
               {text}
             
{text ? ( @@ -42,7 +42,7 @@ export const TextsField = (props: TextsFieldProps) => { key={`${title}-${text}-field`} className="flex w-full p-2 border border-semantic-bg-line rounded-sm relative flex-row justify-between gap-x-2" > -
+            
               {text}
             
{text ? (