diff --git a/src/packages/ce/src/datatype/components/inputs/DataTypeInputComponent.tsx b/src/packages/ce/src/datatype/components/inputs/DataTypeInputComponent.tsx index d8a28f1e..447f2b2c 100644 --- a/src/packages/ce/src/datatype/components/inputs/DataTypeInputComponent.tsx +++ b/src/packages/ce/src/datatype/components/inputs/DataTypeInputComponent.tsx @@ -34,7 +34,7 @@ export const DataTypeInputComponent: React.FC = (pr const suggestions = "schema" in (schema ?? {}) ? (schema as NodeSchema)?.schema?.suggestions as (NodeFunction | ReferenceValue | LiteralValue)[] : [] const inputName = "schema" in (schema ?? {}) ? (schema as NodeSchema)?.schema?.input : (schema as Schema)?.input - if ("schema" in (schema ?? {}) && ((schema as NodeSchema).blockedBy?.length ?? 0) > 0) { + if ("schema" in (schema ?? {}) && (((schema as NodeSchema).blockedBy?.length ?? 0) > 0) && (rest.formValidation?.valid ?? false)) { return null } diff --git a/src/packages/ce/src/datatype/components/inputs/generic/DataTypeGenericInputComponent.tsx b/src/packages/ce/src/datatype/components/inputs/generic/DataTypeGenericInputComponent.tsx index fe7e7403..5151304a 100644 --- a/src/packages/ce/src/datatype/components/inputs/generic/DataTypeGenericInputComponent.tsx +++ b/src/packages/ce/src/datatype/components/inputs/generic/DataTypeGenericInputComponent.tsx @@ -1,7 +1,7 @@ import {DataTypeInputComponentProps} from "@edition/datatype/components/inputs/DataTypeInputComponent"; import React from "react"; import {ButtonGroup} from "@code0-tech/pictor/dist/components/button-group/ButtonGroup"; -import {Button, InputDescription, InputLabel} from "@code0-tech/pictor"; +import {Button, InputDescription, InputLabel, InputMessage} from "@code0-tech/pictor"; import {useDebouncedCallback} from "use-debounce"; import {LiteralValue, NodeFunction, ReferenceValue} from "@code0-tech/sagittarius-graphql-types"; @@ -70,6 +70,9 @@ export const DataTypeGenericInputComponent: React.FC + {!formValidation?.valid && formValidation?.notValidMessage && ( + {formValidation.notValidMessage} + )} } \ No newline at end of file diff --git a/src/packages/ce/src/function/components/nodes/FunctionNodeDefaultComponent.tsx b/src/packages/ce/src/function/components/nodes/FunctionNodeDefaultComponent.tsx index 589be319..b41e9455 100644 --- a/src/packages/ce/src/function/components/nodes/FunctionNodeDefaultComponent.tsx +++ b/src/packages/ce/src/function/components/nodes/FunctionNodeDefaultComponent.tsx @@ -4,7 +4,7 @@ import "./FunctionNodeComponent.style.scss"; import {FunctionNodeComponentProps} from "./FunctionNodeComponent"; import {Badge, Button, ButtonGroup, Card, Flex, Text, useService, useStore as usePictorStore} from "@code0-tech/pictor"; import {useFlowValidation} from "@edition/flow/hooks/Flow.validation.hook"; -import {IconBackspace, IconEdit, IconSparkles, IconVariable} from "@tabler/icons-react"; +import {IconBackspace, IconCircleX, IconEdit, IconSparkles, IconVariable} from "@tabler/icons-react"; import {FlowService} from "@edition/flow/services/Flow.service"; import {FunctionService} from "@edition/function/services/Function.service"; import {LiteralBadgeComponent} from "@edition/datatype/components/badges/LiteralBadgeComponent"; @@ -43,7 +43,7 @@ export const FunctionNodeDefaultComponent: React.FC validation?.filter(v => v.nodeId === data.nodeId && v.parameterIndex === null && !data.functionId), + () => validation?.filter(v => v.nodeId === data.nodeId && !data.functionId), [validation] ) diff --git a/src/packages/ce/src/function/components/nodes/FunctionNodeSquareComponent.tsx b/src/packages/ce/src/function/components/nodes/FunctionNodeSquareComponent.tsx index baad4239..f325f99a 100644 --- a/src/packages/ce/src/function/components/nodes/FunctionNodeSquareComponent.tsx +++ b/src/packages/ce/src/function/components/nodes/FunctionNodeSquareComponent.tsx @@ -40,7 +40,7 @@ export const FunctionNodeSquareComponent: React.FC validation?.filter(v => v.nodeId === data.nodeId && v.parameterIndex === null && !data.functionId), + () => validation?.filter(v => v.nodeId === data.nodeId && !data.functionId), [validation] ) diff --git a/src/packages/ce/src/function/components/nodes/FunctionNodeTriggerComponent.tsx b/src/packages/ce/src/function/components/nodes/FunctionNodeTriggerComponent.tsx index 622b93ab..baa48095 100644 --- a/src/packages/ce/src/function/components/nodes/FunctionNodeTriggerComponent.tsx +++ b/src/packages/ce/src/function/components/nodes/FunctionNodeTriggerComponent.tsx @@ -91,7 +91,7 @@ export const FunctionNodeTriggerComponent: React.FC validation?.filter(v => v.nodeId === null && v.parameterIndex === null), + () => validation?.filter(v => v.nodeId === null), [validation] )