update getValuesFromResult to be less repetitive

elastic · Jul 8, 2020 · 744a5dd · 744a5dd
1 parent 0bc8210
commit 744a5dd
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 27 deletions.
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/analytics.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/analytics.ts
@@ -423,25 +423,21 @@ export const useRefreshAnalyticsList = (
 const DEFAULT_SIG_FIGS = 3;
 
 export function getValuesFromResponse(response: RegressionEvaluateResponse) {
-  let mse = response?.regression?.mse?.value;
-  let rSquared = response?.regression?.r_squared?.value;
-  let msle = response?.regression?.msle?.value;
-  let huber = response?.regression?.huber?.value;
-
-  if (mse) {
-    mse = Number(mse.toPrecision(DEFAULT_SIG_FIGS));
-  }
-  if (rSquared) {
-    rSquared = Number(rSquared.toPrecision(DEFAULT_SIG_FIGS));
-  }
-  if (msle) {
-    msle = Number(msle.toPrecision(DEFAULT_SIG_FIGS));
-  }
-  if (huber) {
-    huber = Number(huber.toPrecision(DEFAULT_SIG_FIGS));
+  const results = {};
+
+  if (response?.regression) {
+    for (const statType in response.regression) {
+      if (response.regression.hasOwnProperty(statType)) {
+        let currentStatValue = response.regression[statType]?.value;
+        if (currentStatValue) {
+          currentStatValue = Number(currentStatValue.toPrecision(DEFAULT_SIG_FIGS));
+        }
+        results[statType] = currentStatValue;
+      }
+    }
   }
 
-  return { mse, rSquared, msle, huber };
+  return results;
 }
 interface ResultsSearchBoolQuery {
   bool: Dictionary<any>;

diff --git a/...frame_analytics/pages/analytics_creation/components/details_step/details_step_details.tsx b/...frame_analytics/pages/analytics_creation/components/details_step/details_step_details.tsx
@@ -16,8 +16,6 @@ import {
 import { State } from '../../../analytics_management/hooks/use_create_analytics_form/state';
 import { ANALYTICS_STEPS } from '../../page';
 
-const DEFAULT_RESULTS_FIELD = 'ml';
-
 export interface ListItems {
   title: string;
   description: string | JSX.Element;

diff --git a/...nalytics/pages/analytics_exploration/components/regression_exploration/evaluate_panel.tsx b/...nalytics/pages/analytics_exploration/components/regression_exploration/evaluate_panel.tsx
@@ -84,12 +84,12 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
       genErrorEval.eval &&
       isRegressionEvaluateResponse(genErrorEval.eval)
     ) {
-      const { mse, msle, huber, rSquared } = getValuesFromResponse(genErrorEval.eval);
+      const { mse, msle, huber, r_squared } = getValuesFromResponse(genErrorEval.eval);
       setGeneralizationEval({
         mse,
         msle,
         huber,
-        rSquared,
+        rSquared: r_squared,
         error: null,
       });
       setIsLoadingGeneralization(false);
@@ -124,12 +124,12 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
       trainingErrorEval.eval &&
       isRegressionEvaluateResponse(trainingErrorEval.eval)
     ) {
-      const { mse, msle, huber, rSquared } = getValuesFromResponse(trainingErrorEval.eval);
+      const { mse, msle, huber, r_squared } = getValuesFromResponse(trainingErrorEval.eval);
       setTrainingEval({
         mse,
         msle,
         huber,
-        rSquared,
+        rSquared: r_squared,
         error: null,
       });
       setIsLoadingTraining(false);

diff --git a/...ata_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row.tsx b/...ata_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row.tsx
@@ -95,12 +95,12 @@ export const ExpandedRow: FC<Props> = ({ item }) => {
       genErrorEval.eval &&
       isRegressionEvaluateResponse(genErrorEval.eval)
     ) {
-      const { mse, msle, huber, rSquared } = getValuesFromResponse(genErrorEval.eval);
+      const { mse, msle, huber, r_squared } = getValuesFromResponse(genErrorEval.eval);
       setGeneralizationEval({
         mse,
         msle,
         huber,
-        rSquared,
+        rSquared: r_squared,
         error: null,
       });
       setIsLoadingGeneralization(false);
@@ -129,12 +129,12 @@ export const ExpandedRow: FC<Props> = ({ item }) => {
       trainingErrorEval.eval &&
       isRegressionEvaluateResponse(trainingErrorEval.eval)
     ) {
-      const { mse, msle, huber, rSquared } = getValuesFromResponse(trainingErrorEval.eval);
+      const { mse, msle, huber, r_squared } = getValuesFromResponse(trainingErrorEval.eval);
       setTrainingEval({
         mse,
         msle,
         huber,
-        rSquared,
+        rSquared: r_squared,
         error: null,
       });
       setIsLoadingTraining(false);