Skip to content
Snippets Groups Projects
Commit 35afe5fe authored by Sam Kagan's avatar Sam Kagan
Browse files

Called dedicated endpoint for auto-pims tile persistence

parent 084793a7
No related branches found
No related tags found
2 merge requests!25Merge 2.4.3 UI to main,!21Added tiles checklist for Accept-and-Archiving calibration jobs
......@@ -2,7 +2,7 @@ import {Injectable} from '@angular/core';
import {HttpClient, HttpParams, HttpHeaders} from "@angular/common/http";
import {ConfigurationService} from "../env/configuration.service";
import {Observable, of} from "rxjs";
import {map, switchMap} from "rxjs/operators";
import {map, switchMap, concatMap} from "rxjs/operators";
import {Job, JobExecution, JobSpec} from "../model/job";
import {FiltersService} from "./filters.service";
import {CustomHttpParamEncoder} from "../custom-http-param-encoder";
......@@ -201,17 +201,19 @@ export class JobsService {
}
public performQA(id: number, status: string, queue: string, selectedTiles?: number[]) {
let ingestBody = {};
if (selectedTiles != undefined && selectedTiles.length > 0) {
ingestBody = {"selectedTiles": selectedTiles};
}
const ingestUrl = this.configService.config.url + this.endPoint + 'jobs/' + id + '/ingest?status=' + status + '&queue=' + queue;
// return this.http.put(this.configService.config.url + this.endPoint + 'jobs/' + id + '/status?status=' + status + '&queue=' + queue, {}, {observe: "response"}).pipe(
// switchMap(response => {
return this.http.put(ingestUrl, ingestBody, {observe: "response"}).pipe(
map(response => {
return response.status;
}));
return this.http.put(ingestUrl, {}, {observe: "response"}).pipe(
switchMap(response => {
if (selectedTiles) {
const tileUrl = this.configService.config.url + this.endPoint + 'jobs/' + id + '/calAutoPimsTiles';
return this.http.post(tileUrl, selectedTiles, {observe: "response"}).pipe(map(response => response.body))
} else {
return of(response);
}
})
);
// }));
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment