AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.
feat(frontend): upgrade RJSF to v6 and implement new FormRenderer system (#11677)
Abhimanyu Yadave5031261706f
diff --git a/autogpt_platform/frontend/package.json b/autogpt_platform/frontend/package.jsonindex 1708ac9053..fcaa150ee1 100644--- a/autogpt_platform/frontend/package.json+++ b/autogpt_platform/frontend/package.json@@ -46,13 +46,14 @@"@radix-ui/react-scroll-area": "1.2.10","@radix-ui/react-select": "2.2.6","@radix-ui/react-separator": "1.1.7",+ "@radix-ui/react-slider": "1.3.6","@radix-ui/react-slot": "1.2.3","@radix-ui/react-switch": "1.2.6","@radix-ui/react-tabs": "1.1.13","@radix-ui/react-toast": "1.2.15","@radix-ui/react-tooltip": "1.2.8",- "@rjsf/core": "5.24.13",- "@rjsf/utils": "5.24.13",+ "@rjsf/core": "6.1.2",+ "@rjsf/utils": "6.1.2","@rjsf/validator-ajv8": "5.24.13","@sentry/nextjs": "10.27.0","@supabase/ssr": "0.7.0",diff --git a/autogpt_platform/frontend/pnpm-lock.yaml b/autogpt_platform/frontend/pnpm-lock.yamlindex 355ffff129..82f516f115 100644--- a/autogpt_platform/frontend/pnpm-lock.yaml+++ b/autogpt_platform/frontend/pnpm-lock.yaml@@ -62,6 +62,9 @@ importers:'@radix-ui/react-separator':specifier: 1.1.7version: 1.1.7(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-slider':+ specifier: 1.3.6+ version: 1.3.6(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])'@radix-ui/react-slot':specifier: 1.2.3version: 1.2.3(@types/[email protected])([email protected])@@ -78,14 +81,14 @@ importers:specifier: 1.2.8version: 1.2.8(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])'@rjsf/core':- specifier: 5.24.13+ specifier: 6.1.2'@rjsf/utils':- specifier: 5.24.13- version: 5.24.13([email protected])+ specifier: 6.1.2+ version: 6.1.2([email protected])'@rjsf/validator-ajv8':specifier: 5.24.13- version: 5.24.13(@rjsf/[email protected]([email protected]))+ version: 5.24.13(@rjsf/[email protected]([email protected]))'@sentry/nextjs':specifier: 10.27.0version: 10.27.0(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))([email protected](@babel/[email protected])(@opentelemetry/[email protected])(@playwright/[email protected])([email protected]([email protected]))([email protected]))([email protected])([email protected]([email protected]))@@ -2310,6 +2313,19 @@ packages:'@types/react-dom':optional: true+ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-JPYb1GuM1bxfjMRlNLE+BcmBC8onfCi60Blk7OBqi2MLTFdS+8401U4uFjnwkOr49BLmXxLC6JHkvAsx5OJvHw==}+ peerDependencies:+ '@types/react': '*'+ '@types/react-dom': '*'+ react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc+ peerDependenciesMeta:+ '@types/react':+ optional: true+ '@types/react-dom':+ optional: true+'@radix-ui/[email protected]':resolution: {integrity: sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==}peerDependencies:@@ -2479,18 +2495,18 @@ packages:react-redux:optional: true- '@rjsf/[email protected]':- resolution: {integrity: sha512-ONTr14s7LFIjx2VRFLuOpagL76sM/HPy6/OhdBfq6UukINmTIs6+aFN0GgcR0aXQHFDXQ7f/fel0o/SO05Htdg==}- engines: {node: '>=14'}+ '@rjsf/[email protected]':+ resolution: {integrity: sha512-fcEO6kArMcVIzTBoBxNStqxzAL417NDw049nmNx11pIcMwUnU5sAkSW18c8kgZOT6v1xaZhQrY+X5cBzzHy9+g==}+ engines: {node: '>=20'}peerDependencies:- '@rjsf/utils': ^5.24.x- react: ^16.14.0 || >=17+ '@rjsf/utils': ^6.x+ react: '>=18'- '@rjsf/[email protected]':- resolution: {integrity: sha512-rNF8tDxIwTtXzz5O/U23QU73nlhgQNYJ+Sv5BAwQOIyhIE2Z3S5tUiSVMwZHt0julkv/Ryfwi+qsD4FiE5rOuw==}- engines: {node: '>=14'}+ '@rjsf/[email protected]':+ resolution: {integrity: sha512-Px3FIkE1KK0745Qng9v88RZ0O7hcLf/1JUu0j00g+r6C8Zyokna42Hz/5TKyyQSKJqgVYcj2Z47YroVLenUM3A==}+ engines: {node: '>=20'}peerDependencies:- react: ^16.14.0 || >=17+ react: '>=18''@rjsf/[email protected]':resolution: {integrity: sha512-oWHP7YK581M8I5cF1t+UXFavnv+bhcqjtL1a7MG/Kaffi0EwhgcYjODrD8SsnrhncsEYMqSECr4ZOEoirnEUWw==}@@ -3643,6 +3659,9 @@ packages:'@webassemblyjs/[email protected]':resolution: {integrity: sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==}+ '@x0k/[email protected]':+ resolution: {integrity: sha512-1734qiJHNX3+cJGDMMw2yz7R+7kpbAtl5NdPs1c/0gO5kYT6s4dMbLXiIfpZNsOYhGZI3aH7FWrj4Zxz7epXNg==}+'@xtuc/[email protected]':resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}@@ -4159,12 +4178,6 @@ packages:resolution: {integrity: sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==}- resolution: {integrity: sha512-TwMbxBNz0l71+8Sc4czv13h4kEqnchV9igQZBi6QUaz09dnz13juGnnaWWJTRsP3brxOoxeB4SA2WELLw1hCtg==}-- resolution: {integrity: sha512-OFNPdQAXnQhDSKioX8/XYT6sdUlXwpeMjfd6ApxMJfyZ4GxmLR1xvMERctlYhlHwIiz6CSpBc2+qYKjHGZw4TQ==}-resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}@@ -4829,6 +4842,9 @@ packages:resolution: {integrity: sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==}+ resolution: {integrity: sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==}+resolution: {integrity: sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==}@@ -5477,13 +5493,6 @@ packages:resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}- resolution: {integrity: sha512-c4WYmDKyJXhs7WWvAWm3uIYnfyWFoIp+JEoX34rctVvEkMYCPGhXtvmFFXiffBbxfZsvQ0RNnV5H7GvDF5HCqQ==}-- resolution: {integrity: sha512-CTUKmIlPJbsWfzRRnOXz+0MjIqvnleIXwFTzz+t9T86HnYX/Rozria6ZVGLktAU9e+NygNljveP+yxqtQp/Q4w==}- engines: {node: '>=12.0.0'}-resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}@@ -5599,6 +5608,9 @@ packages:resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}+ resolution: {integrity: sha512-XEawp1t0gxSi9x01glktRZ5HDy0HXqrM0x5pXQM98EaI0NxO6jVM7omDOxsuEo5UIASAnm2bRp1Jt/e0a2XU8Q==}+resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}@@ -5688,11 +5700,14 @@ packages:resolution: {integrity: sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==}- resolution: {integrity: sha512-DiueEq2bttFcSxUs85GJcQVrOr0+VVsPfj9AEUPqmExJ3f8P/iQNvZHltV4tm1XVhu1kl0vWBZWT3l99izRMaA==}+ resolution: {integrity: sha512-hWEaRxeCDjes1CVUQqU+Ov0mCqBqkGhLKjL98KdbwHSgEWZZSJQeGlJQatVfeZ3RaxrfTrZZ3eczl2dhp5c/pA==}engines: {node: '>= 10'}peerDependencies:react: '>= 0.14.0'+ peerDependenciesMeta:+ react:+ optional: trueresolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}@@ -7578,21 +7593,6 @@ packages:resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}hasBin: true- resolution: {integrity: sha512-DeOy7CnPEziggrOO5CZhVKJw6S3Yi7e9e65R1Nl/RTN1vTQKnzjfvks0/8kQ40FP/dsjRAOd4hxmJ7uLa6vxkg==}-- resolution: {integrity: sha512-LlFybRJEriSuBnUhQyG5bwglhh50EpTL2ul23MPIuR1odjO7XaMLFV8vHGwp7AZciFxtYOeiSCT5st+XSPONiQ==}-- resolution: {integrity: sha512-mTrMk/1ytQHtCY0oNO3dztafHYyGU88KL+jRxWuzfOmQb+4qqnWmI+gykvGp8usKZOM0H7keJHEbRaFiYA0VrA==}-- resolution: {integrity: sha512-22izsYSLojN/P6bppBqhgUDjCkr5RY2jd+N2a3DCAUey8ydvrZ/OkGvFPR7qfOpwR2LC5p4Ngzxz36g5Vgr/hQ==}-- resolution: {integrity: sha512-kRAyotcbNaSYoDnXvb4MHg/0a1egJdLwS6oJ38TJY7aw9n93Fl/3blIXdyYvPOp55CNxywooG/3BcrwNrBpcSg==}-resolution: {integrity: sha512-KxPOq3V2LmfQPP4eqf3Mq/zrT0Dqp2Vmx2Bn285LwVahLc+CsxOM0crBHczm8ijlcjZ0Q5Xd6LW3z3odTPnlrw==}engines: {node: '>= 0.10'}@@ -9903,6 +9903,25 @@ snapshots:'@types/react': 18.3.17'@types/react-dom': 18.3.5(@types/[email protected])+ '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':+ dependencies:+ '@radix-ui/number': 1.1.1+ '@radix-ui/primitive': 1.1.3+ '@radix-ui/react-collection': 1.1.7(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-direction': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-primitive': 2.1.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])+ '@radix-ui/react-use-layout-effect': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-use-previous': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-use-size': 1.1.1(@types/[email protected])([email protected])+ react: 18.3.1+ react-dom: 18.3.1([email protected])+ optionalDependencies:+ '@types/react': 18.3.17+ '@types/react-dom': 18.3.5(@types/[email protected])+dependencies:'@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])@@ -10065,27 +10084,28 @@ snapshots:react: 18.3.1dependencies:- '@rjsf/utils': 5.24.13([email protected])+ '@rjsf/utils': 6.1.2([email protected])lodash: 4.17.21- lodash-es: 4.17.21- markdown-to-jsx: 7.7.13([email protected])+ lodash-es: 4.17.22+ markdown-to-jsx: 8.0.0([email protected])prop-types: 15.8.1react: 18.3.1- '@rjsf/[email protected]([email protected])':+ '@rjsf/[email protected]([email protected])':dependencies:- json-schema-merge-allof: 0.8.1+ '@x0k/json-schema-merge': 1.0.2+ fast-uri: 3.1.0jsonpointer: 5.0.1lodash: 4.17.21- lodash-es: 4.17.21+ lodash-es: 4.17.22react: 18.3.1react-is: 18.3.1dependencies:- '@rjsf/utils': 5.24.13([email protected])+ '@rjsf/utils': 6.1.2([email protected])ajv: 8.17.1ajv-formats: 2.1.1([email protected])lodash: 4.17.21@@ -11502,6 +11522,10 @@ snapshots:'@webassemblyjs/ast': 1.14.1'@xtuc/long': 4.2.2+ '@x0k/[email protected]':+ dependencies:+ '@types/json-schema': 7.0.15+'@xtuc/[email protected]': {}'@xtuc/[email protected]': {}@@ -12041,19 +12065,6 @@ snapshots:- dependencies:- validate.io-array: 1.0.6- validate.io-function: 1.0.2- validate.io-integer-array: 1.0.0-- dependencies:- compute-gcd: 1.2.1- validate.io-array: 1.0.6- validate.io-function: 1.0.2- validate.io-integer-array: 1.0.0-@@ -12932,6 +12943,8 @@ snapshots:+ [email protected]: {}+dependencies:reusify: 1.1.0@@ -13641,16 +13654,6 @@ snapshots:- dependencies:- lodash: 4.17.21-- dependencies:- compute-lcm: 1.1.2- json-schema-compare: 0.2.2- lodash: 4.17.21-@@ -13766,6 +13769,8 @@ snapshots:+ [email protected]: {}+@@ -13845,8 +13850,8 @@ snapshots:- dependencies:+ optionalDependencies:react: 18.3.1@@ -16202,21 +16207,6 @@ snapshots:- [email protected]: {}-- [email protected]: {}-- dependencies:- validate.io-array: 1.0.6- validate.io-integer: 1.0.5-- dependencies:- validate.io-number: 1.0.3-- [email protected]: {}-[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected]):diff --git a/autogpt_platform/frontend/src/app/(platform)/auth/integrations/oauth_callback/route.ts b/autogpt_platform/frontend/src/app/(platform)/auth/integrations/oauth_callback/route.tsindex df1de26300..41d05a9afb 100644--- a/autogpt_platform/frontend/src/app/(platform)/auth/integrations/oauth_callback/route.ts+++ b/autogpt_platform/frontend/src/app/(platform)/auth/integrations/oauth_callback/route.ts@@ -1,4 +1,4 @@-import { OAuthPopupResultMessage } from "@/components/renderers/input-renderer/fields/CredentialField/models/OAuthCredentialModal/useOAuthCredentialModal";+import { OAuthPopupResultMessage } from "./types";import { NextResponse } from "next/server";// This route is intended to be used as the callback for integration OAuth flows,diff --git a/autogpt_platform/frontend/src/app/(platform)/auth/integrations/oauth_callback/types.ts b/autogpt_platform/frontend/src/app/(platform)/auth/integrations/oauth_callback/types.tsnew file mode 100644index 0000000000..9000adf392--- /dev/null+++ b/autogpt_platform/frontend/src/app/(platform)/auth/integrations/oauth_callback/types.ts@@ -0,0 +1,11 @@+export type OAuthPopupResultMessage = { message_type: "oauth_popup_result" } & (+ | {+ success: true;+ code: string;+ state: string;+ }+ | {+ success: false;+ message: string;+ }+);diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunInputDialog/RunInputDialog.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunInputDialog/RunInputDialog.tsxindex 2d9f51c8bf..431feeaade 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunInputDialog/RunInputDialog.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunInputDialog/RunInputDialog.tsx@@ -5,7 +5,7 @@ import { useGraphStore } from "@/app/(platform)/build/stores/graphStore";import { Button } from "@/components/atoms/Button/Button";import { ClockIcon, PlayIcon } from "@phosphor-icons/react";import { Text } from "@/components/atoms/Text/Text";-import { FormRenderer } from "@/components/renderers/input-renderer/FormRenderer";+import { FormRenderer } from "@/components/renderers/InputRenderer/FormRenderer";import { useRunInputDialog } from "./useRunInputDialog";import { CronSchedulerDialog } from "../CronSchedulerDialog/CronSchedulerDialog";diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunInputDialog/useRunInputDialog.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunInputDialog/useRunInputDialog.tsindex f0bb3b1c98..a71ad0bd07 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunInputDialog/useRunInputDialog.ts+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/BuilderActions/components/RunInputDialog/useRunInputDialog.ts@@ -8,7 +8,7 @@ import {import { parseAsInteger, parseAsString, useQueryStates } from "nuqs";import { useMemo, useState } from "react";import { uiSchema } from "../../../FlowEditor/nodes/uiSchema";-import { isCredentialFieldSchema } from "@/components/renderers/input-renderer/fields/CredentialField/helpers";+import { isCredentialFieldSchema } from "@/components/renderers/InputRenderer/custom/CredentialField/helpers";export const useRunInputDialog = ({setIsOpen,diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/DraftRecoveryDialog/DraftRecoveryPopup.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/DraftRecoveryDialog/DraftRecoveryPopup.tsxindex 520addd50f..905d1d4680 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/components/DraftRecoveryDialog/DraftRecoveryPopup.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/DraftRecoveryDialog/DraftRecoveryPopup.tsx@@ -12,16 +12,59 @@ import {import { useDraftRecoveryPopup } from "./useDraftRecoveryPopup";import { Text } from "@/components/atoms/Text/Text";import { AnimatePresence, motion } from "framer-motion";+import { DraftDiff } from "@/lib/dexie/draft-utils";interface DraftRecoveryPopupProps {isInitialLoadComplete: boolean;}+function formatDiffSummary(diff: DraftDiff | null): string {+ if (!diff) return "";++ const parts: string[] = [];++ // Node changes+ const nodeChanges: string[] = [];+ if (diff.nodes.added > 0) nodeChanges.push(`+${diff.nodes.added}`);+ if (diff.nodes.removed > 0) nodeChanges.push(`-${diff.nodes.removed}`);+ if (diff.nodes.modified > 0) nodeChanges.push(`~${diff.nodes.modified}`);++ if (nodeChanges.length > 0) {+ parts.push(+ `${nodeChanges.join("/")} block${diff.nodes.added + diff.nodes.removed + diff.nodes.modified !== 1 ? "s" : ""}`,+ );+ }++ // Edge changes+ const edgeChanges: string[] = [];+ if (diff.edges.added > 0) edgeChanges.push(`+${diff.edges.added}`);+ if (diff.edges.removed > 0) edgeChanges.push(`-${diff.edges.removed}`);+ if (diff.edges.modified > 0) edgeChanges.push(`~${diff.edges.modified}`);++ if (edgeChanges.length > 0) {+ parts.push(+ `${edgeChanges.join("/")} connection${diff.edges.added + diff.edges.removed + diff.edges.modified !== 1 ? "s" : ""}`,+ );+ }++ return parts.join(", ");+}+export function DraftRecoveryPopup({isInitialLoadComplete,}: DraftRecoveryPopupProps) {- const { isOpen, popupRef, nodeCount, edgeCount, savedAt, onLoad, onDiscard } =- useDraftRecoveryPopup(isInitialLoadComplete);+ const {+ isOpen,+ popupRef,+ nodeCount,+ edgeCount,+ diff,+ savedAt,+ onLoad,+ onDiscard,+ } = useDraftRecoveryPopup(isInitialLoadComplete);++ const diffSummary = formatDiffSummary(diff);return (<AnimatePresence>@@ -72,10 +115,9 @@ export function DraftRecoveryPopup({variant="small"className="text-amber-700 dark:text-amber-400">- {nodeCount} block{nodeCount !== 1 ? "s" : ""}, {edgeCount}{" "}- connection- {edgeCount !== 1 ? "s" : ""} •{" "}- {formatTimeAgo(new Date(savedAt).toISOString())}+ {diffSummary ||+ `${nodeCount} block${nodeCount !== 1 ? "s" : ""}, ${edgeCount} connection${edgeCount !== 1 ? "s" : ""}`}{" "}+ • {formatTimeAgo(new Date(savedAt).toISOString())}</Text></div>diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/DraftRecoveryDialog/useDraftRecoveryPopup.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/DraftRecoveryDialog/useDraftRecoveryPopup.tsxindex 0914b04952..7a77f7b4cc 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/components/DraftRecoveryDialog/useDraftRecoveryPopup.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/DraftRecoveryDialog/useDraftRecoveryPopup.tsx@@ -9,6 +9,7 @@ export const useDraftRecoveryPopup = (isInitialLoadComplete: boolean) => {savedAt,nodeCount,edgeCount,+ diff,loadDraft: onLoad,discardDraft: onDiscard,} = useDraftManager(isInitialLoadComplete);@@ -54,6 +55,7 @@ export const useDraftRecoveryPopup = (isInitialLoadComplete: boolean) => {isOpen,nodeCount,edgeCount,+ diff,savedAt,onLoad,onDiscard,diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/helpers/resolve-collision.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/helpers/resolve-collision.tsindex c05f00b5fb..890d1982c8 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/helpers/resolve-collision.ts+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/helpers/resolve-collision.ts@@ -48,8 +48,6 @@ export const resolveCollisions: CollisionAlgorithm = (const width = (node.width ?? node.measured?.width ?? 0) + margin * 2;const height = (node.height ?? node.measured?.height ?? 0) + margin * 2;- console.log("width", width);- console.log("height", height);const x = node.position.x - margin;const y = node.position.y - margin;diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/useDraftManager.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/useDraftManager.tsindex f6d03923bd..a38def74f6 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/useDraftManager.ts+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/useDraftManager.ts@@ -7,7 +7,12 @@ import {DraftData,} from "@/services/builder-draft/draft-service";import { BuilderDraft } from "@/lib/dexie/db";-import { cleanNodes, cleanEdges } from "@/lib/dexie/draft-utils";+import {+ cleanNodes,+ cleanEdges,+ calculateDraftDiff,+ DraftDiff,+} from "@/lib/dexie/draft-utils";import { useNodeStore } from "../../../stores/nodeStore";import { useEdgeStore } from "../../../stores/edgeStore";import { useGraphStore } from "../../../stores/graphStore";@@ -19,6 +24,7 @@ const AUTO_SAVE_INTERVAL_MS = 15000; // 15 secondsinterface DraftRecoveryState {isOpen: boolean;draft: BuilderDraft | null;+ diff: DraftDiff | null;}/**@@ -31,6 +37,7 @@ export function useDraftManager(isInitialLoadComplete: boolean) {const [state, setState] = useState<DraftRecoveryState>({isOpen: false,draft: null,+ diff: null,});const [{ flowID, flowVersion }] = useQueryStates({@@ -207,9 +214,16 @@ export function useDraftManager(isInitialLoadComplete: boolean) {);if (isDifferent && (draft.nodes.length > 0 || draft.edges.length > 0)) {+ const diff = calculateDraftDiff(+ draft.nodes,+ draft.edges,+ currentNodes,+ currentEdges,+ );setState({isOpen: true,draft,+ diff,});} else {await draftService.deleteDraft(effectiveFlowId);@@ -231,6 +245,7 @@ export function useDraftManager(isInitialLoadComplete: boolean) {setState({isOpen: false,draft: null,+ diff: null,});}, [flowID]);@@ -242,8 +257,10 @@ export function useDraftManager(isInitialLoadComplete: boolean) {try {useNodeStore.getState().setNodes(draft.nodes);useEdgeStore.getState().setEdges(draft.edges);+ draft.nodes.forEach((node) => {+ useNodeStore.getState().syncHardcodedValuesWithHandleIds(node.id);+ });- // Restore nodeCounter to prevent ID conflicts when adding new nodesif (draft.nodeCounter !== undefined) {useNodeStore.setState({ nodeCounter: draft.nodeCounter });}@@ -267,6 +284,7 @@ export function useDraftManager(isInitialLoadComplete: boolean) {setState({isOpen: false,draft: null,+ diff: null,});} catch (error) {console.error("[DraftRecovery] Failed to load draft:", error);@@ -275,7 +293,7 @@ export function useDraftManager(isInitialLoadComplete: boolean) {const discardDraft = useCallback(async () => {if (!state.draft) {- setState({ isOpen: false, draft: null });+ setState({ isOpen: false, draft: null, diff: null });return;}@@ -285,7 +303,7 @@ export function useDraftManager(isInitialLoadComplete: boolean) {console.error("[DraftRecovery] Failed to discard draft:", error);}- setState({ isOpen: false, draft: null });+ setState({ isOpen: false, draft: null, diff: null });}, [state.draft]);return {@@ -294,6 +312,7 @@ export function useDraftManager(isInitialLoadComplete: boolean) {savedAt: state.draft?.savedAt ?? 0,nodeCount: state.draft?.nodes.length ?? 0,edgeCount: state.draft?.edges.length ?? 0,+ diff: state.diff,loadDraft,discardDraft,};diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/useFlow.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/useFlow.tsindex 7514611f08..407482073f 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/useFlow.ts+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/useFlow.ts@@ -121,6 +121,14 @@ export const useFlow = () => {if (customNodes.length > 0) {useNodeStore.getState().setNodes([]);addNodes(customNodes);++ // Sync hardcoded values with handle IDs.+ // If a key–value field has a key without a value, the backend omits it from hardcoded values.+ // But if a handleId exists for that key, it causes inconsistency.+ // This ensures hardcoded values stay in sync with handle IDs.+ customNodes.forEach((node) => {+ useNodeStore.getState().syncHardcodedValuesWithHandleIds(node.id);+ });}}, [customNodes, addNodes]);diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/edges/useCustomEdge.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/edges/useCustomEdge.tsindex 8d27f346ef..bf4ba3a418 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/edges/useCustomEdge.ts+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/edges/useCustomEdge.ts@@ -1,12 +1,17 @@-import { Connection as RFConnection, EdgeChange } from "@xyflow/react";+import {+ Connection as RFConnection,+ EdgeChange,+ applyEdgeChanges,+} from "@xyflow/react";import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";import { useCallback } from "react";import { useNodeStore } from "../../../stores/nodeStore";+import { CustomEdge } from "./CustomEdge";export const useCustomEdge = () => {const edges = useEdgeStore((s) => s.edges);const addEdge = useEdgeStore((s) => s.addEdge);- const removeEdge = useEdgeStore((s) => s.removeEdge);+ const setEdges = useEdgeStore((s) => s.setEdges);const onConnect = useCallback((conn: RFConnection) => {@@ -45,14 +50,10 @@ export const useCustomEdge = () => {);const onEdgesChange = useCallback(- (changes: EdgeChange[]) => {- changes.forEach((change) => {- if (change.type === "remove") {- removeEdge(change.id);- }- });+ (changes: EdgeChange<CustomEdge>[]) => {+ setEdges(applyEdgeChanges(changes, edges));},- [removeEdge],+ [edges, setEdges],);return { edges, onConnect, onEdgesChange };diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/handlers/NodeHandle.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/handlers/NodeHandle.tsxindex 4eb2437b65..99edb00c45 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/handlers/NodeHandle.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/handlers/NodeHandle.tsx@@ -1,26 +1,32 @@import { CircleIcon } from "@phosphor-icons/react";import { Handle, Position } from "@xyflow/react";+import { useEdgeStore } from "../../../stores/edgeStore";+import { cleanUpHandleId } from "@/components/renderers/InputRenderer/helpers";+import { cn } from "@/lib/utils";-const NodeHandle = ({+const InputNodeHandle = ({handleId,- isConnected,- side,+ nodeId,}: {handleId: string;- isConnected: boolean;- side: "left" | "right";+ nodeId: string;}) => {+ const cleanedHandleId = cleanUpHandleId(handleId);+ const isInputConnected = useEdgeStore((state) =>+ state.isInputConnected(nodeId ?? "", cleanedHandleId),+ );+return (<Handle- type={side === "left" ? "target" : "source"}- position={side === "left" ? Position.Left : Position.Right}- id={handleId}- className={side === "left" ? "-ml-4 mr-2" : "-mr-2 ml-2"}+ type={"target"}+ position={Position.Left}+ id={cleanedHandleId}+ className={"-ml-6 mr-2"}><div className="pointer-events-none"><CircleIconsize={16}- weight={isConnected ? "fill" : "duotone"}+ weight={isInputConnected ? "fill" : "duotone"}className={"text-gray-400 opacity-100"}/></div>@@ -28,4 +34,35 @@ const NodeHandle = ({);};-export default NodeHandle;+const OutputNodeHandle = ({+ field_name,+ nodeId,+ hexColor,+}: {+ field_name: string;+ nodeId: string;+ hexColor: string;+}) => {+ const isOutputConnected = useEdgeStore((state) =>+ state.isOutputConnected(nodeId, field_name),+ );+ return (+ <Handle+ type={"source"}+ position={Position.Right}+ id={field_name}+ className={"-mr-2 ml-2"}+ >+ <div className="pointer-events-none">+ <CircleIcon+ size={16}+ weight={"duotone"}+ color={isOutputConnected ? hexColor : "gray"}+ className={cn("text-gray-400 opacity-100")}+ />+ </div>+ </Handle>+ );+};++export { InputNodeHandle, OutputNodeHandle };diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/handlers/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/handlers/helpers.tsindex ecacc83146..afaa85a38a 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/handlers/helpers.ts+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/handlers/helpers.ts@@ -1,31 +1,4 @@-/**- * Handle ID Types for different input structures- *- * Examples:- * SIMPLE: "message"- * NESTED: "config.api_key"- * ARRAY: "items_$_0", "items_$_1"- * KEY_VALUE: "headers_#_Authorization", "params_#_limit"- *- * Note: All handle IDs are sanitized to remove spaces and special characters.- * Spaces become underscores, and special characters are removed.- * Example: "user name" becomes "user_name", "[email protected]" becomes "emaildomaincom"- */-export enum HandleIdType {- SIMPLE = "SIMPLE",- NESTED = "NESTED",- ARRAY = "ARRAY",- KEY_VALUE = "KEY_VALUE",-}--const fromRjsfId = (id: string): string => {- if (!id) return "";- const parts = id.split("_");- const filtered = parts.filter(- (p) => p !== "root" && p !== "properties" && p.length > 0,- );- return filtered.join("_") || "";-};+// Here we are handling single level of nesting, if need more in future then i will update itconst sanitizeForHandleId = (str: string): string => {if (!str) return "";@@ -38,51 +11,53 @@ const sanitizeForHandleId = (str: string): string => {.replace(/^_|_$/g, ""); // Remove leading/trailing underscores};-export const generateHandleId = (- fieldKey: string,- nestedValues: string[] = [],- type: HandleIdType = HandleIdType.SIMPLE,-): string => {- if (!fieldKey) return "";-- fieldKey = fromRjsfId(fieldKey);- fieldKey = sanitizeForHandleId(fieldKey);+const cleanTitleId = (id: string): string => {+ if (!id) return "";- if (type === HandleIdType.SIMPLE || nestedValues.length === 0) {- return fieldKey;+ if (id.endsWith("_title")) {+ id = id.slice(0, -6);}-- const sanitizedNestedValues = nestedValues.map((value) =>- sanitizeForHandleId(value),+ const parts = id.split("_");+ const filtered = parts.filter(+ (p) => p !== "root" && p !== "properties" && p.length > 0,);-- switch (type) {- case HandleIdType.NESTED:- return [fieldKey, ...sanitizedNestedValues].join(".");-- case HandleIdType.ARRAY:- return [fieldKey, ...sanitizedNestedValues].join("_$_");-- case HandleIdType.KEY_VALUE:- return [fieldKey, ...sanitizedNestedValues].join("_#_");-- default:- return fieldKey;- }+ const filtered_id = filtered.join("_") || "";+ return filtered_id;};-export const parseKeyValueHandleId = (- handleId: string,- type: HandleIdType,+export const generateHandleIdFromTitleId = (+ fieldKey: string,+ {+ isObjectProperty,+ isAdditionalProperty,+ isArrayItem,+ }: {+ isArrayItem?: boolean;+ isObjectProperty?: boolean;+ isAdditionalProperty?: boolean;+ } = {+ isArrayItem: false,+ isObjectProperty: false,+ isAdditionalProperty: false,+ },): string => {- if (type === HandleIdType.KEY_VALUE) {- return handleId.split("_#_")[1];- } else if (type === HandleIdType.ARRAY) {- return handleId.split("_$_")[1];- } else if (type === HandleIdType.NESTED) {- return handleId.split(".")[1];- } else if (type === HandleIdType.SIMPLE) {- return handleId.split("_")[1];+ if (!fieldKey) return "";++ const filteredKey = cleanTitleId(fieldKey);+ if (isAdditionalProperty || isArrayItem) {+ return filteredKey;+ }+ const cleanedKey = sanitizeForHandleId(filteredKey);++ if (isObjectProperty) {+ // "config_api_key" -> "config.api_key"+ const parts = cleanedKey.split("_");+ if (parts.length >= 2) {+ const baseName = parts[0];+ const propertyName = parts.slice(1).join("_");+ return `${baseName}.${propertyName}`;+ }}- return "";++ return cleanedKey;};diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/CustomNode.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/CustomNode.tsxindex 52068f3acb..3523079b71 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/CustomNode.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/CustomNode.tsx@@ -10,7 +10,7 @@ import { NodeExecutionResult } from "@/app/api/__generated__/models/nodeExecutioimport { NodeContainer } from "./components/NodeContainer";import { NodeHeader } from "./components/NodeHeader";import { FormCreator } from "../FormCreator";-import { preprocessInputSchema } from "@/components/renderers/input-renderer/utils/input-schema-pre-processor";+import { preprocessInputSchema } from "@/components/renderers/InputRenderer/utils/input-schema-pre-processor";import { OutputHandler } from "../OutputHandler";import { NodeAdvancedToggle } from "./components/NodeAdvancedToggle";import { NodeDataRenderer } from "./components/NodeOutput/NodeOutput";@@ -99,7 +99,7 @@ export const CustomNode: React.FC<NodeProps<CustomNode>> = React.memo(nodeId={nodeId}uiType={data.uiType}className={cn(- "bg-white pr-6",+ "bg-white px-4",isWebhook && "pointer-events-none opacity-50",)}showHandles={showHandles}diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeAdvancedToggle.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeAdvancedToggle.tsxindex 4903f2e020..950db1657f 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeAdvancedToggle.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeAdvancedToggle.tsx@@ -8,7 +8,7 @@ export const NodeAdvancedToggle = ({ nodeId }: { nodeId: string }) => {);const setShowAdvanced = useNodeStore((state) => state.setShowAdvanced);return (- <div className="flex items-center justify-between gap-2 rounded-b-xlarge border-t border-slate-200/50 bg-white px-5 py-3.5">+ <div className="flex items-center justify-between gap-2 rounded-b-xlarge border-t border-zinc-200 bg-white px-5 py-3.5"><Text variant="body" className="font-medium text-slate-700">Advanced</Text>diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeContainer.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeContainer.tsxindex f8d5b2e089..da9c13335f 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeContainer.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeContainer.tsx@@ -22,7 +22,7 @@ export const NodeContainer = ({return (<divclassName={cn(- "z-12 max-w-[370px] rounded-xlarge ring-1 ring-slate-200/60",+ "z-12 w-[350px] rounded-xlarge ring-1 ring-slate-200/60",selected && "shadow-lg ring-2 ring-slate-200",status && nodeStyleBasedOnStatus[status],hasErrors ? nodeStyleBasedOnStatus[AgentExecutionStatus.FAILED] : "",diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeHeader.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeHeader.tsxindex 42d14a81a0..4dadccef2b 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeHeader.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeHeader.tsx@@ -23,7 +23,9 @@ export const NodeHeader = ({const updateNodeData = useNodeStore((state) => state.updateNodeData);const title = (data.metadata?.customized_name as string) || data.title;const [isEditingTitle, setIsEditingTitle] = useState(false);- const [editedTitle, setEditedTitle] = useState(title);+ const [editedTitle, setEditedTitle] = useState(+ beautifyString(title).replace("Block", "").trim(),+ );const handleTitleEdit = () => {updateNodeData(nodeId, {@@ -41,7 +43,7 @@ export const NodeHeader = ({};return (- <div className="flex h-auto flex-col gap-1 rounded-xlarge border-b border-slate-200/50 bg-gradient-to-r from-slate-50/80 to-white/90 px-4 py-4 pt-3">+ <div className="flex h-auto flex-col gap-1 rounded-xlarge border-b border-zinc-200 bg-gradient-to-r from-slate-50/80 to-white/90 px-4 py-4 pt-3">{/* Title row with context menu */}<div className="flex items-start justify-between gap-2"><div className="flex min-w-0 flex-1 items-center gap-2">@@ -68,12 +70,12 @@ export const NodeHeader = ({<TooltipTrigger asChild><div><Text variant="large-semibold" className="line-clamp-1">- {beautifyString(title)}+ {beautifyString(title).replace("Block", "").trim()}</Text></div></TooltipTrigger><TooltipContent>- <p>{beautifyString(title)}</p>+ <p>{beautifyString(title).replace("Block", "").trim()}</p></TooltipContent></Tooltip></TooltipProvider>diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/NodeOutput.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/NodeOutput.tsxindex a4b53e3ac3..3f0ae6e350 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/NodeOutput.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/NodeOutput/NodeOutput.tsx@@ -23,7 +23,7 @@ export const NodeDataRenderer = ({ nodeId }: { nodeId: string }) => {}return (- <div className="flex flex-col gap-3 rounded-b-xl border-t border-slate-200/50 px-4 py-4">+ <div className="flex flex-col gap-3 rounded-b-xl border-t border-zinc-200 px-4 py-4"><div className="flex items-center justify-between"><Text variant="body-medium" className="!font-semibold text-slate-700">Node Outputdiff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/StickyNoteBlock.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/StickyNoteBlock.tsxindex 5d57c6c5b6..f900b1633f 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/StickyNoteBlock.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/CustomNode/components/StickyNoteBlock.tsx@@ -1,6 +1,6 @@import { useMemo } from "react";import { FormCreator } from "../../FormCreator";-import { preprocessInputSchema } from "@/components/renderers/input-renderer/utils/input-schema-pre-processor";+import { preprocessInputSchema } from "@/components/renderers/InputRenderer/utils/input-schema-pre-processor";import { CustomNodeData } from "../CustomNode";import { Text } from "@/components/atoms/Text/Text";import { cn } from "@/lib/utils";diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/FormCreator.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/FormCreator.tsxindex cfee0bf89f..28d1bcc0ab 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/FormCreator.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/FormCreator.tsx@@ -3,7 +3,7 @@ import React from "react";import { uiSchema } from "./uiSchema";import { useNodeStore } from "../../../stores/nodeStore";import { BlockUIType } from "../../types";-import { FormRenderer } from "@/components/renderers/input-renderer/FormRenderer";+import { FormRenderer } from "@/components/renderers/InputRenderer/FormRenderer";export const FormCreator = React.memo(({diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/OutputHandler.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/OutputHandler.tsxindex ab3b648ba9..b70a8e239b 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/OutputHandler.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/OutputHandler.tsx@@ -4,7 +4,7 @@ import { CaretDownIcon, InfoIcon } from "@phosphor-icons/react";import { RJSFSchema } from "@rjsf/utils";import { useState } from "react";-import NodeHandle from "../handlers/NodeHandle";+import { OutputNodeHandle } from "../handlers/NodeHandle";import {Tooltip,TooltipContent,@@ -13,7 +13,6 @@ import {} from "@/components/atoms/Tooltip/BaseTooltip";import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";import { getTypeDisplayInfo } from "./helpers";-import { generateHandleId } from "../handlers/helpers";import { BlockUIType } from "../../types";export const OutputHandler = ({@@ -29,8 +28,73 @@ export const OutputHandler = ({const properties = outputSchema?.properties || {};const [isOutputVisible, setIsOutputVisible] = useState(true);+ const showHandles = uiType !== BlockUIType.OUTPUT;++ const renderOutputHandles = (+ schema: RJSFSchema,+ keyPrefix: string = "",+ titlePrefix: string = "",+ ): React.ReactNode[] => {+ return Object.entries(schema).map(+ ([key, fieldSchema]: [string, RJSFSchema]) => {+ const fullKey = keyPrefix ? `${keyPrefix}_#_${key}` : key;+ const fieldTitle = titlePrefix + (fieldSchema?.title || key);++ const isConnected = isOutputConnected(nodeId, fullKey);+ const shouldShow = isConnected || isOutputVisible;+ const { displayType, colorClass, hexColor } =+ getTypeDisplayInfo(fieldSchema);++ return shouldShow ? (+ <div key={fullKey} className="flex flex-col items-end gap-2">+ <div className="relative flex items-center gap-2">+ {fieldSchema?.description && (+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <span+ style={{ marginLeft: 6, cursor: "pointer" }}+ aria-label="info"+ tabIndex={0}+ >+ <InfoIcon />+ </span>+ </TooltipTrigger>+ <TooltipContent>{fieldSchema?.description}</TooltipContent>+ </Tooltip>+ </TooltipProvider>+ )}+ <Text variant="body" className="text-slate-700">+ {fieldTitle}+ </Text>+ <Text variant="small" as="span" className={colorClass}>+ ({displayType})+ </Text>++ {showHandles && (+ <OutputNodeHandle+ field_name={fullKey}+ nodeId={nodeId}+ hexColor={hexColor}+ />+ )}+ </div>++ {/* Recursively render nested properties */}+ {fieldSchema?.properties &&+ renderOutputHandles(+ fieldSchema.properties,+ fullKey,+ `${fieldTitle}.`,+ )}+ </div>+ ) : null;+ },+ );+ };+return (- <div className="flex flex-col items-end justify-between gap-2 rounded-b-xlarge border-t border-slate-200/50 bg-white py-3.5">+ <div className="flex flex-col items-end justify-between gap-2 rounded-b-xlarge border-t border-zinc-200 bg-white py-3.5"><Buttonvariant="ghost"className="mr-4 h-fit min-w-0 p-0 hover:border-transparent hover:bg-transparent"@@ -49,50 +113,9 @@ export const OutputHandler = ({</Text></Button>- {- <div className="flex flex-col items-end gap-2">- {Object.entries(properties).map(([key, property]: [string, any]) => {- const isConnected = isOutputConnected(nodeId, key);- const shouldShow = isConnected || isOutputVisible;- const { displayType, colorClass } = getTypeDisplayInfo(property);-- return shouldShow ? (- <div key={key} className="relative flex items-center gap-2">- {property?.description && (- <TooltipProvider>- <Tooltip>- <TooltipTrigger asChild>- <span- style={{ marginLeft: 6, cursor: "pointer" }}- aria-label="info"- tabIndex={0}- >- <InfoIcon />- </span>- </TooltipTrigger>- <TooltipContent>{property?.description}</TooltipContent>- </Tooltip>- </TooltipProvider>- )}- <Text variant="body" className="text-slate-700">- {property?.title || key}{" "}- </Text>- <Text variant="small" as="span" className={colorClass}>- ({displayType})- </Text>-- <NodeHandle- handleId={- uiType === BlockUIType.AGENT ? key : generateHandleId(key)- }- isConnected={isConnected}- side="right"- />- </div>- ) : null;- })}- </div>- }+ <div className="flex flex-col items-end gap-2">+ {renderOutputHandles(properties)}+ </div></div>);};diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/helpers.tsindex 5572426dc7..39384485f5 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/helpers.ts+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/nodes/helpers.ts@@ -92,14 +92,38 @@ export const getTypeDisplayInfo = (schema: any) => {if (schema?.type === "string" && schema?.format) {const formatMap: Record<string,- { displayType: string; colorClass: string }+ { displayType: string; colorClass: string; hexColor: string }> = {- file: { displayType: "file", colorClass: "!text-green-500" },- date: { displayType: "date", colorClass: "!text-blue-500" },- time: { displayType: "time", colorClass: "!text-blue-500" },- "date-time": { displayType: "datetime", colorClass: "!text-blue-500" },- "long-text": { displayType: "text", colorClass: "!text-green-500" },- "short-text": { displayType: "text", colorClass: "!text-green-500" },+ file: {+ displayType: "file",+ colorClass: "!text-green-500",+ hexColor: "#22c55e",+ },+ date: {+ displayType: "date",+ colorClass: "!text-blue-500",+ hexColor: "#3b82f6",+ },+ time: {+ displayType: "time",+ colorClass: "!text-blue-500",+ hexColor: "#3b82f6",+ },+ "date-time": {+ displayType: "datetime",+ colorClass: "!text-blue-500",+ hexColor: "#3b82f6",+ },+ "long-text": {+ displayType: "text",+ colorClass: "!text-green-500",+ hexColor: "#22c55e",+ },+ "short-text": {+ displayType: "text",+ colorClass: "!text-green-500",+ hexColor: "#22c55e",+ },};const formatInfo = formatMap[schema.format];@@ -131,10 +155,23 @@ export const getTypeDisplayInfo = (schema: any) => {any: "!text-gray-500",};+ const hexColorMap: Record<string, string> = {+ string: "#22c55e",+ number: "#3b82f6",+ integer: "#3b82f6",+ boolean: "#eab308",+ object: "#a855f7",+ array: "#6366f1",+ null: "#6b7280",+ any: "#6b7280",+ };+const colorClass = colorMap[schema?.type] || "!text-gray-500";+ const hexColor = hexColorMap[schema?.type] || "#6b7280";return {displayType,colorClass,+ hexColor,};};diff --git a/autogpt_platform/frontend/src/app/(platform)/build/stores/edgeStore.ts b/autogpt_platform/frontend/src/app/(platform)/build/stores/edgeStore.tsindex cae1d995da..7b17eecfb3 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/stores/edgeStore.ts+++ b/autogpt_platform/frontend/src/app/(platform)/build/stores/edgeStore.ts@@ -4,6 +4,7 @@ import { CustomEdge } from "../components/FlowEditor/edges/CustomEdge";import { customEdgeToLink, linkToCustomEdge } from "../components/helper";import { MarkerType } from "@xyflow/react";import { NodeExecutionResult } from "@/app/api/__generated__/models/nodeExecutionResult";+import { cleanUpHandleId } from "@/components/renderers/InputRenderer/helpers";type EdgeStore = {edges: CustomEdge[];@@ -13,6 +14,8 @@ type EdgeStore = {removeEdge: (edgeId: string) => void;upsertMany: (edges: CustomEdge[]) => void;+ removeEdgesByHandlePrefix: (nodeId: string, handlePrefix: string) => void;+getNodeEdges: (nodeId: string) => CustomEdge[];isInputConnected: (nodeId: string, handle: string) => boolean;isOutputConnected: (nodeId: string, handle: string) => boolean;@@ -79,11 +82,27 @@ export const useEdgeStore = create<EdgeStore>((set, get) => ({return { edges: Array.from(byKey.values()) };}),+ removeEdgesByHandlePrefix: (nodeId, handlePrefix) =>+ set((state) => ({+ edges: state.edges.filter(+ (e) =>+ !(+ e.target === nodeId &&+ e.targetHandle &&+ e.targetHandle.startsWith(handlePrefix)+ ),+ ),+ })),+getNodeEdges: (nodeId) =>get().edges.filter((e) => e.source === nodeId || e.target === nodeId),- isInputConnected: (nodeId, handle) =>- get().edges.some((e) => e.target === nodeId && e.targetHandle === handle),+ isInputConnected: (nodeId, handle) => {+ const cleanedHandle = cleanUpHandleId(handle);+ return get().edges.some(+ (e) => e.target === nodeId && e.targetHandle === cleanedHandle,+ );+ },isOutputConnected: (nodeId, handle) =>get().edges.some((e) => e.source === nodeId && e.sourceHandle === handle),@@ -105,15 +124,15 @@ export const useEdgeStore = create<EdgeStore>((set, get) => ({targetNodeId: string,executionResult: NodeExecutionResult,) => {- set((state) => ({- edges: state.edges.map((edge) => {+ set((state) => {+ let hasChanges = false;++ const newEdges = state.edges.map((edge) => {if (edge.target !== targetNodeId) {return edge;}- const beadData =- edge.data?.beadData ??- new Map<string, NodeExecutionResult["status"]>();+ const beadData = new Map(edge.data?.beadData ?? new Map());const inputValue = edge.targetHandle? executionResult.input_data[edge.targetHandle]@@ -137,6 +156,11 @@ export const useEdgeStore = create<EdgeStore>((set, get) => ({beadUp = beadDown + 1;}+ if (edge.data?.beadUp === beadUp && edge.data?.beadDown === beadDown) {+ return edge;+ }++ hasChanges = true;return {...edge,data: {@@ -146,8 +170,10 @@ export const useEdgeStore = create<EdgeStore>((set, get) => ({beadData,},};- }),- }));+ });++ return hasChanges ? { edges: newEdges } : state;+ });},resetEdgeBeads: () => {diff --git a/autogpt_platform/frontend/src/app/(platform)/build/stores/nodeStore.ts b/autogpt_platform/frontend/src/app/(platform)/build/stores/nodeStore.tsindex 2f41c3bb46..96478c5b6f 100644--- a/autogpt_platform/frontend/src/app/(platform)/build/stores/nodeStore.ts+++ b/autogpt_platform/frontend/src/app/(platform)/build/stores/nodeStore.ts@@ -13,6 +13,10 @@ import { useHistoryStore } from "./historyStore";import { useEdgeStore } from "./edgeStore";import { BlockUIType } from "../components/types";import { pruneEmptyValues } from "@/lib/utils";+import {+ ensurePathExists,+ parseHandleIdToPath,+} from "@/components/renderers/InputRenderer/helpers";// Minimum movement (in pixels) required before logging position change to history// Prevents spamming history with small movements when clicking on inputs inside blocks@@ -62,6 +66,8 @@ type NodeStore = {errors: { [key: string]: string },) => void;clearAllNodeErrors: () => void; // Add this++ syncHardcodedValuesWithHandleIds: (nodeId: string) => void;};export const useNodeStore = create<NodeStore>((set, get) => ({@@ -305,4 +311,35 @@ export const useNodeStore = create<NodeStore>((set, get) => ({})),}));},++ syncHardcodedValuesWithHandleIds: (nodeId: string) => {+ const node = get().nodes.find((n) => n.id === nodeId);+ if (!node) return;++ const handleIds = useEdgeStore.getState().getAllHandleIdsOfANode(nodeId);+ const additionalHandles = handleIds.filter((h) => h.includes("_#_"));++ if (additionalHandles.length === 0) return;++ const hardcodedValues = JSON.parse(+ JSON.stringify(node.data.hardcodedValues || {}),+ );++ let modified = false;++ additionalHandles.forEach((handleId) => {+ const segments = parseHandleIdToPath(handleId);+ if (ensurePathExists(hardcodedValues, segments)) {+ modified = true;+ }+ });++ if (modified) {+ set((state) => ({+ nodes: state.nodes.map((n) =>+ n.id === nodeId ? { ...n, data: { ...n.data, hardcodedValues } } : n,+ ),+ }));+ }+ },}));diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs.tsxindex 07350fb610..60d61fab57 100644--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs.tsx@@ -143,6 +143,7 @@ export function CredentialsInput({size="small"onClick={handleActionButtonClick}className="w-fit"+ type="button">{actionButtonText}</Button>@@ -155,6 +156,7 @@ export function CredentialsInput({size="small"onClick={handleActionButtonClick}className="w-fit"+ type="button">{actionButtonText}</Button>diff --git a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/integrations/page.tsx b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/integrations/page.tsxindex 7d8ead9df7..17800a03a4 100644--- a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/integrations/page.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/integrations/page.tsx@@ -13,7 +13,7 @@ import {import { Button } from "@/components/atoms/Button/Button";import { Dialog } from "@/components/molecules/Dialog/Dialog";import { useToast } from "@/components/molecules/Toast/use-toast";-import { providerIcons } from "@/components/renderers/input-renderer/fields/CredentialField/helpers";+import { providerIcons } from "@/components/renderers/InputRenderer/custom/CredentialField/helpers";import { CredentialsProviderName } from "@/lib/autogpt-server-api";import { useSupabase } from "@/lib/supabase/hooks/useSupabase";import { CredentialsProvidersContext } from "@/providers/agent-credentials/credentials-provider";diff --git a/autogpt_platform/frontend/src/components/contextual/GoogleDrivePicker/GoogleDrivePicker.tsx b/autogpt_platform/frontend/src/components/contextual/GoogleDrivePicker/GoogleDrivePicker.tsxindex 01b98bcdac..e0a43b8c77 100644--- a/autogpt_platform/frontend/src/components/contextual/GoogleDrivePicker/GoogleDrivePicker.tsx+++ b/autogpt_platform/frontend/src/components/contextual/GoogleDrivePicker/GoogleDrivePicker.tsx@@ -49,6 +49,7 @@ export function GoogleDrivePicker(props: Props) {)}<Buttonsize="small"+ type="button"onClick={handleOpenPicker}disabled={props.disabled || isLoading || isAuthInProgress}>diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/FormRenderer.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/FormRenderer.tsxsimilarity index 62%rename from autogpt_platform/frontend/src/components/renderers/input-renderer/FormRenderer.tsxrename to autogpt_platform/frontend/src/components/renderers/InputRenderer/FormRenderer.tsxindex 22c5496efb..6bc785e212 100644--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/FormRenderer.tsx+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/FormRenderer.tsx@@ -1,26 +1,16 @@-import { BlockUIType } from "@/app/(platform)/build/components/types";-import Form from "@rjsf/core";import { RJSFSchema } from "@rjsf/utils";-import { fields } from "./fields";-import { templates } from "./templates";-import { widgets } from "./widgets";import { preprocessInputSchema } from "./utils/input-schema-pre-processor";import { useMemo } from "react";import { customValidator } from "./utils/custom-validator";--type FormContextType = {- nodeId?: string;- uiType?: BlockUIType;- showHandles?: boolean;- size?: "small" | "medium" | "large";-};+import Form from "./registry";+import { ExtendedFormContextType } from "./types";type FormRendererProps = {jsonSchema: RJSFSchema;handleChange: (formData: any) => void;uiSchema: any;initialValues: any;- formContext: FormContextType;+ formContext: ExtendedFormContextType;};export const FormRenderer = ({@@ -33,19 +23,18 @@ export const FormRenderer = ({const preprocessedSchema = useMemo(() => {return preprocessInputSchema(jsonSchema);}, [jsonSchema]);+return (- <div className={"mt-4"}>+ <div className={"mb-6 mt-4"}><Form+ formContext={formContext}+ idPrefix="agpt"+ idSeparator="_%_"schema={preprocessedSchema}validator={customValidator}- fields={fields}- templates={templates}- widgets={widgets}- formContext={formContext}onChange={handleChange}uiSchema={uiSchema}formData={initialValues}- noValidate={true}liveValidate={false}/></div>diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/AnyOfField.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/AnyOfField.tsxnew file mode 100644index 0000000000..3eb5b45a5e--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/AnyOfField.tsx@@ -0,0 +1,86 @@+import { FieldProps, getUiOptions, getWidget } from "@rjsf/utils";+import { AnyOfFieldTitle } from "./components/AnyOfFieldTitle";+import { isEmpty } from "lodash";+import { useAnyOfField } from "./useAnyOfField";+import { getHandleId, updateUiOption } from "../../helpers";+import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";+import { ANY_OF_FLAG } from "../../constants";++export const AnyOfField = (props: FieldProps) => {+ const { registry, schema } = props;+ const { fields } = registry;+ const { SchemaField: _SchemaField } = fields;+ const { nodeId } = registry.formContext;++ const { isInputConnected } = useEdgeStore();++ const uiOptions = getUiOptions(props.uiSchema, props.globalUiOptions);++ const Widget = getWidget({ type: "string" }, "select", registry.widgets);++ const {+ handleOptionChange,+ enumOptions,+ selectedOption,+ optionSchema,+ field_id,+ } = useAnyOfField(props);++ const handleId = getHandleId({+ uiOptions,+ id: field_id + ANY_OF_FLAG,+ schema: schema,+ });++ const updatedUiSchema = updateUiOption(props.uiSchema, {+ handleId: handleId,+ label: false,+ fromAnyOf: true,+ });++ const isHandleConnected = isInputConnected(nodeId, handleId);++ const optionsSchemaField =+ (optionSchema && optionSchema.type !== "null" && (+ <_SchemaField+ {...props}+ schema={optionSchema}+ uiSchema={updatedUiSchema}+ />+ )) ||+ null;++ const selector = (+ <Widget+ id={field_id}+ name={`${props.name}${schema.oneOf ? "__oneof_select" : "__anyof_select"}`}+ schema={{ type: "number", default: 0 }}+ onChange={handleOptionChange}+ onBlur={props.onBlur}+ onFocus={props.onFocus}+ disabled={props.disabled || isEmpty(enumOptions)}+ multiple={false}+ value={selectedOption >= 0 ? selectedOption : undefined}+ options={{ enumOptions }}+ registry={registry}+ placeholder={props.placeholder}+ autocomplete={props.autocomplete}+ className="-ml-1 h-[22px] w-fit gap-1 px-1 pl-2 text-xs font-medium"+ autofocus={props.autofocus}+ label=""+ hideLabel={true}+ readonly={props.readonly}+ />+ );++ return (+ <div>+ <AnyOfFieldTitle+ {...props}+ selector={selector}+ uiSchema={updatedUiSchema}+ />+ {!isHandleConnected && optionsSchemaField}+ </div>+ );+};diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/components/AnyOfFieldTitle.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/components/AnyOfFieldTitle.tsxnew file mode 100644index 0000000000..bd8aadc6a5--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/components/AnyOfFieldTitle.tsx@@ -0,0 +1,78 @@+import {+ descriptionId,+ FieldProps,+ getTemplate,+ getUiOptions,+ titleId,+} from "@rjsf/utils";+import { shouldShowTypeSelector } from "../helpers";+import { useIsArrayItem } from "../../array/context/array-item-context";+import { cleanUpHandleId } from "../../../helpers";+import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";+import { Text } from "@/components/atoms/Text/Text";+import { isOptionalType } from "../../../utils/schema-utils";+import { getTypeDisplayInfo } from "@/app/(platform)/build/components/FlowEditor/nodes/helpers";+import { cn } from "@/lib/utils";++interface customFieldProps extends FieldProps {+ selector: JSX.Element;+}++export const AnyOfFieldTitle = (props: customFieldProps) => {+ const { uiSchema, schema, required, name, registry, fieldPathId, selector } =+ props;+ const { isInputConnected } = useEdgeStore();+ const { nodeId } = registry.formContext;++ const uiOptions = getUiOptions(uiSchema);+ const TitleFieldTemplate = getTemplate(+ "TitleFieldTemplate",+ registry,+ uiOptions,+ );+ const DescriptionFieldTemplate = getTemplate(+ "DescriptionFieldTemplate",+ registry,+ uiOptions,+ );++ const title_id = titleId(fieldPathId ?? "");+ const description_id = descriptionId(fieldPathId ?? "");++ const isArrayItem = useIsArrayItem();++ const handleId = cleanUpHandleId(uiOptions.handleId);+ const isHandleConnected = isInputConnected(nodeId, handleId);++ const { isOptional, type } = isOptionalType(schema); // If we have something like int | null = we will treat it as optional int+ const { displayType, colorClass } = getTypeDisplayInfo(type);++ const shouldShowSelector =+ shouldShowTypeSelector(schema) && !isArrayItem && !isHandleConnected;+ const shoudlShowType = isHandleConnected || (isOptional && type);++ return (+ <div className="flex items-center gap-2">+ <TitleFieldTemplate+ id={title_id}+ title={schema.title || name || ""}+ required={required}+ schema={schema}+ registry={registry}+ uiSchema={uiSchema}+ />+ {shoudlShowType && (+ <Text variant="small" className={cn("text-zinc-700", colorClass)}>+ {isOptional ? `(${displayType})` : "(any)"}+ </Text>+ )}+ {shouldShowSelector && selector}+ <DescriptionFieldTemplate+ id={description_id}+ description={schema.description || ""}+ schema={schema}+ registry={registry}+ />+ </div>+ );+};diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/helpers.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/helpers.tsnew file mode 100644index 0000000000..0a18bbf4d7--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/helpers.ts@@ -0,0 +1,61 @@+import { RJSFSchema, StrictRJSFSchema } from "@rjsf/utils";++const TYPE_PRIORITY = [+ "string",+ "number",+ "integer",+ "boolean",+ "array",+ "object",+] as const;++export function getDefaultTypeIndex(options: StrictRJSFSchema[]): number {+ for (const preferredType of TYPE_PRIORITY) {+ const index = options.findIndex((opt) => opt.type === preferredType);+ if (index >= 0) return index;+ }++ const nonNullIndex = options.findIndex((opt) => opt.type !== "null");+ return nonNullIndex >= 0 ? nonNullIndex : 0;+}++/**+ * Determines if a type selector should be shown for an anyOf schema+ * Returns false for simple optional types (type | null)+ * Returns true for complex anyOf (3+ types or multiple non-null types)+ */+export function shouldShowTypeSelector(+ schema: RJSFSchema | undefined,+): boolean {+ const anyOf = schema?.anyOf;+ if (!anyOf || !Array.isArray(anyOf) || anyOf.length === 0) {+ return false;+ }++ if (anyOf.length === 2 && anyOf.some((opt: any) => opt.type === "null")) {+ return false;+ }++ return anyOf.length >= 3;+}++export function isSimpleOptional(schema: RJSFSchema | undefined): boolean {+ const anyOf = schema?.anyOf;+ return (+ Array.isArray(anyOf) &&+ anyOf.length === 2 &&+ anyOf.some((opt: any) => opt.type === "null")+ );+}++export function getOptionalType(+ schema: RJSFSchema | undefined,+): string | undefined {+ if (!isSimpleOptional(schema)) {+ return undefined;+ }++ const anyOf = schema?.anyOf;+ const nonNullOption = anyOf?.find((opt: any) => opt.type !== "null");+ return nonNullOption ? (nonNullOption as any).type : undefined;+}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/useAnyOfField.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/useAnyOfField.tsnew file mode 100644index 0000000000..15825902b6--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/anyof/useAnyOfField.ts@@ -0,0 +1,96 @@+import { FieldProps, getFirstMatchingOption, mergeSchemas } from "@rjsf/utils";+import { useRef, useState } from "react";+import validator from "@rjsf/validator-ajv8";+import { getDefaultTypeIndex } from "./helpers";+import { cleanUpHandleId } from "../../helpers";+import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";++export const useAnyOfField = (props: FieldProps) => {+ const { registry, schema, options, onChange, formData } = props;+ const { schemaUtils } = registry;++ const getInitialOption = () => {+ if (formData !== undefined && formData !== null) {+ const option = getFirstMatchingOption(+ validator,+ formData,+ options,+ schema,+ );+ return option !== undefined ? option : getDefaultTypeIndex(options);+ }+ return getDefaultTypeIndex(options);+ };++ const [selectedOption, setSelectedOption] =+ useState<number>(getInitialOption());+ const retrievedOptions = useRef<any[]>(+ options.map((opt: any) => schemaUtils.retrieveSchema(opt, formData)),+ );++ const option =+ selectedOption >= 0+ ? retrievedOptions.current[selectedOption] || null+ : null;+ let optionSchema: any | undefined | null;++ // adding top level required to each option schema+ if (option) {+ const { required } = schema;+ optionSchema = required+ ? (mergeSchemas({ required }, option) as any)+ : option;+ }++ const field_id = props.fieldPathId.$id;++ const handleOptionChange = (option?: string) => {+ const intOption = option !== undefined ? parseInt(option, 10) : -1;+ if (intOption === selectedOption) return;++ const newOption =+ intOption >= 0 ? retrievedOptions.current[intOption] : undefined;+ const oldOption =+ selectedOption >= 0+ ? retrievedOptions.current[selectedOption]+ : undefined;++ // When we change the option, we need to clean the form data+ let newFormData = schemaUtils.sanitizeDataForNewSchema(+ newOption,+ oldOption,+ formData,+ );++ const handlePrefix = cleanUpHandleId(field_id);+ console.log("handlePrefix", handlePrefix);+ useEdgeStore+ .getState()+ .removeEdgesByHandlePrefix(registry.formContext.nodeId, handlePrefix);++ // We have cleaned the form data, now we need to get the default form state of new selected option+ if (newOption) {+ newFormData = schemaUtils.getDefaultFormState(+ newOption,+ newFormData,+ "excludeObjectChildren",+ ) as any;+ }++ setSelectedOption(intOption);+ onChange(newFormData, props.fieldPathId.path, undefined, field_id);+ };++ const enumOptions = retrievedOptions.current.map((option, index) => ({+ value: index,+ label: option.type,+ }));++ return {+ handleOptionChange,+ enumOptions,+ selectedOption,+ optionSchema,+ field_id,+ };+};diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/ArrayFieldItemTemplate.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/ArrayFieldItemTemplate.tsxnew file mode 100644index 0000000000..f6b1583b14--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/ArrayFieldItemTemplate.tsx@@ -0,0 +1,34 @@+import {+ ArrayFieldItemTemplateProps,+ getTemplate,+ getUiOptions,+} from "@rjsf/utils";++export default function ArrayFieldItemTemplate(+ props: ArrayFieldItemTemplateProps,+) {+ const { children, buttonsProps, hasToolbar, uiSchema, registry } = props;+ const uiOptions = getUiOptions(uiSchema);+ const ArrayFieldItemButtonsTemplate = getTemplate(+ "ArrayFieldItemButtonsTemplate",+ registry,+ uiOptions,+ );++ return (+ <div>+ <div className="mb-2 flex flex-row flex-wrap items-center">+ <div className="shrink grow">+ <div className="shrink grow">{children}</div>+ </div>+ <div className="flex items-end justify-end">+ {hasToolbar && (+ <div className="-mt-4 mb-2 flex gap-2">+ <ArrayFieldItemButtonsTemplate {...buttonsProps} />+ </div>+ )}+ </div>+ </div>+ </div>+ );+}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/ArrayFieldTemplate.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/ArrayFieldTemplate.tsxnew file mode 100644index 0000000000..7b3f60b5c8--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/ArrayFieldTemplate.tsx@@ -0,0 +1,105 @@+import {+ ArrayFieldTemplateProps,+ buttonId,+ getTemplate,+ getUiOptions,+} from "@rjsf/utils";+import { getHandleId, updateUiOption } from "../../helpers";++export default function ArrayFieldTemplate(props: ArrayFieldTemplateProps) {+ const {+ canAdd,+ disabled,+ fieldPathId,+ uiSchema,+ items,+ optionalDataControl,+ onAddClick,+ readonly,+ registry,+ required,+ schema,+ title,+ } = props;++ const uiOptions = getUiOptions(uiSchema);++ const ArrayFieldDescriptionTemplate = getTemplate(+ "ArrayFieldDescriptionTemplate",+ registry,+ uiOptions,+ );+ const ArrayFieldTitleTemplate = getTemplate(+ "ArrayFieldTitleTemplate",+ registry,+ uiOptions,+ );+ const showOptionalDataControlInTitle = !readonly && !disabled;++ const {+ ButtonTemplates: { AddButton },+ } = registry.templates;++ const { fromAnyOf } = uiOptions;++ const handleId = getHandleId({+ uiOptions,+ id: fieldPathId.$id,+ schema: schema,+ });+ const updatedUiSchema = updateUiOption(uiSchema, {+ handleId: handleId,+ });++ return (+ <div>+ <div className="m-0 flex p-0">+ <div className="m-0 w-full space-y-4 p-0">+ {!fromAnyOf && (+ <div className="flex items-center">+ <ArrayFieldTitleTemplate+ fieldPathId={fieldPathId}+ title={uiOptions.title || title}+ schema={schema}+ uiSchema={updatedUiSchema}+ required={required}+ registry={registry}+ optionalDataControl={+ showOptionalDataControlInTitle+ ? optionalDataControl+ : undefined+ }+ />+ <ArrayFieldDescriptionTemplate+ fieldPathId={fieldPathId}+ description={uiOptions.description || schema.description}+ schema={schema}+ uiSchema={updatedUiSchema}+ registry={registry}+ />+ </div>+ )}+ <div+ key={`array-item-list-${fieldPathId.$id}`}+ className="m-0 mb-2 w-full p-0"+ >+ {!showOptionalDataControlInTitle ? optionalDataControl : undefined}+ {items}+ {canAdd && (+ <div className="mt-4 flex justify-end">+ <AddButton+ id={buttonId(fieldPathId, "add")}+ className="rjsf-array-item-add"+ onClick={onAddClick}+ disabled={disabled || readonly}+ uiSchema={updatedUiSchema}+ registry={registry}+ />+ </div>+ )}+ </div>+ </div>+ </div>+ </div>+ );+}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/ArraySchemaField.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/ArraySchemaField.tsxnew file mode 100644index 0000000000..b926b71f9a--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/ArraySchemaField.tsx@@ -0,0 +1,29 @@+import { FieldProps, getUiOptions } from "@rjsf/utils";+import { getHandleId, updateUiOption } from "../../helpers";+import { ARRAY_ITEM_FLAG } from "../../constants";++const ArraySchemaField = (props: FieldProps) => {+ const { index, registry, fieldPathId } = props;+ const { SchemaField } = registry.fields;++ const uiOptions = getUiOptions(props.uiSchema);++ const handleId = getHandleId({+ uiOptions,+ id: fieldPathId.$id,+ schema: props.schema,+ });+ const updatedUiSchema = updateUiOption(props.uiSchema, {+ handleId: handleId + ARRAY_ITEM_FLAG,+ });++ return (+ <SchemaField+ {...props}+ uiSchema={updatedUiSchema}+ title={"_item-" + index.toString()}+ />+ );+};++export default ArraySchemaField;diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/context/array-item-context.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/context/array-item-context.tsxnew file mode 100644index 0000000000..d4da5b9ea4--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/context/array-item-context.tsx@@ -0,0 +1,33 @@+import React, { createContext, useContext } from "react";++interface ArrayItemContextValue {+ isArrayItem: boolean;+ arrayItemHandleId: string;+}++const ArrayItemContext = createContext<ArrayItemContextValue>({+ isArrayItem: false,+ arrayItemHandleId: "",+});++export const ArrayItemProvider: React.FC<{+ children: React.ReactNode;+ arrayItemHandleId: string;+}> = ({ children, arrayItemHandleId }) => {+ return (+ <ArrayItemContext.Provider value={{ isArrayItem: true, arrayItemHandleId }}>+ {children}+ </ArrayItemContext.Provider>+ );+};++export const useIsArrayItem = (): boolean => {+ // here this will be true if field is inside an array+ const context = useContext(ArrayItemContext);+ return context.isArrayItem;+};++export const useArrayItemHandleId = (): string => {+ const context = useContext(ArrayItemContext);+ return context.arrayItemHandleId;+};diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/helpers.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/helpers.tsnew file mode 100644index 0000000000..96e74e1381--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/helpers.ts@@ -0,0 +1,3 @@+export const generateArrayItemHandleId = (id: string) => {+ return `array-item-${id}`;+};diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/index.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/index.tsnew file mode 100644index 0000000000..eb496d3d6d--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/array/index.ts@@ -0,0 +1,7 @@+export { default as ArrayFieldTemplate } from "./ArrayFieldTemplate";+export { default as ArrayFieldItemTemplate } from "./ArrayFieldItemTemplate";+export { default as ArraySchemaField } from "./ArraySchemaField";+export {+ ArrayItemProvider,+ useIsArrayItem,+} from "./context/array-item-context";diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/base-registry.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/base-registry.tsnew file mode 100644index 0000000000..fe433ce58f--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/base-registry.ts@@ -0,0 +1,69 @@+import {+ RegistryFieldsType,+ RegistryWidgetsType,+ TemplatesType,+} from "@rjsf/utils";+import { AnyOfField } from "./anyof/AnyOfField";+import { AddButton, CopyButton, RemoveButton } from "./standard/buttons";+import {+ ArrayFieldItemTemplate,+ ArraySchemaField,+ ArrayFieldTemplate,+} from "./array";+import {+ ObjectFieldTemplate,+ OptionalDataControlsTemplate,+ WrapIfAdditionalTemplate,+} from "./object";+import { DescriptionField, FieldTemplate, TitleField } from "./standard";+import {+ TextWidget,+ SelectWidget,+ CheckboxWidget,+ FileWidget,+ DateWidget,+ TimeWidget,+ DateTimeWidget,+} from "./standard/widgets";++const NoButton = () => null;++export function generateBaseFields(): RegistryFieldsType {+ return {+ AnyOfField,+ ArraySchemaField,+ };+}++export function generateBaseTemplates(): Partial<TemplatesType> {+ return {+ ArrayFieldItemTemplate,+ ArrayFieldTemplate,+ ButtonTemplates: {+ AddButton,+ CopyButton,+ MoveDownButton: NoButton,+ MoveUpButton: NoButton,+ RemoveButton,+ SubmitButton: NoButton,+ },+ DescriptionFieldTemplate: DescriptionField,+ FieldTemplate,+ ObjectFieldTemplate,+ OptionalDataControlsTemplate,+ TitleFieldTemplate: TitleField,+ WrapIfAdditionalTemplate,+ };+}++export function generateBaseWidgets(): RegistryWidgetsType {+ return {+ TextWidget,+ SelectWidget,+ CheckboxWidget,+ FileWidget,+ DateWidget,+ TimeWidget,+ DateTimeWidget,+ };+}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/index.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/index.tsnew file mode 100644index 0000000000..cfd0a86fa4--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/index.ts@@ -0,0 +1,5 @@+export * from "./array";+export * from "./object";+export * from "./standard";+export * from "./standard/widgets";+export * from "./standard/buttons";diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/object/ObjectFieldTemplate.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/object/ObjectFieldTemplate.tsxnew file mode 100644index 0000000000..80d7682bbc--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/object/ObjectFieldTemplate.tsx@@ -0,0 +1,122 @@+import {+ ADDITIONAL_PROPERTY_FLAG,+ buttonId,+ canExpand,+ descriptionId,+ getTemplate,+ getUiOptions,+ ObjectFieldTemplateProps,+ titleId,+} from "@rjsf/utils";+import { getHandleId, updateUiOption } from "../../helpers";+import React from "react";++export default function ObjectFieldTemplate(props: ObjectFieldTemplateProps) {+ const {+ description,+ title,+ properties,+ required,+ uiSchema,+ fieldPathId,+ schema,+ formData,+ optionalDataControl,+ onAddProperty,+ disabled,+ readonly,+ registry,+ } = props;+ const uiOptions = getUiOptions(uiSchema);++ const TitleFieldTemplate = getTemplate(+ "TitleFieldTemplate",+ registry,+ uiOptions,+ );++ const DescriptionFieldTemplate = getTemplate(+ "DescriptionFieldTemplate",+ registry,+ uiOptions,+ );+ const showOptionalDataControlInTitle = !readonly && !disabled;++ const {+ ButtonTemplates: { AddButton },+ } = registry.templates;++ const additional = ADDITIONAL_PROPERTY_FLAG in schema;++ const handleId = getHandleId({+ uiOptions,+ id: fieldPathId.$id,+ schema,+ });++ const updatedUiSchema = updateUiOption(uiSchema, {+ handleId: handleId,+ });++ return (+ <>+ <div className="flex items-center gap-2">+ {title && !additional && (+ <TitleFieldTemplate+ id={titleId(fieldPathId)}+ title={title}+ required={required}+ schema={schema}+ uiSchema={updatedUiSchema}+ registry={registry}+ optionalDataControl={true ? optionalDataControl : undefined}+ />+ )}+ {description && (+ <DescriptionFieldTemplate+ id={descriptionId(fieldPathId)}+ description={description}+ schema={schema}+ uiSchema={updatedUiSchema}+ registry={registry}+ />+ )}+ </div>++ <div className="flex flex-col">+ {!showOptionalDataControlInTitle ? optionalDataControl : undefined}++ {/* I have cloned it - so i could pass updated uiSchema to the nested children */}+ {properties.map((element: any, index: number) => {+ const clonedContent = React.cloneElement(element.content, {+ ...element.content.props,+ uiSchema: updateUiOption(element.content.props.uiSchema, {+ handleId: handleId,+ }),+ });++ return (+ <div+ key={index}+ className={`${element.hidden ? "hidden" : ""} flex`}+ >+ <div className="w-full">{clonedContent}</div>+ </div>+ );+ })}+ {canExpand(schema, uiSchema, formData) ? (+ <div className="mt-2 flex justify-end">+ <AddButton+ id={buttonId(fieldPathId, "add")}+ onClick={onAddProperty}+ disabled={disabled || readonly}+ className="rjsf-object-property-expand"+ uiSchema={updatedUiSchema}+ registry={registry}+ />+ </div>+ ) : null}+ </div>+ </>+ );+}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/object/OptionalDataControlsTemplate.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/object/OptionalDataControlsTemplate.tsxnew file mode 100644index 0000000000..dc53c6ce5b--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/object/OptionalDataControlsTemplate.tsx@@ -0,0 +1,35 @@+import { OptionalDataControlsTemplateProps } from "@rjsf/utils";+import { PlusCircle } from "lucide-react";++import { IconButton, RemoveButton } from "../standard/buttons";++export default function OptionalDataControlsTemplate(+ props: OptionalDataControlsTemplateProps,+) {+ const { id, registry, label, onAddClick, onRemoveClick } = props;+ if (onAddClick) {+ return (+ <IconButton+ id={id}+ registry={registry}+ className="rjsf-add-optional-data"+ onClick={onAddClick}+ title={label}+ icon={<PlusCircle />}+ size="small"+ />+ );+ } else if (onRemoveClick) {+ return (+ <RemoveButton+ id={id}+ registry={registry}+ className="rjsf-remove-optional-data"+ onClick={onRemoveClick}+ title={label}+ size="small"+ />+ );+ }+ return <em id={id}>{label}</em>;+}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/object/WrapIfAdditionalTemplate.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/object/WrapIfAdditionalTemplate.tsxnew file mode 100644index 0000000000..97478e9eaf--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/object/WrapIfAdditionalTemplate.tsx@@ -0,0 +1,114 @@+import {+ ADDITIONAL_PROPERTY_FLAG,+ buttonId,+ getTemplate,+ getUiOptions,+ titleId,+ WrapIfAdditionalTemplateProps,+} from "@rjsf/utils";++import { Input } from "@/components/atoms/Input/Input";+import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";++export default function WrapIfAdditionalTemplate(+ props: WrapIfAdditionalTemplateProps,+) {+ const {+ classNames,+ style,+ children,+ disabled,+ id,+ label,+ onRemoveProperty,+ onKeyRenameBlur,+ readonly,+ required,+ schema,+ uiSchema,+ registry,+ } = props;+ const { templates, formContext } = registry;+ const uiOptions = getUiOptions(uiSchema);+ // Button templates are not overridden in the uiSchema+ const { RemoveButton } = templates.ButtonTemplates;+ const { isInputConnected } = useEdgeStore();++ const additional = ADDITIONAL_PROPERTY_FLAG in schema;+ const { nodeId } = formContext;+ const handleId = uiOptions.handleId;++ const TitleFieldTemplate = getTemplate(+ "TitleFieldTemplate",+ registry,+ uiOptions,+ );++ if (!additional) {+ return (+ <div className={classNames} style={style}>+ {children}+ </div>+ );+ }++ const keyId = `${id}-key`;+ const generateObjectPropertyTitleId = (id: string, label: string) => {+ return id.replace(`_${label}`, `_#_${label}`);+ };+ const title_id = generateObjectPropertyTitleId(id, label);++ const handleBlur = (e: React.FocusEvent<HTMLInputElement>) => {+ if (e.target.value == "") {+ onRemoveProperty();+ } else {+ onKeyRenameBlur(e);+ }+ };++ const isHandleConnected = isInputConnected(nodeId, handleId);++ return (+ <>+ <div className={`mb-4 flex flex-col gap-1`} style={style}>+ <TitleFieldTemplate+ id={titleId(title_id)}+ title={`#${label}`}+ required={required}+ schema={schema}+ registry={registry}+ uiSchema={uiSchema}+ />+ {!isHandleConnected && (+ <div className="flex flex-1 items-center gap-2">+ <Input+ label={""}+ hideLabel={true}+ required={required}+ defaultValue={label}+ disabled={disabled || readonly}+ id={keyId}+ wrapperClassName="mb-2 w-30"+ name={keyId}+ onBlur={!readonly ? handleBlur : undefined}+ type="text"+ size="small"+ />+ <div className="mt-2"> {children}</div>+ </div>+ )}+ {!isHandleConnected && (+ <div className="-mt-4">+ <RemoveButton+ id={buttonId(id, "remove")}+ disabled={disabled || readonly}+ onClick={onRemoveProperty}+ uiSchema={uiSchema}+ registry={registry}+ />+ </div>+ )}+ </div>+ </>+ );+}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/object/index.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/object/index.tsnew file mode 100644index 0000000000..84bf8baa16--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/object/index.ts@@ -0,0 +1,3 @@+export { default as ObjectFieldTemplate } from "./ObjectFieldTemplate";+export { default as WrapIfAdditionalTemplate } from "./WrapIfAdditionalTemplate";+export { default as OptionalDataControlsTemplate } from "./OptionalDataControlsTemplate";diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/DescriptionField.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/DescriptionField.tsxnew file mode 100644index 0000000000..65b5e4be43--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/DescriptionField.tsx@@ -0,0 +1,32 @@+import { DescriptionFieldProps } from "@rjsf/utils";+import { RichDescription } from "@rjsf/core";+import { InfoIcon } from "@phosphor-icons/react";+import {+ Tooltip,+ TooltipContent,+ TooltipTrigger,+} from "@/components/atoms/Tooltip/BaseTooltip";++export default function DescriptionField(props: DescriptionFieldProps) {+ const { id, description, registry, uiSchema } = props;+ if (!description) {+ return null;+ }++ return (+ <div id={id} className="0 inline w-fit">+ <Tooltip>+ <TooltipTrigger asChild>+ <InfoIcon size={16} className="cursor-pointer" />+ </TooltipTrigger>+ <TooltipContent>+ <RichDescription+ description={description}+ registry={registry}+ uiSchema={uiSchema}+ />+ </TooltipContent>+ </Tooltip>+ </div>+ );+}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/FieldError.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/FieldError.tsxnew file mode 100644index 0000000000..e25a9bc80f--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/FieldError.tsx@@ -0,0 +1,27 @@+import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";+import { Text } from "@/components/atoms/Text/Text";++export const FieldError = ({+ nodeId,+ fieldId,+}: {+ nodeId: string;+ fieldId: string;+}) => {+ const nodeErrors = useNodeStore((state) => {+ const node = state.nodes.find((n) => n.id === nodeId);+ return node?.data?.errors;+ });+ const fieldError =+ nodeErrors?.[fieldId] || nodeErrors?.[fieldId.replace(/_%_/g, ".")] || null;++ return (+ <div>+ {fieldError && (+ <Text variant="small" className="mt-1 pl-4 !text-red-600">+ {fieldError}+ </Text>+ )}+ </div>+ );+};diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/FieldTemplate.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/FieldTemplate.tsxnew file mode 100644index 0000000000..d912d9d06e--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/FieldTemplate.tsx@@ -0,0 +1,131 @@+import {+ ADDITIONAL_PROPERTY_FLAG,+ FieldTemplateProps,+ getTemplate,+ getUiOptions,+ titleId,+} from "@rjsf/utils";++import { isAnyOfChild, isAnyOfSchema } from "../../utils/schema-utils";+import {+ cleanUpHandleId,+ getHandleId,+ isPartOfAnyOf,+ updateUiOption,+} from "../../helpers";++import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";+import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";+import { FieldError } from "./FieldError";++export default function FieldTemplate(props: FieldTemplateProps) {+ const {+ id,+ children,+ displayLabel,+ description,+ rawDescription,+ label,+ hidden,+ required,+ schema,+ uiSchema,+ registry,+ classNames,+ style,+ disabled,+ onKeyRename,+ onKeyRenameBlur,+ onRemoveProperty,+ readonly,+ } = props;+ const { nodeId } = registry.formContext;++ const { isInputConnected } = useEdgeStore();+ const showAdvanced = useNodeStore(+ (state) => state.nodeAdvancedStates[registry.formContext.nodeId ?? ""],+ );++ if (hidden) {+ return <div className="hidden">{children}</div>;+ }++ const uiOptions = getUiOptions(uiSchema);+ const TitleFieldTemplate = getTemplate(+ "TitleFieldTemplate",+ registry,+ uiOptions,+ );+ const WrapIfAdditionalTemplate = getTemplate(+ "WrapIfAdditionalTemplate",+ registry,+ uiOptions,+ );++ const additional = ADDITIONAL_PROPERTY_FLAG in schema;++ const handleId = getHandleId({+ uiOptions,+ id: id,+ schema: schema,+ });+ const updatedUiSchema = updateUiOption(uiSchema, {+ handleId: handleId,+ });+ const isHandleConnected = isInputConnected(nodeId, cleanUpHandleId(handleId));++ const shouldDisplayLabel =+ displayLabel ||+ (schema.type === "boolean" && !isAnyOfChild(uiSchema as any));+ const shouldShowTitleSection = !isAnyOfSchema(schema) && !additional;+ const shouldShowChildren = isAnyOfSchema(schema) || !isHandleConnected;++ const isAdvancedField = (schema as any).advanced === true;+ if (!showAdvanced && isAdvancedField && !isHandleConnected) {+ return null;+ }++ const marginBottom =+ isPartOfAnyOf({ uiOptions }) || isAnyOfSchema(schema) ? 0 : 16;++ return (+ <WrapIfAdditionalTemplate+ classNames={classNames}+ style={style}+ disabled={disabled}+ id={id}+ label={label}+ displayLabel={displayLabel}+ onKeyRename={onKeyRename}+ onKeyRenameBlur={onKeyRenameBlur}+ onRemoveProperty={onRemoveProperty}+ rawDescription={rawDescription}+ readonly={readonly}+ required={required}+ schema={schema}+ uiSchema={updatedUiSchema}+ registry={registry}+ >+ <div className="flex flex-col gap-2" style={{ marginBottom }}>+ {shouldShowTitleSection && (+ <div className="flex items-center gap-2">+ {shouldDisplayLabel && (+ <TitleFieldTemplate+ id={titleId(id)}+ title={label}+ required={required}+ schema={schema}+ uiSchema={updatedUiSchema}+ registry={registry}+ />+ )}+ {shouldDisplayLabel && rawDescription && <span>{description}</span>}+ </div>+ )}+ {shouldShowChildren && children}++ <FieldError nodeId={nodeId} fieldId={cleanUpHandleId(id)} />+ </div>+ </WrapIfAdditionalTemplate>+ );+}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/TitleField.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/TitleField.tsxnew file mode 100644index 0000000000..378ffa7f34--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/TitleField.tsx@@ -0,0 +1,55 @@+import {+ ADDITIONAL_PROPERTY_FLAG,+ descriptionId,+ getUiOptions,+ TitleFieldProps,+} from "@rjsf/utils";++import { Text } from "@/components/atoms/Text/Text";+import { getTypeDisplayInfo } from "@/app/(platform)/build/components/FlowEditor/nodes/helpers";+import { isAnyOfSchema } from "../../utils/schema-utils";+import { cn } from "@/lib/utils";+import { isArrayItem } from "../../helpers";+import { InputNodeHandle } from "@/app/(platform)/build/components/FlowEditor/handlers/NodeHandle";++export default function TitleField(props: TitleFieldProps) {+ const { id, title, required, schema, registry, uiSchema } = props;+ const { nodeId, showHandles } = registry.formContext;+ const uiOptions = getUiOptions(uiSchema);++ const isAnyOf = isAnyOfSchema(schema);+ const { displayType, colorClass } = getTypeDisplayInfo(schema);+ const description_id = descriptionId(id);++ const additional = ADDITIONAL_PROPERTY_FLAG in schema;+ const isArrayItemFlag = isArrayItem({ uiOptions });+ const smallText = isArrayItemFlag || additional;++ const showHandle = uiOptions.showHandles ?? showHandles;+ return (+ <div className="flex items-center">+ {showHandle !== false && (+ <InputNodeHandle handleId={uiOptions.handleId} nodeId={nodeId} />+ )}+ <Text+ variant={isArrayItemFlag ? "small" : "body"}+ id={id}+ className={cn("line-clamp-1", smallText && "text-sm text-zinc-700")}+ >+ {title}+ </Text>+ <Text variant="small" className={"mr-1 text-red-500"}>+ {required ? "*" : null}+ </Text>+ {!isAnyOf && (+ <Text+ variant="small"+ className={cn("ml-2", colorClass)}+ id={description_id}+ >+ ({displayType})+ </Text>+ )}+ </div>+ );+}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/buttons/AddButton.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/buttons/AddButton.tsxnew file mode 100644index 0000000000..901716f56a--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/buttons/AddButton.tsx@@ -0,0 +1,27 @@+import { IconButtonProps, TranslatableString } from "@rjsf/utils";+import { cn } from "@/lib/utils";+import { Button } from "@/components/atoms/Button/Button";+import { PlusIcon } from "@phosphor-icons/react";++export default function AddButton({+ registry,+ className,+ uiSchema: _uiSchema,+ ...props+}: IconButtonProps) {+ const { translateString } = registry;+ return (+ <div className="m-0 w-full p-0">+ <Button+ {...props}+ size="small"+ className={cn("w-full gap-4", className)}+ variant="secondary"+ type="button"+ >+ <PlusIcon size={16} weight="bold" />+ {translateString(TranslatableString.AddItemButton)}+ </Button>+ </div>+ );+}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/buttons/IconButton.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/buttons/IconButton.tsxnew file mode 100644index 0000000000..4a7f011b82--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/buttons/IconButton.tsx@@ -0,0 +1,101 @@+import {+ FormContextType,+ IconButtonProps,+ RJSFSchema,+ StrictRJSFSchema,+ TranslatableString,+} from "@rjsf/utils";+import { ChevronDown, ChevronUp, Copy } from "lucide-react";+import type { VariantProps } from "class-variance-authority";++import { Button } from "@/components/atoms/Button/Button";+import { extendedButtonVariants } from "@/components/atoms/Button/helpers";+import { TrashIcon } from "@phosphor-icons/react";+import { cn } from "@/lib/utils";+import { Text } from "@/components/atoms/Text/Text";++export type AutogptIconButtonProps<+ T = any,+ S extends StrictRJSFSchema = RJSFSchema,+ F extends FormContextType = any,+> = IconButtonProps<T, S, F> & VariantProps<typeof extendedButtonVariants>;++export default function IconButton(props: AutogptIconButtonProps) {+ const {+ icon,+ className,+ uiSchema: _uiSchema,+ registry: _registry,+ iconType: _iconType,+ ...otherProps+ } = props;++ return (+ <Button+ size="icon"+ variant="secondary"+ className={cn(className, "w-fit border border-zinc-200 p-1.5 px-4")}+ {...otherProps}+ type="button"+ >+ {icon}+ <Text variant="body" className="ml-2">+ {" "}+ Remove Item{" "}+ </Text>+ </Button>+ );+}++export function CopyButton(props: AutogptIconButtonProps) {+ const {+ registry: { translateString },+ } = props;+ return (+ <IconButton+ title={translateString(TranslatableString.CopyButton)}+ {...props}+ icon={<Copy className="h-4 w-4" />}+ />+ );+}++export function MoveDownButton(props: AutogptIconButtonProps) {+ const {+ registry: { translateString },+ } = props;+ return (+ <IconButton+ title={translateString(TranslatableString.MoveDownButton)}+ {...props}+ icon={<ChevronDown className="h-4 w-4" />}+ />+ );+}++export function MoveUpButton(props: AutogptIconButtonProps) {+ const {+ registry: { translateString },+ } = props;+ return (+ <IconButton+ title={translateString(TranslatableString.MoveUpButton)}+ {...props}+ icon={<ChevronUp className="h-4 w-4" />}+ />+ );+}++export function RemoveButton(props: AutogptIconButtonProps) {+ const {+ registry: { translateString },+ } = props;+ return (+ <IconButton+ title={translateString(TranslatableString.RemoveButton)}+ {...props}+ className={"border-destructive"}+ icon={<TrashIcon size={16} className="!text-zinc-800" />}+ />+ );+}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/buttons/index.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/buttons/index.tsnew file mode 100644index 0000000000..f083306249--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/buttons/index.ts@@ -0,0 +1,8 @@+export { default as AddButton } from "./AddButton";+export {+ default as IconButton,+ CopyButton,+ RemoveButton,+ MoveUpButton,+ MoveDownButton,+} from "./IconButton";diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/errors/ErrorList.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/errors/ErrorList.tsxnew file mode 100644index 0000000000..39175ef13e--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/errors/ErrorList.tsx@@ -0,0 +1,24 @@+import { ErrorListProps, TranslatableString } from "@rjsf/utils";+import { AlertCircle } from "lucide-react";++import {+ Alert,+ AlertDescription,+ AlertTitle,+} from "@/components/molecules/Alert/Alert";++export default function ErrorList(props: ErrorListProps) {+ const { errors, registry } = props;+ const { translateString } = registry;+ return (+ <Alert variant="error" className="mb-2">+ <AlertCircle className="h-4 w-4" />+ <AlertTitle>{translateString(TranslatableString.ErrorsLabel)}</AlertTitle>+ <AlertDescription className="flex flex-col gap-1">+ {errors.map((error, i: number) => {+ return <span key={i}>• {error.stack}</span>;+ })}+ </AlertDescription>+ </Alert>+ );+}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/errors/index.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/errors/index.tsnew file mode 100644index 0000000000..ccecd3c8c6--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/errors/index.ts@@ -0,0 +1 @@+export { default as ErrorList } from "./ErrorList";diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/helpers.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/helpers.tsnew file mode 100644index 0000000000..327a0e06b6--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/helpers.ts@@ -0,0 +1,76 @@+import { RJSFSchema } from "@rjsf/utils";++export function parseFieldPath(+ rootSchema: RJSFSchema,+ id: string,+ additional: boolean,+ idSeparator: string = "_%_",+): { path: string[]; typeHints: string[] } {+ const segments = id.split(idSeparator).filter(Boolean);+ const typeHints: string[] = [];++ let currentSchema = rootSchema;++ for (let i = 0; i < segments.length; i++) {+ const segment = segments[i];+ const isNumeric = /^\d+$/.test(segment);++ if (isNumeric) {+ typeHints.push("array");+ } else {+ if (additional) {+ typeHints.push("object-key");+ } else {+ typeHints.push("object-property");+ }+ currentSchema = (currentSchema.properties?.[segment] as RJSFSchema) || {};+ }+ }++ return { path: segments, typeHints };+}++// This helper work is simple - it just help us to convert rjsf id to our backend compatible id+// Example : List[dict] = agpt_%_List_0_dict__title -> List_$_0_#_dict+// We remove the prefix and suffix and then we split id by our custom delimiter (_%_)+// then add _$_ delimiter for array and _#_ delimiter for object-key+// and for normal property we add . delimiter++export function getHandleId(+ rootSchema: RJSFSchema,+ id: string,+ additional: boolean,+ idSeparator: string = "_%_",+): string {+ const idPrefix = "agpt_%_";+ const idSuffix = "__title";++ if (id.startsWith(idPrefix)) {+ id = id.slice(idPrefix.length);+ }+ if (id.endsWith(idSuffix)) {+ id = id.slice(0, -idSuffix.length);+ }++ const { path, typeHints } = parseFieldPath(+ rootSchema,+ id,+ additional,+ idSeparator,+ );++ return path+ .map((seg, i) => {+ const type = typeHints[i];+ if (type === "array") {+ return `_$_${seg}`;+ }+ if (type === "object-key") {+ return `_${seg}`; // we haven't added _#_ delimiter for object-key because it's already added in the id - check WrapIfAdditionalTemplate.tsx+ }++ return `.${seg}`;+ })+ .join("")+ .slice(1);+}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/index.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/index.tsnew file mode 100644index 0000000000..870753151c--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/index.ts@@ -0,0 +1,3 @@+export { default as FieldTemplate } from "./FieldTemplate";+export { default as TitleField } from "./TitleField";+export { default as DescriptionField } from "./DescriptionField";diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/SwitchWidget.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/CheckboxInput/CheckBoxWidget.tsxsimilarity index 87%rename from autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/SwitchWidget.tsxrename to autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/CheckboxInput/CheckBoxWidget.tsxindex d15ec18a9a..ff93528492 100644--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/SwitchWidget.tsx+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/CheckboxInput/CheckBoxWidget.tsx@@ -1,8 +1,9 @@import { WidgetProps } from "@rjsf/utils";import { Switch } from "@/components/atoms/Switch/Switch";-export function SwitchWidget(props: WidgetProps) {+export function CheckboxWidget(props: WidgetProps) {const { value = false, onChange, disabled, readonly, autofocus, id } = props;+return (<Switchid={id}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/CheckboxInput/index.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/CheckboxInput/index.tsnew file mode 100644index 0000000000..d04c6a67b5--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/CheckboxInput/index.ts@@ -0,0 +1 @@+export { CheckboxWidget } from "./CheckBoxWidget";diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/DateInputWidget.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/DateInput/DateWidget.tsxsimilarity index 88%rename from autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/DateInputWidget.tsxrename to autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/DateInput/DateWidget.tsxindex 9e7cc3f058..1a861821e5 100644--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/DateInputWidget.tsx+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/DateInput/DateWidget.tsx@@ -1,8 +1,7 @@-import * as React from "react";import { WidgetProps } from "@rjsf/utils";import { DateInput } from "@/components/atoms/DateInput/DateInput";-export const DateInputWidget = (props: WidgetProps) => {+export const DateWidget = (props: WidgetProps) => {const {value,onChange,diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/DateInput/index.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/DateInput/index.tsnew file mode 100644index 0000000000..3ba465c4f4--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/DateInput/index.ts@@ -0,0 +1 @@+export { DateWidget } from "./DateWidget";diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/DateTimeInputWidget.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/DateTimeInput/DateTimeWidget.tsxsimilarity index 91%rename from autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/DateTimeInputWidget.tsxrename to autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/DateTimeInput/DateTimeWidget.tsxindex 2e85a610b5..50f6e378fb 100644--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/DateTimeInputWidget.tsx+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/DateTimeInput/DateTimeWidget.tsx@@ -1,7 +1,7 @@import { WidgetProps } from "@rjsf/utils";import { DateTimeInput } from "@/components/atoms/DateTimeInput/DateTimeInput";-export const DateTimeInputWidget = (props: WidgetProps) => {+export const DateTimeWidget = (props: WidgetProps) => {const {value,onChange,diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/DateTimeInput/index.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/DateTimeInput/index.tsnew file mode 100644index 0000000000..bf7c084f5a--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/DateTimeInput/index.ts@@ -0,0 +1 @@+export { DateTimeWidget } from "./DateTimeWidget";diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/FileWidget.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/FileInput/FileWidget.tsxsimilarity index 100%rename from autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/FileWidget.tsxrename to autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/FileInput/FileWidget.tsxdiff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/FileInput/index.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/FileInput/index.tsnew file mode 100644index 0000000000..e23b50bfd0--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/FileInput/index.ts@@ -0,0 +1 @@+export { FileWidget } from "./FileWidget";diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/SelectWidget.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/SelectInput/SelectWidget.tsxsimilarity index 87%rename from autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/SelectWidget.tsxrename to autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/SelectInput/SelectWidget.tsxindex db68a1628c..894004db40 100644--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/SelectWidget.tsx+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/SelectInput/SelectWidget.tsx@@ -14,8 +14,16 @@ import {} from "@/components/__legacy__/ui/multiselect";export const SelectWidget = (props: WidgetProps) => {- const { options, value, onChange, disabled, readonly, id, formContext } =- props;+ const {+ options,+ value,+ onChange,+ disabled,+ readonly,+ className,+ id,+ formContext,+ } = props;const enumOptions = options.enumOptions || [];const type = mapJsonSchemaTypeToInputType(props.schema);const { size = "small" } = formContext || {};@@ -36,7 +44,7 @@ export const SelectWidget = (props: WidgetProps) => {</MultiSelectorTrigger><MultiSelectorContent><MultiSelectorList>- {enumOptions?.map((option) => (+ {enumOptions?.map((option: any) => (<MultiSelectorItem key={option.value} value={option.value}>{option.label}</MultiSelectorItem>@@ -56,12 +64,13 @@ export const SelectWidget = (props: WidgetProps) => {value={value ?? ""}onValueChange={onChange}options={- enumOptions?.map((option) => ({+ enumOptions?.map((option: any) => ({value: option.value,label: option.label,})) || []}wrapperClassName="!mb-0 "+ className={className}/>);};diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/SelectInput/index.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/SelectInput/index.tsnew file mode 100644index 0000000000..9a64291abc--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/SelectInput/index.ts@@ -0,0 +1 @@+export { SelectWidget } from "./SelectWidget";diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/TextInputWidget/InputExpanderModal.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/TextInput/TextInputExpanderModal.tsxsimilarity index 100%rename from autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/TextInputWidget/InputExpanderModal.tsxrename to autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/TextInput/TextInputExpanderModal.tsxdiff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/TextInputWidget/TextInputWidget.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/TextInput/TextWidget.tsxsimilarity index 91%rename from autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/TextInputWidget/TextInputWidget.tsxrename to autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/TextInput/TextWidget.tsxindex 83fe826223..33a55581c7 100644--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/TextInputWidget/TextInputWidget.tsx+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/TextInput/TextWidget.tsx@@ -14,15 +14,12 @@ import {TooltipTrigger,} from "@/components/atoms/Tooltip/BaseTooltip";import { BlockUIType } from "@/lib/autogpt-server-api/types";-import { InputExpanderModal } from "./InputExpanderModal";import { ArrowsOutIcon } from "@phosphor-icons/react";+import { InputExpanderModal } from "./TextInputExpanderModal";-export const TextInputWidget = (props: WidgetProps) => {- const { schema, formContext } = props;- const { uiType, size = "small" } = formContext as {- uiType: BlockUIType;- size?: string;- };+export default function TextWidget(props: WidgetProps) {+ const { schema, placeholder, registry } = props;+ const { size, uiType } = registry.formContext;const [isModalOpen, setIsModalOpen] = useState(false);@@ -51,7 +48,7 @@ export const TextInputWidget = (props: WidgetProps) => {handleChange: (v: string) => (v === "" ? undefined : Number(v)),},[InputType.INTEGER]: {- htmlType: "number",+ htmlType: "account",placeholder: "Enter integer value...",handleChange: (v: string) => (v === "" ? undefined : Number(v)),},@@ -122,7 +119,7 @@ export const TextInputWidget = (props: WidgetProps) => {wrapperClassName="mb-0 flex-1"value={props.value ?? ""}onChange={handleChange}- placeholder={schema.placeholder || config.placeholder}+ placeholder={placeholder || config.placeholder}required={props.required}disabled={props.disabled}className={showExpandButton ? "pr-8" : ""}@@ -152,8 +149,8 @@ export const TextInputWidget = (props: WidgetProps) => {title={schema.title || "Edit value"}description={schema.description || ""}defaultValue={props.value ?? ""}- placeholder={schema.placeholder || config.placeholder}+ placeholder={placeholder || config.placeholder}/></>);-};+}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/TextInput/index.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/TextInput/index.tsnew file mode 100644index 0000000000..102db07ade--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/TextInput/index.ts@@ -0,0 +1,2 @@+export { default } from "./TextWidget";+export { InputExpanderModal } from "./TextInputExpanderModal";diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/TimeInputWidget.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/TimeInput/TimeWidget.tsxsimilarity index 91%rename from autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/TimeInputWidget.tsxrename to autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/TimeInput/TimeWidget.tsxindex 032c33e62c..152aae7298 100644--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/TimeInputWidget.tsx+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/TimeInput/TimeWidget.tsx@@ -1,7 +1,7 @@import { WidgetProps } from "@rjsf/utils";import { TimeInput } from "@/components/atoms/TimeInput/TimeInput";-export const TimeInputWidget = (props: WidgetProps) => {+export const TimeWidget = (props: WidgetProps) => {const { value, onChange, disabled, readonly, placeholder, id, formContext } =props;const { size = "small" } = formContext || {};diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/TimeInput/index.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/TimeInput/index.tsnew file mode 100644index 0000000000..488e184c08--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/TimeInput/index.ts@@ -0,0 +1 @@+export { TimeWidget } from "./TimeWidget";diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/index.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/index.tsnew file mode 100644index 0000000000..5a370422e2--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/base/standard/widgets/index.ts@@ -0,0 +1,7 @@+export { default as TextWidget } from "./TextInput";+export { SelectWidget } from "./SelectInput";+export { CheckboxWidget } from "./CheckboxInput";+export { FileWidget } from "./FileInput";+export { DateWidget } from "./DateInput";+export { TimeWidget } from "./TimeInput";+export { DateTimeWidget } from "./DateTimeInput";diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/constants.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/constants.tsnew file mode 100644index 0000000000..144d850a00--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/constants.ts@@ -0,0 +1,8 @@+export const ANY_OF_FLAG = "__anyOf";+export const ARRAY_FLAG = "__array";+export const OBJECT_FLAG = "__object";+export const KEY_PAIR_FLAG = "__keyPair";+export const TITLE_FLAG = "__title";+export const ARRAY_ITEM_FLAG = "__arrayItem";+export const ID_PREFIX = "agpt_@_";+export const ID_PREFIX_ARRAY = "agpt_%_";diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/CredentialField/CredentialField.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/CredentialField/CredentialField.tsxnew file mode 100644index 0000000000..f814fba93f--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/CredentialField/CredentialField.tsx@@ -0,0 +1,73 @@+import React, { useMemo } from "react";+import { FieldProps, getUiOptions } from "@rjsf/utils";+import {+ BlockIOCredentialsSubSchema,+ CredentialsMetaInput,+} from "@/lib/autogpt-server-api";+import { CredentialsInput } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs";+import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";+import { useShallow } from "zustand/react/shallow";+import { CredentialFieldTitle } from "./components/CredentialFieldTitle";++export const CredentialsField = (props: FieldProps) => {+ const { formData, onChange, schema, registry, fieldPathId } = props;++ const formContext = registry.formContext;+ const uiOptions = getUiOptions(props.uiSchema);+ const nodeId = formContext?.nodeId;++ // Get sibling inputs (hardcoded values) from the node store+ const hardcodedValues = useNodeStore(+ useShallow((state) => (nodeId ? state.getHardCodedValues(nodeId) : {})),+ );++ const handleChange = (newValue: any) => {+ onChange(newValue, fieldPathId?.path);+ };++ const handleSelectCredentials = (credentialsMeta?: CredentialsMetaInput) => {+ if (credentialsMeta) {+ handleChange({+ id: credentialsMeta.id,+ provider: credentialsMeta.provider,+ title: credentialsMeta.title,+ type: credentialsMeta.type,+ });+ } else {+ handleChange(undefined);+ }+ };++ // Convert formData to CredentialsMetaInput format+ const selectedCredentials: CredentialsMetaInput | undefined = useMemo(+ () =>+ formData?.id+ ? {+ id: formData.id,+ provider: formData.provider,+ title: formData.title,+ type: formData.type,+ }+ : undefined,+ [formData?.id, formData?.provider, formData?.title, formData?.type],+ );++ return (+ <div className="flex flex-col gap-2">+ <CredentialFieldTitle+ fieldPathId={fieldPathId}+ registry={registry}+ uiOptions={uiOptions}+ schema={schema}+ />+ <CredentialsInput+ schema={schema as BlockIOCredentialsSubSchema}+ selectedCredentials={selectedCredentials}+ onSelectCredentials={handleSelectCredentials}+ siblingInputs={hardcodedValues}+ showTitle={false}+ readOnly={formContext?.readOnly}+ />+ </div>+ );+};diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/CredentialField/components/CredentialFieldTitle.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/CredentialField/components/CredentialFieldTitle.tsxnew file mode 100644index 0000000000..ca14c8a4ce--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/CredentialField/components/CredentialFieldTitle.tsx@@ -0,0 +1,66 @@+import {+ getTemplate,+ UiSchema,+ Registry,+ RJSFSchema,+ FieldPathId,+ titleId,+ descriptionId,+} from "@rjsf/utils";+import { getCredentialProviderFromSchema, toDisplayName } from "../helpers";+import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";+import { BlockIOCredentialsSubSchema } from "@/lib/autogpt-server-api";+import { updateUiOption } from "../../../helpers";+import { uiSchema } from "@/app/(platform)/build/components/FlowEditor/nodes/uiSchema";++export const CredentialFieldTitle = (props: {+ registry: Registry;+ uiOptions: UiSchema;+ schema: RJSFSchema;+ fieldPathId: FieldPathId;+}) => {+ const { registry, uiOptions, schema, fieldPathId } = props;+ const { nodeId } = registry.formContext;++ const TitleFieldTemplate = getTemplate(+ "TitleFieldTemplate",+ registry,+ uiOptions,+ );++ const DescriptionFieldTemplate = getTemplate(+ "DescriptionFieldTemplate",+ registry,+ uiOptions,+ );++ const credentialProvider = toDisplayName(+ getCredentialProviderFromSchema(+ useNodeStore.getState().getHardCodedValues(nodeId),+ schema as BlockIOCredentialsSubSchema,+ ) ?? "",+ );++ const updatedUiSchema = updateUiOption(uiSchema, {+ showHandles: false,+ });++ return (+ <div className="flex items-center gap-2">+ <TitleFieldTemplate+ id={titleId(fieldPathId ?? "")}+ title={credentialProvider ?? ""}+ required={true}+ schema={schema}+ registry={registry}+ uiSchema={updatedUiSchema}+ />+ <DescriptionFieldTemplate+ id={descriptionId(fieldPathId ?? "")}+ description={schema.description || ""}+ schema={schema}+ registry={registry}+ />+ </div>+ );+};diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/helpers.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/CredentialField/helpers.tssimilarity index 100%rename from autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/helpers.tsrename to autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/CredentialField/helpers.tsdiff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/GoogleDrivePickerField/GoogleDrivePickerField.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/GoogleDrivePickerField/GoogleDrivePickerField.tsxnew file mode 100644index 0000000000..51c5806ae5--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/GoogleDrivePickerField/GoogleDrivePickerField.tsx@@ -0,0 +1,21 @@+import { GoogleDrivePickerInput } from "@/components/contextual/GoogleDrivePicker/GoogleDrivePickerInput";+import { GoogleDrivePickerConfig } from "@/lib/autogpt-server-api";+import { FieldProps, getUiOptions } from "@rjsf/utils";++export const GoogleDrivePickerField = (props: FieldProps) => {+ const { schema, uiSchema, onChange, fieldPathId, formData } = props;+ const uiOptions = getUiOptions(uiSchema);+ const config: GoogleDrivePickerConfig = schema.google_drive_picker_config;++ return (+ <div>+ <GoogleDrivePickerInput+ config={config}+ value={formData}+ onChange={(value) => onChange(value, fieldPathId.path)}+ className={uiOptions.className}+ showRemoveButton={true}+ />+ </div>+ );+};diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/custom-registry.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/custom-registry.tsnew file mode 100644index 0000000000..91850e3f10--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/custom/custom-registry.ts@@ -0,0 +1,52 @@+import { FieldProps, RJSFSchema, RegistryFieldsType } from "@rjsf/utils";+import { CredentialsField } from "./CredentialField/CredentialField";+import { GoogleDrivePickerField } from "./GoogleDrivePickerField/GoogleDrivePickerField";++export interface CustomFieldDefinition {+ id: string;+ matcher: (schema: any) => boolean;+ component: (props: FieldProps<any, RJSFSchema, any>) => JSX.Element | null;+}++export const CUSTOM_FIELDS: CustomFieldDefinition[] = [+ {+ id: "custom/credential_field",+ matcher: (schema: any) => {+ return (+ typeof schema === "object" &&+ schema !== null &&+ "credentials_provider" in schema+ );+ },+ component: CredentialsField,+ },+ {+ id: "custom/google_drive_picker_field",+ matcher: (schema: any) => {+ return (+ "google_drive_picker_config" in schema ||+ ("format" in schema && schema.format === "google-drive-picker")+ );+ },+ component: GoogleDrivePickerField,+ },+];++export function findCustomFieldId(schema: any): string | null {+ for (const field of CUSTOM_FIELDS) {+ if (field.matcher(schema)) {+ return field.id;+ }+ }+ return null;+}++export function generateCustomFields(): RegistryFieldsType {+ return CUSTOM_FIELDS.reduce(+ (acc, field) => {+ acc[field.id] = field.component;+ return acc;+ },+ {} as Record<string, any>,+ );+}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/docs/HEIRARCHY.md b/autogpt_platform/frontend/src/components/renderers/InputRenderer/docs/HEIRARCHY.mdnew file mode 100644index 0000000000..45b4276946--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/docs/HEIRARCHY.md@@ -0,0 +1,291 @@+# Input Renderer 2 - Hierarchy++## Flow Overview++```+FormRenderer2 → Form (RJSF) → ObjectFieldTemplate → FieldTemplate → Widget/Field+```++---++## Component Layers++### 1. Root (FormRenderer2)++- Entry point+- Preprocesses schema+- Passes to RJSF Form++### 2. Form (registry/Form.tsx)++- RJSF themed form+- Combines: templates + widgets + fields++### 3. Templates (decide layout/structure)++| Template | When Used |+| -------------------------- | ------------------------------------------- |+| `ObjectFieldTemplate` | `type: "object"` |+| `ArrayFieldTemplate` | `type: "array"` |+| `FieldTemplate` | Wraps every field (title, errors, children) |+| `ArrayFieldItemTemplate` | Each array item |+| `WrapIfAdditionalTemplate` | Additional properties in objects |++### 4. Fields (custom rendering logic)++| Field | When Used |+| ------------------ | ---------------------------- |+| `AnyOfField` | `anyOf` or `oneOf` in schema |+| `ArraySchemaField` | Array type handling |++### 5. Widgets (actual input elements)++| Widget | Input Type |+| ---------------- | ----------------------- |+| `TextWidget` | string, number, integer |+| `SelectWidget` | enum, anyOf selector |+| `CheckboxWidget` | boolean |+| `FileWidget` | file upload |+| `DateWidget` | date |+| `TimeWidget` | time |+| `DateTimeWidget` | datetime |++---++## Your Schema Hierarchy++```+Root (type: object)+└── ObjectFieldTemplate+ │+ ├── name (string, required)+ │ └── FieldTemplate → TextWidget+ │+ ├── value (anyOf)+ │ └── FieldTemplate → AnyOfField+ │ └── Selector dropdown + selected type:+ │ ├── String → TextWidget+ │ ├── Number → TextWidget+ │ ├── Integer → TextWidget+ │ ├── Boolean → CheckboxWidget+ │ ├── Array → ArrayFieldTemplate → items+ │ ├── Object → ObjectFieldTemplate+ │ └── Null → nothing+ │+ ├── title (anyOf: string | null)+ │ └── FieldTemplate → AnyOfField+ │ └── String → TextWidget OR Null → nothing+ │+ ├── description (anyOf: string | null)+ │ └── FieldTemplate → AnyOfField+ │ └── String → TextWidget OR Null → nothing+ │+ ├── placeholder_values (array of strings)+ │ └── FieldTemplate → ArrayFieldTemplate+ │ └── ArrayFieldItemTemplate (per item)+ │ └── TextWidget+ │+ ├── advanced (boolean)+ │ └── FieldTemplate → CheckboxWidget+ │+ └── secret (boolean)+ └── FieldTemplate → CheckboxWidget+```++---++## Nested Examples (up to 3 levels)++### Simple Array (strings)++```json+{ "tags": { "type": "array", "items": { "type": "string" } } }+```++```+Level 1: ObjectFieldTemplate (root)+└── Level 2: FieldTemplate → ArrayFieldTemplate+ └── Level 3: ArrayFieldItemTemplate → TextWidget+```++### Array of Objects++```json+{+ "users": {+ "type": "array",+ "items": {+ "type": "object",+ "properties": {+ "name": { "type": "string" },+ "age": { "type": "integer" }+ }+ }+ }+}+```++```+Level 1: ObjectFieldTemplate (root)+└── Level 2: FieldTemplate → ArrayFieldTemplate+ └── Level 3: ArrayFieldItemTemplate → ObjectFieldTemplate+ ├── FieldTemplate → TextWidget (name)+ └── FieldTemplate → TextWidget (age)+```++### Nested Object (3 levels)++```json+{+ "config": {+ "type": "object",+ "properties": {+ "database": {+ "type": "object",+ "properties": {+ "host": { "type": "string" },+ "port": { "type": "integer" }+ }+ }+ }+ }+}+```++```+Level 1: ObjectFieldTemplate (root)+└── config+ └── Level 2: FieldTemplate → ObjectFieldTemplate+ └── database+ └── Level 3: FieldTemplate → ObjectFieldTemplate+ ├── FieldTemplate → TextWidget (host)+ └── FieldTemplate → TextWidget (port)+```++### Array of Arrays (nested array)++```json+{+ "matrix": {+ "type": "array",+ "items": {+ "type": "array",+ "items": { "type": "number" }+ }+ }+}+```++```+Level 1: ObjectFieldTemplate (root)+└── Level 2: FieldTemplate → ArrayFieldTemplate+ └── Level 3: ArrayFieldItemTemplate → ArrayFieldTemplate+ └── ArrayFieldItemTemplate → TextWidget+```++### Complex: Object → Array → Object++```json+{+ "company": {+ "type": "object",+ "properties": {+ "departments": {+ "type": "array",+ "items": {+ "type": "object",+ "properties": {+ "name": { "type": "string" },+ "budget": { "type": "number" }+ }+ }+ }+ }+ }+}+```++```+Level 1: ObjectFieldTemplate (root)+└── company+ └── Level 2: FieldTemplate → ObjectFieldTemplate+ └── departments+ └── Level 3: FieldTemplate → ArrayFieldTemplate+ └── ArrayFieldItemTemplate → ObjectFieldTemplate+ ├── FieldTemplate → TextWidget (name)+ └── FieldTemplate → TextWidget (budget)+```++### anyOf inside Array++```json+{+ "items": {+ "type": "array",+ "items": {+ "anyOf": [+ { "type": "string" },+ { "type": "object", "properties": { "id": { "type": "string" } } }+ ]+ }+ }+}+```++```+Level 1: ObjectFieldTemplate (root)+└── Level 2: FieldTemplate → ArrayFieldTemplate+ └── Level 3: ArrayFieldItemTemplate → AnyOfField+ └── Selector + selected:+ ├── String → TextWidget+ └── Object → ObjectFieldTemplate+ └── FieldTemplate → TextWidget (id)+```++---++## Nesting Pattern Summary++| Parent Type | Child Wrapper |+| ----------- | ----------------------------------------------- |+| object | `ObjectFieldTemplate` → `FieldTemplate` |+| array | `ArrayFieldTemplate` → `ArrayFieldItemTemplate` |+| anyOf | `AnyOfField` → selected schema's template |+| primitive | `Widget` (leaf - no children) |++**Pattern:** Each level adds FieldTemplate wrapper except array items (use ArrayFieldItemTemplate)++---++## Key Points++1. **FieldTemplate wraps everything** - handles title, description, errors+2. **anyOf = AnyOfField** - shows dropdown to pick type, then renders selected schema+3. **ObjectFieldTemplate loops properties** - each property gets FieldTemplate+4. **ArrayFieldTemplate loops items** - each item gets ArrayFieldItemTemplate+5. **Widgets are leaf nodes** - actual input controls user interacts with+6. **Nesting repeats the pattern** - object/array/anyOf can contain object/array/anyOf recursively++---++## Decision Flow++```+Schema Type?+├── object → ObjectFieldTemplate → loop properties+├── array → ArrayFieldTemplate → loop items+├── anyOf/oneOf → AnyOfField → selector + selected schema+└── primitive (string/number/boolean) → Widget+```++---++## Template Wrapping Order++```+ObjectFieldTemplate (root)+└── FieldTemplate (per property)+ └── WrapIfAdditionalTemplate (if additionalProperties)+ └── TitleField + DescriptionField + children+ └── Widget OR nested Template/Field+```diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/helpers.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/helpers.tsnew file mode 100644index 0000000000..f3302fcb85--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/helpers.ts@@ -0,0 +1,276 @@+import {+ RJSFSchema,+ UIOptionsType,+ StrictRJSFSchema,+ FormContextType,+ ADDITIONAL_PROPERTY_FLAG,+} from "@rjsf/utils";++import {+ ANY_OF_FLAG,+ ARRAY_ITEM_FLAG,+ ID_PREFIX,+ ID_PREFIX_ARRAY,+ KEY_PAIR_FLAG,+ OBJECT_FLAG,+} from "./constants";+import { PathSegment } from "./types";++export function updateUiOption<T extends Record<string, any>>(+ uiSchema: T | undefined,+ options: Record<string, any>,+): T & { "ui:options": Record<string, any> } {+ return {+ ...(uiSchema || {}),+ "ui:options": {+ ...uiSchema?.["ui:options"],+ ...options,+ },+ } as T & { "ui:options": Record<string, any> };+}++export const cleanUpHandleId = (handleId: string) => {+ let newHandleId = handleId;+ if (handleId.includes(ANY_OF_FLAG)) {+ newHandleId = newHandleId.replace(ANY_OF_FLAG, "");+ }+ if (handleId.includes(ARRAY_ITEM_FLAG)) {+ newHandleId = newHandleId.replace(ARRAY_ITEM_FLAG, "");+ }+ if (handleId.includes(KEY_PAIR_FLAG)) {+ newHandleId = newHandleId.replace(KEY_PAIR_FLAG, "");+ }+ if (handleId.includes(OBJECT_FLAG)) {+ newHandleId = newHandleId.replace(OBJECT_FLAG, "");+ }+ if (handleId.includes(ID_PREFIX_ARRAY)) {+ newHandleId = newHandleId.replace(ID_PREFIX_ARRAY, "");+ }+ if (handleId.includes(ID_PREFIX)) {+ newHandleId = newHandleId.replace(ID_PREFIX, "");+ }+ return newHandleId;+};++export const isArrayItem = <+ T = any,+ S extends StrictRJSFSchema = RJSFSchema,+ F extends FormContextType = any,+>({+ uiOptions,+}: {+ uiOptions: UIOptionsType<T, S, F>;+}) => {+ return uiOptions.handleId?.endsWith(ARRAY_ITEM_FLAG);+};++export const isKeyValuePair = ({ schema }: { schema: RJSFSchema }) => {+ return ADDITIONAL_PROPERTY_FLAG in schema;+};++export const isNormal = <+ T = any,+ S extends StrictRJSFSchema = RJSFSchema,+ F extends FormContextType = any,+>({+ uiOptions,+}: {+ uiOptions: UIOptionsType<T, S, F>;+}) => {+ return uiOptions.handleId === undefined;+};++export const isPartOfAnyOf = <+ T = any,+ S extends StrictRJSFSchema = RJSFSchema,+ F extends FormContextType = any,+>({+ uiOptions,+}: {+ uiOptions: UIOptionsType<T, S, F>;+}) => {+ return uiOptions.handleId?.endsWith(ANY_OF_FLAG);+};+export const isObjectProperty = <+ T = any,+ S extends StrictRJSFSchema = RJSFSchema,+ F extends FormContextType = any,+>({+ uiOptions,+ schema,+}: {+ uiOptions: UIOptionsType<T, S, F>;+ schema: RJSFSchema;+}) => {+ return (+ !isArrayItem({ uiOptions }) &&+ !isKeyValuePair({ schema }) &&+ !isNormal({ uiOptions }) &&+ !isPartOfAnyOf({ uiOptions })+ );+};++export const getHandleId = <+ T = any,+ S extends StrictRJSFSchema = RJSFSchema,+ F extends FormContextType = any,+>({+ id,+ schema,+ uiOptions,+}: {+ id: string;+ schema: RJSFSchema;+ uiOptions: UIOptionsType<T, S, F>;+}) => {+ const parentHandleId = uiOptions.handleId;++ if (isNormal({ uiOptions })) {+ return id;+ }++ if (isPartOfAnyOf({ uiOptions })) {+ return parentHandleId + ANY_OF_FLAG;+ }++ if (isKeyValuePair({ schema })) {+ const key = id.split("_%_").at(-1);+ let prefix = "";+ if (parentHandleId) {+ prefix = parentHandleId;+ } else {+ prefix = id.split("_%_").slice(0, -1).join("_%_");+ }++ const handleId = `${prefix}_#_${key}`;+ return handleId + KEY_PAIR_FLAG;+ }++ if (isArrayItem({ uiOptions })) {+ const index = id.split("_%_").at(-1);+ const prefix = id.split("_%_").slice(0, -1).join("_%_");+ const handleId = `${prefix}_$_${index}`;+ return handleId + ARRAY_ITEM_FLAG;+ }++ if (isObjectProperty({ uiOptions, schema })) {+ const key = id.split("_%_").at(-1);+ const prefix = id.split("_%_").slice(0, -1).join("_%_");+ const handleId = `${prefix}_@_${key}`;+ return handleId + OBJECT_FLAG;+ }+ return parentHandleId;+};++export function isCredentialFieldSchema(schema: any): boolean {+ return (+ typeof schema === "object" &&+ schema !== null &&+ "credentials_provider" in schema+ );+}++export function parseHandleIdToPath(handleId: string): PathSegment[] {+ const cleanedId = cleanUpHandleId(handleId);+ const segments: PathSegment[] = [];+ const parts = cleanedId.split(/(_#_|_@_|_\$_|\.)/);++ let currentType: "property" | "item" | "additional" | "normal" = "normal";++ for (let i = 0; i < parts.length; i++) {+ const part = parts[i];++ if (part === "_#_") {+ currentType = "additional";+ } else if (part === "_@_") {+ currentType = "property";+ } else if (part === "_$_") {+ currentType = "item";+ } else if (part === ".") {+ currentType = "normal";+ } else if (part) {+ const isNumeric = /^\d+$/.test(part);+ if (currentType === "item" && isNumeric) {+ segments.push({+ key: part,+ type: "item",+ index: parseInt(part, 10),+ });+ } else {+ segments.push({+ key: part,+ type: currentType,+ });+ }+ currentType = "normal";+ }+ }++ return segments;+}++/**+ * Ensure a path exists in an object, creating intermediate objects/arrays as needed+ * Returns true if any modifications were made+ */+export function ensurePathExists(+ obj: Record<string, any>,+ segments: PathSegment[],+): boolean {+ if (segments.length === 0) return false;++ let current = obj;+ let modified = false;++ for (let i = 0; i < segments.length; i++) {+ const segment = segments[i];+ const isLast = i === segments.length - 1;+ const nextSegment = segments[i + 1];++ const getDefaultValue = () => {+ if (isLast) {+ return "";+ }+ if (nextSegment?.type === "item") {+ return [];+ }+ return {};+ };++ if (segment.type === "item" && segment.index !== undefined) {+ if (!Array.isArray(current)) {+ return modified;+ }++ while (current.length <= segment.index) {+ current.push(isLast ? "" : {});+ modified = true;+ }++ if (!isLast) {+ if (+ current[segment.index] === undefined ||+ current[segment.index] === null+ ) {+ current[segment.index] = getDefaultValue();+ modified = true;+ }+ current = current[segment.index];+ }+ } else {+ if (!(segment.key in current)) {+ current[segment.key] = getDefaultValue();+ modified = true;+ } else if (!isLast && current[segment.key] === undefined) {+ current[segment.key] = getDefaultValue();+ modified = true;+ }++ if (!isLast) {+ current = current[segment.key];+ }+ }+ }++ return modified;+}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/index.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/index.tsnew file mode 100644index 0000000000..c25af0b231--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/index.ts@@ -0,0 +1,3 @@+export { FormRenderer } from "./FormRenderer";+export { default as Form } from "./registry";+export type { ExtendedFormContextType } from "./types";diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/registry/Form.tsx b/autogpt_platform/frontend/src/components/renderers/InputRenderer/registry/Form.tsxnew file mode 100644index 0000000000..5bf720a994--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/registry/Form.tsx@@ -0,0 +1,23 @@+import { ComponentType } from "react";+import { FormProps, withTheme, ThemeProps } from "@rjsf/core";+import {+ generateBaseFields,+ generateBaseTemplates,+ generateBaseWidgets,+} from "../base/base-registry";+import { generateCustomFields } from "../custom/custom-registry";++export function generateForm(): ComponentType<FormProps> {+ const theme: ThemeProps = {+ templates: generateBaseTemplates(),+ widgets: generateBaseWidgets(),+ fields: {+ ...generateBaseFields(),+ ...generateCustomFields(),+ },+ };++ return withTheme(theme);+}++export default generateForm();diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/registry/index.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/registry/index.tsnew file mode 100644index 0000000000..641c2a97d6--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/registry/index.ts@@ -0,0 +1,10 @@+export { default, generateForm } from "./Form";+export {+ generateBaseFields,+ generateBaseTemplates,+ generateBaseWidgets,+} from "../base/base-registry";+export {+ generateCustomFields,+ findCustomFieldId,+} from "../custom/custom-registry";diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/registry/types.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/registry/types.tsnew file mode 100644index 0000000000..cab84afcc3--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/registry/types.ts@@ -0,0 +1,7 @@+import { BlockUIType } from "@/app/(platform)/build/components/types";++export type ExtraContext = {+ nodeId?: string;+ uiType?: BlockUIType;+ size?: "small" | "medium" | "large";+};diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/types.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/types.tsnew file mode 100644index 0000000000..af2e8b7866--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/types.ts@@ -0,0 +1,15 @@+import { BlockUIType } from "@/lib/autogpt-server-api/types";+import { FormContextType } from "@rjsf/utils";++export interface ExtendedFormContextType extends FormContextType {+ nodeId?: string;+ uiType?: BlockUIType;+ showHandles?: boolean;+ size?: "small" | "medium" | "large";+}++export type PathSegment = {+ key: string;+ type: "property" | "item" | "additional" | "normal";+ index?: number;+};diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/utils/custom-validator.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/custom-validator.tssimilarity index 100%rename from autogpt_platform/frontend/src/components/renderers/input-renderer/utils/custom-validator.tsrename to autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/custom-validator.tsdiff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/utils/helpers.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/helpers.tssimilarity index 100%rename from autogpt_platform/frontend/src/components/renderers/input-renderer/utils/helpers.tsrename to autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/helpers.tsdiff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/utils/input-schema-pre-processor.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/input-schema-pre-processor.tssimilarity index 91%rename from autogpt_platform/frontend/src/components/renderers/input-renderer/utils/input-schema-pre-processor.tsrename to autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/input-schema-pre-processor.tsindex ffbcbf52b2..dad95251ed 100644--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/utils/input-schema-pre-processor.ts+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/input-schema-pre-processor.ts@@ -1,9 +1,11 @@import { RJSFSchema } from "@rjsf/utils";+import { findCustomFieldId } from "../custom/custom-registry";/*** Pre-processes the input schema to ensure all properties have a type defined.* If a property doesn't have a type, it assigns a union of all supported JSON Schema types.*/+export function preprocessInputSchema(schema: RJSFSchema): RJSFSchema {if (!schema || typeof schema !== "object") {return schema;@@ -19,6 +21,12 @@ export function preprocessInputSchema(schema: RJSFSchema): RJSFSchema {if (property && typeof property === "object") {const processedProperty = { ...property };+ // adding $id for custom field+ const customFieldId = findCustomFieldId(processedProperty);+ if (customFieldId) {+ processedProperty.$id = customFieldId;+ }+// Only add type if no type is defined AND no anyOf/oneOf/allOf is presentif (!processedProperty.type &&@@ -32,7 +40,7 @@ export function preprocessInputSchema(schema: RJSFSchema): RJSFSchema {{ type: "integer" },{ type: "boolean" },{ type: "array", items: { type: "string" } },- { type: "object" },+ { type: "object", title: "Object", additionalProperties: true },{ type: "null" },];}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/rjsf-utils.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/rjsf-utils.tsnew file mode 100644index 0000000000..365058cebd--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/rjsf-utils.ts@@ -0,0 +1,6 @@+import { type ClassValue, clsx } from "clsx";+import { twMerge } from "tailwind-merge";++export function cn(...inputs: ClassValue[]) {+ return twMerge(clsx(inputs));+}diff --git a/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/schema-utils.ts b/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/schema-utils.tsnew file mode 100644index 0000000000..b1cfd37967--- /dev/null+++ b/autogpt_platform/frontend/src/components/renderers/InputRenderer/utils/schema-utils.ts@@ -0,0 +1,35 @@+import { getUiOptions, RJSFSchema, UiSchema } from "@rjsf/utils";++export function isAnyOfSchema(schema: RJSFSchema | undefined): boolean {+ return Array.isArray(schema?.anyOf) && schema!.anyOf.length > 0;+}++export const isAnyOfChild = (+ uiSchema: UiSchema<any, RJSFSchema, any> | undefined,+): boolean => {+ const uiOptions = getUiOptions(uiSchema);+ return uiOptions.label === false;+};++export function isOptionalType(schema: RJSFSchema | undefined): {+ isOptional: boolean;+ type?: any;+} {+ if (+ !Array.isArray(schema?.anyOf) ||+ schema!.anyOf.length !== 2 ||+ !schema!.anyOf.some((opt: any) => opt.type === "null")+ ) {+ return { isOptional: false };+ }++ const nonNullType = schema!.anyOf?.find((opt: any) => opt.type !== "null");++ return {+ isOptional: true,+ type: nonNullType,+ };+}+export function isAnyOfSelector(name: string) {+ return name.includes("anyof_select");+}diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/ARCHITECTURE_INPUT_RENDERER.md b/autogpt_platform/frontend/src/components/renderers/input-renderer/ARCHITECTURE_INPUT_RENDERER.mddeleted file mode 100644index 7ae3d2b546..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/ARCHITECTURE_INPUT_RENDERER.md+++ /dev/null@@ -1,938 +0,0 @@-# Input-Renderer Architecture Documentation--## Overview--The Input-Renderer is a **JSON Schema-based form generation system** built on top of **React JSON Schema Form (RJSF)**. It dynamically creates form inputs for block nodes in the FlowEditor based on JSON schemas defined in the backend.--This system allows blocks to define their input requirements declaratively, and the frontend automatically generates appropriate UI components.-------## High-Level Architecture--```-┌─────────────────────────────────────────────────────────┐-│ FormRenderer │-│ (Entry point, wraps RJSF Form) │-└─────────────────────┬───────────────────────────────────┘- │- ┌─────────▼─────────┐- │ RJSF Core │- │ <Form /> │- └───────┬───────────┘- │- ┌───────────┼───────────┬──────────────┐- │ │ │ │- ┌────▼────┐ ┌───▼────┐ ┌────▼─────┐ ┌────▼────┐- │ Fields │ │Templates│ │ Widgets │ │ Schemas │- └─────────┘ └─────────┘ └──────────┘ └─────────┘- │ │ │ │- │ │ │ │- Handles Wrapper Actual JSON Schema- complex layouts input (from backend)- types & labels components-```-------## What is RJSF (React JSON Schema Form)?--**RJSF** is a library that generates React forms from JSON Schema definitions. It follows a specific hierarchy to render forms:--### **RJSF Rendering Flow:**--```-1. JSON Schema (defines data structure)- ↓-2. Schema Field (decides which Field component to use)- ↓-3. Field Component (handles specific type logic)- ↓-4. Field Template (wraps field with label, description)- ↓-5. Widget (actual input element - TextInput, Select, etc.)-```--### **Example Flow:**--```json-// JSON Schema-{- "type": "object",- "properties": {- "name": {- "type": "string",- "title": "Name"- }- }-}-```--**Becomes:**--```-SchemaField (detects "string" type)- ↓-StringField (default RJSF field)- ↓-FieldTemplate (adds label "Name")- ↓-TextWidget (renders <input type="text" />)-```-------## Core Components of Input-Renderer--### 1. **FormRenderer** (`FormRenderer.tsx`)--The main entry point that wraps RJSF `<Form />` component.--```typescript-export const FormRenderer = ({- jsonSchema, // JSON Schema from backend- handleChange, // Callback when form changes- uiSchema, // UI customization- initialValues, // Pre-filled values- formContext, // Extra context (nodeId, uiType, etc.)-}: FormRendererProps) => {- const preprocessedSchema = preprocessInputSchema(jsonSchema);-- return (- <Form- schema={preprocessedSchema} // Modified schema- validator={customValidator} // Custom validation logic- fields={fields} // Custom field components- templates={templates} // Custom layout templates- widgets={widgets} // Custom input widgets- formContext={formContext} // Pass context down- onChange={handleChange} // Form change handler- uiSchema={uiSchema} // UI customization- formData={initialValues} // Initial values- />- );-};-```--**Key Props:**--- **`fields`** - Custom components for complex types (anyOf, credentials, objects)-- **`templates`** - Layout wrappers (FieldTemplate, ArrayFieldTemplate)-- **`widgets`** - Actual input components (TextInput, Select, FileWidget)-- **`formContext`** - Shared data (nodeId, showHandles, size)-------### 2. **Schema Pre-Processing** (`utils/input-schema-pre-processor.ts`)--Before rendering, schemas are transformed to ensure RJSF compatibility.--**Purpose:**--- Add missing `type` fields (prevents RJSF errors)-- Recursively process nested objects and arrays-- Normalize inconsistent schemas from backend--**Example:**--```typescript-// Backend schema (missing type)-{- "properties": {- "value": {} // No type defined!- }-}--// After pre-processing-{- "properties": {- "value": {- "anyOf": [- { "type": "string" },- { "type": "number" },- { "type": "boolean" },- // ... all possible types- ]- }- }-}-```--**Why?** RJSF requires explicit types. Without this, it would crash or render incorrectly.-------## The Three Pillars: Fields, Templates, Widgets--### **A. Fields** (`fields/`)--Fields handle **complex type logic** that goes beyond simple inputs.--**Registered Fields:**--```typescript-export const fields: RegistryFieldsType = {- AnyOfField: AnyOfField, // Handles anyOf/oneOf- credentials: CredentialsField, // OAuth/API key handling- ObjectField: ObjectField, // Free-form objects-};-```--#### **1. AnyOfField** (`fields/AnyOfField/AnyOfField.tsx`)--Handles schemas with multiple possible types (union types).--**When Used:**--```json-{- "anyOf": [{ "type": "string" }, { "type": "number" }, { "type": "boolean" }]-}-```--**Rendering:**--```-┌─────────────────────────────────────┐-│ Parameter Name (string) ▼ │ ← Type selector dropdown-├─────────────────────────────────────┤-│ [Text Input] │ ← Widget for selected type-└─────────────────────────────────────┘-```--**Features:**--- Type selector dropdown-- Nullable types (with toggle switch)-- Recursive rendering (can contain arrays, objects)-- Connection-aware (hides input when connected)--**Special Case: Nullable Types**--```json-{- "anyOf": [{ "type": "string" }, { "type": "null" }]-}-```--**Renders as:**--```-┌─────────────────────────────────────┐-│ Parameter Name (string | null) [✓] │ ← Toggle switch-├─────────────────────────────────────┤-│ [Text Input] (only if enabled) │-└─────────────────────────────────────┘-```-------#### **2. CredentialsField** (`fields/CredentialField/CredentialField.tsx`)--Handles authentication credentials (OAuth, API Keys, Passwords).--**When Used:**--```json-{- "type": "object",- "credentials": {- "provider": "google",- "scopes": ["email", "profile"]- }-}-```--**Flow:**--```-1. Renders SelectCredential dropdown- ↓-2. User selects existing credential OR clicks "Add New"- ↓-3. Modal opens (OAuthModal/APIKeyModal/PasswordModal)- ↓-4. User authorizes/enters credentials- ↓-5. Credential saved to backend- ↓-6. Dropdown shows selected credential-```--**Credential Types:**--- **OAuth** - 3rd party authorization (Google, GitHub, etc.)-- **API Key** - Simple key-based auth-- **Password** - Username/password pairs-------#### **3. ObjectField** (`fields/ObjectField.tsx`)--Handles free-form objects (key-value pairs).--**When Used:**--```json-{- "type": "object",- "additionalProperties": true // Free-form-}-```--vs--```json-{- "type": "object",- "properties": {- "name": { "type": "string" } // Fixed schema- }-}-```--**Behavior:**--- **Fixed schema** → Uses default RJSF rendering-- **Free-form** → Uses ObjectEditorWidget (JSON editor)-------### **B. Templates** (`templates/`)--Templates control **layout and wrapping** of fields.--#### **1. FieldTemplate** (`templates/FieldTemplate.tsx`)--Wraps every field with label, type indicator, and connection handle.--**Rendering Structure:**--```-┌────────────────────────────────────────┐-│ ○ Label (type) ⓘ │ ← Handle + Label + Type + Info icon-├────────────────────────────────────────┤-│ [Actual Input Widget] │ ← The input itself-└────────────────────────────────────────┘-```--**Responsibilities:**--- Shows/hides input based on connection status-- Renders connection handle (NodeHandle)-- Displays type information-- Shows tooltip with description-- Handles "advanced" field visibility-- Formats credential field labels--**Key Logic:**--```typescript-// Hide input if connected-{(isAnyOf || !isConnected) && (- <div>{children}</div>-)}--// Show handle for most fields-{shouldShowHandle && (- <NodeHandle handleId={handleId} isConnected={isConnected} />-)}-```--**Context-Aware Behavior:**--- Inside `AnyOfField` → No handle (parent handles it)-- Credential field → Special label formatting-- Array item → Uses parent handle-- INPUT/OUTPUT/WEBHOOK blocks → Different handle positioning-------#### **2. ArrayFieldTemplate** (`templates/ArrayFieldTemplate.tsx`)--Wraps array fields to use custom ArrayEditorWidget.--**Simple Wrapper:**--```typescript-function ArrayFieldTemplate(props: ArrayFieldTemplateProps) {- const { items, canAdd, onAddClick, nodeId } = props;-- return (- <ArrayEditorWidget- items={items}- nodeId={nodeId}- canAdd={canAdd}- onAddClick={onAddClick}- />- );-}-```-------### **C. Widgets** (`widgets/`)--Widgets are **actual input components** - the final rendered HTML elements.--**Registered Widgets:**--```typescript-export const widgets: RegistryWidgetsType = {- TextWidget: TextInputWidget, // <input type="text" />- SelectWidget: SelectWidget, // <select> dropdown- CheckboxWidget: SwitchWidget, // <Switch> toggle- FileWidget: FileWidget, // File upload- DateWidget: DateInputWidget, // Date picker- TimeWidget: TimeInputWidget, // Time picker- DateTimeWidget: DateTimeInputWidget, // Combined date+time-};-```--#### **Widget Selection Logic (RJSF)**--RJSF automatically picks the right widget based on schema:--```json-{ "type": "string" } → TextWidget-{ "type": "string", "enum": [...] } → SelectWidget-{ "type": "boolean" } → CheckboxWidget-{ "type": "string", "format": "date" } → DateWidget-{ "type": "string", "format": "time" } → TimeWidget-```--#### **Special Widgets:**--**1. ArrayEditorWidget** (`widgets/ArrayEditorWidget/`)--```-┌─────────────────────────────────────┐-│ ○ Item 1 [Text Input] [X Remove] │-│ ○ Item 2 [Text Input] [X Remove] │-│ [+ Add Item] │-└─────────────────────────────────────┘-```--**Features:**--- Each array item gets its own connection handle-- Remove button per item-- Add button at bottom-- Context provider for handle management--**ArrayEditorContext:**--```typescript-{- isArrayItem: true,- arrayFieldHandleId: "input-items-0", // Unique per item- isConnected: false-}-```--**2. ObjectEditorWidget** (`widgets/ObjectEditorWidget/`)--- JSON editor for free-form objects-- Key-value pair management-- Used by ObjectField for `additionalProperties: true`-------## The Complete Rendering Flow--### **Example: Rendering a Text Input**--```json-// Backend Schema-{- "type": "object",- "properties": {- "message": {- "type": "string",- "title": "Message",- "description": "Enter your message"- }- }-}-```--**Step-by-Step:**--```-1. FormRenderer receives schema- ↓-2. preprocessInputSchema() normalizes it- ↓-3. RJSF <Form /> starts rendering- ↓-4. SchemaField detects "string" type- ↓-5. Uses default StringField- ↓-6. FieldTemplate wraps it:- - Adds NodeHandle (connection point)- - Adds label "Message (string)"- - Adds info icon with description- ↓-7. TextWidget renders <input />- ↓-8. User types "Hello"- ↓-9. onChange callback fires- ↓-10. FormCreator updates nodeStore.updateNodeData()-```-------### **Example: Rendering AnyOf Field**--```json-// Backend Schema-{- "anyOf": [{ "type": "string" }, { "type": "number" }],- "title": "Value"-}-```--**Rendering Flow:**--```-1. RJSF detects "anyOf"- ↓-2. Uses AnyOfField (custom field)- ↓-3. AnyOfField renders:- ┌─────────────────────────────────┐- │ ○ Value (string) ▼ │ ← Self-managed handle & selector- ├─────────────────────────────────┤- │ [Text Input] │ ← Recursively renders SchemaField- └─────────────────────────────────┘- ↓-4. User changes type to "number"- ↓-5. AnyOfField re-renders with NumberWidget- ↓-6. User enters "42"- ↓-7. onChange({ type: "number", value: 42 })-```--**Key Point:** AnyOfField **does NOT use FieldTemplate** for itself. It manages its own handle and label to avoid duplication. But it **recursively calls SchemaField** for the selected type, which may use FieldTemplate.-------### **Example: Rendering Array Field**--```json-// Backend Schema-{- "type": "array",- "items": {- "type": "string"- },- "title": "Tags"-}-```--**Rendering Flow:**--```-1. RJSF detects "array" type- ↓-2. Uses ArrayFieldTemplate- ↓-3. ArrayFieldTemplate passes to ArrayEditorWidget- ↓-4. ArrayEditorWidget renders:- ┌─────────────────────────────────┐- │ ○ Tag 1 [Text Input] [X] │ ← Each item wrapped in context- │ ○ Tag 2 [Text Input] [X] │- │ [+ Add Item] │- └─────────────────────────────────┘- ↓-5. Each item wrapped in ArrayEditorContext- ↓-6. FieldTemplate reads context:- - isArrayItem = true- - Uses arrayFieldHandleId instead of own handle- ↓-7. TextWidget renders for each item-```-------## Hierarchy: What Comes First?--This is the **order of execution** from schema to rendered input:--```-1. JSON Schema (from backend)- ↓-2. preprocessInputSchema() (normalization)- ↓-3. RJSF <Form /> (library entry point)- ↓-4. SchemaField (RJSF internal - decides which field)- ↓-5. Field Component (AnyOfField, CredentialsField, or default)- ↓-6. Template (FieldTemplate or ArrayFieldTemplate)- ↓-7. Widget (TextWidget, SelectWidget, etc.)- ↓-8. Actual HTML (<input>, <select>, etc.)-```-------## Key Concepts Explained--### **1. Why Custom Fields?**--RJSF's default fields don't handle:--- **AnyOf** - Type selection + dynamic widget switching-- **Credentials** - OAuth flows, modal management-- **Free-form Objects** - JSON editor instead of fixed fields--Custom fields fill these gaps.-------### **2. Why Templates?**--Templates add **FlowEditor-specific UI**:--- Connection handles (left side dots)-- Type indicators-- Tooltips-- Advanced field hiding-- Connection-aware rendering--Default RJSF templates don't support these features.-------### **3. Why Custom Widgets?**--Custom widgets provide:--- Consistent styling with design system-- Integration with Zustand stores-- Custom behaviors (e.g., FileWidget uploads)-- Better UX (e.g., SwitchWidget vs checkbox)-------### **4. FormContext - The Shared State**--FormContext passes data down the RJSF tree:--```typescript-type FormContextType = {- nodeId?: string; // Which node this form belongs to- uiType?: BlockUIType; // Block type (INPUT, OUTPUT, etc.)- showHandles?: boolean; // Show connection handles?- size?: "small" | "large"; // Form size variant-};-```--**Why?** RJSF components don't have direct access to React props from parent. FormContext provides a channel.--**Usage:**--```typescript-// In FieldTemplate-const { nodeId, showHandles, size } = formContext;--// Check if input is connected-const isConnected = useEdgeStore().isInputConnected(nodeId, handleId);--// Hide input if connected-{!isConnected && <div>{children}</div>}-```-------### **5. Handle Management**--Connection handles are the **left-side dots** on nodes where edges connect.--**Handle ID Format:**--```typescript-// Regular field-generateHandleId("root_message") → "input-message"--// Array item-generateHandleId("root_tags", ["0"]) → "input-tags-0"-generateHandleId("root_tags", ["1"]) → "input-tags-1"--// Nested field-generateHandleId("root_config_api_key") → "input-config-api_key"-```--**Context Provider Pattern (Arrays):**--```typescript-// ArrayEditorWidget wraps each item-<ArrayEditorContext.Provider- value={{- isArrayItem: true,- arrayFieldHandleId: "input-tags-0"- }}->- {element.children} // ← FieldTemplate renders here-</ArrayEditorContext.Provider>--// FieldTemplate reads context-const { isArrayItem, arrayFieldHandleId } = useContext(ArrayEditorContext);--// Use array handle instead of generating own-const handleId = isArrayItem ? arrayFieldHandleId : generateHandleId(fieldId);-```-------## Connection-Aware Rendering--One of the most important features: **hiding inputs when connected**.--**Flow:**--```-1. User connects edge to input handle- ↓-2. edgeStore.addEdge() creates connection- ↓-3. Next render cycle:- - FieldTemplate calls isInputConnected(nodeId, handleId)- - Returns true- ↓-4. FieldTemplate hides input:- {!isConnected && <div>{children}</div>}- ↓-5. Only handle visible (with blue highlight)-```--**Why?** When a value comes from another node's output, manual input is disabled. The connection provides the value.--**Exception:** AnyOf fields still show type selector when connected (but hide the input).-------## Advanced Features--### **1. Advanced Field Toggle**--Some fields marked as `advanced: true` in schema are hidden by default.--**Logic in FieldTemplate:**--```typescript-const showAdvanced = useNodeStore((state) => state.nodeAdvancedStates[nodeId]);--if (!showAdvanced && schema.advanced === true && !isConnected) {- return null; // Hide field-}-```--**UI:** NodeAdvancedToggle button in CustomNode shows/hides these fields.-------### **2. Nullable Type Handling**--```json-{- "anyOf": [{ "type": "string" }, { "type": "null" }]-}-```--**AnyOfField detects this pattern and renders:**--```-┌─────────────────────────────────────┐-│ Parameter (string | null) [✓] │ ← Switch to enable/disable-├─────────────────────────────────────┤-│ [Input only if enabled] │-└─────────────────────────────────────┘-```--**State Management:**--```typescript-const [isEnabled, setIsEnabled] = useState(formData !== null);--const handleNullableToggle = (checked: boolean) => {- setIsEnabled(checked);- onChange(checked ? "" : null); // Send null when disabled-};-```-------### **3. Recursive Schema Rendering**--AnyOfField, ObjectField, and ArrayField all recursively call `SchemaField`:--```typescript-const SchemaField = registry.fields.SchemaField;--<SchemaField- schema={nestedSchema}- formData={formData}- onChange={handleChange}- // ... propagate all props-/>-```--This allows **infinite nesting**: arrays of objects, objects with anyOf fields, etc.-------## Common Patterns--### **Adding a New Widget**--1. Create widget component in `widgets/`:--```typescript-export const MyWidget = ({ value, onChange, ...props }: WidgetProps) => {- return <input value={value} onChange={(e) => onChange(e.target.value)} />;-};-```--2. Register in `widgets/index.ts`:--```typescript-export const widgets: RegistryWidgetsType = {- // ...- MyCustomWidget: MyWidget,-};-```--3. Use in uiSchema or schema format:--```json-{- "type": "string",- "format": "my-custom-format" // RJSF maps format → widget-}-```-------### **Adding a New Field**--1. Create field component in `fields/`:--```typescript-export const MyField = ({ schema, formData, onChange, ...props }: FieldProps) => {- // Custom logic here- return <div>...</div>;-};-```--2. Register in `fields/index.ts`:--```typescript-export const fields: RegistryFieldsType = {- // ...- MyField: MyField,-};-```--3. RJSF uses it based on schema structure (e.g., custom keyword).-------## Integration with FlowEditor--```-CustomNode- ↓-FormCreator- ↓-FormRenderer ← YOU ARE HERE- ↓-RJSF <Form />- ↓-(Fields, Templates, Widgets)- ↓-User Input- ↓-onChange callback- ↓-FormCreator.handleChange()- ↓-nodeStore.updateNodeData(nodeId, { hardcodedValues })- ↓-historyStore.pushState() (undo/redo)-```-------## Debugging Tips--### **Field Not Rendering**--- Check if `preprocessInputSchema()` is handling it correctly-- Verify schema has `type` field-- Check RJSF console for validation errors--### **Widget Wrong Type**--- Check schema `type` and `format` fields-- Verify widget is registered in `widgets/index.ts`-- Check if custom field is overriding default behavior--### **Handle Not Appearing**--- Check `showHandles` in formContext-- Verify not inside `fromAnyOf` context-- Check if field is credential or array item--### **Value Not Saving**--- Verify `onChange` callback is firing-- Check `handleChange` in FormCreator-- Look for console errors in `updateNodeData`-------## Summary--The Input-Renderer is a sophisticated form system that:--1. **Uses RJSF** as the foundation for JSON Schema → React forms-2. **Extends RJSF** with custom Fields, Templates, and Widgets-3. **Integrates** with FlowEditor's connection system-4. **Handles** complex types (anyOf, credentials, free-form objects)-5. **Provides** connection-aware, type-safe input rendering--**Key Hierarchy (What Comes First):**--```-JSON Schema- → Pre-processing- → RJSF Form- → SchemaField (RJSF internal)- → Field (AnyOfField, CredentialsField, etc.)- → Template (FieldTemplate, ArrayFieldTemplate)- → Widget (TextWidget, SelectWidget, etc.)- → HTML Element-```--**Mental Model:**--- **Fields** = Smart logic layers (type selection, OAuth flows)-- **Templates** = Layout wrappers (handles, labels, tooltips)-- **Widgets** = Actual inputs (text boxes, dropdowns)--**Integration Point:**--- FormRenderer receives schema from `node.data.inputSchema`-- User edits form → `onChange` → `nodeStore.updateNodeData()`-- Values saved as `node.data.hardcodedValues`diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/AnyOfField/AnyOfField.tsx b/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/AnyOfField/AnyOfField.tsxdeleted file mode 100644index 79fa15304d..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/AnyOfField/AnyOfField.tsx+++ /dev/null@@ -1,232 +0,0 @@-import React from "react";-import { FieldProps, RJSFSchema } from "@rjsf/utils";--import { Text } from "@/components/atoms/Text/Text";-import { Switch } from "@/components/atoms/Switch/Switch";-import { Select } from "@/components/atoms/Select/Select";-import {- InputType,- mapJsonSchemaTypeToInputType,-} from "@/app/(platform)/build/components/FlowEditor/nodes/helpers";--import { InfoIcon } from "@phosphor-icons/react";-import { useAnyOfField } from "./useAnyOfField";-import NodeHandle from "@/app/(platform)/build/components/FlowEditor/handlers/NodeHandle";-import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";-import { generateHandleId } from "@/app/(platform)/build/components/FlowEditor/handlers/helpers";-import { getTypeDisplayInfo } from "@/app/(platform)/build/components/FlowEditor/nodes/helpers";-import merge from "lodash/merge";-import {- Tooltip,- TooltipContent,- TooltipProvider,- TooltipTrigger,-} from "@/components/atoms/Tooltip/BaseTooltip";-import { cn } from "@/lib/utils";-import { BlockUIType } from "@/app/(platform)/build/components/types";--type TypeOption = {- type: string;- title: string;- index: number;- format?: string;- enum?: any[];- secret?: boolean;- schema: RJSFSchema;-};--export const AnyOfField = ({- schema,- formData,- onChange,- name,- idSchema,- formContext,- registry,- uiSchema,- disabled,- onBlur,- onFocus,-}: FieldProps) => {- const handleId =- formContext.uiType === BlockUIType.AGENT- ? (idSchema.$id ?? "")- .split("_")- .filter((p) => p !== "root" && p !== "properties" && p.length > 0)- .join("_") || ""- : generateHandleId(idSchema.$id ?? "");-- const updatedFormContexrt = { ...formContext, fromAnyOf: true };-- const { nodeId, showHandles = true } = updatedFormContexrt;- const { isInputConnected } = useEdgeStore();- const isConnected = showHandles ? isInputConnected(nodeId, handleId) : false;- const {- isNullableType,- nonNull,- selectedType,- handleTypeChange,- handleNullableToggle,- handleValueChange,- currentTypeOption,- isEnabled,- typeOptions,- } = useAnyOfField(schema, formData, onChange);-- const renderInput = (typeOption: TypeOption) => {- const optionSchema = (typeOption.schema || {- type: typeOption.type,- format: typeOption.format,- secret: typeOption.secret,- enum: typeOption.enum,- }) as RJSFSchema;- const inputType = mapJsonSchemaTypeToInputType(optionSchema);-- // Help us to tell the field under the anyOf field that you are a part of anyOf field.- // We can't use formContext in this case that's why we are using this.- // We could use context api here, but i think it's better to keep it simple.- const uiSchemaFromAnyOf = merge({}, uiSchema, {- "ui:options": { fromAnyOf: true },- });-- // We are using SchemaField to render the field recursively.- if (inputType === InputType.ARRAY_EDITOR) {- const SchemaField = registry.fields.SchemaField;- return (- <div className="-ml-2">- <SchemaField- schema={optionSchema}- formData={formData}- idSchema={idSchema}- uiSchema={uiSchemaFromAnyOf}- onChange={handleValueChange}- onBlur={onBlur}- onFocus={onFocus}- name={name}- registry={registry}- disabled={disabled}- formContext={updatedFormContexrt}- />- </div>- );- }-- const SchemaField = registry.fields.SchemaField;- return (- <div className="-ml-2">- <SchemaField- schema={optionSchema}- formData={formData}- idSchema={idSchema}- uiSchema={uiSchemaFromAnyOf}- onChange={handleValueChange}- onBlur={onBlur}- onFocus={onFocus}- name={name}- registry={registry}- disabled={disabled}- formContext={updatedFormContexrt}- />- </div>- );- };-- // I am doing this, because we need different UI for optional types.- if (isNullableType && nonNull) {- const { displayType, colorClass } = getTypeDisplayInfo(nonNull);-- return (- <div className="mb-0 flex flex-col">- <div className="flex items-center justify-between gap-2">- <div- className={cn(- "ml-1 flex items-center gap-1",- showHandles && "-ml-2",- )}- >- {showHandles && (- <NodeHandle- handleId={handleId}- isConnected={isConnected}- side="left"- />- )}- <Text- variant={formContext.size === "small" ? "body" : "body-medium"}- >- {schema.title || name.charAt(0).toUpperCase() + name.slice(1)}- </Text>- <Text variant="small" className={colorClass}>- ({displayType} | null)- </Text>- </div>- {!isConnected && (- <Switch- className="z-10"- checked={isEnabled}- onCheckedChange={handleNullableToggle}- />- )}- </div>- <div className="mt-2">- {!isConnected && isEnabled && renderInput(nonNull)}- </div>- </div>- );- }-- return (- <div className="mb-0 flex flex-col">- <div- className={cn("ml-1 flex items-center gap-1", showHandles && "-ml-2")}- >- {showHandles && (- <NodeHandle- handleId={handleId}- isConnected={isConnected}- side="left"- />- )}- <Text variant={formContext.size === "small" ? "body" : "body-medium"}>- {schema.title || name.charAt(0).toUpperCase() + name.slice(1)}- </Text>- {!isConnected && (- <Select- label=""- id={`${name}-type-select`}- hideLabel={true}- value={selectedType}- onValueChange={handleTypeChange}- options={typeOptions.map((o) => {- const { displayType } = getTypeDisplayInfo(o);- return { value: o.type, label: displayType };- })}- size="small"- wrapperClassName="!mb-0 "- className="h-6 w-fit gap-1 pl-3 pr-2"- />- )}-- {schema.description && (- <TooltipProvider>- <Tooltip>- <TooltipTrigger asChild>- <span- style={{ marginLeft: 6, cursor: "pointer" }}- aria-label="info"- tabIndex={0}- >- <InfoIcon />- </span>- </TooltipTrigger>- <TooltipContent>{schema.description}</TooltipContent>- </Tooltip>- </TooltipProvider>- )}- </div>- <div className="mt-2">- {!isConnected && currentTypeOption && renderInput(currentTypeOption)}- </div>- </div>- );-};diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/AnyOfField/useAnyOfField.tsx b/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/AnyOfField/useAnyOfField.tsxdeleted file mode 100644index 073ed1f8e5..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/AnyOfField/useAnyOfField.tsx+++ /dev/null@@ -1,105 +0,0 @@-import { useMemo, useState } from "react";-import { RJSFSchema } from "@rjsf/utils";--const getDefaultValueForType = (type?: string): any => {- if (!type) return "";-- switch (type) {- case "string":- return "";- case "number":- case "integer":- return 0;- case "boolean":- return false;- case "array":- return [];- case "object":- return {};- default:- return "";- }-};--export const useAnyOfField = (- schema: RJSFSchema,- formData: any,- onChange: (value: any) => void,-) => {- const typeOptions: any[] = useMemo(- () =>- schema.anyOf?.map((opt: any, i: number) => ({- type: opt.type || "string",- title: opt.title || `Option ${i + 1}`,- index: i,- format: opt.format,- enum: opt.enum,- secret: opt.secret,- schema: opt,- })) || [],- [schema.anyOf],- );-- const isNullableType = useMemo(- () =>- typeOptions.length === 2 &&- typeOptions.some((o) => o.type === "null") &&- typeOptions.some((o) => o.type !== "null"),- [typeOptions],- );-- const nonNull = useMemo(- () => (isNullableType ? typeOptions.find((o) => o.type !== "null") : null),- [isNullableType, typeOptions],- );-- const initialSelectedType = useMemo(() => {- const def = schema.default;- const first = typeOptions[0]?.type || "string";- if (isNullableType) return nonNull?.type || "string";- if (typeof def === "string" && typeOptions.some((o) => o.type === def))- return def;- return first;- }, [schema.default, typeOptions, isNullableType, nonNull?.type]);-- const [selectedType, setSelectedType] = useState<string>(initialSelectedType);-- // Only check for explicit null (set by toggle off), not undefined (empty input)- // This allows users to clear number inputs without the field disappearing- const isEnabled = formData !== null;-- const handleTypeChange = (t: string) => {- setSelectedType(t);- onChange(undefined); // clear current value when switching type- };-- const handleNullableToggle = (checked: boolean) => {- if (checked) {- onChange(getDefaultValueForType(nonNull?.type));- } else {- onChange(null);- }- };-- const handleValueChange = (value: any) => {- if (isNullableType && value === null) {- onChange(undefined);- return;- }- onChange(value);- };-- const currentTypeOption = typeOptions.find((o) => o.type === selectedType);-- return {- isNullableType,- nonNull,- selectedType,- handleTypeChange,- handleNullableToggle,- handleValueChange,- currentTypeOption,- isEnabled,- typeOptions,- };-};diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/CredentialField.tsx b/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/CredentialField.tsxdeleted file mode 100644index a61d2f0b16..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/CredentialField.tsx+++ /dev/null@@ -1,87 +0,0 @@-import React from "react";-import { FieldProps } from "@rjsf/utils";-import { useCredentialField } from "./useCredentialField";-import { SelectCredential } from "./SelectCredential";-import { Skeleton } from "@/components/__legacy__/ui/skeleton";-import { BlockIOCredentialsSubSchema } from "@/lib/autogpt-server-api";-import { APIKeyCredentialsModal } from "./models/APIKeyCredentialModal/APIKeyCredentialModal";-import { OAuthCredentialModal } from "./models/OAuthCredentialModal/OAuthCredentialModal";-import { PasswordCredentialsModal } from "./models/PasswordCredentialModal/PasswordCredentialModal";-import { HostScopedCredentialsModal } from "./models/HostScopedCredentialsModal/HostScopedCredentialsModal";--export const CredentialsField = (props: FieldProps) => {- const {- formData = {},- onChange,- required: _required,- schema,- formContext,- } = props;- const {- credentials,- isCredentialListLoading,- supportsApiKey,- supportsOAuth2,- supportsUserPassword,- supportsHostScoped,- credentialsExists,- credentialProvider,- setCredential,- discriminatorValue,- } = useCredentialField({- credentialSchema: schema as BlockIOCredentialsSubSchema,- formData,- nodeId: formContext.nodeId,- onChange,- });-- if (isCredentialListLoading) {- return (- <div className="flex flex-col gap-2">- <Skeleton className="h-8 w-full rounded-xlarge" />- <Skeleton className="h-8 w-[30%] rounded-xlarge" />- </div>- );- }-- if (!credentialProvider) {- return null;- }-- return (- <div className="flex flex-col gap-2">- {credentialsExists && (- <SelectCredential- credentials={credentials}- value={formData.id || ""}- onChange={setCredential}- disabled={false}- label="Credential"- placeholder="Select credential"- />- )}-- <div className="flex flex-wrap gap-2">- {supportsApiKey && (- <APIKeyCredentialsModal- schema={schema as BlockIOCredentialsSubSchema}- provider={credentialProvider}- />- )}- {supportsOAuth2 && (- <OAuthCredentialModal provider={credentialProvider} />- )}- {supportsUserPassword && (- <PasswordCredentialsModal provider={credentialProvider} />- )}- {supportsHostScoped && discriminatorValue && (- <HostScopedCredentialsModal- schema={schema as BlockIOCredentialsSubSchema}- provider={credentialProvider}- discriminatorValue={discriminatorValue}- />- )}- </div>- </div>- );-};diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/SelectCredential.tsx b/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/SelectCredential.tsxdeleted file mode 100644index 55081332aa..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/SelectCredential.tsx+++ /dev/null@@ -1,93 +0,0 @@-import React from "react";-import { Select } from "@/components/atoms/Select/Select";-import { CredentialsMetaResponse } from "@/app/api/__generated__/models/credentialsMetaResponse";-import {- ArrowSquareOutIcon,- KeyholeIcon,- KeyIcon,-} from "@phosphor-icons/react";-import { Button } from "@/components/atoms/Button/Button";-import { providerIcons } from "./helpers";--type SelectCredentialProps = {- credentials: CredentialsMetaResponse[];- value?: string;- defaultValue?: string;- onChange: (credentialId: string) => void;- disabled?: boolean;- label?: string;- placeholder?: string;-};--export const SelectCredential: React.FC<SelectCredentialProps> = ({- credentials,- value,- onChange,- disabled = false,- label = "Credential",- placeholder = "Select credential",-}) => {- const options = credentials.map((cred) => {- const details: string[] = [];- if (cred.title && cred.title !== cred.provider) {- details.push(cred.title);- }- if (cred.username) {- details.push(cred.username);- }- if (cred.host) {- details.push(cred.host);- }- const label =- details.length > 0- ? `${cred.provider} (${details.join(" - ")})`- : cred.provider;-- const Icon = providerIcons[cred.provider];- const icon =- cred.type === "oauth2" ? (- Icon ? (- <Icon />- ) : (- <KeyholeIcon />- )- ) : (- <KeyIcon className="h-4 w-4" />- );-- return {- value: cred.id,- label,- icon,- };- });-- return (- <div className="flex w-full items-center gap-2">- <Select- label={label}- id="select-credential"- wrapperClassName="!mb-0 flex-1 !max-w-[90%]"- value={value}- onValueChange={onChange}- options={options}- disabled={disabled}- placeholder={placeholder}- size="small"- hideLabel- />-- <Button- as="NextLink"- href="/profile/integrations"- target="_blank"- rel="noopener noreferrer"- variant="outline"- size="icon"- className="h-8 w-8 !min-w-8 border-zinc-300 p-0"- >- <ArrowSquareOutIcon className="h-4 w-4 text-zinc-600" />- </Button>- </div>- );-};diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/APIKeyCredentialModal/APIKeyCredentialModal.tsx b/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/APIKeyCredentialModal/APIKeyCredentialModal.tsxdeleted file mode 100644index 5a51e1e36c..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/APIKeyCredentialModal/APIKeyCredentialModal.tsx+++ /dev/null@@ -1,123 +0,0 @@-import { Input } from "@/components/atoms/Input/Input";-import { Button } from "@/components/atoms/Button/Button";-import { Dialog } from "@/components/molecules/Dialog/Dialog";-import {- Form,- FormDescription,- FormField,-} from "@/components/__legacy__/ui/form";-import { BlockIOCredentialsSubSchema } from "@/lib/autogpt-server-api/types"; // we need to find a way to replace it with autogenerated types-import { useAPIKeyCredentialsModal } from "./useAPIKeyCredentialsModal";-import { toDisplayName } from "../../helpers";-import { KeyIcon } from "@phosphor-icons/react";-import { Text } from "@/components/atoms/Text/Text";--type Props = {- schema: BlockIOCredentialsSubSchema;- provider: string;-};--export function APIKeyCredentialsModal({ schema, provider }: Props) {- const { form, schemaDescription, onSubmit, isOpen, setIsOpen } =- useAPIKeyCredentialsModal({ schema, provider });-- return (- <>- <Dialog- title={`Add new API key for ${toDisplayName(provider) ?? ""}`}- controlled={{- isOpen: isOpen,- set: (isOpen) => {- if (!isOpen) setIsOpen(false);- },- }}- onClose={() => setIsOpen(false)}- styling={{- maxWidth: "25rem",- }}- >- <Dialog.Content>- {schemaDescription && (- <p className="mb-4 text-sm text-zinc-600">{schemaDescription}</p>- )}-- <Form {...form}>- <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-2">- <FormField- control={form.control}- name="apiKey"- render={({ field }) => (- <>- <Input- id="apiKey"- label="API Key"- type="password"- placeholder="Enter API key..."- size="small"- hint={- schema.credentials_scopes ? (- <FormDescription>- Required scope(s) for this block:{" "}- {schema.credentials_scopes?.map((s, i, a) => (- <span key={i}>- <code className="text-xs font-bold">{s}</code>- {i < a.length - 1 && ", "}- </span>- ))}- </FormDescription>- ) : null- }- {...field}- />- </>- )}- />- <FormField- control={form.control}- name="title"- render={({ field }) => (- <Input- id="title"- label="Name"- type="text"- placeholder="Enter a name for this API key..."- size="small"- {...field}- />- )}- />- <FormField- control={form.control}- name="expiresAt"- render={({ field }) => (- <Input- id="expiresAt"- label="Expiration Date"- type="datetime-local"- placeholder="Select expiration date..."- size="small"- {...field}- />- )}- />- <Button type="submit" size="small" className="min-w-68">- Save & use this API key- </Button>- </form>- </Form>- </Dialog.Content>- </Dialog>- <Button- type="button"- className="w-fit px-2"- size="small"- onClick={() => setIsOpen(true)}- >- <KeyIcon />- <Text variant="small" className="!text-white opacity-100">- Add API key- </Text>- </Button>- </>- );-}diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/APIKeyCredentialModal/useAPIKeyCredentialsModal.ts b/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/APIKeyCredentialModal/useAPIKeyCredentialsModal.tsdeleted file mode 100644index 499cacf1ce..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/APIKeyCredentialModal/useAPIKeyCredentialsModal.ts+++ /dev/null@@ -1,103 +0,0 @@-import { z } from "zod";-import { useForm, type UseFormReturn } from "react-hook-form";-import { zodResolver } from "@hookform/resolvers/zod";-import { BlockIOCredentialsSubSchema } from "@/lib/autogpt-server-api/types";-import {- getGetV1ListCredentialsQueryKey,- usePostV1CreateCredentials,-} from "@/app/api/__generated__/endpoints/integrations/integrations";-import { useToast } from "@/components/molecules/Toast/use-toast";-import { APIKeyCredentials } from "@/app/api/__generated__/models/aPIKeyCredentials";-import { useQueryClient } from "@tanstack/react-query";-import { useState } from "react";--export type APIKeyFormValues = {- apiKey: string;- title: string;- expiresAt?: string;-};--type useAPIKeyCredentialsModalType = {- schema: BlockIOCredentialsSubSchema;- provider: string;-};--export function useAPIKeyCredentialsModal({- schema,- provider,-}: useAPIKeyCredentialsModalType): {- form: UseFormReturn<APIKeyFormValues>;- schemaDescription?: string;- onSubmit: (values: APIKeyFormValues) => Promise<void>;- isOpen: boolean;- setIsOpen: (isOpen: boolean) => void;-} {- const { toast } = useToast();- const [isOpen, setIsOpen] = useState(false);- const queryClient = useQueryClient();-- const { mutateAsync: createCredentials } = usePostV1CreateCredentials({- mutation: {- onSuccess: async () => {- form.reset();- setIsOpen(false);- toast({- title: "Success",- description: "Credentials created successfully",- variant: "default",- });-- await queryClient.refetchQueries({- queryKey: getGetV1ListCredentialsQueryKey(),- });- },- onError: () => {- toast({- title: "Error",- description: "Failed to create credentials.",- variant: "destructive",- });- },- },- });-- const formSchema = z.object({- apiKey: z.string().min(1, "API Key is required"),- title: z.string().min(1, "Name is required"),- expiresAt: z.string().optional(),- });-- const form = useForm<APIKeyFormValues>({- resolver: zodResolver(formSchema),- defaultValues: {- apiKey: "",- title: "",- expiresAt: "",- },- });-- async function onSubmit(values: APIKeyFormValues) {- const expiresAt = values.expiresAt- ? new Date(values.expiresAt).getTime() / 1000- : undefined;-- createCredentials({- provider: provider,- data: {- provider: provider,- type: "api_key",- api_key: values.apiKey,- title: values.title,- expires_at: expiresAt,- } as APIKeyCredentials,- });- }-- return {- form,- schemaDescription: schema.description,- onSubmit,- isOpen,- setIsOpen,- };-}diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/HostScopedCredentialsModal/HostScopedCredentialsModal.tsx b/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/HostScopedCredentialsModal/HostScopedCredentialsModal.tsxdeleted file mode 100644index 3264fca76f..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/HostScopedCredentialsModal/HostScopedCredentialsModal.tsx+++ /dev/null@@ -1,185 +0,0 @@-import { Input } from "@/components/atoms/Input/Input";-import { Button } from "@/components/atoms/Button/Button";-import { Dialog } from "@/components/molecules/Dialog/Dialog";-import {- Form,- FormDescription,- FormField,- FormLabel,-} from "@/components/__legacy__/ui/form";-import { BlockIOCredentialsSubSchema } from "@/lib/autogpt-server-api/types";-import { useHostScopedCredentialsModal } from "./useHostScopedCredentialsModal";-import { toDisplayName } from "../../helpers";-import { GlobeIcon, PlusIcon, TrashIcon } from "@phosphor-icons/react";-import { Text } from "@/components/atoms/Text/Text";--type Props = {- schema: BlockIOCredentialsSubSchema;- provider: string;- discriminatorValue?: string;-};--export function HostScopedCredentialsModal({- schema,- provider,- discriminatorValue,-}: Props) {- const {- form,- schemaDescription,- onSubmit,- isOpen,- setIsOpen,- headerPairs,- addHeaderPair,- removeHeaderPair,- updateHeaderPair,- currentHost,- } = useHostScopedCredentialsModal({ schema, provider, discriminatorValue });-- return (- <>- <Dialog- title={`Add sensitive headers for ${toDisplayName(provider) ?? ""}`}- controlled={{- isOpen: isOpen,- set: (isOpen) => {- if (!isOpen) setIsOpen(false);- },- }}- onClose={() => setIsOpen(false)}- styling={{- maxWidth: "38rem",- }}- >- <Dialog.Content>- <div className="px-1">- {schemaDescription && (- <p className="mb-4 text-sm text-zinc-600">{schemaDescription}</p>- )}-- <Form {...form}>- <form- onSubmit={form.handleSubmit(onSubmit)}- className="space-y-4"- >- <FormField- control={form.control}- name="host"- render={({ field }) => (- <Input- id="host"- label="Host Pattern"- type="text"- size="small"- readOnly={!!currentHost}- hint={- currentHost- ? "Auto-populated from the URL field. Headers will be applied to requests to this host."- : "Enter the host/domain to match against request URLs (e.g., api.example.com)."- }- placeholder={- currentHost- ? undefined- : "Enter host (e.g., api.example.com)"- }- {...field}- />- )}- />-- <FormField- control={form.control}- name="title"- render={({ field }) => (- <Input- id="title"- label="Name (optional)"- type="text"- placeholder="Enter a name for these credentials..."- size="small"- {...field}- />- )}- />-- <div className="space-y-2">- <FormLabel>Headers</FormLabel>- <FormDescription className="max-w-md">- Add sensitive headers (like Authorization, X-API-Key) that- should be automatically included in requests to the- specified host.- </FormDescription>-- {headerPairs.map((pair, index) => (- <div key={index} className="flex w-full items-center gap-2">- <Input- id={`header-${index}-key`}- label="Header Name"- placeholder="e.g., Authorization"- size="small"- value={pair.key}- className="flex-1"- onChange={(e) =>- updateHeaderPair(index, "key", e.target.value)- }- />-- <Input- id={`header-${index}-value`}- label="Header Value"- size="small"- type="password"- className="flex-1"- placeholder="e.g., Bearer token123"- value={pair.value}- onChange={(e) =>- updateHeaderPair(index, "value", e.target.value)- }- />- <Button- type="button"- variant="secondary"- size="small"- onClick={() => removeHeaderPair(index)}- disabled={headerPairs.length === 1}- className="min-w-0"- >- <TrashIcon className="size-4" />- </Button>- </div>- ))}-- <Button- type="button"- variant="outline"- size="small"- onClick={addHeaderPair}- >- <PlusIcon className="size-4" /> Add Another Header- </Button>- </div>-- <Button type="submit" size="small" className="min-w-68">- Save & use these credentials- </Button>- </form>- </Form>- </div>- </Dialog.Content>- </Dialog>- <Button- type="button"- className="w-fit px-2"- size="small"- onClick={() => setIsOpen(true)}- >- <GlobeIcon />- <Text variant="small" className="truncate !text-white opacity-100">- Add sensitive headers for{" "}- {toDisplayName(discriminatorValue || provider) ?? ""}- </Text>- </Button>- </>- );-}diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/HostScopedCredentialsModal/useHostScopedCredentialsModal.ts b/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/HostScopedCredentialsModal/useHostScopedCredentialsModal.tsdeleted file mode 100644index 066bc05b51..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/HostScopedCredentialsModal/useHostScopedCredentialsModal.ts+++ /dev/null@@ -1,167 +0,0 @@-import { z } from "zod";-import { useForm, type UseFormReturn } from "react-hook-form";-import { zodResolver } from "@hookform/resolvers/zod";-import { BlockIOCredentialsSubSchema } from "@/lib/autogpt-server-api/types";-import {- getGetV1ListCredentialsQueryKey,- usePostV1CreateCredentials,-} from "@/app/api/__generated__/endpoints/integrations/integrations";-import { useToast } from "@/components/molecules/Toast/use-toast";-import { HostScopedCredentialsInput } from "@/app/api/__generated__/models/hostScopedCredentialsInput";-import { useQueryClient } from "@tanstack/react-query";-import { useState } from "react";-import { getHostFromUrl } from "@/lib/utils/url";--export type HeaderPair = {- key: string;- value: string;-};--export type HostScopedFormValues = {- host: string;- title?: string;-};--type UseHostScopedCredentialsModalType = {- schema: BlockIOCredentialsSubSchema;- provider: string;- discriminatorValue?: string;-};--export function useHostScopedCredentialsModal({- schema,- provider,- discriminatorValue,-}: UseHostScopedCredentialsModalType): {- form: UseFormReturn<HostScopedFormValues>;- schemaDescription?: string;- onSubmit: (values: HostScopedFormValues) => Promise<void>;- isOpen: boolean;- setIsOpen: (isOpen: boolean) => void;- headerPairs: HeaderPair[];- addHeaderPair: () => void;- removeHeaderPair: (index: number) => void;- updateHeaderPair: (- index: number,- field: "key" | "value",- value: string,- ) => void;- currentHost: string | null;-} {- const { toast } = useToast();- const [isOpen, setIsOpen] = useState(false);- const [headerPairs, setHeaderPairs] = useState<HeaderPair[]>([- { key: "", value: "" },- ]);- const queryClient = useQueryClient();-- // Get current host from discriminatorValue (URL field)- const currentHost = discriminatorValue- ? getHostFromUrl(discriminatorValue)- : null;-- const { mutateAsync: createCredentials } = usePostV1CreateCredentials({- mutation: {- onSuccess: async () => {- form.reset();- setHeaderPairs([{ key: "", value: "" }]);- setIsOpen(false);- toast({- title: "Success",- description: "Host-scoped credentials created successfully",- variant: "default",- });-- await queryClient.refetchQueries({- queryKey: getGetV1ListCredentialsQueryKey(),- });- },- onError: () => {- toast({- title: "Error",- description: "Failed to create host-scoped credentials.",- variant: "destructive",- });- },- },- });-- const formSchema = z.object({- host: z.string().min(1, "Host is required"),- title: z.string().optional().default(""),- });-- const form = useForm<HostScopedFormValues>({- resolver: zodResolver(formSchema),- defaultValues: {- host: currentHost || "",- title: currentHost || "Manual Entry",- },- });-- // Update form values when modal opens and discriminatorValue changes- const handleSetIsOpen = (open: boolean) => {- if (open && currentHost) {- form.setValue("host", currentHost);- form.setValue("title", currentHost);- }- setIsOpen(open);- };-- const addHeaderPair = () => {- setHeaderPairs([...headerPairs, { key: "", value: "" }]);- };-- const removeHeaderPair = (index: number) => {- if (headerPairs.length > 1) {- setHeaderPairs(headerPairs.filter((_, i) => i !== index));- }- };-- const updateHeaderPair = (- index: number,- field: "key" | "value",- value: string,- ) => {- const newPairs = [...headerPairs];- newPairs[index][field] = value;- setHeaderPairs(newPairs);- };-- async function onSubmit(values: HostScopedFormValues) {- // Convert header pairs to object, filtering out empty pairs- const headers = headerPairs.reduce(- (acc, pair) => {- if (pair.key.trim() && pair.value.trim()) {- acc[pair.key.trim()] = pair.value.trim();- }- return acc;- },- {} as Record<string, string>,- );-- createCredentials({- provider: provider,- data: {- provider: provider,- type: "host_scoped",- host: values.host,- title: values.title || values.host,- headers: headers,- } as HostScopedCredentialsInput,- });- }-- return {- form,- schemaDescription: schema.description,- onSubmit,- isOpen,- setIsOpen: handleSetIsOpen,- headerPairs,- addHeaderPair,- removeHeaderPair,- updateHeaderPair,- currentHost,- };-}diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/OAuthCredentialModal/OAuthCredentialModal.tsx b/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/OAuthCredentialModal/OAuthCredentialModal.tsxdeleted file mode 100644index 9824ace169..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/OAuthCredentialModal/OAuthCredentialModal.tsx+++ /dev/null@@ -1,63 +0,0 @@-import { Button } from "@/components/atoms/Button/Button";-import { Dialog } from "@/components/molecules/Dialog/Dialog";-import { providerIcons, toDisplayName } from "../../helpers";-import { useOAuthCredentialModal } from "./useOAuthCredentialModal";-import { Text } from "@/components/atoms/Text/Text";--type OAuthCredentialModalProps = {- provider: string;-};--export const OAuthCredentialModal = ({- provider,-}: OAuthCredentialModalProps) => {- const Icon = providerIcons[provider];- const { handleOAuthLogin, loading, error, onClose, open, setOpen } =- useOAuthCredentialModal({- provider,- });- return (- <>- <Dialog- title={`Waiting on ${toDisplayName(provider)} sign-in process...`}- controlled={{- isOpen: open,- set: (isOpen) => {- if (!isOpen) setOpen(false);- },- }}- onClose={onClose}- >- <Dialog.Content>- <p className="text-sm text-zinc-600">- Complete the sign-in process in the pop-up window.- <br />- Closing this dialog will cancel the sign-in process.- </p>- </Dialog.Content>- </Dialog>-- <Button- type="button"- className="w-fit px-2"- size="small"- onClick={() => {- handleOAuthLogin();- }}- disabled={loading}- >- {Icon && <Icon className="size-4" />}- <Text variant="small" className="!text-white opacity-100">- Add OAuth2- </Text>- </Button>- {error && (- <div className="mt-2 flex w-fit items-center rounded-full bg-red-50 p-1 px-3 ring-1 ring-red-600">- <Text variant="small" className="!text-red-600">- {error as string}- </Text>- </div>- )}- </>- );-};diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/OAuthCredentialModal/useOAuthCredentialModal.ts b/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/OAuthCredentialModal/useOAuthCredentialModal.tsdeleted file mode 100644index cf82ebca70..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/OAuthCredentialModal/useOAuthCredentialModal.ts+++ /dev/null@@ -1,196 +0,0 @@-import {- getGetV1ListCredentialsQueryKey,- useGetV1InitiateOauthFlow,- usePostV1ExchangeOauthCodeForTokens,-} from "@/app/api/__generated__/endpoints/integrations/integrations";-import { LoginResponse } from "@/app/api/__generated__/models/loginResponse";-import { useToast } from "@/components/molecules/Toast/use-toast";-import { useQueryClient } from "@tanstack/react-query";-import { useState } from "react";--type useOAuthCredentialModalProps = {- provider: string;- scopes?: string[];-};--export type OAuthPopupResultMessage = { message_type: "oauth_popup_result" } & (- | {- success: true;- code: string;- state: string;- }- | {- success: false;- message: string;- }-);--export const useOAuthCredentialModal = ({- provider,- scopes,-}: useOAuthCredentialModalProps) => {- const { toast } = useToast();-- const [open, setOpen] = useState(false);- const [oAuthPopupController, setOAuthPopupController] =- useState<AbortController | null>(null);- const [oAuthError, setOAuthError] = useState<string | null>(null);- const [isOAuth2FlowInProgress, setOAuth2FlowInProgress] = useState(false);-- const queryClient = useQueryClient();-- const {- refetch: initiateOauthFlow,- isRefetching: isInitiatingOauthFlow,- isRefetchError: initiatingOauthFlowError,- } = useGetV1InitiateOauthFlow(- provider,- {- scopes: scopes?.join(","),- },- {- query: {- enabled: false,- select: (res) => {- return res.data as LoginResponse;- },- },- },- );-- const {- mutateAsync: oAuthCallback,- isPending: isOAuthCallbackPending,- error: oAuthCallbackError,- } = usePostV1ExchangeOauthCodeForTokens({- mutation: {- onSuccess: () => {- queryClient.invalidateQueries({- queryKey: getGetV1ListCredentialsQueryKey(),- });- setOpen(false);- toast({- title: "Success",- description: "Credential added successfully",- variant: "default",- });- },- },- });-- const handleOAuthLogin = async () => {- const { data } = await initiateOauthFlow();- if (!data || !data.login_url || !data.state_token) {- toast({- title: "Failed to initiate OAuth flow",- variant: "destructive",- });- setOAuthError(- data && typeof data === "object" && "detail" in data- ? (data.detail as string)- : "Failed to initiate OAuth flow",- );- return;- }-- setOpen(true);- setOAuth2FlowInProgress(true);-- const { login_url, state_token } = data;-- const popup = window.open(login_url, "_blank", "popup=true");-- if (!popup) {- throw new Error(- "Failed to open popup window. Please allow popups for this site.",- );- }-- const controller = new AbortController();- setOAuthPopupController(controller);-- controller.signal.onabort = () => {- console.debug("OAuth flow aborted");- popup.close();- };-- const handleMessage = async (e: MessageEvent<OAuthPopupResultMessage>) => {- console.debug("Message received:", e.data);- if (- typeof e.data != "object" ||- !("message_type" in e.data) ||- e.data.message_type !== "oauth_popup_result"- ) {- console.debug("Ignoring irrelevant message");- return;- }-- if (!e.data.success) {- console.error("OAuth flow failed:", e.data.message);- setOAuthError(`OAuth flow failed: ${e.data.message}`);- setOAuth2FlowInProgress(false);- return;- }-- if (e.data.state !== state_token) {- console.error("Invalid state token received");- setOAuthError("Invalid state token received");- setOAuth2FlowInProgress(false);- return;- }-- try {- console.debug("Processing OAuth callback");- await oAuthCallback({- provider,- data: {- code: e.data.code,- state_token: e.data.state,- },- });-- console.debug("OAuth callback processed successfully");- } catch (error) {- console.error("Error in OAuth callback:", error);- setOAuthError(- `Error in OAuth callback: ${- error instanceof Error ? error.message : String(error)- }`,- );- } finally {- console.debug("Finalizing OAuth flow");- setOAuth2FlowInProgress(false);- controller.abort("success");- }- };-- window.addEventListener("message", handleMessage, {- signal: controller.signal,- });-- setTimeout(- () => {- console.debug("OAuth flow timed out");- controller.abort("timeout");- setOAuth2FlowInProgress(false);- setOAuthError("OAuth flow timed out");- },- 5 * 60 * 1000,- );- };-- const onClose = () => {- oAuthPopupController?.abort("canceled");- setOpen(false);- };-- return {- handleOAuthLogin,- loading:- isOAuth2FlowInProgress || isOAuthCallbackPending || isInitiatingOauthFlow,- error: oAuthError || initiatingOauthFlowError || oAuthCallbackError,- onClose,- open,- setOpen,- };-};diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/PasswordCredentialModal/PasswordCredentialModal.tsx b/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/PasswordCredentialModal/PasswordCredentialModal.tsxdeleted file mode 100644index 9abaa8b328..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/PasswordCredentialModal/PasswordCredentialModal.tsx+++ /dev/null@@ -1,102 +0,0 @@-import { Input } from "@/components/atoms/Input/Input";-import { Button } from "@/components/atoms/Button/Button";-import { Dialog } from "@/components/molecules/Dialog/Dialog";-import { Form, FormField } from "@/components/__legacy__/ui/form";-import { usePasswordCredentialModal } from "./usePasswordCredentialModal";-import { toDisplayName } from "../../helpers";-import { UserIcon } from "@phosphor-icons/react";-import { Text } from "@/components/atoms/Text/Text";--type Props = {- provider: string;-};--export function PasswordCredentialsModal({ provider }: Props) {- const { form, onSubmit, open, setOpen } = usePasswordCredentialModal({- provider,- });-- return (- <>- <Dialog- title={`Add new username & password for ${toDisplayName(provider)}`}- controlled={{- isOpen: open,- set: (isOpen) => {- if (!isOpen) setOpen(false);- },- }}- onClose={() => setOpen(false)}- styling={{- maxWidth: "25rem",- }}- >- <Dialog.Content>- <Form {...form}>- <form- onSubmit={form.handleSubmit(onSubmit)}- className="space-y-2 pt-4"- >- <FormField- control={form.control}- name="username"- render={({ field }) => (- <Input- id="username"- label="Username"- type="text"- placeholder="Enter username..."- size="small"- {...field}- />- )}- />- <FormField- control={form.control}- name="password"- render={({ field }) => (- <Input- id="password"- label="Password"- type="password"- placeholder="Enter password..."- size="small"- {...field}- />- )}- />- <FormField- control={form.control}- name="title"- render={({ field }) => (- <Input- id="title"- label="Name"- type="text"- placeholder="Enter a name for this user login..."- size="small"- {...field}- />- )}- />- <Button type="submit" size="small" className="min-w-68">- Save & use this user login- </Button>- </form>- </Form>- </Dialog.Content>- </Dialog>- <Button- type="button"- className="w-fit px-2"- size="small"- onClick={() => setOpen(true)}- >- <UserIcon className="size-4" />- <Text variant="small" className="!text-white opacity-100">- Add username & password- </Text>- </Button>- </>- );-}diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/PasswordCredentialModal/usePasswordCredentialModal.ts b/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/PasswordCredentialModal/usePasswordCredentialModal.tsdeleted file mode 100644index e0a4e4a805..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/models/PasswordCredentialModal/usePasswordCredentialModal.ts+++ /dev/null@@ -1,75 +0,0 @@-import { useState } from "react";-import z from "zod";-import { useForm } from "react-hook-form";-import { zodResolver } from "@hookform/resolvers/zod";-import {- getGetV1ListCredentialsQueryKey,- usePostV1CreateCredentials,-} from "@/app/api/__generated__/endpoints/integrations/integrations";-import { useToast } from "@/components/molecules/Toast/use-toast";-import { useQueryClient } from "@tanstack/react-query";--type usePasswordCredentialModalType = {- provider: string;-};--export const usePasswordCredentialModal = ({- provider,-}: usePasswordCredentialModalType) => {- const [open, setOpen] = useState(false);- const { toast } = useToast();- const queryClient = useQueryClient();-- const formSchema = z.object({- username: z.string().min(1, "Username is required"),- password: z.string().min(1, "Password is required"),- title: z.string().min(1, "Name is required"),- });-- const form = useForm<z.infer<typeof formSchema>>({- resolver: zodResolver(formSchema),- defaultValues: {- username: "",- password: "",- title: "",- },- });-- const { mutateAsync: createCredentials } = usePostV1CreateCredentials({- mutation: {- onSuccess: async () => {- form.reset();- setOpen(false);- toast({- title: "Success",- description: "Credentials created successfully",- variant: "default",- });-- await queryClient.refetchQueries({- queryKey: getGetV1ListCredentialsQueryKey(),- });- },- },- });-- async function onSubmit(values: z.infer<typeof formSchema>) {- createCredentials({- provider: provider,- data: {- provider: provider,- type: "user_password",- username: values.username,- password: values.password,- title: values.title,- },- });- }-- return {- form,- onSubmit,- open,- setOpen,- };-};diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/useCredentialField.ts b/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/useCredentialField.tsdeleted file mode 100644index a90add8aeb..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/CredentialField/useCredentialField.ts+++ /dev/null@@ -1,141 +0,0 @@-import { useGetV1ListCredentials } from "@/app/api/__generated__/endpoints/integrations/integrations";-import { CredentialsMetaResponse } from "@/app/api/__generated__/models/credentialsMetaResponse";-import { BlockIOCredentialsSubSchema } from "@/lib/autogpt-server-api";-import {- filterCredentialsByProvider,- getCredentialProviderFromSchema,- getDiscriminatorValue,-} from "./helpers";-import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";-import { useEffect, useRef } from "react";-import { useShallow } from "zustand/react/shallow";--export const useCredentialField = ({- credentialSchema,- formData,- nodeId,- onChange,-}: {- credentialSchema: BlockIOCredentialsSubSchema; // Here we are using manual typing, we need to fix it with automatic one- formData: Record<string, any>;- nodeId: string;- onChange: (value: Record<string, any>) => void;-}) => {- const previousProviderRef = useRef<string | null>(null);-- // Fetch all the credentials from the backend- // We will save it in cache for 10 min, if user edits the credential, we will invalidate the cache- // Whenever user adds a block, we filter the credentials list and check if this block's provider is in the list- const { data: credentials, isLoading: isCredentialListLoading } =- useGetV1ListCredentials({- query: {- refetchInterval: 10 * 60 * 1000,- select: (x) => {- return x.data as CredentialsMetaResponse[];- },- },- });-- const hardcodedValues = useNodeStore(- useShallow((state) => state.getHardCodedValues(nodeId)),- );-- const credentialProvider = getCredentialProviderFromSchema(- hardcodedValues,- credentialSchema,- );-- const discriminatorValue = getDiscriminatorValue(- hardcodedValues,- credentialSchema,- );-- const supportsApiKey = credentialSchema.credentials_types.includes("api_key");- const supportsOAuth2 = credentialSchema.credentials_types.includes("oauth2");- const supportsUserPassword =- credentialSchema.credentials_types.includes("user_password");- const supportsHostScoped =- credentialSchema.credentials_types.includes("host_scoped");-- const { credentials: filteredCredentials, exists: credentialsExists } =- filterCredentialsByProvider(- credentials,- credentialProvider ?? "",- credentialSchema,- discriminatorValue,- );-- const setCredential = (credentialId: string) => {- const selectedCredential = filteredCredentials.find(- (c) => c.id === credentialId,- );- if (selectedCredential) {- onChange({- ...formData,- id: selectedCredential.id,- provider: selectedCredential.provider,- title: selectedCredential.title,- type: selectedCredential.type,- });- }- };-- // This side effect is used to clear the hardcoded value in credential formData when the provider changes- useEffect(() => {- if (!credentialProvider) return;- // If provider has changed and we have a credential selected- if (- previousProviderRef.current !== null &&- previousProviderRef.current !== credentialProvider &&- formData.id- ) {- // Check if the current credential belongs to the new provider- const currentCredentialBelongsToProvider = filteredCredentials.some(- (c) => c.id === formData.id,- );-- // If not, clear the credential- if (!currentCredentialBelongsToProvider) {- onChange({- id: "",- provider: "",- title: "",- type: "",- });- }- }- previousProviderRef.current = credentialProvider;- }, [credentialProvider, formData.id, credentials, onChange]);-- // This side effect is used to auto-select the latest credential when none is selected [latest means last one in the list of credentials]- useEffect(() => {- if (- !isCredentialListLoading &&- filteredCredentials.length > 0 &&- !formData.id && // No credential currently selected- credentialProvider // Provider is set- ) {- const latestCredential =- filteredCredentials[filteredCredentials.length - 1];- setCredential(latestCredential.id);- }- }, [- isCredentialListLoading,- filteredCredentials.length,- formData.id,- credentialProvider,- ]);-- return {- credentials: filteredCredentials,- isCredentialListLoading,- setCredential,- supportsApiKey,- supportsOAuth2,- supportsUserPassword,- supportsHostScoped,- credentialsExists,- credentialProvider,- discriminatorValue,- };-};diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/ObjectField.tsx b/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/ObjectField.tsxdeleted file mode 100644index 8189116a4e..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/ObjectField.tsx+++ /dev/null@@ -1,42 +0,0 @@-import React from "react";-import { FieldProps } from "@rjsf/utils";-import { getDefaultRegistry } from "@rjsf/core";-import { generateHandleId } from "@/app/(platform)/build/components/FlowEditor/handlers/helpers";-import { ObjectEditor } from "../widgets/ObjectEditorWidget/ObjectEditorWidget";--export const ObjectField = (props: FieldProps) => {- const {- schema,- formData = {},- onChange,- name,- idSchema,- formContext,- } = props;- const DefaultObjectField = getDefaultRegistry().fields.ObjectField;-- // Let the default field render for root or fixed-schema objects- let isFreeForm = false;- if ("additionalProperties" in schema || !("properties" in schema)) {- isFreeForm = true;- }-- if (idSchema?.$id === "root" || !isFreeForm) {- // TODO : We need to create better one- return <DefaultObjectField {...props} />;- }-- const fieldKey = generateHandleId(idSchema.$id ?? "");- const { nodeId } = formContext;-- return (- <ObjectEditor- id={idSchema?.$id ?? ""}- nodeId={nodeId}- fieldKey={fieldKey}- value={formData}- onChange={onChange}- placeholder={`Enter ${name || "Contact Data"}`}- />- );-};diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/index.ts b/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/index.tsdeleted file mode 100644index 6f826495d1..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/fields/index.ts+++ /dev/null@@ -1,10 +0,0 @@-import { RegistryFieldsType } from "@rjsf/utils";-import { CredentialsField } from "./CredentialField/CredentialField";-import { AnyOfField } from "./AnyOfField/AnyOfField";-import { ObjectField } from "./ObjectField";--export const fields: RegistryFieldsType = {- AnyOfField: AnyOfField,- credentials: CredentialsField,- ObjectField: ObjectField,-};diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/templates/ArrayFieldTemplate.tsx b/autogpt_platform/frontend/src/components/renderers/input-renderer/templates/ArrayFieldTemplate.tsxdeleted file mode 100644index e9f708de5a..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/templates/ArrayFieldTemplate.tsx+++ /dev/null@@ -1,30 +0,0 @@-import React from "react";-import { ArrayFieldTemplateProps } from "@rjsf/utils";-import { ArrayEditorWidget } from "../widgets/ArrayEditorWidget/ArrayEditorWidget";--function ArrayFieldTemplate(props: ArrayFieldTemplateProps) {- const {- items,- canAdd,- onAddClick,- disabled,- readonly,- formContext,- idSchema,- } = props;- const { nodeId } = formContext;-- return (- <ArrayEditorWidget- items={items}- nodeId={nodeId}- canAdd={canAdd}- onAddClick={onAddClick}- disabled={disabled}- readonly={readonly}- id={idSchema.$id}- />- );-}--export default ArrayFieldTemplate;diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/templates/FieldTemplate.tsx b/autogpt_platform/frontend/src/components/renderers/input-renderer/templates/FieldTemplate.tsxdeleted file mode 100644index ebc8a1f038..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/templates/FieldTemplate.tsx+++ /dev/null@@ -1,184 +0,0 @@-import React, { useContext } from "react";-import { FieldTemplateProps } from "@rjsf/utils";-import { InfoIcon } from "@phosphor-icons/react";-import {- Tooltip,- TooltipContent,- TooltipProvider,- TooltipTrigger,-} from "@/components/atoms/Tooltip/BaseTooltip";-import { Text } from "@/components/atoms/Text/Text";--import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";-import { useNodeStore } from "@/app/(platform)/build/stores/nodeStore";-import { generateHandleId } from "@/app/(platform)/build/components/FlowEditor/handlers/helpers";-import { getTypeDisplayInfo } from "@/app/(platform)/build/components/FlowEditor/nodes/helpers";-import { ArrayEditorContext } from "../widgets/ArrayEditorWidget/ArrayEditorContext";-import {- isCredentialFieldSchema,- toDisplayName,- getCredentialProviderFromSchema,-} from "../fields/CredentialField/helpers";-import { cn } from "@/lib/utils";-import { BlockIOCredentialsSubSchema } from "@/lib/autogpt-server-api";-import { BlockUIType } from "@/lib/autogpt-server-api";-import NodeHandle from "@/app/(platform)/build/components/FlowEditor/handlers/NodeHandle";-import { getFieldErrorKey } from "../utils/helpers";--const FieldTemplate: React.FC<FieldTemplateProps> = ({- id: fieldId,- label,- required,- description,- children,- schema,- formContext,- uiSchema,-}) => {- const { isInputConnected } = useEdgeStore();- const { nodeId, showHandles = true, size = "small" } = formContext;- const uiType = formContext.uiType;-- const showAdvanced = useNodeStore(- (state) => state.nodeAdvancedStates[nodeId] ?? false,- );-- const nodeErrors = useNodeStore((state) => {- const node = state.nodes.find((n) => n.id === nodeId);- return node?.data?.errors;- });-- const { isArrayItem, arrayFieldHandleId } = useContext(ArrayEditorContext);-- const isAnyOf =- Array.isArray((schema as any)?.anyOf) && !(schema as any)?.enum;- const isOneOf = Array.isArray((schema as any)?.oneOf);- const isCredential = isCredentialFieldSchema(schema);- const suppressHandle = isAnyOf || isOneOf;-- let handleId = null;- if (!isArrayItem) {- if (uiType === BlockUIType.AGENT) {- const parts = fieldId.split("_");- const filtered = parts.filter(- (p) => p !== "root" && p !== "properties" && p.length > 0,- );- handleId = filtered.join("_") || "";- } else {- handleId = generateHandleId(fieldId);- }- } else {- handleId = arrayFieldHandleId;- }-- const isConnected = showHandles ? isInputConnected(nodeId, handleId) : false;-- if (!showAdvanced && schema.advanced === true && !isConnected) {- return null;- }-- const fromAnyOf =- Boolean((uiSchema as any)?.["ui:options"]?.fromAnyOf) ||- Boolean((formContext as any)?.fromAnyOf);-- const { displayType, colorClass } = getTypeDisplayInfo(schema);-- let credentialProvider = null;- if (isCredential) {- credentialProvider = getCredentialProviderFromSchema(- useNodeStore.getState().getHardCodedValues(nodeId),- schema as BlockIOCredentialsSubSchema,- );- }- if (formContext.uiType === BlockUIType.NOTE) {- return <div className="w-full space-y-1">{children}</div>;- }-- // Size-based styling- let shouldShowHandle =- showHandles && !suppressHandle && !fromAnyOf && !isCredential;-- // We do not want handle for output block's name field- if (uiType === BlockUIType.OUTPUT && fieldId === "root_name") {- shouldShowHandle = false;- }-- const fieldErrorKey = getFieldErrorKey(fieldId);- const fieldError =- nodeErrors?.[fieldErrorKey] ||- nodeErrors?.[fieldErrorKey.replace(/_/g, ".")] ||- nodeErrors?.[fieldErrorKey.replace(/\./g, "_")] ||- null;-- return (- <div- className={cn(- "mb-4 space-y-2",- fromAnyOf && "mb-0",- size === "small" ? "w-[350px]" : "w-full",- )}- >- {!isAnyOf && !fromAnyOf && label && (- <label htmlFor={fieldId} className="flex items-center gap-1">- {shouldShowHandle && (- <NodeHandle- handleId={handleId}- isConnected={isConnected}- side="left"- />- )}- <Text- variant={formContext.size === "small" ? "body" : "body-medium"}- className={cn(- "line-clamp-1",- isCredential && !shouldShowHandle && "ml-3",- size == "large" && "ml-0",- uiType === BlockUIType.OUTPUT &&- fieldId === "root_name" &&- "ml-3",- uiType === BlockUIType.INPUT && "ml-3",- uiType === BlockUIType.WEBHOOK && "ml-3",- uiType === BlockUIType.WEBHOOK_MANUAL && "ml-3",- )}- >- {isCredential && credentialProvider- ? toDisplayName(credentialProvider) + " credentials"- : schema.title || label}- </Text>- <Text variant="small" className={colorClass}>- ({displayType})- </Text>- {required && <span style={{ color: "red" }}>*</span>}- {description?.props?.description && (- <TooltipProvider>- <Tooltip>- <TooltipTrigger asChild>- <span- style={{ marginLeft: 6, cursor: "pointer" }}- aria-label="info"- tabIndex={0}- >- <InfoIcon />- </span>- </TooltipTrigger>- <TooltipContent>{description}</TooltipContent>- </Tooltip>- </TooltipProvider>- )}- </label>- )}- {(isAnyOf || !isConnected) && (- <div className={cn(size === "small" ? "max-w-[340px] pl-2" : "")}>- {children}- </div>- )}- {fieldError && (- <Text variant="small" className="mt-1 pl-4 !text-red-600">- {fieldError}- </Text>- )}- </div>- );-};--export default FieldTemplate;diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/templates/index.ts b/autogpt_platform/frontend/src/components/renderers/input-renderer/templates/index.tsdeleted file mode 100644index 203526cd75..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/templates/index.ts+++ /dev/null@@ -1,10 +0,0 @@-import ArrayFieldTemplate from "./ArrayFieldTemplate";-import FieldTemplate from "./FieldTemplate";--const NoSubmitButton = () => null;--export const templates = {- FieldTemplate,- ButtonTemplates: { SubmitButton: NoSubmitButton },- ArrayFieldTemplate,-};diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/ArrayEditorWidget/ArrayEditorContext.tsx b/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/ArrayEditorWidget/ArrayEditorContext.tsxdeleted file mode 100644index 09fe11bc94..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/ArrayEditorWidget/ArrayEditorContext.tsx+++ /dev/null@@ -1,11 +0,0 @@-import { createContext } from "react";--export const ArrayEditorContext = createContext<{- isArrayItem: boolean;- arrayFieldHandleId: string;- isConnected: boolean;-}>({- isArrayItem: false,- arrayFieldHandleId: "",- isConnected: false,-});diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/ArrayEditorWidget/ArrayEditorWidget.tsx b/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/ArrayEditorWidget/ArrayEditorWidget.tsxdeleted file mode 100644index 01a2af2e40..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/ArrayEditorWidget/ArrayEditorWidget.tsx+++ /dev/null@@ -1,92 +0,0 @@-import { ArrayFieldTemplateItemType, RJSFSchema } from "@rjsf/utils";-import { ArrayEditorContext } from "./ArrayEditorContext";-import { Button } from "@/components/atoms/Button/Button";-import { PlusIcon, XIcon } from "@phosphor-icons/react";-import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";-import {- generateHandleId,- HandleIdType,-} from "@/app/(platform)/build/components/FlowEditor/handlers/helpers";--export interface ArrayEditorProps {- items?: ArrayFieldTemplateItemType<any, RJSFSchema, any>[];- nodeId: string;- canAdd: boolean | undefined;- onAddClick?: () => void;- disabled: boolean | undefined;- readonly: boolean | undefined;- id: string;-}--export const ArrayEditorWidget = ({- items,- nodeId,- canAdd,- onAddClick,- disabled,- readonly,- id: fieldId,-}: ArrayEditorProps) => {- const { isInputConnected } = useEdgeStore();-- return (- <div className="space-y-2">- <div className="flex items-center gap-2">- <div className="max-w-[345px] flex-1">- {items?.map((element) => {- const arrayFieldHandleId = generateHandleId(- fieldId,- [element.index.toString()],- HandleIdType.ARRAY,- );- const isConnected = isInputConnected(nodeId, arrayFieldHandleId);- return (- <div- key={element.key}- className="-ml-2 flex max-w-[350px] items-center gap-2"- >- <ArrayEditorContext.Provider- value={{- isArrayItem: true,- arrayFieldHandleId: arrayFieldHandleId,- isConnected,- }}- >- {element.children}- </ArrayEditorContext.Provider>-- {element.hasRemove &&- !readonly &&- !disabled &&- !isConnected && (- <Button- type="button"- variant="secondary"- className="relative top-1.5 min-w-0 p-2 px-3"- size="small"- onClick={element.onDropIndexClick(element.index)}- >- <XIcon className="size-4" />- </Button>- )}- </div>- );- })}- </div>- </div>-- {canAdd && !readonly && !disabled && (- <Button- type="button"- variant="secondary"- size="small"- onClick={onAddClick}- className="w-full"- >- <PlusIcon className="mr-2 h-4 w-4" />- Add Item- </Button>- )}- </div>- );-};diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/ObjectEditorWidget/ObjectEditorWidget.tsx b/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/ObjectEditorWidget/ObjectEditorWidget.tsxdeleted file mode 100644index 80d504421d..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/ObjectEditorWidget/ObjectEditorWidget.tsx+++ /dev/null@@ -1,183 +0,0 @@-"use client";--import React from "react";-import { Plus, X } from "lucide-react";-import { Text } from "@/components/atoms/Text/Text";-import { Button } from "@/components/atoms/Button/Button";-import { Input } from "@/components/atoms/Input/Input";-import NodeHandle from "@/app/(platform)/build/components/FlowEditor/handlers/NodeHandle";-import { useEdgeStore } from "@/app/(platform)/build/stores/edgeStore";-import {- generateHandleId,- HandleIdType,- parseKeyValueHandleId,-} from "@/app/(platform)/build/components/FlowEditor/handlers/helpers";--export interface ObjectEditorProps {- id: string;- value?: Record<string, any>;- onChange?: (value: Record<string, any>) => void;- placeholder?: string;- disabled?: boolean;- className?: string;- nodeId: string;- fieldKey: string;-}--export const ObjectEditor = React.forwardRef<HTMLDivElement, ObjectEditorProps>(- (- {- id: parentFieldId,- value = {},- onChange,- placeholder = "Enter value",- disabled = false,- className,- nodeId,- },- ref,- ) => {- const getAllHandleIdsOfANode = useEdgeStore(- (state) => state.getAllHandleIdsOfANode,- );- const setProperty = (key: string, propertyValue: any) => {- if (!onChange) return;-- const newData: Record<string, any> = { ...value };- if (propertyValue === undefined || propertyValue === "") {- delete newData[key];- } else {- newData[key] = propertyValue;- }- onChange(newData);- };-- const addProperty = () => {- if (!onChange) return;- onChange({ ...value, [""]: "" });- };-- const removeProperty = (key: string) => {- if (!onChange) return;- const newData = { ...value };- delete newData[key];- onChange(newData);- };-- const updateKey = (oldKey: string, newKey: string) => {- if (!onChange || oldKey === newKey) return;-- const propertyValue = value[oldKey];- const newData: Record<string, any> = { ...value };- delete newData[oldKey];- newData[newKey] = propertyValue;- onChange(newData);- };-- const hasEmptyKeys = Object.keys(value).some((key) => key.trim() === "");-- const { isInputConnected } = useEdgeStore();-- const allHandleIdsOfANode = getAllHandleIdsOfANode(nodeId);- const allKeyValueHandleIdsOfANode = allHandleIdsOfANode.filter((handleId) =>- handleId.includes("_#_"),- );- allKeyValueHandleIdsOfANode.forEach((handleId) => {- const key = parseKeyValueHandleId(handleId, HandleIdType.KEY_VALUE);- if (!value[key]) {- value[key] = null;- }- });-- // Note: ObjectEditor is always used in node context, so showHandles is always true- // If you need to use it in dialog context, you'll need to pass showHandles via props- const showHandles = true;-- return (- <div- ref={ref}- className={`flex flex-col gap-2 ${className || ""}`}- id={parentFieldId}- >- {Object.entries(value).map(([key, propertyValue], idx) => {- const handleId = generateHandleId(- parentFieldId,- [key],- HandleIdType.KEY_VALUE,- );- const isDynamicPropertyConnected = isInputConnected(nodeId, handleId);-- return (- <div key={idx} className="flex flex-col gap-2">- <div className="-ml-2 flex items-center gap-1">- {showHandles && (- <NodeHandle- isConnected={isDynamicPropertyConnected}- handleId={handleId}- side="left"- />- )}- <Text variant="small" className="!text-gray-500">- #{key.trim() === "" ? "" : key}- </Text>- <Text variant="small" className="!text-green-500">- (string)- </Text>- </div>- {!isDynamicPropertyConnected && (- <div className="flex items-center gap-2">- <Input- hideLabel={true}- label=""- id={`key-${idx}`}- size="small"- value={key}- onChange={(e) => updateKey(key, e.target.value)}- placeholder="Key"- wrapperClassName="mb-0"- disabled={disabled}- />- <Input- hideLabel={true}- label=""- id={`value-${idx}`}- size="small"- value={propertyValue ?? ""}- onChange={(e) => setProperty(key, e.target.value)}- placeholder={placeholder}- wrapperClassName="mb-0"- disabled={disabled}- />- <Button- type="button"- variant="secondary"- size="small"- className="min-w-10"- onClick={() => removeProperty(key)}- disabled={disabled}- >- <X className="h-4 w-4" />- </Button>- </div>- )}- </div>- );- })}-- <Button- type="button"- variant="secondary"- size="small"- onClick={addProperty}- className="w-fit"- disabled={hasEmptyKeys || disabled}- >- <Plus className="h-4 w-4" />- Add Property- </Button>- </div>- );- },-);--ObjectEditor.displayName = "ObjectEditor";diff --git a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/index.ts b/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/index.tsdeleted file mode 100644index 3788e74fbf..0000000000--- a/autogpt_platform/frontend/src/components/renderers/input-renderer/widgets/index.ts+++ /dev/null@@ -1,18 +0,0 @@-import { RegistryWidgetsType } from "@rjsf/utils";-import { SelectWidget } from "./SelectWidget";-import { TextInputWidget } from "./TextInputWidget/TextInputWidget";-import { SwitchWidget } from "./SwitchWidget";-import { FileWidget } from "./FileWidget";-import { DateInputWidget } from "./DateInputWidget";-import { TimeInputWidget } from "./TimeInputWidget";-import { DateTimeInputWidget } from "./DateTimeInputWidget";--export const widgets: RegistryWidgetsType = {- TextWidget: TextInputWidget,- SelectWidget: SelectWidget,- CheckboxWidget: SwitchWidget,- FileWidget: FileWidget,- DateWidget: DateInputWidget,- TimeWidget: TimeInputWidget,- DateTimeWidget: DateTimeInputWidget,-};diff --git a/autogpt_platform/frontend/src/lib/dexie/draft-utils.ts b/autogpt_platform/frontend/src/lib/dexie/draft-utils.tsindex 185ebf92b4..03232ede30 100644--- a/autogpt_platform/frontend/src/lib/dexie/draft-utils.ts+++ b/autogpt_platform/frontend/src/lib/dexie/draft-utils.ts@@ -1,5 +1,6 @@import type { CustomNode } from "@/app/(platform)/build/components/FlowEditor/nodes/CustomNode/CustomNode";import type { CustomEdge } from "@/app/(platform)/build/components/FlowEditor/edges/CustomEdge";+import isEqual from "lodash/isEqual";export function cleanNode(node: CustomNode) {return {@@ -31,3 +32,81 @@ export function cleanNodes(nodes: CustomNode[]) {export function cleanEdges(edges: CustomEdge[]) {return edges.map(cleanEdge);}++export interface DraftDiff {+ nodes: {+ added: number;+ removed: number;+ modified: number;+ };+ edges: {+ added: number;+ removed: number;+ modified: number;+ };+}++/**+ * Calculate the diff between draft and current nodes/edges.+ * - Added: items in draft but not in current (will be restored)+ * - Removed: items in current but not in draft (will be removed if draft is loaded)+ * - Modified: items with same ID but different content+ */+export function calculateDraftDiff(+ draftNodes: CustomNode[],+ draftEdges: CustomEdge[],+ currentNodes: CustomNode[],+ currentEdges: CustomEdge[],+): DraftDiff {+ const draftNodeIds = new Set(draftNodes.map((n) => n.id));+ const currentNodeIds = new Set(currentNodes.map((n) => n.id));+ const draftEdgeIds = new Set(draftEdges.map((e) => e.id));+ const currentEdgeIds = new Set(currentEdges.map((e) => e.id));++ // Nodes diff+ const nodesAdded = draftNodes.filter((n) => !currentNodeIds.has(n.id)).length;+ const nodesRemoved = currentNodes.filter(+ (n) => !draftNodeIds.has(n.id),+ ).length;++ // Modified nodes: same ID but different content+ const draftNodeMap = new Map(draftNodes.map((n) => [n.id, cleanNode(n)]));+ const currentNodeMap = new Map(currentNodes.map((n) => [n.id, cleanNode(n)]));+ let nodesModified = 0;+ for (const [id, draftClean] of draftNodeMap) {+ const currentClean = currentNodeMap.get(id);+ if (currentClean && !isEqual(draftClean, currentClean)) {+ nodesModified++;+ }+ }++ // Edges diff+ const edgesAdded = draftEdges.filter((e) => !currentEdgeIds.has(e.id)).length;+ const edgesRemoved = currentEdges.filter(+ (e) => !draftEdgeIds.has(e.id),+ ).length;++ // Modified edges: same ID but different content+ const draftEdgeMap = new Map(draftEdges.map((e) => [e.id, cleanEdge(e)]));+ const currentEdgeMap = new Map(currentEdges.map((e) => [e.id, cleanEdge(e)]));+ let edgesModified = 0;+ for (const [id, draftClean] of draftEdgeMap) {+ const currentClean = currentEdgeMap.get(id);+ if (currentClean && !isEqual(draftClean, currentClean)) {+ edgesModified++;+ }+ }++ return {+ nodes: {+ added: nodesAdded,+ removed: nodesRemoved,+ modified: nodesModified,+ },+ edges: {+ added: edgesAdded,+ removed: edgesRemoved,+ modified: edgesModified,+ },+ };+}