From 71fa6e9c13682db20a101005661d9c20d9a093c3 Mon Sep 17 00:00:00 2001 From: AllForNothing Date: Tue, 28 Jul 2020 11:46:06 +0800 Subject: [PATCH] Modify column name for preheat task list UI Signed-off-by: AllForNothing --- .../add-p2p-policy/add-p2p-policy.component.html | 2 +- .../task-list/task-list.component.html | 15 +++++++++++---- .../p2p-provider/task-list/task-list.component.ts | 13 ++++++++++--- src/portal/src/i18n/lang/en-us-lang.json | 4 +++- src/portal/src/i18n/lang/es-es-lang.json | 4 +++- src/portal/src/i18n/lang/fr-fr-lang.json | 4 +++- src/portal/src/i18n/lang/pt-br-lang.json | 4 +++- src/portal/src/i18n/lang/tr-tr-lang.json | 4 +++- src/portal/src/i18n/lang/zh-cn-lang.json | 4 +++- src/portal/src/i18n/lang/zh-tw-lang.json | 4 +++- 10 files changed, 43 insertions(+), 15 deletions(-) diff --git a/src/portal/src/app/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.html b/src/portal/src/app/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.html index def93fd83..eeae34e0b 100644 --- a/src/portal/src/app/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.html +++ b/src/portal/src/app/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.html @@ -110,7 +110,7 @@ diff --git a/src/portal/src/app/project/p2p-provider/task-list/task-list.component.html b/src/portal/src/app/project/p2p-provider/task-list/task-list.component.html index 781cb65c4..020e9c364 100644 --- a/src/portal/src/app/project/p2p-provider/task-list/task-list.component.html +++ b/src/portal/src/app/project/p2p-provider/task-list/task-list.component.html @@ -87,7 +87,9 @@ {{'REPLICATION.TASK_ID'| translate}} {{'P2P_PROVIDER.ID' | translate}} {{'REPLICATION.STATUS' | translate}} - {{'P2P_PROVIDER.EXTRA_ATTRS' | translate}} + {{'P2P_PROVIDER.ARTIFACT' | translate}} + {{'P2P_PROVIDER.DIGEST' | translate}} + {{'P2P_PROVIDER.TYPE' | translate}} {{'REPLICATION.CREATION_TIME' | translate}} {{'REPLICATION.DURATION' | translate}} {{'REPLICATION.LOGS' | translate}} @@ -104,10 +106,15 @@ - {{t.extra_attrs?.artifact}},  - {{t.extra_attrs?.digest}},  - {{t.extra_attrs?.kind}} + {{t.extra_attrs?.artifact}} + + {{t.extra_attrs?.digest}} + + + {{t.extra_attrs?.kind}} + + {{t.start_time | date: 'short'}} {{getDuration(t)}} diff --git a/src/portal/src/app/project/p2p-provider/task-list/task-list.component.ts b/src/portal/src/app/project/p2p-provider/task-list/task-list.component.ts index f5dca3a24..36cfbcce7 100644 --- a/src/portal/src/app/project/p2p-provider/task-list/task-list.component.ts +++ b/src/portal/src/app/project/p2p-provider/task-list/task-list.component.ts @@ -36,6 +36,7 @@ export class TaskListComponent implements OnInit, OnDestroy { hasUpdatePermission: boolean = false; btnState: ClrLoadingState = ClrLoadingState.DEFAULT; timeout: any; + timeoutForTaskList: any; constructor( private translate: TranslateService, private router: Router, @@ -65,6 +66,10 @@ export class TaskListComponent implements OnInit, OnDestroy { clearTimeout(this.timeout); this.timeout = null; } + if (this.timeoutForTaskList) { + clearTimeout(this.timeoutForTaskList); + this.timeoutForTaskList = null; + } } getPermissions() { const permissionsList: Observable[] = []; @@ -191,9 +196,11 @@ export class TaskListComponent implements OnInit, OnDestroy { this.totalCount = this.tasks.length; for (let i = 0; i < this.tasks.length; i++) { if (this.p2pProviderService.willChangStatus(this.tasks[i].status)) { - setTimeout(() => { - this.clrLoadTasks(false); - }, TIME_OUT); + if (!this.timeoutForTaskList) { + this.timeoutForTaskList = setTimeout(() => { + this.clrLoadTasks(false); + }, TIME_OUT); + } } } } diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json index 9b0b6474e..c0a08ef5d 100644 --- a/src/portal/src/i18n/lang/en-us-lang.json +++ b/src/portal/src/i18n/lang/en-us-lang.json @@ -1536,7 +1536,9 @@ "PROVIDER_TYPE": "Vendor", "ID": "Execution ID", "NO_PROVIDER": "Please add a provider first", - "EXTRA_ATTRS": "Artifact, Digest and Kind", + "ARTIFACT": "Artifact", + "DIGEST": "Digest", + "TYPE": "Type", "TASKS": "Tasks", "TASKS_PLACEHOLDER": "We couldn't find any task", "SEVERITY_WARNING": "Vulnerability settings here conflicts with the relevant project configuration that will override the settings here", diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json index 58461e94d..b353c058d 100644 --- a/src/portal/src/i18n/lang/es-es-lang.json +++ b/src/portal/src/i18n/lang/es-es-lang.json @@ -1534,7 +1534,9 @@ "PROVIDER_TYPE": "Vendor", "ID": "Execution ID", "NO_PROVIDER": "Please add a provider first", - "EXTRA_ATTRS": "Artifact, Digest and Kind", + "ARTIFACT": "Artifact", + "DIGEST": "Digest", + "TYPE": "Type", "TASKS": "Tasks", "TASKS_PLACEHOLDER": "We couldn't find any task", "SEVERITY_WARNING": "Vulnerability settings here conflicts with the relevant project configuration that will override the settings here", diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json index 77b21ecfb..62247f4bb 100644 --- a/src/portal/src/i18n/lang/fr-fr-lang.json +++ b/src/portal/src/i18n/lang/fr-fr-lang.json @@ -1504,7 +1504,9 @@ "PROVIDER_TYPE": "Vendor", "ID": "Execution ID", "NO_PROVIDER": "Please add a provider first", - "EXTRA_ATTRS": "Artifact, Digest and Kind", + "ARTIFACT": "Artifact", + "DIGEST": "Digest", + "TYPE": "Type", "TASKS": "Tasks", "TASKS_PLACEHOLDER": "We couldn't find any task", "SEVERITY_WARNING": "Vulnerability settings here conflicts with the relevant project configuration that will override the settings here", diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json index 9ff427c88..55f0a8732 100644 --- a/src/portal/src/i18n/lang/pt-br-lang.json +++ b/src/portal/src/i18n/lang/pt-br-lang.json @@ -1532,7 +1532,9 @@ "PROVIDER_TYPE": "Vendor", "ID": "Execution ID", "NO_PROVIDER": "Please add a provider first", - "EXTRA_ATTRS": "Artifact, Digest and Kind", + "ARTIFACT": "Artifact", + "DIGEST": "Digest", + "TYPE": "Type", "TASKS": "Tasks", "TASKS_PLACEHOLDER": "We couldn't find any task", "SEVERITY_WARNING": "Vulnerability settings here conflicts with the relevant project configuration that will override the settings here", diff --git a/src/portal/src/i18n/lang/tr-tr-lang.json b/src/portal/src/i18n/lang/tr-tr-lang.json index f311aea9c..7ee8569c6 100644 --- a/src/portal/src/i18n/lang/tr-tr-lang.json +++ b/src/portal/src/i18n/lang/tr-tr-lang.json @@ -1536,7 +1536,9 @@ "PROVIDER_TYPE": "Vendor", "ID": "Execution ID", "NO_PROVIDER": "Please add a provider first", - "EXTRA_ATTRS": "Artifact, Digest and Kind", + "ARTIFACT": "Artifact", + "DIGEST": "Digest", + "TYPE": "Type", "TASKS": "Tasks", "TASKS_PLACEHOLDER": "We couldn't find any task", "SEVERITY_WARNING": "Vulnerability settings here conflicts with the relevant project configuration that will override the settings here", diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json index d007b294d..892995a92 100644 --- a/src/portal/src/i18n/lang/zh-cn-lang.json +++ b/src/portal/src/i18n/lang/zh-cn-lang.json @@ -1533,7 +1533,9 @@ "PROVIDER_TYPE": "发起方", "ID": "执行 ID", "NO_PROVIDER": "请先添加提供商", - "EXTRA_ATTRS": "Artifact, 摘要和类型", + "ARTIFACT": "Artifact", + "DIGEST": "摘要", + "TYPE": "类型", "TASKS": "任务", "TASKS_PLACEHOLDER": "暂无记录", "SEVERITY_WARNING": "此处漏洞等级设置与项目设置冲突且将会被项目设置覆盖", diff --git a/src/portal/src/i18n/lang/zh-tw-lang.json b/src/portal/src/i18n/lang/zh-tw-lang.json index dde2f74e8..c31a18ed6 100644 --- a/src/portal/src/i18n/lang/zh-tw-lang.json +++ b/src/portal/src/i18n/lang/zh-tw-lang.json @@ -1520,7 +1520,9 @@ "PROVIDER_TYPE": "Vendor", "ID": "Execution ID", "NO_PROVIDER": "Please add a provider first", - "EXTRA_ATTRS": "Artifact, Digest and Kind", + "ARTIFACT": "Artifact", + "DIGEST": "Digest", + "TYPE": "Type", "TASKS": "Tasks", "TASKS_PLACEHOLDER": "We couldn't find any task", "SEVERITY_WARNING": "Vulnerability settings here conflicts with the relevant project configuration that will override the settings here",