Fixed more issues found while testing role permissions feature. #7310
parent
fcf7cf5eb2
commit
d468c16ca2
|
|
@ -60,6 +60,7 @@ export default function(basicSettings) {
|
|||
'400': '#333333',
|
||||
'600': '#282828',
|
||||
'800': '#1e1e1e',
|
||||
'900': '#8A8A8A',
|
||||
},
|
||||
text: {
|
||||
primary: '#d4d4d4',
|
||||
|
|
@ -72,7 +73,7 @@ export default function(basicSettings) {
|
|||
},
|
||||
custom: {
|
||||
checkbox: {
|
||||
borderColor: '#4a4a4a',
|
||||
borderColor: '#8A8A8A',
|
||||
disabled: '#6b6b6b'
|
||||
},
|
||||
icon: {
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ export default function(basicSettings) {
|
|||
'400': '#2D3A48',
|
||||
'600': '#1F2932',
|
||||
'800': '#010B15',
|
||||
'900': '#8b9cac'
|
||||
},
|
||||
text: {
|
||||
primary: '#fff',
|
||||
|
|
@ -70,7 +71,7 @@ export default function(basicSettings) {
|
|||
},
|
||||
custom: {
|
||||
checkbox: {
|
||||
borderColor: '#A6B7C8',
|
||||
borderColor: '#8b9cac',
|
||||
disabled: '#6b6b6b'
|
||||
},
|
||||
icon: {
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ export default function(basicSettings) {
|
|||
'400': '#ebeef3',
|
||||
'600': '#bac1cd',
|
||||
'800': '#848ea0',
|
||||
'900': '#646B82',
|
||||
},
|
||||
text: {
|
||||
primary: '#222',
|
||||
|
|
@ -70,7 +71,7 @@ export default function(basicSettings) {
|
|||
},
|
||||
custom: {
|
||||
checkbox: {
|
||||
borderColor: '#bac1cd',
|
||||
borderColor: '#646B82',
|
||||
disabled: '#ebeef3'
|
||||
},
|
||||
icon: {
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@ import { FilterIcon } from '../../../../../static/js/components/ExternalIcon';
|
|||
import { PgMenu, PgMenuItem, usePgMenuGroup } from '../../../../../static/js/components/Menu';
|
||||
import { FILTER_NAME, MENUS, MENUS_COMPARE_CONSTANT, SCHEMA_DIFF_EVENT, IGNORE_OPTION } from '../SchemaDiffConstants';
|
||||
import { SchemaDiffContext, SchemaDiffEventsContext } from './SchemaDiffComponent';
|
||||
import withCheckPermission from '../../../../../browser/static/js/withCheckPermission';
|
||||
import { AllPermissionTypes } from '../../../../../browser/static/js/constants';
|
||||
|
||||
|
||||
const Root = styled('div')(({theme}) => ({
|
||||
|
|
@ -152,9 +154,12 @@ export function SchemaDiffButtonComponent({ sourceData, targetData, selectedRowI
|
|||
onServerSchemaChange();
|
||||
};
|
||||
|
||||
const generateScript = () => {
|
||||
// Check permission and call.
|
||||
const generateScript = withCheckPermission({
|
||||
permission: AllPermissionTypes.TOOLS_QUERY_TOOL
|
||||
}, () => {
|
||||
eventBus.fireEvent(SCHEMA_DIFF_EVENT.TRIGGER_GENERATE_SCRIPT, { sid: targetData.sid, did: targetData.did, selectedIds: selectedRowIds, rows: rows, selectedFilters: selectedFilters });
|
||||
};
|
||||
});
|
||||
|
||||
return (
|
||||
(<Root>
|
||||
|
|
|
|||
Loading…
Reference in New Issue