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

auto-fill name while suggesting relationships (closes #1095) #1437

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 7 commits into from
Jan 24, 2019
Merged

auto-fill name while suggesting relationships (closes #1095) #1437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b614756
remove auth webhook ref from docs
wawhal Jan 8, 2019
b6a8a9b
Merge branch 'master' of github.com:hasura/graphql-engine
wawhal Jan 9, 2019
837f87d
Merge branch 'master' of github.com:hasura/graphql-engine
wawhal Jan 10, 2019
d4a8991
Merge branch 'master' of github.com:hasura/graphql-engine
wawhal Jan 16, 2019
d5ccc83
Merge branch 'master' of github.com:hasura/graphql-engine into issue-…
wawhal Jan 22, 2019
ceaaa30
fix #1095
wawhal Jan 22, 2019
e4bcc2a
update tests
wawhal Jan 22, 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
4 changes: 3 additions & 1 deletion console/cypress/integration/data/insert-browse/spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,9 @@ export const checkViewRelationship = () => {
// Add relationship
cy.get(getElementFromAlias('add-rel-mod')).click();
cy.get(getElementFromAlias('obj-rel-add-0')).click();
cy.get(getElementFromAlias('suggested-rel-name')).type('someRel');
cy.get(getElementFromAlias('suggested-rel-name'))
.clear()
.type('someRel');
cy.get(getElementFromAlias('obj-rel-save-0')).click();
cy.wait(300);
// Insert a row
Expand Down
21 changes: 16 additions & 5 deletions console/cypress/integration/data/relationships/spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,9 @@ export const passRTAddSuggestedRel = () => {
cy.get(getElementFromAlias('article_table_rt')).click();
cy.get(getElementFromAlias('table-relationships')).click();
cy.get(getElementFromAlias('obj-rel-add-0')).click();
cy.get(getElementFromAlias('suggested-rel-name')).type('author');
cy.get(getElementFromAlias('suggested-rel-name'))
.clear()
.type('author');
cy.get(getElementFromAlias('obj-rel-save-0')).click();
cy.wait(15000);
validateColumn(
Expand All @@ -183,7 +185,9 @@ export const passRTAddSuggestedRel = () => {
cy.get(getElementFromAlias('article_table_rt')).click();
cy.get(getElementFromAlias('table-relationships')).click();
cy.get(getElementFromAlias('arr-rel-add-0')).click();
cy.get(getElementFromAlias('suggested-rel-name')).type('comments');
cy.get(getElementFromAlias('suggested-rel-name'))
.clear()
.type('comments');
cy.get(getElementFromAlias('arr-rel-save-0')).click();
cy.wait(15000);
validateColumn(
Expand All @@ -197,10 +201,13 @@ export const failRTAddSuggestedRel = () => {
cy.get(getElementFromAlias('article_table_rt')).click();
cy.get(getElementFromAlias('table-relationships')).click();
cy.get(getElementFromAlias('obj-rel-add-0')).click();
cy.get(getElementFromAlias('suggested-rel-name')).clear();
cy.get(getElementFromAlias('obj-rel-save-0')).click();
// cy.get('.notification-error');
cy.wait(15000);
cy.get(getElementFromAlias('suggested-rel-name')).type(123123);
cy.get(getElementFromAlias('suggested-rel-name'))
.clear()
.type(123123);
cy.get('button')
.contains('Save')
.click();
Expand All @@ -214,7 +221,9 @@ export const failRTAddSuggestedRel = () => {
cy.get(getElementFromAlias('article_table_rt')).click();
cy.get(getElementFromAlias('table-relationships')).click();
cy.get(getElementFromAlias('obj-rel-add-0')).click();
cy.get(getElementFromAlias('suggested-rel-name')).type('author');
cy.get(getElementFromAlias('suggested-rel-name'))
.clear()
.type('author');
cy.get(getElementFromAlias('obj-rel-save-0')).click();
cy.wait(15000);
validateColumn(
Expand All @@ -225,7 +234,9 @@ export const failRTAddSuggestedRel = () => {
cy.get(getElementFromAlias('article_table_rt')).click();
cy.get(getElementFromAlias('table-relationships')).click();
cy.get(getElementFromAlias('arr-rel-add-0')).click();
cy.get(getElementFromAlias('suggested-rel-name')).type('author');
cy.get(getElementFromAlias('suggested-rel-name'))
.clear()
.type('author');
cy.get(getElementFromAlias('arr-rel-save-0')).click();
cy.wait(15000);
// cy.get('.notification-error');
Expand Down
32 changes: 18 additions & 14 deletions 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 @@ -336,21 +336,25 @@ const sanitizeRelName = arg =>
});

const formRelName = relMeta => {
let finalRelName;
// remove special chars and change first letter after underscore to uppercase
const targetTable = sanitizeRelName(relMeta.rTable);
if (relMeta.isObjRel) {
const objLCol = sanitizeRelName(relMeta.lcol.join(','));
finalRelName = `${targetTable}By${objLCol}`;
} else {
const arrRCol = sanitizeRelName(relMeta.rcol.join(','));
finalRelName =
`${
targetTable
// (targetTable[targetTable.length - 1] !== 's' ? 's' : '') + // add s only if the last char is not s
}s` + `By${arrRCol}`;
try {
let finalRelName;
// remove special chars and change first letter after underscore to uppercase
const targetTable = sanitizeRelName(relMeta.rTable);
if (relMeta.isObjRel) {
const objLCol = sanitizeRelName(relMeta.lcol.join(','));
finalRelName = `${targetTable}By${objLCol}`;
} else {
const arrRCol = sanitizeRelName(relMeta.rcol.join(','));
finalRelName =
`${
targetTable
// (targetTable[targetTable.length - 1] !== 's' ? 's' : '') + // add s only if the last char is not s
}s` + `By${arrRCol}`;
}
return finalRelName;
} catch (e) {
return '';
}
return finalRelName;
};

const getAllUnTrackedRelations = (allSchemas, currentSchema) => {
Expand Down
2 changes: 2 additions & 0 deletions console/src/components/Services/Data/TableRelationships/Relationships.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
relNameChanged,
resetRelationshipForm,
relManualAddClicked,
formRelName,
} from './Actions';
import { findAllFromRel } from '../utils';
import { showErrorNotification } from '../Notification';
Expand Down Expand Up @@ -109,6 +110,7 @@ const addRelationshipCellView = (
const onAdd = e => {
e.preventDefault();
dispatch(relSelectionChanged(rel));
dispatch(relNameChanged(formRelName(rel)));
};

const onRelationshipNameChanged = e => {
Expand Down