[discover] data type overrides language config and if includes time filter then don't modify query

src/plugins/data/common/datasets/types.ts

@@ -265,4 +265,16 @@ export interface DatasetField {
 
 export interface DatasetSearchOptions {
   strategy?: string;
+  /*
+   * Whether to include the raw time filter in the search
+   * defaults to false and if the dataset type supportsTimeFilter
+   * then the time filter will be included automatically into the query.
+   * If true, the time filter will be included in the search request as
+   * a param but leave the query unchanged.
+   *
+   * Using this will override the time filter in the query.
+   * Using this will disable aggregation based on the time filter automatically.
+   * Search strategy will need to handle the logic for that and ensure consistency.
+   */
+  includeTimeFilter?: boolean;
 }

src/plugins/data/public/query/query_string/language_service/types.ts

@@ -61,6 +61,11 @@ export interface LanguageConfig {
   };
   editorSupportedAppNames?: string[];
   supportedAppNames?: string[];
+  /**
+   * @deprecated
+   *
+   * Use `datasetTypeConfig.supportsTimeFilter` instead
+   */
   hideDatePicker?: boolean;
   sampleQueries?: SampleQuery[];
 }

src/plugins/data/public/ui/dataset_selector/configurator.tsx

@@ -152,6 +152,20 @@
     };
   }, [indexedViewsService, selectedIndexedView, dataset]);
 
+  const shouldRenderDatePickerField = useCallback(() => {
+    const datasetType = queryString.getDatasetService().getType(dataset.type);
+
+    // Check dataset type configuration first
+    const supportsTimeFilter = datasetType?.meta?.supportsTimeFilter;
+    if (supportsTimeFilter !== undefined) {
+      return Boolean(supportsTimeFilter);
+    }
+
+    // Fall back to language configuration
+    const languageConfig = languageService.getLanguage(language);
+    return !languageConfig?.hideDatePicker;
+  }, [dataset.type, language, queryString, languageService]);
+
   return (
     <>
       <EuiModalHeader>
@@ -256,7 +270,7 @@
               data-test-subj="advancedSelectorLanguageSelect"
             />
           </EuiFormRow>
-          {!languageService.getLanguage(language)?.hideDatePicker &&
+          {shouldRenderDatePickerField() &&
             (dataset.type === DEFAULT_DATA.SET_TYPES.INDEX_PATTERN ? (
               <EuiFormRow
                 label={i18n.translate(

src/plugins/data/public/ui/query_editor/query_editor_top_row.tsx

@@ -224,18 +224,58 @@
     );
   }
 
+  /**
+   * Determines if the date picker should be rendered based on UI settings, dataset configuration, and language settings.
+   *
+   * @returns {boolean} Whether the date picker should be rendered
+   *
+   * UI Settings permutations (isDatePickerEnabled):
+   * - showDatePicker=true || showAutoRefreshOnly=true => true
+   * - showDatePicker=false && showAutoRefreshOnly=false => false
+   * - both undefined => true (default)
+   * If isDatePickerEnabled is false, returns false immediately
+   *
+   * Dataset Type permutations (datasetType?.meta?.supportsTimeFilter):
+   * - supportsTimeFilter=true => true
+   * - supportsTimeFilter=false => false
+   * - supportsTimeFilter=undefined && dataset exists => falls through to language check
+   * - no dataset => falls through to language check
+   *
+   * Language permutations (when dataset.meta.supportsTimeFilter is undefined):
+   * - queryLanguage=undefined => true (shows date picker)
+   * - queryLanguage exists:
+   *   - hideDatePicker=true => false
+   *   - hideDatePicker=false => true
+   *   - hideDatePicker=undefined => true
+   *
+   * Example scenarios:
+   * 1. {showDatePicker: false} => false
+   * 2. {dataset: {type: 'x', meta: {supportsTimeFilter: true}}} => true
+   * 3. {dataset: {type: 'x', meta: {supportsTimeFilter: false}}} => false
+   * 4. {dataset: {type: 'x'}, queryLanguage: 'sql', hideDatePicker: true} => false
+   * 5. {dataset: {type: 'x'}, queryLanguage: 'sql', hideDatePicker: false} => true
+   * 6. {dataset: {type: 'x'}, queryLanguage: undefined} => true (no language restrictions)
+   * 7. No configuration => true (default behavior shows date picker)
+   */
   function shouldRenderDatePicker(): boolean {
-    return (
-      Boolean((props.showDatePicker || props.showAutoRefreshOnly) ?? true) &&
-      !(
-        queryLanguage &&
-        data.query.queryString.getLanguageService().getLanguage(queryLanguage)?.hideDatePicker
-      ) &&
-      (props.query?.dataset
-        ? data.query.queryString.getDatasetService().getType(props.query.dataset.type)?.meta
-            ?.supportsTimeFilter !== false
-        : true)
+    const { queryString } = data.query;
+    const datasetService = queryString.getDatasetService();
+    const languageService = queryString.getLanguageService();
+    const isDatePickerEnabled = Boolean(
+      (props.showDatePicker || props.showAutoRefreshOnly) ?? true
     );
+    if (!isDatePickerEnabled) return false;
+
+    // Get dataset type configuration
+    const datasetType = props.query?.dataset
+      ? datasetService.getType(props.query?.dataset.type)
+      : undefined;
+    // Check if dataset type explicitly configures the `supportsTimeFilter` option
+    if (datasetType?.meta?.supportsTimeFilter !== undefined) {
+      return Boolean(datasetType?.meta?.supportsTimeFilter);
+    }
+
+    return Boolean(!(queryLanguage && languageService.getLanguage(queryLanguage)?.hideDatePicker));
   }
 
   function shouldRenderQueryEditor(): boolean {

src/plugins/query_enhancements/public/search/ppl_search_interceptor.ts

@@ -68,15 +68,29 @@ export class PPLSearchInterceptor extends SearchInterceptor {
         .getDatasetService()
         .getType(datasetType);
       strategy = datasetTypeConfig?.getSearchOptions?.().strategy ?? strategy;
+
+      if (datasetTypeConfig?.getSearchOptions?.().includeTimeFilter) {
+        request.params = {
+          ...request.params,
+          body: {
+            ...request.params.body,
+            timeRange: this.queryService.timefilter.timefilter.getTime(),
+          },
+        };
+      }
     }
 
     return this.runSearch(request, options.abortSignal, strategy);
   }
 
   private buildQuery() {
-    const query: Query = this.queryService.queryString.getQuery();
+    const { queryString } = this.queryService;
+    const query: Query = queryString.getQuery();
     const dataset = query.dataset;
     if (!dataset || !dataset.timeFieldName) return query;
+    const datasetService = queryString.getDatasetService();
+    if (datasetService.getType(dataset.type)?.getSearchOptions?.().includeTimeFilter) return query;
+
     const [baseQuery, ...afterPipeParts] = query.query.split('|');
     const afterPipe = afterPipeParts.length > 0 ? ` | ${afterPipeParts.join('|').trim()}` : '';
     const timeFilter = this.getTimeFilter(dataset.timeFieldName);

src/plugins/query_enhancements/public/search/sql_search_interceptor.ts

@@ -62,6 +62,16 @@ export class SQLSearchInterceptor extends SearchInterceptor {
         .getDatasetService()
         .getType(datasetType);
       strategy = datasetTypeConfig?.getSearchOptions?.().strategy ?? strategy;
+
+      if (datasetTypeConfig?.getSearchOptions?.().includeTimeFilter) {
+        request.params = {
+          ...request.params,
+          body: {
+            ...request.params.body,
+            timeRange: this.queryService.timefilter.timefilter.getTime(),
+          },
+        };
+      }
     }
 
     return this.runSearch(request, options.abortSignal, strategy);

src/plugins/query_enhancements/server/routes/index.ts

@@ -77,6 +77,7 @@ export function defineSearchStrategyRouteProvider(logger: Logger, router: IRoute
                 sessionId: schema.maybe(schema.string()),
               })
             ),
+            timeRange: schema.maybe(schema.object({}, { unknowns: 'allow' })),
           }),
         },
       },