From 26b53ef3433c6c9b6858b226fecce78a5e3e3be2 Mon Sep 17 00:00:00 2001
From: Shijun Sun <30999793+AllForNothing@users.noreply.github.com>
Date: Thu, 3 Aug 2023 17:24:09 +0800
Subject: [PATCH] Show banner message on log in page (#19078)

1. Fixes #19076

Signed-off-by: AllForNothing <sshijun@vmware.com>
---
 .../account/sign-in/sign-in.component.html    |  1 +
 src/portal/src/app/base/base.module.ts        |  2 --
 .../system/system-settings.component.html     |  2 ++
 .../app-level-alerts.component.html           |  0
 .../app-level-alerts.component.scss           |  0
 .../app-level-alerts.component.spec.ts        |  4 +--
 .../app-level-alerts.component.ts             | 30 ++++++++-----------
 src/portal/src/app/shared/shared.module.ts    |  3 ++
 8 files changed, 20 insertions(+), 22 deletions(-)
 rename src/portal/src/app/{base/harbor-shell => shared/components}/app-level-alerts/app-level-alerts.component.html (100%)
 rename src/portal/src/app/{base/harbor-shell => shared/components}/app-level-alerts/app-level-alerts.component.scss (100%)
 rename src/portal/src/app/{base/harbor-shell => shared/components}/app-level-alerts/app-level-alerts.component.spec.ts (94%)
 rename src/portal/src/app/{base/harbor-shell => shared/components}/app-level-alerts/app-level-alerts.component.ts (90%)

diff --git a/src/portal/src/app/account/sign-in/sign-in.component.html b/src/portal/src/app/account/sign-in/sign-in.component.html
index f7cb85aea..eeab0c0af 100644
--- a/src/portal/src/app/account/sign-in/sign-in.component.html
+++ b/src/portal/src/app/account/sign-in/sign-in.component.html
@@ -1,4 +1,5 @@
 <clr-main-container>
+    <app-app-level-alerts></app-app-level-alerts>
     <navigator (showDialogModalAction)="openModal($event)"></navigator>
     <search-result></search-result>
     <div
diff --git a/src/portal/src/app/base/base.module.ts b/src/portal/src/app/base/base.module.ts
index 927774330..6beb77fe6 100644
--- a/src/portal/src/app/base/base.module.ts
+++ b/src/portal/src/app/base/base.module.ts
@@ -22,7 +22,6 @@ import { PasswordSettingComponent } from './password-setting/password-setting.co
 import { AccountSettingsModalComponent } from './account-settings/account-settings-modal.component';
 import { ForgotPasswordComponent } from './password-setting/forgot-password/forgot-password.component';
 import { GlobalConfirmationDialogComponent } from './global-confirmation-dialog/global-confirmation-dialog.component';
-import { AppLevelAlertsComponent } from './harbor-shell/app-level-alerts/app-level-alerts.component';
 
 const routes: Routes = [
     {
@@ -173,7 +172,6 @@ const routes: Routes = [
         AccountSettingsModalComponent,
         ForgotPasswordComponent,
         GlobalConfirmationDialogComponent,
-        AppLevelAlertsComponent,
     ],
 })
 export class BaseModule {}
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 6cda8e51c..485c31ec7 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
@@ -443,6 +443,7 @@
                             min="{{ currentDate | date : 'yyyy-MM-dd' }}"
                             max="{{ messageToDate | date : 'yyyy-MM-dd' }}"
                             clrDate
+                            readonly
                             [(ngModel)]="messageFromDate"
                             [ngModelOptions]="{ standalone: true }"
                             [disabled]="
@@ -463,6 +464,7 @@
                         <input
                             class="date"
                             clrDate
+                            readonly
                             type="date"
                             id="to"
                             min="{{ minDateForEndDay() | date : 'yyyy-MM-dd' }}"
diff --git a/src/portal/src/app/base/harbor-shell/app-level-alerts/app-level-alerts.component.html b/src/portal/src/app/shared/components/app-level-alerts/app-level-alerts.component.html
similarity index 100%
rename from src/portal/src/app/base/harbor-shell/app-level-alerts/app-level-alerts.component.html
rename to src/portal/src/app/shared/components/app-level-alerts/app-level-alerts.component.html
diff --git a/src/portal/src/app/base/harbor-shell/app-level-alerts/app-level-alerts.component.scss b/src/portal/src/app/shared/components/app-level-alerts/app-level-alerts.component.scss
similarity index 100%
rename from src/portal/src/app/base/harbor-shell/app-level-alerts/app-level-alerts.component.scss
rename to src/portal/src/app/shared/components/app-level-alerts/app-level-alerts.component.scss
diff --git a/src/portal/src/app/base/harbor-shell/app-level-alerts/app-level-alerts.component.spec.ts b/src/portal/src/app/shared/components/app-level-alerts/app-level-alerts.component.spec.ts
similarity index 94%
rename from src/portal/src/app/base/harbor-shell/app-level-alerts/app-level-alerts.component.spec.ts
rename to src/portal/src/app/shared/components/app-level-alerts/app-level-alerts.component.spec.ts
index 90c0be3c2..b33d2cbd7 100644
--- a/src/portal/src/app/base/harbor-shell/app-level-alerts/app-level-alerts.component.spec.ts
+++ b/src/portal/src/app/shared/components/app-level-alerts/app-level-alerts.component.spec.ts
@@ -1,10 +1,10 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AppLevelAlertsComponent } from './app-level-alerts.component';
-import { SharedTestingModule } from '../../../shared/shared.module';
+import { SharedTestingModule } from '../../shared.module';
 import { HttpHeaders, HttpResponse } from '@angular/common/http';
 import { of } from 'rxjs';
 import { delay } from 'rxjs/operators';
-import { Scanner } from '../../left-side-nav/interrogation-services/scanner/scanner';
+import { Scanner } from '../../../base/left-side-nav/interrogation-services/scanner/scanner';
 import { ScannerService } from 'ng-swagger-gen/services/scanner.service';
 import { SessionService } from 'src/app/shared/services/session.service';
 import { AppConfigService } from '../../../services/app-config.service';
diff --git a/src/portal/src/app/base/harbor-shell/app-level-alerts/app-level-alerts.component.ts b/src/portal/src/app/shared/components/app-level-alerts/app-level-alerts.component.ts
similarity index 90%
rename from src/portal/src/app/base/harbor-shell/app-level-alerts/app-level-alerts.component.ts
rename to src/portal/src/app/shared/components/app-level-alerts/app-level-alerts.component.ts
index 5d33b23d4..a23f7e0bf 100644
--- a/src/portal/src/app/base/harbor-shell/app-level-alerts/app-level-alerts.component.ts
+++ b/src/portal/src/app/shared/components/app-level-alerts/app-level-alerts.component.ts
@@ -1,24 +1,21 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { SCANNERS_DOC } from '../../left-side-nav/interrogation-services/scanner/scanner';
-import { SessionService } from '../../../shared/services/session.service';
-import { DEFAULT_PAGE_SIZE, delUrlParam } from '../../../shared/units/utils';
+import { SCANNERS_DOC } from '../../../base/left-side-nav/interrogation-services/scanner/scanner';
+import { SessionService } from '../../services/session.service';
+import { DEFAULT_PAGE_SIZE, delUrlParam } from '../../units/utils';
 import { forkJoin, Observable, Subscription } from 'rxjs';
 import { Project } from '../../../../../ng-swagger-gen/models/project';
 import { ScannerService } from '../../../../../ng-swagger-gen/services/scanner.service';
 import { UN_LOGGED_PARAM } from '../../../account/sign-in/sign-in.service';
-import {
-    CommonRoutes,
-    httpStatusCode,
-} from '../../../shared/entities/shared.const';
+import { CommonRoutes, httpStatusCode } from '../../entities/shared.const';
 import { ActivatedRoute, Router } from '@angular/router';
-import { MessageService } from '../../../shared/components/global-message/message.service';
-import { Message } from '../../../shared/components/global-message/message';
-import { JobServiceDashboardHealthCheckService } from '../../left-side-nav/job-service-dashboard/job-service-dashboard-health-check.service';
+import { MessageService } from '../global-message/message.service';
+import { Message } from '../global-message/message';
+import { JobServiceDashboardHealthCheckService } from '../../../base/left-side-nav/job-service-dashboard/job-service-dashboard-health-check.service';
 import { AppConfigService } from '../../../services/app-config.service';
 import {
     BannerMessage,
     BannerMessageType,
-} from '../../left-side-nav/config/config';
+} from '../../../base/left-side-nav/config/config';
 const HAS_SHOWED_SCANNER_INFO: string = 'hasShowScannerInfo';
 const YES: string = 'yes';
 @Component({
@@ -191,13 +188,10 @@ export class AppLevelAlertsComponent implements OnInit, OnDestroy {
     }
 
     hasValidBannerMessage(): boolean {
-        if (
-            this.appConfigService.getConfig()?.banner_message &&
-            this.appConfigService.getConfig()?.current_time
-        ) {
-            const current = new Date(
-                this.appConfigService.getConfig()?.current_time
-            );
+        const current: Date = this.appConfigService.getConfig()?.current_time
+            ? new Date(this.appConfigService.getConfig()?.current_time)
+            : new Date();
+        if (this.appConfigService.getConfig()?.banner_message) {
             const bm = JSON.parse(
                 this.appConfigService.getConfig()?.banner_message
             ) as BannerMessage;
diff --git a/src/portal/src/app/shared/shared.module.ts b/src/portal/src/app/shared/shared.module.ts
index 7211cf184..af4e4a072 100644
--- a/src/portal/src/app/shared/shared.module.ts
+++ b/src/portal/src/app/shared/shared.module.ts
@@ -78,6 +78,7 @@ import { LabelSelectorComponent } from './components/label-selector/label-select
 import { ScrollSectionDirective } from './directives/scroll/scroll-section.directive';
 import { ScrollManagerService } from './directives/scroll/scroll-manager.service';
 import { ScrollAnchorDirective } from './directives/scroll/scroll-anchor.directive';
+import { AppLevelAlertsComponent } from './components/app-level-alerts/app-level-alerts.component';
 
 // ClarityIcons is publicly accessible from the browser's window object.
 declare const ClarityIcons: ClarityIconsApi;
@@ -147,6 +148,7 @@ ClarityIcons.add({
         HarborDatetimePipe,
         RemainingTimeComponent,
         LabelSelectorComponent,
+        AppLevelAlertsComponent,
     ],
     exports: [
         TranslateModule,
@@ -188,6 +190,7 @@ ClarityIcons.add({
         HarborDatetimePipe,
         RemainingTimeComponent,
         LabelSelectorComponent,
+        AppLevelAlertsComponent,
     ],
     providers: [
         { provide: EndpointService, useClass: EndpointDefaultService },