Skip to content

Commit 7a7807e

Browse files
songjianetsongjianet
authored
[Feature] Remove old ui. (#9909)
* [Feature] Remove old ui. * [Docs] Add license file for screenfull.
1 parent 15a15de commit 7a7807e

1,099 files changed

Lines changed: 125 additions & 61348 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/frontend.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ on:
2323
- dev
2424
paths:
2525
- '.github/workflows/frontend.yml'
26-
- 'dolphinscheduler-ui-next/**'
26+
- 'dolphinscheduler-ui/**'
2727
pull_request:
2828
paths:
2929
- '.github/workflows/frontend.yml'
30-
- 'dolphinscheduler-ui-next/**'
30+
- 'dolphinscheduler-ui/**'
3131

3232
defaults:
3333
run:
34-
working-directory: dolphinscheduler-ui-next
34+
working-directory: dolphinscheduler-ui
3535

3636
concurrency:
3737
group: frontend-${{ github.event.pull_request.number || github.ref }}

‎.github/workflows/unit-test.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ on:
2323
paths-ignore:
2424
- '**/*.md'
2525
- 'dolphinscheduler-ui'
26-
- 'dolphinscheduler-ui-next'
2726
- 'dolphinscheduler-python/pydolphinscheduler'
2827
branches:
2928
- dev
@@ -93,7 +92,7 @@ jobs:
9392
-Dsonar.core.codeCoveragePlugin=jacoco
9493
-Dsonar.projectKey=apache-dolphinscheduler
9594
-Dsonar.login=e4058004bc6be89decf558ac819aa1ecbee57682
96-
-Dsonar.exclusions=dolphinscheduler-ui/src/**/i18n/locale/*.js,dolphinscheduler-ui-next/src/**/i18n/locale/*.js,dolphinscheduler-microbench/src/**/*
95+
-Dsonar.exclusions=,dolphinscheduler-ui/src/**/i18n/locale/*.js,dolphinscheduler-microbench/src/**/*
9796
-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
9897
env:
9998
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ dolphinscheduler-alert/src/main/resources/logback.xml
4545
dolphinscheduler-server/src/main/resources/logback.xml
4646
dolphinscheduler-ui/dist
4747
dolphinscheduler-ui/node
48-
dolphinscheduler-ui-next/node
4948
dolphinscheduler-common/sql
5049
dolphinscheduler-common/test
5150
dolphinscheduler-worker/logs

‎docs/docs/en/development/development-environment-setup.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Find the class `org.apache.dolphinscheduler.server.StandaloneServer` in Intellij
5555
Install frontend dependencies and run it
5656

5757
```shell
58-
cd dolphinscheduler-ui-next
58+
cd dolphinscheduler-ui
5959
pnpm install
6060
pnpm run dev
6161
```
@@ -152,7 +152,7 @@ There are three services that need to be started, including MasterServer, Worker
152152
Install frontend dependencies and run it
153153
154154
```shell
155-
cd dolphinscheduler-ui-next
155+
cd dolphinscheduler-ui
156156
pnpm install
157157
pnpm run dev
158158
```

‎docs/docs/zh/development/development-environment-setup.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ DolphinScheduler 开发环境配置有两个方式，分别是standalone模式
5252
安装前端依赖并运行前端组件
5353

5454
```shell
55-
cd dolphinscheduler-ui-next
55+
cd dolphinscheduler-ui
5656
pnpm install
5757
pnpm run dev
5858
```
@@ -147,7 +147,7 @@ DolphinScheduler 的元数据存储在关系型数据库中，目前支持的关
147147
安装前端依赖并运行前端组件
148148

149149
```shell
150-
cd dolphinscheduler-ui-next
150+
cd dolphinscheduler-ui
151151
pnpm install
152152
pnpm run dev
153153
```

‎dolphinscheduler-api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
<dependency>
6060
<groupId>org.apache.dolphinscheduler</groupId>
61-
<artifactId>dolphinscheduler-ui-next</artifactId>
61+
<artifactId>dolphinscheduler-ui</artifactId>
6262
</dependency>
6363

6464
<!--springboot-->

‎dolphinscheduler-api/src/main/assembly/dolphinscheduler-api-server.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<outputDirectory>conf</outputDirectory>
5757
</fileSet>
5858
<fileSet>
59-
<directory>${basedir}/../dolphinscheduler-ui-next/dist</directory>
59+
<directory>${basedir}/../dolphinscheduler-ui/dist</directory>
6060
<outputDirectory>./ui</outputDirectory>
6161
</fileSet>
6262
</fileSets>

‎dolphinscheduler-dist/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
<dependency>
6060
<groupId>org.apache.dolphinscheduler</groupId>
61-
<artifactId>dolphinscheduler-ui-next</artifactId>
61+
<artifactId>dolphinscheduler-ui</artifactId>
6262
</dependency>
6363

6464
<dependency>

‎dolphinscheduler-dist/release-docs/LICENSE‎

Lines changed: 2 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -554,59 +554,14 @@ CC0-1.0 licenses
554554

555555
HdrHistogram 2.1.12: https://github.com/HdrHistogram/HdrHistogram , CC0-1.0 and BSD 2-Clause
556556

557+
557558
========================================================================
558559
UI related licenses
559560
========================================================================
560561

561562
The following components are used in UI.See project link for details.
562563
The text of each license is also included at licenses/ui-licenses/LICENSE-[project].txt.
563564

564-
========================================
565-
MIT licenses
566-
========================================
567-
@form-create/element-ui 1.0.18: https://github.com/xaboy/form-create MIT
568-
axios 0.16.2: https://github.com/axios/axios MIT
569-
bootstrap 3.3.7: https://github.com/twbs/bootstrap MIT
570-
canvg 1.5.1: https://github.com/canvg/canvg MIT
571-
clipboard 2.0.1: https://github.com/zenorocha/clipboard.js MIT
572-
codemirror 5.43.0: https://github.com/codemirror/CodeMirror MIT
573-
dayjs 1.7.8: https://github.com/iamkun/dayjs MIT
574-
element-ui 2.13.2: https://github.com/ElemeFE/element MIT
575-
html2canvas 0.5.0-beta4: https://github.com/niklasvh/html2canvas MIT
576-
jquery 3.3.1: https://github.com/jquery/jquery MIT
577-
jquery-ui 1.12.1: https://github.com/jquery/jquery-ui MIT
578-
js-cookie 2.2.1: https://github.com/js-cookie/js-cookie MIT
579-
jsplumb 2.8.6: https://github.com/jsplumb/jsplumb MIT and GPLv2
580-
lodash 4.17.11: https://github.com/lodash/lodash MIT
581-
moment-timezone 0.5.33: https://github.com/moment/moment-timezone MIT
582-
vue-treeselect 0.4.0: https://github.com/riophae/vue-treeselect MIT
583-
vue 2.5.17: https://github.com/vuejs/vue MIT
584-
vue-router 2.7.0: https://github.com/vuejs/vue-router MIT
585-
vuex 3.0.0: https://github.com/vuejs/vuex MIT
586-
vuex-router-sync 4.1.2: https://github.com/vuejs/vuex-router-sync MIT
587-
dagre 0.8.5: https://github.com/dagrejs/dagre MIT
588-
js-cookie 3.0.1 https://github.com/js-cookie/js-cookie MIT
589-
@types/js-cookie 3.0.1 https://github.com/DefinitelyTyped/DefinitelyTyped MIT
590-
591-
========================================
592-
Apache 2.0 licenses
593-
========================================
594-
echarts 4.1.0: https://github.com/apache/incubator-echarts Apache-2.0
595-
remixicon 2.5.0 https://github.com/Remix-Design/remixicon Apache-2.0
596-
597-
========================================
598-
BSD licenses
599-
========================================
600-
d3 3.5.17: https://github.com/d3/d3 BSD-3-Clause
601-
602-
603-
========================================================================
604-
UI-Next related licenses
605-
========================================================================
606-
607-
The following components are used in UI-Next.See project link for details.
608-
The text of each license is also included at licenses/ui-next-licenses/LICENSE-[project].txt.
609-
610565
========================================
611566
MIT licenses
612567
========================================
@@ -660,7 +615,7 @@ BSD licenses
660615
========================================================================
661616

662617
The following components are provided under a BSD license. See project link for details.
663-
The text of each license is also included at licenses/ui-next-licenses/LICENSE-[project].txt.
618+
The text of each license is also included at licenses/ui-licenses/LICENSE-[project].txt.
664619
qs 6.10.3: https://github.com/ljharb/qs BSD 3-Clause
665620
@typescript-eslint/eslint-plugin 5.12.1: https://github.com/typescript-eslint/typescript-eslint BSD 2-clause
666621
@typescript-eslint/parser 5.12.1: https://github.com/typescript-eslint/typescript-eslint BSD 2-clause

dolphinscheduler-dist/release-docs/licenses/ui-next-licenses/LICENSE-@antv-layout renamed to dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-@antv-layout

File renamed without changes.

0 commit comments

Comments
 (0)