This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kyuubi.git
The following commit(s) were added to refs/heads/master by this push:
new 591250c8f [KYUUBI #5573] Delete parts of the Kyuubi Web UI that are
not useful
591250c8f is described below
commit 591250c8ff47af8e2a665cc4086cb0fa4c29b609
Author: zwangsheng <[email protected]>
AuthorDate: Tue Oct 31 17:48:30 2023 +0800
[KYUUBI #5573] Delete parts of the Kyuubi Web UI that are not useful
### _Why are the changes needed?_
As title and make Web UI more clean.
And as Contact Us page and Overview page will do refactor later, so remain
these.
### _How was this patch tested?_
- [x] Add some test cases that check the changes thoroughly including
negative and positive cases if possible
- [ ] Add screenshots for manual tests if appropriate
- [ ] [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 #5574 from zwangsheng/KYUUBI#5573.
Closes #5573
462f9f662 [zwangsheng] fix comments
d32101055 [zwangsheng] [KYUUBI #5573][Improvement] Delete parts of the
Kyuubi Web UI that are not useful
Authored-by: zwangsheng <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
---
.../web-ui/src/layout/components/aside/types.ts | 47 ----------------------
kyuubi-server/web-ui/src/router/contact/index.ts | 26 ------------
kyuubi-server/web-ui/src/router/index.ts | 6 ---
kyuubi-server/web-ui/src/router/operation/index.ts | 31 --------------
kyuubi-server/web-ui/src/router/workload/index.ts | 41 -------------------
.../src/views/operation/completedJobs/index.vue | 29 -------------
.../src/views/operation/runningJobs/index.vue | 29 -------------
.../web-ui/src/views/workload/analysis/index.vue | 29 -------------
.../web-ui/src/views/workload/query/index.vue | 29 -------------
.../web-ui/src/views/workload/queue/index.vue | 29 -------------
.../web-ui/src/views/workload/session/index.vue | 29 -------------
11 files changed, 325 deletions(-)
diff --git a/kyuubi-server/web-ui/src/layout/components/aside/types.ts
b/kyuubi-server/web-ui/src/layout/components/aside/types.ts
index a7e495e18..1a6461634 100644
--- a/kyuubi-server/web-ui/src/layout/components/aside/types.ts
+++ b/kyuubi-server/web-ui/src/layout/components/aside/types.ts
@@ -43,58 +43,11 @@ export const MENUS = [
}
]
},
- {
- label: 'Workload',
- icon: 'List',
- children: [
- {
- label: 'Analysis',
- icon: 'VideoPlay',
- router: '/workload/analysis'
- },
- {
- label: 'Queue',
- icon: 'Select',
- router: '/workload/queue'
- },
- {
- label: 'Session',
- icon: 'Select',
- router: '/workload/session'
- },
- {
- label: 'Query',
- icon: 'Select',
- router: '/workload/query'
- }
- ]
- },
- {
- label: 'Operation',
- icon: 'List',
- children: [
- {
- label: 'Running Jobs',
- icon: 'VideoPlay',
- router: '/operation/runningJobs'
- },
- {
- label: 'Completed Jobs',
- icon: 'Select',
- router: '/operation/completedJobs'
- }
- ]
- },
{
label: 'Swagger',
icon: 'List',
router: '/swagger'
},
- {
- label: 'Contact Us',
- icon: 'PhoneFilled',
- router: '/contact'
- },
{
label: 'SQL Lab',
icon: 'Cpu',
diff --git a/kyuubi-server/web-ui/src/router/contact/index.ts
b/kyuubi-server/web-ui/src/router/contact/index.ts
deleted file mode 100644
index a83c653ec..000000000
--- a/kyuubi-server/web-ui/src/router/contact/index.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-const routes = [
- {
- path: '/contact',
- name: 'contact',
- component: () => import('@/views/contact/index.vue')
- }
-]
-
-export default routes
diff --git a/kyuubi-server/web-ui/src/router/index.ts
b/kyuubi-server/web-ui/src/router/index.ts
index c59c5f28c..9df39574f 100644
--- a/kyuubi-server/web-ui/src/router/index.ts
+++ b/kyuubi-server/web-ui/src/router/index.ts
@@ -17,9 +17,6 @@
import { createRouter, createWebHistory } from 'vue-router'
import overviewRoutes from './overview'
-import workloadRoutes from './workload'
-import operationRoutes from './operation'
-import contactRoutes from './contact'
import managementRoutes from './management'
import detailRoutes from './detail'
import swaggerRoutes from './swagger'
@@ -40,12 +37,9 @@ const routes = [
redirect: 'overview',
children: [
...overviewRoutes,
- ...workloadRoutes,
- ...operationRoutes,
...managementRoutes,
...detailRoutes,
...swaggerRoutes,
- ...contactRoutes,
...labRoutes
]
}
diff --git a/kyuubi-server/web-ui/src/router/operation/index.ts
b/kyuubi-server/web-ui/src/router/operation/index.ts
deleted file mode 100644
index 03ba4c285..000000000
--- a/kyuubi-server/web-ui/src/router/operation/index.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-const routes = [
- {
- path: '/operation/runningJobs',
- name: 'operation-runningJobs',
- component: () => import('@/views/operation/runningJobs/index.vue')
- },
- {
- path: '/operation/completedJobs',
- name: 'operation-completedJobs',
- component: () => import('@/views/operation/completedJobs/index.vue')
- }
-]
-
-export default routes
diff --git a/kyuubi-server/web-ui/src/router/workload/index.ts
b/kyuubi-server/web-ui/src/router/workload/index.ts
deleted file mode 100644
index 7d7b91a47..000000000
--- a/kyuubi-server/web-ui/src/router/workload/index.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-const routes = [
- {
- path: '/workload/analysis',
- name: 'workload-analysis',
- component: () => import('@/views/workload/analysis/index.vue')
- },
- {
- path: '/workload/queue',
- name: 'workload-queue',
- component: () => import('@/views/workload/queue/index.vue')
- },
- {
- path: '/workload/session',
- name: 'workload-session',
- component: () => import('@/views/workload/session/index.vue')
- },
- {
- path: '/workload/query',
- name: 'workload-query',
- component: () => import('@/views/workload/query/index.vue')
- }
-]
-
-export default routes
diff --git a/kyuubi-server/web-ui/src/views/operation/completedJobs/index.vue
b/kyuubi-server/web-ui/src/views/operation/completedJobs/index.vue
deleted file mode 100644
index 7b587c4fa..000000000
--- a/kyuubi-server/web-ui/src/views/operation/completedJobs/index.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
--->
-
-<template>
- <main>Completed jobs page</main>
-</template>
-
-<script lang="ts">
- export default {
- name: 'OperationCompletedJobsIndex'
- }
-</script>
-
-<style scoped></style>
diff --git a/kyuubi-server/web-ui/src/views/operation/runningJobs/index.vue
b/kyuubi-server/web-ui/src/views/operation/runningJobs/index.vue
deleted file mode 100644
index 030b48ae9..000000000
--- a/kyuubi-server/web-ui/src/views/operation/runningJobs/index.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
--->
-
-<template>
- <main>Running jobs page</main>
-</template>
-
-<script lang="ts">
- export default {
- name: 'OperationRunningJobsIndex'
- }
-</script>
-
-<style scoped></style>
diff --git a/kyuubi-server/web-ui/src/views/workload/analysis/index.vue
b/kyuubi-server/web-ui/src/views/workload/analysis/index.vue
deleted file mode 100644
index 31b42d46e..000000000
--- a/kyuubi-server/web-ui/src/views/workload/analysis/index.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
--->
-
-<template>
- <main>Analysis page</main>
-</template>
-
-<script lang="ts">
- export default {
- name: 'WorkloadAnalysisIndex'
- }
-</script>
-
-<style scoped></style>
diff --git a/kyuubi-server/web-ui/src/views/workload/query/index.vue
b/kyuubi-server/web-ui/src/views/workload/query/index.vue
deleted file mode 100644
index 45d0cd91b..000000000
--- a/kyuubi-server/web-ui/src/views/workload/query/index.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
--->
-
-<template>
- <main>Query page</main>
-</template>
-
-<script lang="ts">
- export default {
- name: 'WorkloadQueryIndex'
- }
-</script>
-
-<style scoped></style>
diff --git a/kyuubi-server/web-ui/src/views/workload/queue/index.vue
b/kyuubi-server/web-ui/src/views/workload/queue/index.vue
deleted file mode 100644
index bbeb8e985..000000000
--- a/kyuubi-server/web-ui/src/views/workload/queue/index.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
--->
-
-<template>
- <main>Queue page</main>
-</template>
-
-<script lang="ts">
- export default {
- name: 'WorkloadQueueIndex'
- }
-</script>
-
-<style scoped></style>
diff --git a/kyuubi-server/web-ui/src/views/workload/session/index.vue
b/kyuubi-server/web-ui/src/views/workload/session/index.vue
deleted file mode 100644
index bd4ec51d5..000000000
--- a/kyuubi-server/web-ui/src/views/workload/session/index.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
--->
-
-<template>
- <main>Session page</main>
-</template>
-
-<script lang="ts">
- export default {
- name: 'WorkloadSessionIndex'
- }
-</script>
-
-<style scoped></style>
