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 4762edc62 [KYUUBI #4757][UI] Move Statistics to Management Menu
4762edc62 is described below
commit 4762edc6228f0e1a405f4e0d6b4beaca7d4c63e1
Author: zwangsheng <[email protected]>
AuthorDate: Thu Apr 27 20:33:43 2023 +0800
[KYUUBI #4757][UI] Move Statistics to Management Menu
### _Why are the changes needed?_
Close #4757
### _How was this patch tested?_
- [ ] 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/develop_tools/testing.html#running-tests)
locally before make a pull request
Closes #4758 from zwangsheng/KYUUBI_4757.
Closes #4757
2daa5fc84 [zwangsheng] fix comments
b1d5177ce [zwangsheng] [KYUUBI #4757][UI] Move Statistics to Management Menu
Authored-by: zwangsheng <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
---
kyuubi-server/web-ui/src/router/engine/index.ts | 26 ---------------
kyuubi-server/web-ui/src/router/index.ts | 8 ++---
.../src/router/{server => management}/index.ts | 21 ++++++++++--
kyuubi-server/web-ui/src/router/operation/index.ts | 5 ---
kyuubi-server/web-ui/src/router/session/index.ts | 26 ---------------
.../src/views/layout/components/aside/types.ts | 39 ++++++++--------------
.../src/views/{ => management}/engine/index.vue | 0
.../operation}/index.vue | 0
.../server}/index.vue | 0
.../session}/index.vue | 0
10 files changed, 33 insertions(+), 92 deletions(-)
diff --git a/kyuubi-server/web-ui/src/router/engine/index.ts
b/kyuubi-server/web-ui/src/router/engine/index.ts
deleted file mode 100644
index 22b056a32..000000000
--- a/kyuubi-server/web-ui/src/router/engine/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: '/engine/engine-statistics',
- name: 'engine-statistics',
- component: () => import('@/views/engine/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 ce9960ba6..cad831705 100644
--- a/kyuubi-server/web-ui/src/router/index.ts
+++ b/kyuubi-server/web-ui/src/router/index.ts
@@ -20,9 +20,7 @@ import overviewRoutes from './overview'
import workloadRoutes from './workload'
import operationRoutes from './operation'
import contactRoutes from './contact'
-import sessionRoutes from './session'
-import engineRoutes from './engine'
-import serverRoutes from './server'
+import managementRoutes from './management'
const routes = [
{
@@ -39,11 +37,9 @@ const routes = [
redirect: 'overview',
children: [
...overviewRoutes,
- ...sessionRoutes,
...workloadRoutes,
...operationRoutes,
- ...engineRoutes,
- ...serverRoutes,
+ ...managementRoutes,
...contactRoutes
]
}
diff --git a/kyuubi-server/web-ui/src/router/server/index.ts
b/kyuubi-server/web-ui/src/router/management/index.ts
similarity index 62%
rename from kyuubi-server/web-ui/src/router/server/index.ts
rename to kyuubi-server/web-ui/src/router/management/index.ts
index c06240485..a87ff6052 100644
--- a/kyuubi-server/web-ui/src/router/server/index.ts
+++ b/kyuubi-server/web-ui/src/router/management/index.ts
@@ -17,9 +17,24 @@
const router = [
{
- path: '/server/server-statistics',
- name: 'server-statistics',
- component: () => import('@/views/server/server-statistics/index.vue')
+ path: '/management/engine',
+ name: 'engine',
+ component: () => import('@/views/management/engine/index.vue')
+ },
+ {
+ path: '/management/server',
+ name: 'server',
+ component: () => import('@/views/management/server/index.vue')
+ },
+ {
+ path: '/management/session',
+ name: 'session',
+ component: () => import('@/views/management/session/index.vue')
+ },
+ {
+ path: '/management/operation',
+ name: 'operation',
+ component: () => import('@/views/management/operation/index.vue')
}
]
diff --git a/kyuubi-server/web-ui/src/router/operation/index.ts
b/kyuubi-server/web-ui/src/router/operation/index.ts
index 8d6dfbd91..03ba4c285 100644
--- a/kyuubi-server/web-ui/src/router/operation/index.ts
+++ b/kyuubi-server/web-ui/src/router/operation/index.ts
@@ -25,11 +25,6 @@ const routes = [
path: '/operation/completedJobs',
name: 'operation-completedJobs',
component: () => import('@/views/operation/completedJobs/index.vue')
- },
- {
- path: '/operation/operation-statistics',
- name: 'operation-statistics',
- component: () => import('@/views/operation/operation-statistics/index.vue')
}
]
diff --git a/kyuubi-server/web-ui/src/router/session/index.ts
b/kyuubi-server/web-ui/src/router/session/index.ts
deleted file mode 100644
index fca49f211..000000000
--- a/kyuubi-server/web-ui/src/router/session/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: '/session/session-statistics',
- name: 'session-statistics',
- component: () => import('@/views/session/session-statistics/index.vue')
- }
-]
-
-export default routes
diff --git a/kyuubi-server/web-ui/src/views/layout/components/aside/types.ts
b/kyuubi-server/web-ui/src/views/layout/components/aside/types.ts
index 46ea825a9..697ee40cf 100644
--- a/kyuubi-server/web-ui/src/views/layout/components/aside/types.ts
+++ b/kyuubi-server/web-ui/src/views/layout/components/aside/types.ts
@@ -22,32 +22,24 @@ export const MENUS = [
router: '/overview'
},
{
- label: 'Session Management',
+ label: 'Management',
icon: 'List',
children: [
{
- label: 'Session Statistics',
- router: '/session/session-statistics'
- }
- ]
- },
- {
- label: 'Engine Management',
- icon: 'List',
- children: [
+ label: 'Session',
+ router: '/management/session'
+ },
{
- label: 'Engine Statistics',
- router: '/engine/engine-statistics'
- }
- ]
- },
- {
- label: 'Server Management',
- icon: 'List',
- children: [
+ label: 'Operation',
+ router: '/management/operation'
+ },
{
- label: 'Server Statistics',
- router: '/server/server-statistics'
+ label: 'Engine',
+ router: '/management/engine'
+ },
+ {
+ label: 'Server',
+ router: '/management/server'
}
]
},
@@ -81,11 +73,6 @@ export const MENUS = [
label: 'Operation',
icon: 'List',
children: [
- {
- label: 'Operation Statistics',
- icon: 'VideoPlay',
- router: '/operation/operation-statistics'
- },
{
label: 'Running Jobs',
icon: 'VideoPlay',
diff --git a/kyuubi-server/web-ui/src/views/engine/index.vue
b/kyuubi-server/web-ui/src/views/management/engine/index.vue
similarity index 100%
rename from kyuubi-server/web-ui/src/views/engine/index.vue
rename to kyuubi-server/web-ui/src/views/management/engine/index.vue
diff --git
a/kyuubi-server/web-ui/src/views/operation/operation-statistics/index.vue
b/kyuubi-server/web-ui/src/views/management/operation/index.vue
similarity index 100%
rename from
kyuubi-server/web-ui/src/views/operation/operation-statistics/index.vue
rename to kyuubi-server/web-ui/src/views/management/operation/index.vue
diff --git a/kyuubi-server/web-ui/src/views/server/server-statistics/index.vue
b/kyuubi-server/web-ui/src/views/management/server/index.vue
similarity index 100%
rename from kyuubi-server/web-ui/src/views/server/server-statistics/index.vue
rename to kyuubi-server/web-ui/src/views/management/server/index.vue
diff --git
a/kyuubi-server/web-ui/src/views/session/session-statistics/index.vue
b/kyuubi-server/web-ui/src/views/management/session/index.vue
similarity index 100%
rename from kyuubi-server/web-ui/src/views/session/session-statistics/index.vue
rename to kyuubi-server/web-ui/src/views/management/session/index.vue
