Skip to content

Commit

Permalink
chore: cleanup references to the old ember app (#5797)
Browse files Browse the repository at this point in the history
Co-authored-by: Shirshanka Das <[email protected]>
  • Loading branch information
hsheth2 and shirshanka authored Sep 5, 2022
1 parent 762bcbb commit c44fd62
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 31 deletions.
4 changes: 2 additions & 2 deletions datahub-frontend/conf/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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}
6 changes: 1 addition & 5 deletions datahub-frontend/play.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
9 changes: 4 additions & 5 deletions datahub-web-react/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions docker/datahub-frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 1 addition & 6 deletions docker/datahub-frontend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Please note the final `.` and that the tag `your_datahub_frontend` is determined by you.
11 changes: 0 additions & 11 deletions docker/quickstart-ember.sh

This file was deleted.

0 comments on commit c44fd62

Please sign in to comment.