This is an automated email from the ASF dual-hosted git repository.
tcodehuber028 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git
The following commit(s) were added to refs/heads/master by this push:
new f4cc0a5b7 [AMORO-2698] Display more details in the page of
Optimizing->Optimizers (#2699)
f4cc0a5b7 is described below
commit f4cc0a5b7b4a9a0c4a8a86a4826f359ba2184632
Author: tcodehuber <[email protected]>
AuthorDate: Sat Apr 20 22:25:25 2024 +0800
[AMORO-2698] Display more details in the page of Optimizing->Optimizers
(#2699)
* [AMORO-2698] Display more details in the page of Optimizing->Optimizers
* add token
* refactor
---
ams/dashboard/src/language/en.ts | 3 +++
ams/dashboard/src/views/resource/components/List.vue | 10 ++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ams/dashboard/src/language/en.ts b/ams/dashboard/src/language/en.ts
index 2596f0931..790f57525 100644
--- a/ams/dashboard/src/language/en.ts
+++ b/ams/dashboard/src/language/en.ts
@@ -34,6 +34,7 @@ export default {
logout: 'Logout',
logoutModalTitle: 'Log out of the ams?',
order: 'Order',
+ token: 'Token',
cluster: 'Cluster',
database: 'Database | Databases',
table: 'Table | Tables',
@@ -83,6 +84,7 @@ export default {
fileContent: 'File Content',
startTime: 'Start Time',
finishTime: 'Finish Time',
+ touchTime: 'Touch Time',
duration: 'Duration',
optimizeType: 'Optimize Type',
parallelism: 'Parallelism',
@@ -94,6 +96,7 @@ export default {
operationDetails: 'Operation Details',
copy: 'Copy',
optimizer: 'Optimizer',
+ optimizerId: 'Optimizer Id',
optimizers: 'Optimizers',
container: 'Container',
status: 'Status',
diff --git a/ams/dashboard/src/views/resource/components/List.vue
b/ams/dashboard/src/views/resource/components/List.vue
index b9f3418ad..3d068abf0 100644
--- a/ams/dashboard/src/views/resource/components/List.vue
+++ b/ams/dashboard/src/views/resource/components/List.vue
@@ -69,6 +69,7 @@ import { mbToSize } from '@/utils'
import { Modal, message } from 'ant-design-vue-v3'
import { useRouter } from 'vue-router'
import ScaleOut from '@/views/resource/components/ScaleOut.vue'
+import { dateFormat } from '@/utils/index'
const { t } = useI18n()
const router = useRouter()
@@ -96,11 +97,14 @@ const tableColumns = shallowReactive([
{ dataIndex: 'operationGroup', title: t('operation'), key: 'operationGroup',
ellipsis: true, width: 230, scopedSlots: { customRender: 'operationGroup' } }
])
const optimizerColumns = shallowReactive([
- { dataIndex: 'index', title: t('order'), width: 80, ellipsis: true },
+ { dataIndex: 'jobId', title: t('optimizerId'), width: '15%', ellipsis: true
},
+ { dataIndex: 'token', title: t('token'), width: '10%', ellipsis: true },
{ dataIndex: 'groupName', title: t('optimizerGroup'), ellipsis: true },
{ dataIndex: 'container', title: t('container'), ellipsis: true },
{ dataIndex: 'jobStatus', title: t('status'), ellipsis: true },
- { dataIndex: 'resourceAllocation', title: t('resourceAllocation'), width:
'20%', ellipsis: true },
+ { dataIndex: 'resourceAllocation', title: t('resourceAllocation'), width:
'10%', ellipsis: true },
+ { dataIndex: 'startTime', title: t('startTime'), width: 172, ellipsis: true
},
+ { dataIndex: 'touchTime', title: t('touchTime'), width: 172, ellipsis: true
},
{ dataIndex: 'operation', title: t('operation'), key: 'operation', ellipsis:
true, width: 160, scopedSlots: { customRender: 'operationGroup' } }
])
const pagination = reactive(usePagination())
@@ -169,6 +173,8 @@ async function getOptimizersList () {
(list || []).forEach((p: IOptimizeResourceTableItem, index: number) => {
p.resourceAllocation = `${p.coreNumber} ${t('core')}
${mbToSize(p.memory)}`
p.index = (pagination.current - 1) * pagination.pageSize + index + 1
+ p.startTime = p.startTime ? dateFormat(p.startTime) : '-'
+ p.touchTime = p.touchTime ? dateFormat(p.touchTime) : '-'
optimizersList.push(p)
})
} catch (error) {
