From 079cca5f918bb884a0fd1d4848542187bbf675ca Mon Sep 17 00:00:00 2001 From: Steven Zou Date: Tue, 14 Mar 2017 18:01:18 +0800 Subject: [PATCH] merge latest ui code to fix block issues --- .../account-settings-modal.component.ts | 2 +- .../password/password-setting.component.ts | 2 +- .../password/password-setting.service.ts | 18 ++++-- .../password/reset-password.component.ts | 6 +- .../account/sign-in/sign-in.component.html | 4 +- .../app/account/sign-in/sign-in.component.ts | 20 +++++- .../app/account/sign-up/sign-up.component.ts | 11 +++- src/ui_ng/src/app/app-config.service.ts | 41 ++++++++++++ src/ui_ng/src/app/app-config.ts | 20 ++++++ src/ui_ng/src/app/app.module.ts | 15 +++-- .../base/navigator/navigator.component.css | 9 +++ .../base/navigator/navigator.component.html | 11 +++- .../app/base/navigator/navigator.component.ts | 46 +++++++++++--- .../config/auth/config-auth.component.html | 5 +- .../app/config/auth/config-auth.component.ts | 2 +- .../src/app/config/config.component.html | 2 + src/ui_ng/src/app/config/config.component.ts | 63 ++++++++++++++++++- src/ui_ng/src/app/config/config.service.ts | 16 +++++ .../config/email/config-email.component.html | 2 - src/ui_ng/src/app/harbor-routing.module.ts | 33 +++++----- src/ui_ng/src/app/log/audit-log.component.ts | 2 +- .../src/app/project/project.component.ts | 2 +- .../app/repository/mock-verfied-signature.ts | 10 --- .../src/app/repository/repository.service.ts | 36 +++++------ .../tag-repository.component.html | 2 +- .../tag-repository.component.ts | 49 ++++++++++----- src/ui_ng/src/app/user/user.component.html | 2 +- src/ui_ng/src/index.html | 13 ++-- src/ui_ng/src/ng/i18n/lang/en-lang.json | 12 +++- src/ui_ng/src/ng/i18n/lang/zh-lang.json | 12 +++- 30 files changed, 351 insertions(+), 117 deletions(-) create mode 100644 src/ui_ng/src/app/app-config.service.ts create mode 100644 src/ui_ng/src/app/app-config.ts delete mode 100644 src/ui_ng/src/app/repository/mock-verfied-signature.ts 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 bb81493dc..a3f43f2ef 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 @@ -118,7 +118,7 @@ export class AccountSettingsModalComponent implements OnInit, AfterViewChecked { this.session.updateAccountSettings(this.account) .then(() => { this.isOnCalling = false; - this.close(); + this.opened = false; this.msgService.announceMessage(200, "PROFILE.SAVE_SUCCESS", AlertType.SUCCESS); }) .catch(error => { 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 6c8dd8248..4fcd04d15 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 @@ -117,7 +117,7 @@ export class PasswordSettingComponent implements AfterViewChecked { }) .then(() => { this.onCalling = false; - this.close(); + this.opened = false; this.msgService.announceMessage(200, "CHANGE_PWD.SAVE_SUCCESS", AlertType.SUCCESS); }) .catch(error => { diff --git a/src/ui_ng/src/app/account/password/password-setting.service.ts b/src/ui_ng/src/app/account/password/password-setting.service.ts index d5f0db427..2d16ca8fb 100644 --- a/src/ui_ng/src/app/account/password/password-setting.service.ts +++ b/src/ui_ng/src/app/account/password/password-setting.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Headers, Http, RequestOptions } from '@angular/http'; +import { Headers, Http, RequestOptions, URLSearchParams } from '@angular/http'; import 'rxjs/add/operator/toPromise'; import { PasswordSetting } from './password-setting'; @@ -52,10 +52,18 @@ export class PasswordSettingService { return Promise.reject("Invalid reset uuid or password"); } - return this.http.post(resetPasswordEndpoint, JSON.stringify({ - "reset_uuid": uuid, - "password": newPassword - }), this.options) + let formHeaders = new Headers({ + "Content-Type": 'application/x-www-form-urlencoded' + }); + let formOptions: RequestOptions = new RequestOptions({ + headers: formHeaders + }); + + let body: URLSearchParams = new URLSearchParams(); + body.set("reset_uuid", uuid); + body.set("password", newPassword); + + return this.http.post(resetPasswordEndpoint, body.toString(), formOptions) .toPromise() .then(response => response) .catch(error => { 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 75bd52c92..0e22af2ff 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 @@ -44,7 +44,9 @@ export class ResetPasswordComponent implements OnInit{ } public getValidationState(key: string): boolean { - return this.validationState && this.validationState[key]; + return this.validationState && + this.validationState[key] && + key === 'reNewPassword'?this.samePassword():true; } public open(): void { @@ -76,10 +78,12 @@ export class ResetPasswordComponent implements OnInit{ this.onGoing = true; this.pwdService.resetPassword(this.resetUuid, this.password) .then(() => { + this.onGoing = false; this.resetOk = true; this.inlineAlert.showInlineSuccess({message:'RESET_PWD.RESET_OK'}); }) .catch(error => { + this.onGoing = false; if(accessErrorHandler(error, this.msgService)){ this.close(); }else{ diff --git a/src/ui_ng/src/app/account/sign-in/sign-in.component.html b/src/ui_ng/src/app/account/sign-in/sign-in.component.html index c4de78af5..d95ef7203 100644 --- a/src/ui_ng/src/app/account/sign-in/sign-in.component.html +++ b/src/ui_ng/src/app/account/sign-in/sign-in.component.html @@ -31,9 +31,9 @@ {{ 'SIGN_IN.INVALID_MSG' | translate }} - {{ 'BUTTON.SIGN_UP_LINK' | translate }} + {{ 'BUTTON.SIGN_UP_LINK' | translate }} -> + \ No newline at end of file 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 40cd828a1..f69d11619 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 @@ -10,6 +10,9 @@ import { SignUpComponent } from '../sign-up/sign-up.component'; import { harborRootRoute } from '../../shared/shared.const'; import { ForgotPasswordComponent } from '../password/forgot-password.component'; +import { AppConfigService } from '../../app-config.service'; +import { AppConfig } from '../../app-config'; + //Define status flags for signing in states export const signInStatusNormal = 0; export const signInStatusOnGoing = 1; @@ -23,6 +26,7 @@ export const signInStatusError = -1; export class SignInComponent implements AfterViewChecked, OnInit { private redirectUrl: string = ""; + private appConfig: AppConfig = new AppConfig(); //Form reference signInForm: NgForm; @ViewChild('signInForm') currentForm: NgForm; @@ -41,13 +45,19 @@ export class SignInComponent implements AfterViewChecked, OnInit { constructor( private router: Router, private session: SessionService, - private route: ActivatedRoute + private route: ActivatedRoute, + private appConfigService: AppConfigService ) { } ngOnInit(): void { + this.appConfig = this.appConfigService.getConfig(); this.route.queryParams .subscribe(params => { this.redirectUrl = params["redirect_url"] || ""; + let isSignUp = params["sign_up"] || ""; + if (isSignUp != "") { + this.signUp();//Open sign up + } }); } @@ -65,6 +75,12 @@ export class SignInComponent implements AfterViewChecked, OnInit { return this.currentForm.form.valid; } + //Whether show the 'sign up' link + public get selfSignUp(): boolean { + return this.appConfig.auth_mode === 'db_auth' + && this.appConfig.self_registration; + } + //General error handler private handleError(error) { //Set error status @@ -124,7 +140,7 @@ export class SignInComponent implements AfterViewChecked, OnInit { if (this.redirectUrl === "") { //Routing to the default location this.router.navigateByUrl(harborRootRoute); - }else{ + } else { this.router.navigateByUrl(this.redirectUrl); } }) 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 86cb22ed8..60743f587 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 @@ -9,6 +9,8 @@ import { UserService } from '../../user/user.service'; import { errorHandler } from '../../shared/shared.utils'; import { InlineAlertComponent } from '../../shared/inline-alert/inline-alert.component'; +import { Modal } from 'clarity-angular'; + @Component({ selector: 'sign-up', templateUrl: "sign-up.component.html" @@ -30,6 +32,9 @@ export class SignUpComponent { @ViewChild(InlineAlertComponent) private inlienAlert: InlineAlertComponent; + @ViewChild(Modal) + private modal: Modal; + private getNewUser(): User { return this.newUserForm.getData(); } @@ -55,7 +60,7 @@ export class SignUpComponent { open(): void { this.newUserForm.reset();//Reset form this.formValueChanged = false; - this.opened = true; + this.modal.open(); } close(): void { @@ -74,7 +79,7 @@ export class SignUpComponent { } confirmCancel(): void { - this.opened = false; + this.modal.close(); } //Create new user @@ -97,7 +102,7 @@ export class SignUpComponent { this.userService.addUser(u) .then(() => { this.onGoing = false; - this.close(); + this.modal.close(); }) .catch(error => { this.onGoing = false; diff --git a/src/ui_ng/src/app/app-config.service.ts b/src/ui_ng/src/app/app-config.service.ts new file mode 100644 index 000000000..529ab1739 --- /dev/null +++ b/src/ui_ng/src/app/app-config.service.ts @@ -0,0 +1,41 @@ +import { Injectable } from '@angular/core'; +import { Headers, Http, RequestOptions } from '@angular/http'; +import 'rxjs/add/operator/toPromise'; + +import { AppConfig } from './app-config'; + +export const systemInfoEndpoint = "/api/systeminfo"; +/** + * Declare service to handle the bootstrap options + * + * + * @export + * @class GlobalSearchService + */ +@Injectable() +export class AppConfigService { + private headers = new Headers({ + "Content-Type": 'application/json' + }); + private options = new RequestOptions({ + headers: this.headers + }); + + //Store the application configuration + private configurations: AppConfig = new AppConfig(); + + constructor(private http: Http) { } + + public load(): Promise { + return this.http.get(systemInfoEndpoint, this.options).toPromise() + .then(response => this.configurations = response.json() as AppConfig) + .catch(error => { + //Catch the error + console.error("Failed to load bootstrap options with error: ", error); + }); + } + + public getConfig(): AppConfig { + return this.configurations; + } +} \ No newline at end of file diff --git a/src/ui_ng/src/app/app-config.ts b/src/ui_ng/src/app/app-config.ts new file mode 100644 index 000000000..80bf3f61c --- /dev/null +++ b/src/ui_ng/src/app/app-config.ts @@ -0,0 +1,20 @@ +export class AppConfig { + constructor(){ + //Set default value + this.with_notary = false; + this.with_admiral = false; + this.admiral_endpoint = ""; + this.auth_mode = "db_auth"; + this.registry_url = ""; + this.project_creation_restriction = "everyone"; + this.self_registration = true; + } + + with_notary: boolean; + with_admiral: boolean; + admiral_endpoint: string; + auth_mode: string; + registry_url: string; + project_creation_restriction: string; + self_registration: boolean; +} \ No newline at end of file diff --git a/src/ui_ng/src/app/app.module.ts b/src/ui_ng/src/app/app.module.ts index 4799a97d2..3f117d6b5 100644 --- a/src/ui_ng/src/app/app.module.ts +++ b/src/ui_ng/src/app/app.module.ts @@ -16,17 +16,14 @@ import { MyMissingTranslationHandler } from './i18n/missing-trans.handler'; import { TranslateHttpLoader } from '@ngx-translate/http-loader'; import { Http } from '@angular/http'; -import { SessionService } from './shared/session.service'; +import { AppConfigService } from './app-config.service'; export function HttpLoaderFactory(http: Http) { return new TranslateHttpLoader(http, 'ng/i18n/lang/', '-lang.json'); } -export function initConfig(session: SessionService) { - return () => { - console.info("app init here"); - return Promise.resolve(true); - }; +export function initConfig(configService: AppConfigService) { + return () => configService.load(); } @NgModule({ @@ -51,10 +48,12 @@ export function initConfig(session: SessionService) { } }) ], - providers: [{ + providers: [ + AppConfigService, + { provide: APP_INITIALIZER, useFactory: initConfig, - deps: [SessionService], + deps: [AppConfigService], multi: true }], bootstrap: [AppComponent] diff --git a/src/ui_ng/src/app/base/navigator/navigator.component.css b/src/ui_ng/src/app/base/navigator/navigator.component.css index 8fcf6818c..66a64add0 100644 --- a/src/ui_ng/src/app/base/navigator/navigator.component.css +++ b/src/ui_ng/src/app/base/navigator/navigator.component.css @@ -17,4 +17,13 @@ .lang-selected { font-weight: bold; +} + +.nav-divider { + display: inline-block; + width: 1px; + height: 40px; + background-color: #fafafa; + position: relative; + top: 10px; } \ No newline at end of file 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 c297f3e3d..c17f0b958 100644 --- a/src/ui_ng/src/app/base/navigator/navigator.component.html +++ b/src/ui_ng/src/app/base/navigator/navigator.component.html @@ -5,12 +5,19 @@ Harbor +
+ Management + Registry +
+ {{'SIGN_IN.HEADER_LINK' | translate}} +
+ {{'SIGN_UP.TITLE' | 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 135a34da8..05fe47384 100644 --- a/src/ui_ng/src/app/base/navigator/navigator.component.ts +++ b/src/ui_ng/src/app/base/navigator/navigator.component.ts @@ -1,5 +1,5 @@ -import { Component, Output, EventEmitter, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; +import { Component, Output, EventEmitter, OnInit, Inject } from '@angular/core'; +import { Router, NavigationExtras } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { ModalEvent } from '../modal-event'; @@ -9,7 +9,10 @@ import { SessionUser } from '../../shared/session-user'; import { SessionService } from '../../shared/session.service'; import { CookieService } from 'angular2-cookie/core'; -import { supportedLangs, enLang, languageNames } from '../../shared/shared.const'; +import { supportedLangs, enLang, languageNames, signInRoute } from '../../shared/shared.const'; + +import { AppConfigService } from '../../app-config.service'; +import { AppConfig } from '../../app-config'; @Component({ selector: 'navigator', @@ -24,12 +27,14 @@ export class NavigatorComponent implements OnInit { private sessionUser: SessionUser = null; private selectedLang: string = enLang; + private appConfig: AppConfig = new AppConfig(); constructor( private session: SessionService, private router: Router, private translate: TranslateService, - private cookie: CookieService) { } + private cookie: CookieService, + private appConfigService: AppConfigService) { } ngOnInit(): void { this.sessionUser = this.session.getCurrentUser(); @@ -39,6 +44,8 @@ export class NavigatorComponent implements OnInit { //Keep in cookie for next use this.cookie.put("harbor-lang", langChange.lang); }); + + this.appConfig = this.appConfigService.getConfig(); } public get isSessionValid(): boolean { @@ -53,6 +60,19 @@ export class NavigatorComponent implements OnInit { return languageNames[this.selectedLang]; } + public get isIntegrationMode(): boolean { + return this.appConfig.with_admiral && this.appConfig.admiral_endpoint.trim() != ""; + } + + public get admiralLink(): string { + let routeSegments = [this.appConfig.admiral_endpoint, + "?registry_url=", + encodeURIComponent(window.location.href) + ]; + + return routeSegments.join(""); + } + matchLang(lang: string): boolean { return lang.trim() === this.selectedLang; } @@ -94,12 +114,12 @@ export class NavigatorComponent implements OnInit { //Switch languages switchLanguage(lang: string): void { - if (supportedLangs.find(supportedLang => supportedLang === lang.trim())){ + if (supportedLangs.find(supportedLang => supportedLang === lang.trim())) { this.translate.use(lang); - }else{ + } else { this.translate.use(enLang);//Use default //TODO: - console.error('Language '+lang.trim()+' is not suppoted'); + console.error('Language ' + lang.trim() + ' is not suppoted'); } //Try to switch backend lang //this.session.switchLanguage(lang).catch(error => console.error(error)); @@ -107,12 +127,20 @@ export class NavigatorComponent implements OnInit { //Handle the home action homeAction(): void { - if(this.sessionUser != null){ + if (this.sessionUser != null) { //Navigate to default page this.router.navigate(['harbor']); - }else{ + } else { //Naviagte to signin page this.router.navigate(['sign-in']); } } + + openSignUp(): void { + let navigatorExtra: NavigationExtras = { + queryParams: { "sign_up": true } + }; + + this.router.navigate([signInRoute], navigatorExtra); + } } \ No newline at end of file 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 6c1dc778b..2431351f9 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,10 +3,9 @@
- - +
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 7c2b3cfac..0b8297e9b 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 @@ -20,7 +20,7 @@ export class ConfigurationAuthComponent { public get showLdap(): boolean { return this.currentConfig && this.currentConfig.auth_mode && - this.currentConfig.auth_mode.value === 'ldap'; + this.currentConfig.auth_mode.value === 'ldap_auth'; } private disabled(prop: any): boolean { diff --git a/src/ui_ng/src/app/config/config.component.html b/src/ui_ng/src/app/config/config.component.html index 189e18e7c..6074a5203 100644 --- a/src/ui_ng/src/app/config/config.component.html +++ b/src/ui_ng/src/app/config/config.component.html @@ -55,4 +55,6 @@ + +
\ 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 abc4b4a8d..764e1b619 100644 --- a/src/ui_ng/src/app/config/config.component.ts +++ b/src/ui_ng/src/app/config/config.component.ts @@ -15,6 +15,8 @@ import { DeletionMessage } from '../shared/deletion-dialog/deletion-message' import { ConfigurationAuthComponent } from './auth/config-auth.component'; import { ConfigurationEmailComponent } from './email/config-email.component'; +import { AppConfigService } from '../app-config.service'; + const fakePass = "fakepassword"; @Component({ @@ -28,6 +30,7 @@ export class ConfigurationComponent implements OnInit, OnDestroy { private currentTabId: string = ""; private originalCopy: Configuration; private confirmSub: Subscription; + private testingOnGoing: boolean = false; @ViewChild("repoConfigFrom") repoConfigForm: NgForm; @ViewChild("systemConfigFrom") systemConfigForm: NgForm; @@ -37,7 +40,8 @@ export class ConfigurationComponent implements OnInit, OnDestroy { constructor( private msgService: MessageService, private configService: ConfigurationService, - private confirmService: DeletionDialogService) { } + private confirmService: DeletionDialogService, + private appConfigService: AppConfigService) { } ngOnInit(): void { //First load @@ -58,6 +62,10 @@ export class ConfigurationComponent implements OnInit, OnDestroy { return this.onGoing; } + public get testingInProgress(): boolean { + return this.testingOnGoing; + } + public isValid(): boolean { return this.repoConfigForm && this.repoConfigForm.valid && @@ -82,6 +90,16 @@ export class ConfigurationComponent implements OnInit, OnDestroy { return this.currentTabId === 'config-email'; } + public get showLdapServerBtn(): boolean { + return this.currentTabId === 'config-auth' && + this.allConfig.auth_mode && + this.allConfig.auth_mode.value === "ldap_auth"; + } + + public isLDAPConfigValid(): boolean { + return this.authConfig && this.authConfig.isValid(); + } + public tabLinkChanged(tabLink: any) { this.currentTabId = tabLink.id; } @@ -105,6 +123,10 @@ export class ConfigurationComponent implements OnInit, OnDestroy { //or force refresh by calling service. //HERE we choose force way this.retrieveConfig(); + + //Reload bootstrap option + this.appConfigService.load().catch(error=> console.error("Failed to reload bootstrap option with error: ", error)); + this.msgService.announceMessage(response.status, "CONFIG.SAVE_SUCCESS", AlertType.SUCCESS); }) .catch(error => { @@ -150,7 +172,46 @@ export class ConfigurationComponent implements OnInit, OnDestroy { * @memberOf ConfigurationComponent */ public testMailServer(): void { + let mailSettings = {}; + let allChanges = this.getChanges(); + for (let prop in allChanges) { + if (prop.startsWith("email_")) { + mailSettings[prop] = allChanges[prop]; + } + } + this.testingOnGoing = true; + this.configService.testMailServer(mailSettings) + .then(response => { + this.testingOnGoing = false; + this.msgService.announceMessage(200, "CONFIG.TEST_MAIL_SUCCESS", AlertType.SUCCESS); + }) + .catch(error => { + this.testingOnGoing = false; + this.msgService.announceMessage(error.status, errorHandler(error), AlertType.WARNING); + }); + } + + public testLDAPServer(): void { + let ldapSettings = {}; + let allChanges = this.getChanges(); + for (let prop in allChanges) { + if (prop.startsWith("ldap_")) { + ldapSettings[prop] = allChanges[prop]; + } + } + + console.info(ldapSettings); + this.testingOnGoing = true; + this.configService.testLDAPServer(ldapSettings) + .then(respone => { + this.testingOnGoing = false; + this.msgService.announceMessage(200, "CONFIG.TEST_LDAP_SUCCESS", AlertType.SUCCESS); + }) + .catch(error => { + this.testingOnGoing = false; + this.msgService.announceMessage(error.status, errorHandler(error), AlertType.WARNING); + }); } private retrieveConfig(): void { diff --git a/src/ui_ng/src/app/config/config.service.ts b/src/ui_ng/src/app/config/config.service.ts index 36e065610..be7b25f9f 100644 --- a/src/ui_ng/src/app/config/config.service.ts +++ b/src/ui_ng/src/app/config/config.service.ts @@ -5,6 +5,8 @@ import 'rxjs/add/operator/toPromise'; import { Configuration } from './config'; const configEndpoint = "/api/configurations"; +const emailEndpoint = "/api/email/ping"; +const ldapEndpoint = "/api/ldap/ping"; @Injectable() export class ConfigurationService { @@ -30,4 +32,18 @@ export class ConfigurationService { .then(response => response) .catch(error => Promise.reject(error)); } + + public testMailServer(mailSettings: any): Promise { + return this.http.post(emailEndpoint, JSON.stringify(mailSettings), this.options) + .toPromise() + .then(response => response) + .catch(error => Promise.reject(error)); + } + + public testLDAPServer(ldapSettings: any): Promise { + return this.http.post(ldapEndpoint, JSON.stringify(ldapSettings), this.options) + .toPromise() + .then(response => response) + .catch(error => Promise.reject(error)); + } } diff --git a/src/ui_ng/src/app/config/email/config-email.component.html b/src/ui_ng/src/app/config/email/config-email.component.html index f95ef09f4..f00bb96d6 100644 --- a/src/ui_ng/src/app/config/email/config-email.component.html +++ b/src/ui_ng/src/app/config/email/config-email.component.html @@ -29,7 +29,6 @@ {{'REPOSITORY.DELETE' | translate}} + {{'REPOSITORY.DELETE' | translate}} diff --git a/src/ui_ng/src/app/repository/tag-repository/tag-repository.component.ts b/src/ui_ng/src/app/repository/tag-repository/tag-repository.component.ts index d2e9316f4..ea77ac520 100644 --- a/src/ui_ng/src/app/repository/tag-repository/tag-repository.component.ts +++ b/src/ui_ng/src/app/repository/tag-repository/tag-repository.component.ts @@ -32,16 +32,24 @@ export class TagRepositoryComponent implements OnInit, OnDestroy { private repositoryService: RepositoryService) { this.subscription = this.deletionDialogService.deletionConfirm$.subscribe( message=>{ - let tagName = message.data; - this.repositoryService - .deleteRepoByTag(this.repoName, tagName) - .subscribe( - response=>{ - this.retrieve(); - console.log('Deleted repo:' + this.repoName + ' with tag:' + tagName); - }, - error=>this.messageService.announceMessage(error.status, 'Failed to delete tag:' + tagName + ' under repo:' + this.repoName, AlertType.DANGER) - ); + let tag = message.data; + if(tag) { + if(tag.verified) { + return; + } else { + let tagName = tag.tag; + this.repositoryService + .deleteRepoByTag(this.repoName, tagName) + .subscribe( + response=>{ + this.retrieve(); + console.log('Deleted repo:' + this.repoName + ' with tag:' + tagName); + }, + error=>this.messageService.announceMessage(error.status, 'Failed to delete tag:' + tagName + ' under repo:' + this.repoName, AlertType.DANGER) + ); + } + } + } ) } @@ -58,8 +66,9 @@ export class TagRepositoryComponent implements OnInit, OnDestroy { this.subscription.unsubscribe(); } } - + retrieve() { + this.tags = []; this.repositoryService .listTagsWithVerifiedSignatures(this.repoName) .subscribe( @@ -81,11 +90,19 @@ export class TagRepositoryComponent implements OnInit, OnDestroy { error=>this.messageService.announceMessage(error.status, 'Failed to list tags with repo:' + this.repoName, AlertType.DANGER)); } - deleteTag(tagName: string) { - let message = new DeletionMessage( - 'REPOSITORY.DELETION_TITLE_TAG', 'REPOSITORY.DELETION_SUMMARY_TAG', - tagName, tagName, DeletionTargets.TAG); - this.deletionDialogService.openComfirmDialog(message); + deleteTag(tag: TagView) { + if(tag) { + let titleKey: string, summaryKey: string; + if (tag.verified) { + titleKey = 'REPOSITORY.DELETION_TITLE_TAG_DENIED'; + summaryKey = 'REPOSITORY.DELETION_SUMMARY_TAG_DENIED'; + } else { + titleKey = 'REPOSITORY.DELETION_TITLE_TAG'; + summaryKey = 'REPOSITORY.DELETION_SUMMARY_TAG'; + } + let message = new DeletionMessage(titleKey, summaryKey, tag.tag, tag, DeletionTargets.TAG); + this.deletionDialogService.openComfirmDialog(message); + } } } \ No newline at end of file diff --git a/src/ui_ng/src/app/user/user.component.html b/src/ui_ng/src/app/user/user.component.html index 3a514b6b9..207e6e4ae 100644 --- a/src/ui_ng/src/app/user/user.component.html +++ b/src/ui_ng/src/app/user/user.component.html @@ -1,5 +1,5 @@
-

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

+

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

diff --git a/src/ui_ng/src/index.html b/src/ui_ng/src/index.html index 37df927a2..0d977b6c1 100644 --- a/src/ui_ng/src/index.html +++ b/src/ui_ng/src/index.html @@ -1,13 +1,16 @@ + - Clarity Seed App - + Harbor + + -Loading... - - + Loading... + + + \ No newline at end of file diff --git a/src/ui_ng/src/ng/i18n/lang/en-lang.json b/src/ui_ng/src/ng/i18n/lang/en-lang.json index c4ba08b65..7a6aff569 100644 --- a/src/ui_ng/src/ng/i18n/lang/en-lang.json +++ b/src/ui_ng/src/ng/i18n/lang/en-lang.json @@ -2,7 +2,8 @@ "SIGN_IN": { "REMEMBER": "Remember me", "INVALID_MSG": "Invalid user name or password", - "FORGOT_PWD": "Forgot password" + "FORGOT_PWD": "Forgot password", + "HEADER_LINK": "Sign In" }, "SIGN_UP": { "TITLE": "Sign Up" @@ -18,7 +19,8 @@ "SEND": "SEND", "SAVE": "SAVE", "TEST_MAIL": "TEST MAIL SERVER", - "CLOSE": "CLOSE" + "CLOSE": "CLOSE", + "TEST_LDAP": "TEST LDAP SERVER" }, "TOOLTIP": { "EMAIL": "Email should be a valid email address like name@example.com", @@ -256,6 +258,8 @@ "DELETION_SUMMARY_REPO": "Do you want to delete repository {{param}}?", "DELETION_TITLE_TAG": "Confirm Tag Deletion", "DELETION_SUMMARY_TAG": "Do you want to delete tag {{param}}?", + "DELETION_TITLE_TAG_DENIED": "Signed Tag can't be deleted", + "DELETION_SUMMARY_TAG_DENIED": "The tag must be removed from Notary before they can be deleted.", "FILTER_FOR_REPOSITORIES": "Filter for repositories", "TAG": "Tag", "VERIFIED": "Verified", @@ -330,7 +334,9 @@ "FILTER": "LDAP Filter", "UID": "LDAP UID", "SCOPE": "lDAP Scope" - } + }, + "TEST_MAIL_SUCCESS": "Connection to mail server is verified", + "TEST_LDAP_SUCCESS": "Connection to ldap server is verified" }, "PAGE_NOT_FOUND": { "MAIN_TITLE": "Page not found", diff --git a/src/ui_ng/src/ng/i18n/lang/zh-lang.json b/src/ui_ng/src/ng/i18n/lang/zh-lang.json index cc96fb19d..c025cd441 100644 --- a/src/ui_ng/src/ng/i18n/lang/zh-lang.json +++ b/src/ui_ng/src/ng/i18n/lang/zh-lang.json @@ -2,7 +2,8 @@ "SIGN_IN": { "REMEMBER": "记住我", "INVALID_MSG": "用户名或者密码不正确", - "FORGOT_PWD": "忘记密码" + "FORGOT_PWD": "忘记密码", + "HEADER_LINK": "登录" }, "SIGN_UP": { "TITLE": "注册" @@ -18,7 +19,8 @@ "SEND": "发送", "SAVE": "保存", "TEST_MAIL": "测试邮件服务器", - "CLOSE": "关闭" + "CLOSE": "关闭", + "TEST_LDAP": "测试LDAP服务器" }, "TOOLTIP": { "EMAIL": "请使用正确的邮箱地址，比如name@example.com", @@ -256,6 +258,8 @@ "DELETION_SUMMARY_REPO": "确认删除镜像仓库 {{param}}?", "DELETION_TITLE_TAG": "删除镜像标签确认", "DELETION_SUMMARY_TAG": "确认删除镜像标签 {{param}}?", + "DELETION_TITLE_TAG_DENIED": "已签名的镜像不能被删除", + "DELETION_SUMMARY_TAG_DENIED": "要删除此镜像标签必须首先从Notary中删除。", "FILTER_FOR_REPOSITORIES": "过滤镜像仓库", "TAG": "标签", "VERIFIED": "已验证", @@ -330,7 +334,9 @@ "FILTER": "LDAP过滤器", "UID": "LDAP用户标识（UID)", "SCOPE": "lDAP范围" - } + }, + "TEST_MAIL_SUCCESS": "邮件服务器的连通正常", + "TEST_LDAP_SUCCESS": "LDAP服务器的连通正常" }, "PAGE_NOT_FOUND": { "MAIN_TITLE": "页面不存在",