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

Ensure the database and schema restriction controls are not shown as a drop-down. Fixes #7255

Browse Source
This commit is contained in:
Pradip Parkale 2022-04-09 11:49:02 +05:30 committed by Akshay Joshi
parent efa971edb4
commit c2f1a7bdc5
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_6_9.rst
View File

@ -18,6 +18,7 @@ Housekeeping
************ ************
| `Issue #6131 <https://redmine.postgresql.org/issues/6131>`_ - Port query tool to React. | `Issue #6131 <https://redmine.postgresql.org/issues/6131>`_ - Port query tool to React.
| `Issue #7255 <https://redmine.postgresql.org/issues/7255>`_ - Ensure the database and schema restriction controls are not shown as a drop-down.
Bug fixes Bug fixes
********* *********

2
web/pgadmin/browser/server_groups/servers/databases/static/js/database.ui.js
View File

@ -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.'), 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'], helpMessageMode: ['edit', 'create'],
controlProps: { controlProps: {
multiple: true, allowClear: false, creatable: true, multiple: true, allowClear: false, creatable: true, noDropdown: true, placeholder: 'Specify the schemas to be restrict...'
}, depChange: (state)=>{ }, depChange: (state)=>{
if(!_.isUndefined(state.oid)) { if(!_.isUndefined(state.oid)) {
obj.informText = undefined; obj.informText = undefined;

2
web/pgadmin/browser/server_groups/servers/static/js/server.ui.js
View File

@ -415,7 +415,7 @@ export default class ServerSchema extends BaseUISchema {
id: 'db_res', label: gettext('DB restriction'), type: 'select', group: gettext('Advanced'), id: 'db_res', label: gettext('DB restriction'), type: 'select', group: gettext('Advanced'),
options: [], options: [],
mode: ['properties', 'edit', 'create'], readonly: obj.isConnected, controlProps: { 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', id: 'passfile', label: gettext('Password file'), type: 'file',

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

@ -895,6 +895,8 @@ export const InputSelect = forwardRef(({
components: { components: {
Option: CustomSelectOption, Option: CustomSelectOption,
SingleValue: CustomSelectSingleValue, SingleValue: CustomSelectSingleValue,
IndicatorSeparator: (props) => controlProps.noDropdown ? null: <RSComponents.IndicatorSeparator {...props} />,
DropdownIndicator: (props) => controlProps.noDropdown ? null: <RSComponents.DropdownIndicator {...props} />
}, },
isMulti: Boolean(controlProps.multiple), isMulti: Boolean(controlProps.multiple),
openMenuOnClick: !readonly, openMenuOnClick: !readonly,
@ -915,7 +917,13 @@ export const InputSelect = forwardRef(({
); );
} else { } else {
return ( return (
<CreatableSelect ref={ref} {...commonProps} /> <CreatableSelect
ref={ref}
{...commonProps}
noOptionsMessage={() =>
!controlProps.noDropdown ? 'No options' : null
}
/>
); );
} }
}); });