index pattern updates

Signed-off-by: Kawika Avilla <[email protected]>
kavilla · Aug 26, 2024 · b6f55d1 · b6f55d1
1 parent 182792d
commit b6f55d1
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/src/plugins/data/public/query/query_string/dataset_service/lib/index_pattern_type.ts b/src/plugins/data/public/query/query_string/dataset_service/lib/index_pattern_type.ts
@@ -4,7 +4,13 @@
  */
 
 import { SavedObjectsClientContract } from 'opensearch-dashboards/public';
-import { DEFAULT_DATA, DataStructure, DatasetField, Dataset } from '../../../../../common';
+import {
+  DEFAULT_DATA,
+  DataStructure,
+  DatasetField,
+  Dataset,
+  IIndexPattern,
+} from '../../../../../common';
 import { DatasetTypeConfig } from '../types';
 import { getIndexPatterns } from '../../../../services';
 
@@ -60,11 +66,26 @@ export const indexPatternTypeConfig: DatasetTypeConfig = {
 };
 
 const fetchIndexPatterns = async (client: SavedObjectsClientContract): Promise<DataStructure[]> => {
-  const indexPatterns = await getIndexPatterns().getIdsWithTitle();
-
-  return indexPatterns.map((indexPattern) => ({
-    id: indexPattern.id,
-    title: indexPattern.title,
+  const resp = await client.find<IIndexPattern>({
+    type: 'index-pattern',
+    fields: ['title', 'timeFieldName', 'references'],
+    search: `*`,
+    searchFields: ['title'],
+    perPage: 100,
+  });
+  return resp.savedObjects.map((savedObject) => ({
+    id: savedObject.id,
+    title: savedObject.attributes.title,
+    timeFieldName: savedObject.attributes.timeFieldName,
     type: DEFAULT_DATA.SET_TYPES.INDEX_PATTERN,
+    ...(savedObject.references[0]
+      ? {
+          dataSource: {
+            id: savedObject.references[0]?.id,
+            name: savedObject.references[0]?.name,
+            type: 'data-source',
+          },
+        }
+      : {}),
   }));
 };
diff --git a/src/plugins/discover/public/application/view_components/utils/use_index_pattern.ts b/src/plugins/discover/public/application/view_components/utils/use_index_pattern.ts
@@ -46,7 +46,7 @@ export const useIndexPattern = (services: DiscoverViewServices) => {
 
     const handleIndexPattern = async () => {
       if (isQueryEnhancementEnabled && query?.dataset) {
-        const pattern = await data.indexPatterns.get(query.dataset.id, true);
+        const pattern = await data.indexPatterns.get(query.dataset.id);
 
         if (isMounted && pattern) {
           setIndexPattern(pattern);