From ffd3b73232db422c185dfe25b96c83bb93cb5b35 Mon Sep 17 00:00:00 2001 From: Steven Zou Date: Tue, 28 Mar 2017 23:16:31 +0800 Subject: [PATCH] fix related issues --- .../account-settings-modal.component.ts | 12 ++++ .../password/forgot-password.component.html | 2 +- .../password/forgot-password.component.ts | 7 ++- .../password/password-setting.component.ts | 13 +++- .../password/reset-password.component.html | 2 +- .../password/reset-password.component.ts | 14 ++++- .../app/account/sign-in/sign-in.component.ts | 3 +- .../app/account/sign-up/sign-up.component.ts | 7 ++- .../base/navigator/navigator.component.html | 2 +- .../app/base/navigator/navigator.component.ts | 6 ++ .../config/auth/config-auth.component.html | 4 +- .../app/config/auth/config-auth.component.ts | 21 ++++++- src/ui_ng/src/app/config/config.component.ts | 13 ++-- src/ui_ng/src/app/log/recent-log.component.ts | 3 +- .../new-user-form/new-user-form.component.ts | 40 ++++++++----- .../route/auth-user-activate.service.ts | 5 +- .../route/sign-in-guard-activate.service.ts | 2 +- .../src/app/user/new-user-modal.component.ts | 4 ++ src/ui_ng/src/app/user/user.component.html | 60 +++++++++---------- src/ui_ng/src/i18n/lang/en-lang.json | 3 +- src/ui_ng/src/i18n/lang/zh-lang.json | 3 +- 21 files changed, 155 insertions(+), 71 deletions(-) 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 24834916c..4f3b33ff3 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 @@ -141,6 +141,18 @@ export class AccountSettingsModalComponent implements OnInit, AfterViewChecked { this.account = Object.assign({}, this.session.getCurrentUser()); this.formValueChanged = false; + //Confirm inline alert is closed + this.inlineAlert.close(); + + //Clear check history + this.mailAlreadyChecked = {}; + + //Reset validation status + this.validationStateMap = { + "account_settings_email": true, + "account_settings_full_name": true + }; + this.opened = true; } diff --git a/src/ui_ng/src/app/account/password/forgot-password.component.html b/src/ui_ng/src/app/account/password/forgot-password.component.html index 70cbf4042..b805a73f4 100644 --- a/src/ui_ng/src/app/account/password/forgot-password.component.html +++ b/src/ui_ng/src/app/account/password/forgot-password.component.html @@ -1,4 +1,4 @@ - +

{{'RESET_PWD.TITLE' | translate}}

diff --git a/src/ui_ng/src/app/account/password/forgot-password.component.ts b/src/ui_ng/src/app/account/password/forgot-password.component.ts index ab0a996ef..f8ed863e1 100644 --- a/src/ui_ng/src/app/account/password/forgot-password.component.ts +++ b/src/ui_ng/src/app/account/password/forgot-password.component.ts @@ -32,10 +32,15 @@ export class ForgotPasswordComponent { } public open(): void { - this.opened = true; + //Clear state data this.validationState = true; this.forceValid = true; + this.onGoing = false; + this.email = ""; this.forgotPwdForm.resetForm(); + this.inlineAlert.close(); + + this.opened = true; } public close(): void { diff --git a/src/ui_ng/src/app/account/password/password-setting.component.ts b/src/ui_ng/src/app/account/password/password-setting.component.ts index 6b38a8e8c..38b3c191c 100644 --- a/src/ui_ng/src/app/account/password/password-setting.component.ts +++ b/src/ui_ng/src/app/account/password/password-setting.component.ts @@ -93,9 +93,18 @@ export class PasswordSettingComponent implements AfterViewChecked { //Open modal dialog open(): void { - this.opened = true; - this.pwdForm.reset(); + //Reset state this.formValueChanged = false; + this.onCalling = false; + this.error = null; + this.validationStateMap = { + "newPassword": true, + "reNewPassword": true + }; + this.pwdForm.reset(); + this.inlineAlert.close(); + + this.opened = true; } //Close the moal dialog diff --git a/src/ui_ng/src/app/account/password/reset-password.component.html b/src/ui_ng/src/app/account/password/reset-password.component.html index 499db9933..69cdc9ee5 100644 --- a/src/ui_ng/src/app/account/password/reset-password.component.html +++ b/src/ui_ng/src/app/account/password/reset-password.component.html @@ -1,4 +1,4 @@ - +

{{'RESET_PWD.TITLE' | translate}}

diff --git a/src/ui_ng/src/app/account/password/reset-password.component.ts b/src/ui_ng/src/app/account/password/reset-password.component.ts index 0bb9801d8..2b3db64e9 100644 --- a/src/ui_ng/src/app/account/password/reset-password.component.ts +++ b/src/ui_ng/src/app/account/password/reset-password.component.ts @@ -15,7 +15,10 @@ export class ResetPasswordComponent implements OnInit { opened: boolean = true; private onGoing: boolean = false; private password: string = ""; - private validationState: any = {}; + private validationState: any = { + "newPassword": true, + "reNewPassword": true + }; private resetUuid: string = ""; private resetOk: boolean = false; @@ -49,8 +52,15 @@ export class ResetPasswordComponent implements OnInit { public open(): void { this.resetOk = false; - this.opened = true; + this.onGoing = false; + this.validationState = { + "newPassword": true, + "reNewPassword": true + }; this.resetPwdForm.resetForm(); + this.inlineAlert.close(); + + this.opened = true; } public close(): void { diff --git a/src/ui_ng/src/app/account/sign-in/sign-in.component.ts b/src/ui_ng/src/app/account/sign-in/sign-in.component.ts index 4ea042dd2..20beffc6f 100644 --- a/src/ui_ng/src/app/account/sign-in/sign-in.component.ts +++ b/src/ui_ng/src/app/account/sign-in/sign-in.component.ts @@ -153,8 +153,7 @@ export class SignInComponent implements AfterViewChecked, OnInit { private handleUserCreation(user: User): void { if (user) { this.currentForm.setValue({ - "login_username": user.username, - "login_password": user.password + "login_username": user.username }); } diff --git a/src/ui_ng/src/app/account/sign-up/sign-up.component.ts b/src/ui_ng/src/app/account/sign-up/sign-up.component.ts index c5ae6381f..aac5c29c4 100644 --- a/src/ui_ng/src/app/account/sign-up/sign-up.component.ts +++ b/src/ui_ng/src/app/account/sign-up/sign-up.component.ts @@ -59,8 +59,13 @@ export class SignUpComponent { } open(): void { - this.newUserForm.reset();//Reset form + //Reset state + this.newUserForm.reset(); this.formValueChanged = false; + this.error = null; + this.onGoing = false; + this.inlienAlert.close(); + this.modal.open(); } diff --git a/src/ui_ng/src/app/base/navigator/navigator.component.html b/src/ui_ng/src/app/base/navigator/navigator.component.html index 1fbeb6c59..6db1970ed 100644 --- a/src/ui_ng/src/app/base/navigator/navigator.component.html +++ b/src/ui_ng/src/app/base/navigator/navigator.component.html @@ -30,7 +30,7 @@
{{'ACCOUNT_SETTINGS.PROFILE' | translate}} - {{'ACCOUNT_SETTINGS.CHANGE_PWD' | translate}} + {{'ACCOUNT_SETTINGS.CHANGE_PWD' | translate}} {{'ACCOUNT_SETTINGS.ROOT_CERT' | translate}} {{'ACCOUNT_SETTINGS.ABOUT' | translate}}
diff --git a/src/ui_ng/src/app/base/navigator/navigator.component.ts b/src/ui_ng/src/app/base/navigator/navigator.component.ts index 686a80902..83aaf337f 100644 --- a/src/ui_ng/src/app/base/navigator/navigator.component.ts +++ b/src/ui_ng/src/app/base/navigator/navigator.component.ts @@ -76,6 +76,12 @@ export class NavigatorComponent implements OnInit { this.appConfigService.getConfig().has_ca_root; } + public get canChangePassword(): boolean { + return this.session.getCurrentUser() && + this.appConfigService.getConfig() && + this.appConfigService.getConfig().auth_mode != 'ldap_auth'; + } + matchLang(lang: string): boolean { return lang.trim() === this.selectedLang; } diff --git a/src/ui_ng/src/app/config/auth/config-auth.component.html b/src/ui_ng/src/app/config/auth/config-auth.component.html index 21a3da766..0341c84af 100644 --- a/src/ui_ng/src/app/config/auth/config-auth.component.html +++ b/src/ui_ng/src/app/config/auth/config-auth.component.html @@ -3,7 +3,7 @@
- @@ -128,7 +128,7 @@ {{'CONFIG.TOOLTIP.PRO_CREATION_RESTRICTION' | translate}}
-
+
diff --git a/src/ui_ng/src/app/config/auth/config-auth.component.ts b/src/ui_ng/src/app/config/auth/config-auth.component.ts index 0b8297e9b..f196f4b4c 100644 --- a/src/ui_ng/src/app/config/auth/config-auth.component.ts +++ b/src/ui_ng/src/app/config/auth/config-auth.component.ts @@ -1,6 +1,6 @@ import { Component, Input, ViewChild } from '@angular/core'; import { NgForm } from '@angular/forms'; -import { Subscription } from 'rxjs/Subscription'; +import { Subscription } from 'rxjs/Subscription'; import { Configuration } from '../config'; @@ -23,6 +23,14 @@ export class ConfigurationAuthComponent { this.currentConfig.auth_mode.value === 'ldap_auth'; } + public get showSelfReg(): boolean { + if (!this.currentConfig || !this.currentConfig.auth_mode) { + return true; + } else { + return this.currentConfig.auth_mode.value != 'ldap_auth'; + } + } + private disabled(prop: any): boolean { return !(prop && prop.editable); } @@ -30,4 +38,15 @@ export class ConfigurationAuthComponent { public isValid(): boolean { return this.authForm && this.authForm.valid; } + + private handleOnChange($event): void { + if ($event && $event.target && $event.target["value"]) { + let authMode = $event.target["value"]; + if (authMode === 'ldap_auth') { + if (this.currentConfig.self_registration.value) { + this.currentConfig.self_registration.value = false;//uncheck + } + } + } + } } \ No newline at end of file diff --git a/src/ui_ng/src/app/config/config.component.ts b/src/ui_ng/src/app/config/config.component.ts index 4bd896891..e71e8f2ea 100644 --- a/src/ui_ng/src/app/config/config.component.ts +++ b/src/ui_ng/src/app/config/config.component.ts @@ -280,14 +280,13 @@ export class ConfigurationComponent implements OnInit, OnDestroy { } let allChanges = this.getChanges(); - for (let prop in allChanges) { - if (prop.startsWith("ldap_")) { - ldapSettings[prop] = allChanges[prop]; - } + let ldapSearchPwd = allChanges["ldap_search_password"]; + if(ldapSearchPwd){ + ldapSettings['ldap_search_password'] = ldapSearchPwd; + }else{ + delete ldapSettings['ldap_search_password']; } - console.info(ldapSettings); - this.testingOnGoing = true; this.configService.testLDAPServer(ldapSettings) .then(respone => { @@ -300,7 +299,7 @@ export class ConfigurationComponent implements OnInit, OnDestroy { if(!err){ err = "UNKNOWN"; } - this.msgHandler.showError("CONFIG.TEST_LDAP_FAILED", err); + this.msgHandler.showError("CONFIG.TEST_LDAP_FAILED", {'param': err}); }); } diff --git a/src/ui_ng/src/app/log/recent-log.component.ts b/src/ui_ng/src/app/log/recent-log.component.ts index 44179e93a..9144dc798 100644 --- a/src/ui_ng/src/app/log/recent-log.component.ts +++ b/src/ui_ng/src/app/log/recent-log.component.ts @@ -96,6 +96,7 @@ export class RecentLogComponent implements OnInit { let reg = new RegExp('.*' + terms + '.*', 'i'); return reg.test(log.username) || reg.test(log.repo_name) || - reg.test(log.operation); + reg.test(log.operation) || + reg.test(log.repo_tag); } } \ No newline at end of file diff --git a/src/ui_ng/src/app/shared/new-user-form/new-user-form.component.ts b/src/ui_ng/src/app/shared/new-user-form/new-user-form.component.ts index 5562c459c..77fbdcdff 100644 --- a/src/ui_ng/src/app/shared/new-user-form/new-user-form.component.ts +++ b/src/ui_ng/src/app/shared/new-user-form/new-user-form.component.ts @@ -21,7 +21,6 @@ import { SessionService } from '../../shared/session.service'; export class NewUserFormComponent implements AfterViewChecked, OnInit { newUser: User = new User(); - confirmedPwd: string = ""; @Input() isSelfRegistration: boolean = false; newUserFormRef: NgForm; @@ -33,17 +32,10 @@ export class NewUserFormComponent implements AfterViewChecked, OnInit { constructor(private session: SessionService) { } ngOnInit() { - this.formValueChanged = false; + this.resetState(); } - private validationStateMap: any = { - "username": true, - "email": true, - "realname": true, - "newPassword": true, - "confirmPassword": true, - "comment": true - }; + private validationStateMap: any = {}; private mailAlreadyChecked: any = {}; private userNameAlreadyChecked: any = {}; @@ -51,10 +43,27 @@ export class NewUserFormComponent implements AfterViewChecked, OnInit { private usernameTooltip: string = 'TOOLTIP.USER_NAME'; private formValueChanged: boolean = false; - private checkOnGoing: any = { - "username": false, - "email": false - }; + private checkOnGoing: any = {}; + + private resetState(): void { + this.mailAlreadyChecked = {}; + this.userNameAlreadyChecked = {}; + this.emailTooltip = 'TOOLTIP.EMAIL'; + this.usernameTooltip = 'TOOLTIP.USER_NAME'; + this.formValueChanged = false; + this.checkOnGoing = { + "username": false, + "email": false + }; + this.validationStateMap = { + "username": true, + "email": true, + "realname": true, + "newPassword": true, + "confirmPassword": true, + "comment": true + }; + } public isChecking(key: string): boolean { return !this.checkOnGoing[key]; @@ -161,7 +170,7 @@ export class NewUserFormComponent implements AfterViewChecked, OnInit { pwdEqualStatus = this.newUserForm.controls["confirmPassword"].value === this.newUserForm.controls["newPassword"].value; } return this.newUserForm && - this.newUserForm.valid && + this.newUserForm.valid && pwdEqualStatus && this.validationStateMap["username"] && this.validationStateMap["email"];//Backend check should be valid as well @@ -186,6 +195,7 @@ export class NewUserFormComponent implements AfterViewChecked, OnInit { //Reset form reset(): void { + this.resetState(); if (this.newUserForm) { this.newUserForm.reset(); } diff --git a/src/ui_ng/src/app/shared/route/auth-user-activate.service.ts b/src/ui_ng/src/app/shared/route/auth-user-activate.service.ts index b40ddb853..74898bbd2 100644 --- a/src/ui_ng/src/app/shared/route/auth-user-activate.service.ts +++ b/src/ui_ng/src/app/shared/route/auth-user-activate.service.ts @@ -11,6 +11,7 @@ import { CommonRoutes, AdmiralQueryParamKey } from '../../shared/shared.const'; import { AppConfigService } from '../../app-config.service'; import { maintainUrlQueryParmas } from '../../shared/shared.utils'; import { MessageHandlerService } from '../message-handler/message-handler.service'; +import { SearchTriggerService } from '../../base/global-search/search-trigger.service'; @Injectable() export class AuthCheckGuard implements CanActivate, CanActivateChild { @@ -18,7 +19,8 @@ export class AuthCheckGuard implements CanActivate, CanActivateChild { private authService: SessionService, private router: Router, private appConfigService: AppConfigService, - private msgHandler: MessageHandlerService) { } + private msgHandler: MessageHandlerService, + private searchTrigger: SearchTriggerService) { } private isGuest(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean { const proRegExp = /\/harbor\/projects\/[\d]+\/.+/i; @@ -33,6 +35,7 @@ export class AuthCheckGuard implements CanActivate, CanActivateChild { canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise | boolean { //When routing change, clear this.msgHandler.clear(); + this.searchTrigger.closeSearch(true); return new Promise((resolve, reject) => { //Before activating, we firstly need to confirm whether the route is coming from peer part - admiral diff --git a/src/ui_ng/src/app/shared/route/sign-in-guard-activate.service.ts b/src/ui_ng/src/app/shared/route/sign-in-guard-activate.service.ts index 1e55b2990..18d0400ee 100644 --- a/src/ui_ng/src/app/shared/route/sign-in-guard-activate.service.ts +++ b/src/ui_ng/src/app/shared/route/sign-in-guard-activate.service.ts @@ -16,7 +16,7 @@ export class SignInGuard implements CanActivate, CanActivateChild { //If user has logged in, should not login again return new Promise((resolve, reject) => { let user = this.authService.getCurrentUser(); - if (!user) { + if (user === null) { this.authService.retrieveUser() .then(() => { this.router.navigate([CommonRoutes.HARBOR_DEFAULT]); diff --git a/src/ui_ng/src/app/user/new-user-modal.component.ts b/src/ui_ng/src/app/user/new-user-modal.component.ts index 026006f1d..230ef7eaa 100644 --- a/src/ui_ng/src/app/user/new-user-modal.component.ts +++ b/src/ui_ng/src/app/user/new-user-modal.component.ts @@ -55,6 +55,10 @@ export class NewUserModalComponent { open(): void { this.newUserForm.reset();//Reset form this.formValueChanged = false; + this.onGoing = false; + this.error = null; + this.inlineAlert.close(); + this.opened = true; } diff --git a/src/ui_ng/src/app/user/user.component.html b/src/ui_ng/src/app/user/user.component.html index 3cc7f635f..656502bd2 100644 --- a/src/ui_ng/src/app/user/user.component.html +++ b/src/ui_ng/src/app/user/user.component.html @@ -1,37 +1,37 @@
-
-

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

-
- +
+

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

+
+ - - + + - + +
+
+ + {{'USER.COLUMN_NAME' | translate}} + {{'USER.COLUMN_ADMIN' | translate}} + {{'USER.COLUMN_EMAIL' | translate}} + {{'USER.COLUMN_REG_NAME' | translate}} + + + + + + {{user.username}} + {{isSystemAdmin(user)}} + {{user.email}} + + {{user.creation_time}} + + + {{users.length}} {{'USER.ITEMS' | translate}} + +
+
-
- - {{'USER.COLUMN_NAME' | translate}} - {{'USER.COLUMN_ADMIN' | translate}} - {{'USER.COLUMN_EMAIL' | translate}} - {{'USER.COLUMN_REG_NAME' | translate}} - - - - - - {{user.username}} - {{isSystemAdmin(user)}} - {{user.email}} - - {{user.creation_time}} - - - {{users.length}} {{'USER.ADD_ACTION' | translate}} - -
- -
\ No newline at end of file diff --git a/src/ui_ng/src/i18n/lang/en-lang.json b/src/ui_ng/src/i18n/lang/en-lang.json index 93d16e0cd..fcf96164b 100644 --- a/src/ui_ng/src/i18n/lang/en-lang.json +++ b/src/ui_ng/src/i18n/lang/en-lang.json @@ -114,7 +114,8 @@ "SAVE_SUCCESS": "New user added successfully", "DELETION_TITLE": "Confirm user deletion", "DELETION_SUMMARY": "Do you want to delete user {{param}}?", - "DELETE_SUCCESS": "User deleted successfully" + "DELETE_SUCCESS": "User deleted successfully", + "ITEMS": "item(s)" }, "PROJECT": { "PROJECTS": "Projects", diff --git a/src/ui_ng/src/i18n/lang/zh-lang.json b/src/ui_ng/src/i18n/lang/zh-lang.json index 77f9c4861..b686682da 100644 --- a/src/ui_ng/src/i18n/lang/zh-lang.json +++ b/src/ui_ng/src/i18n/lang/zh-lang.json @@ -114,7 +114,8 @@ "SAVE_SUCCESS": "添加用户成功", "DELETION_TITLE": "删除用户确认", "DELETION_SUMMARY": "你确认删除用户 {{param}}?", - "DELETE_SUCCESS": "删除用户成功" + "DELETE_SUCCESS": "删除用户成功", + "ITEMS": "条记录" }, "PROJECT": { "PROJECTS": "项目",