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

Clear selected row after refreshing for replication task list component (#15549) 

Signed-off-by: AllForNothing <sshijun@vmware.com>
This commit is contained in:
孙世军 2021-09-14 11:21:16 +08:00 committed by GitHub
parent 251feea1fd
commit 9fdf8e286d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/portal/src/app/base/left-side-nav/replication/replication/replication.component.ts
View File

@ -65,6 +65,7 @@ import { ConfirmationAcknowledgement } from "../../../global-confirmation-dialog
const ONE_HOUR_SECONDS: number = 3600;
const ONE_MINUTE_SECONDS: number = 60;
const ONE_DAY_SECONDS: number = 24 * ONE_HOUR_SECONDS;
const IN_PROCESS: string = 'InProgress';
const ruleStatus: { [key: string]: any } = [
{ key: "all", description: "REPLICATION.ALL_STATUS" },
@ -242,7 +243,7 @@ export class ReplicationComponent implements OnInit, OnDestroy {
}
this.jobsLoading = true;
this.selectedRow = [];
this.replicationService.getExecutions(this.search.ruleId, params).subscribe(
response => {
this.totalCount = response.metadata.xTotalCount;
@ -252,7 +253,7 @@ export class ReplicationComponent implements OnInit, OnDestroy {
let count: number = 0;
this.jobs.forEach(job => {
if (
job.status === "InProgress"
job.status === IN_PROCESS
) {
count++;
}
@ -403,8 +404,16 @@ export class ReplicationComponent implements OnInit, OnDestroy {
this.StopConfirmDialog.open(StopExecutionsMessage);
}
canStop() {
return this.selectedRow && this.selectedRow[0]
&& this.selectedRow[0].status === 'InProgress';
if (this.selectedRow?.length) {
let flag: boolean = true;
this.selectedRow.forEach(item => {
if (item.status !== IN_PROCESS) {
flag = false;
}
});
return flag;
}
return false;
}
confirmStop(message: ConfirmationAcknowledgement) {
@ -430,7 +439,6 @@ export class ReplicationComponent implements OnInit, OnDestroy {
finalize(() => {
this.refreshJobs();
this.isStopOnGoing = false;
this.selectedRow = [];
})
)
.subscribe(() => { }
@ -489,7 +497,6 @@ export class ReplicationComponent implements OnInit, OnDestroy {
refreshJobs() {
this.currentTerm = "";
this.currentPage = 1;
let st: ClrDatagridStateInterface = {
page: {
from: 0,

4
src/portal/src/app/base/project/robot-account/robot-account.component.ts
View File

@ -96,7 +96,7 @@ export class RobotAccountComponent implements OnInit, OnDestroy {
}));
})).subscribe(response => {
this.total = Number.parseInt(
response.headers.get('x-total-count')
response.headers.get('x-total-count'), 10
);
this.robots = response.body as Robot[];
}, error => {
@ -169,7 +169,7 @@ export class RobotAccountComponent implements OnInit, OnDestroy {
.subscribe(
response => {
this.total = Number.parseInt(
response.headers.get('x-total-count')
response.headers.get('x-total-count'), 10
);
this.robots = response.body as Robot[];
},