IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Port Language node to react. Fixes #6581

Browse Source
This commit is contained in:
Pradip Parkale
2021-07-19 11:07:28 +05:30
committed by Akshay Joshi
parent 5d8eeba0dd
commit 621426ac55
4 changed files with 384 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
web/pgadmin/static/js/components/FormComponents.jsx
View File

@@ -388,7 +388,7 @@ export function InputToggle({cid, value, onChange, options, disabled, readonly,
const isSelected = option.value === value;
const isDisabled = disabled || (readonly && isSelected);
return (
<ToggleButton key={option.label} value={option.value} component={isSelected ? PrimaryButton : DefaultButton}
<ToggleButton key={option.label} value={option.value || ''} component={isSelected ? PrimaryButton : DefaultButton}
disabled={isDisabled} aria-label={option.label}>
<CheckRoundedIcon style={{visibility: isSelected ? 'visible': 'hidden'}}/>&nbsp;{option.label}
</ToggleButton>
@@ -556,7 +556,8 @@ function getRealValue(options, value, creatable, formatter) {
realValue = realValue.map((val)=>(_.find(options, (option)=>option.value==val)));
}
} else {
realValue = _.find(options, (option)=>option.value==value) || null;
realValue = _.find(options, (option)=>option.value==value) ||
(creatable && !_.isUndefined(value) ? {label:value, value: value} : null);
}
return realValue;
}