Skip to content

Commit 75428bb

Browse files
pan3793yaooqinn
authored andcommitted
[KYUUBI #5484] Remove legacy Web UI
### _Why are the changes needed?_ Close #5484 Kyuubi provides a basic new Web UI which is built on top of Vue3, we can remove the legacy dummy Web UI in 1.8. The new UI hosts at `http://<host>:<port>/ui/` and the legacy UI hosts at `http://<host>:<port>/`, we should 1. Remove the legacy UI routing from Jetty 2. Remove all files related to legacy UI 3. Redirect `http://<host>:<port>/` to `http://<host>:<port>/ui/` ### _How was this patch tested?_ - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible - [x] Add screenshots for manual tests if appropriate building with the command `build/dist --web-ui`, then `cd dist` and perform `bin/kyuubi run` access http://0.0.0.0:10099 could correctly redirect to http://0.0.0.0:10099/ui/ <img width="1428" alt="image" src="https://github.com/apache/kyuubi/assets/26535726/1e8a67f6-e4db-415e-8a47-dd7c41b487cf"> swagger is render correctly too. <img width="1428" alt="image" src="https://github.com/apache/kyuubi/assets/26535726/1cb4ba31-9965-4468-b7c3-b0319ba959e6"> - [ ] [Run test](https://kyuubi.readthedocs.io/en/master/contributing/code/testing.html#running-tests) locally before make a pull request ### _Was this patch authored or co-authored using generative AI tooling?_ No. Closes #5516 from pan3793/5484. Closes #5484 9d58ef7 [Cheng Pan] address comment and fix test 6d4c098 [Cheng Pan] [KYUUBI #5484] Remove legacy Web UI Authored-by: Cheng Pan <[email protected]> Signed-off-by: Kent Yao <[email protected]>
1 parent f4f5466 commit 75428bb

27 files changed

+6
-1523
lines changed

.rat-excludes

-7
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,6 @@ build/scala-*/**
3939
**/*.output.schema
4040
**/apache-kyuubi-*-bin*/**
4141
**/benchmarks/**
42-
**/jquery-*.min.js
43-
**/semantic.min.js
44-
**/semantic.min.css
45-
**/icon.png
46-
**/icon.min.css
47-
**/org/apache/kyuubi/ui/static/assets/**
48-
**/org/apache/kyuubi/ui/swagger/**
4942
**/org.apache.spark.status.AppHistoryServerPlugin
5043
**/metadata-store-schema*.sql
5144
**/*.derby.sql

LICENSE

-17
Original file line numberDiff line numberDiff line change
@@ -199,20 +199,3 @@
199199
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200200
See the License for the specific language governing permissions and
201201
limitations under the License.
202-
203-
------------------------------------------------------------------------------------
204-
This product bundles various third-party components under other open source licenses.
205-
This section summarizes those components and their licenses. See licenses/
206-
for text of these licenses.
207-
208-
Apache License Version 2.0
209-
--------------------------
210-
kyuubi-server/src/main/resources/org/apache/kyuubi/ui/swagger/*
211-
212-
MIT license
213-
-----------
214-
kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/assets/fonts/*
215-
kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/icon.min.css
216-
kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/semantic.min.css
217-
kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/semantic.min.js
218-
kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/jquery-3.6.0.min.js

LICENSE-binary

-7
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ org.apache.logging.log4j:log4j-1.2-api
276276
org.apache.logging.log4j:log4j-api
277277
org.apache.logging.log4j:log4j-core
278278
org.apache.logging.log4j:log4j-slf4j-impl
279-
org.webjars:swagger-ui
280279
org.yaml:snakeyaml
281280
io.dropwizard.metrics:metrics-core
282281
io.dropwizard.metrics:metrics-jmx
@@ -365,12 +364,6 @@ com.theokanning.openai-gpt3-java:api
365364
com.theokanning.openai-gpt3-java:client
366365
com.theokanning.openai-gpt3-java:service
367366

368-
kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/assets/fonts/*
369-
kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/icon.min.css
370-
kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/semantic.min.css
371-
kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/semantic.min.js
372-
kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/jquery-3.6.0.min.js
373-
374367
This product also contains the following third-party components, the information
375368
is auto-generated by `pnpm licenses list --prod`.
376369
-----------------------------------------------------

dev/dependencyList

-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ swagger-core/2.2.1//swagger-core-2.2.1.jar
191191
swagger-integration/2.2.1//swagger-integration-2.2.1.jar
192192
swagger-jaxrs2/2.2.1//swagger-jaxrs2-2.2.1.jar
193193
swagger-models/2.2.1//swagger-models-2.2.1.jar
194-
swagger-ui/4.9.1//swagger-ui-4.9.1.jar
195194
trino-client/363//trino-client-363.jar
196195
units/1.6//units-1.6.jar
197196
vertx-core/4.3.2//vertx-core-4.3.2.jar

kyuubi-server/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -400,11 +400,6 @@
400400
</exclusions>
401401
</dependency>
402402

403-
<dependency>
404-
<groupId>org.webjars</groupId>
405-
<artifactId>swagger-ui</artifactId>
406-
</dependency>
407-
408403
<dependency>
409404
<groupId>org.apache.kafka</groupId>
410405
<artifactId>kafka-clients</artifactId>

kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/assets/fonts/icons.svg

-565
This file was deleted.

kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/environment.html

-59
This file was deleted.

kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/icon.min.css

-9
This file was deleted.
Binary file not shown.

kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/index.html

-58
This file was deleted.

kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/jquery-3.6.0.min.js

-2
This file was deleted.

kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/kyuubi.js

-46
This file was deleted.

kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/metrics.html

-60
This file was deleted.

kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/operations.html

-59
This file was deleted.

kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/semantic.min.css

-372
This file was deleted.

kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/semantic.min.js

-11
This file was deleted.

0 commit comments

Comments
 (0)