Skip to content

[Canvas] Fixes esdocs fields #34894

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

Merged
cqliu1 merged 2 commits into from
Apr 12, 2019
Merged

[Canvas] Fixes esdocs fields #34894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ceb692e
Fixed api route for esFields
cqliu1 Apr 10, 2019
c85b0f9
Changes canvas api route back to /api/canvas
cqliu1 Apr 10, 2019
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
2 changes: 1 addition & 1 deletion x-pack/plugins/canvas/common/lib/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const CANVAS_TYPE = 'canvas-workpad';
export const CANVAS_APP = 'canvas';
export const APP_ROUTE = '/app/canvas';
export const APP_ROUTE_WORKPAD = `${APP_ROUTE}#/workpad`;
export const API_ROUTE = '/api/interpreter';
export const API_ROUTE = '/api/canvas';
export const API_ROUTE_WORKPAD = `${API_ROUTE}/workpad`;
export const API_ROUTE_WORKPAD_ASSETS = `${API_ROUTE}/workpad-assets`;
export const API_ROUTE_WORKPAD_STRUCTURES = `${API_ROUTE}/workpad-structures`;
Expand Down
4 changes: 3 additions & 1 deletion x-pack/plugins/canvas/server/routes/es_fields/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,17 @@
*/

import { partial } from 'lodash';
import { API_ROUTE } from '../../../common/lib/constants';
import { getESFieldTypes } from './get_es_field_types';

// TODO: Error handling, note: esErrors

export function esFields(server) {
const { callWithRequest } = server.plugins.elasticsearch.getCluster('data');

server.route({
method: 'GET',
path: '/api/canvas/es_fields',
path: `${API_ROUTE}/es_fields`,
handler: function(request, h) {
const { index, fields } = request.query;
if (!index) {
Expand Down