From 576028b3674c778931f0539472c6de466c74dfe2 Mon Sep 17 00:00:00 2001
From: Sychev Andrey <44414066+SychevAndrey@users.noreply.github.com>
Date: Tue, 19 Aug 2025 12:02:39 +0200
Subject: [PATCH] dbeaver/pro#6253 [CB] [users] default team should be marked
 and read only (#3658)

* dbeaver/pro#6253 fix: set disable state for checkbox respecting readonly

There was a bug in UiKitCheckbox props which rewrites disabled state using only disabled prop.

* dbeaver/pro#6253 fix: remove redundant readonly property in Options

First of all, Radio doesn't support readonly attribute. Moreover, we don't render this RadioGroup when condition in readonly prop is true.

---------

Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>
---
 .../src/FormControls/Checkboxes/CheckboxMarkup.tsx     |  3 ++-
 .../src/ConnectionForm/Options/Options.tsx             | 10 +---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.tsx b/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.tsx
index dfbe87b27e..ced029631e 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.tsx
@@ -36,13 +36,14 @@ export const CheckboxMarkup: React.FC<ICheckboxMarkupProps> = function CheckboxM
   title,
   readOnly,
   children,
+  disabled,
   ...rest
 }) {
   const styles = useS(CheckboxMarkupStyles);
 
   return (
     <div className={s(styles, { container: true }, 'checkbox-markup', `checkbox-markup-theme--${theme}`, className)} title={title}>
-      <UiKitCheckbox id={id || rest.name} indeterminate={indeterminate} disabled={rest.disabled || readOnly} size={size} {...rest}>
+      <UiKitCheckbox id={id || rest.name} indeterminate={indeterminate} disabled={disabled || readOnly} size={size} {...rest}>
         {label && <span className={s(styles, { label: true }, 'checkbox-markup__label')}>{label}</span>}
         {caption && <span className={s(styles, { caption: true }, 'checkbox-markup__caption')}>{caption}</span>}
       </UiKitCheckbox>
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx
index 02edbef9d1..df3bf6a084 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx
@@ -206,15 +206,7 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
                     <Container gap>
                       <RadioGroup aria-label={configurationTypeLabel} name="configurationType" state={optionsPart.state}>
                         {configurationTypes.map(conf => (
-                          <Radio
-                            key={conf.value}
-                            id={conf.value}
-                            value={conf.value}
-                            readOnly={readonly || configurationTypes.length < 2}
-                            disabled={readonly}
-                            small
-                            keepSize
-                          >
+                          <Radio key={conf.value} id={conf.value} value={conf.value} disabled={readonly} small keepSize>
                             {conf.name}
                           </Radio>
                         ))}