Fix bugs

elastic · May 19, 2020 · 356e473 · 356e473
1 parent 38a74f0
commit 356e473
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/x-pack/plugins/pipeline_builder/public/nodes/calculated_column.tsx b/x-pack/plugins/pipeline_builder/public/nodes/calculated_column.tsx
@@ -103,7 +103,7 @@ export const definition: NodeDefinition<CalculatedColumnState> = {
     const value = inputs[inputNodeIds[0]]?.value;
 
     const { outputColumnId, selectedFormula, formulaState } = node.state;
-    if (!outputColumnId || !selectedFormula || !formulaState) {
+    if (!outputColumnId || !selectedFormula || !formulaState || !value) {
       return value;
     }
 
@@ -149,18 +149,18 @@ const calculations: Record<
         const groupTotals: Record<string, number> = {};
 
         table.rows.forEach(row => {
-          if (groupTotals[row[formulaState.otherColumn]]) {
-            groupTotals[row[formulaState.otherColumn]] += row[state.formulaState.column];
+          if (groupTotals[row[state.formulaState.otherColumn]]) {
+            groupTotals[row[state.formulaState.otherColumn]] += row[state.formulaState.column];
           } else {
-            groupTotals[row[formulaState.otherColumn]] = row[state.formulaState.column];
+            groupTotals[row[state.formulaState.otherColumn]] = row[state.formulaState.column];
           }
         });
         return {
           columns: table.columns.concat([{ id: state.outputColumnId, dataType: 'number' }]),
           rows: table.rows.map(r => ({
             ...r,
             [state.outputColumnId]:
-              r[state.formulaState.column] / groupTotals[row[formulaState.otherColumn]],
+              r[state.formulaState.column] / groupTotals[r[state.formulaState.otherColumn]],
           })),
         };
       }
@@ -169,14 +169,17 @@ const calculations: Record<
           columns: table.columns.concat([{ id: state.outputColumnId, dataType: 'number' }]),
           rows: table.rows.map(r => ({
             ...r,
-            [state.outputColumnId]: r[state.formulaState.column] / row[formulaState.otherColumn],
+            [state.outputColumnId]: r[state.formulaState.column] / r[state.formulaState.otherColumn],
           })),
         };
       }
 
       return table;
     },
     renderEditor: (node, table, dispatch) => {
+      if (!table) {
+        return <>No columns available from table</>;
+      }
       return (
         <>
           <EuiFormRow label="Column">
@@ -226,8 +229,8 @@ const calculations: Record<
             <EuiFormRow label="Group by column">
               <EuiSelect
                 options={[{ text: 'No column', value: '' }].concat(
-                  table.columns
-                    .filter(c => c.id !== node.state.formulaState.column)
+                  table?.columns
+                    .filter(c => c.id !== node.state.formulaState?.column)
                     .map(c => ({ text: c.label || c.id, value: c.id }))
                 )}
                 value={node.state.formulaState?.otherColumn ?? ''}

diff --git a/x-pack/plugins/pipeline_builder/public/nodes/search_node.tsx b/x-pack/plugins/pipeline_builder/public/nodes/search_node.tsx
@@ -184,12 +184,19 @@ export const definition: NodeDefinition<SearchNodeState> = {
   async run(node, inputs, inputNodeIds, deps) {
     const { state } = node;
     const fn = deps.http.post;
-    const result = await fn('/api/console/proxy', {
-      query: { path: state.path, method: state.method },
-      body: state.body,
-    });
+    try {
+      const result = await fn('/api/console/proxy', {
+        query: { path: state.path, method: state.method },
+        body: state.body,
+      });
 
-    return result;
+      return result;
+    } catch (e) {
+      throw new Error(`${e.body.error.reason}
+
+      On line ${e.body.error.line}:
+${state.body.split('\n')[e.body.error.line - 1]}`);
+    }
   },
 };