github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ML] Adding version to the http service (#158358)

Browse source 
Adds `version` to the `getFetchOptions` response which is passed to
`http.fetch`
Refactors the code to remove duplicate functions which do not need to be
methods in `HttpService`.
This commit is contained in:
James Gowdy 2023-05-24 12:54:54 +01:00 • committed by GitHub
parent 360790290b
commit 0a79002d73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

63
x-pack/plugins/ml/public/application/services/http_service.ts
View file

@ -20,19 +20,31 @@ function getFetchOptions(options: HttpFetchOptionsWithPath): {
path: string;
fetchOptions: HttpFetchOptions;
} {
if (!options.path) {
const { path, method, headers, body, query, version } = options;
if (!path) {
throw new Error('URL path is missing');
}
const fetchOptions: HttpFetchOptions = {
asSystemRequest: true,
credentials: 'same-origin',
method: method || 'GET',
headers: getResultHeaders(headers ?? {}),
};
if (body) {
fetchOptions.body = body;
}
if (query) {
fetchOptions.query = query;
}
if (version) {
fetchOptions.version = version;
}
return {
path: options.path,
fetchOptions: {
asSystemRequest: true,
credentials: 'same-origin',
method: options.method || 'GET',
...(options.body ? { body: options.body } : {}),
...(options.query ? { query: options.query } : {}),
headers: getResultHeaders(options.headers ?? {}),
},
path,
fetchOptions,
};
}
@ -119,33 +131,6 @@ export class HttpService {
this.getLoadingCount$ = httpStart.getLoadingCount$();
}
private getResultHeaders(headers: HeadersInit): HeadersInit {
return {
'Content-Type': 'application/json',
...headers,
} as HeadersInit;
}
private getFetchOptions(options: HttpFetchOptionsWithPath): {
path: string;
fetchOptions: HttpFetchOptions;
} {
if (!options.path) {
throw new Error('URL path is missing');
}
return {
path: options.path,
fetchOptions: {
asSystemRequest: true,
credentials: 'same-origin',
method: options.method || 'GET',
...(options.body ? { body: options.body } : {}),
...(options.query ? { query: options.query } : {}),
headers: this.getResultHeaders(options.headers ?? {}),
},
};
}
/**
* Creates an Observable from Kibana's HttpHandler.
*/
@ -202,7 +187,7 @@ export class HttpService {
* Wrapper for Kibana's HttpHandler.
*/
public async http<T>(options: HttpFetchOptionsWithPath): Promise<T> {
const { path, fetchOptions } = this.getFetchOptions(options);
const { path, fetchOptions } = getFetchOptions(options);
return this.httpStart.fetch<T>(path, fetchOptions);
}
@ -211,7 +196,7 @@ export class HttpService {
* with request cancellation support.
*/
public http$<T>(options: HttpFetchOptionsWithPath): Observable<T> {
const { path, fetchOptions } = this.getFetchOptions(options);
const { path, fetchOptions } = getFetchOptions(options);
return this.fromHttpHandler<T>(path, fetchOptions);
}
}