Skip to content

[ES|QL Editor] Attempt to fix resetting of edits after a query was submitted #210638

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.

Sign up for GitHub

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

Closed
kertal wants to merge 4 commits into from
Closed

[ES|QL Editor] Attempt to fix resetting of edits after a query was submitted #210638

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
875967c
Apply more memoization to ESQL-Editor
kertal Feb 11, 2025
3feedb6
Apply additional logic preventing local query state to be overwritten
kertal Feb 11, 2025
9a27a08
Merge branch 'main' into discover-research-esql-reset
kertal Feb 11, 2025
f3e63b3
Another attempt
kertal Feb 12, 2025
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
19 changes: 16 additions & 3 deletions ...rm/plugins/shared/discover/public/application/main/components/top_nav/discover_topnav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
* License v3.0 only", or the "Server Side Public License, v 1".
*/

import React, { useCallback, useEffect, useMemo, useRef } from 'react';
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { DataViewType } from '@kbn/data-views-plugin/public';
import type { DataViewPickerProps } from '@kbn/unified-search-plugin/public';
import { ENABLE_ESQL } from '@kbn/esql-utils';
import { TextBasedLanguages } from '@kbn/esql-utils';
import { DiscoverFlyouts, dismissAllFlyoutsExceptFor } from '@kbn/discover-utils';
import { AggregateQuery, Query, TimeRange } from '@kbn/es-query';
import { useSavedSearchInitial } from '../../state_management/discover_state_provider';
import { ESQL_TRANSITION_MODAL_KEY } from '../../../../../common/constants';
import {
Expand Down Expand Up @@ -52,6 +53,10 @@ export const DiscoverTopNav = ({
const { dataViewEditor, navigation, dataViewFieldEditor, data, uiSettings, setHeaderActionMenu } =
services;
const query = useAppStateSelector((state) => state.query);
const [actualQuery, setActualQuery] = useState(query);
useEffect(() => {
setActualQuery(query);
}, [query]);
const { savedDataViews, managedDataViews, adHocDataViews } =
useInternalStateSelector(selectDataViewsForPicker);
const dataView = useInternalStateSelector((state) => state.dataView!);
Expand Down Expand Up @@ -221,17 +226,25 @@ export const DiscoverTopNav = ({
const shouldHideDefaultDataviewPicker =
!!searchBarCustomization?.CustomDataViewPicker || !!searchBarCustomization?.hideDataViewPicker;

const onQuerySubmit = useCallback(
(payload: { dateRange: TimeRange; query?: Query | AggregateQuery }, isUpdate?: boolean) => {
if (isUpdate === false) stateContainer.actions.onUpdateQuery(payload, isUpdate);
setActualQuery(payload.query);
},
[stateContainer]
);

return (
<>
<SearchBar
{...topNavProps}
appName="discover"
indexPatterns={[dataView]}
onQuerySubmit={stateContainer.actions.onUpdateQuery}
onQuerySubmit={onQuerySubmit}
onCancel={onCancelClick}
isLoading={isLoading}
onSavedQueryIdChange={updateSavedQueryId}
query={query}
query={actualQuery}
savedQueryId={savedQuery}
screenTitle={savedSearch.title}
showDatePicker={showDatePicker}
Expand Down