From 4907541c3b99b30d35d1f12e102f8e66a0f94bb8 Mon Sep 17 00:00:00 2001 From: Catherine Liu Date: Fri, 12 Apr 2019 13:28:16 -0500 Subject: [PATCH] [Canvas] Fixes esdocs fields (#34894) (#35008) * Fixed api route for esFields * Changes canvas api route back to /api/canvas --- x-pack/plugins/canvas/common/lib/constants.js | 2 +- x-pack/plugins/canvas/server/routes/es_fields/index.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/canvas/common/lib/constants.js b/x-pack/plugins/canvas/common/lib/constants.js index a9839f6bcc5ce7..d996bc5e8c4b81 100644 --- a/x-pack/plugins/canvas/common/lib/constants.js +++ b/x-pack/plugins/canvas/common/lib/constants.js @@ -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`; diff --git a/x-pack/plugins/canvas/server/routes/es_fields/index.js b/x-pack/plugins/canvas/server/routes/es_fields/index.js index 235b2b0bc69e3a..6967c2994a2910 100644 --- a/x-pack/plugins/canvas/server/routes/es_fields/index.js +++ b/x-pack/plugins/canvas/server/routes/es_fields/index.js @@ -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) {