mirror of
https://github.com/goharbor/harbor.git
synced 2024-10-02 23:37:38 +02:00
Fix bug of UI;
1.One of the request is cancelled when trying to do the multiple deletion for tags 2.when using other languages, switch languages, English button has default border Signed-off-by: Yogi_Wang <yawang@vmware.com>
This commit is contained in:
parent
8cf5dba39a
commit
03e54729c3
@ -22,7 +22,7 @@ import {
|
|||||||
Output,
|
Output,
|
||||||
ViewChild
|
ViewChild
|
||||||
} from "@angular/core";
|
} from "@angular/core";
|
||||||
import { forkJoin, Observable, Subject, throwError as observableThrowError } from "rxjs";
|
import { forkJoin, Observable, Subject, throwError as observableThrowError, of } from "rxjs";
|
||||||
import { catchError, debounceTime, distinctUntilChanged, finalize, map } from 'rxjs/operators';
|
import { catchError, debounceTime, distinctUntilChanged, finalize, map } from 'rxjs/operators';
|
||||||
import { TranslateService } from "@ngx-translate/core";
|
import { TranslateService } from "@ngx-translate/core";
|
||||||
import { Comparator, Label, State, Tag, TagClickEvent, VulnerabilitySummary } from "../service/interface";
|
import { Comparator, Label, State, Tag, TagClickEvent, VulnerabilitySummary } from "../service/interface";
|
||||||
@ -629,9 +629,12 @@ export class TagComponent implements OnInit, AfterViewInit {
|
|||||||
observableLists.push(this.delOperate(tag));
|
observableLists.push(this.delOperate(tag));
|
||||||
});
|
});
|
||||||
|
|
||||||
forkJoin(...observableLists).subscribe((item) => {
|
forkJoin(...observableLists).subscribe((items) => {
|
||||||
this.selectedRow = [];
|
// if delete one success refresh list
|
||||||
this.retrieve();
|
if (items.some(item => !item)) {
|
||||||
|
this.selectedRow = [];
|
||||||
|
this.retrieve();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -669,7 +672,7 @@ export class TagComponent implements OnInit, AfterViewInit {
|
|||||||
this.translateService.get(message).subscribe(res =>
|
this.translateService.get(message).subscribe(res =>
|
||||||
operateChanges(operMessage, OperationState.failure, res)
|
operateChanges(operMessage, OperationState.failure, res)
|
||||||
);
|
);
|
||||||
return observableThrowError(message);
|
return of(error);
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -59,4 +59,7 @@
|
|||||||
width: 36px;
|
width: 36px;
|
||||||
height: 36px;
|
height: 36px;
|
||||||
object-fit: fill;
|
object-fit: fill;
|
||||||
|
}
|
||||||
|
.dropdown-item {
|
||||||
|
outline: none;
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user