From b31a91b64a09f008a286581dc0e8784236063d61 Mon Sep 17 00:00:00 2001 From: "Deng, Qian" Date: Mon, 29 Jan 2018 21:54:59 +0800 Subject: [PATCH] Fix UI bugs Add deleting confirmation dialog back Change buttons' style on tag component --- src/ui_ng/lib/package.json | 2 +- src/ui_ng/lib/pkg/package.json | 2 +- src/ui_ng/lib/src/tag/tag.component.html.ts | 8 +++---- src/ui_ng/lib/tslint.json | 5 ----- src/ui_ng/package.json | 2 +- .../list-project/list-project.component.ts | 10 ++++++++- .../app/project/member/member.component.ts | 21 +++++++++++++------ src/ui_ng/tslint.json | 5 ----- 8 files changed, 30 insertions(+), 25 deletions(-) diff --git a/src/ui_ng/lib/package.json b/src/ui_ng/lib/package.json index 90749f512..e5ea1c350 100644 --- a/src/ui_ng/lib/package.json +++ b/src/ui_ng/lib/package.json @@ -1,6 +1,6 @@ { "name": "harbor-ui", - "version": "0.6.37", + "version": "0.6.41", "description": "Harbor shared UI components based on Clarity and Angular4", "scripts": { "start": "ng serve --host 0.0.0.0 --port 4500 --proxy-config proxy.config.json", diff --git a/src/ui_ng/lib/pkg/package.json b/src/ui_ng/lib/pkg/package.json index c34b70587..1a5e8cbff 100644 --- a/src/ui_ng/lib/pkg/package.json +++ b/src/ui_ng/lib/pkg/package.json @@ -1,6 +1,6 @@ { "name": "harbor-ui", - "version": "0.6.37", + "version": "0.6.41", "description": "Harbor shared UI components based on Clarity and Angular4", "author": "VMware", "module": "index.js", diff --git a/src/ui_ng/lib/src/tag/tag.component.html.ts b/src/ui_ng/lib/src/tag/tag.component.html.ts index ecedbd9e3..34e4dc753 100644 --- a/src/ui_ng/lib/src/tag/tag.component.html.ts +++ b/src/ui_ng/lib/src/tag/tag.component.html.ts @@ -24,11 +24,9 @@ export const TAG_TEMPLATE = `
-
- - - -
+ + + {{'REPOSITORY.TAG' | translate}} {{'REPOSITORY.SIZE' | translate}} diff --git a/src/ui_ng/lib/tslint.json b/src/ui_ng/lib/tslint.json index 283c238ec..59ffa4e02 100644 --- a/src/ui_ng/lib/tslint.json +++ b/src/ui_ng/lib/tslint.json @@ -69,11 +69,6 @@ "check-else", "check-whitespace" ], - "quotemark": [ - true, - "double", - "avoid-escape" - ], "radix": true, "semicolon": [ "always" diff --git a/src/ui_ng/package.json b/src/ui_ng/package.json index e356c01e6..04c4ae315 100644 --- a/src/ui_ng/package.json +++ b/src/ui_ng/package.json @@ -31,7 +31,7 @@ "clarity-icons": "^0.10.17", "clarity-ui": "^0.10.17", "core-js": "^2.4.1", - "harbor-ui": "0.6.37", + "harbor-ui": "0.6.41", "intl": "^1.2.5", "mutationobserver-shim": "^0.3.2", "ngx-cookie": "^1.0.0", 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 7fc109958..a893e47c9 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 @@ -221,7 +221,15 @@ export class ListProjectComponent implements OnDestroy { this.batchDelectionInfos.push(initBatchMessage); }); this.deletionDialogService.addBatchInfoList(this.batchDelectionInfos); - this.delProjects(p); + let deletionMessage = new ConfirmationMessage( + "PROJECT.DELETION_TITLE", + "PROJECT.DELETION_SUMMARY", + nameArr.join(","), + p, + ConfirmationTargets.PROJECT, + ConfirmationButtons.DELETE_CANCEL + ); + this.deletionDialogService.openComfirmDialog(deletionMessage); } } delProjects(projects: Project[]) { 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 0c9b1a457..e4330b88d 100644 --- a/src/ui_ng/src/app/project/member/member.component.ts +++ b/src/ui_ng/src/app/project/member/member.component.ts @@ -63,6 +63,7 @@ export class MemberComponent implements OnInit, OnDestroy { isDelete = false; isChangeRole = false; batchActionInfos: BatchInfo[] = []; + batchDeletionInfos: BatchInfo[] = []; constructor( private route: ActivatedRoute, @@ -206,17 +207,25 @@ export class MemberComponent implements OnInit, OnDestroy { this.isDelete = true; this.isChangeRole = false; let nameArr: string[] = []; - this.batchActionInfos = []; + this.batchDeletionInfos = []; if (m && m.length) { m.forEach(data => { nameArr.push(data.username); let initBatchMessage = new BatchInfo (); initBatchMessage.name = data.username; - this.batchActionInfos.push(initBatchMessage); + this.batchDeletionInfos.push(initBatchMessage); }); - this.OperateDialogService.addBatchInfoList(this.batchActionInfos); + this.OperateDialogService.addBatchInfoList(this.batchDeletionInfos); - this.deleteMem(m); + let deletionMessage = new ConfirmationMessage( + "MEMBER.DELETION_TITLE", + "MEMBER.DELETION_SUMMARY", + nameArr.join(","), + m, + ConfirmationTargets.PROJECT_MEMBER, + ConfirmationButtons.DELETE_CANCEL + ); + this.OperateDialogService.openComfirmDialog(deletionMessage); } } @@ -225,7 +234,7 @@ export class MemberComponent implements OnInit, OnDestroy { let promiseLists: any[] = []; members.forEach(member => { if (member.user_id === this.currentUser.user_id) { - let findedList = this.batchActionInfos.find(data => data.name === member.username); + let findedList = this.batchDeletionInfos.find(data => data.name === member.username); this.translate.get("BATCH.DELETED_FAILURE").subscribe(res => { findedList = BathInfoChanges(findedList, res, false, true); }); @@ -243,7 +252,7 @@ export class MemberComponent implements OnInit, OnDestroy { } delOperate(projectId: number, memberId: number, username: string) { - let findedList = this.batchActionInfos.find(data => data.name === username); + let findedList = this.batchDeletionInfos.find(data => data.name === username); return this.memberService .deleteMember(projectId, memberId) .then( diff --git a/src/ui_ng/tslint.json b/src/ui_ng/tslint.json index 90fd0a727..c1cc66953 100644 --- a/src/ui_ng/tslint.json +++ b/src/ui_ng/tslint.json @@ -69,11 +69,6 @@ "check-else", "check-whitespace" ], - "quotemark": [ - true, - "double", - "avoid-escape" - ], "radix": true, "semicolon": [ true