use updated dataset for index pattern

Signed-off-by: Paul Sebastian <[email protected]>

src/plugins/data/public/antlr/dql/code_completion.ts

@@ -36,11 +36,11 @@ const findCursorIndex = (
   return undefined;
 };
 
-const findFieldSuggestions = (indexPattern: IndexPattern) => {
+const findFieldSuggestions = (indexPattern: any) => {
   const fieldNames: string[] = indexPattern.fields
-    .filter((idxField: IndexPatternField) => !idxField.subType) // filter removed .keyword fields
-    .map((idxField: { displayName: string }) => {
-      return idxField.displayName;
+    .filter((idxField: IndexPatternField) => !idxField?.subType) // filter removed .keyword fields
+    .map((idxField: { name: string }) => {
+      return idxField.name;
     });
 
   const fieldSuggestions: Array<{ text: string; type: string }> = fieldNames.map(
@@ -65,22 +65,17 @@ const getFieldSuggestedValues = async (
   });
 };
 
-const findValueSuggestions = async (
-  index: IndexPattern,
-  field: string,
-  value: string,
-  http?: HttpSetup
-) => {
+const findValueSuggestions = async (index: any, field: string, value: string, http?: HttpSetup) => {
   // check to see if last field is within index and if it can suggest values, first check
   // if .keyword appended field exists because that has values
   const matchedField =
     index.fields.find((idxField: IndexPatternField) => {
       // check to see if the field matches another field with .keyword appended
-      if (idxField.displayName === `${field}.keyword`) return idxField;
+      if (idxField.name === `${field}.keyword`) return idxField;
     }) ||
     index.fields.find((idxField: IndexPatternField) => {
       // if the display name matches, return
-      if (idxField.displayName === field) return idxField;
+      if (idxField.name === field) return idxField;
     });
 
   if (matchedField?.type === 'boolean') {
@@ -90,7 +85,7 @@ const findValueSuggestions = async (
   if (!matchedField || !matchedField.aggregatable || matchedField.type !== 'string') return;
 
   // ask api for suggestions
-  return await getFieldSuggestedValues(index.title, matchedField.displayName, value, http);
+  return await getFieldSuggestedValues(index.title, matchedField.name, value, http);
 };
 
 // visitor for parsing the current query
@@ -122,8 +117,11 @@ export const getSuggestions = async ({
   selectionEnd,
   core: coreSetup,
 }: QuerySuggestionGetFnArgs) => {
+  console.log('indexpa', indexPatterns);
+
   const http = coreSetup?.http;
-  const currentIndexPattern = indexPatterns[0] as IndexPattern;
+  const currentIndexPattern = indexPatterns[0];
+  console.log('curr', currentIndexPattern);
 
   const inputStream = CharStream.fromString(query);
   const lexer = new DQLLexer(inputStream);

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

@@ -25,10 +25,11 @@ import { QuerySuggestion } from '../../autocomplete';
 import { fromUser, getQueryLog, PersistedLog, toUser } from '../../query';
 import { SuggestionsListSize } from '../typeahead/suggestions_component';
 import { DataSettings } from '../types';
-import { fetchIndexPatterns } from './fetch_index_patterns';
 import { QueryLanguageSelector } from './language_selector';
 import { QueryEditorExtensions } from './query_editor_extensions';
 import { QueryEditorBtnCollapse } from './query_editor_btn_collapse';
+import { getQueryService } from '../../services';
+import { SIMPLE_DATA_SET_TYPES } from '../../../common';
 
 const LANGUAGE_ID_SQL = 'SQL';
 monaco.languages.register({ id: LANGUAGE_ID_SQL });
@@ -107,6 +108,8 @@ export default class QueryEditorUI extends Component<Props, State> {
 
   public inputRef: monaco.editor.IStandaloneCodeEditor | null = null;
 
+  private queryService = getQueryService();
+
   private persistedLog: PersistedLog | undefined;
   private abortController?: AbortController;
   private services = this.props.opensearchDashboards.services;
@@ -121,26 +124,6 @@ export default class QueryEditorUI extends Component<Props, State> {
     return toUser(this.props.query.query);
   };
 
-  // TODO: MQL don't do this here? || Fetch data sources
-  private fetchIndexPatterns = async () => {
-    const stringPatterns = this.props.indexPatterns.filter(
-      (indexPattern) => typeof indexPattern === 'string'
-    ) as string[];
-    const objectPatterns = this.props.indexPatterns.filter(
-      (indexPattern) => typeof indexPattern !== 'string'
-    ) as IIndexPattern[];
-
-    const objectPatternsFromStrings = (await fetchIndexPatterns(
-      this.services.savedObjects!.client,
-      stringPatterns,
-      this.services.uiSettings!
-    )) as IIndexPattern[];
-
-    this.setState({
-      indexPatterns: [...objectPatterns, ...objectPatternsFromStrings],
-    });
-  };
-
   private renderQueryEditorExtensions() {
     if (
       !(
@@ -305,18 +288,43 @@ export default class QueryEditorUI extends Component<Props, State> {
     }
   };
 
+  private fetchIndexPatterns = async () => {
+    const client = this.services.savedObjects.client;
+    const dataSet = this.queryService.dataSet.getDataSet();
+    const title = dataSet?.title;
+
+    const resp = await client.find({
+      type: 'index-pattern',
+      fields: ['title', 'timeFieldName', 'fields'],
+      search: `${title}*`,
+      searchFields: ['title'],
+      perPage: 100,
+    });
+
+    return resp.savedObjects.map((savedObject: any) => ({
+      id: savedObject.id,
+      title: savedObject.attributes?.title,
+      timeFieldName: savedObject.attributes?.timeFieldName,
+      fields: JSON.parse(savedObject.attributes?.fields),
+      type: SIMPLE_DATA_SET_TYPES.INDEX_PATTERN,
+    }));
+  };
+
   provideCompletionItems = async (
     model: monaco.editor.ITextModel,
     position: monaco.Position
   ): Promise<monaco.languages.CompletionList> => {
     const enhancements = this.props.settings.getQueryEnhancements(this.props.query.language);
     const connectionService = enhancements?.connectionService;
+
+    const indexPatterns = await this.fetchIndexPatterns();
+
     const suggestions = await this.services.data.autocomplete.getQuerySuggestions({
       query: this.getQueryString(),
       selectionStart: model.getOffsetAt(position),
       selectionEnd: model.getOffsetAt(position),
       language: this.props.query.language,
-      indexPatterns: this.state.indexPatterns,
+      indexPatterns,
       position,
       connectionService,
     });