Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-18 14:47:38 +01:00
Code Issues Projects Releases Wiki Activity

Improve notary cmd on UI

Browse Source 
Signed-off-by: AllForNothing <sshijun@vmware.com>
This commit is contained in:
AllForNothing 2020-09-14 18:39:22 +08:00
parent 49c80f954c
commit 60c2350088
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/portal/src/app/project/repository/artifact/artifact-tag/artifact-tag.component.ts
View File

@ -34,7 +34,7 @@ class InitTag {
name = ""; name = "";
} }
const DeleteTagWithNotoryCommand1 = 'notary -s https://'; const DeleteTagWithNotoryCommand1 = 'notary -s https://';
const DeleteTagWithNotoryCommand2 = ' -d ~/.docker/trust remove -p '; const DeleteTagWithNotoryCommand2 = ':4443 -d ~/.docker/trust remove -p ';
@Component({ @Component({
selector: 'artifact-tag', selector: 'artifact-tag',
templateUrl: './artifact-tag.component.html', templateUrl: './artifact-tag.component.html',
@ -256,7 +256,12 @@ export class ArtifactTagComponent implements OnInit, OnDestroy {
} }
} }
} }
deletePort(url): string {
if (url && url.indexOf(':') !== -1) {
return url.split(':')[0];
}
return url;
}
delOperate(tag: Tag): Observable<any> | null { delOperate(tag: Tag): Observable<any> | null {
// init operation info // init operation info
let operMessage = new OperateInfo(); let operMessage = new OperateInfo();
@ -268,10 +273,10 @@ export class ArtifactTagComponent implements OnInit, OnDestroy {
if (tag.signed) { if (tag.signed) {
forkJoin(this.translateService.get("BATCH.DELETED_FAILURE"), forkJoin(this.translateService.get("BATCH.DELETED_FAILURE"),
this.translateService.get("REPOSITORY.DELETION_SUMMARY_TAG_DENIED")).subscribe(res => { this.translateService.get("REPOSITORY.DELETION_SUMMARY_TAG_DENIED")).subscribe(res => {
let wrongInfo: string = res[1] + DeleteTagWithNotoryCommand1 + this.registryUrl + const wrongInfo: string = res[1] + DeleteTagWithNotoryCommand1 + this.deletePort(this.registryUrl) +
DeleteTagWithNotoryCommand2 + DeleteTagWithNotoryCommand2 +
this.registryUrl + "/" + this.repositoryName + this.registryUrl + "/" + this.repositoryName +
" " + name; " " + tag.name;
operateChanges(operMessage, OperationState.failure, wrongInfo); operateChanges(operMessage, OperationState.failure, wrongInfo);
}); });
return of(null); return of(null);