make filter options dissapear for non-filterable languages

Signed-off-by: abbyhu2000 <[email protected]>
abbyhu2000 · Aug 21, 2024 · d72472c · d72472c
1 parent 9385d53
commit d72472c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/src/plugins/data/public/query/query_service.ts b/src/plugins/data/public/query/query_service.ts
@@ -48,9 +48,8 @@ import {
   IndexPatternsService,
 } from '../../common';
 import { getUiSettings } from '../services';
-import { IndexPattern, ISearchStart } from '..';
+import { IndexPattern } from '..';
 import { ConfigSchema } from '../../config';
-import { SearchService } from '../search/search_service';
 
 /**
  * Query Service

diff --git a/src/plugins/data/public/ui/search_bar/search_bar.tsx b/src/plugins/data/public/ui/search_bar/search_bar.tsx
@@ -251,12 +251,36 @@ class SearchBarUI extends Component<SearchBarProps, State> {
    */
   private shouldRenderTimeFilterInSavedQueryForm() {
     const { dateRangeFrom, dateRangeTo, showDatePicker } = this.props;
+    const enhancement = this.queryStringService
+      .getLanguageManager()
+      .getQueryEnhancements(this.state.query?.language!);
+
+    // if it is an enhanced language, check the filterable field
+    if (enhancement) {
+      return enhancement.fields?.filterable;
+    }
+
+    // otherwise, check if showDatePicker is enabled
     return (
       showDatePicker ||
       (!showDatePicker && dateRangeFrom !== undefined && dateRangeTo !== undefined)
     );
   }
 
+  private shouldRenderFilterInSavedQueryForm() {
+    const enhancement = this.queryStringService
+      .getLanguageManager()
+      .getQueryEnhancements(this.state.query?.language!);
+
+    // if it is an enhanced language, check the filterable field
+    if (enhancement) {
+      return enhancement.fields?.filterable;
+    }
+
+    // otherwise, check if filters are enabled
+    return this.props.showFilterBar;
+  }
+
   public setFilterBarHeight = () => {
     requestAnimationFrame(() => {
       const height =
@@ -560,7 +584,7 @@ class SearchBarUI extends Component<SearchBarProps, State> {
             savedQueryService={this.savedQueryService}
             onSave={this.onSave}
             onClose={() => this.setState({ showSaveQueryModal: false })}
-            showFilterOption={this.props.showFilterBar}
+            showFilterOption={this.shouldRenderFilterInSavedQueryForm()}
             showTimeFilterOption={this.shouldRenderTimeFilterInSavedQueryForm()}
           />
         ) : null}
@@ -569,7 +593,7 @@ class SearchBarUI extends Component<SearchBarProps, State> {
             savedQueryService={this.savedQueryService}
             onSave={(savedQueryMeta) => this.onSave(savedQueryMeta, true)}
             onClose={() => this.setState({ showSaveNewQueryModal: false })}
-            showFilterOption={this.props.showFilterBar}
+            showFilterOption={this.shouldRenderFilterInSavedQueryForm()}
             showTimeFilterOption={this.shouldRenderTimeFilterInSavedQueryForm()}
           />
         ) : null}

diff --git a/src/plugins/data/public/ui/types.ts b/src/plugins/data/public/ui/types.ts
@@ -28,6 +28,7 @@ export interface QueryEnhancement {
   };
   fields?: {
     visualizable?: boolean;
+    filterable?: boolean;
   };
   // List of supported app names that this enhancement should be enabled for,
   // if not provided it will be enabled for all apps

diff --git a/src/plugins/query_enhancements/public/plugin.tsx b/src/plugins/query_enhancements/public/plugin.tsx
@@ -80,6 +80,7 @@ export class QueryEnhancementsPlugin
           },
           fields: {
             visualizable: false,
+            filterable: false,
           },
           supportedAppNames: ['discover'],
         },
@@ -97,6 +98,7 @@ export class QueryEnhancementsPlugin
           },
           fields: {
             visualizable: false,
+            filterable: false,
           },
           supportedAppNames: ['discover'],
         },