From 1d81b3d8adce8db9621cbd11154932336c9c6258 Mon Sep 17 00:00:00 2001 From: Shijun Sun <30999793+AllForNothing@users.noreply.github.com> Date: Thu, 3 Aug 2023 14:36:20 +0800 Subject: [PATCH] Update ui for gc history and banner message (#19094) 1. Fixes #19031 2. Fixes #19049 Signed-off-by: AllForNothing --- .../gc-page/gc/gc-history/gc-history.component.scss | 2 +- .../config/system/system-settings.component.html | 2 +- .../config/system/system-settings.component.ts | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc-history/gc-history.component.scss b/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc-history/gc-history.component.scss index 21e83f3d2..8f610b50d 100644 --- a/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc-history/gc-history.component.scss +++ b/src/portal/src/app/base/left-side-nav/clearing-job/gc-page/gc/gc-history/gc-history.component.scss @@ -20,5 +20,5 @@ } .detail { - width: 12rem !important; + min-width: 12rem !important; } diff --git a/src/portal/src/app/base/left-side-nav/config/system/system-settings.component.html b/src/portal/src/app/base/left-side-nav/config/system/system-settings.component.html index fc3b3a862..6cda8e51c 100644 --- a/src/portal/src/app/base/left-side-nav/config/system/system-settings.component.html +++ b/src/portal/src/app/base/left-side-nav/config/system/system-settings.component.html @@ -465,7 +465,7 @@ clrDate type="date" id="to" - min="{{ minDateForEndDay | date : 'yyyy-MM-dd' }}" + min="{{ minDateForEndDay() | date : 'yyyy-MM-dd' }}" autocomplete="off" [(ngModel)]="messageToDate" [disabled]=" diff --git a/src/portal/src/app/base/left-side-nav/config/system/system-settings.component.ts b/src/portal/src/app/base/left-side-nav/config/system/system-settings.component.ts index 3e5621653..fd297af49 100644 --- a/src/portal/src/app/base/left-side-nav/config/system/system-settings.component.ts +++ b/src/portal/src/app/base/left-side-nav/config/system/system-settings.component.ts @@ -51,8 +51,6 @@ export class SystemSettingsComponent implements OnInit, OnDestroy { messageToDateCopy: Date; bannerRefreshSub: Subscription; currentDate: Date = new Date(); - minDateForEndDay: Date; - @ViewChild('systemConfigFrom') systemSettingsForm: NgForm; constructor( @@ -62,9 +60,6 @@ export class SystemSettingsComponent implements OnInit, OnDestroy { private event: EventService ) { this.downloadLink = CURRENT_BASE_HREF + '/systeminfo/getcert'; - this.minDateForEndDay = this.messageFromDate - ? this.messageFromDate - : this.currentDate; } ngOnInit() { @@ -300,4 +295,8 @@ export class SystemSettingsComponent implements OnInit, OnDestroy { translateMessageType(type: string): string { return BannerMessageI18nMap[type] || type; } + + minDateForEndDay(): Date { + return this.messageFromDate ? this.messageFromDate : this.currentDate; + } }