diff --git a/src/frontend/src/components/core/parameterRenderComponent/components/inputComponent/components/popover/index.tsx b/src/frontend/src/components/core/parameterRenderComponent/components/inputComponent/components/popover/index.tsx index d6157970a..a86574eba 100644 --- a/src/frontend/src/components/core/parameterRenderComponent/components/inputComponent/components/popover/index.tsx +++ b/src/frontend/src/components/core/parameterRenderComponent/components/inputComponent/components/popover/index.tsx @@ -229,7 +229,7 @@ const CustomInputPopover = ({ className={getAnchorClassName(editNode, disabled, isFocused)} onClick={() => !nodeStyle && !disabled && setShowOptions(true)} > - {selectedOptions?.length > 0 ? ( + {!disabled && selectedOptions?.length > 0 ? (
{selectedOptions.map((option) => ( ))}
- ) : selectedOption?.length > 0 ? ( + ) : !disabled && selectedOption?.length > 0 ? (
) : null} - {!selectedOption?.length && !selectedOptions?.length && ( + {(!selectedOption?.length && !selectedOptions?.length) || disabled ? ( setIsFocused(true)} @@ -274,7 +274,7 @@ const CustomInputPopover = ({ onInputLostFocus?.(); setIsFocused(false); }} - value={value || ""} + value={disabled ? "" : value || ""} disabled={disabled} required={required} className={getInputClassName( @@ -285,7 +285,9 @@ const CustomInputPopover = ({ blockAddNewGlobalVariable, )} placeholder={ - selectedOptions?.length > 0 || selectedOption ? "" : placeholder + !disabled && (selectedOptions?.length > 0 || selectedOption) + ? "" + : placeholder } onChange={(e) => onChange?.(e.target.value)} onKeyDown={(e) => { @@ -294,7 +296,7 @@ const CustomInputPopover = ({ }} data-testid={editNode ? id + "-edit" : id} /> - )} + ) : null}
diff --git a/src/frontend/src/components/core/parameterRenderComponent/components/inputGlobalComponent/index.tsx b/src/frontend/src/components/core/parameterRenderComponent/components/inputGlobalComponent/index.tsx index 12856599e..268cbfe22 100644 --- a/src/frontend/src/components/core/parameterRenderComponent/components/inputGlobalComponent/index.tsx +++ b/src/frontend/src/components/core/parameterRenderComponent/components/inputGlobalComponent/index.tsx @@ -34,7 +34,7 @@ export default function InputGlobalComponent({ ); useEffect(() => { - if (globalVariables) { + if (globalVariables && !disabled) { if ( load_from_db && !globalVariables.find((variable) => variable.name === value) @@ -56,7 +56,7 @@ export default function InputGlobalComponent({ ); } } - }, [globalVariables, unavailableFields]); + }, [globalVariables, unavailableFields, disabled]); function handleDelete(key: string) { if (value === key && load_from_db) {