From 4253c640cf67ef725ade61298c5cc878be03358c Mon Sep 17 00:00:00 2001 From: alex <48489896+devnaumov@users.noreply.github.com> Date: Mon, 28 Apr 2025 08:49:30 +0200 Subject: [PATCH] dbeaver/pro#5550 fallback to checked state first (#3398) * dbeaver/pro#5550 fallback to checked state first * dbeaver/pro#5550 check for boolean type --------- Co-authored-by: mr-anton-t <42037741+mr-anton-t@users.noreply.github.com> --- .../src/FormControls/Checkboxes/useCheckboxState.ts | 2 +- .../ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/useCheckboxState.ts b/webapp/packages/core-blocks/src/FormControls/Checkboxes/useCheckboxState.ts index ed78f3ac21..2231d59d3e 100644 --- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/useCheckboxState.ts +++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/useCheckboxState.ts @@ -58,7 +58,7 @@ export function useCheckboxState(options: CheckboxStateOpti checked = !!currentState; } } else { - checked = false; + checked = checked ?? false; } } diff --git a/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx b/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx index d8aa15dae7..73bdb45519 100644 --- a/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx +++ b/webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx @@ -45,6 +45,10 @@ function getValue(value: any, controlType: ObjectPropertyType) { return checkbox ? false : ''; } + if (typeof value === 'boolean') { + return checkbox ? value : String(value); + } + if (typeof value === 'string') { return checkbox ? value.toLowerCase() === 'true' : value; }