Panels filter check for where clause (opensearch-project#251) (opense…

…arch-project#253) * where cluase filter Signed-off-by: Shenoy Pratik <[email protected]> * remove eslintcache Signed-off-by: Shenoy Pratik <[email protected]> * changing const to let Signed-off-by: Shenoy Pratik <[email protected]> --------- Signed-off-by: Shenoy Pratik <[email protected]> (cherry picked from commit d9793e1) Co-authored-by: Shenoy Pratik <[email protected]> (cherry picked from commit a008f71)
amsiglan · Mar 9, 2023 · 2ccf7a5 · 2ccf7a5
1 parent dd7c752
commit 2ccf7a5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/auto_sync_commit_metadata.json b/auto_sync_commit_metadata.json
@@ -1,4 +1,4 @@
 {
-    "last_github_commit": "7205a79d9444b2cedfb682f618cedfc3f1eaede7",
-    "last_gitfarm_commit": "8c3762b90a01c404198b2f177c245144c5f26236"
+    "last_github_commit": "a008f71635a197f589cfb03ba30f678120fc4fbc",
+    "last_gitfarm_commit": "67e5256218f5f9e4ee60088550f13496d6f5d30e"
 }
diff --git a/common/constants/shared.ts b/common/constants/shared.ts
@@ -40,6 +40,7 @@ export const PPL_SPAN_REGEX = /by\s*span/i;
 export const PPL_STATS_REGEX = /\|\s*stats/i;
 export const PPL_INDEX_INSERT_POINT_REGEX = /(search source|source|index)\s*=\s*([^|\s]+)(.*)/i;
 export const PPL_INDEX_REGEX = /(search source|source|index)\s*=\s*([^|\s]+)/i;
+export const PPL_WHERE_CLAUSE_REGEX = /\s*where\s+/i;
 export const PPL_NEWLINE_REGEX = /[\n\r]+/g;
 
 // Observability plugin URI

diff --git a/public/components/custom_panels/helpers/utils.tsx b/public/components/custom_panels/helpers/utils.tsx
@@ -11,7 +11,11 @@ import _ from 'lodash';
 import { Moment } from 'moment-timezone';
 import React from 'react';
 import { Layout } from 'react-grid-layout';
-import { PPL_DATE_FORMAT, PPL_INDEX_REGEX } from '../../../../common/constants/shared';
+import {
+  PPL_DATE_FORMAT,
+  PPL_INDEX_REGEX,
+  PPL_WHERE_CLAUSE_REGEX,
+} from '../../../../common/constants/shared';
 import PPLService from '../../../services/requests/ppl';
 import { CoreStart } from '../../../../../../src/core/public';
 import { CUSTOM_PANELS_API_PREFIX } from '../../../../common/constants/custom_panels';
@@ -68,7 +72,7 @@ export const mergeLayoutAndVisualizations = (
 
   for (let i = 0; i < newVisualizationList.length; i++) {
     for (let j = 0; j < layout.length; j++) {
-      if (newVisualizationList[i].id == layout[j].i) {
+      if (newVisualizationList[i].id === layout[j].i) {
         newPanelVisualizations.push({
           ...newVisualizationList[i],
           x: layout[j].x,
@@ -301,7 +305,7 @@ const createCatalogVisualizationMetaData = (
   };
 };
 
-//Creates a catalogVisualization for a runtime catalog based PPL query and runs getQueryResponse
+// Creates a catalogVisualization for a runtime catalog based PPL query and runs getQueryResponse
 export const renderCatalogVisualization = async (
   http: CoreStart['http'],
   pplService: PPLService,
@@ -367,14 +371,15 @@ export const onTimeChange = (
   setStart: React.Dispatch<React.SetStateAction<string>>,
   setEnd: React.Dispatch<React.SetStateAction<string>>
 ) => {
-  const recentlyUsedRange = recentlyUsedRanges.filter((recentlyUsedRange) => {
+  let recentlyUsedRangeObject = recentlyUsedRanges.filter((recentlyUsedRange) => {
     const isDuplicate = recentlyUsedRange.start === start && recentlyUsedRange.end === end;
     return !isDuplicate;
   });
-  recentlyUsedRange.unshift({ start, end });
+
+  recentlyUsedRangeObject.unshift({ start, end });
   setStart(start);
   setEnd(end);
-  setRecentlyUsedRanges(recentlyUsedRange.slice(0, 9));
+  setRecentlyUsedRanges(recentlyUsedRangeObject.slice(0, 9));
 };
 
 // Function to check date validity
@@ -400,6 +405,11 @@ const checkIndexExists = (query: string) => {
   return PPL_INDEX_REGEX.test(query);
 };
 
+// Check if the filter query starts with a where clause
+const checkWhereClauseExists = (query: string) => {
+  return PPL_WHERE_CLAUSE_REGEX.test(query);
+};
+
 // Check PPL Query in Panel UI
 // Validate if the query doesn't contain any Index
 export const isPPLFilterValid = (
@@ -415,6 +425,10 @@ export const isPPLFilterValid = (
     setToast('Please remove index from PPL Filter', 'danger', undefined);
     return false;
   }
+  if (!checkWhereClauseExists(query)) {
+    setToast('PPL filters should start with a where clause', 'danger', undefined);
+    return false;
+  }
   return true;
 };
 
@@ -429,7 +443,7 @@ export const displayVisualization = (metaData: any, data: any, type: string) =>
     ...getDefaultVisConfig(new QueryManager().queryParser().parse(metaData.query).getStats()),
   };
   let finalDimensions = [...(realTimeParsedStats.dimensions || [])];
-  let breakdowns = [...(dataConfig.breakdowns || [])];
+  const breakdowns = [...(dataConfig.breakdowns || [])];
 
   // filter out breakdowns from dimnesions
   if (hasBreakdowns) {