Merge remote-tracking branch 'upstream/master' into looker-test-conne…

…ction
datahub-project · Sep 5, 2022 · d4a4217 · d4a4217
2 parents 2f0ea16 + 13f20ad
commit d4a4217
Show file tree

Hide file tree

Showing 76 changed files with 2,110 additions and 1,128 deletions.
diff --git a/datahub-frontend/conf/application.conf b/datahub-frontend/conf/application.conf
@@ -118,7 +118,7 @@ ui.new.browse.dataset = true
 
 # React App Authentication
 # ~~~~~
-# React currently supports OIDC SSO + self-configured JAAS (same as Ember) for authentication. Below you can find the supported configurations for
+# React currently supports OIDC SSO + self-configured JAAS for authentication. Below you can find the supported configurations for
 # each mechanism.
 #
 # Required OIDC Configuration Values:
@@ -232,4 +232,4 @@ metadataService.auth.enabled=${?METADATA_SERVICE_AUTH_ENABLED}
 systemClientId = __datahub_system # Change this to something random.
 systemClientSecret = JohnSnowKnowsNothing # Along with this.
 systemClientId=${?DATAHUB_SYSTEM_CLIENT_ID}
-systemClientSecret=${?DATAHUB_SYSTEM_CLIENT_SECRET}
+systemClientSecret=${?DATAHUB_SYSTEM_CLIENT_SECRET}
diff --git a/datahub-frontend/play.gradle b/datahub-frontend/play.gradle
@@ -13,11 +13,7 @@ configurations {
 }
 
 dependencies {
-  if (project.hasProperty('enableEmber') && project.getProperty('enableEmber').toBoolean()) {
-    assets project(path: ':datahub-web', configuration: 'assets')
-  } else {
-    assets project(path: ':datahub-web-react', configuration: 'assets')
-  }
+  assets project(path: ':datahub-web-react', configuration: 'assets')
 
   constraints {
     play('org.springframework:spring-core:5.2.3.RELEASE')

diff --git a/...l-core/src/main/java/com/linkedin/datahub/graphql/resolvers/config/AppConfigResolver.java b/...l-core/src/main/java/com/linkedin/datahub/graphql/resolvers/config/AppConfigResolver.java
@@ -115,6 +115,7 @@ public CompletableFuture<AppConfig> get(final DataFetchingEnvironment environmen
     final VisualConfig visualConfig = new VisualConfig();
     if (_visualConfiguration != null && _visualConfiguration.getAssets() != null) {
       visualConfig.setLogoUrl(_visualConfiguration.getAssets().getLogoUrl());
+      visualConfig.setFaviconUrl(_visualConfiguration.getAssets().getFaviconUrl());
     }
     appConfig.setVisualConfig(visualConfig);
 

diff --git a/datahub-graphql-core/src/main/resources/app.graphql b/datahub-graphql-core/src/main/resources/app.graphql
@@ -167,6 +167,11 @@ type VisualConfig {
   Custom logo url for the homepage & top banner
   """
   logoUrl: String
+
+  """
+  Custom favicon url for the homepage & top banner
+  """
+  faviconUrl: String
 }
 
 """