diff --git a/datahub-frontend/conf/application.conf b/datahub-frontend/conf/application.conf index 354e8283e2bae9..de5a19879e5157 100644 --- 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} \ No newline at end of file +systemClientSecret=${?DATAHUB_SYSTEM_CLIENT_SECRET} diff --git a/datahub-frontend/play.gradle b/datahub-frontend/play.gradle index 80892c59e9f4ec..123cce7eb3cfbf 100644 --- 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/datahub-web-react/README.md b/datahub-web-react/README.md index ff838328ca9181..3cc0f1fc83eacc 100644 --- a/datahub-web-react/README.md +++ b/datahub-web-react/README.md @@ -5,15 +5,14 @@ title: "datahub-web-react" # DataHub React App ## About -This module contains a React version of the DataHub UI. This is now the production version of the DataHub client experience. -Notice that this is a completely separate frontend experience from the legacy Ember app and will remain so as it evolves. +This module contains a React application that serves as the DataHub UI. Feel free to take a look around, deploy, and contribute. For details about the motivation please see [this RFC](../docs/rfc/active/2055-react-app/README.md). ## Functional Goals -The initial milestone for the app was to achieve functional parity with the existing Ember app. This meant supporting +The initial milestone for the app was to achieve functional parity with the previous Ember app. This meant supporting - Dataset Profiles, Search, Browse Experience - User Profiles, Search @@ -22,8 +21,8 @@ The initial milestone for the app was to achieve functional parity with the exis This has since been achieved. The new set of functional goals are reflected in the latest version of the [DataHub Roadmap](../docs/roadmap.md). ## Design Goals -In building out the client experience, we intend to leverage learnings from the Ember app and incorporate feedback gathered -from organizations operating DataHub. Two themes have emerged to serve as guideposts: +In building out the client experience, we intend to leverage learnings from the previous Ember-based app and incorporate feedback gathered +from organizations operating DataHub. Two themes have emerged to serve as guideposts: 1. **Configurability**: The client experience should be configurable, such that deploying organizations can tailor certain aspects to their needs. This includes theme / styling configurability, showing and hiding specific functionality, diff --git a/docker/datahub-frontend/Dockerfile b/docker/datahub-frontend/Dockerfile index 68c74eeab3f2b4..a70e64bd70b628 100644 --- a/docker/datahub-frontend/Dockerfile +++ b/docker/datahub-frontend/Dockerfile @@ -15,14 +15,13 @@ FROM --platform=$BUILDPLATFORM node:16.13.0-alpine3.14 AS prod-build RUN apk --no-cache --update-cache --available upgrade \ && apk --no-cache add perl openjdk8 -ARG ENABLE_EMBER="false" ARG USE_SYSTEM_NODE="true" ENV CI=true ENV GRADLE_OPTS="-Xms256m -Xmx512m" COPY . datahub-src RUN cd datahub-src \ && ./gradlew :datahub-web-react:build -x test -x yarnTest -x yarnLint \ - && ./gradlew :datahub-frontend:dist -PenableEmber=${ENABLE_EMBER} -PuseSystemNode=${USE_SYSTEM_NODE} -x test -x yarnTest -x yarnLint \ + && ./gradlew :datahub-frontend:dist -PuseSystemNode=${USE_SYSTEM_NODE} -x test -x yarnTest -x yarnLint \ && cp datahub-frontend/build/distributions/datahub-frontend.zip ../datahub-frontend.zip \ && cd .. && rm -rf datahub-src && unzip datahub-frontend.zip diff --git a/docker/datahub-frontend/README.md b/docker/datahub-frontend/README.md index 9d696d6ac5c087..45f0805c0c9a9b 100644 --- a/docker/datahub-frontend/README.md +++ b/docker/datahub-frontend/README.md @@ -14,11 +14,6 @@ If using React app: http://localhost:9002 ``` -If using legacy Ember app: -``` -http://localhost:9001 -``` - You can sign in with `datahub` as username and password. ## Build instructions @@ -27,4 +22,4 @@ If you want to build the `datahub-frontend` Docker image yourself, you can run t `DOCKER_BUILDKIT=1 docker build -t your_datahub_frontend -f ./docker/datahub-frontend/Dockerfile .` -Please note the final `.` and that the tag `your_datahub_frontend` is determined by you. \ No newline at end of file +Please note the final `.` and that the tag `your_datahub_frontend` is determined by you. diff --git a/docker/quickstart-ember.sh b/docker/quickstart-ember.sh deleted file mode 100755 index df4ff0106a93b1..00000000000000 --- a/docker/quickstart-ember.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# Quickstarts an Ember-serving variant of DataHub by pulling all images from dockerhub and then running the containers locally. -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -export DATAHUB_VERSION=${DATAHUB_VERSION:-head} -cd $DIR && docker-compose -f docker-compose.yml -f docker-compose.override.yml -f docker-compose.ember.yml pull && docker-compose -p datahub \ - -f docker-compose.yml \ - -f docker-compose.override.yml \ - -f docker-compose.ember.yml \ - up \ - --scale datahub-frontend-react=0