diff --git a/datahub-web-react/src/graphql/lineage.graphql b/datahub-web-react/src/graphql/lineage.graphql index 6c7e438fd2f76..42c54ceb354fd 100644 --- a/datahub-web-react/src/graphql/lineage.graphql +++ b/datahub-web-react/src/graphql/lineage.graphql @@ -212,7 +212,7 @@ fragment lineageNodeProperties on EntityWithRelationships { } } -fragment relationshipFields on EntityWithRelationships { +fragment lineageFields on EntityWithRelationships { ...lineageNodeProperties ... on Dataset { siblings { @@ -224,10 +224,10 @@ fragment relationshipFields on EntityWithRelationships { } } } - upstream: lineage(input: { direction: UPSTREAM, start: 0, count: 100 }) { + upstream: lineage(input: { direction: UPSTREAM, start: 0, count: 100, separateSiblings: $separateSiblings }) { ...leafLineageResults } - downstream: lineage(input: { direction: DOWNSTREAM, start: 0, count: 100 }) { + downstream: lineage(input: { direction: DOWNSTREAM, start: 0, count: 100, separateSiblings: $separateSiblings }) { ...leafLineageResults } } @@ -239,7 +239,7 @@ fragment fullLineageResults on EntityLineageResult { relationships { type entity { - ...relationshipFields + ...lineageFields } } } diff --git a/datahub-web-react/src/graphql/relationships.graphql b/datahub-web-react/src/graphql/relationships.graphql index 54bc0fd92c2d1..e2afff5dfa6d2 100644 --- a/datahub-web-react/src/graphql/relationships.graphql +++ b/datahub-web-react/src/graphql/relationships.graphql @@ -23,3 +23,23 @@ fragment leafRelationshipResults on EntityRelationshipsResult { } } } + +fragment relationshipFields on EntityWithRelationships { + ...lineageNodeProperties + ... on Dataset { + siblings { + isPrimary + siblings { + urn + type + ...lineageNodeProperties + } + } + } + upstream: lineage(input: { direction: UPSTREAM, start: 0, count: 100 }) { + ...leafLineageResults + } + downstream: lineage(input: { direction: DOWNSTREAM, start: 0, count: 100 }) { + ...leafLineageResults + } +} diff --git a/smoke-test/tests/cypress/cypress/integration/siblings/siblings.js b/smoke-test/tests/cypress/cypress/integration/siblings/siblings.js index a0fa90e97e3d1..cb19284ef9cd0 100644 --- a/smoke-test/tests/cypress/cypress/integration/siblings/siblings.js +++ b/smoke-test/tests/cypress/cypress/integration/siblings/siblings.js @@ -31,6 +31,15 @@ describe('siblings', () => { it('can view individual nodes', () => { cy.login(); + + const resizeObserverLoopErrRe = /^[^(ResizeObserver loop limit exceeded)]/ + cy.on('uncaught:exception', (err) => { + /* returning false here prevents Cypress from failing the test */ + if (resizeObserverLoopErrRe.test(err.message)) { + return false + } + }) + cy.visit('/dataset/urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.customers,PROD)/?is_lineage_mode=false'); // navigate to the bq entity