From 893cb0a655a6ee561db807572cc9e866d8220dfd Mon Sep 17 00:00:00 2001 From: Shijun Sun <30999793+AllForNothing@users.noreply.github.com> Date: Tue, 9 Aug 2022 12:14:53 +0800 Subject: [PATCH] Fix ui issues found in testing-day-round-2 (#17357) Signed-off-by: AllForNothing --- .../history/purge-history.component.ts | 12 ++++++++---- .../audit-log-purge/set-job/set-job.component.html | 4 ++-- .../audit-log-purge/set-job/set-job.component.scss | 5 +++++ .../gc-page/gc/gc-history/gc-history.component.ts | 12 ++++++++---- .../clearing-job/gc-page/gc/gc.component.html | 4 ++-- .../clearing-job/gc-page/gc/gc.component.scss | 5 +++++ .../project-detail/project-detail.component.html | 2 +- src/portal/src/i18n/lang/de-de-lang.json | 3 ++- src/portal/src/i18n/lang/en-us-lang.json | 3 ++- src/portal/src/i18n/lang/es-es-lang.json | 3 ++- src/portal/src/i18n/lang/fr-fr-lang.json | 3 ++- src/portal/src/i18n/lang/pt-br-lang.json | 3 ++- src/portal/src/i18n/lang/tr-tr-lang.json | 3 ++- src/portal/src/i18n/lang/zh-cn-lang.json | 3 ++- src/portal/src/i18n/lang/zh-tw-lang.json | 3 ++- 15 files changed, 47 insertions(+), 21 deletions(-) diff --git a/src/portal/src/app/base/left-side-nav/clearing-job/audit-log-purge/history/purge-history.component.ts b/src/portal/src/app/base/left-side-nav/clearing-job/audit-log-purge/history/purge-history.component.ts index 380f81f8d..83673d281 100644 --- a/src/portal/src/app/base/left-side-nav/clearing-job/audit-log-purge/history/purge-history.component.ts +++ b/src/portal/src/app/base/left-side-nav/clearing-job/audit-log-purge/history/purge-history.component.ts @@ -5,7 +5,6 @@ import { ConfirmationButtons, ConfirmationState, ConfirmationTargets, - REFRESH_TIME_DIFFERENCE, } from 'src/app/shared/entities/shared.const'; import { ErrorHandler } from 'src/app/shared/units/error-handler/error-handler'; import { @@ -16,7 +15,12 @@ import { setPageSizeToLocalStorage, } from 'src/app/shared/units/utils'; import { PurgeService } from '../../../../../../../ng-swagger-gen/services/purge.service'; -import { JOB_STATUS, NO, YES } from '../../clearing-job-interfact'; +import { + JOB_STATUS, + NO, + REFRESH_STATUS_TIME_DIFFERENCE, + YES, +} from '../../clearing-job-interfact'; import { ConfirmationMessage } from '../../../../global-confirmation-dialog/confirmation-message'; import { ConfirmationDialogService } from '../../../../global-confirmation-dialog/confirmation-dialog.service'; import { ExecHistory } from '../../../../../../../ng-swagger-gen/models/exec-history'; @@ -159,8 +163,8 @@ export class PurgeHistoryComponent implements OnInit, OnDestroy { // to avoid some jobs not finished. if (!this.timerDelay) { this.timerDelay = timer( - REFRESH_TIME_DIFFERENCE, - REFRESH_TIME_DIFFERENCE + REFRESH_STATUS_TIME_DIFFERENCE, + REFRESH_STATUS_TIME_DIFFERENCE ).subscribe(() => { let count: number = 0; this.jobs.forEach(job => { diff --git a/src/portal/src/app/base/left-side-nav/clearing-job/audit-log-purge/set-job/set-job.component.html b/src/portal/src/app/base/left-side-nav/clearing-job/audit-log-purge/set-job/set-job.component.html index e859e9233..36ef23ac9 100644 --- a/src/portal/src/app/base/left-side-nav/clearing-job/audit-log-purge/set-job/set-job.component.html +++ b/src/portal/src/app/base/left-side-nav/clearing-job/audit-log-purge/set-job/set-job.component.html @@ -8,7 +8,7 @@
-
+
{{ 'CLEARANCES.LAST_COMPLETED' | translate }} @@ -31,7 +31,7 @@
-
+
{{ 'CLEARANCES.NEXT_SCHEDULED_TIME' | translate }} diff --git a/src/portal/src/app/base/left-side-nav/clearing-job/audit-log-purge/set-job/set-job.component.scss b/src/portal/src/app/base/left-side-nav/clearing-job/audit-log-purge/set-job/set-job.component.scss index 3d34d8cf1..f517614fd 100644 --- a/src/portal/src/app/base/left-side-nav/clearing-job/audit-log-purge/set-job/set-job.component.scss +++ b/src/portal/src/app/base/left-side-nav/clearing-job/audit-log-purge/set-job/set-job.component.scss @@ -46,3 +46,8 @@ .pt { padding-right: 1rem; } + +.p-06 { + padding-left: .6rem; + padding-right: .6rem; +} diff --git a/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc-history/gc-history.component.ts b/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc-history/gc-history.component.ts index 47bb9a65b..1bef783ff 100644 --- a/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc-history/gc-history.component.ts +++ b/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc-history/gc-history.component.ts @@ -5,7 +5,6 @@ import { ConfirmationButtons, ConfirmationState, ConfirmationTargets, - REFRESH_TIME_DIFFERENCE, } from '../../../../../../shared/entities/shared.const'; import { GcService } from '../../../../../../../../ng-swagger-gen/services/gc.service'; import { @@ -18,7 +17,12 @@ import { import { ClrDatagridStateInterface } from '@clr/angular'; import { finalize } from 'rxjs/operators'; import { GCHistory } from '../../../../../../../../ng-swagger-gen/models/gchistory'; -import { JOB_STATUS, NO, YES } from '../../../clearing-job-interfact'; +import { + JOB_STATUS, + NO, + REFRESH_STATUS_TIME_DIFFERENCE, + YES, +} from '../../../clearing-job-interfact'; import { ConfirmationMessage } from '../../../../../global-confirmation-dialog/confirmation-message'; import { ConfirmationDialogService } from '../../../../../global-confirmation-dialog/confirmation-dialog.service'; @@ -161,8 +165,8 @@ export class GcHistoryComponent implements OnInit, OnDestroy { // to avoid some jobs not finished. if (!this.timerDelay) { this.timerDelay = timer( - REFRESH_TIME_DIFFERENCE, - REFRESH_TIME_DIFFERENCE + REFRESH_STATUS_TIME_DIFFERENCE, + REFRESH_STATUS_TIME_DIFFERENCE ).subscribe(() => { let count: number = 0; this.jobs.forEach(job => { diff --git a/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc.component.html b/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc.component.html index 80ab32fb3..02ebfcdb6 100644 --- a/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc.component.html +++ b/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc.component.html @@ -8,7 +8,7 @@
-
+
{{ 'CLEARANCES.LAST_COMPLETED' | translate }} @@ -31,7 +31,7 @@
-
+
{{ 'CLEARANCES.NEXT_SCHEDULED_TIME' | translate }} diff --git a/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc.component.scss b/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc.component.scss index 4cabab856..88f4a102b 100644 --- a/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc.component.scss +++ b/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc.component.scss @@ -30,3 +30,8 @@ justify-content: center; align-items: center; } + +.p-06 { + padding-left: .6rem; + padding-right: .6rem; +} diff --git a/src/portal/src/app/base/project/project-detail/project-detail.component.html b/src/portal/src/app/base/project/project-detail/project-detail.component.html index e33d943e4..7c6fa0dc8 100644 --- a/src/portal/src/app/base/project/project-detail/project-detail.component.html +++ b/src/portal/src/app/base/project/project-detail/project-detail.component.html @@ -49,7 +49,7 @@
- {{ 'STATISTICS.STORAGE_USED' | translate }} + {{ 'QUOTA.QUOTA_USED' | translate }}
diff --git a/src/portal/src/i18n/lang/de-de-lang.json b/src/portal/src/i18n/lang/de-de-lang.json index 0c68e278f..706a644a6 100644 --- a/src/portal/src/i18n/lang/de-de-lang.json +++ b/src/portal/src/i18n/lang/de-de-lang.json @@ -1184,7 +1184,8 @@ "UNLIMITED": "unlimitiert", "INVALID_INPUT": "ungültige Eingabe", "PLACEHOLDER": "Es konnten keine Begrenzungen gefunden werden", - "FILTER_PLACEHOLDER": "Suche nach Name (genaue Übereinstimmung)" + "FILTER_PLACEHOLDER": "Suche nach Name (genaue Übereinstimmung)", + "QUOTA_USED": "Quota used" }, "WEEKLY": { "MONDAY": "Montag", diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json index ea4137745..d2d3604ad 100644 --- a/src/portal/src/i18n/lang/en-us-lang.json +++ b/src/portal/src/i18n/lang/en-us-lang.json @@ -1184,7 +1184,8 @@ "UNLIMITED": "unlimited", "INVALID_INPUT": "invalid input", "PLACEHOLDER": "We couldn't find any project quotas", - "FILTER_PLACEHOLDER": "Search by name(exact match)" + "FILTER_PLACEHOLDER": "Search by name(exact match)", + "QUOTA_USED": "Quota used" }, "WEEKLY": { "MONDAY": "Monday", diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json index 8b83fdafd..f99edeb12 100644 --- a/src/portal/src/i18n/lang/es-es-lang.json +++ b/src/portal/src/i18n/lang/es-es-lang.json @@ -1186,7 +1186,8 @@ "UNLIMITED": "unlimited", "INVALID_INPUT": "invalid input", "PLACEHOLDER": "We couldn't find any project quotas", - "FILTER_PLACEHOLDER": "Search by name(exact match)" + "FILTER_PLACEHOLDER": "Search by name(exact match)", + "QUOTA_USED": "Quota used" }, "WEEKLY": { "MONDAY": "Monday", diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json index 513fbdfb9..ba86bd1f2 100644 --- a/src/portal/src/i18n/lang/fr-fr-lang.json +++ b/src/portal/src/i18n/lang/fr-fr-lang.json @@ -1158,7 +1158,8 @@ "UNLIMITED": "Illimité", "INVALID_INPUT": "Saisie non valide", "PLACEHOLDER": "Nous n'avons trouvé aucun quota de projet !", - "FILTER_PLACEHOLDER": "Chercher par nom (correspondance exacte)" + "FILTER_PLACEHOLDER": "Chercher par nom (correspondance exacte)", + "QUOTA_USED": "Quota used" }, "WEEKLY": { "MONDAY": "Lundi", diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json index 1e9f2cd45..41b6933aa 100644 --- a/src/portal/src/i18n/lang/pt-br-lang.json +++ b/src/portal/src/i18n/lang/pt-br-lang.json @@ -1177,7 +1177,8 @@ "UNLIMITED": "∞", "INVALID_INPUT": "valor inválido", "PLACEHOLDER": "Nenhuma limite encontrado nos projetos", - "FILTER_PLACEHOLDER": "Buscar pelo nome (exato)" + "FILTER_PLACEHOLDER": "Buscar pelo nome (exato)", + "QUOTA_USED": "Quota used" }, "WEEKLY": { "MONDAY": "Segunda Feira", diff --git a/src/portal/src/i18n/lang/tr-tr-lang.json b/src/portal/src/i18n/lang/tr-tr-lang.json index 6047f00f9..ce62c9e6a 100644 --- a/src/portal/src/i18n/lang/tr-tr-lang.json +++ b/src/portal/src/i18n/lang/tr-tr-lang.json @@ -1184,7 +1184,8 @@ "UNLIMITED": "sınırsız", "INVALID_INPUT": "geçersiz giriş", "PLACEHOLDER": "We couldn't find any project quotas", - "FILTER_PLACEHOLDER": "Search by name(exact match)" + "FILTER_PLACEHOLDER": "Search by name(exact match)", + "QUOTA_USED": "Quota used" }, "WEEKLY": { "MONDAY": "Pazartesi", diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json index c03830d1e..abe6db26c 100644 --- a/src/portal/src/i18n/lang/zh-cn-lang.json +++ b/src/portal/src/i18n/lang/zh-cn-lang.json @@ -1185,7 +1185,8 @@ "UNLIMITED": "不设限", "INVALID_INPUT": "输入错误", "PLACEHOLDER": "我们找不到任何可以配置定额的项目", - "FILTER_PLACEHOLDER": "按名称查找（完全匹配）" + "FILTER_PLACEHOLDER": "按名称查找（完全匹配）", + "QUOTA_USED": "已使用的配额" }, "WEEKLY": { "MONDAY": "周一", diff --git a/src/portal/src/i18n/lang/zh-tw-lang.json b/src/portal/src/i18n/lang/zh-tw-lang.json index 2afdc4202..2899ebd85 100644 --- a/src/portal/src/i18n/lang/zh-tw-lang.json +++ b/src/portal/src/i18n/lang/zh-tw-lang.json @@ -1180,7 +1180,8 @@ "UNLIMITED": "不設限", "INVALID_INPUT": "輸入錯誤", "PLACEHOLDER": "我們找不到任何可以配置定額的項目", - "FILTER_PLACEHOLDER": "Search by name(exact match)" + "FILTER_PLACEHOLDER": "Search by name(exact match)", + "QUOTA_USED": "Quota used" }, "WEEKLY":{ "MONDAY": "週一",