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

Merge pull request #4812 from pengpengshui/labelFilter

Browse Source 
Modify images filter with label issue
This commit is contained in:
pengpengshui 2018-05-02 18:29:05 +08:00 committed by GitHub
commit 042ac05dfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui_ng/lib/src/create-edit-label/create-edit-label.component.css.ts
View File

@ -14,7 +14,7 @@ export const CREATE_EDIT_LABEL_STYLE: string = `
.colorDrop .colorPanel{position:absolute; width:166px; padding:6px; background-color: white; border: 1px solid #ccc; z-index:10;}
.btnColor{
margin: 0 !important;
padding: 0;
padding: 0 !important;
width: 26px;
height:22px;
min-width: 26px;}

2
src/ui_ng/lib/src/create-edit-label/create-edit-label.component.ts
View File

@ -85,7 +85,7 @@ export class CreateEditLabelComponent implements OnInit, OnDestroy {
});
setTimeout(() => {
setInterval(() => this.ref.markForCheck(), 100);
}, 1000);
}, 3000);
});
}

45
src/ui_ng/lib/src/tag/tag.component.ts
View File

@ -60,7 +60,7 @@ import {BatchInfo, BathInfoChanges} from "../confirmation-dialog/confirmation-ba
import {Observable} from "rxjs/Observable";
import {LabelService} from "../service/label.service";
import {Subject} from "rxjs/Subject";
export interface LabelOpe {
export interface LabelState {
iconsShow: boolean;
label: Label;
show: boolean;
@ -70,7 +70,6 @@ export interface LabelOpe {
selector: "hbr-tag",
template: TAG_TEMPLATE,
styles: [TAG_STYLE],
changeDetection: ChangeDetectionStrategy.Default
})
export class TagComponent implements OnInit, AfterViewInit {
@ -108,9 +107,9 @@ export class TagComponent implements OnInit, AfterViewInit {
copyFailed = false;
selectedRow: Tag[] = [];
imageLabels: LabelOpe[] = [];
imageStickLabels: LabelOpe[] = [];
imageFilterLabels: LabelOpe[] = [];
imageLabels: LabelState[] = [];
imageStickLabels: LabelState[] = [];
imageFilterLabels: LabelState[] = [];
labelListOpen = false;
selectedTag: Tag[];
@ -228,7 +227,7 @@ export class TagComponent implements OnInit, AfterViewInit {
st.page.to = this.pageSize - 1;
let selectedLab = this.imageFilterLabels.find(label => label.iconsShow === true);
if (selectedLab) {
st.filters = [{property: 'name', value: this.lastFilteredTagName}, {property: 'labels.name', value: selectedLab.label.name}];
st.filters = [{property: 'name', value: this.lastFilteredTagName}, {property: 'labels.id', value: selectedLab.label.id}];
}else {
st.filters = [{property: 'name', value: this.lastFilteredTagName}];
}
@ -325,7 +324,7 @@ export class TagComponent implements OnInit, AfterViewInit {
this.labelSelectedChange(tag);
}
stickLabel(labelInfo: LabelOpe): void {
stickLabel(labelInfo: LabelState): void {
if (labelInfo && !labelInfo.iconsShow) {
this.selectLabel(labelInfo);
}
@ -334,7 +333,7 @@ export class TagComponent implements OnInit, AfterViewInit {
}
}
selectLabel(labelInfo: LabelOpe): void {
selectLabel(labelInfo: LabelState): void {
if (!this.inprogress) {
this.inprogress = true;
let labelId = labelInfo.label.id;
@ -355,13 +354,14 @@ export class TagComponent implements OnInit, AfterViewInit {
}
}
unSelectLabel(labelInfo: LabelOpe): void {
if (!this.inprogress) {
this.inprogress = true;
let labelId = labelInfo.label.id;
this.selectedRow = this.selectedTag;
toPromise<any>(this.tagService.deleteLabelToImages(this.repoName, this.selectedRow[0].name, labelId)).then(res => {
this.refresh();
unSelectLabel(labelInfo: LabelState): void {
if (!this.inprogress) {
this.inprogress = true;
let labelId = labelInfo.label.id;
this.selectedRow = this.selectedTag;
toPromise<any>(this.tagService.deleteLabelToImages(this.repoName, this.selectedRow[0].name, labelId)).then(res => {
this.refresh();
// insert the unselected label to groups with the same icons
this.sortOperation(this.imageStickLabels, labelInfo);
labelInfo.iconsShow = false;
@ -373,7 +373,7 @@ export class TagComponent implements OnInit, AfterViewInit {
}
}
rightFilterLabel(labelInfo: LabelOpe): void {
rightFilterLabel(labelInfo: LabelState): void {
if (labelInfo) {
if (!labelInfo.iconsShow) {
this.filterLabel(labelInfo);
@ -383,8 +383,9 @@ export class TagComponent implements OnInit, AfterViewInit {
}
}
filterLabel(labelInfo: LabelOpe): void {
filterLabel(labelInfo: LabelState): void {
let labelName = labelInfo.label.name;
let labelId = labelInfo.label.id;
// insert the unselected label to groups with the same icons
let preLabelInfo = this.imageFilterLabels.find(data => data.label.id === this.filterOneLabel.id);
if (preLabelInfo) {
@ -392,7 +393,7 @@ export class TagComponent implements OnInit, AfterViewInit {
}
this.imageFilterLabels.filter(data => {
if (data.label.name !== labelName) {
if (data.label.id !== labelId) {
data.iconsShow = false;
}else {
data.iconsShow = true;
@ -412,15 +413,15 @@ export class TagComponent implements OnInit, AfterViewInit {
st.page.from = 0;
st.page.to = this.pageSize - 1;
if (this.lastFilteredTagName) {
st.filters = [{property: 'name', value: this.lastFilteredTagName}, {property: 'labels.name', value: labelName}];
st.filters = [{property: 'name', value: this.lastFilteredTagName}, {property: 'labels.id', value: labelId}];
}else {
st.filters = [{property: 'labels.name', value: labelName}];
st.filters = [{property: 'labels.id', value: labelId}];
}
this.clrLoad(st);
}
unFilterLabel(labelInfo: LabelOpe): void {
unFilterLabel(labelInfo: LabelState): void {
// insert the unselected label to groups with the same icons
this.sortOperation(this.imageFilterLabels, labelInfo);
@ -461,7 +462,7 @@ export class TagComponent implements OnInit, AfterViewInit {
}
// insert the unselected label to groups with the same icons
sortOperation(labelList: LabelOpe[], labelInfo: LabelOpe): void {
sortOperation(labelList: LabelState[], labelInfo: LabelState): void {
labelList.some((data, i) => {
if (!data.iconsShow) {
if (data.label.scope === labelInfo.label.scope) {

2
src/ui_ng/package.json
View File

@ -30,7 +30,7 @@
"clarity-icons": "^0.10.27",
"clarity-ui": "^0.10.27",
"core-js": "^2.4.1",
"harbor-ui": "0.7.10",
"harbor-ui": "0.7.12",
"intl": "^1.2.5",
"mutationobserver-shim": "^0.3.2",
"ngx-cookie": "^1.0.0",