[Canvas] Improvements to datasource expressions including SQL paramet…

…er support and array leniency (#99549) (#103527) * Remove es sql strategy from behind Labs project, remove legacy essql code, remove last spot of legacy elasticsearch client from canvas * clean up test * fix es field test * remove comment Co-authored-by: Kibana Machine <[email protected]> Co-authored-by: Poff Poffenberger <[email protected]>
elastic · Jun 28, 2021 · b3c920d · b3c920d
1 parent a8f3ef1
commit b3c920d
Show file tree

Hide file tree

Showing 15 changed files with 219 additions and 556 deletions.
diff --git a/src/plugins/presentation_util/common/labs.ts b/src/plugins/presentation_util/common/labs.ts
@@ -9,11 +9,10 @@
 import { i18n } from '@kbn/i18n';
 
 export const LABS_PROJECT_PREFIX = 'labs:';
-export const USE_DATA_SERVICE = `${LABS_PROJECT_PREFIX}canvas:useDataService` as const;
 export const TIME_TO_PRESENT = `${LABS_PROJECT_PREFIX}presentation:timeToPresent` as const;
 export const DEFER_BELOW_FOLD = `${LABS_PROJECT_PREFIX}dashboard:deferBelowFold` as const;
 
-export const projectIDs = [TIME_TO_PRESENT, USE_DATA_SERVICE, DEFER_BELOW_FOLD] as const;
+export const projectIDs = [TIME_TO_PRESENT, DEFER_BELOW_FOLD] as const;
 export const environmentNames = ['kibana', 'browser', 'session'] as const;
 export const solutionNames = ['canvas', 'dashboard', 'presentation'] as const;
 
@@ -35,22 +34,6 @@ export const projects: { [ID in ProjectID]: ProjectConfig & { id: ID } } = {
  }),
  solutions: ['canvas'],
  },
- [USE_DATA_SERVICE]: {
- id: USE_DATA_SERVICE,
- isActive: true,
- isDisplayed: true,
- environments: ['kibana', 'browser', 'session'],
- name: i18n.translate('presentationUtil.experiments.enableUseDataServiceExperimentName', {
- defaultMessage: 'Use data service',
- }),
- description: i18n.translate(
- 'presentationUtil.experiments.enableUseDataServiceExperimentDescription',
- {
- defaultMessage: 'An experiment of using the new data.search service for Canvas datasources',
- }
- ),
- solutions: ['canvas'],
- },
  [DEFER_BELOW_FOLD]: {
  id: DEFER_BELOW_FOLD,
  isActive: false,

diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/escount.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/escount.ts
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/esdocs.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/esdocs.ts
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/essql.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/essql.ts
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/index.ts
@@ -6,9 +6,6 @@
  */
 
 import { demodata } from './demodata';
-import { escount } from './escount';
-import { esdocs } from './esdocs';
 import { pointseries } from './pointseries';
-import { essql } from './essql';
 
-export const functions = [demodata, esdocs, escount, essql, pointseries];
+export const functions = [demodata, pointseries];
diff --git a/x-pack/plugins/canvas/public/services/expressions.ts b/x-pack/plugins/canvas/public/services/expressions.ts
@@ -24,10 +24,6 @@ export const expressionsServiceFactory: CanvasServiceFactory<ExpressionsService>
  const loadServerFunctionWrappers = async () => {
  if (!cached) {
  cached = (async () => {
- const labService = startPlugins.presentationUtil.labsService;
- const hasDataSearch = labService.isProjectEnabled('labs:canvas:useDataService');
- const dataSearchFns = ['essql', 'esdocs', 'escount'];
-
  const serverFunctionList = await coreSetup.http.get(API_ROUTE_FUNCTIONS);
  const batchedFunction = bfetch.batchedFunction({ url: API_ROUTE_FUNCTIONS });
  const { serialize } = serializeProvider(expressions.getTypes());
@@ -36,13 +32,7 @@ export const expressionsServiceFactory: CanvasServiceFactory<ExpressionsService>
  // function that matches its definition, but which simply
  // calls the server-side function endpoint.
  Object.keys(serverFunctionList).forEach((functionName) => {
- // Allow function to be overwritten if we want to use
- // the server-hosted essql, esdocs, and escount functions
- if (dataSearchFns.includes(functionName)) {
- if (hasDataSearch && expressions.getFunction(functionName)) {
- return;
- }
- } else if (expressions.getFunction(functionName)) {
+ if (expressions.getFunction(functionName)) {
  return;
  }