Skip to content

Fix: JSON #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: JSON #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 53 additions & 11 deletions src/app/engines/mistral/mistral.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {BehaviorSubject, Observable, of as ObservableOf, throwError} from "rxjs"
import {catchError, map} from "rxjs/operators";

import {ActionExecution, Execution, SubWorkflowExecution, TaskDef, TaskExec, WorkflowDef} from "../../shared/models";
import {toUrlParams} from "../../shared/utils";
import {toUrlParams, toHTTPHeaders} from "../../shared/utils";
import {NonWaitingStates} from "../../shared/models/common";

@Injectable()
Expand All @@ -29,6 +29,10 @@ export class MistralService {
* url: /executions?<query_params>
*/
executions(sortBy="created_at", sortByDir="desc", marker=""): Observable<{executions: Execution[], next?: string}> { /*tslint:disable-line*/
let headers = toHTTPHeaders({
Accept: "application/json"
});

let params = toUrlParams({
limit: 100,
fields: "workflow_name,created_at,state,task_execution_id",
Expand All @@ -40,7 +44,7 @@ export class MistralService {
params = params.append("marker", marker);
}

return this.http.get<any>(this.prefix + "executions", {params})
return this.http.get<any>(this.prefix + "executions", {params, headers})
.pipe(
catchError(e => this.handleError(e))
);
Expand All @@ -50,7 +54,11 @@ export class MistralService {
* url: /executions/<id>
*/
execution(id: string): Observable<Execution> {
return this.http.get(this.prefix + "executions/" + id)
let headers = toHTTPHeaders({
Accept: "application/json"
});

return this.http.get(this.prefix + "executions/" + id, {headers})
.pipe(
map((res: Execution) => {
const execution = new Execution(res);
Expand All @@ -69,7 +77,11 @@ export class MistralService {
"updated_at", "workflow_execution_id", "workflow_id", "type", "started_at", "finished_at"].join(",");
const params = toUrlParams({fields});

return this.http.get(this.prefix + `executions/${id}/tasks`, {params})
let headers = toHTTPHeaders({
Accept: "application/json"
});

return this.http.get(this.prefix + `executions/${id}/tasks`, {params, headers})
.pipe(
map(res => res["tasks"]),
map(res => {
Expand All @@ -86,7 +98,11 @@ export class MistralService {
* Extract the definition
*/
workflowDef(id: string): Observable<WorkflowDef> {
return this.http.get(this.prefix + `workflows/${id}`)
let headers = toHTTPHeaders({
Accept: "application/json"
});

return this.http.get(this.prefix + `workflows/${id}`, {headers})
.pipe(
map(res => new WorkflowDef(res["definition"], res["name"])),
catchError(e => ObservableOf(WorkflowDef.FromEmpty()))
Expand All @@ -95,7 +111,11 @@ export class MistralService {

setParentExecutionId(execution: Execution): void {
if (execution.task_execution_id) {
this.http.get(this.prefix + `tasks/${execution.task_execution_id}`)
let headers = toHTTPHeaders({
Accept: "application/json"
});

this.http.get(this.prefix + `tasks/${execution.task_execution_id}`, {headers})
.pipe(
map((res: TaskExec) => execution.parentExecutionId = res.workflow_execution_id),
catchError(e => this.handleError(e))
Expand All @@ -113,7 +133,11 @@ export class MistralService {
if (taskExec.result != null) {
return ObservableOf(taskExec);
} else {
return this.http.get(this.prefix + `tasks/${taskExec.id}`)
let headers = toHTTPHeaders({
Accept: "application/json"
});

return this.http.get(this.prefix + `tasks/${taskExec.id}`, {headers})
.pipe(
map(res => {
taskExec.setResult(res["result"]);
Expand Down Expand Up @@ -172,7 +196,12 @@ export class MistralService {
*/
actionExecutions(taskExecId: string): Observable<ActionExecution[]> {
const params = toUrlParams({fields: "name,state,created_at,updated_at"});
return this.http.get(this.prefix + `tasks/${taskExecId}/action_executions`, {params})

let headers = toHTTPHeaders({
Accept: "application/json"
});

return this.http.get(this.prefix + `tasks/${taskExecId}/action_executions`, {params, headers})
.pipe(
map(res => res["action_executions"]),
catchError(e => this.handleError(e))
Expand All @@ -185,7 +214,12 @@ export class MistralService {
*/
wfExecutionsByTaskExecutionId(taskExecId: string): Observable<any[]> {
const params = toUrlParams({task_execution_id: taskExecId, fields: "state,workflow_name,created_at,updated_at"});
return this.http.get(this.prefix + "executions", {params})

let headers = toHTTPHeaders({
Accept: "application/json"
});

return this.http.get(this.prefix + "executions", {params, headers})
.pipe(
map(res => res["executions"]),
catchError(e => this.handleError(e))
Expand All @@ -196,7 +230,11 @@ export class MistralService {
* url: /tasks/<task_id>
*/
getTask(taskId: string): Observable<TaskExec> {
return this.http.get<any>(this.prefix + `tasks/${taskId}`)
let headers = toHTTPHeaders({
Accept: "application/json"
});

return this.http.get<any>(this.prefix + `tasks/${taskId}`, {headers})
.pipe(
catchError(e => this.handleError(e))
);
Expand All @@ -206,7 +244,11 @@ export class MistralService {
* url: /action_executions/<action_execution_id>
*/
getActionExecution(actionExecutionId: string): Observable<ActionExecution> {
return this.http.get<any>(this.prefix + `action_executions/${actionExecutionId}`)
let headers = toHTTPHeaders({
Accept: "application/json"
});

return this.http.get<any>(this.prefix + `action_executions/${actionExecutionId}`, {headers})
.pipe(
catchError(e => this.handleError(e))
);
Expand Down
13 changes: 12 additions & 1 deletion src/app/shared/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
// Copyright (C) 2017 Nokia

import {HttpParams} from "@angular/common/http";
import {HttpParams, HttpHeaders} from "@angular/common/http";
import * as jsyaml from 'js-yaml';

/**
* Build HttpHeaders object
* @param obj
* @returns {HttpHeaders}
*/
export function toHTTPHeaders(obj = {}): HttpHeaders {
let headers = new HttpHeaders();
Object.keys(obj).forEach(key => headers = headers.append(key, obj[key].toString()));
return headers;
}

/**
* Build URLSearchParams object
* @param obj
Expand Down