From 6895bdfb1ea6ae95295682136f0f1821e436fbe3 Mon Sep 17 00:00:00 2001 From: cptran777 Date: Mon, 14 Sep 2020 14:26:07 -0700 Subject: [PATCH 1/2] Initial fix for lineage graph --- .../app/controllers/api/v2/Dataset.java | 2 +- .../addon/entity/dataset/dataset-entity.ts | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/datahub-frontend/app/controllers/api/v2/Dataset.java b/datahub-frontend/app/controllers/api/v2/Dataset.java index fc3e59975df5fa..aa92859c5ab4ed 100644 --- a/datahub-frontend/app/controllers/api/v2/Dataset.java +++ b/datahub-frontend/app/controllers/api/v2/Dataset.java @@ -58,7 +58,7 @@ public Result getDataset(@Nonnull String datasetUrn) { return internalServerError(ControllerUtil.errorResponse(e)); } - return ok(Json.newObject().set("dataset", Json.toJson(view))); + return ok(Json.toJson(view)); } @Security.Authenticated(Secured.class) diff --git a/datahub-web/@datahub/data-models/addon/entity/dataset/dataset-entity.ts b/datahub-web/@datahub/data-models/addon/entity/dataset/dataset-entity.ts index 19955e2b44a265..53791cbf5752c6 100644 --- a/datahub-web/@datahub/data-models/addon/entity/dataset/dataset-entity.ts +++ b/datahub-web/@datahub/data-models/addon/entity/dataset/dataset-entity.ts @@ -148,25 +148,25 @@ export class DatasetEntity extends BaseEntity { /** * Whether or not the dataset has been deprecated */ - @alias('entity.dataset.deprecated') + @alias('entity.deprecated') deprecated?: boolean; /** * Note attached to the deprecation process for this dataset */ - @alias('entity.dataset.deprecationNote') + @alias('entity.deprecationNote') deprecationNote?: string; /** * Timestamp for when the dataset was deprecated */ - @alias('entity.dataset.decommissionTime') + @alias('entity.decommissionTime') decommissionTime?: number; /** * Last timestamp for the modification of this dataset */ - @oneWay('entity.dataset.modifiedTime') + @oneWay('entity.modifiedTime') modifiedTime?: number; /** @@ -174,7 +174,7 @@ export class DatasetEntity extends BaseEntity { * Note: This overrides the BaseEntity implementation since DatasetEntity has a different behavior than * other entities */ - @oneWay('entity.dataset.removed') + @oneWay('entity.removed') removed!: boolean; /** @@ -187,7 +187,7 @@ export class DatasetEntity extends BaseEntity { /** * Description for the dataset that contains more information about the nature of the data or metadata */ - @oneWay('entity.dataset.description') + @oneWay('entity.description') description?: string; /** @@ -202,7 +202,7 @@ export class DatasetEntity extends BaseEntity { /** * Reference to the data entity, is the data platform to which the dataset belongs */ - @computed('entity.dataset.platform', 'urn') + @computed('entity.platform', 'urn') get platform(): DatasetPlatform | undefined { const { urn, entity } = this; const parts = getDatasetUrnParts(urn); From 3e5933b84039ee9eb14ed96a715f1d85d169357b Mon Sep 17 00:00:00 2001 From: cptran777 Date: Mon, 14 Sep 2020 17:49:20 -0700 Subject: [PATCH 2/2] Fixes broken test by lineage fix commit and returns empty response instead of 500 for upstreams --- datahub-frontend/app/controllers/api/v2/Dataset.java | 5 +++++ .../components/dynamic-components/entity/field-test.ts | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/datahub-frontend/app/controllers/api/v2/Dataset.java b/datahub-frontend/app/controllers/api/v2/Dataset.java index aa92859c5ab4ed..962b1c12c4ab08 100644 --- a/datahub-frontend/app/controllers/api/v2/Dataset.java +++ b/datahub-frontend/app/controllers/api/v2/Dataset.java @@ -249,6 +249,11 @@ public Result getDatasetUpstreams(@Nonnull String datasetUrn) { try { upstreams = _lineageDao.getUpstreamLineage(datasetUrn); } catch (Exception e) { + if (ControllerUtil.checkErrorCode(e, 404)) { + int[] emptyUpstreams = new int[0]; + return ok(Json.toJson(emptyUpstreams)); + } + Logger.error("Fetch Dataset upstreams error", e); return internalServerError(ControllerUtil.errorResponse(e)); } diff --git a/datahub-web/@datahub/shared/tests/integration/components/dynamic-components/entity/field-test.ts b/datahub-web/@datahub/shared/tests/integration/components/dynamic-components/entity/field-test.ts index e6fc94cf7333ee..2702b1097e6649 100644 --- a/datahub-web/@datahub/shared/tests/integration/components/dynamic-components/entity/field-test.ts +++ b/datahub-web/@datahub/shared/tests/integration/components/dynamic-components/entity/field-test.ts @@ -9,9 +9,7 @@ module('Integration | Component | dynamic-components/entity/field', function(hoo test('it renders', async function(assert) { const fakeSeedInformation = { - dataset: { - description: `Pikachu's special dataset` - } + description: `Pikachu's special dataset` }; const testUnderlyingDataset = new DatasetEntity( 'pikachu',