diff --git a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.ui.js b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.ui.js index 5b02716d3..fbc40d0a2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.ui.js +++ b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.ui.js @@ -198,7 +198,7 @@ export default class DatabaseSchema extends BaseUISchema { helpMessage: gettext('Note: Changes to the schema restriction will require the Schemas node in the browser to be refreshed before they will be shown.'), helpMessageMode: ['edit', 'create'], controlProps: { - multiple: true, allowClear: false, creatable: true, + multiple: true, allowClear: false, creatable: true, noDropdown: true }, depChange: (state)=>{ if(!_.isUndefined(state.oid)) { obj.informText = undefined; diff --git a/web/pgadmin/static/js/components/FormComponents.jsx b/web/pgadmin/static/js/components/FormComponents.jsx index cec2ae439..39ba9c7da 100644 --- a/web/pgadmin/static/js/components/FormComponents.jsx +++ b/web/pgadmin/static/js/components/FormComponents.jsx @@ -774,6 +774,18 @@ CustomSelectSingleValue.propTypes = { data: PropTypes.object, }; +const CustomDropDownIndicator = (props) => { + if (props.selectProps.isDropDown) + return ( + + ); + return null; +}; + +CustomDropDownIndicator.propTypes = { + selectProps: PropTypes.object, +}; + export function flattenSelectOptions(options) { return _.flatMap(options, (option) => { if (option.options) { @@ -895,6 +907,7 @@ export const InputSelect = forwardRef(({ components: { Option: CustomSelectOption, SingleValue: CustomSelectSingleValue, + DropdownIndicator: CustomDropDownIndicator }, isMulti: Boolean(controlProps.multiple), openMenuOnClick: !readonly, @@ -906,6 +919,7 @@ export const InputSelect = forwardRef(({ styles: styles, inputId: cid, placeholder: (readonly || disabled) ? '' : controlProps.placeholder || gettext('Select an item...'), + isDropDown: !controlProps.noDropdown, ...otherProps, ...props, }; @@ -915,7 +929,13 @@ export const InputSelect = forwardRef(({ ); } else { return ( - + + !controlProps.noDropdown ? 'No options' : null + } + /> ); } });