refactor(ui): Remove unnecessary fields in GraphQL (datahub-project#5358

)
shirshanka · Jul 9, 2022 · c7a2df3 · c7a2df3
1 parent 72e78fd
commit c7a2df3
Show file tree

Hide file tree

Showing 10 changed files with 89 additions and 78 deletions.
diff --git a/datahub-web-react/src/Mocks.tsx b/datahub-web-react/src/Mocks.tsx
@@ -462,7 +462,6 @@ export const dataset3 = {
         primaryKeys: [],
         foreignKeys: [],
     },
-    previousSchemaMetadata: null,
     editableSchemaMetadata: null,
     deprecation: null,
     usageStats: null,

diff --git a/datahub-web-react/src/app/entity/dataJob/DataJobEntity.tsx b/datahub-web-react/src/app/entity/dataJob/DataJobEntity.tsx
@@ -88,8 +88,8 @@ export class DataJobEntity implements Entity<DataJob> {
                     display: {
                         visible: (_, _1) => true,
                         enabled: (_, dataJob: GetDataJobQuery) =>
-                            (dataJob?.dataJob?.incoming?.count || 0) !== 0 ||
-                            (dataJob?.dataJob?.outgoing?.count || 0) !== 0,
+                            (dataJob?.dataJob?.upstream?.count || 0) !== 0 ||
+                            (dataJob?.dataJob?.downstream?.count || 0) !== 0,
                     },
                 },
                 {

diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/DataJobFlowTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/DataJobFlowTab.tsx
@@ -7,8 +7,8 @@ import { useEntityRegistry } from '../../../../useEntityRegistry';
 export const DataJobFlowTab = () => {
     const entity = useBaseEntity() as any;
     const dataJob = entity && entity.dataJob;
-    const dataFlows = dataJob?.parentFlow?.relationships.map((relationship) => relationship.entity);
+    const dataFlow = dataJob?.dataFlow;
     const entityRegistry = useEntityRegistry();
     const title = `Part of ${entityRegistry.getEntityName(EntityType.DataFlow)}`;
-    return <EntityList title={title} type={EntityType.DataFlow} entities={dataFlows || []} />;
+    return <EntityList title={title} type={EntityType.DataFlow} entities={[dataFlow] || []} />;
 };
diff --git a/datahub-web-react/src/graphql-mock/fixtures/entity/datasetEntity.ts b/datahub-web-react/src/graphql-mock/fixtures/entity/datasetEntity.ts
@@ -35,11 +35,7 @@ export type DatasetEntityArg = {
     path: string;
 };
 
-export const datasetEntity = ({
-    platform,
-    origin,
-    path,
-}: DatasetEntityArg): Dataset & { previousSchemaMetadata: any } => {
+export const datasetEntity = ({ platform, origin, path }: DatasetEntityArg): Dataset => {
     const name = `${path}.${faker.company.bsNoun()}_${faker.company.bsNoun()}`;
     const description = `${faker.commerce.productDescription()}`;
     const datahubUser = findUserByUsername('datahub');
@@ -80,7 +76,6 @@ export const datasetEntity = ({
         usageStats: null,
         glossaryTerms: null,
         schemaMetadata: null,
-        previousSchemaMetadata: null,
         __typename: 'Dataset',
         subTypes: null,
         health: [],

diff --git a/datahub-web-react/src/graphql/chart.graphql b/datahub-web-react/src/graphql/chart.graphql
@@ -56,9 +56,6 @@ query getChart($urn: String!) {
         dashboards: relationships(input: { types: ["Contains"], direction: INCOMING, start: 0, count: 100 }) {
             ...fullRelationshipResults
         }
-        container {
-            ...entityContainer
-        }
         parentContainers {
             ...parentContainersFields
         }

diff --git a/datahub-web-react/src/graphql/dashboard.graphql b/datahub-web-react/src/graphql/dashboard.graphql
@@ -1,9 +1,6 @@
 query getDashboard($urn: String!) {
     dashboard(urn: $urn) {
         ...dashboardFields
-        editableProperties {
-            description
-        }
         charts: relationships(input: { types: ["Contains"], direction: OUTGOING, start: 0, count: 100 }) {
             ...fullRelationshipResults
         }

diff --git a/datahub-web-react/src/graphql/dataJob.graphql b/datahub-web-react/src/graphql/dataJob.graphql
@@ -1,41 +1,17 @@
 query getDataJob($urn: String!) {
     dataJob(urn: $urn) {
         ...dataJobFields
-        parentFlow: relationships(input: { types: ["IsPartOf"], direction: OUTGOING, start: 0, count: 1 }) {
-            ...fullRelationshipResults
-        }
-        incoming: relationships(
-            input: {
-                types: ["DownstreamOf", "Consumes", "Produces", "TrainedBy"]
-                direction: INCOMING
-                start: 0
-                count: 100
-            }
-        ) {
-            ...fullRelationshipResults
-        }
-        outgoing: relationships(
-            input: { types: ["DownstreamOf", "Consumes", "Produces"], direction: OUTGOING, start: 0, count: 100 }
-        ) {
-            ...fullRelationshipResults
-        }
         upstream: lineage(input: { direction: UPSTREAM, start: 0, count: 100 }) {
             ...partialLineageResults
         }
         downstream: lineage(input: { direction: DOWNSTREAM, start: 0, count: 100 }) {
             ...partialLineageResults
         }
-        status {
-            removed
-        }
         runs(start: 0, count: 20) {
             count
             start
             total
         }
-        deprecation {
-            ...deprecationFields
-        }
     }
 }
 

diff --git a/datahub-web-react/src/graphql/dataset.graphql b/datahub-web-react/src/graphql/dataset.graphql
@@ -41,9 +41,6 @@ fragment nonSiblingDatasetFields on Dataset {
     schemaMetadata(version: 0) {
         ...schemaMetadataFields
     }
-    previousSchemaMetadata: schemaMetadata(version: -1) {
-        ...schemaMetadataFields
-    }
     editableSchemaMetadata {
         editableSchemaFieldInfo {
             fieldPath
@@ -74,9 +71,6 @@ fragment nonSiblingDatasetFields on Dataset {
     domain {
         ...entityDomain
     }
-    container {
-        ...entityContainer
-    }
     parentContainers {
         ...parentContainersFields
     }

diff --git a/datahub-web-react/src/graphql/fragments.graphql b/datahub-web-react/src/graphql/fragments.graphql
@@ -17,16 +17,9 @@ fragment glossaryNode on GlossaryNode {
     properties {
         name
     }
-    children: relationships(
-            input: {
-                types: ["IsPartOf"]
-                direction: INCOMING
-                start: 0
-                count: 1000
-            }
-        ) {
-            count
-        }
+    children: relationships(input: { types: ["IsPartOf"], direction: INCOMING, start: 0, count: 1000 }) {
+        count
+    }
 }
 
 fragment glossaryTerm on GlossaryTerm {
@@ -209,9 +202,6 @@ fragment nonRecursiveDatasetFields on Dataset {
     schemaMetadata(version: 0) {
         ...schemaMetadataFields
     }
-    previousSchemaMetadata: schemaMetadata(version: -1) {
-        ...schemaMetadataFields
-    }
     editableSchemaMetadata {
         editableSchemaFieldInfo {
             fieldPath
@@ -306,17 +296,6 @@ fragment dataJobFields on DataJob {
     ownership {
         ...ownershipFields
     }
-    inputOutput {
-        inputDatasets {
-            ...nonRecursiveDatasetFields
-        }
-        outputDatasets {
-            ...nonRecursiveDatasetFields
-        }
-        inputDatajobs {
-            ...nonRecursiveDataJobFields
-        }
-    }
     properties {
         name
         description
@@ -344,6 +323,9 @@ fragment dataJobFields on DataJob {
     deprecation {
         ...deprecationFields
     }
+    status {
+        removed
+    }
     dataPlatformInstance {
         ...dataPlatformInstanceFields
     }
@@ -371,6 +353,9 @@ fragment dashboardFields on Dashboard {
             time
         }
     }
+    editableProperties {
+        description
+    }
     ownership {
         ...ownershipFields
     }
@@ -389,9 +374,6 @@ fragment dashboardFields on Dashboard {
     domain {
         ...entityDomain
     }
-    container {
-        ...entityContainer
-    }
     parentContainers {
         ...parentContainersFields
     }
@@ -798,7 +780,7 @@ fragment nonConflictingPlatformFields on DataPlatform {
     }
 }
 
-fragment dataPlatformInstanceFields on DataPlatformInstance  {
+fragment dataPlatformInstanceFields on DataPlatformInstance {
     urn
     type
     platform {

diff --git a/datahub-web-react/src/graphql/lineage.graphql b/datahub-web-react/src/graphql/lineage.graphql
@@ -2,7 +2,39 @@ fragment lineageNodeProperties on EntityWithRelationships {
     urn
     type
     ... on DataJob {
-        ...dataJobFields
+        urn
+        type
+        dataFlow {
+            ...nonRecursiveDataFlowFields
+        }
+        jobId
+        ownership {
+            ...ownershipFields
+        }
+        properties {
+            name
+            description
+            externalUrl
+            customProperties {
+                key
+                value
+            }
+        }
+        globalTags {
+            ...globalTagsFields
+        }
+        glossaryTerms {
+            ...glossaryTerms
+        }
+        domain {
+            ...entityDomain
+        }
+        deprecation {
+            ...deprecationFields
+        }
+        dataPlatformInstance {
+            ...dataPlatformInstanceFields
+        }
         editableProperties {
             description
         }
@@ -42,13 +74,52 @@ fragment lineageNodeProperties on EntityWithRelationships {
         }
     }
     ... on Dashboard {
-        ...dashboardFields
-        editableProperties {
+        urn
+        type
+        tool
+        dashboardId
+        properties {
+            name
             description
+            externalUrl
+            lastRefreshed
+            created {
+                time
+            }
+            lastModified {
+                time
+            }
+        }
+        ownership {
+            ...ownershipFields
+        }
+        globalTags {
+            ...globalTagsFields
+        }
+        glossaryTerms {
+            ...glossaryTerms
         }
         platform {
             ...platformFields
         }
+        domain {
+            ...entityDomain
+        }
+        parentContainers {
+            ...parentContainersFields
+        }
+        status {
+            removed
+        }
+        deprecation {
+            ...deprecationFields
+        }
+        dataPlatformInstance {
+            ...dataPlatformInstanceFields
+        }
+        editableProperties {
+            description
+        }
         status {
             removed
         }