这是indexloc提供的服务，不要输入任何密码
Skip to content

handle invalid keys in permission builder #3863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 12, 2020
Merged

handle invalid keys in permission builder #3863

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f96d19
handle invalid column names in permission builder
rikinsk Feb 11, 2020
726c4e5
handle invalid exist operator keys in permission builder
rikinsk Feb 11, 2020
cd1f38a
handle non-array values for _and/_or operators
rikinsk Feb 12, 2020
77c185f
Merge branch 'master' into console-fix-permissions
rikinsk Feb 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions console/src/components/Services/Data/TablePermissions/PermissionBuilder/PermissionBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import {
isJsonString,
getAllJsonPaths,
isObject,
isArray,
} from '../../../../Common/utils/jsUtils';

class PermissionBuilder extends React.Component {
Expand Down Expand Up @@ -101,9 +102,13 @@ class PermissionBuilder extends React.Component {
_missingSchemas = findMissingSchemas(newPath, currTable);
} else if (isExistOperator(operator)) {
const existTableDef = getQualifiedTableDef(value[TABLE_KEY]);
const existTableSchema = existTableDef.schema;

const existWhere = value[WHERE_KEY];
let existTableSchema;
if (existTableDef) {
existTableSchema = existTableDef.schema;
}

const existWhere = value[WHERE_KEY] || '';

if (existTableSchema) {
const { allTableSchemas } = this.props;
Expand Down Expand Up @@ -443,12 +448,12 @@ class PermissionBuilder extends React.Component {
);
});

const selectedValue = addToPrefix(prefix, value);
const selectedValue = addToPrefix(prefix, value || '--');

return (
<select
value={selectedValue}
name={value}
name={prefix}
onChange={dispatchSelect}
className={styles.qb_select}
data-test="qb-select"
Expand Down Expand Up @@ -720,7 +725,9 @@ class PermissionBuilder extends React.Component {
let columnType = '';
if (tableSchema && columnName) {
const column = getTableColumn(tableSchema, columnName);
columnType = getColumnType(column);
if (column) {
columnType = getColumnType(column);
}
}

_columnExp = renderOperatorExp(
Expand Down Expand Up @@ -818,7 +825,7 @@ class PermissionBuilder extends React.Component {
};

const unselectedElements = [];
if (!existsOpTable.name) {
if (!existsOpTable || !existsOpTable.name) {
unselectedElements.push(WHERE_KEY);
}

Expand All @@ -840,6 +847,8 @@ class PermissionBuilder extends React.Component {
) => {
const _boolExpArray = [];

expressions = isArray(expressions) ? expressions : [];

expressions.concat([{}]).forEach((expression, i) => {
const _boolExp = renderBoolExp(
dispatchFunc,
Expand Down