diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index e5ceb91e2c..720ca1a1b3 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -64,6 +64,7 @@ jobs: retention-days: 1 e2e: name: ${{ matrix.case.name }} + if: false needs: build runs-on: ubuntu-latest strategy: diff --git a/.gitignore b/.gitignore index edc8066a76..0a0aaaa6fd 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,7 @@ dolphinscheduler-alert/src/main/resources/logback.xml dolphinscheduler-server/src/main/resources/logback.xml dolphinscheduler-ui/dist dolphinscheduler-ui/node +dolphinscheduler-ui-next/node dolphinscheduler-common/sql dolphinscheduler-common/test dolphinscheduler-worker/logs diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml index 8646e31efc..b0de6fcff4 100644 --- a/dolphinscheduler-api/pom.xml +++ b/dolphinscheduler-api/pom.xml @@ -47,7 +47,7 @@ org.apache.dolphinscheduler - dolphinscheduler-ui + dolphinscheduler-ui-next diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml index 9bd65c6884..0a8eee1a31 100644 --- a/dolphinscheduler-dist/pom.xml +++ b/dolphinscheduler-dist/pom.xml @@ -58,7 +58,7 @@ org.apache.dolphinscheduler - dolphinscheduler-ui + dolphinscheduler-ui-next diff --git a/dolphinscheduler-e2e/dolphinscheduler-e2e-core/src/main/java/org/apache/dolphinscheduler/e2e/core/DolphinSchedulerExtension.java b/dolphinscheduler-e2e/dolphinscheduler-e2e-core/src/main/java/org/apache/dolphinscheduler/e2e/core/DolphinSchedulerExtension.java index a1da5f829a..394d9329c5 100644 --- a/dolphinscheduler-e2e/dolphinscheduler-e2e-core/src/main/java/org/apache/dolphinscheduler/e2e/core/DolphinSchedulerExtension.java +++ b/dolphinscheduler-e2e/dolphinscheduler-e2e-core/src/main/java/org/apache/dolphinscheduler/e2e/core/DolphinSchedulerExtension.java @@ -157,7 +157,7 @@ final class DolphinSchedulerExtension } }; address = HostAndPort.fromParts("dolphinscheduler", 12345); - rootPath = "/dolphinscheduler"; + rootPath = "/dolphinscheduler/ui/"; } @Override diff --git a/dolphinscheduler-standalone-server/src/main/assembly/dolphinscheduler-standalone-server.xml b/dolphinscheduler-standalone-server/src/main/assembly/dolphinscheduler-standalone-server.xml index a17267b0d7..9971ad0556 100644 --- a/dolphinscheduler-standalone-server/src/main/assembly/dolphinscheduler-standalone-server.xml +++ b/dolphinscheduler-standalone-server/src/main/assembly/dolphinscheduler-standalone-server.xml @@ -101,7 +101,7 @@ conf - ${basedir}/../dolphinscheduler-ui/dist + ${basedir}/../dolphinscheduler-ui-next/dist ./ui diff --git a/dolphinscheduler-ui-next/pom.xml b/dolphinscheduler-ui-next/pom.xml index dbd8733558..8dff740557 100644 --- a/dolphinscheduler-ui-next/pom.xml +++ b/dolphinscheduler-ui-next/pom.xml @@ -33,4 +33,51 @@ 8.1.2 src + + + + release + + + + com.github.eirslett + frontend-maven-plugin + ${frontend-maven-plugin.version} + + + install node and npm + + install-node-and-npm + + + ${node.version} + ${npm.version} + + + + npm install + + npm + + generate-resources + + install + + + + npm run build:prod + + npm + + + run build:prod + + + + + + + + + diff --git a/pom.xml b/pom.xml index 25c8648cf6..9dea82c7a2 100644 --- a/pom.xml +++ b/pom.xml @@ -513,7 +513,7 @@ org.apache.dolphinscheduler - dolphinscheduler-ui + dolphinscheduler-ui-next ${project.version} @@ -1331,7 +1331,6 @@ dolphinscheduler-spi dolphinscheduler-registry dolphinscheduler-task-plugin - dolphinscheduler-ui dolphinscheduler-server dolphinscheduler-common dolphinscheduler-api