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..871b9db92 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, placeholder: 'Specify the schemas to be restrict...' }, depChange: (state)=>{ if(!_.isUndefined(state.oid)) { obj.informText = undefined; diff --git a/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js b/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js index f788c621e..f25986de0 100644 --- a/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js +++ b/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js @@ -415,7 +415,7 @@ export default class ServerSchema extends BaseUISchema { id: 'db_res', label: gettext('DB restriction'), type: 'select', group: gettext('Advanced'), options: [], mode: ['properties', 'edit', 'create'], readonly: obj.isConnected, controlProps: { - multiple: true, allowClear: false, creatable: true, noDropdown: true}, + multiple: true, allowClear: false, creatable: true, noDropdown: true, placeholder: 'Specify the databases to be restrict...'}, }, { id: 'passfile', label: gettext('Password file'), type: 'file', diff --git a/web/pgadmin/static/js/components/FormComponents.jsx b/web/pgadmin/static/js/components/FormComponents.jsx index cec2ae439..744a8a764 100644 --- a/web/pgadmin/static/js/components/FormComponents.jsx +++ b/web/pgadmin/static/js/components/FormComponents.jsx @@ -895,6 +895,8 @@ export const InputSelect = forwardRef(({ components: { Option: CustomSelectOption, SingleValue: CustomSelectSingleValue, + IndicatorSeparator: (props) => controlProps.noDropdown ? null: , + DropdownIndicator: (props) => controlProps.noDropdown ? null: }, isMulti: Boolean(controlProps.multiple), openMenuOnClick: !readonly, @@ -915,7 +917,13 @@ export const InputSelect = forwardRef(({ ); } else { return ( - + + !controlProps.noDropdown ? 'No options' : null + } + /> ); } });