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 Table, Column, Primary key, Foreign key, Check constraint, Unique constraint, Exclusion constraint.

Browse Source
This commit is contained in:
Aditya Toshniwal
2021-08-23 13:40:14 +05:30
committed by Akshay Joshi
parent 725d9b4bbf
commit 261cec1d20
36 changed files with 5662 additions and 5168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -665,7 +665,7 @@ function getRealValue(options, value, creatable, formatter) {
}
} else {
realValue = _.find(options, (option)=>option.value==value) ||
(creatable && !_.isUndefined(value) ? {label:value, value: value} : null);
(creatable && !_.isUndefined(value) && !_.isNull(value) ? {label:value, value: value} : null);
}
return realValue;
}
@@ -699,7 +699,8 @@ export function InputSelect({
/* Apply filter if any */
const filteredOptions = (controlProps.filter && controlProps.filter(finalOptions)) || finalOptions;
const realValue = getRealValue(filteredOptions, value, controlProps.creatable, controlProps.formatter);
let realValue = getRealValue(filteredOptions, value, controlProps.creatable, controlProps.formatter);
realValue = _.isNull(realValue) ? '' : realValue;
const otherProps = {
isSearchable: !readonly,
isClearable: !readonly && (!_.isUndefined(controlProps.allowClear) ? controlProps.allowClear : true),
@@ -755,7 +756,7 @@ export function InputSelect({
}
InputSelect.propTypes = {
cid: PropTypes.string,
value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.array]),
value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.array, PropTypes.bool]),
options: PropTypes.oneOfType([PropTypes.array, PropTypes.instanceOf(Promise), PropTypes.func]),
controlProps: PropTypes.object,
optionsLoaded: PropTypes.func,