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

handle non-public schema cases for manual relationship creation (close #911) #912

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 1 commit into from
Oct 29, 2018
Merged

handle non-public schema cases for manual relationship creation (close #911) #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion 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 @@ -15,6 +15,8 @@ import {
boolColumnOperators,
} from './utils';

import { getTableName } from '../../utils';

import QueryBuilderJson from '../../../../QueryBuilderJson/QueryBuilderJson';

const styles = require('./Styles.scss');
Expand Down Expand Up @@ -406,7 +408,8 @@ class PermissionBuilder extends React.Component {
let tableColumns = [];
let tableRelationships = [];
if (table) {
const tableSchema = tableSchemas[table];
// In case of a manual relationship the right table is an object for a different schema
const tableSchema = tableSchemas[getTableName(table)];
tableColumns = getTableColumnNames(tableSchema);
tableRelationships = getTableRelationshipNames(tableSchema);
}
Expand Down
2 changes: 1 addition & 1 deletion console/src/components/Services/Data/TableRelationships/Actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ const generateRelationshipsQuery = (
} else {
const columnReducer = (accumulator, val) => ({
...accumulator,
[val.rcol]: val.lcol,
[val.lcol]: val.rcol,
});
upQuery.args.using = {
manual_configuration: {
Expand Down
10 changes: 1 addition & 9 deletions console/src/components/Services/Data/TableRelationships/autoRelations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
const getTableName = t => {
const typ = typeof t;
if (typ === 'string') {
return t;
} else if (typ === 'object') {
return 'name' in t ? t.name : '';
}
return '';
};
import { getTableName } from '../utils';

const suggestedRelationshipsRaw = (tableName, allSchemas) => {
const objRels = [];
Expand Down
11 changes: 11 additions & 0 deletions console/src/components/Services/Data/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,22 @@ const escapeRegExp = string => {
return string.replace(/([.*+?^${}()|[\]\\])/g, '\\$1');
};

const getTableName = t => {
const typ = typeof t;
if (typ === 'string') {
return t;
} else if (typ === 'object') {
return 'name' in t ? t.name : '';
}
return '';
};

export {
ordinalColSort,
findTableFromRel,
findAllFromRel,
getEdForm,
getIngForm,
escapeRegExp,
getTableName,
};