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

1) Fixed 'Material-UI: You are providing a disabled button child to the Tooltip' 2) Fixed InputToggle value issue. 3) Fixed jasmine test for Language. 4) Remove unused code from the view node.

Browse Source
This commit is contained in:
Akshay Joshi 2021-07-28 17:46:46 +05:30
parent 09db3ddd5c
commit eb48765a5a
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.ui.js
View File

@ -97,9 +97,6 @@ export default class ViewSchema extends BaseUISchema {
type: 'sql', mode: ['create', 'edit'], group: gettext('Code'), type: 'sql', mode: ['create', 'edit'], group: gettext('Code'),
isFullTab: true, isFullTab: true,
disabled: obj.notInSchema, disabled: obj.notInSchema,
controlProps: {
className: ['sql-code-control'],
},
}, },
{ {
@ -117,7 +114,6 @@ export default class ViewSchema extends BaseUISchema {
editable: false, type: 'collection', editable: false, type: 'collection',
canEdit: false, group: gettext('Security'), canDelete: true, canEdit: false, group: gettext('Security'), canDelete: true,
mode: ['edit', 'create'], canAdd: true, mode: ['edit', 'create'], canAdd: true,
control: 'unique-col-collection',
uniqueCol : ['provider'], uniqueCol : ['provider'],
} }
]; ];

2
web/pgadmin/static/js/components/Buttons.jsx
View File

@ -92,9 +92,11 @@ export const PgIconButton = forwardRef(({icon, title, className, ...props}, ref)
/* Tooltip does not work for disabled items */ /* Tooltip does not work for disabled items */
return ( return (
<Tooltip title={title || ''} aria-label={title || ''}> <Tooltip title={title || ''} aria-label={title || ''}>
<span>
<DefaultButton ref={ref} style={{minWidth: 0}} className={clsx(classes.iconButton, className)} {...props}> <DefaultButton ref={ref} style={{minWidth: 0}} className={clsx(classes.iconButton, className)} {...props}>
{icon} {icon}
</DefaultButton> </DefaultButton>
</span>
</Tooltip> </Tooltip>
); );
}); });

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

@ -392,7 +392,7 @@ export function InputToggle({cid, value, onChange, options, disabled, readonly,
const isSelected = option.value === value; const isSelected = option.value === value;
const isDisabled = disabled || (readonly && isSelected); const isDisabled = disabled || (readonly && isSelected);
return ( 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}> disabled={isDisabled} aria-label={option.label}>
<CheckRoundedIcon style={{visibility: isSelected ? 'visible': 'hidden'}}/>&nbsp;{option.label} <CheckRoundedIcon style={{visibility: isSelected ? 'visible': 'hidden'}}/>&nbsp;{option.label}
</ToggleButton> </ToggleButton>

5
web/regression/javascript/schema_ui_files/language.ui.spec.js
View File

@ -114,10 +114,13 @@ describe('LanguageSchema', ()=>{
let state = {}; let state = {};
let setError = jasmine.createSpy('setError'); let setError = jasmine.createSpy('setError');
state.lanproc = null; state.lanproc = '';
schemaObj.validate(state, setError); schemaObj.validate(state, setError);
expect(setError).toHaveBeenCalledWith('lanproc', 'Handler function cannot be empty.'); expect(setError).toHaveBeenCalledWith('lanproc', 'Handler function cannot be empty.');
state.lanproc = 'my_len';
schemaObj.validate(state, setError);
expect(setError).toHaveBeenCalledWith('lanproc', null);
}); });
}); });