Skip to content

Commit 8849693

Browse files
authored
fix(ui): spawninfo polling wait for request end (#5855)
1 parent 266b47c commit 8849693

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ui/src/app/views/workflow/run/node/pipeline/workflow-run-job/workflow-run-job.component.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { ProjectState } from 'app/store/project.state';
1111
import { WorkflowState } from 'app/store/workflow.state';
1212
import * as moment from 'moment';
1313
import { from, interval, Subject, Subscription } from 'rxjs';
14-
import { delay, mergeMap, retryWhen } from 'rxjs/operators';
14+
import { delay, concatMap, retryWhen } from 'rxjs/operators';
1515
import { webSocket, WebSocketSubject } from 'rxjs/webSocket';
1616
import { WorkflowRunJobVariableComponent } from '../variables/job.variables.component';
1717

@@ -104,13 +104,13 @@ export class WorkflowRunJobComponent implements OnInit, OnDestroy {
104104
) {
105105
this.subjectChannel = new Subject<WorkflowNodeJobRun>();
106106
this.subscriptionChannel = this.subjectChannel.pipe(
107-
mergeMap(data => from(this.onNodeJobRunChange(data)))
107+
concatMap(data => from(this.onNodeJobRunChange(data)))
108108
).subscribe();
109109
}
110110

111111
ngOnInit(): void {
112112
this.pollingSpawnInfoSubscription = interval(2000)
113-
.pipe(mergeMap(_ => from(this.loadSpawnInfo())))
113+
.pipe(concatMap(_ => from(this.loadSpawnInfo())))
114114
.subscribe();
115115
}
116116

0 commit comments

Comments
 (0)