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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/types/api/autocomplete.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export interface TQueryAutocomplete {
}

interface TAutocompleteResult {
Entities: TAutocompleteEntity[];
Entities?: TAutocompleteEntity[];
Total?: number;
}

Expand Down
9 changes: 6 additions & 3 deletions src/utils/monaco/yql/generateSuggestions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const commonSuggestionEntities: AutocompleteEntityType[] = ['dir', 'unknown', 'e
const directoryTypes: AutocompleteEntityType[] = ['dir', 'ext_sub_domain'];

function filterAutocompleteEntities(
autocompleteEntities: TAutocompleteEntity[],
autocompleteEntities: TAutocompleteEntity[] | undefined,
suggestions: YQLEntity[],
) {
const suggestionsSet = suggestions.reduce((acc, el) => {
Expand All @@ -84,7 +84,7 @@ function filterAutocompleteEntities(
}
return acc;
}, new Set(commonSuggestionEntities));
return autocompleteEntities.filter(({Type}) => suggestionsSet.has(Type));
return autocompleteEntities?.filter(({Type}) => suggestionsSet.has(Type));
}

function wrapStringToBackticks(value: string) {
Expand Down Expand Up @@ -245,7 +245,7 @@ export async function generateColumnsSuggestion(
{} as Record<string, string[]>,
);

autocompleteResponse.Result.Entities.forEach((col) => {
autocompleteResponse.Result.Entities?.forEach((col) => {
if (!isAutocompleteColumn(col)) {
return;
}
Expand Down Expand Up @@ -353,6 +353,9 @@ export async function generateEntitiesSuggestion(
const withBackticks = prefix?.startsWith('`');
if (data.Success) {
const filteredEntities = filterAutocompleteEntities(data.Result.Entities, suggestEntities);
if (!filteredEntities) {
return [];
}
return filteredEntities.reduce((acc, {Name, Type}) => {
const isDir = directoryTypes.includes(Type);
const label = isDir ? `${Name}/` : Name;
Expand Down
Loading