Upstream
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12115 from jwangyangls/fix-issue-add-label 

[fix] Fix  issue in front ui 2.0.1
This commit is contained in:
jwangyangls 2020-06-02 15:52:37 +08:00 committed by GitHub
parent 9e1302211b 459314308b
commit 6939446c3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/portal/src/app/global-message/message.component.html
View File

@ -7,4 +7,5 @@
</div>
</div>
</clr-alert>
</div>
</div>
<div *ngIf="globalMessageOpened" class="mask-layer"></div>

6
src/portal/src/app/global-message/message.component.scss
View File

@ -1,3 +1,9 @@
.alert-style {
display: inline;
}
.mask-layer {
position: absolute;
width: 100%;
height: 100%;
z-index: 10000;
}

22
src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.ts
View File

@ -446,20 +446,19 @@ export class ArtifactListTabComponent implements OnInit, OnDestroy {
}
labelSelectedChange(artifact?: Artifact[]): void {
if (artifact && artifact[0].labels) {
this.imageStickLabels.forEach(data => {
data.iconsShow = false;
data.show = true;
});
if (artifact[0].labels.length) {
artifact[0].labels.forEach((labelInfo: Label) => {
let findedLabel = this.imageStickLabels.find(data => labelInfo.id === data['label'].id);
this.imageStickLabels.forEach(data => {
data.iconsShow = false;
data.show = true;
});
if (artifact && artifact[0].labels && artifact[0].labels.length) {
artifact[0].labels.forEach((labelInfo: Label) => {
let findedLabel = this.imageStickLabels.find(data => labelInfo.id === data['label'].id);
if (findedLabel) {
this.imageStickLabels.splice(this.imageStickLabels.indexOf(findedLabel), 1);
this.imageStickLabels.unshift(findedLabel);
findedLabel.iconsShow = true;
});
}
}
});
}
}
@ -491,7 +490,6 @@ export class ArtifactListTabComponent implements OnInit, OnDestroy {
};
this.newArtifactService.addLabel(params).subscribe(res => {
this.refresh();
// set the selected label in front
this.imageStickLabels.splice(this.imageStickLabels.indexOf(labelInfo), 1);
this.imageStickLabels.some((data, i) => {