Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions src/platform/packages/private/kbn-esql-editor/src/esql_editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -619,17 +619,25 @@ const ESQLEditorInternal = function ESQLEditor({
useEffect(() => {
const setQueryToTheCache = async () => {
if (editor1?.current) {
const parserMessages = await parseMessages();
const clientParserStatus = parserMessages.errors?.length
? 'error'
: parserMessages.warnings.length
? 'warning'
: 'success';

addQueriesToCache({
queryString: code,
status: clientParserStatus,
});
try {
const parserMessages = await parseMessages();
const clientParserStatus = parserMessages.errors?.length
? 'error'
: parserMessages.warnings.length
? 'warning'
: 'success';

addQueriesToCache({
queryString: code,
status: clientParserStatus,
});
} catch (error) {
// Default to warning when parseMessages fails
addQueriesToCache({
queryString: code,
status: 'warning',
});
}
}
};
if (isQueryLoading || isLoading) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ export interface RecommendedField {

interface ResolveIndexResponseItem {
name: string;
mode?: 'lookup' | 'time_series' | string;
aliases?: string[];
}

export interface ResolveIndexResponse {
Expand Down
69 changes: 15 additions & 54 deletions src/platform/plugins/shared/esql/server/services/esql_service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
*/

import type { ElasticsearchClient } from '@kbn/core/server';
import type { IndicesAutocompleteResult, IndexAutocompleteItem } from '@kbn/esql-types';
import type {
IndicesAutocompleteResult,
IndexAutocompleteItem,
ResolveIndexResponse,
} from '@kbn/esql-types';
import type { InferenceTaskType } from '@elastic/elasticsearch/lib/api/types';
import type { InferenceEndpointsAutocompleteResult } from '@kbn/esql-types';

Expand All @@ -19,67 +23,24 @@ export interface EsqlServiceOptions {
export class EsqlService {
constructor(public readonly options: EsqlServiceOptions) {}

protected async getIndexAliases(indices: string[]): Promise<Record<string, string[]>> {
const result: Record<string, string[]> = {};
const { client } = this.options;

// Execute: GET /<index1,index2,...>/_alias
interface AliasesResponse {
[indexName: string]: {
aliases: {
[aliasName: string]: {};
};
};
}
const response = (await client.indices.getAlias({
index: indices,
})) as AliasesResponse;

for (const [indexName, { aliases }] of Object.entries(response)) {
const aliasNames = Object.keys(aliases ?? {});

if (aliasNames.length > 0) {
result[indexName] = aliasNames;
}
}

return result;
}

public async getIndicesByIndexMode(
mode: 'lookup' | 'time_series'
): Promise<IndicesAutocompleteResult> {
const { client } = this.options;

// Execute: GET /_all/_settings/index.mode,index.hidden,aliases?flat_settings=true
interface IndexModeResponse {
[indexName: string]: {
settings: {
'index.mode': string;
'index.hidden': boolean;
};
};
}
const queryByIndexModeResponse = (await client.indices.getSettings({
name: ['index.hidden', 'index.mode'],
flat_settings: true,
})) as IndexModeResponse;

const indices: IndexAutocompleteItem[] = [];
const indexNames: string[] = [];

for (const [name, { settings }] of Object.entries(queryByIndexModeResponse)) {
if (settings['index.mode'] === mode && !settings['index.hidden']) {
indexNames.push(name);
indices.push({ name, mode, aliases: [] });
}
}
// It doesn't return hidden indices
const sources = (await client.indices.resolveIndex({
name: '*',
expand_wildcards: 'open',
})) as ResolveIndexResponse;

const aliases = await this.getIndexAliases(indexNames);

for (const index of indices) {
index.aliases = aliases[index.name] ?? [];
}
sources.indices?.forEach((index) => {
if (index.mode === mode) {
indices.push({ name: index.name, mode, aliases: index.aliases ?? [] });
}
});

const result: IndicesAutocompleteResult = {
indices,
Expand Down