[ML] DF Analytics Regression results: rerun evaluate endpoint for search bar queries

x-pack/legacy/plugins/ml/public/data_frame_analytics/_index.scss

@@ -1,4 +1,5 @@
 @import 'pages/analytics_exploration/components/exploration/index';
+@import 'pages/analytics_exploration/components/regression_exploration/index';
 @import 'pages/analytics_management/components/analytics_list/index';
 @import 'pages/analytics_management/components/create_analytics_form/index';
 @import 'pages/analytics_management/components/create_analytics_flyout/index';

x-pack/legacy/plugins/ml/public/data_frame_analytics/common/analytics.ts

@@ -9,8 +9,11 @@ import { BehaviorSubject } from 'rxjs';
 import { filter, distinctUntilChanged } from 'rxjs/operators';
 import { Subscription } from 'rxjs';
 import { idx } from '@kbn/elastic-idx';
+import { cloneDeep } from 'lodash';
 import { ml } from '../../services/ml_api_service';
+import { Dictionary } from '../../../common/types/common';
 import { getErrorMessage } from '../pages/analytics_management/hooks/use_create_analytics_form';
+import { SavedSearchQuery } from '../../contexts/kibana';
 
 export type IndexName = string;
 export type IndexPattern = string;
@@ -38,8 +41,8 @@ export enum INDEX_STATUS {
 }
 
 export interface Eval {
-  meanSquaredError: number | '';
-  rSquared: number | '';
+  meanSquaredError: number | string;
+  rSquared: number | string;
   error: null | string;
 }
 
@@ -119,6 +122,13 @@ export const isRegressionAnalysis = (arg: any): arg is RegressionAnalysis => {
   return keys.length === 1 && keys[0] === ANALYSIS_CONFIG_TYPE.REGRESSION;
 };
 
+export const isRegressionResultsSearchBoolQuery = (
+  arg: any
+): arg is RegressionResultsSearchBoolQuery => {
+  const keys = Object.keys(arg);
+  return keys.length === 1 && keys[0] === 'bool';
+};
+
 export interface DataFrameAnalyticsConfig {
   id: DataFrameAnalyticsId;
   // Description attribute is not supported yet
@@ -212,27 +222,67 @@ export function getValuesFromResponse(response: RegressionEvaluateResponse) {
 
   return { meanSquaredError, rSquared };
 }
+interface RegressionResultsSearchBoolQuery {
+  bool: Dictionary<any>;
+}
+interface RegressionResultsSearchTermQuery {
+  term: Dictionary<any>;
+}
+
+export type RegressionResultsSearchQuery =
+  | RegressionResultsSearchBoolQuery
+  | RegressionResultsSearchTermQuery
+  | SavedSearchQuery;
+
+export function getEvalQueryBody({
+  resultsField,
+  isTraining,
+  searchQuery,
+  ignoreDefaultQuery,
+}: {
+  resultsField: string;
+  isTraining: boolean;
+  searchQuery?: RegressionResultsSearchQuery;
+  ignoreDefaultQuery?: boolean;
+}) {
+  let query: RegressionResultsSearchQuery = {
+    term: { [`${resultsField}.is_training`]: { value: isTraining } },
+  };
+
+  if (searchQuery !== undefined && ignoreDefaultQuery === true) {
+    query = searchQuery;
+  } else if (isRegressionResultsSearchBoolQuery(searchQuery)) {
+    const searchQueryClone = cloneDeep(searchQuery);
+    searchQueryClone.bool.must.push(query);
+    query = searchQueryClone;
+  }
+  return query;
+}
 
 export const loadEvalData = async ({
   isTraining,
   index,
   dependentVariable,
   resultsField,
   predictionFieldName,
+  searchQuery,
+  ignoreDefaultQuery,
 }: {
   isTraining: boolean;
   index: string;
   dependentVariable: string;
   resultsField: string;
   predictionFieldName?: string;
+  searchQuery?: RegressionResultsSearchQuery;
+  ignoreDefaultQuery?: boolean;
 }) => {
   const results: LoadEvaluateResult = { success: false, eval: null, error: null };
   const defaultPredictionField = `${dependentVariable}_prediction`;
   const predictedField = `${resultsField}.${
     predictionFieldName ? predictionFieldName : defaultPredictionField
   }`;
 
-  const query = { term: { [`${resultsField}.is_training`]: { value: isTraining } } };
+  const query = getEvalQueryBody({ resultsField, isTraining, searchQuery, ignoreDefaultQuery });
 
   const config = {
     index,

x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/_index.scss

@@ -0,0 +1 @@
+@import 'regression_exploration';

x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/_regression_exploration.scss

@@ -0,0 +1,3 @@
+.mlDataFrameAnalyticsRegression__evaluateStat span.euiToolTipAnchor {
+  padding-top: $euiSizeL;
+}

x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/error_callout.tsx

@@ -62,6 +62,29 @@ export const ErrorCallout: FC<Props> = ({ error }) => {
         </p>
       </EuiCallOut>
     );
+  } else if (error.includes('userProvidedQueryBuilder')) {
+    // query bar syntax is incorrect
+    errorCallout = (
+      <EuiCallOut
+        title={i18n.translate(
+          'xpack.ml.dataframe.analytics.regressionExploration.queryParsingErrorMessage',
+          {
+            defaultMessage: 'Unable to parse query.',
+          }
+        )}
+        color="primary"
+      >
+        <p>
+          {i18n.translate(
+            'xpack.ml.dataframe.analytics.regressionExploration.queryParsingErrorBody',
+            {
+              defaultMessage:
+                'The query syntax is invalid and returned no results. Please check the query syntax and try again.',
+            }
+          )}
+        </p>
+      </EuiCallOut>
+    );
   }
 
   return <Fragment>{errorCallout}</Fragment>;