+
+ {isDiscardQueryModalVisible && (
+
+ (await starredQueriesService?.onDiscardModalClose(dismissFlag, removeQuery)) ??
+ Promise.resolve()
+ }
+ />
+ )}
);
}
@@ -359,7 +422,7 @@ export function QueryColumn({
onClick={() => {
setIsRowExpanded(!isRowExpanded);
}}
- data-test-subj="ESQLEditor-queryHistory-queryString-expanded"
+ data-test-subj="ESQLEditor-queryList-queryString-expanded"
aria-label={
isRowExpanded
? i18n.translate('esqlEditor.query.collapseLabel', {
@@ -392,3 +455,171 @@ export function QueryColumn({
);
}
+
+export function HistoryAndStarredQueriesTabs({
+ containerCSS,
+ containerWidth,
+ onUpdateAndSubmit,
+ height,
+}: {
+ containerCSS: Interpolation
;
+ containerWidth: number;
+ onUpdateAndSubmit: (qs: string) => void;
+ height: number;
+}) {
+ const kibana = useKibana();
+ const { core, usageCollection, storage } = kibana.services;
+
+ const [starredQueriesService, setStarredQueriesService] = useState();
+ const [starredQueries, setStarredQueries] = useState([]);
+
+ useEffect(() => {
+ const initializeService = async () => {
+ const starredService = await EsqlStarredQueriesService.initialize({
+ http: core.http,
+ usageCollection,
+ storage,
+ });
+ setStarredQueriesService(starredService);
+ };
+ if (!starredQueriesService) {
+ initializeService();
+ }
+ }, [core.http, starredQueriesService, storage, usageCollection]);
+
+ starredQueriesService?.queries$.subscribe((nextQueries) => {
+ if (nextQueries.length !== starredQueries.length) {
+ setStarredQueries(nextQueries);
+ }
+ });
+
+ const { euiTheme } = useEuiTheme();
+ const tabs = useMemo(() => {
+ return [
+ {
+ id: 'history-queries-tab',
+ name: i18n.translate('esqlEditor.query.historyQueriesTabLabel', {
+ defaultMessage: 'Recent',
+ }),
+ dataTestSubj: 'history-queries-tab',
+ content: (
+
+ ),
+ },
+ {
+ id: 'starred-queries-tab',
+ dataTestSubj: 'starred-queries-tab',
+ name: i18n.translate('esqlEditor.query.starredQueriesTabLabel', {
+ defaultMessage: 'Starred',
+ }),
+ append: (
+
+ {starredQueries?.length}
+
+ ),
+ content: (
+
+ ),
+ },
+ ];
+ }, [
+ containerCSS,
+ containerWidth,
+ height,
+ onUpdateAndSubmit,
+ starredQueries,
+ starredQueriesService,
+ ]);
+
+ const [selectedTabId, setSelectedTabId] = useState('history-queries-tab');
+ const selectedTabContent = useMemo(() => {
+ return tabs.find((obj) => obj.id === selectedTabId)?.content;
+ }, [selectedTabId, tabs]);
+
+ const onSelectedTabChanged = (id: string) => {
+ setSelectedTabId(id);
+ };
+
+ const renderTabs = useCallback(() => {
+ return tabs.map((tab, index) => (
+ onSelectedTabChanged(tab.id)}
+ isSelected={tab.id === selectedTabId}
+ append={tab.append}
+ data-test-subj={tab.dataTestSubj}
+ >
+ {tab.name}
+
+ ));
+ }, [selectedTabId, tabs]);
+
+ return (
+ <>
+
+
+ {renderTabs()}
+
+
+
+
+
+ {selectedTabId === 'history-queries-tab'
+ ? i18n.translate('esqlEditor.history.historyItemslimit', {
+ defaultMessage: 'Showing last {historyItemsLimit} queries',
+ values: { historyItemsLimit: MAX_HISTORY_QUERIES_NUMBER },
+ })
+ : i18n.translate('esqlEditor.history.starredItemslimit', {
+ defaultMessage:
+ 'Showing {starredItemsCount} queries (max {starredItemsLimit})',
+ values: {
+ starredItemsLimit: ESQL_STARRED_QUERIES_LIMIT,
+ starredItemsCount: starredQueries.length ?? 0,
+ },
+ })}
+
+
+
+
+
+ {selectedTabContent}
+
+ );
+}
diff --git a/packages/kbn-esql-editor/src/editor_footer/query_history_helpers.test.ts b/packages/kbn-esql-editor/src/editor_footer/history_starred_queries_helpers.test.ts
similarity index 93%
rename from packages/kbn-esql-editor/src/editor_footer/query_history_helpers.test.ts
rename to packages/kbn-esql-editor/src/editor_footer/history_starred_queries_helpers.test.ts
index 43a676aba56b5..ad33cd3687fae 100644
--- a/packages/kbn-esql-editor/src/editor_footer/query_history_helpers.test.ts
+++ b/packages/kbn-esql-editor/src/editor_footer/history_starred_queries_helpers.test.ts
@@ -7,7 +7,7 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/
-import { swapArrayElements } from './query_history_helpers';
+import { swapArrayElements } from './history_starred_queries_helpers';
describe('query history helpers', function () {
it('should swap 2 elements in an array', function () {
diff --git a/packages/kbn-esql-editor/src/editor_footer/query_history_helpers.ts b/packages/kbn-esql-editor/src/editor_footer/history_starred_queries_helpers.ts
similarity index 86%
rename from packages/kbn-esql-editor/src/editor_footer/query_history_helpers.ts
rename to packages/kbn-esql-editor/src/editor_footer/history_starred_queries_helpers.ts
index c55bc0801ec66..2f7d4419d13c9 100644
--- a/packages/kbn-esql-editor/src/editor_footer/query_history_helpers.ts
+++ b/packages/kbn-esql-editor/src/editor_footer/history_starred_queries_helpers.ts
@@ -19,16 +19,19 @@ export const getReducedSpaceStyling = () => {
}
.euiTable thead tr {
display: grid;
- grid-template-columns: 40px 1fr 0 auto;
+ grid-template-columns: 40px 40px 1fr 0 auto;
}
.euiTable tbody tr {
display: grid;
- grid-template-columns: 40px 1fr auto;
+ grid-template-columns: 40px 40px 1fr auto;
grid-template-areas:
- 'status timeRan lastDuration actions'
- '. queryString queryString queryString';
+ 'favoriteBtn status timeRan lastDuration actions'
+ '. . queryString queryString queryString';
}
/* Set grid template areas */
+ .euiTable td[data-test-subj='favoriteBtn'] {
+ grid-area: favoriteBtn;
+ }
.euiTable td[data-test-subj='status'] {
grid-area: status;
}
diff --git a/packages/kbn-esql-editor/src/editor_footer/index.tsx b/packages/kbn-esql-editor/src/editor_footer/index.tsx
index d898d2c52c9c7..4e60e65f19ca4 100644
--- a/packages/kbn-esql-editor/src/editor_footer/index.tsx
+++ b/packages/kbn-esql-editor/src/editor_footer/index.tsx
@@ -8,7 +8,6 @@
*/
import React, { memo, useState, useCallback, useMemo } from 'react';
-
import { i18n } from '@kbn/i18n';
import {
EuiText,
@@ -27,7 +26,7 @@ import {
import { getLimitFromESQLQuery } from '@kbn/esql-utils';
import { type MonacoMessage } from '../helpers';
import { ErrorsWarningsFooterPopover } from './errors_warnings_popover';
-import { QueryHistoryAction, QueryHistory } from './query_history';
+import { QueryHistoryAction, HistoryAndStarredQueriesTabs } from './history_starred_queries';
import { SubmitFeedbackComponent } from './feedback_component';
import { QueryWrapComponent } from './query_wrap_component';
import type { ESQLEditorDeps } from '../types';
@@ -60,7 +59,6 @@ interface EditorFooterProps {
isSpaceReduced?: boolean;
hideTimeFilterInfo?: boolean;
hideQueryHistory?: boolean;
- isInCompactMode?: boolean;
displayDocumentationAsFlyout?: boolean;
}
@@ -84,7 +82,6 @@ export const EditorFooter = memo(function EditorFooter({
isLanguageComponentOpen,
setIsLanguageComponentOpen,
hideQueryHistory,
- isInCompactMode,
displayDocumentationAsFlyout,
measuredContainerWidth,
code,
@@ -310,7 +307,7 @@ export const EditorFooter = memo(function EditorFooter({
{isHistoryOpen && (
- > & {
+ tooltipContent: string;
+ /** When the condition is truthy, the tooltip will be shown */
+ condition: boolean;
+};
+
+export const TooltipWrapper: React.FunctionComponent = ({
+ children,
+ condition,
+ tooltipContent,
+ ...tooltipProps
+}) => {
+ return (
+ <>
+ {condition ? (
+
+ <>{children}
+
+ ) : (
+ children
+ )}
+
+ );
+};
diff --git a/packages/kbn-esql-editor/src/esql_editor.test.tsx b/packages/kbn-esql-editor/src/esql_editor.test.tsx
index ac00604e5508b..c572ff5355585 100644
--- a/packages/kbn-esql-editor/src/esql_editor.test.tsx
+++ b/packages/kbn-esql-editor/src/esql_editor.test.tsx
@@ -16,23 +16,20 @@ import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
import { ESQLEditor } from './esql_editor';
import type { ESQLEditorProps } from './types';
import { ReactWrapper } from 'enzyme';
-import { of } from 'rxjs';
+import { coreMock } from '@kbn/core/server/mocks';
describe('ESQLEditor', () => {
const uiConfig: Record = {};
const uiSettings = {
get: (key: string) => uiConfig[key],
} as IUiSettingsClient;
- const theme = {
- theme$: of({ darkMode: false }),
- };
const services = {
uiSettings,
settings: {
client: uiSettings,
},
- theme,
+ core: coreMock.createStart(),
};
function renderESQLEditorComponent(testProps: ESQLEditorProps) {
diff --git a/packages/kbn-esql-editor/src/esql_editor.tsx b/packages/kbn-esql-editor/src/esql_editor.tsx
index e8ca582ac5229..767bc9026348c 100644
--- a/packages/kbn-esql-editor/src/esql_editor.tsx
+++ b/packages/kbn-esql-editor/src/esql_editor.tsx
@@ -25,7 +25,14 @@ import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
import type { AggregateQuery } from '@kbn/es-query';
import type { ExpressionsStart } from '@kbn/expressions-plugin/public';
import { useKibana } from '@kbn/kibana-react-plugin/public';
-import { ESQLLang, ESQL_LANG_ID, ESQL_THEME_ID, monaco, type ESQLCallbacks } from '@kbn/monaco';
+import {
+ ESQLLang,
+ ESQL_LANG_ID,
+ ESQL_DARK_THEME_ID,
+ ESQL_LIGHT_THEME_ID,
+ monaco,
+ type ESQLCallbacks,
+} from '@kbn/monaco';
import memoize from 'lodash/memoize';
import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { createPortal } from 'react-dom';
@@ -91,7 +98,8 @@ export const ESQLEditor = memo(function ESQLEditor({
fieldsMetadata,
uiSettings,
} = kibana.services;
- const timeZone = core?.uiSettings?.get('dateFormat:tz');
+ const darkMode = core.theme?.getTheme().darkMode;
+
const histogramBarTarget = uiSettings?.get('histogram:barTarget') ?? 50;
const [code, setCode] = useState(query.esql ?? '');
// To make server side errors less "sticky", register the state of the code when submitting
@@ -456,11 +464,10 @@ export const ESQLEditor = memo(function ESQLEditor({
validateQuery();
addQueriesToCache({
queryString: code,
- timeZone,
status: clientParserStatus,
});
}
- }, [clientParserStatus, isLoading, isQueryLoading, parseMessages, code, timeZone]);
+ }, [clientParserStatus, isLoading, isQueryLoading, parseMessages, code]);
const queryValidation = useCallback(
async ({ active }: { active: boolean }) => {
@@ -597,7 +604,7 @@ export const ESQLEditor = memo(function ESQLEditor({
vertical: 'auto',
},
scrollBeyondLastLine: false,
- theme: ESQL_THEME_ID,
+ theme: darkMode ? ESQL_DARK_THEME_ID : ESQL_LIGHT_THEME_ID,
wordWrap: 'on',
wrappingIndent: 'none',
};
diff --git a/packages/kbn-esql-editor/src/history_local_storage.test.ts b/packages/kbn-esql-editor/src/history_local_storage.test.ts
index c149dada84894..4632bd124f80d 100644
--- a/packages/kbn-esql-editor/src/history_local_storage.test.ts
+++ b/packages/kbn-esql-editor/src/history_local_storage.test.ts
@@ -20,7 +20,6 @@ describe('history local storage', function () {
it('should add queries to cache correctly ', function () {
addQueriesToCache({
queryString: 'from kibana_sample_data_flights | limit 10',
- timeZone: 'Browser',
});
const historyItems = getCachedQueries();
expect(historyItems.length).toBe(1);
@@ -31,7 +30,6 @@ describe('history local storage', function () {
it('should update queries to cache correctly ', function () {
addQueriesToCache({
queryString: 'from kibana_sample_data_flights \n | limit 10 \n | stats meow = avg(woof)',
- timeZone: 'Browser',
status: 'success',
});
@@ -49,7 +47,6 @@ describe('history local storage', function () {
it('should update queries to cache correctly if they are the same with different format', function () {
addQueriesToCache({
queryString: 'from kibana_sample_data_flights | limit 10 | stats meow = avg(woof) ',
- timeZone: 'Browser',
status: 'success',
});
@@ -68,7 +65,6 @@ describe('history local storage', function () {
addQueriesToCache(
{
queryString: 'row 1',
- timeZone: 'Browser',
status: 'success',
},
2
diff --git a/packages/kbn-esql-editor/src/history_local_storage.ts b/packages/kbn-esql-editor/src/history_local_storage.ts
index c79561d5d3875..46dd770d8d897 100644
--- a/packages/kbn-esql-editor/src/history_local_storage.ts
+++ b/packages/kbn-esql-editor/src/history_local_storage.ts
@@ -7,10 +7,9 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/
-import moment from 'moment';
import 'moment-timezone';
const QUERY_HISTORY_ITEM_KEY = 'QUERY_HISTORY_ITEM_KEY';
-const dateFormat = 'MMM. D, YY HH:mm:ss.SSS';
+export const dateFormat = 'MMM. D, YY HH:mm:ss';
/**
* We show maximum 20 ES|QL queries in the Query history component
@@ -19,32 +18,35 @@ const dateFormat = 'MMM. D, YY HH:mm:ss.SSS';
export interface QueryHistoryItem {
status?: 'success' | 'error' | 'warning';
queryString: string;
- startDateMilliseconds?: number;
timeRan?: string;
- timeZone?: string;
}
-const MAX_QUERIES_NUMBER = 20;
+export const MAX_HISTORY_QUERIES_NUMBER = 20;
-const getKey = (queryString: string) => {
+export const getTrimmedQuery = (queryString: string) => {
return queryString.replaceAll('\n', '').trim().replace(/\s\s+/g, ' ');
};
-const getMomentTimeZone = (timeZone?: string) => {
- return !timeZone || timeZone === 'Browser' ? moment.tz.guess() : timeZone;
-};
-
-const sortDates = (date1?: number, date2?: number) => {
- return moment(date1)?.valueOf() - moment(date2)?.valueOf();
+const sortDates = (date1?: string, date2?: string) => {
+ if (!date1 || !date2) return 0;
+ return date1 < date2 ? 1 : date1 > date2 ? -1 : 0;
};
export const getHistoryItems = (sortDirection: 'desc' | 'asc'): QueryHistoryItem[] => {
const localStorageString = localStorage.getItem(QUERY_HISTORY_ITEM_KEY) ?? '[]';
- const historyItems: QueryHistoryItem[] = JSON.parse(localStorageString);
+ const localStorageItems: QueryHistoryItem[] = JSON.parse(localStorageString);
+ const historyItems: QueryHistoryItem[] = localStorageItems.map((item) => {
+ return {
+ status: item.status,
+ queryString: item.queryString,
+ timeRan: item.timeRan ? new Date(item.timeRan).toISOString() : undefined,
+ };
+ });
+
const sortedByDate = historyItems.sort((a, b) => {
return sortDirection === 'desc'
- ? sortDates(b.startDateMilliseconds, a.startDateMilliseconds)
- : sortDates(a.startDateMilliseconds, b.startDateMilliseconds);
+ ? sortDates(b.timeRan, a.timeRan)
+ : sortDates(a.timeRan, b.timeRan);
});
return sortedByDate;
};
@@ -58,24 +60,22 @@ export const getCachedQueries = (): QueryHistoryItem[] => {
// Adding the maxQueriesAllowed here for testing purposes
export const addQueriesToCache = (
item: QueryHistoryItem,
- maxQueriesAllowed = MAX_QUERIES_NUMBER
+ maxQueriesAllowed = MAX_HISTORY_QUERIES_NUMBER
) => {
// if the user is working on multiple tabs
// the cachedQueries Map might not contain all
// the localStorage queries
const queries = getHistoryItems('desc');
queries.forEach((queryItem) => {
- const trimmedQueryString = getKey(queryItem.queryString);
+ const trimmedQueryString = getTrimmedQuery(queryItem.queryString);
cachedQueries.set(trimmedQueryString, queryItem);
});
- const trimmedQueryString = getKey(item.queryString);
+ const trimmedQueryString = getTrimmedQuery(item.queryString);
if (item.queryString) {
- const tz = getMomentTimeZone(item.timeZone);
cachedQueries.set(trimmedQueryString, {
...item,
- timeRan: moment().tz(tz).format(dateFormat),
- startDateMilliseconds: moment().valueOf(),
+ timeRan: new Date().toISOString(),
status: item.status,
});
}
@@ -83,9 +83,7 @@ export const addQueriesToCache = (
let allQueries = [...getCachedQueries()];
if (allQueries.length >= maxQueriesAllowed + 1) {
- const sortedByDate = allQueries.sort((a, b) =>
- sortDates(b?.startDateMilliseconds, a?.startDateMilliseconds)
- );
+ const sortedByDate = allQueries.sort((a, b) => sortDates(b.timeRan, a.timeRan));
// queries to store in the localstorage
allQueries = sortedByDate.slice(0, maxQueriesAllowed);
diff --git a/packages/kbn-esql-editor/src/types.ts b/packages/kbn-esql-editor/src/types.ts
index 339ac7a506430..a5fcaba885b0a 100644
--- a/packages/kbn-esql-editor/src/types.ts
+++ b/packages/kbn-esql-editor/src/types.ts
@@ -13,6 +13,8 @@ import type { AggregateQuery } from '@kbn/es-query';
import type { ExpressionsStart } from '@kbn/expressions-plugin/public';
import type { IndexManagementPluginSetup } from '@kbn/index-management-shared-types';
import type { FieldsMetadataPublicStart } from '@kbn/fields-metadata-plugin/public';
+import type { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
+import type { Storage } from '@kbn/kibana-utils-plugin/public';
export interface ESQLEditorProps {
/** The aggregate type query */
@@ -70,6 +72,8 @@ export interface ESQLEditorDeps {
core: CoreStart;
dataViews: DataViewsPublicPluginStart;
expressions: ExpressionsStart;
+ storage: Storage;
indexManagementApiService?: IndexManagementPluginSetup['apiService'];
fieldsMetadata?: FieldsMetadataPublicStart;
+ usageCollection?: UsageCollectionStart;
}
diff --git a/packages/kbn-esql-editor/tsconfig.json b/packages/kbn-esql-editor/tsconfig.json
index c26b971e5231c..5131dd90fb0a5 100644
--- a/packages/kbn-esql-editor/tsconfig.json
+++ b/packages/kbn-esql-editor/tsconfig.json
@@ -28,6 +28,11 @@
"@kbn/fields-metadata-plugin",
"@kbn/esql-validation-autocomplete",
"@kbn/esql-utils",
+ "@kbn/content-management-favorites-public",
+ "@kbn/usage-collection-plugin",
+ "@kbn/content-management-favorites-common",
+ "@kbn/kibana-utils-plugin",
+ "@kbn/shared-ux-table-persist",
],
"exclude": [
"target/**/*",
diff --git a/packages/kbn-esql-validation-autocomplete/src/__tests__/helpers.ts b/packages/kbn-esql-validation-autocomplete/src/__tests__/helpers.ts
index 2f46356acee37..02d2c062ccca7 100644
--- a/packages/kbn-esql-validation-autocomplete/src/__tests__/helpers.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/__tests__/helpers.ts
@@ -12,9 +12,7 @@ import { ESQLRealField } from '../validation/types';
import { fieldTypes } from '../definitions/types';
export const fields: ESQLRealField[] = [
- ...fieldTypes
- .map((type) => ({ name: `${camelCase(type)}Field`, type }))
- .filter((f) => f.type !== 'unsupported'),
+ ...fieldTypes.map((type) => ({ name: `${camelCase(type)}Field`, type })),
{ name: 'any#Char$Field', type: 'double' },
{ name: 'kubernetes.something.something', type: 'double' },
{ name: '@timestamp', type: 'date' },
diff --git a/packages/kbn-esql-validation-autocomplete/src/autocomplete/__tests__/helpers.ts b/packages/kbn-esql-validation-autocomplete/src/autocomplete/__tests__/helpers.ts
index 2221f4dc1582f..c49b05985c86a 100644
--- a/packages/kbn-esql-validation-autocomplete/src/autocomplete/__tests__/helpers.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/autocomplete/__tests__/helpers.ts
@@ -11,6 +11,7 @@ import { camelCase } from 'lodash';
import { parse } from '@kbn/esql-ast';
import { scalarFunctionDefinitions } from '../../definitions/generated/scalar_functions';
import { builtinFunctions } from '../../definitions/builtin';
+import { NOT_SUGGESTED_TYPES } from '../../shared/resources_helpers';
import { aggregationFunctionDefinitions } from '../../definitions/generated/aggregation_functions';
import { timeUnitsToSuggest } from '../../definitions/literals';
import { groupingFunctionDefinitions } from '../../definitions/grouping';
@@ -229,7 +230,11 @@ export function getFieldNamesByType(
) {
const requestedType = Array.isArray(_requestedType) ? _requestedType : [_requestedType];
return fields
- .filter(({ type }) => requestedType.includes('any') || requestedType.includes(type))
+ .filter(
+ ({ type }) =>
+ (requestedType.includes('any') || requestedType.includes(type)) &&
+ !NOT_SUGGESTED_TYPES.includes(type)
+ )
.map(({ name, suggestedAs }) => suggestedAs || name);
}
@@ -267,7 +272,9 @@ export function createCustomCallbackMocks(
enrichFields: string[];
}>
) {
- const finalColumnsSinceLastCommand = customColumnsSinceLastCommand || fields;
+ const finalColumnsSinceLastCommand =
+ customColumnsSinceLastCommand ||
+ fields.filter(({ type }) => !NOT_SUGGESTED_TYPES.includes(type));
const finalSources = customSources || indexes;
const finalPolicies = customPolicies || policies;
return {
diff --git a/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.test.ts b/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.test.ts
index 5f3a2e45f9e1f..f8d72fecf229a 100644
--- a/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.test.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.test.ts
@@ -887,6 +887,7 @@ describe('autocomplete', () => {
'FROM a | ENRICH policy /',
['ON $0', 'WITH $0', '| '].map(attachTriggerCommand)
);
+
testSuggestions(
'FROM a | ENRICH policy ON /',
getFieldNamesByType('any')
diff --git a/packages/kbn-esql-validation-autocomplete/src/shared/resources_helpers.ts b/packages/kbn-esql-validation-autocomplete/src/shared/resources_helpers.ts
index 5e7d951d8bdbf..5659a585ed758 100644
--- a/packages/kbn-esql-validation-autocomplete/src/shared/resources_helpers.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/shared/resources_helpers.ts
@@ -12,6 +12,8 @@ import type { ESQLCallbacks } from './types';
import type { ESQLRealField } from '../validation/types';
import { enrichFieldsWithECSInfo } from '../autocomplete/utils/ecs_metadata_helper';
+export const NOT_SUGGESTED_TYPES = ['unsupported'];
+
export function buildQueryUntilPreviousCommand(ast: ESQLAst, queryString: string) {
const prevCommand = ast[Math.max(ast.length - 2, 0)];
return prevCommand ? queryString.substring(0, prevCommand.location.max + 1) : queryString;
@@ -54,7 +56,11 @@ export function getFieldsByTypeHelper(queryText: string, resourceRetriever?: ESQ
return (
Array.from(cacheFields.values())?.filter(({ name, type }) => {
const ts = Array.isArray(type) ? type : [type];
- return !ignored.includes(name) && ts.some((t) => types[0] === 'any' || types.includes(t));
+ return (
+ !ignored.includes(name) &&
+ ts.some((t) => types[0] === 'any' || types.includes(t)) &&
+ !NOT_SUGGESTED_TYPES.includes(type)
+ );
}) || []
);
},
diff --git a/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json b/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json
index bf0e9782a3395..fee9f90f38c93 100644
--- a/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json
+++ b/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json
@@ -76,6 +76,10 @@
"name": "counterDoubleField",
"type": "counter_double"
},
+ {
+ "name": "unsupportedField",
+ "type": "unsupported"
+ },
{
"name": "dateNanosField",
"type": "date_nanos"
@@ -9690,6 +9694,13 @@
],
"warning": []
},
+ {
+ "query": "from a_index | keep unsupportedField",
+ "error": [],
+ "warning": [
+ "Field [unsupportedField] cannot be retrieved, it is unsupported or not indexed; returning null"
+ ]
+ },
{
"query": "f",
"error": [
diff --git a/packages/kbn-esql-validation-autocomplete/src/validation/validation.test.ts b/packages/kbn-esql-validation-autocomplete/src/validation/validation.test.ts
index 9d737d542bd1a..68d8ebb233f5e 100644
--- a/packages/kbn-esql-validation-autocomplete/src/validation/validation.test.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/validation/validation.test.ts
@@ -1695,6 +1695,16 @@ describe('validation logic', () => {
['Argument of [trim] must be [keyword], found value [doubleField] type [double]']
);
});
+
+ describe('unsupported fields', () => {
+ testErrorsAndWarnings(
+ `from a_index | keep unsupportedField`,
+ [],
+ [
+ 'Field [unsupportedField] cannot be retrieved, it is unsupported or not indexed; returning null',
+ ]
+ );
+ });
});
describe('Ignoring errors based on callbacks', () => {
diff --git a/packages/kbn-esql-validation-autocomplete/src/validation/validation.ts b/packages/kbn-esql-validation-autocomplete/src/validation/validation.ts
index b4d095e2c0442..b3076d107f850 100644
--- a/packages/kbn-esql-validation-autocomplete/src/validation/validation.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/validation/validation.ts
@@ -1223,21 +1223,24 @@ function validateFieldsShadowing(
return messages;
}
-function validateUnsupportedTypeFields(fields: Map) {
+function validateUnsupportedTypeFields(fields: Map, ast: ESQLAst) {
+ const usedColumnsInQuery: string[] = [];
+
+ walk(ast, {
+ visitColumn: (node) => usedColumnsInQuery.push(node.name),
+ });
const messages: ESQLMessage[] = [];
- for (const field of fields.values()) {
- if (field.type === 'unsupported') {
- // Removed temporarily to supress all these warnings
- // Issue to re-enable in a better way: https://github.com/elastic/kibana/issues/189666
- // messages.push(
- // getMessageFromId({
- // messageId: 'unsupportedFieldType',
- // values: {
- // field: field.name,
- // },
- // locations: { min: 1, max: 1 },
- // })
- // );
+ for (const column of usedColumnsInQuery) {
+ if (fields.has(column) && fields.get(column)!.type === 'unsupported') {
+ messages.push(
+ getMessageFromId({
+ messageId: 'unsupportedFieldType',
+ values: {
+ field: column,
+ },
+ locations: { min: 1, max: 1 },
+ })
+ );
}
}
return messages;
@@ -1350,7 +1353,7 @@ async function validateAst(
const variables = collectVariables(ast, availableFields, queryString);
// notify if the user is rewriting a column as variable with another type
messages.push(...validateFieldsShadowing(availableFields, variables));
- messages.push(...validateUnsupportedTypeFields(availableFields));
+ messages.push(...validateUnsupportedTypeFields(availableFields, ast));
for (const [index, command] of ast.entries()) {
const references: ReferenceMaps = {
diff --git a/packages/kbn-event-annotation-components/components/event_annotation_group_saved_object_finder.tsx b/packages/kbn-event-annotation-components/components/event_annotation_group_saved_object_finder.tsx
index 2f9c7afcd2190..38a701abdd81c 100644
--- a/packages/kbn-event-annotation-components/components/event_annotation_group_saved_object_finder.tsx
+++ b/packages/kbn-event-annotation-components/components/event_annotation_group_saved_object_finder.tsx
@@ -100,6 +100,7 @@ export const EventAnnotationGroupSavedObjectFinder = ({
) : (
{
onChoose({ id, type, fullName, savedObject });
diff --git a/packages/kbn-lens-embeddable-utils/attribute_builder/utils.ts b/packages/kbn-lens-embeddable-utils/attribute_builder/utils.ts
index 6418023586084..9c6ea500c97c7 100644
--- a/packages/kbn-lens-embeddable-utils/attribute_builder/utils.ts
+++ b/packages/kbn-lens-embeddable-utils/attribute_builder/utils.ts
@@ -28,7 +28,7 @@ export type DateHistogramColumnParams = DateHistogramIndexPatternColumn['params'
export type TopValuesColumnParams = Pick<
TermsIndexPatternColumn['params'],
- 'size' | 'orderDirection' | 'orderBy' | 'secondaryFields' | 'accuracyMode'
+ 'size' | 'orderDirection' | 'orderBy' | 'secondaryFields' | 'accuracyMode' | 'orderAgg'
>;
export const getHistogramColumn = ({
diff --git a/packages/kbn-management/settings/setting_ids/index.ts b/packages/kbn-management/settings/setting_ids/index.ts
index bc0f7206a2835..9a7c95917878a 100644
--- a/packages/kbn-management/settings/setting_ids/index.ts
+++ b/packages/kbn-management/settings/setting_ids/index.ts
@@ -45,6 +45,7 @@ export const SHORT_DOTS_ENABLE_ID = 'shortDots:enable';
export const SORT_OPTIONS_ID = 'sort:options';
export const STATE_STORE_IN_SESSION_STORAGE_ID = 'state:storeInSessionStorage';
export const THEME_DARK_MODE_ID = 'theme:darkMode';
+export const THEME_NAME_ID = 'theme:name';
export const TIMEPICKER_QUICK_RANGES_ID = 'timepicker:quickRanges';
export const TIMEPICKER_REFRESH_INTERVAL_DEFAULTS_ID = 'timepicker:refreshIntervalDefaults';
export const TIMEPICKER_TIME_DEFAULTS_ID = 'timepicker:timeDefaults';
diff --git a/packages/kbn-manifest/index.ts b/packages/kbn-manifest/index.ts
index 5fc4727a1a72d..ce890742ea61f 100644
--- a/packages/kbn-manifest/index.ts
+++ b/packages/kbn-manifest/index.ts
@@ -37,7 +37,7 @@ export const runKbnManifestCli = () => {
--list all List all the manifests
--package [packageId] Select a package to update.
--plugin [pluginId] Select a plugin to update.
- --set [property] [value] Set the desired "[property]": "[value]"
+ --set [property]=[value] Set the desired "[property]": "[value]"
--unset [property] Removes the desired "[property]: value" from the manifest
`,
},
diff --git a/packages/kbn-monaco/index.ts b/packages/kbn-monaco/index.ts
index ba8b0edb68e1a..283c3150302b7 100644
--- a/packages/kbn-monaco/index.ts
+++ b/packages/kbn-monaco/index.ts
@@ -20,7 +20,7 @@ export {
} from './src/monaco_imports';
export { XJsonLang } from './src/xjson';
export { SQLLang } from './src/sql';
-export { ESQL_LANG_ID, ESQL_THEME_ID, ESQLLang } from './src/esql';
+export { ESQL_LANG_ID, ESQL_DARK_THEME_ID, ESQL_LIGHT_THEME_ID, ESQLLang } from './src/esql';
export type { ESQLCallbacks } from '@kbn/esql-validation-autocomplete';
export * from './src/painless';
diff --git a/packages/kbn-monaco/src/esql/index.ts b/packages/kbn-monaco/src/esql/index.ts
index b14a2ab18ba75..64d49b155cc42 100644
--- a/packages/kbn-monaco/src/esql/index.ts
+++ b/packages/kbn-monaco/src/esql/index.ts
@@ -7,6 +7,6 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/
-export { ESQL_LANG_ID, ESQL_THEME_ID } from './lib/constants';
+export { ESQL_LANG_ID, ESQL_DARK_THEME_ID, ESQL_LIGHT_THEME_ID } from './lib/constants';
export { ESQLLang } from './language';
-export { buildESQlTheme } from './lib/esql_theme';
+export { buildESQLTheme } from './lib/esql_theme';
diff --git a/packages/kbn-monaco/src/esql/lib/constants.ts b/packages/kbn-monaco/src/esql/lib/constants.ts
index b0b0588b3ff4a..56f2f85ab074e 100644
--- a/packages/kbn-monaco/src/esql/lib/constants.ts
+++ b/packages/kbn-monaco/src/esql/lib/constants.ts
@@ -8,6 +8,7 @@
*/
export const ESQL_LANG_ID = 'esql';
-export const ESQL_THEME_ID = 'esqlTheme';
+export const ESQL_LIGHT_THEME_ID = 'esqlThemeLight';
+export const ESQL_DARK_THEME_ID = 'esqlThemeDark';
export const ESQL_TOKEN_POSTFIX = '.esql';
diff --git a/packages/kbn-monaco/src/esql/lib/esql_theme.test.ts b/packages/kbn-monaco/src/esql/lib/esql_theme.test.ts
index 237996a7fbcaa..c2a200e650804 100644
--- a/packages/kbn-monaco/src/esql/lib/esql_theme.test.ts
+++ b/packages/kbn-monaco/src/esql/lib/esql_theme.test.ts
@@ -9,12 +9,12 @@
import { ESQLErrorListener, getLexer as _getLexer } from '@kbn/esql-ast';
import { ESQL_TOKEN_POSTFIX } from './constants';
-import { buildESQlTheme } from './esql_theme';
+import { buildESQLTheme } from './esql_theme';
import { CharStreams } from 'antlr4';
describe('ESQL Theme', () => {
it('should not have multiple rules for a single token', () => {
- const theme = buildESQlTheme();
+ const theme = buildESQLTheme({ darkMode: false });
const seen = new Set();
const duplicates: string[] = [];
@@ -40,7 +40,7 @@ describe('ESQL Theme', () => {
.map((name) => name!.toLowerCase());
it('every rule should apply to a valid lexical name', () => {
- const theme = buildESQlTheme();
+ const theme = buildESQLTheme({ darkMode: false });
// These names aren't from the lexer... they are added on our side
// see packages/kbn-monaco/src/esql/lib/esql_token_helpers.ts
@@ -62,7 +62,7 @@ describe('ESQL Theme', () => {
});
it('every valid lexical name should have a corresponding rule', () => {
- const theme = buildESQlTheme();
+ const theme = buildESQLTheme({ darkMode: false });
const tokenIDs = theme.rules.map((rule) => rule.token.replace(ESQL_TOKEN_POSTFIX, ''));
const validExceptions = [
diff --git a/packages/kbn-monaco/src/esql/lib/esql_theme.ts b/packages/kbn-monaco/src/esql/lib/esql_theme.ts
index 330e55de86155..07a4d723b63e8 100644
--- a/packages/kbn-monaco/src/esql/lib/esql_theme.ts
+++ b/packages/kbn-monaco/src/esql/lib/esql_theme.ts
@@ -7,169 +7,177 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/
-import { euiThemeVars, darkMode } from '@kbn/ui-theme';
+import { euiDarkVars, euiLightVars } from '@kbn/ui-theme';
import { themeRuleGroupBuilderFactory } from '../../common/theme';
import { ESQL_TOKEN_POSTFIX } from './constants';
import { monaco } from '../../monaco_imports';
const buildRuleGroup = themeRuleGroupBuilderFactory(ESQL_TOKEN_POSTFIX);
-export const buildESQlTheme = (): monaco.editor.IStandaloneThemeData => ({
- base: darkMode ? 'vs-dark' : 'vs',
- inherit: true,
- rules: [
- // base
- ...buildRuleGroup(
- [
- 'explain',
- 'ws',
- 'assign',
- 'comma',
- 'dot',
- 'opening_bracket',
- 'closing_bracket',
- 'quoted_identifier',
- 'unquoted_identifier',
- 'pipe',
- ],
- euiThemeVars.euiTextColor
- ),
+export const buildESQLTheme = ({
+ darkMode,
+}: {
+ darkMode: boolean;
+}): monaco.editor.IStandaloneThemeData => {
+ const euiThemeVars = darkMode ? euiDarkVars : euiLightVars;
- // source commands
- ...buildRuleGroup(
- ['from', 'row', 'show'],
- euiThemeVars.euiColorPrimaryText,
- true // isBold
- ),
+ return {
+ base: darkMode ? 'vs-dark' : 'vs',
+ inherit: true,
+ rules: [
+ // base
+ ...buildRuleGroup(
+ [
+ 'explain',
+ 'ws',
+ 'assign',
+ 'comma',
+ 'dot',
+ 'opening_bracket',
+ 'closing_bracket',
+ 'quoted_identifier',
+ 'unquoted_identifier',
+ 'pipe',
+ ],
+ euiThemeVars.euiTextColor
+ ),
- // commands
- ...buildRuleGroup(
- [
- 'dev_metrics',
- 'metadata',
- 'mv_expand',
- 'stats',
- 'dev_inlinestats',
- 'dissect',
- 'grok',
- 'keep',
- 'rename',
- 'drop',
- 'eval',
- 'sort',
- 'by',
- 'where',
- 'not',
- 'is',
- 'like',
- 'rlike',
- 'in',
- 'as',
- 'limit',
- 'dev_lookup',
- 'null',
- 'enrich',
- 'on',
- 'with',
- 'asc',
- 'desc',
- 'nulls_order',
- ],
- euiThemeVars.euiColorAccentText,
- true // isBold
- ),
+ // source commands
+ ...buildRuleGroup(
+ ['from', 'row', 'show'],
+ euiThemeVars.euiColorPrimaryText,
+ true // isBold
+ ),
- // functions
- ...buildRuleGroup(['functions'], euiThemeVars.euiColorPrimaryText),
+ // commands
+ ...buildRuleGroup(
+ [
+ 'dev_metrics',
+ 'metadata',
+ 'mv_expand',
+ 'stats',
+ 'dev_inlinestats',
+ 'dissect',
+ 'grok',
+ 'keep',
+ 'rename',
+ 'drop',
+ 'eval',
+ 'sort',
+ 'by',
+ 'where',
+ 'not',
+ 'is',
+ 'like',
+ 'rlike',
+ 'in',
+ 'as',
+ 'limit',
+ 'dev_lookup',
+ 'null',
+ 'enrich',
+ 'on',
+ 'with',
+ 'asc',
+ 'desc',
+ 'nulls_order',
+ ],
+ euiThemeVars.euiColorAccentText,
+ true // isBold
+ ),
- // operators
- ...buildRuleGroup(
- [
- 'or',
- 'and',
- 'rp', // ')'
- 'lp', // '('
- 'eq', // '=='
- 'cieq', // '=~'
- 'neq', // '!='
- 'lt', // '<'
- 'lte', // '<='
- 'gt', // '>'
- 'gte', // '>='
- 'plus', // '+'
- 'minus', // '-'
- 'asterisk', // '*'
- 'slash', // '/'
- 'percent', // '%'
- 'cast_op', // '::'
- ],
- euiThemeVars.euiColorPrimaryText
- ),
+ // functions
+ ...buildRuleGroup(['functions'], euiThemeVars.euiColorPrimaryText),
- // comments
- ...buildRuleGroup(
- [
- 'line_comment',
- 'multiline_comment',
- 'expr_line_comment',
- 'expr_multiline_comment',
- 'explain_line_comment',
- 'explain_multiline_comment',
- 'project_line_comment',
- 'project_multiline_comment',
- 'rename_line_comment',
- 'rename_multiline_comment',
- 'from_line_comment',
- 'from_multiline_comment',
- 'enrich_line_comment',
- 'enrich_multiline_comment',
- 'mvexpand_line_comment',
- 'mvexpand_multiline_comment',
- 'enrich_field_line_comment',
- 'enrich_field_multiline_comment',
- 'lookup_line_comment',
- 'lookup_multiline_comment',
- 'lookup_field_line_comment',
- 'lookup_field_multiline_comment',
- 'show_line_comment',
- 'show_multiline_comment',
- 'setting',
- 'setting_line_comment',
- 'settting_multiline_comment',
- 'metrics_line_comment',
- 'metrics_multiline_comment',
- 'closing_metrics_line_comment',
- 'closing_metrics_multiline_comment',
- ],
- euiThemeVars.euiColorDisabledText
- ),
+ // operators
+ ...buildRuleGroup(
+ [
+ 'or',
+ 'and',
+ 'rp', // ')'
+ 'lp', // '('
+ 'eq', // '=='
+ 'cieq', // '=~'
+ 'neq', // '!='
+ 'lt', // '<'
+ 'lte', // '<='
+ 'gt', // '>'
+ 'gte', // '>='
+ 'plus', // '+'
+ 'minus', // '-'
+ 'asterisk', // '*'
+ 'slash', // '/'
+ 'percent', // '%'
+ 'cast_op', // '::'
+ ],
+ euiThemeVars.euiColorPrimaryText
+ ),
- // values
- ...buildRuleGroup(
- [
- 'quoted_string',
- 'integer_literal',
- 'decimal_literal',
- 'named_or_positional_param',
- 'param',
- 'timespan_literal',
- ],
- euiThemeVars.euiColorSuccessText
- ),
- ],
- colors: {
- 'editor.foreground': euiThemeVars.euiTextColor,
- 'editor.background': euiThemeVars.euiColorEmptyShade,
- 'editor.lineHighlightBackground': euiThemeVars.euiColorLightestShade,
- 'editor.lineHighlightBorder': euiThemeVars.euiColorLightestShade,
- 'editor.selectionHighlightBackground': euiThemeVars.euiColorLightestShade,
- 'editor.selectionHighlightBorder': euiThemeVars.euiColorLightShade,
- 'editorSuggestWidget.background': euiThemeVars.euiColorEmptyShade,
- 'editorSuggestWidget.border': euiThemeVars.euiColorEmptyShade,
- 'editorSuggestWidget.focusHighlightForeground': euiThemeVars.euiColorEmptyShade,
- 'editorSuggestWidget.foreground': euiThemeVars.euiTextColor,
- 'editorSuggestWidget.highlightForeground': euiThemeVars.euiColorPrimary,
- 'editorSuggestWidget.selectedBackground': euiThemeVars.euiColorPrimary,
- 'editorSuggestWidget.selectedForeground': euiThemeVars.euiColorEmptyShade,
- },
-});
+ // comments
+ ...buildRuleGroup(
+ [
+ 'line_comment',
+ 'multiline_comment',
+ 'expr_line_comment',
+ 'expr_multiline_comment',
+ 'explain_line_comment',
+ 'explain_multiline_comment',
+ 'project_line_comment',
+ 'project_multiline_comment',
+ 'rename_line_comment',
+ 'rename_multiline_comment',
+ 'from_line_comment',
+ 'from_multiline_comment',
+ 'enrich_line_comment',
+ 'enrich_multiline_comment',
+ 'mvexpand_line_comment',
+ 'mvexpand_multiline_comment',
+ 'enrich_field_line_comment',
+ 'enrich_field_multiline_comment',
+ 'lookup_line_comment',
+ 'lookup_multiline_comment',
+ 'lookup_field_line_comment',
+ 'lookup_field_multiline_comment',
+ 'show_line_comment',
+ 'show_multiline_comment',
+ 'setting',
+ 'setting_line_comment',
+ 'settting_multiline_comment',
+ 'metrics_line_comment',
+ 'metrics_multiline_comment',
+ 'closing_metrics_line_comment',
+ 'closing_metrics_multiline_comment',
+ ],
+ euiThemeVars.euiColorDisabledText
+ ),
+
+ // values
+ ...buildRuleGroup(
+ [
+ 'quoted_string',
+ 'integer_literal',
+ 'decimal_literal',
+ 'named_or_positional_param',
+ 'param',
+ 'timespan_literal',
+ ],
+ euiThemeVars.euiColorSuccessText
+ ),
+ ],
+ colors: {
+ 'editor.foreground': euiThemeVars.euiTextColor,
+ 'editor.background': euiThemeVars.euiColorEmptyShade,
+ 'editor.lineHighlightBackground': euiThemeVars.euiColorLightestShade,
+ 'editor.lineHighlightBorder': euiThemeVars.euiColorLightestShade,
+ 'editor.selectionHighlightBackground': euiThemeVars.euiColorLightestShade,
+ 'editor.selectionHighlightBorder': euiThemeVars.euiColorLightShade,
+ 'editorSuggestWidget.background': euiThemeVars.euiColorEmptyShade,
+ 'editorSuggestWidget.border': euiThemeVars.euiColorEmptyShade,
+ 'editorSuggestWidget.focusHighlightForeground': euiThemeVars.euiColorEmptyShade,
+ 'editorSuggestWidget.foreground': euiThemeVars.euiTextColor,
+ 'editorSuggestWidget.highlightForeground': euiThemeVars.euiColorPrimary,
+ 'editorSuggestWidget.selectedBackground': euiThemeVars.euiColorPrimary,
+ 'editorSuggestWidget.selectedForeground': euiThemeVars.euiColorEmptyShade,
+ },
+ };
+};
diff --git a/packages/kbn-monaco/src/register_globals.ts b/packages/kbn-monaco/src/register_globals.ts
index b4d9c07f78c79..32b8fb0ef2ece 100644
--- a/packages/kbn-monaco/src/register_globals.ts
+++ b/packages/kbn-monaco/src/register_globals.ts
@@ -11,7 +11,7 @@ import { XJsonLang } from './xjson';
import { PainlessLang } from './painless';
import { SQLLang } from './sql';
import { monaco } from './monaco_imports';
-import { ESQL_THEME_ID, ESQLLang, buildESQlTheme } from './esql';
+import { ESQL_DARK_THEME_ID, ESQL_LIGHT_THEME_ID, ESQLLang, buildESQLTheme } from './esql';
import { YAML_LANG_ID } from './yaml';
import { registerLanguage, registerTheme } from './helpers';
import { ConsoleLang, ConsoleOutputLang, CONSOLE_THEME_ID, buildConsoleTheme } from './console';
@@ -50,7 +50,8 @@ registerLanguage(ConsoleOutputLang);
/**
* Register custom themes
*/
-registerTheme(ESQL_THEME_ID, buildESQlTheme());
+registerTheme(ESQL_LIGHT_THEME_ID, buildESQLTheme({ darkMode: false }));
+registerTheme(ESQL_DARK_THEME_ID, buildESQLTheme({ darkMode: true }));
registerTheme(CONSOLE_THEME_ID, buildConsoleTheme());
registerTheme(CODE_EDITOR_LIGHT_THEME_ID, buildLightTheme());
registerTheme(CODE_EDITOR_DARK_THEME_ID, buildDarkTheme());
diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
index 8e1cd3e8fb7a1..58424700d9bf6 100644
--- a/packages/kbn-optimizer/limits.yml
+++ b/packages/kbn-optimizer/limits.yml
@@ -2,7 +2,7 @@ pageLoadAssetSize:
actions: 20000
advancedSettings: 27596
aiAssistantManagementSelection: 19146
- aiops: 16526
+ aiops: 16600
alerting: 106936
apm: 64385
banners: 17946
diff --git a/packages/kbn-optimizer/src/common/index.ts b/packages/kbn-optimizer/src/common/index.ts
index 112e677c9d713..543991a92065d 100644
--- a/packages/kbn-optimizer/src/common/index.ts
+++ b/packages/kbn-optimizer/src/common/index.ts
@@ -18,7 +18,6 @@ export * from './rxjs_helpers';
export * from './array_helpers';
export * from './event_stream_helpers';
export * from './parse_path';
-export * from './theme_tags';
export * from './obj_helpers';
export * from './hashes';
export * from './dll_manifest';
diff --git a/packages/kbn-optimizer/src/common/theme_tags.test.ts b/packages/kbn-optimizer/src/common/theme_tags.test.ts
deleted file mode 100644
index edf58797587f6..0000000000000
--- a/packages/kbn-optimizer/src/common/theme_tags.test.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
- * Public License v 1"; you may not use this file except in compliance with, at
- * your election, the "Elastic License 2.0", the "GNU Affero General Public
- * License v3.0 only", or the "Server Side Public License, v 1".
- */
-
-import { parseThemeTags } from './theme_tags';
-
-it('returns default tags when passed undefined', () => {
- expect(parseThemeTags()).toMatchInlineSnapshot(`
- Array [
- "v8dark",
- "v8light",
- ]
- `);
-});
-
-it('returns all tags when passed *', () => {
- expect(parseThemeTags('*')).toMatchInlineSnapshot(`
- Array [
- "v8dark",
- "v8light",
- ]
- `);
-});
-
-it('returns specific tag when passed a single value', () => {
- expect(parseThemeTags('v8light')).toMatchInlineSnapshot(`
- Array [
- "v8light",
- ]
- `);
-});
-
-it('returns specific tags when passed a comma separated list', () => {
- expect(parseThemeTags('v8light,v8dark')).toMatchInlineSnapshot(`
- Array [
- "v8dark",
- "v8light",
- ]
- `);
-});
-
-it('returns specific tags when passed an array', () => {
- expect(parseThemeTags(['v8light', 'v8dark'])).toMatchInlineSnapshot(`
- Array [
- "v8dark",
- "v8light",
- ]
- `);
-});
-
-it('throws when an invalid tag is in the array', () => {
- expect(() => parseThemeTags(['v8light', 'v7light'])).toThrowErrorMatchingInlineSnapshot(
- `"Invalid theme tags [v7light], options: [v8dark, v8light]"`
- );
-});
-
-it('throws when an invalid tags in comma separated list', () => {
- expect(() => parseThemeTags('v8light ,v7light')).toThrowErrorMatchingInlineSnapshot(
- `"Invalid theme tags [v7light], options: [v8dark, v8light]"`
- );
-});
-
-it('returns tags in alphabetical order', () => {
- const tags = parseThemeTags(['v8dark', 'v8light']);
- expect(tags).toEqual(tags.slice().sort((a, b) => a.localeCompare(b)));
-});
-
-it('returns an immutable array', () => {
- expect(() => {
- const tags = parseThemeTags('v8light');
- // @ts-expect-error
- tags.push('foo');
- }).toThrowErrorMatchingInlineSnapshot(`"Cannot add property 1, object is not extensible"`);
-});
diff --git a/packages/kbn-optimizer/src/common/theme_tags.ts b/packages/kbn-optimizer/src/common/theme_tags.ts
deleted file mode 100644
index fc126d55a4330..0000000000000
--- a/packages/kbn-optimizer/src/common/theme_tags.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
- * Public License v 1"; you may not use this file except in compliance with, at
- * your election, the "Elastic License 2.0", the "GNU Affero General Public
- * License v3.0 only", or the "Server Side Public License, v 1".
- */
-
-import { ascending } from './array_helpers';
-
-const tags = (...themeTags: string[]) =>
- Object.freeze(themeTags.sort(ascending((tag) => tag)) as ThemeTag[]);
-
-const validTag = (tag: any): tag is ThemeTag => ALL_THEMES.includes(tag);
-const isArrayOfStrings = (input: unknown): input is string[] =>
- Array.isArray(input) && input.every((v) => typeof v === 'string');
-
-export type ThemeTags = readonly ThemeTag[];
-export type ThemeTag = 'v8light' | 'v8dark';
-export const DEFAULT_THEMES = tags('v8light', 'v8dark');
-export const ALL_THEMES = tags('v8light', 'v8dark');
-
-export function parseThemeTags(input?: any): ThemeTags {
- if (!input) {
- return DEFAULT_THEMES;
- }
-
- if (input === '*') {
- return ALL_THEMES;
- }
-
- if (typeof input === 'string') {
- input = input.split(',').map((tag) => tag.trim());
- }
-
- if (!isArrayOfStrings(input)) {
- throw new Error(`Invalid theme tags, must be an array of strings`);
- }
-
- if (!input.length) {
- throw new Error(
- `Invalid theme tags, you must specify at least one of [${ALL_THEMES.join(', ')}]`
- );
- }
-
- const invalidTags = input.filter((t) => !validTag(t));
- if (invalidTags.length) {
- throw new Error(
- `Invalid theme tags [${invalidTags.join(', ')}], options: [${ALL_THEMES.join(', ')}]`
- );
- }
-
- return tags(...input);
-}
diff --git a/packages/kbn-optimizer/src/common/worker_config.ts b/packages/kbn-optimizer/src/common/worker_config.ts
index 8881d2354740b..6a61c3a99af07 100644
--- a/packages/kbn-optimizer/src/common/worker_config.ts
+++ b/packages/kbn-optimizer/src/common/worker_config.ts
@@ -9,8 +9,8 @@
import Path from 'path';
+import { ThemeTags, parseThemeTags } from '@kbn/core-ui-settings-common';
import { UnknownVals } from './ts_helpers';
-import { ThemeTags, parseThemeTags } from './theme_tags';
export interface WorkerConfig {
readonly repoRoot: string;
diff --git a/packages/kbn-optimizer/src/log_optimizer_state.ts b/packages/kbn-optimizer/src/log_optimizer_state.ts
index 3173ef2a05980..2bb810f45d240 100644
--- a/packages/kbn-optimizer/src/log_optimizer_state.ts
+++ b/packages/kbn-optimizer/src/log_optimizer_state.ts
@@ -10,11 +10,12 @@
import { inspect } from 'util';
import { ToolingLog } from '@kbn/tooling-log';
+import { hasNonDefaultThemeTags } from '@kbn/core-ui-settings-common';
import { tap } from 'rxjs';
import { OptimizerConfig } from './optimizer';
import { OptimizerUpdate$ } from './run_optimizer';
-import { CompilerMsg, pipeClosure, ALL_THEMES } from './common';
+import { CompilerMsg, pipeClosure } from './common';
export function logOptimizerState(log: ToolingLog, config: OptimizerConfig) {
return pipeClosure((update$: OptimizerUpdate$) => {
@@ -80,9 +81,9 @@ export function logOptimizerState(log: ToolingLog, config: OptimizerConfig) {
);
}
- if (config.themeTags.length !== ALL_THEMES.length) {
+ if (hasNonDefaultThemeTags(config.themeTags)) {
log.warning(
- `only building [${config.themeTags}] themes, customize with the KBN_OPTIMIZER_THEMES environment variable`
+ `running with non-default [${config.themeTags}] set of themes, customize with the KBN_OPTIMIZER_THEMES environment variable`
);
}
}
diff --git a/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.test.ts b/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.test.ts
index 6d520836ac4b2..f08849005e971 100644
--- a/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.test.ts
+++ b/packages/kbn-optimizer/src/optimizer/optimizer_cache_key.test.ts
@@ -90,8 +90,8 @@ describe('getOptimizerCacheKey()', () => {
"optimizerCacheKey": "♻",
"repoRoot": ,
"themeTags": Array [
- "v8dark",
"v8light",
+ "v8dark",
],
},
}
diff --git a/packages/kbn-optimizer/src/optimizer/optimizer_config.test.ts b/packages/kbn-optimizer/src/optimizer/optimizer_config.test.ts
index a3329dcc3d57f..5fd2318953a8c 100644
--- a/packages/kbn-optimizer/src/optimizer/optimizer_config.test.ts
+++ b/packages/kbn-optimizer/src/optimizer/optimizer_config.test.ts
@@ -8,10 +8,10 @@
*/
jest.mock('@kbn/repo-packages');
+jest.mock('@kbn/core-ui-settings-common');
jest.mock('./assign_bundles_to_workers');
jest.mock('./kibana_platform_plugins');
jest.mock('./get_plugin_bundles');
-jest.mock('../common/theme_tags');
jest.mock('./filter_by_id');
jest.mock('./focus_bundles');
jest.mock('../limits');
@@ -29,7 +29,7 @@ import { REPO_ROOT } from '@kbn/repo-info';
import { createAbsolutePathSerializer } from '@kbn/jest-serializers';
import { OptimizerConfig, ParsedOptions } from './optimizer_config';
-import { parseThemeTags } from '../common';
+import { parseThemeTags } from '@kbn/core-ui-settings-common';
expect.addSnapshotSerializer(createAbsolutePathSerializer());
diff --git a/packages/kbn-optimizer/src/optimizer/optimizer_config.ts b/packages/kbn-optimizer/src/optimizer/optimizer_config.ts
index b09650c0708da..1b04a6fbd25a3 100644
--- a/packages/kbn-optimizer/src/optimizer/optimizer_config.ts
+++ b/packages/kbn-optimizer/src/optimizer/optimizer_config.ts
@@ -10,16 +10,9 @@
import Path from 'path';
import Os from 'os';
import { getPackages, getPluginPackagesFilter, type PluginSelector } from '@kbn/repo-packages';
+import { ThemeTag, ThemeTags, parseThemeTags } from '@kbn/core-ui-settings-common';
-import {
- Bundle,
- WorkerConfig,
- CacheableWorkerConfig,
- ThemeTag,
- ThemeTags,
- parseThemeTags,
- omit,
-} from '../common';
+import { Bundle, WorkerConfig, CacheableWorkerConfig, omit } from '../common';
import { toKibanaPlatformPlugin, KibanaPlatformPlugin } from './kibana_platform_plugins';
import { getPluginBundles } from './get_plugin_bundles';
diff --git a/packages/kbn-optimizer/src/worker/theme_loader.ts b/packages/kbn-optimizer/src/worker/theme_loader.ts
index 92a728f17f5cb..3bce12d94e974 100644
--- a/packages/kbn-optimizer/src/worker/theme_loader.ts
+++ b/packages/kbn-optimizer/src/worker/theme_loader.ts
@@ -9,12 +9,11 @@
import { stringifyRequest, getOptions } from 'loader-utils';
import webpack from 'webpack';
-import { parseThemeTags, ALL_THEMES, ThemeTag } from '../common';
-
-const getVersion = (tag: ThemeTag) => 8;
-const getIsDark = (tag: ThemeTag) => tag.includes('dark');
-const compare = (a: ThemeTag, b: ThemeTag) =>
- (getVersion(a) === getVersion(b) ? 1 : 0) + (getIsDark(a) === getIsDark(b) ? 1 : 0);
+import {
+ FALLBACK_THEME_TAG,
+ parseThemeTags,
+ hasNonDefaultThemeTags,
+} from '@kbn/core-ui-settings-common';
// eslint-disable-next-line import/no-default-export
export default function (this: webpack.loader.LoaderContext) {
@@ -23,27 +22,34 @@ export default function (this: webpack.loader.LoaderContext) {
const options = getOptions(this);
const bundleId = options.bundleId as string;
const themeTags = parseThemeTags(options.themeTags);
-
- const cases = ALL_THEMES.map((tag) => {
- if (themeTags.includes(tag)) {
- return `
- case '${tag}':
- return require(${stringifyRequest(this, `${this.resourcePath}?${tag}`)});`;
- }
-
- const fallback = themeTags
- .slice()
- .sort((a, b) => compare(b, tag) - compare(a, tag))
- .shift()!;
-
- const message = `SASS files in [${bundleId}] were not built for theme [${tag}]. Styles were compiled using the [${fallback}] theme instead to keep Kibana somewhat usable. Please adjust the advanced settings to make use of [${themeTags}] or make sure the KBN_OPTIMIZER_THEMES environment variable includes [${tag}] in a comma separated list of themes you want to compile. You can also set it to "*" to build all themes.`;
- return `
- case '${tag}':
- console.error(new Error(${JSON.stringify(message)}));
- return require(${stringifyRequest(this, `${this.resourcePath}?${fallback}`)})`;
- }).join('\n');
+ const isFallbackNeeded = hasNonDefaultThemeTags(themeTags);
+
+ /**
+ * The following piece of code generates a `switch` statement that gets injected into the output
+ * bundle for all `.scss` file imports. The generated `switch` contains:
+ * - a `case` clause for each of the bundled theme tags,
+ * - an optional `default` clause for the theme fallback logic, included when some of the default
+ * Kibana theme tags are omitted and the fallback logic might be needed. The fallback logic
+ * should never have to run and is added as an extra precaution layer.
+ */
+
+ let defaultClause = '';
+ if (isFallbackNeeded) {
+ defaultClause = `
+ default:
+ console.error(new Error("SASS files in [${bundleId}] were not built for theme [" + window.__kbnThemeTag__ + "]. Styles were compiled using the [${FALLBACK_THEME_TAG}] theme instead to keep Kibana somewhat usable. Please adjust the advanced settings to make use of [${themeTags}] or make sure the KBN_OPTIMIZER_THEMES environment variable includes [" + window.__kbnThemeTag__ + "] in a comma-separated list of themes you want to compile. You can also set it to \'*\' to build all themes."));
+ return require(${stringifyRequest(this, `${this.resourcePath}?${FALLBACK_THEME_TAG}`)});`;
+ }
return `
-switch (window.__kbnThemeTag__) {${cases}
+switch (window.__kbnThemeTag__) {
+${themeTags
+ .map(
+ (tag) => `
+ case '${tag}':
+ return require(${stringifyRequest(this, `${this.resourcePath}?${tag}`)});`
+ )
+ .join('\n')}
+ ${defaultClause}
}`;
}
diff --git a/packages/kbn-optimizer/tsconfig.json b/packages/kbn-optimizer/tsconfig.json
index f8cb993537be7..d6e79f66a561a 100644
--- a/packages/kbn-optimizer/tsconfig.json
+++ b/packages/kbn-optimizer/tsconfig.json
@@ -18,6 +18,7 @@
"kbn_references": [
"@kbn/config-schema",
"@kbn/dev-utils",
+ "@kbn/core-ui-settings-common",
"@kbn/optimizer-webpack-helpers",
"@kbn/std",
"@kbn/ui-shared-deps-npm",
diff --git a/packages/kbn-react-hooks/README.md b/packages/kbn-react-hooks/README.md
index 792df6534c8d8..6eba8db3641d6 100644
--- a/packages/kbn-react-hooks/README.md
+++ b/packages/kbn-react-hooks/README.md
@@ -4,7 +4,7 @@ A utility package, `@kbn/react-hooks`, provides custom react hooks for simple ab
## Custom Hooks
-### [useBoolean](./src/useBoolean)
+### [useBoolean](./src/use_boolean/use_boolean.ts)
Simplify handling boolean value with predefined handlers.
@@ -25,4 +25,20 @@ function App() {