diff --git a/src/ui/views/reset-password-mail.tpl b/src/ui/views/reset-password-mail.tpl new file mode 100644 index 000000000..31fb438ef --- /dev/null +++ b/src/ui/views/reset-password-mail.tpl @@ -0,0 +1,21 @@ + + + + +

Please click this link to reset your password:

+ {{.URL}}/reset_password?reset_uuid={{.UUID}} + + diff --git a/src/ui_ng/src/app/harbor-routing.module.ts b/src/ui_ng/src/app/harbor-routing.module.ts index 967a3c402..583071bfb 100644 --- a/src/ui_ng/src/app/harbor-routing.module.ts +++ b/src/ui_ng/src/app/harbor-routing.module.ts @@ -76,7 +76,10 @@ const harborRoutes: Routes = [ }, { path: 'tags/:id/:repo', - component: TagRepositoryComponent + component: TagRepositoryComponent, + resolve: { + projectResolver: ProjectRoutingResolver + } }, { path: 'projects/:id', diff --git a/src/ui_ng/src/app/log/audit-log.service.ts b/src/ui_ng/src/app/log/audit-log.service.ts index 320d589b5..28be16021 100644 --- a/src/ui_ng/src/app/log/audit-log.service.ts +++ b/src/ui_ng/src/app/log/audit-log.service.ts @@ -1,8 +1,6 @@ import { Injectable } from '@angular/core'; import { Http, Headers, RequestOptions } from '@angular/http'; -import { BaseService } from '../service/base.service'; - import { AuditLog } from './audit-log'; import { Observable } from 'rxjs/Observable'; @@ -13,7 +11,7 @@ import 'rxjs/add/observable/throw'; export const logEndpoint = "/api/logs"; @Injectable() -export class AuditLogService extends BaseService { +export class AuditLogService { private httpOptions = new RequestOptions({ headers: new Headers({ "Content-Type": 'application/json', @@ -21,9 +19,7 @@ export class AuditLogService extends BaseService { }) }); - constructor(private http: Http) { - super(); - } + constructor(private http: Http) {} listAuditLogs(queryParam: AuditLog): Observable { return this.http @@ -36,12 +32,12 @@ export class AuditLogService extends BaseService { username: queryParam.username }) .map(response => response) - .catch(error => this.handleError(error)); + .catch(error => Observable.throw(error)); } getRecentLogs(lines: number): Observable { return this.http.get(logEndpoint + "?lines=" + lines, this.httpOptions) .map(response => response.json() as AuditLog[]) - .catch(error => this.handleError(error)); + .catch(error => Observable.throw(error)); } } \ No newline at end of file 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 725f538a6..785ba7fe9 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 @@ -31,6 +31,6 @@
- +
diff --git a/src/ui_ng/src/app/project/list-project/list-project.component.html b/src/ui_ng/src/app/project/list-project/list-project.component.html index fa6074706..c04437c00 100644 --- a/src/ui_ng/src/app/project/list-project/list-project.component.html +++ b/src/ui_ng/src/app/project/list-project/list-project.component.html @@ -1,9 +1,9 @@ {{'PROJECT.NAME' | translate}} {{'PROJECT.PUBLIC_OR_PRIVATE' | translate}} + {{'PROJECT.ROLE' | translate}} {{'PROJECT.REPO_COUNT'| translate}} {{'PROJECT.CREATION_TIME' | translate}} - {{'PROJECT.DESCRIPTION' | translate}} @@ -12,9 +12,9 @@ {{p.name}} {{ (p.public === 1 ? 'PROJECT.PUBLIC' : 'PROJECT.PRIVATE') | translate}} + {{roleInfo[p.current_user_role_id] | translate}} {{p.repo_count}} {{p.creation_time}} - {{p.description}} {{totalRecordCount || (projects ? projects.length : 0)}} {{'PROJECT.ITEMS' | translate}} diff --git a/src/ui_ng/src/app/project/list-project/list-project.component.ts b/src/ui_ng/src/app/project/list-project/list-project.component.ts index c4a5895cb..1a4c8b5ea 100644 --- a/src/ui_ng/src/app/project/list-project/list-project.component.ts +++ b/src/ui_ng/src/app/project/list-project/list-project.component.ts @@ -5,7 +5,7 @@ import { ProjectService } from '../project.service'; import { SessionService } from '../../shared/session.service'; import { SearchTriggerService } from '../../base/global-search/search-trigger.service'; -import { ListMode } from '../../shared/shared.const'; +import { ListMode, ProjectTypes, RoleInfo } from '../../shared/shared.const'; import { State } from 'clarity-angular'; @@ -24,6 +24,8 @@ export class ListProjectComponent implements OnInit { @Input() totalRecordCount: number; pageOffset: number = 1; + @Input() filteredType: string; + @Output() paginate = new EventEmitter(); @Output() toggle = new EventEmitter(); @@ -31,6 +33,8 @@ export class ListProjectComponent implements OnInit { @Input() mode: string = ListMode.FULL; + roleInfo = RoleInfo; + constructor( private session: SessionService, private router: Router, @@ -43,6 +47,10 @@ export class ListProjectComponent implements OnInit { return this.mode === ListMode.FULL && this.session.getCurrentUser() != null; } + get showRoleInfo(): boolean { + return this.listFullMode && this.filteredType === ProjectTypes[0]; + } + public get isSystemAdmin(): boolean { let account = this.session.getCurrentUser(); return account != null && account.has_admin_role > 0; diff --git a/src/ui_ng/src/app/project/member/add-member/add-member.component.html b/src/ui_ng/src/app/project/member/add-member/add-member.component.html index 844ddd209..55764ae35 100644 --- a/src/ui_ng/src/app/project/member/add-member/add-member.component.html +++ b/src/ui_ng/src/app/project/member/add-member/add-member.component.html @@ -36,6 +36,6 @@
- +
diff --git a/src/ui_ng/src/app/project/member/member.component.html b/src/ui_ng/src/app/project/member/member.component.html index a0563db81..ac4a5ea5f 100644 --- a/src/ui_ng/src/app/project/member/member.component.html +++ b/src/ui_ng/src/app/project/member/member.component.html @@ -17,15 +17,15 @@ {{'MEMBER.NAME' | translate}} {{'MEMBER.ROLE' | translate}} - - - - - - + + + + + + - {{u.username}} - {{roleInfo[u.role_id] | translate}} + {{m.username}} + {{roleInfo[m.role_id] | translate}} {{ (members ? members.length : 0) }} {{'MEMBER.ITEMS' | translate}} diff --git a/src/ui_ng/src/app/project/member/member.component.ts b/src/ui_ng/src/app/project/member/member.component.ts index b13b04c3b..765f67ee6 100644 --- a/src/ui_ng/src/app/project/member/member.component.ts +++ b/src/ui_ng/src/app/project/member/member.component.ts @@ -15,6 +15,8 @@ import { ConfirmationDialogService } from '../../shared/confirmation-dialog/conf import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; import { SessionService } from '../../shared/session.service'; +import { RoleInfo } from '../../shared/shared.const'; + import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/switchMap'; import 'rxjs/add/operator/catch'; @@ -22,7 +24,7 @@ import 'rxjs/add/operator/map'; import 'rxjs/add/observable/throw'; import { Subscription } from 'rxjs/Subscription'; -export const roleInfo: {} = { 1: 'MEMBER.PROJECT_ADMIN', 2: 'MEMBER.DEVELOPER', 3: 'MEMBER.GUEST' }; +import { Project } from '../../project/project'; @Component({ moduleId: module.id, @@ -31,31 +33,22 @@ export const roleInfo: {} = { 1: 'MEMBER.PROJECT_ADMIN', 2: 'MEMBER.DEVELOPER', }) export class MemberComponent implements OnInit, OnDestroy { - currentUser: SessionUser; members: Member[]; projectId: number; - roleInfo = roleInfo; + roleInfo = RoleInfo; private delSub: Subscription; @ViewChild(AddMemberComponent) addMemberComponent: AddMemberComponent; + currentUser: SessionUser; hasProjectAdminRole: boolean; constructor(private route: ActivatedRoute, private router: Router, private memberService: MemberService, private messageService: MessageService, private deletionDialogService: ConfirmationDialogService, - session: SessionService) { - //Get current user from registered resolver. - this.currentUser = session.getCurrentUser(); - let projectMembers: Member[] = session.getProjectMembers(); - if(this.currentUser && projectMembers) { - let currentMember = projectMembers.find(m=>m.user_id === this.currentUser.user_id); - if(currentMember) { - this.hasProjectAdminRole = (currentMember.role_name === 'projectAdmin'); - } - } - + private session: SessionService) { + this.delSub = deletionDialogService.confirmationConfirm$.subscribe(message => { if (message && message.state === ConfirmationState.CONFIRMED && @@ -82,8 +75,7 @@ export class MemberComponent implements OnInit, OnDestroy { error => { this.router.navigate(['/harbor', 'projects']); this.messageService.announceMessage(error.status, 'Failed to get project member with project ID:' + projectId, AlertType.DANGER); - } - ); + }); } ngOnDestroy() { @@ -97,6 +89,15 @@ export class MemberComponent implements OnInit, OnDestroy { this.projectId = +this.route.snapshot.parent.params['id']; console.log('Get projectId from route params snapshot:' + this.projectId); + this.currentUser = this.session.getCurrentUser(); + //Get current user from registered resolver. + let resolverData = this.route.snapshot.parent.data; + if(resolverData) { + this.hasProjectAdminRole = (resolverData['projectResolver']).has_project_admin_role; + } + + + this.retrieve(this.projectId, ''); } @@ -108,25 +109,27 @@ export class MemberComponent implements OnInit, OnDestroy { this.retrieve(this.projectId, ''); } - changeRole(userId: number, roleId: number) { - this.memberService - .changeMemberRole(this.projectId, userId, roleId) - .subscribe( - response => { - this.messageService.announceMessage(response, 'MEMBER.SWITCHED_SUCCESS', AlertType.SUCCESS); - console.log('Successful change role with user ' + userId + ' to roleId ' + roleId); - this.retrieve(this.projectId, ''); - }, - error => this.messageService.announceMessage(error.status, 'Failed to change role with user ' + userId + ' to roleId ' + roleId, AlertType.DANGER) - ); + changeRole(m: Member, roleId: number) { + if(m) { + this.memberService + .changeMemberRole(this.projectId, m.user_id, roleId) + .subscribe( + response => { + this.messageService.announceMessage(response, 'MEMBER.SWITCHED_SUCCESS', AlertType.SUCCESS); + console.log('Successful change role with user ' + m.user_id + ' to roleId ' + roleId); + this.retrieve(this.projectId, ''); + }, + error => this.messageService.announceMessage(error.status, 'Failed to change role with user ' + m.user_id + ' to roleId ' + roleId, AlertType.DANGER) + ); + } } - deleteMember(userId: number) { + deleteMember(m: Member) { let deletionMessage: ConfirmationMessage = new ConfirmationMessage( 'MEMBER.DELETION_TITLE', 'MEMBER.DELETION_SUMMARY', - userId + "", - userId, + m.username, + m.user_id, ConfirmationTargets.PROJECT_MEMBER ); this.deletionDialogService.openComfirmDialog(deletionMessage); diff --git a/src/ui_ng/src/app/project/member/member.service.ts b/src/ui_ng/src/app/project/member/member.service.ts index 5578b1083..28cb0c895 100644 --- a/src/ui_ng/src/app/project/member/member.service.ts +++ b/src/ui_ng/src/app/project/member/member.service.ts @@ -6,22 +6,19 @@ import 'rxjs/add/operator/catch'; import 'rxjs/add/operator/map'; import 'rxjs/add/observable/throw'; -import { BaseService } from '../../service/base.service'; import { Member } from './member'; @Injectable() -export class MemberService extends BaseService { +export class MemberService { - constructor(private http: Http) { - super(); - } + constructor(private http: Http) {} listMembers(projectId: number, username: string): Observable { console.log('Get member from project_id:' + projectId + ', username:' + username); return this.http .get(`/api/projects/${projectId}/members?username=${username}`) - .map(response=>response.json()) - .catch(error=>this.handleError(error)); + .map(response=>response.json() as Member[]) + .catch(error=>Observable.throw(error)); } addMember(projectId: number, username: string, roleId: number): Observable { diff --git a/src/ui_ng/src/app/project/project-detail/project-detail.component.html b/src/ui_ng/src/app/project/project-detail/project-detail.component.html index ccfd09356..b33359980 100644 --- a/src/ui_ng/src/app/project/project-detail/project-detail.component.html +++ b/src/ui_ng/src/app/project/project-detail/project-detail.component.html @@ -5,10 +5,10 @@
  • {{'PROJECT_DETAIL.REPOSITORIES' | translate}}
    • -
  • +
  • {{'PROJECT_DETAIL.USERS' | translate}}
    • -
  • +
  • {{'PROJECT_DETAIL.LOGS' | translate}}
  • diff --git a/src/ui_ng/src/app/project/project-detail/project-detail.component.ts b/src/ui_ng/src/app/project/project-detail/project-detail.component.ts index 9914eb253..b5128b252 100644 --- a/src/ui_ng/src/app/project/project-detail/project-detail.component.ts +++ b/src/ui_ng/src/app/project/project-detail/project-detail.component.ts @@ -4,6 +4,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { Project } from '../project'; import { SessionService } from '../../shared/session.service'; +import { ProjectService } from '../../project/project.service'; @Component({ selector: 'project-detail', @@ -13,13 +14,18 @@ import { SessionService } from '../../shared/session.service'; export class ProjectDetailComponent { currentProject: Project; + isMember: boolean; constructor( private route: ActivatedRoute, private router: Router, - private sessionService: SessionService) { - this.route.data.subscribe(data=>this.currentProject = data['projectResolver']); + private sessionService: SessionService, + private projectService: ProjectService) { + this.route.data.subscribe(data=>{ + this.currentProject = data['projectResolver']; + this.isMember = this.currentProject.is_member; + }); } public get isSystemAdmin(): boolean { diff --git a/src/ui_ng/src/app/project/project-routing-resolver.service.ts b/src/ui_ng/src/app/project/project-routing-resolver.service.ts index 92e80906f..d479b5669 100644 --- a/src/ui_ng/src/app/project/project-routing-resolver.service.ts +++ b/src/ui_ng/src/app/project/project-routing-resolver.service.ts @@ -3,23 +3,43 @@ import { Router, Resolve, RouterStateSnapshot, ActivatedRouteSnapshot } from '@a import { Project } from './project'; import { ProjectService } from './project.service'; +import { SessionService } from '../shared/session.service'; +import 'rxjs/add/operator/mergeMap'; @Injectable() export class ProjectRoutingResolver implements Resolve{ - constructor(private projectService: ProjectService, private router: Router) {} + constructor( + private sessionService: SessionService, + private projectService: ProjectService, + private router: Router) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise { - let projectId = route.params['id']; + let projectId = route.params['id']; + console.log('Project resolver, projectID:' + projectId); return this.projectService .getProject(projectId) - .then(project=> { - if(project) { - return project; - } else { - this.router.navigate(['/harbor', 'projects']); - return null; - } + .toPromise() + .then((project: Project)=> { + if(project) { + let currentUser = this.sessionService.getCurrentUser(); + let projectMembers = this.sessionService.getProjectMembers(); + if(currentUser && projectMembers) { + let currentMember = projectMembers.find(m=>m.user_id === currentUser.user_id); + if(currentMember) { + project.is_member = true; + project.has_project_admin_role = (currentMember.role_name === 'projectAdmin') || currentUser.has_admin_role === 1; + } + } + return project; + } else { + this.router.navigate(['/harbor', 'projects']); + return null; + } + }).catch(error=>{ + this.router.navigate(['/harbor', 'projects']); + return null; }); + } } \ No newline at end of file diff --git a/src/ui_ng/src/app/project/project.component.css b/src/ui_ng/src/app/project/project.component.css index d7166ed6c..d230c21d8 100644 --- a/src/ui_ng/src/app/project/project.component.css +++ b/src/ui_ng/src/app/project/project.component.css @@ -1,11 +1,13 @@ .header-title { - margin-top: 0; + margin-top: 12px; } + .option-left { - padding-left: 12px; - margin-top: 12px; + padding-left: 12px; + margin-top: 12px; } + .option-right { - padding-right: 16px; - margin-top: 18px; -} + padding-right: 16px; + margin-top: 18px; +} \ No newline at end of file diff --git a/src/ui_ng/src/app/project/project.component.html b/src/ui_ng/src/app/project/project.component.html index 1649cd740..008069e04 100644 --- a/src/ui_ng/src/app/project/project.component.html +++ b/src/ui_ng/src/app/project/project.component.html @@ -1,6 +1,9 @@ -
    +

    {{'PROJECT.PROJECTS' | translate}}

    +
    + +
    @@ -18,11 +21,13 @@
    - + + +
    -
    -
    - -
    + +
    + + diff --git a/src/ui_ng/src/app/project/project.component.ts b/src/ui_ng/src/app/project/project.component.ts index fb82dd380..f87525334 100644 --- a/src/ui_ng/src/app/project/project.component.ts +++ b/src/ui_ng/src/app/project/project.component.ts @@ -25,9 +25,7 @@ import { State } from 'clarity-angular'; import { AppConfigService } from '../app-config.service'; import { SessionService } from '../shared/session.service'; - - -const types: {} = { 0: 'PROJECT.MY_PROJECTS', 1: 'PROJECT.PUBLIC_PROJECTS' }; +import { ProjectTypes } from '../shared/shared.const'; @Component({ moduleId: module.id, @@ -39,7 +37,7 @@ export class ProjectComponent implements OnInit, OnDestroy { selected = []; changedProjects: Project[]; - projectTypes = types; + projectTypes = ProjectTypes; @ViewChild(CreateProjectComponent) creationProject: CreateProjectComponent; @@ -145,7 +143,7 @@ export class ProjectComponent implements OnInit, OnDestroy { } doFilterProjects(filteredType: number): void { - console.log('Filter projects with type:' + types[filteredType]); + console.log('Filter projects with type:' + this.projectTypes[filteredType]); this.isPublic = filteredType; this.currentFilteredType = filteredType; this.retrieve(); diff --git a/src/ui_ng/src/app/project/project.service.ts b/src/ui_ng/src/app/project/project.service.ts index 187d791c1..50c637fe7 100644 --- a/src/ui_ng/src/app/project/project.service.ts +++ b/src/ui_ng/src/app/project/project.service.ts @@ -3,8 +3,6 @@ import { Injectable } from '@angular/core'; import { Http, Headers, RequestOptions, Response, URLSearchParams } from '@angular/http'; import { Project } from './project'; -import { BaseService } from '../service/base.service'; - import { Message } from '../global-message/message'; import { Observable } from 'rxjs/Observable'; @@ -22,11 +20,10 @@ export class ProjectService { constructor(private http: Http) {} - getProject(projectId: number): Promise { + getProject(projectId: number): Observable { return this.http .get(`/api/projects/${projectId}`) - .toPromise() - .then(response=>response.json() as Project) + .map(response=>response.json()) .catch(error=>Observable.throw(error)); } diff --git a/src/ui_ng/src/app/project/project.ts b/src/ui_ng/src/app/project/project.ts index 1c6d73014..3304c6d5f 100644 --- a/src/ui_ng/src/app/project/project.ts +++ b/src/ui_ng/src/app/project/project.ts @@ -29,4 +29,6 @@ export class Project { update_time: Date; current_user_role_id: number; repo_count: number; + has_project_admin_role: boolean; + is_member: boolean; } \ No newline at end of file diff --git a/src/ui_ng/src/app/replication/replication.service.ts b/src/ui_ng/src/app/replication/replication.service.ts index bec392cfd..a8526fc19 100644 --- a/src/ui_ng/src/app/replication/replication.service.ts +++ b/src/ui_ng/src/app/replication/replication.service.ts @@ -1,8 +1,6 @@ import { Injectable } from '@angular/core'; import { Http, URLSearchParams, Response } from '@angular/http'; -import { BaseService } from '../service/base.service'; - import { Policy } from './policy'; import { Job } from './job'; import { Target } from './target'; @@ -14,10 +12,8 @@ import 'rxjs/add/observable/throw'; import 'rxjs/add/operator/mergeMap'; @Injectable() -export class ReplicationService extends BaseService { - constructor(private http: Http) { - super(); - } +export class ReplicationService { + constructor(private http: Http) {} listPolicies(policyName: string, projectId?: any): Observable { if(!projectId) { diff --git a/src/ui_ng/src/app/repository/list-repository/list-repository.component.ts b/src/ui_ng/src/app/repository/list-repository/list-repository.component.ts index df2490d55..b33a1b06f 100644 --- a/src/ui_ng/src/app/repository/list-repository/list-repository.component.ts +++ b/src/ui_ng/src/app/repository/list-repository/list-repository.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, Output, EventEmitter } from '@angular/core'; +import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core'; import { Router, NavigationExtras } from '@angular/router'; import { Repository } from '../repository'; import { State } from 'clarity-angular'; @@ -8,16 +8,17 @@ import { SessionService } from '../../shared/session.service'; import { ListMode } from '../../shared/shared.const'; import { SessionUser } from '../../shared/session-user'; -import { Member } from '../../project/member/member'; @Component({ selector: 'list-repository', templateUrl: 'list-repository.component.html' }) -export class ListRepositoryComponent { +export class ListRepositoryComponent implements OnInit { @Input() projectId: number; @Input() repositories: Repository[]; + + @Output() delete = new EventEmitter(); @Input() totalPage: number; @@ -25,25 +26,16 @@ export class ListRepositoryComponent { @Output() paginate = new EventEmitter(); @Input() mode: string = ListMode.FULL; + @Input() hasProjectAdminRole: boolean; pageOffset: number = 1; - hasProjectAdminRole: boolean; - constructor( private router: Router, private searchTrigger: SearchTriggerService, - private session: SessionService) { - //Get current user from registered resolver. - let currentUser = session.getCurrentUser(); - let projectMembers: Member[] = session.getProjectMembers(); - if(currentUser && projectMembers) { - let currentMember = projectMembers.find(m=>m.user_id === currentUser.user_id); - if(currentMember) { - this.hasProjectAdminRole = (currentMember.role_name === 'projectAdmin'); - } - } - } + private session: SessionService) { } + + ngOnInit() {} deleteRepo(repoName: string) { this.delete.emit(repoName); diff --git a/src/ui_ng/src/app/repository/repository.component.html b/src/ui_ng/src/app/repository/repository.component.html index 5e506a53a..bafef0007 100644 --- a/src/ui_ng/src/app/repository/repository.component.html +++ b/src/ui_ng/src/app/repository/repository.component.html @@ -8,6 +8,6 @@
    - +
    \ No newline at end of file diff --git a/src/ui_ng/src/app/repository/repository.component.ts b/src/ui_ng/src/app/repository/repository.component.ts index 616cb1209..d1869c6be 100644 --- a/src/ui_ng/src/app/repository/repository.component.ts +++ b/src/ui_ng/src/app/repository/repository.component.ts @@ -14,6 +14,8 @@ import { Subscription } from 'rxjs/Subscription'; import { State } from 'clarity-angular'; +import { Project } from '../project/project'; + const repositoryTypes = [ { key: '0', description: 'REPOSITORY.MY_REPOSITORY' }, { key: '1', description: 'REPOSITORY.PUBLIC_REPOSITORY' } @@ -39,6 +41,8 @@ export class RepositoryComponent implements OnInit { totalPage: number; totalRecordCount: number; + hasProjectAdminRole: boolean; + subscription: Subscription; constructor( @@ -66,12 +70,16 @@ export class RepositoryComponent implements OnInit { error => this.messageService.announceMessage(error.status, 'Failed to delete repo:' + repoName, AlertType.DANGER) ); } - } - ); + }); + } ngOnInit(): void { this.projectId = this.route.snapshot.parent.params['id']; + let resolverData = this.route.snapshot.parent.data; + if(resolverData) { + this.hasProjectAdminRole = (resolverData['projectResolver']).has_project_admin_role; + } this.currentRepositoryType = this.repositoryTypes[0]; this.lastFilteredRepoName = ''; this.retrieve(); 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 6b7211c29..4a91096b3 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 @@ -16,7 +16,8 @@ import { TagView } from '../tag-view'; import { AppConfigService } from '../../app-config.service'; import { SessionService } from '../../shared/session.service'; -import { Member } from '../../project/member/member'; + +import { Project } from '../../project/project'; @Component({ moduleId: module.id, @@ -29,7 +30,7 @@ export class TagRepositoryComponent implements OnInit, OnDestroy { projectId: number; repoName: string; - hasProjectAdminRole: boolean; + hasProjectAdminRole: boolean = false; tags: TagView[]; registryUrl: string; @@ -45,15 +46,6 @@ export class TagRepositoryComponent implements OnInit, OnDestroy { private appConfigService: AppConfigService, private session: SessionService){ - let currentUser = session.getCurrentUser(); - let projectMembers: Member[] = session.getProjectMembers(); - if(currentUser && projectMembers) { - let currentMember = projectMembers.find(m=>m.user_id === currentUser.user_id); - if(currentMember) { - this.hasProjectAdminRole = (currentMember.role_name === 'projectAdmin'); - } - } - this.subscription = this.deletionDialogService.confirmationConfirm$.subscribe( message => { if (message && @@ -78,11 +70,15 @@ export class TagRepositoryComponent implements OnInit, OnDestroy { } } } - } - ) + }); } ngOnInit() { + let resolverData = this.route.snapshot.data; + console.log(JSON.stringify(resolverData)); + if(resolverData) { + this.hasProjectAdminRole = (resolverData['projectResolver']).has_project_admin_role; + } this.projectId = this.route.snapshot.params['id']; this.repoName = this.route.snapshot.params['repo']; this.tags = []; @@ -100,17 +96,17 @@ export class TagRepositoryComponent implements OnInit, OnDestroy { retrieve() { this.tags = []; if(this.withNotary) { - this.repositoryService - .listTagsWithVerifiedSignatures(this.repoName) - .subscribe( - items => this.listTags(items), - error => this.messageService.announceMessage(error.status, 'Failed to list tags with repo:' + this.repoName, AlertType.DANGER)); + this.repositoryService + .listTagsWithVerifiedSignatures(this.repoName) + .subscribe( + items => this.listTags(items), + error => this.messageService.announceMessage(error.status, 'Failed to list tags with repo:' + this.repoName, AlertType.DANGER)); } else { this.repositoryService - .listTags(this.repoName) - .subscribe( - items => this.listTags(items), - error => this.messageService.announceMessage(error.status, 'Failed to list tags with repo:' + this.repoName, AlertType.DANGER)); + .listTags(this.repoName) + .subscribe( + items => this.listTags(items), + error => this.messageService.announceMessage(error.status, 'Failed to list tags with repo:' + this.repoName, AlertType.DANGER)); } } diff --git a/src/ui_ng/src/app/service/auth-guard.service.ts b/src/ui_ng/src/app/service/auth-guard.service.ts deleted file mode 100644 index 4c1fbcea4..000000000 --- a/src/ui_ng/src/app/service/auth-guard.service.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Injectable } from '@angular/core'; -import { CanActivate } from '@angular/router'; - -export class AuthGuard implements CanActivate { - canActivate() { - return true; - } -} \ No newline at end of file diff --git a/src/ui_ng/src/app/service/base.service.ts b/src/ui_ng/src/app/service/base.service.ts deleted file mode 100644 index 7e79b2049..000000000 --- a/src/ui_ng/src/app/service/base.service.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Http, Response,} from '@angular/http'; - -export class BaseService { - - protected handleError(error: Response | any): Promise { - // In a real world app, we might use a remote logging infrastructure - let errMsg: string; - console.log(typeof error); - if (error instanceof Response) { - const body = error.json() || ''; - const err = body.error || JSON.stringify(body); - errMsg = `${error.status} - ${error.statusText || ''} ${err}`; - } else { - errMsg = error.message ? error.message : error.toString(); - } - return Promise.reject(error); - } -} \ No newline at end of file diff --git a/src/ui_ng/src/app/shared/route/member-guard-activate.service.ts b/src/ui_ng/src/app/shared/route/member-guard-activate.service.ts index a1d4fc74f..18632bbab 100644 --- a/src/ui_ng/src/app/shared/route/member-guard-activate.service.ts +++ b/src/ui_ng/src/app/shared/route/member-guard-activate.service.ts @@ -17,7 +17,8 @@ export class MemberGuard implements CanActivate, CanActivateChild { private router: Router) {} canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise | boolean { - let projectId: number = route.params['id']; + let projectId = route.params['id']; + this.sessionService.setProjectMembers([]); return new Promise((resolve, reject) => { this.projectService.checkProjectMember(projectId) .subscribe( @@ -26,6 +27,10 @@ export class MemberGuard implements CanActivate, CanActivateChild { return resolve(true) }, error => { + //Add exception for repository in project detail router activation. + if(state.url.endsWith('repository')) { + return resolve(true); + } this.router.navigate([CommonRoutes.HARBOR_DEFAULT]); return resolve(false); }); diff --git a/src/ui_ng/src/app/shared/shared.const.ts b/src/ui_ng/src/app/shared/shared.const.ts index 536ed59bd..830b00baf 100644 --- a/src/ui_ng/src/app/shared/shared.const.ts +++ b/src/ui_ng/src/app/shared/shared.const.ts @@ -52,4 +52,7 @@ export const CookieKeyOfAdmiral = "admiral.endpoint.latest"; export const enum ConfirmationState { NA, CONFIRMED, CANCEL -} \ No newline at end of file +} + +export const ProjectTypes = { 0: 'PROJECT.MY_PROJECTS', 1: 'PROJECT.PUBLIC_PROJECTS' }; +export const RoleInfo = { 1: 'MEMBER.PROJECT_ADMIN', 2: 'MEMBER.DEVELOPER', 3: 'MEMBER.GUEST' }; 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 e7a860ed4..df9828631 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 @@ -1,25 +1,41 @@ -
    -

    {{'STATISTICS.TITLE' | translate }}

    - -
    -
    -{{'STATISTICS.PRO_ITEM' | translate }} -
    -
    - - - -
    -
    -
    -
    - {{'STATISTICS.REPO_ITEM' | translate }} +
    +
    +
    +
    +
    +
    + {{'STATISTICS.PRO_ITEM' | translate }} +
    +
    + {{'STATISTICS.REPO_ITEM' | translate }} +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    Storage
    -
    - - - -
    -
    -
    \ No newline at end of file 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 51b62a853..f308d3377 100644 --- a/src/ui_ng/src/app/shared/statictics/statistics.component.css +++ b/src/ui_ng/src/app/shared/statictics/statistics.component.css @@ -1,30 +1,57 @@ .statistic-wrapper { - padding: 12px; - margin: 12px; - text-align: center; + padding: 4px; + margin: 4px; + text-align: right; vertical-align: middle; - height: 72px; - min-width: 108px; - max-width: 216px; + height: 30px; display: inline-block; } .statistic-data { - font-size: 48px; - font-weight: bolder; - font-family: "Metropolis"; - line-height: 48px; + font-size: 16px; + font-weight: 900; + font-family: "semibold"; + line-height: 16px; } .statistic-text { - font-size: 24px; - font-weight: 400; - line-height: 24px; + font-size: 10px; + line-height: 10px; text-transform: uppercase; - font-family: "Metropolis"; + font-family: "semibold"; +} + +.statistic-column-block { + display: inline-block; + text-align: right; } .statistic-column-title { position: relative; - top: 40%; + text-transform: uppercase; + font-size: 14px; +} + +.statistic-column-title-pro { + top: -10px; +} + +.statistic-column-title-repo { + top: 3px; +} + +.statistic-item-divider { + height: 54px; + display: inline-block; + width: 1px; + background-color: #ccc; + opacity: 0.55; + margin-left: 4px; + margin-right: 12px; + position: relative; + top: 3px; +} + +.statistic-block { + display: inline-block; } \ No newline at end of file diff --git a/src/ui_ng/src/app/shared/statictics/statistics.component.html b/src/ui_ng/src/app/shared/statictics/statistics.component.html index 642ed916a..2d98c617e 100644 --- a/src/ui_ng/src/app/shared/statictics/statistics.component.html +++ b/src/ui_ng/src/app/shared/statictics/statistics.component.html @@ -1,4 +1,4 @@
    - {{data.number}} - {{data.label}} + {{data}} + {{label}}
    \ No newline at end of file diff --git a/src/ui_ng/src/app/shared/statictics/statistics.component.ts b/src/ui_ng/src/app/shared/statictics/statistics.component.ts index f1e5563fb..bcb028b61 100644 --- a/src/ui_ng/src/app/shared/statictics/statistics.component.ts +++ b/src/ui_ng/src/app/shared/statictics/statistics.component.ts @@ -7,5 +7,6 @@ import { Component, Input } from '@angular/core'; }) export class StatisticsComponent { - @Input() data: any; + @Input() label: string; + @Input() data: number = 0; } \ 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 7faa7e7df..d1efbb68b 100644 --- a/src/ui_ng/src/i18n/lang/en-lang.json +++ b/src/ui_ng/src/i18n/lang/en-lang.json @@ -110,10 +110,10 @@ "PROJECT": { "PROJECTS": "Projects", "NAME": "Project Name", + "ROLE": "Role", "PUBLIC_OR_PRIVATE": "Public", "REPO_COUNT": "Repositories Count", "CREATION_TIME": "Creation Time", - "DESCRIPTION": "Description", "PUBLIC": "Public", "PRIVATE": "Private", "MAKE": "Make", @@ -290,7 +290,7 @@ "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 the Notary before it can be deleted. {{param}}", - "FILTER_FOR_REPOSITORIES": "Filter for repositories", + "FILTER_FOR_REPOSITORIES": "Filter Repositories", "TAG": "Tag", "SIGNED": "Signed", "AUTHOR": "Author", diff --git a/src/ui_ng/src/i18n/lang/zh-lang.json b/src/ui_ng/src/i18n/lang/zh-lang.json index efac765dc..3250b2369 100644 --- a/src/ui_ng/src/i18n/lang/zh-lang.json +++ b/src/ui_ng/src/i18n/lang/zh-lang.json @@ -110,10 +110,10 @@ "PROJECT": { "PROJECTS": "项目", "NAME": "项目名称", + "ROLE": "角色", "PUBLIC_OR_PRIVATE": "公开", "REPO_COUNT": "镜像仓库数", "CREATION_TIME": "创建时间", - "DESCRIPTION": "描述", "PUBLIC": "公开", "PRIVATE": "私有", "MAKE": "设为", @@ -395,8 +395,8 @@ "TITLE": "统计", "PRO_ITEM": "项目", "REPO_ITEM": "镜像库", - "INDEX_MY": "私有的", - "INDEX_PUB": "公开的", + "INDEX_MY": "私有", + "INDEX_PUB": "公开", "INDEX_TOTAL": "总计" }, "SEARCH": {