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

allow only tracked tables in manual relationships #3046

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 2 commits into from
Oct 8, 2019
Merged

allow only tracked tables in manual relationships #3046

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ae4d8c
allow only tracked tables in manual relationships
rikinsk Oct 7, 2019
147389c
Merge branch 'master' into console-fix-manual-rel
rikinsk Oct 8, 2019
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
26 changes: 18 additions & 8 deletions console/src/components/Services/Data/TableRelationships/AddManualRelationship.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@ import { ordinalColSort } from '../utils';
import { addRelViewMigrate, resetManualRelationshipForm } from './Actions';
import ExpandableEditor from '../../../Common/Layout/ExpandableEditor/Editor';
import ManualRelationshipSelector from './ManualRelationshipSelector';
import {
getColumnName,
getSchemaName,
getSchemaTables,
getTableColumnNames,
getTableName,
getTableSchema,
getTrackedTables,
} from '../../../Common/utils/pgUtils';

const AddManualRelationship = ({
tableSchema,
Expand All @@ -17,20 +26,21 @@ const AddManualRelationship = ({

// columns in the right order with their indices
const orderedColumns = columns.map((c, i) => ({
name: c.column_name,
name: getColumnName(c),
index: i,
}));

relAdd.rSchema = relAdd.rSchema || tableSchema.table_schema;
relAdd.rSchema = relAdd.rSchema || getTableSchema(tableSchema);

const refTables = {};
allSchemas.forEach(ts => {
if (ts.table_schema === relAdd.rSchema) {
refTables[ts.table_name] = ts.columns.map(c => c.column_name);
}
});
const trackedSchemaTables = getTrackedTables(
getSchemaTables(allSchemas, relAdd.rSchema)
);
trackedSchemaTables.forEach(
ts => (refTables[getTableName(ts)] = getTableColumnNames(ts))
);

const orderedSchemaList = schemaList.map(s => s.schema_name).sort();
const orderedSchemaList = schemaList.map(s => getSchemaName(s)).sort();

const resetManualRel = () => {
dispatch(resetManualRelationshipForm());
Expand Down