Merge branch 'main' into acceleration-table-tests

Signed-off-by: Sean Li <[email protected]>

common/constants/data_connections.ts

@@ -12,7 +12,7 @@ export const OPENSEARCH_S3_DOCUMENTATION_URL =
   'https://opensearch.org/docs/latest/dashboards/management/S3-data-source/';
 
 export const OPENSEARCH_ACC_DOCUMENTATION_URL =
-  'https://opensearch.org/docs/latest/data-acceleration/index';
+  'https://opensearch.org/docs/latest/dashboards/management/accelerate-external-data/';
 export const QUERY_RESTRICTED = 'query-restricted';
 export const QUERY_ALL = 'query-all';
 

common/constants/explorer.ts

@@ -328,7 +328,7 @@ export const TYPE_TAB_MAPPING = {
 };
 
 export const DEFAULT_EMPTY_EXPLORER_FIELDS = [
-  { name: 'timestamp', type: 'timestamp' },
+  // timestamp field will be a default but is added after finding what it is
   { name: '_source', type: 'string' },
 ];
 

common/constants/shared.ts

@@ -265,3 +265,5 @@ export const DIRECT_DUMMY_QUERY = 'select 1';
 export const DEFAULT_START_TIME = 'now-15m';
 export const QUERY_ASSIST_START_TIME = 'now-40y';
 export const QUERY_ASSIST_END_TIME = 'now';
+
+export const TIMESTAMP_DATETIME_TYPES = ['date', 'date_nanos'];

common/types/data_connections.ts

@@ -83,19 +83,19 @@ export interface CachedColumn {
 
 export interface CachedTable {
   name: string;
-  columns: CachedColumn[];
+  columns?: CachedColumn[];
 }
 
 export interface CachedDatabase {
   name: string;
   tables: CachedTable[];
-  lastUpdated: string; // Assuming date string in UTC format
+  lastUpdated: string; // date string in UTC format
   status: CachedDataSourceStatus;
 }
 
 export interface CachedDataSource {
   name: string;
-  lastUpdated: string; // Assuming date string in UTC format
+  lastUpdated: string; // date string in UTC format
   status: CachedDataSourceStatus;
   databases: CachedDatabase[];
 }
@@ -115,13 +115,18 @@ export interface CachedAccelerations {
   status: string;
 }
 
-export interface AccelerationsCacheData {
-  version: string;
+export interface CachedAcclerationByDataSource {
+  name: string;
   accelerations: CachedAccelerations[];
-  lastUpdated: string; // Assuming date string in UTC format
+  lastUpdated: string; // date string in UTC format
   status: CachedDataSourceStatus;
 }
 
+export interface AccelerationsCacheData {
+  version: string;
+  dataSources: CachedAcclerationByDataSource[];
+}
+
 export interface PollingSuccessResult {
   schema: Array<{ name: string; type: string }>;
   datarows: Array<Array<string | number | boolean>>;

public/components/common/search/direct_search.tsx

@@ -18,13 +18,25 @@ import {
   EuiPopoverFooter,
   EuiToolTip,
 } from '@elastic/eui';
-import { isEqual } from 'lodash';
+import { isEmpty, isEqual } from 'lodash';
 import React, { useEffect, useState } from 'react';
 import { batch, useDispatch, useSelector } from 'react-redux';
 import { ASYNC_POLLING_INTERVAL, QUERY_LANGUAGE } from '../../../../common/constants/data_sources';
-import { APP_ANALYTICS_TAB_ID_REGEX, RAW_QUERY } from '../../../../common/constants/explorer';
-import { PPL_NEWLINE_REGEX, PPL_SPAN_REGEX } from '../../../../common/constants/shared';
-import { DirectQueryLoadingStatus, DirectQueryRequest } from '../../../../common/types/explorer';
+import {
+  APP_ANALYTICS_TAB_ID_REGEX,
+  RAW_QUERY,
+  SELECTED_TIMESTAMP,
+} from '../../../../common/constants/explorer';
+import {
+  PPL_NEWLINE_REGEX,
+  PPL_SPAN_REGEX,
+  TIMESTAMP_DATETIME_TYPES,
+} from '../../../../common/constants/shared';
+import {
+  DirectQueryLoadingStatus,
+  DirectQueryRequest,
+  IDefaultTimestampState,
+} from '../../../../common/types/explorer';
 import { uiSettingsService } from '../../../../common/utils';
 import { getAsyncSessionId, setAsyncSessionId } from '../../../../common/utils/query_session_utils';
 import { get as getObjValue } from '../../../../common/utils/shared';
@@ -42,6 +54,7 @@ import { formatError } from '../../event_analytics/utils';
 import { usePolling } from '../../hooks/use_polling';
 import { PPLReferenceFlyout } from '../helpers';
 import { Autocomplete } from './autocomplete';
+import { i18n } from '@osd/i18n';
 export interface IQueryBarProps {
   query: string;
   tempQuery: string;
@@ -250,6 +263,33 @@ export const DirectSearch = (props: any) => {
       });
   };
 
+  const getDirectQueryTimestamp = (schema: Array<{ name: string; type: string }>) => {
+    const timestamp: IDefaultTimestampState = {
+      hasSchemaConflict: false, // schema conflict bool used for OS index w/ different mappings, not needed here
+      default_timestamp: '',
+      message: i18n.translate(`discover.events.directQuery.noTimeStampFoundMessage`, {
+        defaultMessage: 'Index does not contain a valid time field.',
+      }),
+    };
+
+    for (let i = 0; i < schema.length; i++) {
+      const fieldMapping = schema[i];
+      if (!isEmpty(fieldMapping)) {
+        const fieldName = fieldMapping.name;
+        const fieldType = fieldMapping.type;
+        const isValidTimeType = TIMESTAMP_DATETIME_TYPES.some((dateTimeType) =>
+          isEqual(fieldType, dateTimeType)
+        );
+        if (isValidTimeType && isEmpty(timestamp.default_timestamp)) {
+          timestamp.default_timestamp = fieldName;
+          timestamp.message = '';
+          break;
+        }
+      }
+    }
+    return timestamp;
+  };
+
   useEffect(() => {
     // cancel direct query
     if (!pollingResult) return;
@@ -258,6 +298,16 @@ export const DirectSearch = (props: any) => {
 
     if (status === DirectQueryLoadingStatus.SUCCESS || datarows) {
       stopPollingWithStatus(status);
+      // find the timestamp from results
+      const derivedTimestamp = getDirectQueryTimestamp(pollingResult.schema);
+      dispatch(
+        changeQuery({
+          tabId,
+          query: {
+            [SELECTED_TIMESTAMP]: derivedTimestamp.default_timestamp,
+          },
+        })
+      );
       // update page with data
       dispatchOnGettingHis(pollingResult, '');
     } else if (status === DirectQueryLoadingStatus.FAILED) {

public/components/datasources/components/__tests__/data_connection.test.tsx

@@ -3,25 +3,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { act } from '@testing-library/react';
 import { configure } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
-import { act } from '@testing-library/react';
 import React from 'react';
+import ReactDOM from 'react-dom';
+import { coreRefs } from '../../../../../public/framework/core_refs';
 import {
   describePrometheusDataConnection,
   describeS3Dataconnection,
 } from '../../../../../test/datasources';
 import { DataConnection } from '../manage/data_connection';
-import ReactDOM from 'react-dom';
-import { coreRefs } from '../../../../../public/framework/core_refs';
 
 jest.mock('../../../../plugin', () => ({
-  getRenderAccelerationDetailsFlyout: jest.fn(() =>
-    jest.fn().mockImplementation(() => console.log('Acceleration Details Flyout Rendered'))
-  ),
-  getRenderAssociatedObjectsDetailsFlyout: jest.fn(() =>
-    jest.fn().mockImplementation(() => console.log('Associated Objects Details Flyout Rendered'))
-  ),
+  getRenderAccelerationDetailsFlyout: jest.fn(),
+  getRenderAssociatedObjectsDetailsFlyout: jest.fn(),
+  getRenderCreateAccelerationFlyout: jest.fn(),
 }));
 
 jest.mock('../../../../../public/framework/core_refs', () => ({