Fix code style

elastic · Jun 30, 2021 · 39ddde8 · 39ddde8
1 parent 480bbc3
commit 39ddde8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/...ck/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.tsx b/...ck/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/formula.tsx
@@ -55,7 +55,7 @@ export const formulaOperation: OperationDefinition<
 
     const visibleOperationsMap = filterByVisibleOperation(operationDefinitionMap);
     const { root, error } = tryToParse(column.params.formula, visibleOperationsMap);
-    if (error || typeof root === 'undefined' || root == null) {
+    if (error || root == null) {
       return error?.message ? [error.message] : [];
     }
 

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/parse.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/formula/parse.ts
@@ -35,7 +35,7 @@ function parseAndExtract(
   label?: string
 ) {
   const { root, error } = tryToParse(text, operationDefinitionMap);
-  if (error || typeof root === 'undefined' || root == null) {
+  if (error || root == null) {
     return { extracted: [], isValid: false };
   }
   // before extracting the data run the validation task and throw if invalid

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts b/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts
@@ -230,12 +230,6 @@ function getExpressionForLayer(
       }
     );
 
-    const allDateHistogramFields = Object.values(columns)
-      .map((column) =>
-        column.operationType === dateHistogramOperation.type ? column.sourceField : null
-      )
-      .filter((field): field is string => Boolean(field));
-
     if (esAggEntries.length === 0) {
       return {
         type: 'expression',
@@ -256,6 +250,12 @@ function getExpressionForLayer(
       };
     }
 
+    const allDateHistogramFields = Object.values(columns)
+      .map((column) =>
+        column.operationType === dateHistogramOperation.type ? column.sourceField : null
+      )
+      .filter((field): field is string => Boolean(field));
+
     return {
       type: 'expression',
       chain: [