+
+ {isDiscardQueryModalVisible && (
+
+ (await starredQueriesService?.onDiscardModalClose(dismissFlag, removeQuery)) ??
+ Promise.resolve()
+ }
+ />
+ )}
);
}
@@ -354,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', {
@@ -387,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.tsx b/packages/kbn-esql-editor/src/esql_editor.tsx
index 636bb0b13ff17..767bc9026348c 100644
--- a/packages/kbn-esql-editor/src/esql_editor.tsx
+++ b/packages/kbn-esql-editor/src/esql_editor.tsx
@@ -99,7 +99,7 @@ export const ESQLEditor = memo(function ESQLEditor({
uiSettings,
} = kibana.services;
const darkMode = core.theme?.getTheme().darkMode;
- const timeZone = uiSettings?.get('dateFormat:tz');
+
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
@@ -464,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 }) => {
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 075c5ff9ab457..5131dd90fb0a5 100644
--- a/packages/kbn-esql-editor/tsconfig.json
+++ b/packages/kbn-esql-editor/tsconfig.json
@@ -28,6 +28,10 @@
"@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": [
diff --git a/src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts b/src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts
index 02f7007b51202..28a1e8e1eb538 100644
--- a/src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts
+++ b/src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts
@@ -100,7 +100,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
"event_loop_delays_daily": "01b967e8e043801357503de09199dfa3853bab88",
"exception-list": "4aebc4e61fb5d608cae48eaeb0977e8db21c61a4",
"exception-list-agnostic": "6d3262d58eee28ac381ec9654f93126a58be6f5d",
- "favorites": "a68c7c8ae22eaddcca324d8b3bfc80a94e3eec3a",
+ "favorites": "e9773d802932ea85547b120e0efdd9a4f11ff4c6",
"file": "6b65ae5899b60ebe08656fd163ea532e557d3c98",
"file-upload-usage-collection-telemetry": "06e0a8c04f991e744e09d03ab2bd7f86b2088200",
"fileShare": "5be52de1747d249a221b5241af2838264e19aaa1",
diff --git a/src/dev/prs/kibana_qa_pr_list.json b/src/dev/prs/kibana_qa_pr_list.json
index a6e5b9a4f933f..5115959da9f61 100644
--- a/src/dev/prs/kibana_qa_pr_list.json
+++ b/src/dev/prs/kibana_qa_pr_list.json
@@ -1,8 +1,17 @@
{
"include": [
-"v8.13.0"
+"v8.16.0"
],
"exclude": [
+"v8.15.3",
+"v8.15.2",
+"v8.15.1",
+"v8.15.0",
+"v7.17.25",
+"v8.15.3",
+"v8.15.2",
+"v8.15.1",
+"v8.15.0",
"v8.12.0",
"v8.3.3",
"v8.3.2",
@@ -20,9 +29,10 @@
"Feature:Endpoint",
"Feature:Observability Landing - Milestone 1",
"Feature:Osquery",
-"Feature:Transforms",
+"Feature:EEM",
"Feature:Unified Integrations",
"Synthetics",
+"Feature: Observability Onboarding",
"Team: AWL: Platform",
"Team: AWP: Visualization",
"Team: Actionable Observability",
@@ -57,15 +67,19 @@
"Team:apm",
"Team:logs-metrics-ui",
"Team:uptime",
-"Team: Protections Experience",
+"Team:Protections Experience",
"Team:obs-ux-infra_services",
"Team:obs-ux-management",
"Team:Cloud Security",
+"Team:Security Generative AI",
"Team:obs-ux-logs",
"Team:Defend Workflows",
"Team:Entity Analytics",
"Team:Obs AI Assistant",
"Team:Search",
+"Team:Security-Scalability",
+"Team:Detection Engine",
+"Team:Cloud Security",
"bump",
"docs",
"failed-test",
diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.tsx b/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.tsx
index 5baf582877a68..816a10509b425 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.tsx
+++ b/src/plugins/chart_expressions/expression_partition_vis/public/components/partition_vis_component.tsx
@@ -41,6 +41,7 @@ import {
} from '@kbn/expressions-plugin/public';
import type { FieldFormat } from '@kbn/field-formats-plugin/common';
import { getOverridesFor } from '@kbn/chart-expressions-common';
+import { useAppFixedViewport } from '@kbn/core-rendering-browser';
import { consolidateMetricColumns } from '../../common/utils';
import { DEFAULT_PERCENT_DECIMALS } from '../../common/constants';
import {
@@ -385,7 +386,7 @@ const PartitionVisComponent = (props: PartitionVisComponentProps) => {
[visType, visParams, containerDimensions, rescaleFactor, hasOpenedOnAggBasedEditor]
);
- const fixedViewPort = document.getElementById('app-fixed-viewport');
+ const fixedViewPort = useAppFixedViewport();
const legendPosition = visParams.legendPosition ?? Position.Right;
diff --git a/src/plugins/chart_expressions/expression_partition_vis/tsconfig.json b/src/plugins/chart_expressions/expression_partition_vis/tsconfig.json
index 7669646f40a6b..1d8c4c4098728 100644
--- a/src/plugins/chart_expressions/expression_partition_vis/tsconfig.json
+++ b/src/plugins/chart_expressions/expression_partition_vis/tsconfig.json
@@ -30,6 +30,7 @@
"@kbn/chart-expressions-common",
"@kbn/cell-actions",
"@kbn/react-kibana-context-render",
+ "@kbn/core-rendering-browser",
],
"exclude": [
"target/**/*",
diff --git a/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.tsx b/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.tsx
index e1c428dd15c72..349af46eb101a 100644
--- a/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.tsx
@@ -55,6 +55,7 @@ import {
} from '@kbn/visualizations-plugin/common/constants';
import { PersistedState } from '@kbn/visualizations-plugin/public';
import { getOverridesFor, ChartSizeSpec } from '@kbn/chart-expressions-common';
+import { useAppFixedViewport } from '@kbn/core-rendering-browser';
import type {
FilterEvent,
BrushEvent,
@@ -232,6 +233,7 @@ export function XYChart({
const chartRef = useRef(null);
const chartBaseTheme = chartsThemeService.useChartsBaseTheme();
const darkMode = chartsThemeService.useDarkMode();
+ const appFixedViewport = useAppFixedViewport();
const filteredLayers = getFilteredLayers(layers);
const layersById = filteredLayers.reduce>(
(hashMap, layer) => ({ ...hashMap, [layer.layerId]: layer }),
@@ -767,7 +769,7 @@ export function XYChart({
>
, XYChartSeriesIdentifier>
- boundary={document.getElementById('app-fixed-viewport') ?? undefined}
+ boundary={appFixedViewport}
headerFormatter={
!args.detailedTooltip && xAxisColumn
? ({ value }) => (
diff --git a/src/plugins/chart_expressions/expression_xy/tsconfig.json b/src/plugins/chart_expressions/expression_xy/tsconfig.json
index efa65a7f28a7d..cd8bd4db90b89 100644
--- a/src/plugins/chart_expressions/expression_xy/tsconfig.json
+++ b/src/plugins/chart_expressions/expression_xy/tsconfig.json
@@ -35,6 +35,7 @@
"@kbn/es-query",
"@kbn/cell-actions",
"@kbn/react-kibana-context-render",
+ "@kbn/core-rendering-browser",
],
"exclude": [
"target/**/*",
diff --git a/src/plugins/console/common/constants/index.ts b/src/plugins/console/common/constants/index.ts
index a00bcebcf38cc..b4d6a594241ce 100644
--- a/src/plugins/console/common/constants/index.ts
+++ b/src/plugins/console/common/constants/index.ts
@@ -7,7 +7,7 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/
-export { MAJOR_VERSION } from './plugin';
+export { MAJOR_VERSION, WELCOME_TOUR_DELAY } from './plugin';
export { API_BASE_PATH, KIBANA_API_PREFIX } from './api';
export { DEFAULT_VARIABLES } from './variables';
export {
diff --git a/src/plugins/console/common/constants/plugin.ts b/src/plugins/console/common/constants/plugin.ts
index 27ddb7d5dff1d..bb87e300c138d 100644
--- a/src/plugins/console/common/constants/plugin.ts
+++ b/src/plugins/console/common/constants/plugin.ts
@@ -8,3 +8,5 @@
*/
export const MAJOR_VERSION = '8.0.0';
+
+export const WELCOME_TOUR_DELAY = 250;
diff --git a/src/plugins/console/public/application/components/console_tour_step.tsx b/src/plugins/console/public/application/components/console_tour_step.tsx
index 578d590bfff4a..97e999b0090aa 100644
--- a/src/plugins/console/public/application/components/console_tour_step.tsx
+++ b/src/plugins/console/public/application/components/console_tour_step.tsx
@@ -7,8 +7,9 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/
-import React, { ReactNode, ReactElement } from 'react';
+import React, { ReactNode, ReactElement, useState, useEffect } from 'react';
import { EuiTourStep, PopoverAnchorPosition } from '@elastic/eui';
+import { WELCOME_TOUR_DELAY } from '../../../common/constants';
export interface ConsoleTourStepProps {
step: number;
@@ -44,11 +45,31 @@ export const ConsoleTourStep = ({ tourStepProps, children }: Props) => {
css,
} = tourStepProps;
+ const [popoverVisible, setPopoverVisible] = useState(false);
+
+ useEffect(() => {
+ let timeoutId: any;
+
+ if (isStepOpen) {
+ timeoutId = setTimeout(() => {
+ setPopoverVisible(true);
+ }, WELCOME_TOUR_DELAY);
+ } else {
+ setPopoverVisible(false);
+ }
+
+ return () => {
+ if (timeoutId) {
+ clearTimeout(timeoutId);
+ }
+ };
+ }, [isStepOpen]);
+
return (
{
+ const debouncedResize = debounce(() => {
+ window.dispatchEvent(new Event('resize'));
+ }, WELCOME_TOUR_DELAY);
+
+ debouncedResize();
+
+ // Cleanup the debounce instance on unmount or dependency change
+ return () => {
+ debouncedResize.cancel();
+ };
+ }, [consoleHeight]);
+
useEffect(() => {
function handleResize() {
const newMaxConsoleHeight = getCurrentConsoleMaxSize(euiTheme);
diff --git a/src/plugins/content_management/server/plugin.test.ts b/src/plugins/content_management/server/plugin.test.ts
index 30bbc57ee0159..de077a3f6d4de 100644
--- a/src/plugins/content_management/server/plugin.test.ts
+++ b/src/plugins/content_management/server/plugin.test.ts
@@ -91,7 +91,7 @@ describe('ContentManagementPlugin', () => {
const { plugin, coreSetup, pluginsSetup } = setup();
const api = plugin.setup(coreSetup, pluginsSetup);
- expect(Object.keys(api).sort()).toEqual(['crud', 'eventBus', 'register']);
+ expect(Object.keys(api).sort()).toEqual(['crud', 'eventBus', 'favorites', 'register']);
expect(api.crud('')).toBe('mockedCrud');
expect(api.register({} as any)).toBe('mockedRegister');
expect(api.eventBus.emit({} as any)).toBe('mockedEventBusEmit');
diff --git a/src/plugins/content_management/server/plugin.ts b/src/plugins/content_management/server/plugin.ts
index c82ed1c66fee2..0215f3d36771b 100755
--- a/src/plugins/content_management/server/plugin.ts
+++ b/src/plugins/content_management/server/plugin.ts
@@ -76,10 +76,15 @@ export class ContentManagementPlugin
contentRegistry,
});
- registerFavorites({ core, logger: this.logger, usageCollection: plugins.usageCollection });
+ const favoritesSetup = registerFavorites({
+ core,
+ logger: this.logger,
+ usageCollection: plugins.usageCollection,
+ });
return {
...coreApi,
+ favorites: favoritesSetup,
};
}
diff --git a/src/plugins/content_management/server/types.ts b/src/plugins/content_management/server/types.ts
index 22d1d57e38ba8..020f135a7d080 100644
--- a/src/plugins/content_management/server/types.ts
+++ b/src/plugins/content_management/server/types.ts
@@ -9,6 +9,7 @@
import type { Version } from '@kbn/object-versioning';
import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import type { FavoritesSetup } from '@kbn/content-management-favorites-server';
import type { CoreApi, StorageContextGetTransformFn } from './core';
export interface ContentManagementServerSetupDependencies {
@@ -18,8 +19,9 @@ export interface ContentManagementServerSetupDependencies {
// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface ContentManagementServerStartDependencies {}
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface ContentManagementServerSetup extends CoreApi {}
+export interface ContentManagementServerSetup extends CoreApi {
+ favorites: FavoritesSetup;
+}
// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface ContentManagementServerStart {}
diff --git a/src/plugins/dashboard/public/dashboard_actions/filters_notification_popover.tsx b/src/plugins/dashboard/public/dashboard_actions/filters_notification_popover.tsx
index 5f23b21dc9155..5433646e3db8e 100644
--- a/src/plugins/dashboard/public/dashboard_actions/filters_notification_popover.tsx
+++ b/src/plugins/dashboard/public/dashboard_actions/filters_notification_popover.tsx
@@ -62,8 +62,7 @@ export function FiltersNotificationPopover({ api }: { api: FiltersNotificationAc
}
}, [api, setDisableEditButton]);
- const [hasLockedHoverActions, dataViews, parentViewMode] = useBatchedOptionalPublishingSubjects(
- api.hasLockedHoverActions$,
+ const [dataViews, parentViewMode] = useBatchedOptionalPublishingSubjects(
api.parentApi?.dataViews,
getViewModeSubject(api ?? undefined)
);
@@ -77,7 +76,7 @@ export function FiltersNotificationPopover({ api }: { api: FiltersNotificationAc
onClick={() => {
setIsPopoverOpen(!isPopoverOpen);
if (apiCanLockHoverActions(api)) {
- api?.lockHoverActions(!hasLockedHoverActions);
+ api?.lockHoverActions(!api.hasLockedHoverActions$.value);
}
}}
data-test-subj={`embeddablePanelNotification-${api.uuid}`}
diff --git a/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid.tsx b/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid.tsx
index 0ef976af51eb6..76a545d1ea9fc 100644
--- a/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid.tsx
+++ b/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid.tsx
@@ -18,6 +18,7 @@ import { Layout, Responsive as ResponsiveReactGridLayout } from 'react-grid-layo
import { ViewMode } from '@kbn/embeddable-plugin/public';
import { useBatchedPublishingSubjects } from '@kbn/presentation-publishing';
+import { useAppFixedViewport } from '@kbn/core-rendering-browser';
import { DashboardPanelState } from '../../../../common';
import { DashboardGridItem } from './dashboard_grid_item';
import { useDashboardGridSettings } from './use_dashboard_grid_settings';
@@ -25,7 +26,13 @@ import { useDashboardApi } from '../../../dashboard_api/use_dashboard_api';
import { getPanelLayoutsAreEqual } from '../../state/diffing/dashboard_diffing_utils';
import { DASHBOARD_GRID_HEIGHT, DASHBOARD_MARGIN_SIZE } from '../../../dashboard_constants';
-export const DashboardGrid = ({ viewportWidth }: { viewportWidth: number }) => {
+export const DashboardGrid = ({
+ dashboardContainer,
+ viewportWidth,
+}: {
+ dashboardContainer?: HTMLElement;
+ viewportWidth: number;
+}) => {
const dashboardApi = useDashboardApi();
const [animatePanelTransforms, expandedPanelId, focusedPanelId, panels, useMargins, viewMode] =
@@ -51,6 +58,8 @@ export const DashboardGrid = ({ viewportWidth }: { viewportWidth: number }) => {
}
}, [expandedPanelId]);
+ const appFixedViewport = useAppFixedViewport();
+
const panelsInOrder: string[] = useMemo(() => {
return Object.keys(panels).sort((embeddableIdA, embeddableIdB) => {
const panelA = panels[embeddableIdA];
@@ -72,6 +81,8 @@ export const DashboardGrid = ({ viewportWidth }: { viewportWidth: number }) => {
const type = panels[embeddableId].type;
return (
{
/>
);
});
- }, [expandedPanelId, panels, panelsInOrder, focusedPanelId]);
+ }, [
+ appFixedViewport,
+ dashboardContainer,
+ expandedPanelId,
+ panels,
+ panelsInOrder,
+ focusedPanelId,
+ ]);
const onLayoutChange = useCallback(
(newLayout: Array) => {
diff --git a/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid_item.tsx b/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid_item.tsx
index 9b5a00c628608..5ad1363e6f8af 100644
--- a/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid_item.tsx
+++ b/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid_item.tsx
@@ -23,6 +23,8 @@ import { embeddableService, presentationUtilService } from '../../../services/ki
type DivProps = Pick, 'className' | 'style' | 'children'>;
export interface Props extends DivProps {
+ appFixedViewport?: HTMLElement;
+ dashboardContainer?: HTMLElement;
id: DashboardPanelState['explicitInput']['id'];
index?: number;
type: DashboardPanelState['type'];
@@ -35,6 +37,8 @@ export interface Props extends DivProps {
export const Item = React.forwardRef(
(
{
+ appFixedViewport,
+ dashboardContainer,
expandedPanelId,
focusedPanelId,
id,
@@ -92,10 +96,8 @@ export const Item = React.forwardRef(
}
}, [id, dashboardApi, scrollToPanelId, highlightPanelId, ref, blurPanel]);
- const dashboardContainerTopOffset =
- (document.querySelector('.dashboardContainer') as HTMLDivElement)?.offsetTop || 0;
- const globalNavTopOffset =
- (document.querySelector('#app-fixed-viewport') as HTMLDivElement)?.offsetTop || 0;
+ const dashboardContainerTopOffset = dashboardContainer?.offsetTop || 0;
+ const globalNavTopOffset = appFixedViewport?.offsetTop || 0;
const focusStyles = blurPanel
? css`
diff --git a/src/plugins/dashboard/public/dashboard_container/component/viewport/dashboard_viewport.tsx b/src/plugins/dashboard/public/dashboard_container/component/viewport/dashboard_viewport.tsx
index 027d2aee62b15..51f414bfcc298 100644
--- a/src/plugins/dashboard/public/dashboard_container/component/viewport/dashboard_viewport.tsx
+++ b/src/plugins/dashboard/public/dashboard_container/component/viewport/dashboard_viewport.tsx
@@ -41,7 +41,7 @@ export const useDebouncedWidthObserver = (skipDebounce = false, wait = 100) => {
return { ref, width };
};
-export const DashboardViewport = () => {
+export const DashboardViewport = ({ dashboardContainer }: { dashboardContainer?: HTMLElement }) => {
const dashboardApi = useDashboardApi();
const [hasControls, setHasControls] = useState(false);
const [
@@ -160,7 +160,9 @@ export const DashboardViewport = () => {
otherwise, there is a race condition where the panels can end up being squashed
TODO only render when dashboardInitialized
*/}
- {viewportWidth !== 0 && }
+ {viewportWidth !== 0 && (
+
+ )}