From b3ef639caf525992354684f8b353f5757c390159 Mon Sep 17 00:00:00 2001 From: Steven Zou Date: Tue, 28 Mar 2017 15:18:51 +0800 Subject: [PATCH 1/2] control the button status based on app config --- src/ui_ng/src/app/user/user.component.html | 2 +- src/ui_ng/src/app/user/user.component.ts | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/ui_ng/src/app/user/user.component.html b/src/ui_ng/src/app/user/user.component.html index 48c1987d1..fd71f7f1f 100644 --- a/src/ui_ng/src/app/user/user.component.html +++ b/src/ui_ng/src/app/user/user.component.html @@ -2,7 +2,7 @@

{{'SIDE_NAV.SYSTEM_MGMT.USER' | translate}}

- + diff --git a/src/ui_ng/src/app/user/user.component.ts b/src/ui_ng/src/app/user/user.component.ts index 471307608..ffafc8a7d 100644 --- a/src/ui_ng/src/app/user/user.component.ts +++ b/src/ui_ng/src/app/user/user.component.ts @@ -12,6 +12,7 @@ import { ConfirmationState, ConfirmationTargets } from '../shared/shared.const' import { MessageHandlerService } from '../shared/message-handler/message-handler.service'; import { SessionService } from '../shared/session.service'; +import { AppConfigService } from '../app-config.service'; @Component({ selector: 'harbor-user', @@ -37,7 +38,8 @@ export class UserComponent implements OnInit, OnDestroy { private translate: TranslateService, private deletionDialogService: ConfirmationDialogService, private msgHandler: MessageHandlerService, - private session: SessionService) { + private session: SessionService, + private appConfigService: AppConfigService) { this.deletionSubscription = deletionDialogService.confirmationConfirm$.subscribe(confirmed => { if (confirmed && confirmed.source === ConfirmationTargets.USER && @@ -62,6 +64,15 @@ export class UserComponent implements OnInit, OnDestroy { return testedItem.indexOf(terms) != -1; } + public get canCreateUser(): boolean { + let appConfig = this.appConfigService.getConfig(); + if (appConfig) { + return appConfig.auth_mode != 'ldap_auth'; + } else { + return true; + } + } + isSystemAdmin(u: User): string { if (!u) { return "{{MISS}}"; From cd3343226450d19c7035fb6454942defcc10182f Mon Sep 17 00:00:00 2001 From: Steven Zou Date: Tue, 28 Mar 2017 18:37:03 +0800 Subject: [PATCH 2/2] fix issue 1795 --- .../account-settings-modal.component.html | 2 +- .../account-settings-modal.component.ts | 10 +++------- .../password/password-setting.component.html | 2 +- .../app/account/sign-up/sign-up.component.html | 2 +- src/ui_ng/src/app/app-config.ts | 2 ++ .../about-dialog/about-dialog.component.html | 2 -- .../shared/about-dialog/about-dialog.component.ts | 14 +++++++++++--- .../inline-alert/inline-alert.component.css | 4 ++++ .../inline-alert/inline-alert.component.html | 3 ++- .../shared/inline-alert/inline-alert.component.ts | 15 ++++++++++++--- .../statictics/statistics-panel.component.html | 4 ++-- .../statictics/statistics-panel.component.ts | 5 ++++- .../shared/statictics/statistics.component.css | 5 +++-- .../src/app/user/new-user-modal.component.html | 2 +- 14 files changed, 47 insertions(+), 25 deletions(-) create mode 100644 src/ui_ng/src/app/shared/inline-alert/inline-alert.component.css diff --git a/src/ui_ng/src/app/account/account-settings/account-settings-modal.component.html b/src/ui_ng/src/app/account/account-settings/account-settings-modal.component.html index 556a1bc59..820b6a792 100644 --- a/src/ui_ng/src/app/account/account-settings/account-settings-modal.component.html +++ b/src/ui_ng/src/app/account/account-settings/account-settings-modal.component.html @@ -1,4 +1,4 @@ - +

{{'PROFILE.TITLE' | translate}}

diff --git a/src/ui_ng/src/app/account/account-settings/account-settings-modal.component.ts b/src/ui_ng/src/app/account/account-settings/account-settings-modal.component.ts index fac1bd8b1..24834916c 100644 --- a/src/ui_ng/src/app/account/account-settings/account-settings-modal.component.ts +++ b/src/ui_ng/src/app/account/account-settings/account-settings-modal.component.ts @@ -97,12 +97,8 @@ export class AccountSettingsModalComponent implements OnInit, AfterViewChecked { } for (var prop in this.originalStaticData) { - if (this.originalStaticData[prop]) { - if (this.account[prop]) { - if (this.originalStaticData[prop] != this.account[prop]) { - return true; - } - } + if (this.originalStaticData[prop] != this.account[prop]) { + return true; } } @@ -188,7 +184,7 @@ export class AccountSettingsModalComponent implements OnInit, AfterViewChecked { if (this.msgHandler.isAppLevel(error)) { this.opened = false; this.msgHandler.handleError(error); - }else{ + } else { this.inlineAlert.showInlineError(error); } }); diff --git a/src/ui_ng/src/app/account/password/password-setting.component.html b/src/ui_ng/src/app/account/password/password-setting.component.html index 0ecc01d30..1057922b1 100644 --- a/src/ui_ng/src/app/account/password/password-setting.component.html +++ b/src/ui_ng/src/app/account/password/password-setting.component.html @@ -1,4 +1,4 @@ - +

{{'CHANGE_PWD.TITLE' | translate}}

diff --git a/src/ui_ng/src/app/account/sign-up/sign-up.component.html b/src/ui_ng/src/app/account/sign-up/sign-up.component.html index 54a5dd4ac..c467fd45b 100644 --- a/src/ui_ng/src/app/account/sign-up/sign-up.component.html +++ b/src/ui_ng/src/app/account/sign-up/sign-up.component.html @@ -1,4 +1,4 @@ - +

{{'SIGN_UP.TITLE' | translate}}

diff --git a/src/ui_ng/src/app/app-config.ts b/src/ui_ng/src/app/app-config.ts index 5715716a6..4b269c62a 100644 --- a/src/ui_ng/src/app/app-config.ts +++ b/src/ui_ng/src/app/app-config.ts @@ -9,6 +9,7 @@ export class AppConfig { this.project_creation_restriction = "everyone"; this.self_registration = true; this.has_ca_root = false; + this.harbor_version = "0.5.0";//default } with_notary: boolean; @@ -19,4 +20,5 @@ export class AppConfig { project_creation_restriction: string; self_registration: boolean; has_ca_root: boolean; + harbor_version: string; } \ No newline at end of file diff --git a/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.html b/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.html index d194e5bca..3d7600058 100644 --- a/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.html +++ b/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.html @@ -7,8 +7,6 @@
{{'ABOUT.VERSION' | translate}} {{version}} - | - {{'ABOUT.BUILD' | translate}} {{build}}
diff --git a/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.ts b/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.ts index adea99883..9f422c9bc 100644 --- a/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.ts +++ b/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.ts @@ -1,5 +1,7 @@ import { Component } from '@angular/core'; - + +import { AppConfigService } from '../../app-config.service'; + @Component({ selector: 'about-dialog', templateUrl: "about-dialog.component.html", @@ -7,8 +9,14 @@ import { Component } from '@angular/core'; }) export class AboutDialogComponent { private opened: boolean = false; - private version: string ="0.4.1"; - private build: string ="4276418"; + private build: string = "4276418"; + + constructor(private appConfigService: AppConfigService) { } + + public get version(): string { + let appConfig = this.appConfigService.getConfig(); + return appConfig?appConfig.harbor_version: "n/a"; + } public open(): void { this.opened = true; diff --git a/src/ui_ng/src/app/shared/inline-alert/inline-alert.component.css b/src/ui_ng/src/app/shared/inline-alert/inline-alert.component.css new file mode 100644 index 000000000..c170863bc --- /dev/null +++ b/src/ui_ng/src/app/shared/inline-alert/inline-alert.component.css @@ -0,0 +1,4 @@ +.alert-text-blink { + color: red; + font-weight: bolder; +} \ No newline at end of file diff --git a/src/ui_ng/src/app/shared/inline-alert/inline-alert.component.html b/src/ui_ng/src/app/shared/inline-alert/inline-alert.component.html index bf89df4ca..a33ed4ab1 100644 --- a/src/ui_ng/src/app/shared/inline-alert/inline-alert.component.html +++ b/src/ui_ng/src/app/shared/inline-alert/inline-alert.component.html @@ -1,9 +1,10 @@
- + {{errorMessage}}
+
diff --git a/src/ui_ng/src/app/shared/inline-alert/inline-alert.component.ts b/src/ui_ng/src/app/shared/inline-alert/inline-alert.component.ts index 9079846b0..c919f6ac2 100644 --- a/src/ui_ng/src/app/shared/inline-alert/inline-alert.component.ts +++ b/src/ui_ng/src/app/shared/inline-alert/inline-alert.component.ts @@ -2,18 +2,24 @@ import { Component, Input, Output, EventEmitter } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { errorHandler } from '../shared.utils'; +import { Observable } from 'rxjs/Rx'; +import { Subscription } from "rxjs"; @Component({ selector: 'inline-alert', - templateUrl: "inline-alert.component.html" + templateUrl: "inline-alert.component.html", + styleUrls: ['inline-alert.component.css'] }) export class InlineAlertComponent { private inlineAlertType: string = 'alert-danger'; - private inlineAlertClosable: boolean = true; + private inlineAlertClosable: boolean = false; private alertClose: boolean = true; private displayedText: string = ""; private showCancelAction: boolean = false; private useAppLevelStyle: boolean = false; + private timer: Subscription = null; + private count: number = 0; + private blinking: boolean = false; @Output() confirmEvt = new EventEmitter(); @@ -45,7 +51,7 @@ export class InlineAlertComponent { } this.inlineAlertType = 'alert-warning'; this.showCancelAction = true; - this.inlineAlertClosable = true; + this.inlineAlertClosable = false; this.alertClose = false; this.useAppLevelStyle = false; } @@ -68,6 +74,9 @@ export class InlineAlertComponent { this.alertClose = true; } + public blink() { + } + private confirmCancel(): void { this.confirmEvt.emit(true); } diff --git a/src/ui_ng/src/app/shared/statictics/statistics-panel.component.html b/src/ui_ng/src/app/shared/statictics/statistics-panel.component.html index 943cf3db1..5d9b91aff 100644 --- a/src/ui_ng/src/app/shared/statictics/statistics-panel.component.html +++ b/src/ui_ng/src/app/shared/statictics/statistics-panel.component.html @@ -35,8 +35,8 @@
-
-
+
+
{{freeStorage}}GB | {{totalStorage}}GB
[STORAGE]
diff --git a/src/ui_ng/src/app/shared/statictics/statistics-panel.component.ts b/src/ui_ng/src/app/shared/statictics/statistics-panel.component.ts index 0dd0f12b0..06165686c 100644 --- a/src/ui_ng/src/app/shared/statictics/statistics-panel.component.ts +++ b/src/ui_ng/src/app/shared/statictics/statistics-panel.component.ts @@ -26,8 +26,11 @@ export class StatisticsPanelComponent implements OnInit { private session: SessionService) { } ngOnInit(): void { - if (this.isValidSession) { + if (this.session.getCurrentUser()) { this.getStatistics(); + } + + if (this.isValidSession) { this.getVolumes(); } } diff --git a/src/ui_ng/src/app/shared/statictics/statistics.component.css b/src/ui_ng/src/app/shared/statictics/statistics.component.css index f308d3377..0d1f120de 100644 --- a/src/ui_ng/src/app/shared/statictics/statistics.component.css +++ b/src/ui_ng/src/app/shared/statictics/statistics.component.css @@ -10,7 +10,7 @@ .statistic-data { font-size: 16px; font-weight: 900; - font-family: "semibold"; + font-family: "Metropolis Semibold"; line-height: 16px; } @@ -18,7 +18,7 @@ font-size: 10px; line-height: 10px; text-transform: uppercase; - font-family: "semibold"; + font-family: "Metropolis Regular"; } .statistic-column-block { @@ -30,6 +30,7 @@ position: relative; text-transform: uppercase; font-size: 14px; + font-family: "Metropolis Regular"; } .statistic-column-title-pro { diff --git a/src/ui_ng/src/app/user/new-user-modal.component.html b/src/ui_ng/src/app/user/new-user-modal.component.html index 9239c2b70..4725d73d8 100644 --- a/src/ui_ng/src/app/user/new-user-modal.component.html +++ b/src/ui_ng/src/app/user/new-user-modal.component.html @@ -1,4 +1,4 @@ - +

{{'USER.ADD_USER_TITLE' | translate}}