Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] [discover] optimize rendering language options #8688

Merged
merged 1 commit into from
Oct 23, 2024
Merged
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
93 changes: 51 additions & 42 deletions src/plugins/data/public/ui/query_editor/language_selector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
EuiSmallButtonEmpty,
PopoverAnchorPosition,
} from '@elastic/eui';
import React, { useEffect, useState } from 'react';
import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { Query } from '../..';
import { LanguageConfig } from '../../query';
import { getQueryService } from '../../services';
Expand All @@ -36,12 +36,14 @@
const queryString = getQueryService().queryString;
const languageService = queryString.getLanguageService();

const datasetSupportedLanguages = props.query.dataset
? queryString
.getDatasetService()
.getType(props.query.dataset.type)
?.supportedLanguages(props.query.dataset)
: undefined;
const datasetSupportedLanguages = useMemo(() => {
const dataset = props.query.dataset;
if (!dataset) {
return undefined;
}
const datasetType = queryString.getDatasetService().getType(dataset.type);
return datasetType?.supportedLanguages(dataset);

Check warning on line 45 in src/plugins/data/public/ui/query_editor/language_selector.tsx

View check run for this annotation

Codecov / codecov/patch

src/plugins/data/public/ui/query_editor/language_selector.tsx#L44-L45

Added lines #L44 - L45 were not covered by tests
}, [props.query.dataset, queryString]);

useEffect(() => {
const subscription = queryString.getUpdates$().subscribe((query: Query) => {
Expand All @@ -59,51 +61,58 @@
setPopover(!isPopoverOpen);
};

const languageOptions: Array<{ label: string; value: string }> = [];

languageService.getLanguages().forEach((language) => {
if (
(language && props.appName && !language.editorSupportedAppNames?.includes(props.appName)) ||
languageService.getUserQueryLanguageBlocklist().includes(language?.id) ||
(datasetSupportedLanguages && !datasetSupportedLanguages.includes(language.id))
)
return;
languageOptions.unshift(mapExternalLanguageToOptions(language));
});

const selectedLanguage = {
label:
(languageOptions.find(
(option) => (option.value as string).toLowerCase() === currentLanguage.toLowerCase()
)?.label as string) ?? languageOptions[0].label,
};
const languageOptions = useMemo(() => {
const options: Array<{ label: string; value: string }> = [];

const handleLanguageChange = (newLanguage: string) => {
setCurrentLanguage(newLanguage);
props.onSelectLanguage(newLanguage);
};
languageService.getLanguages().forEach((language) => {
const isSupported =
!datasetSupportedLanguages || datasetSupportedLanguages.includes(language.id);
const isBlocklisted = languageService.getUserQueryLanguageBlocklist().includes(language?.id);
const isAppSupported =
!props.appName || language?.editorSupportedAppNames?.includes(props.appName);

if (!isSupported || isBlocklisted || !isAppSupported) return;

options.unshift(mapExternalLanguageToOptions(language));
});

languageService.setUserQueryLanguage(currentLanguage);
return options.sort((a, b) => a.label.localeCompare(b.label));
}, [languageService, props.appName, datasetSupportedLanguages]);

const selectedLanguage = useMemo(
() => ({
label:
languageOptions.find(
(option) => option.value.toLowerCase() === currentLanguage.toLowerCase()
)?.label ?? languageOptions[0]?.label,
}),
[languageOptions, currentLanguage]
);

const handleLanguageChange = useCallback(
(newLanguage: string) => {
setCurrentLanguage(newLanguage);
props.onSelectLanguage(newLanguage);
languageService.setUserQueryLanguage(newLanguage);
setPopover(false);

Check warning on line 97 in src/plugins/data/public/ui/query_editor/language_selector.tsx

View check run for this annotation

Codecov / codecov/patch

src/plugins/data/public/ui/query_editor/language_selector.tsx#L94-L97

Added lines #L94 - L97 were not covered by tests
},
[props, languageService]
);

const languageOptionsMenu = languageOptions
.sort((a, b) => {
return a.label.localeCompare(b.label);
})
.map((language) => {
return (
const languageOptionsMenu = useMemo(
() =>
languageOptions.map((language) => (
<EuiContextMenuItem
key={language.label}
className="languageSelector__menuItem"
icon={language.label === selectedLanguage.label ? 'check' : 'empty'}
onClick={() => {
setPopover(false);
handleLanguageChange(language.value);
}}
onClick={() => handleLanguageChange(language.value)}

Check warning on line 109 in src/plugins/data/public/ui/query_editor/language_selector.tsx

View check run for this annotation

Codecov / codecov/patch

src/plugins/data/public/ui/query_editor/language_selector.tsx#L109

Added line #L109 was not covered by tests
>
{language.label}
</EuiContextMenuItem>
);
});
)),
[languageOptions, selectedLanguage.label, handleLanguageChange]
);

return (
<EuiPopover
Expand Down
Loading