From 2d4cd663546a0c0c5e66b1b08a3d6dffbfd7534c Mon Sep 17 00:00:00 2001 From: Ignacio Bona Date: Thu, 5 Sep 2019 10:53:26 -0700 Subject: [PATCH] Minor and conf fixes --- datahub-frontend/app/controllers/Application.java | 13 ++++++++++++- datahub-frontend/conf/application.conf | 9 ++++----- datahub-frontend/conf/routes | 3 +++ runMidTier.sh | 2 ++ 4 files changed, 21 insertions(+), 6 deletions(-) create mode 100755 runMidTier.sh diff --git a/datahub-frontend/app/controllers/Application.java b/datahub-frontend/app/controllers/Application.java index a332985553..1b91d9c044 100644 --- a/datahub-frontend/app/controllers/Application.java +++ b/datahub-frontend/app/controllers/Application.java @@ -101,6 +101,16 @@ public class Application extends Controller { return serveAsset(""); } + /** + * Generic not found response + * @param path + * @return + */ + @Nonnull + public Result apiNotFound(@Nullable String path) { + return badRequest("{\"error\": \"API endpoint does not exist\"}"); + } + /** * Creates a wrapping ObjectNode containing config information * @@ -112,7 +122,6 @@ public class Application extends Controller { config.put("appVersion", _config.getString("app.version")); config.put("isInternal", _config.getBoolean("linkedin.internal")); config.put("shouldShowDatasetLineage", _config.getBoolean("linkedin.show.dataset.lineage")); - config.put("shouldShowDatasetHealth", _config.getBoolean("linkedin.show.dataset.health")); config.put("suggestionConfidenceThreshold", Integer.valueOf(_config.getString("linkedin.suggestion.confidence.threshold"))); config.set("wikiLinks", wikiLinks()); @@ -122,6 +131,8 @@ public class Application extends Controller { config.put("isStagingBanner", _config.getBoolean("ui.show.staging.banner")); config.put("isLiveDataWarning", _config.getBoolean("ui.show.live.data.banner")); config.put("showChangeManagement", _config.getBoolean("ui.show.CM.banner")); + // Flag to enable people entity elements + config.put("showPeople", _config.getBoolean("ui.show.people")); config.put("changeManagementLink", _config.getString("ui.show.CM.link")); // Flag set in order to warn users that search is experiencing issues config.put("isStaleSearch", _config.getBoolean("ui.show.stale.search")); diff --git a/datahub-frontend/conf/application.conf b/datahub-frontend/conf/application.conf index 38dd9c9092..0173f6dfb4 100644 --- a/datahub-frontend/conf/application.conf +++ b/datahub-frontend/conf/application.conf @@ -50,8 +50,6 @@ linkedin.internal = true linkedin.show.dataset.lineage = true -linkedin.show.dataset.health = true - linkedin.suggestion.confidence.threshold = "50" tracking.piwik.siteid = "0" @@ -81,14 +79,15 @@ links.wiki.datasetDecommission = "" ui.show.ownership.revamp = true -ui.show.staging.banner = true +ui.show.staging.banner = false +ui.show.people = false -ui.show.CM.banner = true +ui.show.CM.banner = false ui.show.CM.link = "" ui.show.stale.search = true -ui.show.live.data.banner = true +ui.show.live.data.banner = false ui.show.lineage.graph = true diff --git a/datahub-frontend/conf/routes b/datahub-frontend/conf/routes index 48a2f76b24..f96c59444a 100644 --- a/datahub-frontend/conf/routes +++ b/datahub-frontend/conf/routes @@ -37,6 +37,9 @@ GET /api/v2/datasets/:urn/snapshot co GET /api/v2/datasets/:urn/upstreams controllers.api.v2.Dataset.getDatasetUpstreams(urn: String) GET /api/v2/search controllers.api.v2.Search.search() +GET /api/*path controllers.Application.apiNotFound(path) +POST /api/*path controllers.Application.apiNotFound(path) + # Map static resources from the /public folder to the /assets URL path GET /assets/*file controllers.Assets.at(path="/public", file) diff --git a/runMidTier.sh b/runMidTier.sh new file mode 100755 index 0000000000..666976588b --- /dev/null +++ b/runMidTier.sh @@ -0,0 +1,2 @@ +./gradlew build -x datahub-web:emberBuild -x datahub-web:emberWorkspaceTest -x datahub-frontend:unzipAssets +cd datahub-frontend/run && ./run-local-frontend \ No newline at end of file