diff --git a/src/ui_ng/favicon.ico b/src/ui_ng/favicon.ico new file mode 100644 index 000000000..8b3d01243 Binary files /dev/null and b/src/ui_ng/favicon.ico differ diff --git a/src/ui_ng/src/app/project/project.css b/src/ui_ng/git similarity index 100% rename from src/ui_ng/src/app/project/project.css rename to src/ui_ng/git diff --git a/src/ui_ng/package.json b/src/ui_ng/package.json index d4398730e..f520967e1 100644 --- a/src/ui_ng/package.json +++ b/src/ui_ng/package.json @@ -4,7 +4,7 @@ "description": "Angular-CLI starter for a Clarity project", "angular-cli": {}, "scripts": { - "start": "ng serve --host 0.0.0.0", + "start": "ng serve --host 0.0.0.0 --proxy-config proxy.config.json", "lint": "tslint \"src/**/*.ts\"", "test": "ng test --single-run", "pree2e": "webdriver-manager update", @@ -24,9 +24,9 @@ "@ngx-translate/http-loader": "0.0.3", "@webcomponents/custom-elements": "1.0.0-alpha.3", "angular2-cookie": "^1.2.6", - "clarity-angular": "^0.8.0", - "clarity-icons": "^0.8.0", - "clarity-ui": "^0.8.0", + "clarity-angular": "0.8.7", + "clarity-icons": "0.8.7", + "clarity-ui": "0.8.7", "core-js": "^2.4.1", "fs": "0.0.1-security", "mutationobserver-shim": "^0.3.2", diff --git a/src/ui_ng/proxy.config.json b/src/ui_ng/proxy.config.json deleted file mode 100644 index 518521657..000000000 --- a/src/ui_ng/proxy.config.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "/api/*": { - "target": "http://10.117.4.165", - "secure": false, - "logLevel": "debug" - }, - "/service/*": { - "target": "http://10.117.4.165", - "secure": false, - "logLevel": "debug" - }, - "/login": { - "target": "http://10.117.4.165", - "secure": false, - "logLevel": "debug" - }, - "/sign_in": { - "target": "http://10.117.4.165", - "secure": false, - "logLevel": "debug" - }, - "/log_out": { - "target": "http://10.117.4.165", - "secure": false, - "logLevel": "debug" - }, - "/sendEmail": { - "target": "http://10.117.4.165", - "secure": false, - "logLevel": "debug" - }, - "/language": { - "target": "http://10.117.4.165", - "secure": false, - "logLevel": "debug" - }, - "/reset": { - "target": "http://10.117.4.165", - "secure": false, - "logLevel": "debug" - } -} \ No newline at end of file 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 4e7be441d..556a1bc59 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,36 +1,39 @@

{{'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 a3f43f2ef..960a8a3ef 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 @@ -10,7 +10,8 @@ import { InlineAlertComponent } from '../../shared/inline-alert/inline-alert.com @Component({ selector: "account-settings-modal", - templateUrl: "account-settings-modal.component.html" + templateUrl: "account-settings-modal.component.html", + styleUrls: ['../../common.css'] }) export class AccountSettingsModalComponent implements OnInit, AfterViewChecked { @@ -19,9 +20,16 @@ export class AccountSettingsModalComponent implements OnInit, AfterViewChecked { account: SessionUser; error: any = null; originalStaticData: SessionUser; + private emailTooltip: string = 'TOOLTIP.EMAIL'; + private validationStateMap: any = { + "account_settings_email": true, + "account_settings_full_name": true + }; + private mailAlreadyChecked = {}; private isOnCalling: boolean = false; private formValueChanged: boolean = false; + private checkOnGoing: boolean = false; accountFormRef: NgForm; @ViewChild("accountSettingsFrom") accountForm: NgForm; @@ -37,6 +45,54 @@ export class AccountSettingsModalComponent implements OnInit, AfterViewChecked { this.account = Object.assign({}, this.session.getCurrentUser()); } + private getValidationState(key: string): boolean { + return this.validationStateMap[key]; + } + + private handleValidation(key: string, flag: boolean): void { + if (flag) { + //Checking + let cont = this.accountForm.controls[key]; + if (cont) { + this.validationStateMap[key] = cont.valid; + //Check email existing from backend + if (cont.valid && key === "account_settings_email") { + if (this.formValueChanged && this.account.email != this.originalStaticData.email) { + if (this.mailAlreadyChecked[this.account.email]) { + this.validationStateMap[key] = !this.mailAlreadyChecked[this.account.email].result; + if (!this.validationStateMap[key]) { + this.emailTooltip = "TOOLTIP.EMAIL_EXISTING"; + } + return; + } + + //Mail changed + this.checkOnGoing = true; + this.session.checkUserExisting("email", this.account.email) + .then((res: boolean) => { + this.checkOnGoing = false; + this.validationStateMap[key] = !res; + if (res) { + this.emailTooltip = "TOOLTIP.EMAIL_EXISTING"; + } + this.mailAlreadyChecked[this.account.email] = { + result: res + }; //Tag it checked + }) + .catch(error => { + this.checkOnGoing = false; + this.validationStateMap[key] = false;//Not valid @ backend + }); + } + } + } + } else { + //Reset + this.validationStateMap[key] = true; + this.emailTooltip = "TOOLTIP.EMAIL"; + } + } + private isUserDataChange(): boolean { if (!this.originalStaticData || !this.account) { return false; @@ -56,13 +112,20 @@ export class AccountSettingsModalComponent implements OnInit, AfterViewChecked { } public get isValid(): boolean { - return this.accountForm && this.accountForm.valid && this.error === null; + return this.accountForm && + this.accountForm.valid && + this.error === null && + this.validationStateMap["account_settings_email"]; //backend check is valid as well } public get showProgress(): boolean { return this.isOnCalling; } + public get checkProgress(): boolean { + return this.checkOnGoing; + } + ngAfterViewChecked(): void { if (this.accountFormRef != this.accountForm) { this.accountFormRef = this.accountForm; @@ -124,9 +187,9 @@ export class AccountSettingsModalComponent implements OnInit, AfterViewChecked { .catch(error => { this.isOnCalling = false; this.error = error; - if(accessErrorHandler(error, this.msgService)){ + if (accessErrorHandler(error, this.msgService)) { this.opened = false; - }else{ + } else { this.inlineAlert.showInlineError(error); } }); diff --git a/src/ui_ng/src/app/account/account.module.ts b/src/ui_ng/src/app/account/account.module.ts index 0c95bf14e..254df097e 100644 --- a/src/ui_ng/src/app/account/account.module.ts +++ b/src/ui_ng/src/app/account/account.module.ts @@ -9,14 +9,17 @@ import { SharedModule } from '../shared/shared.module'; import { SignUpComponent } from './sign-up/sign-up.component'; import { ForgotPasswordComponent } from './password/forgot-password.component'; import { ResetPasswordComponent } from './password/reset-password.component'; +import { SignUpPageComponent } from './sign-up/sign-up-page.component'; import { PasswordSettingService } from './password/password-setting.service'; +import { RepositoryModule } from '../repository/repository.module'; @NgModule({ imports: [ CoreModule, RouterModule, - SharedModule + SharedModule, + RepositoryModule ], declarations: [ SignInComponent, @@ -24,12 +27,14 @@ import { PasswordSettingService } from './password/password-setting.service'; AccountSettingsModalComponent, SignUpComponent, ForgotPasswordComponent, - ResetPasswordComponent], + ResetPasswordComponent, + SignUpPageComponent], exports: [ SignInComponent, PasswordSettingComponent, AccountSettingsModalComponent, - ResetPasswordComponent], + ResetPasswordComponent, + SignUpPageComponent], providers: [PasswordSettingService] }) 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 c9bb505fb..70cbf4042 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,17 +1,18 @@

{{'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 1a7964751..ab0a996ef 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 @@ -8,7 +8,7 @@ import { InlineAlertComponent } from '../../shared/inline-alert/inline-alert.com @Component({ selector: 'forgot-password', templateUrl: "forgot-password.component.html", - styleUrls: ['password.component.css'] + styleUrls: ['password.component.css', '../../common.css'] }) export class ForgotPasswordComponent { opened: boolean = false; 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 5d3a461e2..8a48f6d47 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,51 +1,51 @@

{{'CHANGE_PWD.TITLE' | translate}}

-
+ +
-
- +
+
-
- +
+
-
- +
+
-
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 4fcd04d15..46127c645 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 @@ -11,7 +11,8 @@ import { InlineAlertComponent } from '../../shared/inline-alert/inline-alert.com @Component({ selector: 'password-setting', - templateUrl: "password-setting.component.html" + templateUrl: "password-setting.component.html", + styleUrls: ['../../common.css'] }) export class PasswordSettingComponent implements AfterViewChecked { opened: boolean = false; diff --git a/src/ui_ng/src/app/account/password/password.component.css b/src/ui_ng/src/app/account/password/password.component.css index 3661be1bf..da42992cf 100644 --- a/src/ui_ng/src/app/account/password/password.component.css +++ b/src/ui_ng/src/app/account/password/password.component.css @@ -1,3 +1,7 @@ .reset-modal-title-override { font-size: 14px !important; +} + +.form-group-override { + padding-left: 130px !important; } \ No newline at end of file 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 90571eab4..499db9933 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 @@ -5,7 +5,7 @@
- +
- +
- + \ 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 f69d11619..9d0171f72 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 @@ -7,11 +7,12 @@ import { SessionService } from '../../shared/session.service'; import { SignInCredential } from '../../shared/sign-in-credential'; import { SignUpComponent } from '../sign-up/sign-up.component'; -import { harborRootRoute } from '../../shared/shared.const'; +import { CommonRoutes } from '../../shared/shared.const'; import { ForgotPasswordComponent } from '../password/forgot-password.component'; import { AppConfigService } from '../../app-config.service'; import { AppConfig } from '../../app-config'; +import { User } from '../../user/user'; //Define status flags for signing in states export const signInStatusNormal = 0; @@ -105,6 +106,17 @@ export class SignInComponent implements AfterViewChecked, OnInit { } + //Fill the new user info into the sign in form + private handleUserCreation(user: User): void { + if(user){ + this.currentForm.setValue({ + "login_username": user.username, + "login_password": user.password + }); + + } + } + //Implement interface //Watch the view change only when view is in error state ngAfterViewChecked() { @@ -139,7 +151,7 @@ export class SignInComponent implements AfterViewChecked, OnInit { //Redirect to the right route if (this.redirectUrl === "") { //Routing to the default location - this.router.navigateByUrl(harborRootRoute); + this.router.navigateByUrl(CommonRoutes.HARBOR_DEFAULT); } else { this.router.navigateByUrl(this.redirectUrl); } diff --git a/src/ui_ng/src/app/account/sign-up/sign-up-page.component.html b/src/ui_ng/src/app/account/sign-up/sign-up-page.component.html new file mode 100644 index 000000000..bf6ecd161 --- /dev/null +++ b/src/ui_ng/src/app/account/sign-up/sign-up-page.component.html @@ -0,0 +1,7 @@ +

{{'SIGN_UP.TITLE' | translate}}

+ +
+ + + +
\ No newline at end of file diff --git a/src/ui_ng/src/app/account/sign-up/sign-up-page.component.ts b/src/ui_ng/src/app/account/sign-up/sign-up-page.component.ts new file mode 100644 index 000000000..ae1d1a632 --- /dev/null +++ b/src/ui_ng/src/app/account/sign-up/sign-up-page.component.ts @@ -0,0 +1,97 @@ +import { Component, Output, ViewChild, OnInit } from '@angular/core'; +import { NgForm } from '@angular/forms'; +import { Router } from '@angular/router'; + +import { NewUserFormComponent } from '../../shared/new-user-form/new-user-form.component'; +import { User } from '../../user/user'; + +import { UserService } from '../../user/user.service'; +import { errorHandler } from '../../shared/shared.utils'; +import { AlertType } from '../../shared/shared.const'; + +import { MessageService } from '../../global-message/message.service'; + +@Component({ + selector: 'sign-up-page', + templateUrl: "sign-up-page.component.html" +}) +export class SignUpPageComponent implements OnInit { + private error: any; + private onGoing: boolean = false; + private formValueChanged: boolean = false; + + constructor( + private userService: UserService, + private msgService: MessageService, + private router: Router) { } + + @ViewChild(NewUserFormComponent) + private newUserForm: NewUserFormComponent; + + private getNewUser(): User { + return this.newUserForm.getData(); + } + + public get inProgress(): boolean { + return this.onGoing; + } + + public get isValid(): boolean { + return this.newUserForm.isValid && this.error == null; + } + + public get canBeCancelled(): boolean { + return this.formValueChanged && this.newUserForm && !this.newUserForm.isEmpty(); + } + + ngOnInit(): void { + this.newUserForm.reset();//Reset form + this.formValueChanged = false; + } + + formValueChange(flag: boolean): void { + if (flag) { + this.formValueChanged = true; + } + if (this.error != null) { + this.error = null;//clear error + } + } + + cancel(): void { + if (this.newUserForm) { + this.newUserForm.reset(); + } + } + + //Create new user + create(): void { + //Double confirm everything is ok + //Form is valid + if (!this.isValid) { + return; + } + + //We have new user data + let u = this.getNewUser(); + if (!u) { + return; + } + + //Start process + this.onGoing = true; + + this.userService.addUser(u) + .then(() => { + this.onGoing = false; + this.msgService.announceMessage(200, "", AlertType.SUCCESS); + //Navigate to embeded sign-in + this.router.navigate(['harbor', 'sign-in']); + }) + .catch(error => { + this.onGoing = false; + this.error = error + this.msgService.announceMessage(error.status | 500, "", AlertType.WARNING); + }); + } +} \ No newline at end of file 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 ddd5b5d48..54a5dd4ac 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,8 +1,8 @@

{{'SIGN_UP.TITLE' | translate}}

+
-
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 60743f587..f94c5b75f 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 @@ -1,4 +1,4 @@ -import { Component, Output, ViewChild } from '@angular/core'; +import { Component, Output, ViewChild, EventEmitter } from '@angular/core'; import { NgForm } from '@angular/forms'; import { NewUserFormComponent } from '../../shared/new-user-form/new-user-form.component'; @@ -22,6 +22,8 @@ export class SignUpComponent { private onGoing: boolean = false; private formValueChanged: boolean = false; + @Output() userCreation = new EventEmitter(); + constructor( private session: SessionService, private userService: UserService) { } @@ -103,6 +105,7 @@ export class SignUpComponent { .then(() => { this.onGoing = false; this.modal.close(); + this.userCreation.emit(u); }) .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 index 529ab1739..5e7a4d0e6 100644 --- a/src/ui_ng/src/app/app-config.service.ts +++ b/src/ui_ng/src/app/app-config.service.ts @@ -38,4 +38,10 @@ export class AppConfigService { public getConfig(): AppConfig { return this.configurations; } + + public isIntegrationMode(): boolean { + return this.configurations && + this.configurations.with_admiral && + this.configurations.admiral_endpoint.trim() != ""; + } } \ 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 3f117d6b5..a46f17f50 100644 --- a/src/ui_ng/src/app/app.module.ts +++ b/src/ui_ng/src/app/app.module.ts @@ -19,7 +19,7 @@ import { Http } from '@angular/http'; import { AppConfigService } from './app-config.service'; export function HttpLoaderFactory(http: Http) { - return new TranslateHttpLoader(http, 'ng/i18n/lang/', '-lang.json'); + return new TranslateHttpLoader(http, 'i18n/lang/', '-lang.json'); } export function initConfig(configService: AppConfigService) { diff --git a/src/ui_ng/src/app/base/global-search/global-search.component.ts b/src/ui_ng/src/app/base/global-search/global-search.component.ts index 6fdbd9aa3..8c05dba6e 100644 --- a/src/ui_ng/src/app/base/global-search/global-search.component.ts +++ b/src/ui_ng/src/app/base/global-search/global-search.component.ts @@ -5,7 +5,6 @@ import { Observable } from 'rxjs/Observable'; import { Subscription } from 'rxjs/Subscription'; import { SearchTriggerService } from './search-trigger.service'; -import { harborRootRoute } from '../../shared/shared.const'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; @@ -35,7 +34,7 @@ export class GlobalSearchComponent implements OnInit, OnDestroy { ngOnInit(): void { this.searchSub = this.searchTerms .debounceTime(deBounceTime) - .distinctUntilChanged() + //.distinctUntilChanged() .subscribe(term => { this.searchTrigger.triggerSearch(term); }); diff --git a/src/ui_ng/src/app/base/global-search/search-result.component.css b/src/ui_ng/src/app/base/global-search/search-result.component.css index c1ee21565..d3e70fc46 100644 --- a/src/ui_ng/src/app/base/global-search/search-result.component.css +++ b/src/ui_ng/src/app/base/global-search/search-result.component.css @@ -1,14 +1,16 @@ .search-overlay { display: block; - position: absolute; + position: fixed; height: 100%; - width: 98%; + width: 100%; /*shoud be lesser than 1000 to aoivd override the popup menu*/ z-index: 999; box-sizing: border-box; background: #fafafa; - top: 0px; - padding-left: 24px; + top: 60px; + left: 0px; + padding-left: 36px; + padding-right: 24px; } .search-header { @@ -47,4 +49,8 @@ position: relative; top: 8px; margin: 0px auto 0px auto; +} + +.search-header a:hover { + text-decoration: none; } \ No newline at end of file diff --git a/src/ui_ng/src/app/base/global-search/search-result.component.html b/src/ui_ng/src/app/base/global-search/search-result.component.html index a4a1935d3..2edc6107f 100644 --- a/src/ui_ng/src/app/base/global-search/search-result.component.html +++ b/src/ui_ng/src/app/base/global-search/search-result.component.html @@ -1,20 +1,14 @@
- Search results for '{{currentTerm}}' - - - + < {{'SEARCH.BACK' | translate}}
- +
-

Projects

-
- -
+

{{'PROJECT.PROJECTS' | translate}}

-

Repositories

+

{{'PROJECT_DETAIL.REPOSITORIES' | translate}}

\ No newline at end of file diff --git a/src/ui_ng/src/app/base/global-search/search-result.component.ts b/src/ui_ng/src/app/base/global-search/search-result.component.ts index f41b23801..fc2f5b484 100644 --- a/src/ui_ng/src/app/base/global-search/search-result.component.ts +++ b/src/ui_ng/src/app/base/global-search/search-result.component.ts @@ -35,10 +35,6 @@ export class SearchResultComponent { private msgService: MessageService, private searchTrigger: SearchTriggerService) { } - private doFilterProjects(event: string) { - this.searchResults.project = this.originalCopy.project.filter(pro => pro.name.indexOf(event) != -1); - } - private clone(src: SearchResults): SearchResults { let res: SearchResults = new SearchResults(); diff --git a/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.css b/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.css index 01a92f012..3756d813f 100644 --- a/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.css +++ b/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.css @@ -7,7 +7,6 @@ } .start-content-padding { - padding-top: 0px !important; - padding-bottom: 0px !important; - padding-left: 0px !important; + padding: 0px !important; + background-color: white; } \ No newline at end of file diff --git a/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.html b/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.html index 956d26017..40357dbb3 100644 --- a/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.html +++ b/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.html @@ -2,7 +2,7 @@
-
+
@@ -10,10 +10,9 @@
Management - Registry + Registry
- {{'SIGN_IN.HEADER_LINK' | translate}} -
- {{'SIGN_UP.TITLE' | translate}} - - - - + + + {{'CONFIG.TOOLTIP.TOKEN_EXPIRATION' | translate}} + +
+
+ + + +
+ + + + + +
\ 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 764e1b619..15f353489 100644 --- a/src/ui_ng/src/app/config/config.component.ts +++ b/src/ui_ng/src/app/config/config.component.ts @@ -5,12 +5,12 @@ import { NgForm } from '@angular/forms'; import { ConfigurationService } from './config.service'; import { Configuration } from './config'; import { MessageService } from '../global-message/message.service'; -import { AlertType, DeletionTargets } from '../shared/shared.const'; +import { AlertType, ConfirmationTargets, ConfirmationState } from '../shared/shared.const'; import { errorHandler, accessErrorHandler } from '../shared/shared.utils'; import { StringValueItem } from './config'; -import { DeletionDialogService } from '../shared/deletion-dialog/deletion-dialog.service'; +import { ConfirmationDialogService } from '../shared/confirmation-dialog/confirmation-dialog.service'; import { Subscription } from 'rxjs/Subscription'; -import { DeletionMessage } from '../shared/deletion-dialog/deletion-message' +import { ConfirmationMessage } from '../shared/confirmation-dialog/confirmation-message' import { ConfigurationAuthComponent } from './auth/config-auth.component'; import { ConfigurationEmailComponent } from './email/config-email.component'; @@ -40,15 +40,19 @@ export class ConfigurationComponent implements OnInit, OnDestroy { constructor( private msgService: MessageService, private configService: ConfigurationService, - private confirmService: DeletionDialogService, + private confirmService: ConfirmationDialogService, private appConfigService: AppConfigService) { } ngOnInit(): void { //First load this.retrieveConfig(); - this.confirmSub = this.confirmService.deletionConfirm$.subscribe(confirmation => { - this.reset(confirmation.data); + this.confirmSub = this.confirmService.confirmationConfirm$.subscribe(confirmation => { + if (confirmation && + confirmation.state === ConfirmationState.CONFIRMED && + confirmation.source === ConfirmationTargets.CONFIG) { + this.reset(confirmation.data); + } }); } @@ -125,7 +129,7 @@ export class ConfigurationComponent implements OnInit, OnDestroy { this.retrieveConfig(); //Reload bootstrap option - this.appConfigService.load().catch(error=> console.error("Failed to reload bootstrap option with error: ", error)); + 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); }) @@ -150,12 +154,12 @@ export class ConfigurationComponent implements OnInit, OnDestroy { public cancel(): void { let changes = this.getChanges(); if (!this.isEmpty(changes)) { - let msg = new DeletionMessage( + let msg = new ConfirmationMessage( "CONFIG.CONFIRM_TITLE", "CONFIG.CONFIRM_SUMMARY", "", changes, - DeletionTargets.EMPTY + ConfirmationTargets.CONFIG ); this.confirmService.openComfirmDialog(msg); } else { diff --git a/src/ui_ng/src/app/global-message/message.component.ts b/src/ui_ng/src/app/global-message/message.component.ts index 1b6c7d9d5..ea5f70f9e 100644 --- a/src/ui_ng/src/app/global-message/message.component.ts +++ b/src/ui_ng/src/app/global-message/message.component.ts @@ -6,7 +6,7 @@ import { TranslateService } from '@ngx-translate/core'; import { Message } from './message'; import { MessageService } from './message.service'; -import { AlertType, dismissInterval, httpStatusCode } from '../shared/shared.const'; +import { AlertType, dismissInterval, httpStatusCode, CommonRoutes } from '../shared/shared.const'; @Component({ selector: 'global-message', @@ -94,7 +94,7 @@ export class MessageComponent implements OnInit { } signIn(): void { - this.router.navigate(['sign-in']); + this.router.navigate([CommonRoutes.EMBEDDED_SIGN_IN]); } onClose() { diff --git a/src/ui_ng/src/app/harbor-routing.module.ts b/src/ui_ng/src/app/harbor-routing.module.ts index 6b625f3d9..775d3523c 100644 --- a/src/ui_ng/src/app/harbor-routing.module.ts +++ b/src/ui_ng/src/app/harbor-routing.module.ts @@ -19,7 +19,6 @@ import { ReplicationComponent } from './replication/replication.component'; import { MemberComponent } from './project/member/member.component'; import { AuditLogComponent } from './log/audit-log.component'; -import { BaseRoutingResolver } from './shared/route/base-routing-resolver.service'; import { ProjectRoutingResolver } from './project/project-routing-resolver.service'; import { SystemAdminGuard } from './shared/route/system-admin-activate.service'; import { SignUpComponent } from './account/sign-up/sign-up.component'; @@ -28,43 +27,40 @@ import { RecentLogComponent } from './log/recent-log.component'; import { ConfigurationComponent } from './config/config.component'; import { PageNotFoundComponent } from './shared/not-found/not-found.component' import { StartPageComponent } from './base/start-page/start.component'; +import { SignUpPageComponent } from './account/sign-up/sign-up-page.component'; import { AuthCheckGuard } from './shared/route/auth-user-activate.service'; import { SignInGuard } from './shared/route/sign-in-guard-activate.service'; +import { LeavingConfigRouteDeactivate } from './shared/route/leaving-config-deactivate.service'; const harborRoutes: Routes = [ - { path: '', redirectTo: '/harbor/dashboard', pathMatch: 'full' }, - { path: 'harbor', redirectTo: '/harbor/dashboard', pathMatch: 'full' }, - { path: 'sign-in', component: SignInComponent, canActivate: [SignInGuard] }, - { path: 'sign-up', component: SignUpComponent }, + { path: '', redirectTo: 'harbor', pathMatch: 'full' }, { path: 'password-reset', component: ResetPasswordComponent }, { path: 'harbor', component: HarborShellComponent, + canActivateChild: [AuthCheckGuard], children: [ + { path: '', redirectTo: 'sign-in', pathMatch: 'full' }, { path: 'sign-in', component: SignInComponent, canActivate: [SignInGuard] }, - { path: 'sign-up', component: SignUpComponent }, - { path: 'dashboard', component: StartPageComponent, canActivate: [AuthCheckGuard]}, { path: 'projects', - component: ProjectComponent, - canActivate: [AuthCheckGuard] + component: ProjectComponent }, { path: 'logs', - component: RecentLogComponent, - canActivate: [AuthCheckGuard] + component: RecentLogComponent }, { path: 'users', component: UserComponent, - canActivate: [AuthCheckGuard, SystemAdminGuard] + canActivate: [SystemAdminGuard] }, { path: 'replications', component: ReplicationManagementComponent, - canActivate: [AuthCheckGuard, SystemAdminGuard], - canActivateChild: [AuthCheckGuard, SystemAdminGuard], + canActivate: [SystemAdminGuard], + canActivateChild: [SystemAdminGuard], children: [ { path: 'rules', @@ -78,14 +74,11 @@ const harborRoutes: Routes = [ }, { path: 'tags/:id/:repo', - component: TagRepositoryComponent, - canActivate: [AuthCheckGuard] + component: TagRepositoryComponent }, { path: 'projects/:id', component: ProjectDetailComponent, - canActivate: [AuthCheckGuard], - canActivateChild: [AuthCheckGuard], resolve: { projectResolver: ProjectRoutingResolver }, @@ -111,7 +104,8 @@ const harborRoutes: Routes = [ { path: 'configs', component: ConfigurationComponent, - canActivate: [AuthCheckGuard, SystemAdminGuard], + canActivate: [SystemAdminGuard], + canDeactivate: [LeavingConfigRouteDeactivate] } ] }, diff --git a/src/ui_ng/src/app/log/audit-log.component.css b/src/ui_ng/src/app/log/audit-log.component.css new file mode 100644 index 000000000..f2ead1afc --- /dev/null +++ b/src/ui_ng/src/app/log/audit-log.component.css @@ -0,0 +1,5 @@ +.option-right { + padding-right: 16px; + margin-top: 22px; + margin-bottom: 2px; +} \ No newline at end of file diff --git a/src/ui_ng/src/app/log/audit-log.component.html b/src/ui_ng/src/app/log/audit-log.component.html index 61f2531b5..621bffede 100644 --- a/src/ui_ng/src/app/log/audit-log.component.html +++ b/src/ui_ng/src/app/log/audit-log.component.html @@ -1,18 +1,16 @@
-
+
-
-
-
+
@@ -24,6 +22,8 @@
+
+
{{'AUDIT_LOG.USERNAME' | translate}} {{'AUDIT_LOG.REPOSITORY_NAME' | translate}} diff --git a/src/ui_ng/src/app/log/audit-log.component.ts b/src/ui_ng/src/app/log/audit-log.component.ts index 960405b01..41a46f4f0 100644 --- a/src/ui_ng/src/app/log/audit-log.component.ts +++ b/src/ui_ng/src/app/log/audit-log.component.ts @@ -30,9 +30,10 @@ class FilterOption { } @Component({ + moduleId: module.id, selector: 'audit-log', templateUrl: './audit-log.component.html', - styleUrls: [ 'audit-log.css' ] + styleUrls: [ './audit-log.component.css' ] }) export class AuditLogComponent implements OnInit { diff --git a/src/ui_ng/src/app/log/audit-log.css b/src/ui_ng/src/app/log/audit-log.css deleted file mode 100644 index 32fc27c22..000000000 --- a/src/ui_ng/src/app/log/audit-log.css +++ /dev/null @@ -1,3 +0,0 @@ -.advance-option { - font-size: 12px; -} diff --git a/src/ui_ng/src/app/project/create-project/create-project.component.html b/src/ui_ng/src/app/project/create-project/create-project.component.html index d6b6d93cc..dec87b6a6 100644 --- a/src/ui_ng/src/app/project/create-project/create-project.component.html +++ b/src/ui_ng/src/app/project/create-project/create-project.component.html @@ -1,15 +1,9 @@

{{'PROJECT.NEW_PROJECT' | translate}}

+
- -
- - {{errorMessage}} - -
-