Fixing worker switchmap for edits

This commit is contained in:
Zoe Roux
2022-03-05 00:37:13 +01:00
parent 48c0eacfe6
commit 1d967c00a0
+10 -7
View File
@@ -15,13 +15,16 @@ export class Manager {
await lastValueFrom(this._pipelines await lastValueFrom(this._pipelines
.pipe( .pipe(
tap(x => console.log(`Found pipeline ${JSON.stringify(x)}`)), tap(x => console.log(`Found pipeline ${JSON.stringify(x)}`)),
filter(x => x.enabled),
groupBy((x: Pipeline) => x.id), groupBy((x: Pipeline) => x.id),
switchAll(), mergeMap(grp =>
mergeMap((x: Pipeline) => grp.pipe(
this.createPipeline(x).pipe( map((x: Pipeline) =>
map((env: PipelineEnv) => [x, env]), this.createPipeline(x).pipe(
catchError(err => this.handlePipelineError(x, err)), map((env: PipelineEnv) => [x, env]),
catchError(err => this.handlePipelineError(x, err)),
)
),
switchAll(),
) )
), ),
tap(async ([x, env]: [Pipeline, PipelineEnv]) => { tap(async ([x, env]: [Pipeline, PipelineEnv]) => {
@@ -38,7 +41,7 @@ export class Manager {
} }
createPipeline(pipeline: Pipeline): Observable<PipelineEnv> { createPipeline(pipeline: Pipeline): Observable<PipelineEnv> {
if (pipeline.type === PipelineType.Never) { if (pipeline.type === PipelineType.Never || !pipeline.enabled) {
console.log(`Deleting the pipeline ${pipeline.name}`); console.log(`Deleting the pipeline ${pipeline.name}`);
return NEVER; return NEVER;
} }